Incremented version number to reflect latest changes

Strike lightning on /tempban

CONTRIBUTING.md

@@ -21,6 +21,9 @@ For those who wish to contribute, we encourage you to fork the repository and su
 * Make sure your changes build (<b>and work!</b>).
 
 ## Tips - How To Get Your Pull Request Accepted ##
+* See this picture for help:
+![Imgur](http://i.imgur.com/7kogorv.jpg)
+
 * 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.__

LICENSE.md

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

appinfo.properties

@@ -1,5 +0,0 @@
-#Wed, 14 Aug 2013 15:57:37 +0200
-
-program.VERSION=3.00
-program.BUILDNUM=459
-program.BUILDDATE=08/14/2013 03\:57 PM

build.xml

@@ -1,83 +1,20 @@
 <?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"/>
+    <import file="nbproject/build-impl.xml" />
-    <!--
+    <target name="-pre-jar">
-
+        <buildnumber file="buildnumber.properties" />
-    There exist several targets which are by default empty and which can be 
+        <propertyfile file="appinfo.properties">
-    used for execution of your tasks. These targets are usually executed 
+            <entry key="program.buildnumber" value="${build.number}" />
-    before and after some main targets. They are: 
+            <entry key="program.builddate" type="date" value="now" pattern="MM/dd/yyyy hh:mm aa" />
-
+        </propertyfile>
-      -pre-init:                 called before initialization of project properties
+        <copy file="appinfo.properties" todir="${build.classes.dir}" />
-      -post-init:                called after initialization of project properties
+        <delete file="appinfo.properties" />
-      -pre-compile:              called before javac compilation
+    </target>
-      -post-compile:             called after javac compilation
+	
-      -pre-compile-single:       called before javac compilation of single file
+    <target name="-post-jar">
-      -post-compile-single:      called after javac compilation of single file
+        <!-- Cleanup -->
-      -pre-compile-test:         called before javac compilation of JUnit tests
+        <delete file="${dist.dir}/README.TXT" />
-      -post-compile-test:        called after javac compilation of JUnit tests
+        <delete dir="${dist.dir}/lib/" />
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
+    </target>
-      -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">
-		<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" />
-		</propertyfile>
-		<copy file="appinfo.properties" todir="${build.classes.dir}" />
-	</target>
 </project>

buildnumber.properties

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Wed Aug 14 15:57:37 CEST 2013
+#Tue Jan 14 20:43:15 CET 2014
-build.number=460
+build.number=698

nbproject/build-impl.xml

@@ -18,7 +18,7 @@ is divided into following sections:
   - applet
   - cleanup
 
-        -->
+-->
 <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="TotalFreedomMod-impl">
     <fail message="Please build using Ant 1.8.0 or higher.">
         <condition>
@@ -29,10 +29,10 @@ is divided into following sections:
     </fail>
     <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
     <!-- 
-                ======================
+        ======================
-                INITIALIZATION SECTION 
+        INITIALIZATION SECTION 
-                ======================
+        ======================
-            -->
+    -->
     <target name="-pre-init">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
@@ -645,8 +645,8 @@ is divided into following sections:
     </target>
     <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
     <!--
-                pre NB7.2 profiling section; consider it deprecated
+        pre NB7.2 profiling section; consider it deprecated
-            -->
+    -->
     <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
     <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
         <!-- Empty placeholder for easier customization. -->
@@ -693,8 +693,8 @@ is divided into following sections:
         <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
     </target>
     <!--
-                end of pre NB7.2 profiling section
+        end of pre NB7.2 profiling section
-            -->
+    -->
     <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
         <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
             <attribute default="${main.class}" name="name"/>
@@ -854,10 +854,10 @@ is divided into following sections:
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
     <!--
-                ===================
+        ===================
-                COMPILATION SECTION
+        COMPILATION SECTION
-                ===================
+        ===================
-            -->
+    -->
     <target name="-deps-jar-init" unless="built-jar.properties">
         <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
         <delete file="${built-jar.properties}" quiet="true"/>
@@ -928,10 +928,10 @@ is divided into following sections:
     </target>
     <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
     <!--
-                ====================
+        ====================
-                JAR BUILDING SECTION
+        JAR BUILDING SECTION
-                ====================
+        ====================
-            -->
+    -->
     <target depends="init" name="-pre-pre-jar">
         <dirname file="${dist.jar}" property="dist.jar.dir"/>
         <mkdir dir="${dist.jar.dir}"/>
@@ -1000,10 +1000,10 @@ is divided into following sections:
     </target>
     <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
     <!--
-                =================
+        =================
-                EXECUTION SECTION
+        EXECUTION SECTION
-                =================
+        =================
-            -->
+    -->
     <target depends="init,compile" description="Run a main class." name="run">
         <j2seproject1:java>
             <customize>
@@ -1023,10 +1023,10 @@ is divided into following sections:
         <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
     </target>
     <!--
-                =================
+        =================
-                DEBUGGING SECTION
+        DEBUGGING SECTION
-                =================
+        =================
-            -->
+    -->
     <target depends="init" if="netbeans.home" name="-debug-start-debugger">
         <j2seproject1:nbjpdastart name="${debug.class}"/>
     </target>
@@ -1064,13 +1064,13 @@ is divided into following sections:
     </target>
     <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
     <!--
-                =================
+        =================
-                PROFILING SECTION
+        PROFILING SECTION
-                =================
+        =================
-            -->
+    -->
     <!--
-                pre NB7.2 profiler integration
+        pre NB7.2 profiler integration
-            -->
+    -->
     <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
         <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
         <nbprofiledirect>
@@ -1127,8 +1127,8 @@ is divided into following sections:
         </junit>
     </target>
     <!--
-                end of pre NB72 profiling section
+        end of pre NB72 profiling section
-            -->
+    -->
     <target if="netbeans.home" name="-profile-check">
         <condition property="profiler.configured">
             <or>
@@ -1163,10 +1163,10 @@ is divided into following sections:
         <antcall target="run-applet"/>
     </target>
     <!--
-                ===============
+        ===============
-                JAVADOC SECTION
+        JAVADOC SECTION
-                ===============
+        ===============
-            -->
+    -->
     <target depends="init" if="have.sources" name="-javadoc-build">
         <mkdir dir="${dist.javadoc.dir}"/>
         <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
@@ -1204,10 +1204,10 @@ is divided into following sections:
     </target>
     <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
     <!--
-                =========================
+        =========================
-                TEST COMPILATION SECTION
+        TEST COMPILATION SECTION
-                =========================
+        =========================
-            -->
+    -->
     <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
         <mkdir dir="${build.test.classes.dir}"/>
     </target>
@@ -1243,10 +1243,10 @@ is divided into following sections:
     </target>
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
     <!--
-                =======================
+        =======================
-                TEST EXECUTION SECTION
+        TEST EXECUTION SECTION
-                =======================
+        =======================
-            -->
+    -->
     <target depends="init" if="have.tests" name="-pre-test-run">
         <mkdir dir="${build.test.results.dir}"/>
     </target>
@@ -1280,10 +1280,10 @@ is divided into following sections:
     </target>
     <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
     <!--
-                =======================
+        =======================
-                TEST DEBUGGING SECTION
+        TEST DEBUGGING SECTION
-                =======================
+        =======================
-            -->
+    -->
     <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
         <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
         <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
@@ -1303,10 +1303,10 @@ is divided into following sections:
     </target>
     <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
     <!--
-                =========================
+        =========================
-                APPLET EXECUTION SECTION
+        APPLET EXECUTION SECTION
-                =========================
+        =========================
-            -->
+    -->
     <target depends="init,compile-single" name="run-applet">
         <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
         <j2seproject1:java classname="sun.applet.AppletViewer">
@@ -1316,10 +1316,10 @@ is divided into following sections:
         </j2seproject1:java>
     </target>
     <!--
-                =========================
+        =========================
-                APPLET DEBUGGING  SECTION
+        APPLET DEBUGGING  SECTION
-                =========================
+        =========================
-            -->
+    -->
     <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
         <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
         <j2seproject3:debug classname="sun.applet.AppletViewer">
@@ -1330,10 +1330,10 @@ is divided into following sections:
     </target>
     <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
     <!--
-                ===============
+        ===============
-                CLEANUP SECTION
+        CLEANUP SECTION
-                ===============
+        ===============
-            -->
+    -->
     <target name="-deps-clean-init" unless="built-clean.properties">
         <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
         <delete file="${built-clean.properties}" quiet="true"/>

nbproject/project.properties

@@ -4,7 +4,7 @@ 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
@@ -50,7 +50,9 @@ jar.index=${jnlp.enabled}
 javac.classpath=\
     ${libs.CraftBukkit.classpath}:\
     ${libs.WorldEdit.classpath}:\
-    ${libs.DisguiseCraft.classpath}
+    ${libs.DisguiseCraft.classpath}:\
+    ${libs.Essentials.classpath}:\
+    ${libs.BukkitTelnet.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
 javac.deprecation=false
@@ -83,10 +85,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/config.yml

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

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

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

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

@@ -1,8 +1,8 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -21,13 +21,13 @@ 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 player : server.getOnlinePlayers())
             {

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

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

src/me/StevenLawson/TotalFreedomMod/Commands/Command_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,6 +21,32 @@ public class Command_cage extends TFM_Command
             return false;
         }
 
+        if (TFM_Util.isStopCommand(args[0]) && sender instanceof Player)
+        {
+            TFM_Util.adminAction(sender.getName(), "Uncaging " + sender.getName(), true);
+            TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(sender_p);
+
+            playerdata.setCaged(false);
+            playerdata.regenerateHistory();
+            playerdata.clearHistory();
+
+            return true;
+        }
+        else if ("purge".equalsIgnoreCase(args[0]))
+        {
+            TFM_Util.adminAction(sender.getName(), "Uncaging all players.", true);
+
+            for (Player player : server.getOnlinePlayers())
+            {
+                TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
+                playerdata.setCaged(false);
+                playerdata.regenerateHistory();
+                playerdata.clearHistory();
+            }
+
+            return true;
+        }
+
         Player player;
         try
         {
@@ -34,13 +60,14 @@ public class Command_cage extends TFM_Command
 
         TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
 
-        Material cage_material_outer = Material.GLASS;
+        Material outerMaterial = Material.GLASS;
-        Material cage_material_inner = Material.AIR;
+        Material innerMaterial = Material.AIR;
+
         if (args.length >= 2)
         {
             if (TFM_Util.isStopCommand(args[1]))
             {
-                TFM_Util.adminAction(sender.getName(), "Uncaging " + player.getName() + ".", true);
+                TFM_Util.adminAction(sender.getName(), "Uncaging " + player.getName(), true);
 
                 playerdata.setCaged(false);
                 playerdata.regenerateHistory();
@@ -50,10 +77,13 @@ public class Command_cage extends TFM_Command
             }
             else
             {
-                cage_material_outer = Material.matchMaterial(args[1]);
+                if ("darth".equalsIgnoreCase(args[1]))
-                if (cage_material_outer == null)
                 {
-                    cage_material_outer = Material.GLASS;
+                    outerMaterial = Material.SKULL;
+                }
+                else if (Material.matchMaterial(args[1]) != null)
+                {
+                    outerMaterial = Material.matchMaterial(args[1]);
                 }
             }
         }
@@ -62,25 +92,32 @@ public class Command_cage extends TFM_Command
         {
             if (args[2].equalsIgnoreCase("water"))
             {
-                cage_material_inner = Material.STATIONARY_WATER;
+                innerMaterial = Material.STATIONARY_WATER;
             }
             else if (args[2].equalsIgnoreCase("lava"))
             {
-                cage_material_inner = Material.STATIONARY_LAVA;
+                innerMaterial = Material.STATIONARY_LAVA;
             }
         }
 
-        Location targetPos = player.getLocation().add(0, 1, 0);
+        Location targetPos = player.getLocation().clone().add(0, 1, 0);
-        playerdata.setCaged(true, targetPos, cage_material_outer, cage_material_inner);
+        playerdata.setCaged(true, targetPos, outerMaterial, innerMaterial);
         playerdata.regenerateHistory();
         playerdata.clearHistory();
         TFM_Util.buildHistory(targetPos, 2, playerdata);
-        TFM_Util.generateCube(targetPos, 2, playerdata.getCageMaterial(TFM_PlayerData.CageLayer.OUTER));
+        TFM_Util.generateHollowCube(targetPos, 2, outerMaterial);
-        TFM_Util.generateCube(targetPos, 1, playerdata.getCageMaterial(TFM_PlayerData.CageLayer.INNER));
+        TFM_Util.generateCube(targetPos, 1, innerMaterial);
 
         player.setGameMode(GameMode.SURVIVAL);
 
-        TFM_Util.adminAction(sender.getName(), "Caging " + player.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_cbtool.java

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

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

@@ -5,7 +5,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import org.apache.commons.lang.StringUtils;
+import net.minecraft.util.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_cmdspy.java

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.StringUtils;
+import net.minecraft.util.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_debug.java

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

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

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

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

@@ -3,7 +3,7 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 import java.util.ArrayList;
 import java.util.List;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.StringUtils;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_UserList;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.apache.commons.lang.StringUtils;
+import net.minecraft.util.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_fireplace.java

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

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

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

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

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

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

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

@@ -12,7 +12,7 @@ import org.bukkit.entity.Player;
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 @CommandParameters(
         description = "Use admin commands on someone by hash. Use mode 'list' to get a player's hash. Other modes are kick, nameban, ipban, ban, op, deop, ci",
-        usage = "/<command> [list | [<kick | nameban | ipban | ban | op | deop | ci> <targethash>] ]")
+        usage = "/<command> [list | [<kick | nameban | ipban | ban | op | deop | ci | fr> <targethash>] ]")
 public class Command_gadmin extends TFM_Command
 {
     @Override

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

@@ -7,7 +7,7 @@ import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_UserList;
 import me.StevenLawson.TotalFreedomMod.TFM_UserList.TFM_UserListEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.StringUtils;
+import net.minecraft.util.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_gtfo.java

@@ -4,8 +4,8 @@ import me.StevenLawson.TotalFreedomMod.TFM_RollbackManager;
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TFM_WorldEditBridge;
-import org.apache.commons.lang.ArrayUtils;
+import net.minecraft.util.org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.Location;

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

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.StringUtils;
+import net.minecraft.util.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_landmine.java

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

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

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -17,16 +17,7 @@ public class Command_lavadmg extends TFM_Command
             return false;
         }
 
-        if (args[0].equalsIgnoreCase("on"))
+        playerMsg("Lava damage is now " + (TFM_ConfigEntry.ALLOW_LAVA_DAMAGE.setBoolean(!args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + ".");
-        {
-            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,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -17,16 +17,7 @@ public class Command_lavaplace extends TFM_Command
             return false;
         }
 
-        if (args[0].equalsIgnoreCase("on"))
+        playerMsg("Lava placement is now " + (TFM_ConfigEntry.ALLOW_LAVA_PLACE.setBoolean(!args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + ".");
-        {
-            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,72 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.util.ArrayList;
 import java.util.List;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerRank;
+
+import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
 import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.apache.commons.lang.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]", aliases = "who")
 public class Command_list extends TFM_Command
 {
     private static enum ListFilter
     {
-        SHOW_ALL, SHOW_ADMINS
+        ALL,
+        ADMINS;
     }
 
     @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>();
+            final List<String> names = new ArrayList<String>();
             for (Player player : server.getOnlinePlayers())
             {
-                player_names.add(player.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;
+        final Command_list.ListFilter listFilter = (args.length == 1 && args[0].equals("-a") ? Command_list.ListFilter.ADMINS : Command_list.ListFilter.ALL);
-        if (args.length >= 1)
-        {
-            if (args[0].equalsIgnoreCase("-a"))
-            {
-                listFilter = ListFilter.SHOW_ADMINS;
-            }
-        }
 
-        StringBuilder onlineStats = new StringBuilder();
+        final StringBuilder onlineStats = new StringBuilder();
-        StringBuilder onlineUsers = 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(" out of a maximum ").append(ChatColor.RED).append(server.getMaxPlayers());
         onlineStats.append(ChatColor.BLUE).append(" players online.");
 
-        List<String> player_names = new ArrayList<String>();
+        final List<String> names = new ArrayList<String>();
         for (Player player : server.getOnlinePlayers())
         {
-            boolean userSuperadmin = TFM_SuperadminList.isUserSuperadmin(player);
+            final boolean userSuperadmin = TFM_SuperadminList.isUserSuperadmin(player);
 
-            if (listFilter == ListFilter.SHOW_ADMINS && !userSuperadmin)
+            if (listFilter == Command_list.ListFilter.ADMINS && !userSuperadmin)
             {
                 continue;
             }
 
-            String prefix = "";
+            names.add(TFM_PlayerRank.fromSender(player).getPrefix() + player.getName());
-
-            if (userSuperadmin)
-            {
-                if (TFM_SuperadminList.isSeniorAdmin(player))
-                {
-                    prefix = (ChatColor.LIGHT_PURPLE + "[SrA]");
-                }
-                else
-                {
-                    prefix = (ChatColor.GOLD + "[SA]");
-                }
-
-                if (TFM_Util.DEVELOPERS.contains(player.getName()))
-                {
-                    prefix = (ChatColor.DARK_PURPLE + "[Dev]");
-                }
-
-                if (player.getName().equals("markbyron"))
-                {
-                    prefix = (ChatColor.BLUE + "[Owner]");
-                }
-            }
-            else
-            {
-                if (player.isOp())
-                {
-                    prefix = (ChatColor.RED + "[OP]");
-                }
-            }
-
-            player_names.add(prefix + player.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_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_logs.java

@@ -9,11 +9,12 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_Log;
 import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.apache.commons.lang3.StringUtils;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -46,12 +47,10 @@ public class Command_logs extends TFM_Command
 
     public static void updateLogsRegistration(final CommandSender sender, final String targetName, final String targetIP, final LogsRegistrationMode mode)
     {
-        if (TotalFreedomMod.logsRegisterURL == null || TotalFreedomMod.logsRegisterPassword == null)
+        final String logsRegisterURL = TFM_ConfigEntry.LOGS_REGISTER_URL.getString();
-        {
+        final String logsRegisterPassword = TFM_ConfigEntry.LOGS_REGISTER_PASSWORD.getString();
-            return;
-        }
 
-        if (TotalFreedomMod.logsRegisterPassword.isEmpty() || TotalFreedomMod.logsRegisterURL.isEmpty())
+        if (logsRegisterURL == null || logsRegisterPassword == null || logsRegisterURL.isEmpty() || logsRegisterPassword.isEmpty())
         {
             return;
         }
@@ -68,9 +67,9 @@ public class Command_logs extends TFM_Command
                         sender.sendMessage(ChatColor.YELLOW + "Connecting...");
                     }
 
-                    URL url = new URLBuilder(TotalFreedomMod.logsRegisterURL)
+                    URL url = new URLBuilder(logsRegisterURL)
                             .addQueryParameter("mode", mode.toString())
-                            .addQueryParameter("password", TotalFreedomMod.logsRegisterPassword)
+                            .addQueryParameter("password", logsRegisterPassword)
                             .addQueryParameter("name", targetName)
                             .addQueryParameter("ip", targetIP)
                             .getURL();

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

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

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

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

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

@@ -5,7 +5,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.apache.commons.lang.StringUtils;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -44,24 +44,24 @@ public class Command_permban extends TFM_Command
 
     private void dumplist(CommandSender sender)
     {
-        if (TotalFreedomMod.permbanned_players.isEmpty())
+        if (TotalFreedomMod.permbannedPlayers.isEmpty())
         {
             playerMsg(sender, "No permanently banned player names.");
         }
         else
         {
-            playerMsg(sender, TotalFreedomMod.permbanned_players.size() + " permanently banned players:");
+            playerMsg(sender, TotalFreedomMod.permbannedPlayers.size() + " permanently banned players:");
-            playerMsg(sender, StringUtils.join(TotalFreedomMod.permbanned_players, ", "));
+            playerMsg(sender, StringUtils.join(TotalFreedomMod.permbannedPlayers, ", "));
         }
 
-        if (TotalFreedomMod.permbanned_ips.isEmpty())
+        if (TotalFreedomMod.permbannedIps.isEmpty())
         {
             playerMsg(sender, "No permanently banned IPs.");
         }
         else
         {
-            playerMsg(sender, TotalFreedomMod.permbanned_ips.size() + " permanently banned IPs:");
+            playerMsg(sender, TotalFreedomMod.permbannedIps.size() + " permanently banned IPs:");
-            playerMsg(sender, StringUtils.join(TotalFreedomMod.permbanned_ips, ", "));
+            playerMsg(sender, StringUtils.join(TotalFreedomMod.permbannedIps, ", "));
         }
     }
 }

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

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

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

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import org.apache.commons.lang.StringUtils;
+import net.minecraft.util.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_potion.java

@@ -5,7 +5,7 @@ import java.util.List;
 import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.apache.commons.lang.StringUtils;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

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

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

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

@@ -5,7 +5,6 @@ import java.io.InputStreamReader;
 import java.net.URL;
 import java.net.URLConnection;
 import me.StevenLawson.TotalFreedomMod.TFM_Log;
-import org.apache.commons.lang.exception.ExceptionUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -33,7 +32,7 @@ public class Command_premium extends TFM_Command
         {
             name = args[0];
         }
-        
+
         final String playername = name;
         new BukkitRunnable()
         {
@@ -61,12 +60,12 @@ public class Command_premium extends TFM_Command
                 }
                 catch (Exception ex)
                 {
-                    TFM_Log.severe(ExceptionUtils.getStackTrace(ex));
+                    TFM_Log.severe(ex);
                     playerMsg("There was an error querying the mojang server.", ChatColor.RED);
                 }
             }
         }.runTaskAsynchronously(plugin);
-        
+
         return true;
     }
 }

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

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

src/me/StevenLawson/TotalFreedomMod/Commands/Command_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;
@@ -17,7 +17,7 @@ public class Command_rank extends TFM_Command
         {
             for (Player player : server.getOnlinePlayers())
             {
-                playerMsg(player.getName() + " is " + TFM_Util.getRank(player));
+                playerMsg(player.getName() + " is " + TFM_PlayerRank.fromSender(player).getLoginMessage());
             }
             return true;
         }
@@ -29,7 +29,7 @@ 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;
         }
 
@@ -44,7 +44,7 @@ public class Command_rank extends TFM_Command
             return true;
         }
 
-        playerMsg(player.getName() + " is " + TFM_Util.getRank(player), ChatColor.AQUA);
+        playerMsg(player.getName() + " is " + TFM_PlayerRank.fromSender(player).getLoginMessage(), ChatColor.AQUA);
 
         return true;
     }

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

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

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

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

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

@@ -1,11 +1,12 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
 import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_TwitterHandler;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.apache.commons.lang.StringUtils;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -26,7 +27,7 @@ public class Command_saconfig extends TFM_Command
             }
             else
             {
-                if (!TFM_SuperadminList.isSeniorAdmin(sender))
+                if (!TFM_SuperadminList.isSeniorAdmin(sender, true))
                 {
                     playerMsg(TotalFreedomMod.MSG_NO_PERMS);
                     return true;
@@ -77,7 +78,7 @@ public class Command_saconfig extends TFM_Command
                 }
                 else
                 {
-                    playerMsg(ChatColor.stripColor(TFM_Util.colorise(superadmin.toString())));
+                    playerMsg(ChatColor.stripColor(TFM_Util.colorize(superadmin.toString())));
                 }
 
                 return true;
@@ -123,7 +124,7 @@ public class Command_saconfig extends TFM_Command
                     TFM_SuperadminList.addSuperadmin(admin_name);
                 }
             }
-            else if (args[0].equalsIgnoreCase("delete") || args[0].equalsIgnoreCase("del") || args[0].equalsIgnoreCase("remove"))
+            else if (TFM_Util.isRemoveCommand(args[0]))
             {
                 if (!TFM_SuperadminList.isSeniorAdmin(sender))
                 {
@@ -150,43 +151,11 @@ public class Command_saconfig extends TFM_Command
                 TFM_Util.adminAction(sender.getName(), "Removing " + targetName + " from the superadmin list", true);
                 TFM_SuperadminList.removeSuperadmin(targetName);
 
-                if (!TotalFreedomMod.twitterbotEnabled)
-                {
-                    return true;
-                }
-
                 // Twitterbot
-                TFM_TwitterHandler twitterbot = TFM_TwitterHandler.getInstance(plugin);
+                if (TFM_ConfigEntry.TWITTERBOT_ENABLED.getBoolean())
-                String reply = twitterbot.delTwitter(targetName);
-                if ("ok".equals(reply))
                 {
-                    TFM_Util.adminAction(sender.getName(), "Removing " + targetName + " from TwitterBot", true);
+                    TFM_TwitterHandler.getInstance().delTwitterVerbose(targetName, sender);
                 }
-                else if ("disabled".equals(reply))
-                {
-                    TFM_Util.playerMsg(sender, "Warning: Could not check if player has a twitter handle!");
-                    TFM_Util.playerMsg(sender, "TwitterBot has been temporarily disabled, please wait until it gets 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, targetName + " did not have a twitter handle registered to their name.", ChatColor.GREEN);
-                }
-
             }
             else
             {

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

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

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

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_ServiceChecker;
-import me.StevenLawson.TotalFreedomMod.TFM_ServiceChecker.TFM_ServiceChecker_ServiceStatus;
+import me.StevenLawson.TotalFreedomMod.TFM_ServiceChecker.ServiceStatus;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -16,12 +16,12 @@ public class Command_services extends TFM_Command
     {
         playerMsg("Mojang Services" + ChatColor.WHITE + ":", ChatColor.BLUE);
 
-        for (TFM_ServiceChecker_ServiceStatus service : TFM_ServiceChecker.getInstance().getAllStatuses())
+        for (ServiceStatus service : TFM_ServiceChecker.getInstance().getAllStatuses())
         {
             playerMsg(service.getFormattedStatus());
         }
-        playerMsg("Version" + ChatColor.WHITE + ": " + TFM_ServiceChecker.getInstance().version, ChatColor.DARK_PURPLE);
+        playerMsg("Version" + ChatColor.WHITE + ": " + TFM_ServiceChecker.getInstance().getVersion(), ChatColor.DARK_PURPLE);
-        playerMsg("Last Check" + ChatColor.WHITE + ": " + TFM_ServiceChecker.getInstance().lastCheck, ChatColor.DARK_PURPLE);
+        playerMsg("Last Check" + ChatColor.WHITE + ": " + TFM_ServiceChecker.getInstance().getLastCheck(), ChatColor.DARK_PURPLE);
 
         return true;
     }

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

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

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

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

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

@@ -63,9 +63,9 @@ public class Command_tag extends TFM_Command
                 return true;
             }
 
-            if (args[0].length() > 15)
+            if (ChatColor.stripColor(TFM_Util.colorize(args[0])).length() > 20)
             {
-                playerMsg("That tag is too long.");
+                playerMsg("That tag is too long [Max = 20 characters, not including color codes].");
                 return true;
             }
 

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

@@ -3,12 +3,13 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.ChatColor;
+import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Temporarily bans a player for five minutes.", usage = "/<command> <partialname>", aliases = "nope")
+@CommandParameters(description = "Temporarily bans a player for five minutes.", usage = "/<command> <partialname>", aliases = "noob")
 public class Command_tban extends TFM_Command
 {
     @Override
@@ -30,10 +31,21 @@ public class Command_tban extends TFM_Command
             return true;
         }
 
-        TFM_Util.adminAction(sender.getName(), "NOPE: " + player.getName(), true);
+
-        TFM_ServerInterface.banUsername(player.getName(), ChatColor.RED + "You have been temporarily banned for 5 minutes",
+        // strike with lightning effect:
-                sender.getName(), TFM_Util.parseDateOffset("5m"));
+        final Location targetPos = player.getLocation();
-        player.kickPlayer(ChatColor.RED + "NOPE!\nYou have been temporarily banned for five minutes.");
+        for (int x = -1; x <= 1; x++)
+        {
+            for (int z = -1; z <= 1; z++)
+            {
+                final Location strike_pos = new Location(targetPos.getWorld(), targetPos.getBlockX() + x, targetPos.getBlockY(), targetPos.getBlockZ() + z);
+                targetPos.getWorld().strikeLightning(strike_pos);
+            }
+        }
+
+        TFM_Util.adminAction(sender.getName(), "Tempbanning: " + player.getName() + " for 5 minutes.", true);
+        TFM_ServerInterface.banUsername(player.getName(), ChatColor.RED + "You have been temporarily banned for 5 minutes.", sender.getName(), TFM_Util.parseDateOffset("5m"));
+        player.kickPlayer(ChatColor.RED + "You have been temporarily banned for five minutes. Please read totalfreedom.me for more info.");
 
         return true;
     }

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

@@ -4,12 +4,13 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.ArrayUtils;
+import net.minecraft.util.org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.Location;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 @CommandParameters(description = "Temporarily ban someone.", usage = "/<command> [playername] [duration] [reason]")
@@ -56,6 +57,18 @@ public class Command_tempban extends TFM_Command
             bcast_msg.append(", Reason: \"").append(ban_reason).append("\"");
         }
 
+
+        // strike with lightning effect:
+        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(targetPos.getWorld(), targetPos.getBlockX() + x, targetPos.getBlockY(), targetPos.getBlockZ() + z);
+                targetPos.getWorld().strikeLightning(strike_pos);
+            }
+        }
+
         TFM_Util.adminAction(sender.getName(), bcast_msg.toString(), true);
         TFM_ServerInterface.banUsername(player.getName(), ban_reason, sender.getName(), ban_duration);
         TFM_ServerInterface.banIP(player.getAddress().getAddress().getHostAddress().trim(), ban_reason, sender.getName(), ban_duration);

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

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

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

@@ -105,4 +105,27 @@ public class Command_trail extends TFM_Command
         }
         return null;
     }
+
+    public static void startTrail(Player player)
+    {
+        if (!trailPlayers.contains(player))
+        {
+            trailPlayers.add(player);
+        }
+
+        if (!trailPlayers.isEmpty())
+        {
+            registerMovementHandler();
+        }
+    }
+
+    public static void stopTrail(Player player)
+    {
+        trailPlayers.remove(player);
+
+        if (trailPlayers.isEmpty())
+        {
+            unregisterMovementHandler();
+        }
+    }
 }

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

@@ -1,5 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_TwitterHandler;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
@@ -15,7 +16,7 @@ public class Command_twitter extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        if (!TotalFreedomMod.twitterbotEnabled)
+        if (!TFM_ConfigEntry.TWITTERBOT_ENABLED.getBoolean())
         {
             TFM_Util.playerMsg(sender, "TwitterBot has been disabled in config.", ChatColor.RED);
             return true;
@@ -26,7 +27,7 @@ public class Command_twitter extends TFM_Command
             return false;
         }
 
-        TFM_TwitterHandler twitterbot = TFM_TwitterHandler.getInstance(plugin);
+        TFM_TwitterHandler twitterbot = TFM_TwitterHandler.getInstance();
 
         if ("set".equals(args[0]))
         {

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

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -12,22 +12,12 @@ public class Command_waterplace 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"))
+        playerMsg("Water placement is now " + (TFM_ConfigEntry.ALLOW_WATER_PLACE.setBoolean(!args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + ".");
-        {
-            TotalFreedomMod.allowWaterPlace = true;
-            playerMsg("Water placement is now enabled.");
-        }
-        else
-        {
-            TotalFreedomMod.allowWaterPlace = false;
-            playerMsg("Water placement is now disabled.");
-        }
 
         return true;
     }

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

@@ -104,7 +104,7 @@ public class Command_whitelist extends TFM_Command
         }
 
         // remove
-        if (args[0].equalsIgnoreCase("remove"))
+        if (TFM_Util.isRemoveCommand(args[0]))
         {
             if (args.length < 2)
             {

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

@@ -3,7 +3,7 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 import java.util.ArrayList;
 import java.util.List;
 import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
-import org.apache.commons.lang.StringUtils;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.command.Command;

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

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

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

@@ -46,26 +46,11 @@ public class TFM_CommandLoader
 
         for (TFM_CommandInfo commandInfo : commandList)
         {
-            String description = commandInfo.getDescription();
+            TFM_DynamicCommand dynamicCommand = new TFM_DynamicCommand(commandInfo);
-            switch (commandInfo.getLevel())
-            {
-                case SENIOR:
-                    description = "Senior " + (commandInfo.getSource() == SourceType.ONLY_CONSOLE ? "Console" : "") + " Command - " + description;
-                    break;
-                case SUPER:
-                    description = "Superadmin Command - " + description;
-                    break;
-                case OP:
-                    description = "OP Command - " + description;
-                    break;
-            }
-
-            TFM_DynamicCommand dynamicCommand = new TFM_DynamicCommand(commandInfo.getCommandName(), description, commandInfo.getUsage(), commandInfo.getAliases());
 
             Command existing = commandMap.getCommand(dynamicCommand.getName());
             if (existing != null)
             {
-                TFM_Log.info("Replacing command: " + existing.getName());
                 unregisterCommand(existing, commandMap);
             }
 
@@ -192,7 +177,7 @@ public class TFM_CommandLoader
         return commandList;
     }
 
-    private static class TFM_CommandInfo
+    public static class TFM_CommandInfo
     {
         private final String commandName;
         private final Class<?> commandClass;
@@ -235,6 +220,26 @@ public class TFM_CommandLoader
             return description;
         }
 
+        public String getDescriptionPermissioned()
+        {
+            String _description = description;
+
+            switch (this.getLevel())
+            {
+                case SENIOR:
+                    _description = "Senior " + (this.getSource() == SourceType.ONLY_CONSOLE ? "Console" : "") + " Command - " + _description;
+                    break;
+                case SUPER:
+                    _description = "Superadmin Command - " + _description;
+                    break;
+                case OP:
+                    _description = "OP Command - " + _description;
+                    break;
+            }
+
+            return _description;
+        }
+
         public AdminLevel getLevel()
         {
             return level;
@@ -271,11 +276,15 @@ public class TFM_CommandLoader
         }
     }
 
-    private class TFM_DynamicCommand extends Command implements PluginIdentifiableCommand
+    public class TFM_DynamicCommand extends Command implements PluginIdentifiableCommand
     {
-        public TFM_DynamicCommand(String commandName, String description, String usage, List<String> aliases)
+        private final TFM_CommandInfo commandInfo;
+
+        private TFM_DynamicCommand(TFM_CommandInfo commandInfo)
         {
-            super(commandName, description, usage, aliases);
+            super(commandInfo.getCommandName(), commandInfo.getDescriptionPermissioned(), commandInfo.getUsage(), commandInfo.getAliases());
+
+            this.commandInfo = commandInfo;
         }
 
         @Override
@@ -313,6 +322,11 @@ public class TFM_CommandLoader
         {
             return TotalFreedomMod.plugin;
         }
+
+        public TFM_CommandInfo getCommandInfo()
+        {
+            return commandInfo;
+        }
     }
 
     public static TFM_CommandLoader getInstance()

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

@@ -0,0 +1,59 @@
+package me.StevenLawson.TotalFreedomMod.HTTPD;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
+import static net.minecraft.util.org.apache.commons.lang3.StringEscapeUtils.*;
+
+public class HTMLGenerationTools
+{
+    private HTMLGenerationTools()
+    {
+        throw new AssertionError();
+    }
+
+    public static String paragraph(String data)
+    {
+        return "<p>" + escapeHtml4(data) + "</p>\r\n";
+    }
+
+    public static String heading(String data, int level)
+    {
+        return "<h" + level + ">" + escapeHtml4(data) + "</h" + level + ">\r\n";
+    }
+
+    public static <K, V> String list(Map<K, V> map)
+    {
+        StringBuilder output = new StringBuilder();
+
+        output.append("<ul>\r\n");
+
+        Iterator<Map.Entry<K, V>> it = map.entrySet().iterator();
+        while (it.hasNext())
+        {
+            Map.Entry<K, V> entry = it.next();
+            output.append("<li>").append(escapeHtml4(entry.getKey().toString() + " = " + entry.getValue().toString())).append("</li>\r\n");
+        }
+
+        output.append("</ul>\r\n");
+
+        return output.toString();
+    }
+
+    public static <T> String list(Collection<T> list)
+    {
+        StringBuilder output = new StringBuilder();
+
+        output.append("<ul>\r\n");
+
+        for (T entry : list)
+        {
+            output.append("<li>").append(escapeHtml4(entry.toString())).append("</li>\r\n");
+        }
+
+        output.append("</ul>\r\n");
+
+        return output.toString();
+    }
+}

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

@@ -0,0 +1,111 @@
+package me.StevenLawson.TotalFreedomMod.HTTPD;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
+import net.minecraft.util.org.apache.commons.io.FileUtils;
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
+
+import static me.StevenLawson.TotalFreedomMod.HTTPD.HTMLGenerationTools.*;
+
+public class Module_dump extends TFM_HTTPD_Module
+{
+    private File echoFile = null;
+    private final String body;
+
+    public Module_dump(NanoHTTPD.HTTPSession session)
+    {
+        super(session);
+
+        //Body needs to be computed before getResponse, so we know if a text response or a file echo is needed.
+        this.body = body();
+    }
+
+    @Override
+    public NanoHTTPD.Response getResponse()
+    {
+        String echo = params.get("echo");
+        boolean doEcho = echo != null && ((echo = echo.toLowerCase().trim()).equalsIgnoreCase("true") || echo.equalsIgnoreCase("1"));
+
+        if (doEcho && this.echoFile != null && this.echoFile.exists())
+        {
+            return TFM_HTTPD_Manager.serveFileBasic(this.echoFile);
+        }
+        else
+        {
+            return super.getResponse();
+        }
+    }
+
+    @Override
+    public String getBody()
+    {
+        return body;
+    }
+
+    private String body()
+    {
+        StringBuilder responseBody = new StringBuilder();
+
+        String remoteAddress = socket.getInetAddress().getHostAddress();
+
+        String[] args = StringUtils.split(uri, "/");
+
+        Map<String, String> files = getFiles();
+
+        responseBody
+                .append(paragraph("URI: " + uri))
+                .append(paragraph("args (Length: " + args.length + "): " + StringUtils.join(args, ",")))
+                .append(paragraph("Method: " + method.toString()))
+                .append(paragraph("Remote Address: " + remoteAddress))
+                .append(paragraph("Headers:"))
+                .append(list(headers))
+                .append(paragraph("Params:"))
+                .append(list(params))
+                .append(paragraph("Files:"))
+                .append(list(files));
+
+        Iterator<Map.Entry<String, String>> it = files.entrySet().iterator();
+        while (it.hasNext())
+        {
+            Map.Entry<String, String> entry = it.next();
+            String formName = entry.getKey();
+            String tempFileName = entry.getValue();
+            String origFileName = params.get(formName);
+
+            File tempFile = new File(tempFileName);
+            if (tempFile.exists())
+            {
+                this.echoFile = tempFile;
+
+                if (origFileName.contains("../"))
+                {
+                    continue;
+                }
+
+                String targetFileName = "./public_html/uploads/" + origFileName;
+
+                File targetFile = new File(targetFileName);
+
+                try
+                {
+                    FileUtils.copyFile(tempFile, targetFile);
+                }
+                catch (IOException ex)
+                {
+                    TFM_Log.severe(ex);
+                }
+            }
+        }
+
+        return responseBody.toString();
+    }
+
+    @Override
+    public String getTitle()
+    {
+        return "TotalFreedomMod :: Request Debug Dumper";
+    }
+}

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

@@ -0,0 +1,364 @@
+package me.StevenLawson.TotalFreedomMod.HTTPD;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+
+import static me.StevenLawson.TotalFreedomMod.HTTPD.NanoHTTPD.*;
+
+/*
+ * This class was adapted from https://github.com/NanoHttpd/nanohttpd/blob/master/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java
+ */
+public class Module_file extends TFM_HTTPD_Module
+{
+    private final File rootDir = new File(TFM_ConfigEntry.HTTPD_PUBLIC_FOLDER.getString());
+    public static final Map<String, String> MIME_TYPES = new HashMap<String, String>();
+
+    static
+    {
+        MIME_TYPES.put("css", "text/css");
+        MIME_TYPES.put("htm", "text/html");
+        MIME_TYPES.put("html", "text/html");
+        MIME_TYPES.put("xml", "text/xml");
+        MIME_TYPES.put("java", "text/x-java-source, text/java");
+        MIME_TYPES.put("txt", "text/plain");
+        MIME_TYPES.put("asc", "text/plain");
+        MIME_TYPES.put("yml", "text/yaml");
+        MIME_TYPES.put("gif", "image/gif");
+        MIME_TYPES.put("jpg", "image/jpeg");
+        MIME_TYPES.put("jpeg", "image/jpeg");
+        MIME_TYPES.put("png", "image/png");
+        MIME_TYPES.put("mp3", "audio/mpeg");
+        MIME_TYPES.put("m3u", "audio/mpeg-url");
+        MIME_TYPES.put("mp4", "video/mp4");
+        MIME_TYPES.put("ogv", "video/ogg");
+        MIME_TYPES.put("flv", "video/x-flv");
+        MIME_TYPES.put("mov", "video/quicktime");
+        MIME_TYPES.put("swf", "application/x-shockwave-flash");
+        MIME_TYPES.put("js", "application/javascript");
+        MIME_TYPES.put("pdf", "application/pdf");
+        MIME_TYPES.put("doc", "application/msword");
+        MIME_TYPES.put("ogg", "application/x-ogg");
+        MIME_TYPES.put("zip", "application/octet-stream");
+        MIME_TYPES.put("exe", "application/octet-stream");
+        MIME_TYPES.put("class", "application/octet-stream");
+    }
+
+    public Module_file(NanoHTTPD.HTTPSession session)
+    {
+        super(session);
+    }
+
+    private File getRootDir()
+    {
+        return rootDir;
+    }
+
+    private String encodeUri(String uri)
+    {
+        String newUri = "";
+        StringTokenizer st = new StringTokenizer(uri, "/ ", true);
+        while (st.hasMoreTokens())
+        {
+            String tok = st.nextToken();
+            if (tok.equals("/"))
+            {
+                newUri += "/";
+            }
+            else if (tok.equals(" "))
+            {
+                newUri += "%20";
+            }
+            else
+            {
+                try
+                {
+                    newUri += URLEncoder.encode(tok, "UTF-8");
+                }
+                catch (UnsupportedEncodingException ignored)
+                {
+                }
+            }
+        }
+        return newUri;
+    }
+
+    private Response serveFile(String uri, Map<String, String> header, File homeDir)
+    {
+        Response res = null;
+
+        // Make sure we won't die of an exception later
+        if (!homeDir.isDirectory())
+        {
+            res = new Response(Response.Status.INTERNAL_ERROR, NanoHTTPD.MIME_PLAINTEXT, "INTERNAL ERRROR: serveFile(): given homeDir is not a directory.");
+        }
+
+        if (res == null)
+        {
+            // Remove URL arguments
+            uri = uri.trim().replace(File.separatorChar, '/');
+            if (uri.indexOf('?') >= 0)
+            {
+                uri = uri.substring(0, uri.indexOf('?'));
+            }
+
+            // Prohibit getting out of current directory
+            if (uri.startsWith("src/main") || uri.endsWith("src/main") || uri.contains("../"))
+            {
+                res = new Response(Response.Status.FORBIDDEN, NanoHTTPD.MIME_PLAINTEXT, "FORBIDDEN: Won't serve ../ for security reasons.");
+            }
+        }
+
+        File f = new File(homeDir, uri);
+        if (res == null && !f.exists())
+        {
+            res = new Response(Response.Status.NOT_FOUND, NanoHTTPD.MIME_PLAINTEXT, "Error 404, file not found.");
+        }
+
+        // List the directory, if necessary
+        if (res == null && f.isDirectory())
+        {
+            // Browsers get confused without '/' after the
+            // directory, send a redirect.
+            if (!uri.endsWith("/"))
+            {
+                uri += "/";
+                res = new Response(Response.Status.REDIRECT, NanoHTTPD.MIME_HTML, "<html><body>Redirected: <a href=\"" + uri + "\">" + uri
+                        + "</a></body></html>");
+                res.addHeader("Location", uri);
+            }
+
+            if (res == null)
+            {
+                // First try index.html and index.htm
+                if (new File(f, "index.html").exists())
+                {
+                    f = new File(homeDir, uri + "/index.html");
+                }
+                else if (new File(f, "index.htm").exists())
+                {
+                    f = new File(homeDir, uri + "/index.htm");
+                }
+                else if (f.canRead())
+                {
+                    // No index file, list the directory if it is readable
+                    res = new Response(listDirectory(uri, f));
+                }
+                else
+                {
+                    res = new Response(Response.Status.FORBIDDEN, NanoHTTPD.MIME_PLAINTEXT, "FORBIDDEN: No directory listing.");
+                }
+            }
+        }
+
+        try
+        {
+            if (res == null)
+            {
+                // Get MIME type from file name extension, if possible
+                String mime = null;
+                int dot = f.getCanonicalPath().lastIndexOf('.');
+                if (dot >= 0)
+                {
+                    mime = MIME_TYPES.get(f.getCanonicalPath().substring(dot + 1).toLowerCase());
+                }
+                if (mime == null)
+                {
+                    mime = TFM_HTTPD_Manager.MIME_DEFAULT_BINARY;
+                }
+
+                // Calculate etag
+                String etag = Integer.toHexString((f.getAbsolutePath() + f.lastModified() + "" + f.length()).hashCode());
+
+                // Support (simple) skipping:
+                long startFrom = 0;
+                long endAt = -1;
+                String range = header.get("range");
+                if (range != null)
+                {
+                    if (range.startsWith("bytes="))
+                    {
+                        range = range.substring("bytes=".length());
+                        int minus = range.indexOf('-');
+                        try
+                        {
+                            if (minus > 0)
+                            {
+                                startFrom = Long.parseLong(range.substring(0, minus));
+                                endAt = Long.parseLong(range.substring(minus + 1));
+                            }
+                        }
+                        catch (NumberFormatException ignored)
+                        {
+                        }
+                    }
+                }
+
+                // Change return code and add Content-Range header when skipping is requested
+                long fileLen = f.length();
+                if (range != null && startFrom >= 0)
+                {
+                    if (startFrom >= fileLen)
+                    {
+                        res = new Response(Response.Status.RANGE_NOT_SATISFIABLE, NanoHTTPD.MIME_PLAINTEXT, "");
+                        res.addHeader("Content-Range", "bytes 0-0/" + fileLen);
+                        res.addHeader("ETag", etag);
+                    }
+                    else
+                    {
+                        if (endAt < 0)
+                        {
+                            endAt = fileLen - 1;
+                        }
+                        long newLen = endAt - startFrom + 1;
+                        if (newLen < 0)
+                        {
+                            newLen = 0;
+                        }
+
+                        final long dataLen = newLen;
+                        FileInputStream fis = new FileInputStream(f)
+                        {
+                            @Override
+                            public int available() throws IOException
+                            {
+                                return (int) dataLen;
+                            }
+                        };
+                        fis.skip(startFrom);
+
+                        res = new Response(Response.Status.PARTIAL_CONTENT, mime, fis);
+                        res.addHeader("Content-Length", "" + dataLen);
+                        res.addHeader("Content-Range", "bytes " + startFrom + "-" + endAt + "/" + fileLen);
+                        res.addHeader("ETag", etag);
+                    }
+                }
+                else
+                {
+                    if (etag.equals(header.get("if-none-match")))
+                    {
+                        res = new Response(Response.Status.NOT_MODIFIED, mime, "");
+                    }
+                    else
+                    {
+                        res = new Response(Response.Status.OK, mime, new FileInputStream(f));
+                        res.addHeader("Content-Length", "" + fileLen);
+                        res.addHeader("ETag", etag);
+                    }
+                }
+            }
+        }
+        catch (IOException ioe)
+        {
+            res = new Response(Response.Status.FORBIDDEN, NanoHTTPD.MIME_PLAINTEXT, "FORBIDDEN: Reading file failed.");
+        }
+
+        res.addHeader("Accept-Ranges", "bytes"); // Announce that the file server accepts partial content requestes
+        return res;
+    }
+
+    private String listDirectory(String uri, File f)
+    {
+        String heading = "Directory " + uri;
+        String msg = "<html><head><title>" + heading + "</title><style><!--\n"
+                + "span.dirname { font-weight: bold; }\n"
+                + "span.filesize { font-size: 75%; }\n"
+                + "// -->\n"
+                + "</style>"
+                + "</head><body><h1>" + heading + "</h1>";
+
+        String up = null;
+        if (uri.length() > 1)
+        {
+            String u = uri.substring(0, uri.length() - 1);
+            int slash = u.lastIndexOf('/');
+            if (slash >= 0 && slash < u.length())
+            {
+                up = uri.substring(0, slash + 1);
+            }
+        }
+
+        List<String> _files = Arrays.asList(f.list(new FilenameFilter()
+        {
+            @Override
+            public boolean accept(File dir, String name)
+            {
+                return new File(dir, name).isFile();
+            }
+        }));
+        Collections.sort(_files);
+        List<String> directories = Arrays.asList(f.list(new FilenameFilter()
+        {
+            @Override
+            public boolean accept(File dir, String name)
+            {
+                return new File(dir, name).isDirectory();
+            }
+        }));
+        Collections.sort(directories);
+        if (up != null || directories.size() + _files.size() > 0)
+        {
+            msg += "<ul>";
+            if (up != null || directories.size() > 0)
+            {
+                msg += "<section class=\"directories\">";
+                if (up != null)
+                {
+                    msg += "<li><a rel=\"directory\" href=\"" + up + "\"><span class=\"dirname\">..</span></a></b></li>";
+                }
+                for (int i = 0; i < directories.size(); i++)
+                {
+                    String dir = directories.get(i) + "/";
+                    msg += "<li><a rel=\"directory\" href=\"" + encodeUri(uri + dir) + "\"><span class=\"dirname\">" + dir + "</span></a></b></li>";
+                }
+                msg += "</section>";
+            }
+            if (_files.size() > 0)
+            {
+                msg += "<section class=\"files\">";
+                for (int i = 0; i < _files.size(); i++)
+                {
+                    String file = _files.get(i);
+
+                    msg += "<li><a href=\"" + encodeUri(uri + file) + "\"><span class=\"filename\">" + file + "</span></a>";
+                    File curFile = new File(f, file);
+                    long len = curFile.length();
+                    msg += "&nbsp;<span class=\"filesize\">(";
+                    if (len < 1024)
+                    {
+                        msg += len + " bytes";
+                    }
+                    else if (len < 1024 * 1024)
+                    {
+                        msg += len / 1024 + "." + (len % 1024 / 10 % 100) + " KB";
+                    }
+                    else
+                    {
+                        msg += len / (1024 * 1024) + "." + len % (1024 * 1024) / 10 % 100 + " MB";
+                    }
+                    msg += ")</span></li>";
+                }
+                msg += "</section>";
+            }
+            msg += "</ul>";
+        }
+        msg += "</body></html>";
+        return msg;
+    }
+
+    @Override
+    public Response getResponse()
+    {
+        return serveFile(uri, headers, getRootDir());
+    }
+}

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

@@ -0,0 +1,155 @@
+package me.StevenLawson.TotalFreedomMod.HTTPD;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import me.StevenLawson.TotalFreedomMod.Commands.AdminLevel;
+import me.StevenLawson.TotalFreedomMod.Commands.TFM_CommandLoader;
+import me.StevenLawson.TotalFreedomMod.Commands.TFM_CommandLoader.TFM_DynamicCommand;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandMap;
+import org.bukkit.command.PluginIdentifiableCommand;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
+
+import static me.StevenLawson.TotalFreedomMod.HTTPD.HTMLGenerationTools.*;
+import static net.minecraft.util.org.apache.commons.lang3.StringEscapeUtils.*;
+
+public class Module_help extends TFM_HTTPD_Module
+{
+    public Module_help(NanoHTTPD.HTTPSession session)
+    {
+        super(session);
+    }
+
+    @Override
+    public String getBody()
+    {
+        StringBuilder responseBody = new StringBuilder();
+
+        CommandMap commandMap;
+        HashMap<String, Command> knownCommands;
+        if ((commandMap = TFM_CommandLoader.getInstance().getCommandMap()) == null
+                || (knownCommands = TFM_CommandLoader.getInstance().getKnownCommands(commandMap)) == null)
+        {
+            return paragraph("Error loading commands.");
+        }
+
+        responseBody
+                .append(heading("Command Help", 1))
+                .append(paragraph(
+                "This page is an automatically generated listing of all plugin commands that are currently live on the server. "
+                + "Please note that it does not include vanilla server commands."));
+
+        final Map<String, List<Command>> commandsByPlugin = new HashMap<String, List<Command>>();
+
+        final Iterator<Map.Entry<String, Command>> itKnownCommands = knownCommands.entrySet().iterator();
+        while (itKnownCommands.hasNext())
+        {
+            final Map.Entry<String, Command> entry = itKnownCommands.next();
+            final String name = entry.getKey();
+            final Command command = entry.getValue();
+            if (name.equalsIgnoreCase(command.getName()))
+            {
+                String pluginName = "Bukkit Default";
+                if (command instanceof PluginIdentifiableCommand)
+                {
+                    pluginName = ((PluginIdentifiableCommand) command).getPlugin().getName();
+                }
+                List<Command> pluginCommands = commandsByPlugin.get(pluginName);
+                if (pluginCommands == null)
+                {
+                    commandsByPlugin.put(pluginName, pluginCommands = new ArrayList<Command>());
+                }
+                pluginCommands.add(command);
+            }
+        }
+
+        final Iterator<Map.Entry<String, List<Command>>> itCommandsByPlugin = commandsByPlugin.entrySet().iterator();
+        while (itCommandsByPlugin.hasNext())
+        {
+            final Map.Entry<String, List<Command>> entry = itCommandsByPlugin.next();
+            final String pluginName = entry.getKey();
+            final List<Command> commands = entry.getValue();
+
+            Collections.sort(commands, new Comparator<Command>()
+            {
+                @Override
+                public int compare(Command a, Command b)
+                {
+                    if (a instanceof TFM_DynamicCommand && b instanceof TFM_DynamicCommand)
+                    {
+                        String aName = ((TFM_DynamicCommand) a).getCommandInfo().getLevel().name() + a.getName();
+                        String bName = ((TFM_DynamicCommand) b).getCommandInfo().getLevel().name() + b.getName();
+                        return aName.compareTo(bName);
+                    }
+                    return a.getName().compareTo(b.getName());
+                }
+            });
+
+            responseBody.append(heading(pluginName, 2)).append("<ul>\r\n");
+
+            AdminLevel lastTfmCommandLevel = null;
+            for (Command command : commands)
+            {
+                if ("TotalFreedomMod".equals(pluginName))
+                {
+                    AdminLevel tfmCommandLevel = ((TFM_DynamicCommand) command).getCommandInfo().getLevel();
+                    if (lastTfmCommandLevel == null || lastTfmCommandLevel != tfmCommandLevel)
+                    {
+                        responseBody.append("</ul>\r\n").append(heading(tfmCommandLevel.getFriendlyName(), 3)).append("<ul>\r\n");
+                    }
+                    lastTfmCommandLevel = tfmCommandLevel;
+                }
+                responseBody.append(buildDescription(command));
+            }
+
+            responseBody.append("</ul>\r\n");
+        }
+
+        return responseBody.toString();
+    }
+
+    private static String buildDescription(Command command)
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append(
+                "<li><span class=\"commandName\">{$CMD_NAME}</span> - Usage: <span class=\"commandUsage\">{$CMD_USAGE}</span>"
+                .replace("{$CMD_NAME}", escapeHtml4(command.getName().trim()))
+                .replace("{$CMD_USAGE}", escapeHtml4(command.getUsage().trim())));
+
+        if (!command.getAliases().isEmpty())
+        {
+            sb.append(
+                    " - Aliases: <span class=\"commandAliases\">{$CMD_ALIASES}</span>"
+                    .replace("{$CMD_ALIASES}", escapeHtml4(StringUtils.join(command.getAliases(), ", "))));
+        }
+
+        sb.append(
+                "<br><span class=\"commandDescription\">{$CMD_DESC}</span></li>\r\n"
+                .replace("{$CMD_DESC}", escapeHtml4(command.getDescription().trim())));
+
+        return sb.toString();
+    }
+
+    @Override
+    public String getTitle()
+    {
+        return "TotalFreedomMod :: Command Help";
+    }
+
+    @Override
+    public String getStyle()
+    {
+        return ".commandName{font-weight:bold;}.commandDescription{padding-left:15px;}li{margin:.15em;padding:.15em;}";
+    }
+//    @Override
+//    public String getScript()
+//    {
+//        return "$(document).ready(function(){console.log(\"Ready\");});";
+//    }
+}

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

@@ -0,0 +1,71 @@
+package me.StevenLawson.TotalFreedomMod.HTTPD;
+
+import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+public class Module_list extends TFM_HTTPD_Module
+{
+    public Module_list(NanoHTTPD.HTTPSession session)
+    {
+        super(session);
+    }
+
+    @Override
+    public String getBody()
+    {
+        final StringBuilder body = new StringBuilder();
+
+        final Player[] onlinePlayers = Bukkit.getOnlinePlayers();
+
+        body.append("<p>There are ").append(onlinePlayers.length).append("/").append(Bukkit.getMaxPlayers()).append(" players online:</p>\r\n");
+
+        body.append("<ul>\r\n");
+
+        for (Player player : onlinePlayers)
+        {
+            String prefix = "";
+            if (TFM_SuperadminList.isUserSuperadmin(player))
+            {
+                if (TFM_SuperadminList.isSeniorAdmin(player))
+                {
+                    prefix = "[SrA]";
+                }
+                else
+                {
+                    prefix = "[SA]";
+                }
+
+                if (TFM_Util.DEVELOPERS.contains(player.getName()))
+                {
+                    prefix = "[Dev]";
+                }
+
+                if (player.getName().equals("markbyron"))
+                {
+                    prefix = "[Owner]";
+                }
+            }
+            else
+            {
+                if (player.isOp())
+                {
+                    prefix = "[OP]";
+                }
+            }
+
+            body.append("<li>").append(prefix).append(player.getName()).append("</li>\r\n");
+        }
+
+        body.append("</ul>\r\n");
+
+        return body.toString();
+    }
+
+    @Override
+    public String getTitle()
+    {
+        return "Total Freedom - Online Users";
+    }
+}

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

@@ -0,0 +1,27 @@
+package me.StevenLawson.TotalFreedomMod.HTTPD;
+
+import java.io.File;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+
+public class Module_permbans extends TFM_HTTPD_Module
+{
+    public Module_permbans(NanoHTTPD.HTTPSession session)
+    {
+        super(session);
+    }
+
+    @Override
+    public NanoHTTPD.Response getResponse()
+    {
+        File permbanFile = new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.PERMBAN_FILE);
+        if (permbanFile.exists())
+        {
+            return TFM_HTTPD_Manager.serveFileBasic(new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.PERMBAN_FILE));
+        }
+        else
+        {
+            return new NanoHTTPD.Response(NanoHTTPD.Response.Status.NOT_FOUND, NanoHTTPD.MIME_PLAINTEXT,
+                    "Error 404: Not Found - The requested resource was not found on this server.");
+        }
+    }
+}

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

@@ -0,0 +1,94 @@
+package me.StevenLawson.TotalFreedomMod.HTTPD;
+
+import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class Module_players extends TFM_HTTPD_Module
+{
+    public Module_players(NanoHTTPD.HTTPSession session)
+    {
+        super(session);
+    }
+
+    @Override
+    public NanoHTTPD.Response getResponse()
+    {
+        final JSONObject responseObject = new JSONObject();
+
+        final JSONArray players = new JSONArray();
+        final JSONArray superadmins = new JSONArray();
+        final JSONArray telnetadmins = new JSONArray();
+        final JSONArray senioradmins = new JSONArray();
+        final JSONArray developers = new JSONArray();
+
+        // All online players
+        for (Player player : TotalFreedomMod.server.getOnlinePlayers())
+        {
+            players.add(player.getName());
+        }
+
+        // Super admins (non-telnet and non-senior)
+        for (String superadmin : TFM_SuperadminList.getSuperadminNames())
+        {
+            if (TFM_SuperadminList.getSenioradminNames().contains(superadmin))
+            {
+                continue;
+            }
+
+            if (TFM_SuperadminList.getTelnetadminNames().contains(superadmin))
+            {
+                continue;
+            }
+
+            superadmins.add(getName(superadmin));
+        }
+
+        // Telnet admins (non-senior)
+        for (String telnetadmin : TFM_SuperadminList.getTelnetadminNames())
+        {
+            if (TFM_SuperadminList.getSenioradminNames().contains(telnetadmin))
+            {
+                continue;
+            }
+            telnetadmins.add(getName(telnetadmin));
+        }
+
+        // Senior admins
+        for (String senioradmin : TFM_SuperadminList.getSenioradminNames())
+        {
+            senioradmins.add(getName(senioradmin));
+        }
+
+        // Developers
+        developers.addAll(TFM_Util.DEVELOPERS);
+
+        responseObject.put("players", players);
+        responseObject.put("superadmins", superadmins);
+        responseObject.put("telnetadmins", telnetadmins);
+        responseObject.put("senioradmins", senioradmins);
+        responseObject.put("developers", developers);
+
+        final NanoHTTPD.Response response = new NanoHTTPD.Response(NanoHTTPD.Response.Status.OK, NanoHTTPD.MIME_JSON, responseObject.toString());
+        response.addHeader("Access-Control-Allow-Origin", "*");
+        return response;
+    }
+
+    private String getName(String caseInsensitiveName)
+    {
+        final OfflinePlayer player = Bukkit.getOfflinePlayer(caseInsensitiveName);
+        if (player == null)
+        {
+            return caseInsensitiveName;
+        }
+        else
+        {
+            return player.getName();
+        }
+    }
+}

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

@@ -0,0 +1,296 @@
+package me.StevenLawson.TotalFreedomMod.HTTPD;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+import me.StevenLawson.TotalFreedomMod.HTTPD.NanoHTTPD.Method;
+import me.StevenLawson.TotalFreedomMod.HTTPD.NanoHTTPD.Response;
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
+import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
+import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import net.minecraft.util.org.apache.commons.io.FileUtils;
+import net.minecraft.util.org.apache.commons.lang3.StringEscapeUtils;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
+
+public class Module_schematic extends TFM_HTTPD_Module
+{
+    private static final File SCHEMATIC_FOLDER = new File("./plugins/WorldEdit/schematics/");
+    private static final String REQUEST_FORM_FILE_ELEMENT_NAME = "schematicFile";
+    private static final Pattern SCHEMATIC_FILENAME_LC = Pattern.compile("^[a-z0-9]{1,30}\\.schematic$");
+    private static final String[] SCHEMATIC_FILTER = new String[]
+    {
+        "schematic"
+    };
+    private static final String UPLOAD_FORM =
+            "<form method=\"post\" name=\"schematicForm\" id=\"schematicForm\" action=\"/schematic/upload/\" enctype=\"multipart/form-data\">\n"
+            + "<p>Select a schematic file to upload. Filenames must be alphanumeric, between 1 and 30 characters long (inclusive), and have a .schematic extension.</p>\n"
+            + "<input type=\"file\" id=\"schematicFile\" name=\"schematicFile\" />\n"
+            + "<br />\n"
+            + "<button type=\"submit\">Submit</button>\n"
+            + "</form>";
+
+    public Module_schematic(NanoHTTPD.HTTPSession session)
+    {
+        super(session);
+    }
+
+    @Override
+    public Response getResponse()
+    {
+        try
+        {
+            return new TFM_HTTPD_PageBuilder(body(), title(), null, null).getResponse();
+        }
+        catch (ResponseOverrideException ex)
+        {
+            return ex.getResponse();
+        }
+    }
+
+    public String title()
+    {
+        return "TotalFreedomMod :: Schematic Manager";
+    }
+
+    public String body() throws ResponseOverrideException
+    {
+        if (!SCHEMATIC_FOLDER.exists())
+        {
+            return HTMLGenerationTools.paragraph("Can't find the WorldEdit schematic folder.");
+        }
+
+        final StringBuilder out = new StringBuilder();
+
+        final String[] args = StringUtils.split(uri, "/");
+        final ModuleMode mode = ModuleMode.getMode(getArg(args, 1));
+
+        switch (mode)
+        {
+            case LIST:
+            {
+                Collection<File> schematics = FileUtils.listFiles(SCHEMATIC_FOLDER, SCHEMATIC_FILTER, false);
+
+                final List<String> schematicsFormatted = new ArrayList<String>();
+                for (File schematic : schematics)
+                {
+                    String filename = StringEscapeUtils.escapeHtml4(schematic.getName());
+                    schematicsFormatted.add("<li><a href=\"/schematic/download?schematicName=" + filename + "\">" + filename + "</a></li>");
+                }
+
+                Collections.sort(schematicsFormatted, new Comparator<String>()
+                {
+                    @Override
+                    public int compare(String a, String b)
+                    {
+                        return a.toLowerCase().compareTo(b.toLowerCase());
+                    }
+                });
+
+                out
+                        .append(HTMLGenerationTools.heading("Schematics:", 1))
+                        .append("<ul>")
+                        .append(StringUtils.join(schematicsFormatted, "\r\n"))
+                        .append("</ul>");
+
+                break;
+            }
+            case DOWNLOAD:
+            {
+                try
+                {
+                    throw new ResponseOverrideException(downloadSchematic(params.get("schematicName")));
+                }
+                catch (SchematicTransferException ex)
+                {
+                    out.append(HTMLGenerationTools.paragraph("Error downloading schematic: " + ex.getMessage()));
+                }
+                break;
+            }
+            case UPLOAD:
+            {
+                final String remoteAddress = socket.getInetAddress().getHostAddress();
+                if (!isAuthorized(remoteAddress))
+                {
+                    out.append(HTMLGenerationTools.paragraph("Schematic upload access denied: Your IP, " + remoteAddress + ", is not registered to a superadmin on this server."));
+                }
+                else
+                {
+                    if (method == Method.POST)
+                    {
+                        try
+                        {
+                            uploadSchematic();
+                            out.append(HTMLGenerationTools.paragraph("Schematic uploaded successfully."));
+                        }
+                        catch (SchematicTransferException ex)
+                        {
+                            out.append(HTMLGenerationTools.paragraph("Error uploading schematic: " + ex.getMessage()));
+                        }
+                    }
+                    else
+                    {
+                        out.append(UPLOAD_FORM);
+                    }
+                }
+                break;
+            }
+            default:
+            {
+                out.append(HTMLGenerationTools.paragraph("Invalid request mode."));
+                break;
+            }
+        }
+
+        return out.toString();
+    }
+
+    private boolean uploadSchematic() throws SchematicTransferException
+    {
+        Map<String, String> files = getFiles();
+
+        final String tempFileName = files.get(REQUEST_FORM_FILE_ELEMENT_NAME);
+        if (tempFileName == null)
+        {
+            throw new SchematicTransferException("No file transmitted to server.");
+        }
+
+        final File tempFile = new File(tempFileName);
+        if (!tempFile.exists())
+        {
+            throw new SchematicTransferException();
+        }
+
+        String origFileName = params.get(REQUEST_FORM_FILE_ELEMENT_NAME);
+        if (origFileName == null || (origFileName = origFileName.trim()).isEmpty())
+        {
+            throw new SchematicTransferException("Can't resolve original file name.");
+        }
+
+        if (tempFile.length() > FileUtils.ONE_KB * 64L)
+        {
+            throw new SchematicTransferException("Schematic is too big (64kb max).");
+        }
+
+        if (!SCHEMATIC_FILENAME_LC.matcher(origFileName.toLowerCase()).find())
+        {
+            throw new SchematicTransferException("File name must be alphanumeric, between 1 and 30 characters long (inclusive), and have a \".schematic\" extension.");
+        }
+
+        final File targetFile = new File(SCHEMATIC_FOLDER.getPath(), origFileName);
+        if (targetFile.exists())
+        {
+            throw new SchematicTransferException("Schematic already exists on the server.");
+        }
+
+        try
+        {
+            FileUtils.copyFile(tempFile, targetFile);
+        }
+        catch (IOException ex)
+        {
+            TFM_Log.severe(ex);
+            throw new SchematicTransferException();
+        }
+
+        return true;
+    }
+
+    private Response downloadSchematic(String schematicName) throws SchematicTransferException
+    {
+        if (schematicName == null || !SCHEMATIC_FILENAME_LC.matcher((schematicName = schematicName.trim()).toLowerCase()).find())
+        {
+            throw new SchematicTransferException("Invalid schematic name requested: " + schematicName);
+        }
+
+        final File targetFile = new File(SCHEMATIC_FOLDER.getPath(), schematicName);
+        if (!targetFile.exists())
+        {
+            throw new SchematicTransferException("Schematic not found: " + schematicName);
+        }
+
+        Response response = TFM_HTTPD_Manager.serveFileBasic(targetFile);
+
+        response.addHeader("Content-Disposition", "attachment; filename=" + targetFile.getName() + ";");
+
+        return response;
+    }
+
+    private boolean isAuthorized(String remoteAddress)
+    {
+        TFM_Superadmin entry = TFM_SuperadminList.getAdminEntryByIP(remoteAddress);
+        return entry != null && entry.isActivated();
+    }
+
+    private static class SchematicTransferException extends Exception
+    {
+        public SchematicTransferException()
+        {
+        }
+
+        public SchematicTransferException(String string)
+        {
+            super(string);
+        }
+    }
+
+    private static class ResponseOverrideException extends Exception
+    {
+        private final Response response;
+
+        public ResponseOverrideException(Response response)
+        {
+            this.response = response;
+        }
+
+        public Response getResponse()
+        {
+            return response;
+        }
+    }
+
+    private static String getArg(String[] args, int index)
+    {
+        String out = (args.length == index + 1 ? args[index] : null);
+        return (out == null ? null : (out.trim().isEmpty() ? null : out.trim()));
+    }
+
+    private static enum ModuleMode
+    {
+        LIST("list"),
+        UPLOAD("upload"),
+        DOWNLOAD("download"),
+        INVALID(null);
+        //
+        private final String modeName;
+
+        private ModuleMode(String modeName)
+        {
+            this.modeName = modeName;
+        }
+
+        @Override
+        public String toString()
+        {
+            return this.modeName;
+        }
+
+        public static ModuleMode getMode(String needle)
+        {
+            for (ModuleMode mode : values())
+            {
+                final String haystack = mode.toString();
+                if (haystack != null && haystack.equalsIgnoreCase(needle))
+                {
+                    return mode;
+                }
+            }
+            return INVALID;
+        }
+    }
+}

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

@@ -0,0 +1,280 @@
+package me.StevenLawson.TotalFreedomMod.HTTPD;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.concurrent.Callable;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import me.StevenLawson.TotalFreedomMod.HTTPD.NanoHTTPD.HTTPSession;
+import me.StevenLawson.TotalFreedomMod.HTTPD.NanoHTTPD.Response;
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
+import net.minecraft.util.org.apache.commons.lang3.exception.ExceptionUtils;
+import org.bukkit.Bukkit;
+
+public class TFM_HTTPD_Manager
+{
+    @Deprecated
+    public static String MIME_DEFAULT_BINARY = "application/octet-stream";
+    //
+    private static final Pattern EXT_REGEX = Pattern.compile("\\.([^\\.\\s]+)$");
+    //
+    public static final int PORT = TFM_ConfigEntry.HTTPD_PORT.getInteger();
+    //
+    private final TFM_HTTPD httpd = new TFM_HTTPD(PORT);
+
+    private TFM_HTTPD_Manager()
+    {
+    }
+
+    public void start()
+    {
+        if (!TFM_ConfigEntry.HTTPD_ENABLED.getBoolean())
+        {
+            return;
+        }
+
+        try
+        {
+            httpd.start();
+
+            if (httpd.isAlive())
+            {
+                TFM_Log.info("TFM HTTPd started. Listening on port: " + httpd.getListeningPort());
+            }
+            else
+            {
+                TFM_Log.info("Error starting TFM HTTPd.");
+            }
+        }
+        catch (IOException ex)
+        {
+            TFM_Log.severe(ex);
+        }
+    }
+
+    public void stop()
+    {
+        if (!TFM_ConfigEntry.HTTPD_ENABLED.getBoolean())
+        {
+            return;
+        }
+
+        httpd.stop();
+
+        TFM_Log.info("TFM HTTPd stopped.");
+    }
+
+    private static enum ModuleType
+    {
+        DUMP(new ModuleExecutable(false, "dump")
+        {
+            @Override
+            public Response getResponse(HTTPSession session)
+            {
+                return new Response(Response.Status.OK, NanoHTTPD.MIME_PLAINTEXT, "The DUMP module is disabled. It is intended for debugging use only.");
+            }
+        }),
+        HELP(new ModuleExecutable(true, "help")
+        {
+            @Override
+            public Response getResponse(HTTPSession session)
+            {
+                return new Module_help(session).getResponse();
+            }
+        }),
+        LIST(new ModuleExecutable(true, "list")
+        {
+            @Override
+            public Response getResponse(HTTPSession session)
+            {
+                return new Module_list(session).getResponse();
+            }
+        }),
+        FILE(new ModuleExecutable(false, "file")
+        {
+            @Override
+            public Response getResponse(HTTPSession session)
+            {
+                return new Module_file(session).getResponse();
+            }
+        }),
+        SCHEMATIC(new ModuleExecutable(false, "schematic")
+        {
+            @Override
+            public Response getResponse(HTTPSession session)
+            {
+                return new Module_schematic(session).getResponse();
+            }
+        }),
+        PERMBANS(new ModuleExecutable(false, "permbans")
+        {
+            @Override
+            public Response getResponse(HTTPSession session)
+            {
+                return new Module_permbans(session).getResponse();
+            }
+        }),
+        PLAYERS(new ModuleExecutable(true, "players")
+        {
+            @Override
+            public Response getResponse(HTTPSession session)
+            {
+                return new Module_players(session).getResponse();
+            }
+        });
+        //
+        private final ModuleExecutable moduleExecutable;
+
+        private ModuleType(ModuleExecutable moduleExecutable)
+        {
+            this.moduleExecutable = moduleExecutable;
+        }
+
+        private abstract static class ModuleExecutable
+        {
+            private final boolean runOnBukkitThread;
+            private final String name;
+
+            public ModuleExecutable(boolean runOnBukkitThread, String name)
+            {
+                this.runOnBukkitThread = runOnBukkitThread;
+                this.name = name;
+            }
+
+            public Response execute(final HTTPSession session)
+            {
+                try
+                {
+                    if (this.runOnBukkitThread)
+                    {
+                        return Bukkit.getScheduler().callSyncMethod(TotalFreedomMod.plugin, new Callable<Response>()
+                        {
+                            @Override
+                            public Response call() throws Exception
+                            {
+                                return getResponse(session);
+                            }
+                        }).get();
+                    }
+                    else
+                    {
+                        return getResponse(session);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    TFM_Log.severe(ex);
+                }
+                return null;
+            }
+
+            public abstract Response getResponse(HTTPSession session);
+
+            public String getName()
+            {
+                return name;
+            }
+        }
+
+        public ModuleExecutable getModuleExecutable()
+        {
+            return moduleExecutable;
+        }
+
+        private static ModuleType getByName(String needle)
+        {
+            for (ModuleType type : values())
+            {
+                if (type.getModuleExecutable().getName().equalsIgnoreCase(needle))
+                {
+                    return type;
+                }
+            }
+            return FILE;
+        }
+    }
+
+    private static class TFM_HTTPD extends NanoHTTPD
+    {
+        public TFM_HTTPD(int port)
+        {
+            super(port);
+        }
+
+        public TFM_HTTPD(String hostname, int port)
+        {
+            super(hostname, port);
+        }
+
+        @Override
+        public Response serve(HTTPSession session)
+        {
+            Response response;
+
+            try
+            {
+                final String[] args = StringUtils.split(session.getUri(), "/");
+                final ModuleType moduleType = args.length >= 1 ? ModuleType.getByName(args[0]) : ModuleType.FILE;
+                response = moduleType.getModuleExecutable().execute(session);
+            }
+            catch (Exception ex)
+            {
+                response = new Response(Response.Status.INTERNAL_ERROR, MIME_PLAINTEXT, "Error 500: Internal Server Error\r\n" + ex.getMessage() + "\r\n" + ExceptionUtils.getStackTrace(ex));
+            }
+
+            if (response == null)
+            {
+                response = new Response(Response.Status.NOT_FOUND, MIME_PLAINTEXT, "Error 404: Not Found - The requested resource was not found on this server.");
+            }
+
+            return response;
+        }
+    }
+
+    public static Response serveFileBasic(File file)
+    {
+        Response response = null;
+
+        if (file != null && file.exists())
+        {
+            try
+            {
+                String mimetype = null;
+
+                Matcher matcher = EXT_REGEX.matcher(file.getCanonicalPath());
+                if (matcher.find())
+                {
+                    mimetype = Module_file.MIME_TYPES.get(matcher.group(1));
+                }
+
+                if (mimetype == null || mimetype.trim().isEmpty())
+                {
+                    mimetype = MIME_DEFAULT_BINARY;
+                }
+
+                response = new Response(Response.Status.OK, mimetype, new FileInputStream(file));
+                response.addHeader("Content-Length", "" + file.length());
+            }
+            catch (IOException ex)
+            {
+                TFM_Log.severe(ex);
+            }
+        }
+
+        return response;
+    }
+
+    public static TFM_HTTPD_Manager getInstance()
+    {
+        return TFM_HTTPDManagerHolder.INSTANCE;
+    }
+
+    private static class TFM_HTTPDManagerHolder
+    {
+        private static final TFM_HTTPD_Manager INSTANCE = new TFM_HTTPD_Manager();
+    }
+}

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

@@ -0,0 +1,68 @@
+package me.StevenLawson.TotalFreedomMod.HTTPD;
+
+import java.net.Socket;
+import java.util.HashMap;
+import java.util.Map;
+import me.StevenLawson.TotalFreedomMod.HTTPD.NanoHTTPD.*;
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
+
+public abstract class TFM_HTTPD_Module
+{
+    protected final String uri;
+    protected final Method method;
+    protected final Map<String, String> headers;
+    protected final Map<String, String> params;
+    protected final Socket socket;
+    protected final HTTPSession session;
+
+    public TFM_HTTPD_Module(HTTPSession session)
+    {
+        this.uri = session.getUri();
+        this.method = session.getMethod();
+        this.headers = session.getHeaders();
+        this.params = session.getParms();
+        this.socket = session.getSocket();
+        this.session = session;
+    }
+
+    public String getBody()
+    {
+        return null;
+    }
+
+    public String getTitle()
+    {
+        return null;
+    }
+
+    public String getStyle()
+    {
+        return null;
+    }
+
+    public String getScript()
+    {
+        return null;
+    }
+
+    public Response getResponse()
+    {
+        return new TFM_HTTPD_PageBuilder(getBody(), getTitle(), getStyle(), getScript()).getResponse();
+    }
+
+    protected final Map<String, String> getFiles()
+    {
+        Map<String, String> files = new HashMap<String, String>();
+
+        try
+        {
+            session.parseBody(files);
+        }
+        catch (Exception ex)
+        {
+            TFM_Log.severe(ex);
+        }
+
+        return files;
+    }
+}

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

@@ -0,0 +1,75 @@
+package me.StevenLawson.TotalFreedomMod.HTTPD;
+
+import me.StevenLawson.TotalFreedomMod.HTTPD.NanoHTTPD.Response;
+
+public class TFM_HTTPD_PageBuilder
+{
+    private static final String TEMPLATE =
+            "<!DOCTYPE html>\r\n"
+            + "<html>\r\n"
+            + "<head>\r\n"
+            + "<title>{$TITLE}</title>\r\n"
+            + "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\r\n"
+            + "{$STYLE}"
+            + "{$SCRIPT}"
+            + "</head>\r\n"
+            + "<body>\r\n{$BODY}</body>\r\n"
+            + "</html>\r\n";
+    private static final String STYLE = "<style type=\"text/css\">{$STYLE}</style>\r\n";
+    private static final String SCRIPT =
+            "<script src=\"//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js\"></script>\r\n"
+            + "<script src=\"//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js\"></script>\r\n"
+            + "<script>\r\n{$SCRIPT}\r\n</script>\r\n";
+    //
+    private String body = null;
+    private String title = null;
+    private String style = null;
+    private String script = null;
+
+    public TFM_HTTPD_PageBuilder()
+    {
+    }
+
+    public TFM_HTTPD_PageBuilder(String body, String title, String style, String script)
+    {
+        this.body = body;
+        this.title = title;
+        this.style = style;
+        this.script = script;
+    }
+
+    public void setBody(String body)
+    {
+        this.body = body;
+    }
+
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    public void setStyle(String style)
+    {
+        this.style = style;
+    }
+
+    public void setScript(String script)
+    {
+        this.script = script;
+    }
+
+    public Response getResponse()
+    {
+        return new Response(this.toString());
+    }
+
+    @Override
+    public String toString()
+    {
+        return TEMPLATE
+                .replace("{$BODY}", this.body == null ? "" : this.body)
+                .replace("{$TITLE}", this.title == null ? "" : this.title)
+                .replace("{$STYLE}", this.style == null ? "" : STYLE.replace("{$STYLE}", this.style))
+                .replace("{$SCRIPT}", this.script == null ? "" : SCRIPT.replace("{$SCRIPT}", this.script));
+    }
+}

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

@@ -1,13 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Listener;
 
-import me.StevenLawson.TotalFreedomMod.TFM_Heartbeat;
+import me.StevenLawson.TotalFreedomMod.*;
-import me.StevenLawson.TotalFreedomMod.TFM_Log;
-import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
-import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea;
-import me.StevenLawson.TotalFreedomMod.TFM_RollbackManager;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
-import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -23,7 +16,7 @@ public class TFM_BlockListener implements Listener
     @EventHandler(priority = EventPriority.HIGH)
     public void onBlockBurn(BlockBurnEvent event)
     {
-        if (!TotalFreedomMod.allowFireSpread)
+        if (!TFM_ConfigEntry.ALLOW_FIRE_SPREAD.getBoolean())
         {
             event.setCancelled(true);
         }
@@ -32,7 +25,7 @@ public class TFM_BlockListener implements Listener
     @EventHandler(priority = EventPriority.HIGH)
     public void onBlockIgnite(BlockIgniteEvent event)
     {
-        if (!TotalFreedomMod.allowFirePlace)
+        if (!TFM_ConfigEntry.ALLOW_FIRE_PLACE.getBoolean())
         {
             event.setCancelled(true);
         }
@@ -42,27 +35,29 @@ public class TFM_BlockListener implements Listener
     public void onBlockBreak(BlockBreakEvent event)
     {
         Player player = event.getPlayer();
-        Location block_pos = event.getBlock().getLocation();
+        Location blockLocation = event.getBlock().getLocation();
 
-        if (TotalFreedomMod.nukeMonitor)
+        if (TFM_ConfigEntry.NUKE_MONITOR.getBoolean())
         {
             TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
 
-            Location player_pos = player.getLocation();
+            Location playerLocation = player.getLocation();
 
-            boolean out_of_range = false;
+            final double nukeMonitorRange = TFM_ConfigEntry.NUKE_MONITOR_RANGE.getDouble().doubleValue();
-            if (!player_pos.getWorld().equals(block_pos.getWorld()))
+
+            boolean outOfRange = false;
+            if (!playerLocation.getWorld().equals(blockLocation.getWorld()))
             {
-                out_of_range = true;
+                outOfRange = true;
             }
-            else if (player_pos.distanceSquared(block_pos) > (TotalFreedomMod.nukeMonitorRange * TotalFreedomMod.nukeMonitorRange))
+            else if (playerLocation.distanceSquared(blockLocation) > (nukeMonitorRange * nukeMonitorRange))
             {
-                out_of_range = true;
+                outOfRange = true;
             }
 
-            if (out_of_range)
+            if (outOfRange)
             {
-                if (playerdata.incrementAndGetFreecamDestroyCount() > TotalFreedomMod.freecamTriggerCount)
+                if (playerdata.incrementAndGetFreecamDestroyCount() > TFM_ConfigEntry.FREECAM_TRIGGER_COUNT.getInteger())
                 {
                     TFM_Util.bcastMsg(player.getName() + " has been flagged for possible freecam nuking.", ChatColor.RED);
                     TFM_Util.autoEject(player, "Freecam (extended range) block breaking is not permitted on this server.");
@@ -77,11 +72,11 @@ public class TFM_BlockListener implements Listener
             Long lastRan = TFM_Heartbeat.getLastRan();
             if (lastRan == null || lastRan + TotalFreedomMod.HEARTBEAT_RATE * 1000L < System.currentTimeMillis())
             {
-                //TFM_Log.warning("Heartbeat service timeout - can't check block place/break rates.");
+                // TFM_Log.warning("Heartbeat service timeout - can't check block place/break rates.");
             }
             else
             {
-                if (playerdata.incrementAndGetBlockDestroyCount() > TotalFreedomMod.nukeMonitorCountBreak)
+                if (playerdata.incrementAndGetBlockDestroyCount() > TFM_ConfigEntry.NUKE_MONITOR_COUNT_BREAK.getInteger())
                 {
                     TFM_Util.bcastMsg(player.getName() + " is breaking blocks too fast!", ChatColor.RED);
                     TFM_Util.autoEject(player, "You are breaking blocks too fast. Nukers are not permitted on this server.");
@@ -94,11 +89,11 @@ public class TFM_BlockListener implements Listener
             }
         }
 
-        if (TotalFreedomMod.protectedAreasEnabled)
+        if (TFM_ConfigEntry.PROTECTED_AREAS_ENABLED.getBoolean())
         {
             if (!TFM_SuperadminList.isUserSuperadmin(player))
             {
-                if (TFM_ProtectedArea.isInProtectedArea(block_pos))
+                if (TFM_ProtectedArea.isInProtectedArea(blockLocation))
                 {
                     event.setCancelled(true);
                 }
@@ -106,37 +101,33 @@ public class TFM_BlockListener implements Listener
         }
     }
 
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onRollbackBlockBreak(BlockBreakEvent event)
-    {
-        TFM_RollbackManager.blockBreak(event);
-    }
-
     @EventHandler(priority = EventPriority.HIGH)
     public void onBlockPlace(BlockPlaceEvent event)
     {
         Player player = event.getPlayer();
-        Location block_pos = event.getBlock().getLocation();
+        Location blockLocation = event.getBlock().getLocation();
 
-        if (TotalFreedomMod.nukeMonitor)
+        if (TFM_ConfigEntry.NUKE_MONITOR.getBoolean())
         {
             TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
 
-            Location player_pos = player.getLocation();
+            Location playerLocation = player.getLocation();
 
-            boolean out_of_range = false;
+            double nukeMonitorRange = TFM_ConfigEntry.NUKE_MONITOR_RANGE.getDouble().doubleValue();
-            if (!player_pos.getWorld().equals(block_pos.getWorld()))
+
+            boolean outOfRange = false;
+            if (!playerLocation.getWorld().equals(blockLocation.getWorld()))
             {
-                out_of_range = true;
+                outOfRange = true;
             }
-            else if (player_pos.distanceSquared(block_pos) > (TotalFreedomMod.nukeMonitorRange * TotalFreedomMod.nukeMonitorRange))
+            else if (playerLocation.distanceSquared(blockLocation) > (nukeMonitorRange * nukeMonitorRange))
             {
-                out_of_range = true;
+                outOfRange = true;
             }
 
-            if (out_of_range)
+            if (outOfRange)
             {
-                if (playerdata.incrementAndGetFreecamPlaceCount() > TotalFreedomMod.freecamTriggerCount)
+                if (playerdata.incrementAndGetFreecamPlaceCount() > TFM_ConfigEntry.FREECAM_TRIGGER_COUNT.getInteger())
                 {
                     TFM_Util.bcastMsg(player.getName() + " has been flagged for possible freecam building.", ChatColor.RED);
                     TFM_Util.autoEject(player, "Freecam (extended range) block building is not permitted on this server.");
@@ -155,7 +146,7 @@ public class TFM_BlockListener implements Listener
             }
             else
             {
-                if (playerdata.incrementAndGetBlockPlaceCount() > TotalFreedomMod.nukeMonitorCountPlace)
+                if (playerdata.incrementAndGetBlockPlaceCount() > TFM_ConfigEntry.NUKE_MONITOR_COUNT_PLACE.getInteger())
                 {
                     TFM_Util.bcastMsg(player.getName() + " is placing blocks too fast!", ChatColor.RED);
                     TFM_Util.autoEject(player, "You are placing blocks too fast.");
@@ -168,11 +159,11 @@ public class TFM_BlockListener implements Listener
             }
         }
 
-        if (TotalFreedomMod.protectedAreasEnabled)
+        if (TFM_ConfigEntry.PROTECTED_AREAS_ENABLED.getBoolean())
         {
             if (!TFM_SuperadminList.isUserSuperadmin(player))
             {
-                if (TFM_ProtectedArea.isInProtectedArea(block_pos))
+                if (TFM_ProtectedArea.isInProtectedArea(blockLocation))
                 {
                     event.setCancelled(true);
                     return;
@@ -185,7 +176,7 @@ public class TFM_BlockListener implements Listener
             case LAVA:
             case STATIONARY_LAVA:
             {
-                if (TotalFreedomMod.allowLavaPlace)
+                if (TFM_ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
                 {
                     TFM_Log.info(String.format("%s placed lava @ %s", player.getName(), TFM_Util.formatLocation(event.getBlock().getLocation())));
 
@@ -203,7 +194,7 @@ public class TFM_BlockListener implements Listener
             case WATER:
             case STATIONARY_WATER:
             {
-                if (TotalFreedomMod.allowWaterPlace)
+                if (TFM_ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
                 {
                     TFM_Log.info(String.format("%s placed water @ %s", player.getName(), TFM_Util.formatLocation(event.getBlock().getLocation())));
 
@@ -220,7 +211,7 @@ public class TFM_BlockListener implements Listener
             }
             case FIRE:
             {
-                if (TotalFreedomMod.allowFirePlace)
+                if (TFM_ConfigEntry.ALLOW_FIRE_PLACE.getBoolean())
                 {
                     TFM_Log.info(String.format("%s placed fire @ %s", player.getName(), TFM_Util.formatLocation(event.getBlock().getLocation())));
 
@@ -237,7 +228,7 @@ public class TFM_BlockListener implements Listener
             }
             case TNT:
             {
-                if (TotalFreedomMod.allowExplosions)
+                if (TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
                 {
                     TFM_Log.info(String.format("%s placed TNT @ %s", player.getName(), TFM_Util.formatLocation(event.getBlock().getLocation())));
 
@@ -255,16 +246,28 @@ public class TFM_BlockListener implements Listener
         }
     }
 
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onRollbackBlockBreak(BlockBreakEvent event)
+    {
+        if (!TFM_SuperadminList.isUserSuperadmin(event.getPlayer()))
+        {
+            TFM_RollbackManager.blockBreak(event);
+        }
+    }
+
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onRollbackBlockPlace(BlockPlaceEvent event)
     {
-        TFM_RollbackManager.blockPlace(event);
+        if (!TFM_SuperadminList.isUserSuperadmin(event.getPlayer()))
+        {
+            TFM_RollbackManager.blockPlace(event);
+        }
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onBlockFromTo(BlockFromToEvent event)
     {
-        if (!TotalFreedomMod.allowFliudSpread)
+        if (!TFM_ConfigEntry.ALLOW_FLUID_SPREAD.getBoolean())
         {
             event.setCancelled(true);
         }

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

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Listener;
 
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import org.bukkit.entity.*;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -12,7 +12,7 @@ public class TFM_EntityListener implements Listener
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityExplode(EntityExplodeEvent event)
     {
-        if (!TotalFreedomMod.allowExplosions)
+        if (!TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
         {
             event.setCancelled(true);
             return;
@@ -24,19 +24,19 @@ public class TFM_EntityListener implements Listener
     @EventHandler(priority = EventPriority.HIGH)
     public void onExplosionPrime(ExplosionPrimeEvent event)
     {
-        if (!TotalFreedomMod.allowExplosions)
+        if (!TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
         {
             event.setCancelled(true);
             return;
         }
 
-        event.setRadius((float) TotalFreedomMod.explosiveRadius);
+        event.setRadius((float) TFM_ConfigEntry.EXPLOSIVE_RADIUS.getDouble().doubleValue());
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityCombust(EntityCombustEvent event)
     {
-        if (!TotalFreedomMod.allowExplosions)
+        if (!TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
         {
             event.setCancelled(true);
         }
@@ -49,7 +49,7 @@ public class TFM_EntityListener implements Listener
         {
             case LAVA:
             {
-                if (!TotalFreedomMod.allowLavaDamage)
+                if (!TFM_ConfigEntry.ALLOW_LAVA_DAMAGE.getBoolean())
                 {
                     event.setCancelled(true);
                     return;
@@ -57,7 +57,7 @@ public class TFM_EntityListener implements Listener
             }
         }
 
-        if (TotalFreedomMod.petProtectEnabled)
+        if (TFM_ConfigEntry.PET_PROTECT_ENABLED.getBoolean())
         {
             Entity entity = event.getEntity();
             if (entity instanceof Tameable)
@@ -73,7 +73,7 @@ public class TFM_EntityListener implements Listener
     @EventHandler(priority = EventPriority.NORMAL)
     public void onCreatureSpawn(CreatureSpawnEvent event)
     {
-        if (TotalFreedomMod.mobLimiterEnabled)
+        if (TFM_ConfigEntry.MOB_LIMITER_ENABLED.getBoolean())
         {
             if (event.getSpawnReason().equals(CreatureSpawnEvent.SpawnReason.EGG))
             {
@@ -85,7 +85,7 @@ public class TFM_EntityListener implements Listener
 
             if (spawned instanceof EnderDragon)
             {
-                if (TotalFreedomMod.mobLimiterDisableDragon)
+                if (TFM_ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean())
                 {
                     event.setCancelled(true);
                     return;
@@ -93,7 +93,7 @@ public class TFM_EntityListener implements Listener
             }
             else if (spawned instanceof Ghast)
             {
-                if (TotalFreedomMod.mobLimiterDisableGhast)
+                if (TFM_ConfigEntry.MOB_LIMITER_DISABLE_GHAST.getBoolean())
                 {
                     event.setCancelled(true);
                     return;
@@ -101,7 +101,7 @@ public class TFM_EntityListener implements Listener
             }
             else if (spawned instanceof Slime)
             {
-                if (TotalFreedomMod.mobLimiterDisableSlime)
+                if (TFM_ConfigEntry.MOB_LIMITER_DISABLE_SLIME.getBoolean())
                 {
                     event.setCancelled(true);
                     return;
@@ -109,7 +109,7 @@ public class TFM_EntityListener implements Listener
             }
             else if (spawned instanceof Giant)
             {
-                if (TotalFreedomMod.mobLimiterDisableGiant)
+                if (TFM_ConfigEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean())
                 {
                     event.setCancelled(true);
                     return;
@@ -121,7 +121,9 @@ public class TFM_EntityListener implements Listener
                 return;
             }
 
-            if (TotalFreedomMod.mobLimiterMax > 0)
+            int mobLimiterMax = TFM_ConfigEntry.MOB_LIMITER_MAX.getInteger().intValue();
+
+            if (mobLimiterMax > 0)
             {
                 int mobcount = 0;
 
@@ -133,7 +135,7 @@ public class TFM_EntityListener implements Listener
                     }
                 }
 
-                if (mobcount > TotalFreedomMod.mobLimiterMax)
+                if (mobcount > mobLimiterMax)
                 {
                     event.setCancelled(true);
                 }
@@ -144,7 +146,7 @@ public class TFM_EntityListener implements Listener
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityDeath(EntityDeathEvent event)
     {
-        if (TotalFreedomMod.autoEntityWipe)
+        if (TFM_ConfigEntry.AUTO_ENTITY_WIPE.getBoolean())
         {
             event.setDroppedExp(0);
         }
@@ -153,7 +155,7 @@ public class TFM_EntityListener implements Listener
     @EventHandler(priority = EventPriority.NORMAL)
     public void onProjectileHit(ProjectileHitEvent event)
     {
-        if (TotalFreedomMod.allowExplosions)
+        if (TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
         {
             Projectile entity = event.getEntity();
             if (event.getEntityType() == EntityType.ARROW && entity.getShooter() instanceof Player)

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

@@ -7,7 +7,9 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.regex.Pattern;
 import me.StevenLawson.TotalFreedomMod.*;
-import org.apache.commons.lang.StringUtils;
+import me.StevenLawson.TotalFreedomMod.Commands.Command_landmine;
+import me.StevenLawson.TotalFreedomMod.TFM_RollbackManager.RollbackEntry;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
@@ -35,7 +37,8 @@ public class TFM_PlayerListener implements Listener
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerInteract(PlayerInteractEvent event)
     {
-        Player player = event.getPlayer();
+        final Player player = event.getPlayer();
+        final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
 
         switch (event.getAction())
         {
@@ -46,37 +49,46 @@ public class TFM_PlayerListener implements Listener
                 {
                     case WATER_BUCKET:
                     {
-                        if (!TotalFreedomMod.allowWaterPlace)
+                        if (TFM_ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
                         {
-                            player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                            break;
-                            player.sendMessage(ChatColor.GRAY + "Water buckets are currently disabled.");
-                            event.setCancelled(true);
                         }
+
+                        player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                        player.sendMessage(ChatColor.GRAY + "Water buckets are currently disabled.");
+                        event.setCancelled(true);
                         break;
                     }
+
                     case LAVA_BUCKET:
                     {
-                        if (!TotalFreedomMod.allowLavaPlace)
+                        if (TFM_ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
                         {
-                            player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                            break;
-                            player.sendMessage(ChatColor.GRAY + "Lava buckets are currently disabled.");
-                            event.setCancelled(true);
                         }
+
+                        player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                        player.sendMessage(ChatColor.GRAY + "Lava buckets are currently disabled.");
+                        event.setCancelled(true);
                         break;
                     }
+
                     case EXPLOSIVE_MINECART:
                     {
-                        if (!TotalFreedomMod.allowTntMinecarts)
+                        if (TFM_ConfigEntry.ALLOW_TNT_MINECARTS.getBoolean())
                         {
-                            player.getInventory().clear(player.getInventory().getHeldItemSlot());
+                            break;
-                            player.sendMessage(ChatColor.GRAY + "TNT minecarts are currently disabled.");
-                            event.setCancelled(true);
                         }
+
+                        player.getInventory().clear(player.getInventory().getHeldItemSlot());
+                        player.sendMessage(ChatColor.GRAY + "TNT minecarts are currently disabled.");
+                        event.setCancelled(true);
                         break;
                     }
                 }
                 break;
             }
+
             case LEFT_CLICK_AIR:
             case LEFT_CLICK_BLOCK:
             {
@@ -84,128 +96,167 @@ public class TFM_PlayerListener implements Listener
                 {
                     case STICK:
                     {
-                        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
+                        if (!TFM_SuperadminList.isUserSuperadmin(player))
-                        if (playerdata.mobThrowerEnabled())
                         {
-                            Location player_pos = player.getLocation();
+                            break;
-                            Vector direction = player_pos.getDirection().normalize();
-
-                            LivingEntity rezzed_mob = (LivingEntity) player.getWorld().spawnEntity(player_pos.add(direction.multiply(2.0)), playerdata.mobThrowerCreature());
-                            rezzed_mob.setVelocity(direction.multiply(playerdata.mobThrowerSpeed()));
-                            playerdata.enqueueMob(rezzed_mob);
-
-                            event.setCancelled(true);
                         }
+
+                        event.setCancelled(true);
+
+                        final Location location = player.getTargetBlock(null, 5).getLocation();
+                        final List<RollbackEntry> entries = TFM_RollbackManager.getEntriesAtLocation(location);
+
+                        if (entries.isEmpty())
+                        {
+                            TFM_Util.playerMsg(player, "No block edits at that location.");
+                            break;
+                        }
+
+                        TFM_Util.playerMsg(player, "Block edits at (" + ChatColor.WHITE + "x" + location.getBlockX() + ", y" + location.getBlockY() + ", z" + location.getBlockZ() + ChatColor.BLUE + ")" + ChatColor.WHITE + ":", ChatColor.BLUE);
+                        for (RollbackEntry entry : entries)
+                        {
+                            TFM_Util.playerMsg(player, " - " + ChatColor.BLUE + entry.author + " " + entry.getType() + " " + StringUtils.capitalize(entry.getMaterial().toString().toLowerCase()) + (entry.data == 0 ? "" : ":" + entry.data));
+                        }
+
                         break;
                     }
+
+                    case BONE:
+                    {
+                        if (!playerdata.mobThrowerEnabled())
+                        {
+                            break;
+                        }
+
+                        Location player_pos = player.getLocation();
+                        Vector direction = player_pos.getDirection().normalize();
+
+                        LivingEntity rezzed_mob = (LivingEntity) player.getWorld().spawnEntity(player_pos.add(direction.multiply(2.0)), playerdata.mobThrowerCreature());
+                        rezzed_mob.setVelocity(direction.multiply(playerdata.mobThrowerSpeed()));
+                        playerdata.enqueueMob(rezzed_mob);
+
+                        event.setCancelled(true);
+                        break;
+                    }
+
                     case SULPHUR:
                     {
-                        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
+                        if (!playerdata.isMP44Armed())
-                        if (playerdata.isMP44Armed())
                         {
-                            if (playerdata.toggleMP44Firing())
+                            break;
-                            {
+                        }
-                                playerdata.startArrowShooter(TotalFreedomMod.plugin);
-                            }
-                            else
-                            {
-                                playerdata.stopArrowShooter();
-                            }
 
-                            event.setCancelled(true);
+                        event.setCancelled(true);
+
+                        if (playerdata.toggleMP44Firing())
+                        {
+                            playerdata.startArrowShooter(TotalFreedomMod.plugin);
+                        }
+                        else
+                        {
+                            playerdata.stopArrowShooter();
                         }
                         break;
                     }
+
                     case BLAZE_ROD:
                     {
-                        if (TotalFreedomMod.allowExplosions)
+                        if (!TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
                         {
-                            if (TFM_SuperadminList.isSeniorAdmin(player, true))
+                            break;
-                            {
-                                Block targetBlock;
-
-                                if (event.getAction().equals(Action.LEFT_CLICK_AIR))
-                                {
-                                    targetBlock = player.getTargetBlock(null, 120);
-                                }
-                                else
-                                {
-                                    targetBlock = event.getClickedBlock();
-                                }
-
-                                if (targetBlock != null)
-                                {
-                                    player.getWorld().createExplosion(targetBlock.getLocation(), 4F, true);
-                                    player.getWorld().strikeLightning(targetBlock.getLocation());
-                                }
-                                else
-                                {
-                                    player.sendMessage("Can't resolve target block.");
-                                }
-
-                                event.setCancelled(true);
-                            }
                         }
+
+                        if (!TFM_SuperadminList.isSeniorAdmin(player, true))
+                        {
+                            break;
+                        }
+
+                        event.setCancelled(true);
+                        Block targetBlock;
+
+                        if (event.getAction().equals(Action.LEFT_CLICK_AIR))
+                        {
+                            targetBlock = player.getTargetBlock(null, 120);
+                        }
+                        else
+                        {
+                            targetBlock = event.getClickedBlock();
+                        }
+
+                        if (targetBlock == null)
+                        {
+                            player.sendMessage("Can't resolve target block.");
+                            break;
+                        }
+
+                        player.getWorld().createExplosion(targetBlock.getLocation(), 4F, true);
+                        player.getWorld().strikeLightning(targetBlock.getLocation());
+
                         break;
                     }
+
                     case CARROT:
                     {
-                        if (TotalFreedomMod.allowExplosions)
+                        if (!TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
                         {
-                            if (TFM_SuperadminList.isSeniorAdmin(player, true))
+                            break;
-                            {
-                                Location player_location = player.getLocation().clone();
-
-                                Vector player_pos = player_location.toVector().add(new Vector(0.0, 1.65, 0.0));
-                                Vector player_dir = player_location.getDirection().normalize();
-
-                                double distance = 150.0;
-                                Block targetBlock = player.getTargetBlock(null, Math.round((float) distance));
-                                if (targetBlock != null)
-                                {
-                                    distance = player_location.distance(targetBlock.getLocation());
-                                }
-
-                                final List<Block> affected = new ArrayList<Block>();
-
-                                Block last_block = null;
-                                for (double offset = 0.0; offset <= distance; offset += (distance / 25.0))
-                                {
-                                    Block test_block = player_pos.clone().add(player_dir.clone().multiply(offset)).toLocation(player.getWorld()).getBlock();
-
-                                    if (!test_block.equals(last_block))
-                                    {
-                                        if (test_block.isEmpty())
-                                        {
-                                            affected.add(test_block);
-                                            test_block.setType(Material.TNT);
-                                        }
-                                        else
-                                        {
-                                            break;
-                                        }
-                                    }
-
-                                    last_block = test_block;
-                                }
-
-                                new BukkitRunnable()
-                                {
-                                    @Override
-                                    public void run()
-                                    {
-                                        for (Block tnt_block : affected)
-                                        {
-                                            TNTPrimed tnt_primed = tnt_block.getWorld().spawn(tnt_block.getLocation(), TNTPrimed.class);
-                                            tnt_primed.setFuseTicks(5);
-                                            tnt_block.setType(Material.AIR);
-                                        }
-                                    }
-                                }.runTaskLater(TotalFreedomMod.plugin, 30L);
-
-                                event.setCancelled(true);
-                            }
                         }
+
+                        if (!TFM_SuperadminList.isSeniorAdmin(player, true))
+                        {
+                            break;
+                        }
+
+                        Location location = player.getLocation().clone();
+
+                        Vector playerPostion = location.toVector().add(new Vector(0.0, 1.65, 0.0));
+                        Vector playerDirection = location.getDirection().normalize();
+
+                        double distance = 150.0;
+                        Block targetBlock = player.getTargetBlock(null, Math.round((float) distance));
+                        if (targetBlock != null)
+                        {
+                            distance = location.distance(targetBlock.getLocation());
+                        }
+
+                        final List<Block> affected = new ArrayList<Block>();
+
+                        Block lastBlock = null;
+                        for (double offset = 0.0; offset <= distance; offset += (distance / 25.0))
+                        {
+                            Block block = playerPostion.clone().add(playerDirection.clone().multiply(offset)).toLocation(player.getWorld()).getBlock();
+
+                            if (!block.equals(lastBlock))
+                            {
+                                if (block.isEmpty())
+                                {
+                                    affected.add(block);
+                                    block.setType(Material.TNT);
+                                }
+                                else
+                                {
+                                    break;
+                                }
+                            }
+
+                            lastBlock = block;
+                        }
+
+                        new BukkitRunnable()
+                        {
+                            @Override
+                            public void run()
+                            {
+                                for (Block tntBlock : affected)
+                                {
+                                    TNTPrimed tnt = tntBlock.getWorld().spawn(tntBlock.getLocation(), TNTPrimed.class);
+                                    tnt.setFuseTicks(5);
+                                    tntBlock.setType(Material.AIR);
+                                }
+                            }
+                        }.runTaskLater(TotalFreedomMod.plugin, 30L);
+
+                        event.setCancelled(true);
                         break;
                     }
                 }
@@ -247,52 +298,52 @@ public class TFM_PlayerListener implements Listener
 
         for (Entry<Player, Double> fuckoff : TotalFreedomMod.fuckoffEnabledFor.entrySet())
         {
-            Player fuckoff_player = fuckoff.getKey();
+            Player fuckoffPlayer = fuckoff.getKey();
 
-            if (fuckoff_player.equals(player) || !fuckoff_player.isOnline())
+            if (fuckoffPlayer.equals(player) || !fuckoffPlayer.isOnline())
             {
                 continue;
             }
 
-            double fuckoff_range = fuckoff.getValue().doubleValue();
+            double fuckoffRange = fuckoff.getValue().doubleValue();
 
-            Location mover_pos = player.getLocation();
+            Location playerLocation = player.getLocation();
-            Location fuckoff_pos = fuckoff_player.getLocation();
+            Location fuckoffLocation = fuckoffPlayer.getLocation();
 
             double distanceSquared;
             try
             {
-                distanceSquared = mover_pos.distanceSquared(fuckoff_pos);
+                distanceSquared = playerLocation.distanceSquared(fuckoffLocation);
             }
             catch (IllegalArgumentException ex)
             {
                 continue;
             }
 
-            if (distanceSquared < (fuckoff_range * fuckoff_range))
+            if (distanceSquared < (fuckoffRange * fuckoffRange))
             {
-                event.setTo(fuckoff_pos.clone().add(mover_pos.subtract(fuckoff_pos).toVector().normalize().multiply(fuckoff_range * 1.1)));
+                event.setTo(fuckoffLocation.clone().add(playerLocation.subtract(fuckoffLocation).toVector().normalize().multiply(fuckoffRange * 1.1)));
                 break;
             }
         }
 
-        boolean do_freeze = false;
+        boolean freeze = false;
         if (TotalFreedomMod.allPlayersFrozen)
         {
             if (!TFM_SuperadminList.isUserSuperadmin(player))
             {
-                do_freeze = true;
+                freeze = true;
             }
         }
         else
         {
             if (playerdata.isFrozen())
             {
-                do_freeze = true;
+                freeze = true;
             }
         }
 
-        if (do_freeze)
+        if (freeze)
         {
             Location freezeTo = to.clone();
 
@@ -307,23 +358,23 @@ public class TFM_PlayerListener implements Listener
         {
             Location targetPos = player.getLocation().add(0, 1, 0);
 
-            boolean out_of_cage;
+            boolean outOfCage;
             if (!targetPos.getWorld().equals(playerdata.getCagePos().getWorld()))
             {
-                out_of_cage = true;
+                outOfCage = true;
             }
             else
             {
-                out_of_cage = targetPos.distanceSquared(playerdata.getCagePos()) > (2.5 * 2.5);
+                outOfCage = targetPos.distanceSquared(playerdata.getCagePos()) > (2.5 * 2.5);
             }
 
-            if (out_of_cage)
+            if (outOfCage)
             {
                 playerdata.setCaged(true, targetPos, playerdata.getCageMaterial(TFM_PlayerData.CageLayer.OUTER), playerdata.getCageMaterial(TFM_PlayerData.CageLayer.INNER));
                 playerdata.regenerateHistory();
                 playerdata.clearHistory();
                 TFM_Util.buildHistory(targetPos, 2, playerdata);
-                TFM_Util.generateCube(targetPos, 2, playerdata.getCageMaterial(TFM_PlayerData.CageLayer.OUTER));
+                TFM_Util.generateHollowCube(targetPos, 2, playerdata.getCageMaterial(TFM_PlayerData.CageLayer.OUTER));
                 TFM_Util.generateCube(targetPos, 1, playerdata.getCageMaterial(TFM_PlayerData.CageLayer.INNER));
             }
         }
@@ -341,42 +392,50 @@ public class TFM_PlayerListener implements Listener
             TFM_Jumppads.getInstance().PlayerMoveEvent(event);
         }
 
-        if (TotalFreedomMod.landminesEnabled && TotalFreedomMod.allowExplosions)
+        if (!(TFM_ConfigEntry.LANDMINES_ENABLED.getBoolean() && TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()))
         {
-            Iterator<TFM_LandmineData> landmines = TFM_LandmineData.landmines.iterator();
+            return;
-            while (landmines.hasNext())
+        }
+
+        Iterator<Command_landmine.TFM_LandmineData> landmines = Command_landmine.TFM_LandmineData.landmines.iterator();
+        while (landmines.hasNext())
+        {
+            Command_landmine.TFM_LandmineData landmine = landmines.next();
+
+            Location location = landmine.location;
+            if (location.getBlock().getType() != Material.TNT)
             {
-                TFM_LandmineData landmine = landmines.next();
+                landmines.remove();
-
+                continue;
-                Location landmine_pos = landmine.landmine_pos;
-                if (landmine_pos.getBlock().getType() != Material.TNT)
-                {
-                    landmines.remove();
-                    continue;
-                }
-
-                if (!landmine.player.equals(player))
-                {
-                    if (player.getWorld().equals(landmine_pos.getWorld()))
-                    {
-                        if (player.getLocation().distanceSquared(landmine_pos) <= (landmine.radius * landmine.radius))
-                        {
-                            landmine.landmine_pos.getBlock().setType(Material.AIR);
-
-                            TNTPrimed tnt1 = landmine_pos.getWorld().spawn(landmine_pos, TNTPrimed.class);
-                            tnt1.setFuseTicks(40);
-                            tnt1.setPassenger(player);
-                            tnt1.setVelocity(new Vector(0.0, 2.0, 0.0));
-
-                            TNTPrimed tnt2 = landmine_pos.getWorld().spawn(player.getLocation(), TNTPrimed.class);
-                            tnt2.setFuseTicks(1);
-
-                            player.setGameMode(GameMode.SURVIVAL);
-                            landmines.remove();
-                        }
-                    }
-                }
             }
+
+            if (landmine.player.equals(player))
+            {
+                break;
+            }
+
+            if (!player.getWorld().equals(location.getWorld()))
+            {
+                break;
+            }
+
+            if (!(player.getLocation().distanceSquared(location) <= (landmine.radius * landmine.radius)))
+            {
+                break;
+            }
+
+            landmine.location.getBlock().setType(Material.AIR);
+
+            TNTPrimed tnt1 = location.getWorld().spawn(location, TNTPrimed.class);
+            tnt1.setFuseTicks(40);
+            tnt1.setPassenger(player);
+            tnt1.setVelocity(new Vector(0.0, 2.0, 0.0));
+
+            TNTPrimed tnt2 = location.getWorld().spawn(player.getLocation(), TNTPrimed.class);
+            tnt2.setFuseTicks(1);
+
+            player.setGameMode(GameMode.SURVIVAL);
+            landmines.remove();
         }
 
     }
@@ -424,6 +483,7 @@ public class TFM_PlayerListener implements Listener
                 event.setCancelled(true);
                 return;
             }
+
             playerdata.setLastMessage(message);
 
             // Check for muted
@@ -435,10 +495,8 @@ public class TFM_PlayerListener implements Listener
                     event.setCancelled(true);
                     return;
                 }
-                else
+
-                {
+                playerdata.setMuted(false);
-                    playerdata.setMuted(false);
-                }
             }
 
             // Strip color from messages
@@ -479,6 +537,9 @@ public class TFM_PlayerListener implements Listener
             // Finally, set message
             event.setMessage(message);
 
+            // Broadcast it to console (since 1.7 doesn't do that anymore)
+            TFM_Log.info(String.format(event.getFormat(), player.getDisplayName(), event.getMessage()), true);
+
             // Set the tag
             if (playerdata.getTag() != null)
             {
@@ -526,9 +587,9 @@ public class TFM_PlayerListener implements Listener
         {
             if (!TFM_SuperadminList.isUserSuperadmin(player))
             {
-                for (String test_command : BLOCKED_MUTED_CMDS)
+                for (String commandName : BLOCKED_MUTED_CMDS)
                 {
-                    if (Pattern.compile("^/" + test_command.toLowerCase() + " ").matcher(command).find())
+                    if (Pattern.compile("^/" + commandName.toLowerCase() + " ").matcher(command).find())
                     {
                         player.sendMessage(ChatColor.RED + "That command is blocked while you are muted.");
                         event.setCancelled(true);
@@ -542,7 +603,7 @@ public class TFM_PlayerListener implements Listener
             }
         }
 
-        if (TotalFreedomMod.preprocessLogEnabled)
+        if (TFM_ConfigEntry.PREPROCESS_LOG_ENABLED.getBoolean())
         {
             TFM_Log.info(String.format("[PREPROCESS_COMMAND] %s(%s): %s", player.getName(), ChatColor.stripColor(player.getDisplayName()), command), true);
         }
@@ -550,7 +611,7 @@ public class TFM_PlayerListener implements Listener
         command = command.toLowerCase().trim();
 
         // Blocked commands
-        if (TFM_CommandBlockerNew.getInstance().isCommandBlocked(command, event.getPlayer()))
+        if (TFM_CommandBlocker.getInstance().isCommandBlocked(command, event.getPlayer()))
         {
             // CommandBlocker handles messages and broadcasts
             event.setCancelled(true);
@@ -571,7 +632,7 @@ public class TFM_PlayerListener implements Listener
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerDropItem(PlayerDropItemEvent event)
     {
-        if (TotalFreedomMod.autoEntityWipe)
+        if (TFM_ConfigEntry.AUTO_ENTITY_WIPE.getBoolean())
         {
             if (event.getPlayer().getWorld().getEntities().size() > 750)
             {
@@ -599,6 +660,9 @@ public class TFM_PlayerListener implements Listener
             playerdata.regenerateHistory();
             playerdata.clearHistory();
         }
+
+        // Log player quitting, because 1.7 doesn't do this
+        TFM_Log.info(player.getName() + " left the game.");
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
@@ -627,15 +691,18 @@ public class TFM_PlayerListener implements Listener
             final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
             playerdata.setSuperadminIdVerified(null);
 
+            // Log join message, as 1.7 doesn't log it anymore
+            TFM_Log.info(player.getName() + " joined the game.");
+
             TFM_UserList.getInstance(TotalFreedomMod.plugin).addUser(player);
 
-            boolean superadmin_impostor = TFM_SuperadminList.isSuperadminImpostor(player);
+            final boolean impostor = TFM_SuperadminList.isSuperadminImpostor(player);
 
-            if (superadmin_impostor || TFM_SuperadminList.isUserSuperadmin(player))
+            if (impostor || TFM_SuperadminList.isUserSuperadmin(player))
             {
-                TFM_Util.bcastMsg(ChatColor.AQUA + player.getName() + " is " + TFM_Util.getRank(player));
+                TFM_Util.bcastMsg(ChatColor.AQUA + player.getName() + " is " + TFM_PlayerRank.getLoginMessage(player));
 
-                if (superadmin_impostor)
+                if (impostor)
                 {
                     player.getInventory().clear();
                     player.setOp(false);
@@ -660,8 +727,12 @@ public class TFM_PlayerListener implements Listener
                     player.setOp(true);
                 }
             }
+            else if (TFM_Util.DEVELOPERS.contains(player.getName()))
+            {
+                TFM_Util.bcastMsg(ChatColor.AQUA + player.getName() + " is " + TFM_PlayerRank.getLoginMessage(player));
+            }
 
-            if (TotalFreedomMod.adminOnlyMode)
+            if (TFM_ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
             {
                 new BukkitRunnable()
                 {

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

@@ -1,28 +1,17 @@
 package me.StevenLawson.TotalFreedomMod.Listener;
 
-import java.util.Set;
+import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker;
-import java.util.regex.Matcher;
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
-import java.util.regex.Pattern;
-import me.StevenLawson.TotalFreedomMod.TFM_CommandBlockerNew;
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.server.RemoteServerCommandEvent;
 import org.bukkit.event.server.ServerCommandEvent;
 import org.bukkit.event.server.ServerListPingEvent;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionAttachment;
-import org.bukkit.permissions.PermissionAttachmentInfo;
-import org.bukkit.plugin.Plugin;
 
 public class TFM_ServerListener implements Listener
 {
@@ -30,50 +19,52 @@ public class TFM_ServerListener implements Listener
     // Comment this method out if you want to compile this without a custom CraftBukkit.
     // Just make sure that enable-command-block=false in server.properties.
     // -Madgeek
-    @EventHandler(priority = EventPriority.NORMAL)
+    /* Temporary: Until we get a custom CB build out
-    public void onCommandBlockSet(org.bukkit.event.server.CommandBlockSetEvent event)
+     @EventHandler(priority = EventPriority.NORMAL)
-    {
+     public void onCommandBlockSet(org.bukkit.event.server.CommandBlockSetEvent event)
-        Player player = event.getPlayer();
+     {
-        String newCommandRaw = event.getNewCommand();
+     Player player = event.getPlayer();
+     String newCommandRaw = event.getNewCommand();
 
-        if (!TFM_SuperadminList.isSeniorAdmin(player, true))
+     if (!TFM_SuperadminList.isSeniorAdmin(player, true))
-        {
+     {
-            player.sendMessage(ChatColor.GRAY + "Only senior admins may set command block commands.");
+     player.sendMessage(ChatColor.GRAY + "Only senior admins may set command block commands.");
-            event.setCancelled(true);
+     event.setCancelled(true);
-            return;
+     return;
-        }
+     }
 
-        Matcher matcher = Pattern.compile("^/?(\\S+)").matcher(newCommandRaw);
+     Matcher matcher = Pattern.compile("^/?(\\S+)").matcher(newCommandRaw);
-        if (matcher.find())
+     if (matcher.find())
-        {
+     {
-            String topLevelCommand = matcher.group(1);
+     String topLevelCommand = matcher.group(1);
-            if (topLevelCommand != null)
+     if (topLevelCommand != null)
-            {
+     {
-                topLevelCommand = topLevelCommand.toLowerCase().trim();
+     topLevelCommand = topLevelCommand.toLowerCase().trim();
-
-                // We need to make it look like the command is coming from the console, so keep the player's name without the Player instance via dummy:
-                if (TFM_CommandBlockerNew.getInstance().isCommandBlocked(topLevelCommand, new TFM_ServerListener_DummyCommandSender(player.getName()), false))
-                {
-                    player.sendMessage(ChatColor.GRAY + "That command is blocked.");
-                    event.setCancelled(true);
-                }
-            }
-        }
-    }
 
+     // We need to make it look like the command is coming from the console, so keep the player's name without the Player instance via dummy:
+     if (TFM_CommandBlocker.getInstance().isCommandBlocked(topLevelCommand, new TFM_ServerListener_DummyCommandSender(player.getName()), false))
+     {
+     player.sendMessage(ChatColor.GRAY + "That command is blocked.");
+     event.setCancelled(true);
+     }
+     }
+     }
+     }*/
+    @Deprecated // Moved to TFM_TelnetListener
     @EventHandler(priority = EventPriority.NORMAL)
     public void onRemoteServerCommand(RemoteServerCommandEvent event)
     {
-        if (TFM_CommandBlockerNew.getInstance().isCommandBlocked(event.getCommand(), event.getSender()))
+        if (TFM_CommandBlocker.getInstance().isCommandBlocked(event.getCommand(), event.getSender()))
         {
             event.setCommand("");
         }
     }
 
+    @Deprecated // Moved to TFM_TelnetListener
     @EventHandler(priority = EventPriority.NORMAL)
     public void onServerCommand(ServerCommandEvent event)
     {
-        if (TFM_CommandBlockerNew.getInstance().isCommandBlocked(event.getCommand(), event.getSender()))
+        if (TFM_CommandBlocker.getInstance().isCommandBlocked(event.getCommand(), event.getSender()))
         {
             event.setCommand("");
         }
@@ -88,7 +79,7 @@ public class TFM_ServerListener implements Listener
         {
             event.setMotd(ChatColor.RED + "You are banned.");
         }
-        else if (TotalFreedomMod.adminOnlyMode)
+        else if (TFM_ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
         {
             event.setMotd(ChatColor.RED + "Server is closed.");
         }
@@ -101,111 +92,4 @@ public class TFM_ServerListener implements Listener
             event.setMotd(ChatColor.RED + "Server is full.");
         }
     }
-
-    private static class TFM_ServerListener_DummyCommandSender implements CommandSender
-    {
-        private final String senderName;
-
-        public TFM_ServerListener_DummyCommandSender(String senderName)
-        {
-            this.senderName = senderName;
-        }
-
-        @Override
-        public void sendMessage(String message)
-        {
-        }
-
-        @Override
-        public void sendMessage(String[] messages)
-        {
-        }
-
-        @Override
-        public Server getServer()
-        {
-            return null;
-        }
-
-        @Override
-        public String getName()
-        {
-            return senderName;
-        }
-
-        @Override
-        public boolean isPermissionSet(String name)
-        {
-            return true;
-        }
-
-        @Override
-        public boolean isPermissionSet(Permission perm)
-        {
-            return true;
-        }
-
-        @Override
-        public boolean hasPermission(String name)
-        {
-            return true;
-        }
-
-        @Override
-        public boolean hasPermission(Permission perm)
-        {
-            return true;
-        }
-
-        @Override
-        public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value)
-        {
-            return null;
-        }
-
-        @Override
-        public PermissionAttachment addAttachment(Plugin plugin)
-        {
-            return null;
-        }
-
-        @Override
-        public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value, int ticks)
-        {
-            return null;
-        }
-
-        @Override
-        public PermissionAttachment addAttachment(Plugin plugin, int ticks)
-        {
-            return null;
-        }
-
-        @Override
-        public void removeAttachment(PermissionAttachment attachment)
-        {
-        }
-
-        @Override
-        public void recalculatePermissions()
-        {
-        }
-
-        @Override
-        public Set<PermissionAttachmentInfo> getEffectivePermissions()
-        {
-            return null;
-        }
-
-        @Override
-        public boolean isOp()
-        {
-            return true;
-        }
-
-        @Override
-        public void setOp(boolean value)
-        {
-        }
-    }
 }

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

@@ -0,0 +1,51 @@
+package me.StevenLawson.TotalFreedomMod.Listener;
+
+import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker;
+import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
+import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+public class TFM_TelnetListener implements Listener
+{
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onTelnetPreLogin(me.StevenLawson.BukkitTelnet.TelnetPreLoginEvent event)
+    {
+
+        final String ip = event.getIp();
+        if (ip == null || ip.isEmpty())
+        {
+            return;
+        }
+
+        final TFM_Superadmin admin = TFM_SuperadminList.getAdminEntryByIP(ip, true);
+
+        if (admin == null || !(admin.isTelnetAdmin() || admin.isSeniorAdmin()))
+        {
+            return;
+        }
+
+        event.setBypassPassword(true);
+        event.setName(admin.getName());
+
+        final OfflinePlayer player = Bukkit.getOfflinePlayer(admin.getName());
+        if (player == null)
+        {
+            return;
+        }
+
+        event.setName(player.getName());
+    }
+
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onTelnetCommand(me.StevenLawson.BukkitTelnet.TelnetCommandEvent event)
+    {
+        if (TFM_CommandBlocker.getInstance().isCommandBlocked(event.getCommand(), event.getSender()))
+        {
+            event.setCancelled(true);
+        }
+    }
+}

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

@@ -1,6 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Listener;
 
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminWorld;
+import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -12,7 +13,18 @@ public class TFM_WeatherListener implements Listener
     @EventHandler(priority = EventPriority.HIGH)
     public void onThunderChange(ThunderChangeEvent event)
     {
-        if (event.toThunderState() && TotalFreedomMod.disableWeather)
+        try
+        {
+            if (event.getWorld() == TFM_AdminWorld.getInstance().getWorld() && TFM_AdminWorld.getInstance().getWeatherMode() != TFM_AdminWorld.WeatherMode.OFF)
+            {
+                return;
+            }
+        }
+        catch (Exception ex)
+        {
+        }
+
+        if (event.toThunderState() && TFM_ConfigEntry.DISABLE_WEATHER.getBoolean())
         {
             event.setCancelled(true);
             return;
@@ -22,7 +34,18 @@ public class TFM_WeatherListener implements Listener
     @EventHandler(priority = EventPriority.HIGH)
     public void onWeatherChange(WeatherChangeEvent event)
     {
-        if (event.toWeatherState() && TotalFreedomMod.disableWeather)
+        try
+        {
+            if (event.getWorld() == TFM_AdminWorld.getInstance().getWorld() && TFM_AdminWorld.getInstance().getWeatherMode() != TFM_AdminWorld.WeatherMode.OFF)
+            {
+                return;
+            }
+        }
+        catch (Exception ex)
+        {
+        }
+
+        if (event.toWeatherState() && TFM_ConfigEntry.DISABLE_WEATHER.getBoolean())
         {
             event.setCancelled(true);
             return;

src/me/StevenLawson/TotalFreedomMod/SerializableLocation.java

@@ -1,92 +0,0 @@
-package me.StevenLawson.TotalFreedomMod;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.World;
-
-// From: http://forums.bukkit.org/threads/location-serialized.105851/
-// By: gcflames5
-public final class SerializableLocation implements Serializable
-{
-    private static final long serialVersionUID = 7498864812883577904L;
-    private final String world;
-    private final String uuid;
-    private final double x, y, z;
-    private final float yaw, pitch;
-    private transient Location loc;
-
-    public SerializableLocation(Location l)
-    {
-        this.world = l.getWorld().getName();
-        this.uuid = l.getWorld().getUID().toString();
-        this.x = l.getX();
-        this.y = l.getY();
-        this.z = l.getZ();
-        this.yaw = l.getYaw();
-        this.pitch = l.getPitch();
-    }
-
-    public static Location returnLocation(SerializableLocation l)
-    {
-        float pitch = l.pitch;
-        float yaw = l.yaw;
-        double x = l.x;
-        double y = l.y;
-        double z = l.z;
-        World world = Bukkit.getWorld(l.world);
-        Location location = new Location(world, x, y, z, yaw, pitch);
-        return location;
-    }
-
-    public static Location returnBlockLocation(SerializableLocation l)
-    {
-        double x = l.x;
-        double y = l.y;
-        double z = l.z;
-        World world = Bukkit.getWorld(l.world);
-        Location location = new Location(world, x, y, z);
-        return location;
-    }
-
-    public SerializableLocation(Map<String, Object> map)
-    {
-        this.world = (String) map.get("world");
-        this.uuid = (String) map.get("uuid");
-        this.x = (Double) map.get("x");
-        this.y = (Double) map.get("y");
-        this.z = (Double) map.get("z");
-        this.yaw = ((Float) map.get("yaw")).floatValue();
-        this.pitch = ((Float) map.get("pitch")).floatValue();
-    }
-
-    public final Map<String, Object> serialize()
-    {
-        Map<String, Object> map = new HashMap<String, Object>();
-        map.put("world", this.world);
-        map.put("uuid", this.uuid);
-        map.put("x", this.x);
-        map.put("y", this.y);
-        map.put("z", this.z);
-        map.put("yaw", this.yaw);
-        map.put("pitch", this.pitch);
-        return map;
-    }
-
-    public final Location getLocation(Server server)
-    {
-        if (loc == null)
-        {
-            World world_l = server.getWorld(this.uuid);
-            if (world_l == null)
-            {
-                world_l = server.getWorld(this.world);
-            }
-            loc = new Location(world_l, x, y, z, yaw, pitch);
-        }
-        return loc;
-    }
-}

src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java

@@ -1,13 +1,13 @@
 package me.StevenLawson.TotalFreedomMod;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
-import org.bukkit.Bukkit;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
-import org.bukkit.ChatColor;
+import org.bukkit.*;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.WorldCreator;
-import org.bukkit.WorldType;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.command.CommandSender;
@@ -15,113 +15,51 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
-public class TFM_AdminWorld
+public final class TFM_AdminWorld extends TFM_CustomWorld
 {
     private static final long CACHE_CLEAR_FREQUENCY = 30L * 1000L; //30 seconds, milliseconds
     private static final long TP_COOLDOWN_TIME = 500L; //0.5 seconds, milliseconds
-    private static final String GENERATION_PARAMETERS = "16,stone,32,dirt,1,grass";
+    private static final String GENERATION_PARAMETERS = TFM_ConfigEntry.FLATLANDS_GENERATION_PARAMS.getString();
-    private static final String ADMINWORLD_NAME = "adminworld";
+    private static final String WORLD_NAME = "adminworld";
     //
     private final Map<Player, Long> teleportCooldown = new HashMap<Player, Long>();
-    private final Map<CommandSender, Boolean> superadminCache = new HashMap<CommandSender, Boolean>();
+    private final Map<CommandSender, Boolean> accessCache = new HashMap<CommandSender, Boolean>();
     //
     private Long cacheLastCleared = null;
-    private World adminWorld = null;
+    private Map<Player, Player> guestList = new HashMap<Player, Player>();
+    private WeatherMode weatherMode = WeatherMode.OFF;
+    private TimeOfDay timeOfDay = TimeOfDay.INHERIT;
 
     private TFM_AdminWorld()
     {
     }
 
-    public void sendToAdminWorld(Player player)
+    @Override
+    public void sendToWorld(Player player)
     {
-        if (!TFM_SuperadminList.isUserSuperadmin(player))
+        if (!canAccessWorld(player))
         {
             return;
         }
 
-        player.teleport(getAdminWorld().getSpawnLocation());
+        super.sendToWorld(player);
     }
 
-    public boolean validateMovement(PlayerMoveEvent event)
+    @Override
+    protected World generateWorld()
     {
-        if (adminWorld != null)
+        WorldCreator worldCreator = new WorldCreator(WORLD_NAME);
-        {
+        worldCreator.generateStructures(false);
-            if (event.getTo().getWorld() == adminWorld)
+        worldCreator.type(WorldType.NORMAL);
-            {
+        worldCreator.environment(World.Environment.NORMAL);
-                final Player player = event.getPlayer();
+        worldCreator.generator(new CleanroomChunkGenerator(GENERATION_PARAMETERS));
-                if (!cachedIsUserSuperadmin(player))
-                {
-                    Long lastTP = teleportCooldown.get(player);
-                    long currentTimeMillis = System.currentTimeMillis();
-                    if (lastTP == null || lastTP.longValue() + TP_COOLDOWN_TIME <= currentTimeMillis)
-                    {
-                        teleportCooldown.put(player, currentTimeMillis);
-                        TFM_Log.info(player.getName() + " attempted to access the AdminWorld.");
-                        new BukkitRunnable()
-                        {
-                            @Override
-                            public void run()
-                            {
-                                player.teleport(Bukkit.getWorlds().get(0).getSpawnLocation());
-                            }
-                        }.runTaskLater(TotalFreedomMod.plugin, 1L);
-                    }
-                    event.setCancelled(true);
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
 
-    public World getAdminWorld()
+        World world = Bukkit.getServer().createWorld(worldCreator);
-    {
-        if (adminWorld == null || !Bukkit.getWorlds().contains(adminWorld))
-        {
-            generateWorld();
-        }
 
-        return adminWorld;
+        world.setSpawnFlags(false, false);
-    }
+        world.setSpawnLocation(0, 50, 0);
 
-    public void wipeSuperadminCache()
+        Block welcomeSignBlock = world.getBlockAt(0, 50, 0);
-    {
-        cacheLastCleared = System.currentTimeMillis();
-        superadminCache.clear();
-    }
-
-    private boolean cachedIsUserSuperadmin(CommandSender user)
-    {
-        long currentTimeMillis = System.currentTimeMillis();
-        if (cacheLastCleared == null || cacheLastCleared.longValue() + CACHE_CLEAR_FREQUENCY <= currentTimeMillis)
-        {
-            cacheLastCleared = currentTimeMillis;
-            superadminCache.clear();
-        }
-
-        Boolean cached = superadminCache.get(user);
-        if (cached == null)
-        {
-            cached = TFM_SuperadminList.isUserSuperadmin(user);
-            superadminCache.put(user, cached);
-        }
-        return cached;
-    }
-
-    private void generateWorld()
-    {
-        WorldCreator adminWorldCreator = new WorldCreator(ADMINWORLD_NAME);
-        adminWorldCreator.generateStructures(false);
-        adminWorldCreator.type(WorldType.NORMAL);
-        adminWorldCreator.environment(World.Environment.NORMAL);
-        adminWorldCreator.generator(new CleanroomChunkGenerator(GENERATION_PARAMETERS));
-
-        adminWorld = Bukkit.getServer().createWorld(adminWorldCreator);
-
-        adminWorld.setSpawnFlags(false, false);
-        adminWorld.setSpawnLocation(0, 50, 0);
-
-        Block welcomeSignBlock = adminWorld.getBlockAt(0, 50, 0);
         welcomeSignBlock.setType(Material.SIGN_POST);
         org.bukkit.block.Sign welcomeSign = (org.bukkit.block.Sign) welcomeSignBlock.getState();
 
@@ -135,6 +73,262 @@ public class TFM_AdminWorld
         welcomeSign.update();
 
         TFM_GameRuleHandler.commitGameRules();
+
+        return world;
+    }
+
+    public boolean addGuest(Player guest, Player supervisor)
+    {
+        if (guest == supervisor || TFM_SuperadminList.isUserSuperadmin(guest))
+        {
+            return false;
+        }
+
+        if (TFM_SuperadminList.isUserSuperadmin(supervisor))
+        {
+            guestList.put(guest, supervisor);
+            wipeAccessCache();
+            return true;
+        }
+
+        return false;
+    }
+
+    public Player removeGuest(Player guest)
+    {
+        Player player = guestList.remove(guest);
+        wipeAccessCache();
+        return player;
+    }
+
+    public Player removeGuest(String partialName)
+    {
+        partialName = partialName.toLowerCase().trim();
+        Iterator<Player> it = guestList.values().iterator();
+        while (it.hasNext())
+        {
+            Player player = it.next();
+            if (player.getName().toLowerCase().trim().contains(partialName))
+            {
+                return removeGuest(player);
+            }
+        }
+        return null;
+    }
+
+    public String guestListToString()
+    {
+        List<String> output = new ArrayList<String>();
+        Iterator<Map.Entry<Player, Player>> it = guestList.entrySet().iterator();
+        while (it.hasNext())
+        {
+            Map.Entry<Player, Player> entry = it.next();
+            Player player = entry.getKey();
+            Player supervisor = entry.getValue();
+            output.add(player.getName() + " (Supervisor: " + supervisor.getName() + ")");
+        }
+        return StringUtils.join(output, ", ");
+    }
+
+    public void purgeGuestList()
+    {
+        guestList.clear();
+        wipeAccessCache();
+    }
+
+    public boolean validateMovement(PlayerMoveEvent event)
+    {
+        World world;
+        try
+        {
+            world = getWorld();
+        }
+        catch (Exception ex)
+        {
+            return true;
+        }
+
+        if (world != null && event.getTo().getWorld() == world)
+        {
+            final Player player = event.getPlayer();
+            if (!canAccessWorld(player))
+            {
+                Long lastTP = teleportCooldown.get(player);
+                long currentTimeMillis = System.currentTimeMillis();
+                if (lastTP == null || lastTP.longValue() + TP_COOLDOWN_TIME <= currentTimeMillis)
+                {
+                    teleportCooldown.put(player, currentTimeMillis);
+                    TFM_Log.info(player.getName() + " attempted to access the AdminWorld.");
+                    new BukkitRunnable()
+                    {
+                        @Override
+                        public void run()
+                        {
+                            player.teleport(Bukkit.getWorlds().get(0).getSpawnLocation());
+                        }
+                    }.runTaskLater(TotalFreedomMod.plugin, 1L);
+                }
+                event.setCancelled(true);
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public void wipeAccessCache()
+    {
+        cacheLastCleared = System.currentTimeMillis();
+        accessCache.clear();
+    }
+
+    public boolean canAccessWorld(final Player player)
+    {
+        long currentTimeMillis = System.currentTimeMillis();
+        if (cacheLastCleared == null || cacheLastCleared.longValue() + CACHE_CLEAR_FREQUENCY <= currentTimeMillis)
+        {
+            cacheLastCleared = currentTimeMillis;
+            accessCache.clear();
+        }
+
+        Boolean cached = accessCache.get(player);
+        if (cached == null)
+        {
+            boolean canAccess = TFM_SuperadminList.isUserSuperadmin(player);
+            if (!canAccess)
+            {
+                Player supervisor = guestList.get(player);
+                canAccess = supervisor != null && supervisor.isOnline() && TFM_SuperadminList.isUserSuperadmin(supervisor);
+                if (!canAccess)
+                {
+                    guestList.remove(player);
+                }
+            }
+            cached = canAccess;
+            accessCache.put(player, cached);
+        }
+        return cached;
+    }
+
+    public static enum WeatherMode
+    {
+        OFF("off"),
+        RAIN("rain"),
+        STORM("storm,thunderstorm");
+        //
+        private final List<String> aliases;
+
+        private WeatherMode(String aliases)
+        {
+            this.aliases = Arrays.asList(StringUtils.split(aliases, ","));
+        }
+
+        private void setWorldToWeather(World world)
+        {
+            world.setStorm(this == RAIN || this == STORM);
+            world.setWeatherDuration(this == RAIN || this == STORM ? 20 * 60 * 5 : 0);
+
+            world.setThundering(this == STORM);
+            world.setThunderDuration(this == STORM ? 20 * 60 * 5 : 0);
+        }
+
+        public static WeatherMode getByAlias(String needle)
+        {
+            needle = needle.toLowerCase();
+            for (WeatherMode mode : values())
+            {
+                if (mode.aliases.contains(needle))
+                {
+                    return mode;
+                }
+            }
+            return null;
+        }
+    }
+
+    public static enum TimeOfDay
+    {
+        INHERIT(),
+        SUNRISE("sunrise,morning", 0),
+        NOON("noon,midday,day", 6000),
+        SUNSET("sunset,evening", 12000),
+        MIDNIGHT("midnight,night", 18000);
+        //
+        private final int timeTicks;
+        private final List<String> aliases;
+
+        private TimeOfDay()
+        {
+            this.timeTicks = 0;
+            this.aliases = null;
+        }
+
+        private TimeOfDay(String aliases, int timeTicks)
+        {
+            this.timeTicks = timeTicks;
+            this.aliases = Arrays.asList(StringUtils.split(aliases, ","));
+        }
+
+        public int getTimeTicks()
+        {
+            return timeTicks;
+        }
+
+        public void setWorldToTime(World world)
+        {
+            long time = world.getTime();
+            time -= time % 24000;
+            world.setTime(time + 24000 + getTimeTicks());
+        }
+
+        public static TimeOfDay getByAlias(String needle)
+        {
+            needle = needle.toLowerCase();
+            for (TimeOfDay time : values())
+            {
+                if (time.aliases != null && time.aliases.contains(needle))
+                {
+                    return time;
+                }
+            }
+            return null;
+        }
+    }
+
+    public WeatherMode getWeatherMode()
+    {
+        return weatherMode;
+    }
+
+    public void setWeatherMode(final WeatherMode weatherMode)
+    {
+        this.weatherMode = weatherMode;
+
+        try
+        {
+            weatherMode.setWorldToWeather(getWorld());
+        }
+        catch (Exception ex)
+        {
+        }
+    }
+
+    public TimeOfDay getTimeOfDay()
+    {
+        return timeOfDay;
+    }
+
+    public void setTimeOfDay(final TimeOfDay timeOfDay)
+    {
+        this.timeOfDay = timeOfDay;
+
+        try
+        {
+            timeOfDay.setWorldToTime(getWorld());
+        }
+        catch (Exception ex)
+        {
+        }
     }
 
     public static TFM_AdminWorld getInstance()

src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java

@@ -1,5 +1,10 @@
 package me.StevenLawson.TotalFreedomMod;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import me.StevenLawson.TotalFreedomMod.Commands.TFM_CommandLoader;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -9,98 +14,147 @@ import org.bukkit.entity.Player;
 
 public class TFM_CommandBlocker
 {
-    public static boolean isCommandBlocked(String usedcommand, CommandSender sender)
+    private Map<String, CommandBlockerEntry> blockedCommands = new HashMap<String, CommandBlockerEntry>();
+
+    private TFM_CommandBlocker()
     {
+        parseBlockingRules();
+    }
 
-        String name = sender.getName();
+    public final void parseBlockingRules()
-        usedcommand = usedcommand.toLowerCase().trim();
+    {
+        blockedCommands.clear();
 
-        for (String blocked_command : TotalFreedomMod.blockedCommands)
+        CommandMap commandMap = TFM_CommandLoader.getInstance().getCommandMap();
+        if (commandMap == null)
         {
-            String[] parts = blocked_command.split(":");
+            TFM_Log.severe("Error loading commandMap.");
+            return;
+        }
+
+        List<String> _blockedCommands = (List<String>) TFM_ConfigEntry.BLOCKED_COMMANDS.getList();
+        for (String rawEntry : _blockedCommands)
+        {
+            String[] parts = rawEntry.split(":");
             if (parts.length < 3 || parts.length > 4)
             {
                 continue;
             }
 
-            if (!(usedcommand + " ").startsWith(parts[2] + " "))
+            CommandBlockerRank rank = CommandBlockerRank.fromToken(parts[0]);
-            {
+            if (rank == null)
-
-                CommandMap commandMap = TFM_CommandLoader.getInstance().getCommandMap();
-                if (commandMap == null)
-                {
-                    continue;
-                }
-
-                Command command = commandMap.getCommand(parts[2].replaceAll("/", ""));
-                if (command == null)
-                {
-                    continue;
-                }
-
-                boolean block = false;
-                for (String alias : command.getAliases())
-                {
-                    if (usedcommand.replaceAll("/", "").startsWith(alias))
-                    {
-                        block = true;
-                        break;
-                    }
-                }
-
-                if (!block)
-                {
-                    continue;
-                }
-            }
-
-
-            if (SenderRank.hasPermissions(sender, parts[0]))
             {
                 continue;
             }
 
-            // Past this line indicates that the command is blocked.
+            CommandBlockerAction action = CommandBlockerAction.fromToken(parts[1]);
-
+            if (action == null)
-            // Optional: Send a message
-            if (parts.length == 4)
             {
-                if ("_".equals(parts[3]))
+                continue;
+            }
+
+            String command = parts[2];
+            if (command == null || command.isEmpty())
+            {
+                continue;
+            }
+            Matcher matcher = Pattern.compile("^/?(\\S+)").matcher(command);
+            if (matcher.find())
+            {
+                command = matcher.group(1);
+                if (command == null)
                 {
-                    sender.sendMessage(ChatColor.GRAY + "That command is blocked.");
+                    continue;
                 }
                 else
                 {
-                    sender.sendMessage(ChatColor.GRAY + TFM_Util.colorise(parts[3]));
+                    command = command.toLowerCase().trim();
                 }
             }
+            else
+            {
+                continue;
+            }
 
-            // Action
+            String message = null;
-            if ("b".equals(parts[1]))
+            if (parts.length == 4)
             {
-                return true;
+                message = parts[3];
             }
-            else if ("a".equals(parts[1]))
+
+            CommandBlockerEntry blockedCommandEntry = new CommandBlockerEntry(rank, action, command, message);
+
+            Command bukkitCommand = commandMap.getCommand(command);
+            if (bukkitCommand == null)
             {
-                if (SenderRank.getSenderRank(sender).rank < 2) // Only auto-eject Ops and non-ops
+                //TFM_Log.info("Blocking unknown command: " + blockedCommandEntry.getCommand());
+                blockedCommands.put(blockedCommandEntry.getCommand(), blockedCommandEntry);
+            }
+            else
+            {
+                blockedCommandEntry.setCommand(bukkitCommand.getName().toLowerCase());
+
+                //TFM_Log.info("Blocking command: " + blockedCommandEntry.getCommand());
+                blockedCommands.put(blockedCommandEntry.getCommand(), blockedCommandEntry);
+
+                for (String alias : bukkitCommand.getAliases())
                 {
-                    TFM_Util.autoEject((Player) sender, "You used a prohibited command: " + usedcommand);
+                    //TFM_Log.info("Blocking alias: " + alias.toLowerCase() + " of " + blockedCommandEntry.getCommand());
-                    TFM_Util.bcastMsg(name + " was automatically kicked for using harmful commands.", ChatColor.RED);
+                    blockedCommands.put(alias.toLowerCase(), blockedCommandEntry);
                 }
-                return true;
-            }
-            else if ("u".equals(parts[1]))
-            {
-                sender.sendMessage("Unknown command. Type \"help\" for help.");
-                return true;
             }
+        }
+    }
+
+    public boolean isCommandBlocked(String command, CommandSender sender)
+    {
+        return isCommandBlocked(command, sender, true);
+    }
+
+    public boolean isCommandBlocked(String command, CommandSender sender, boolean doAction)
+    {
+        if (command == null || command.isEmpty())
+        {
             return false;
         }
 
+        Matcher matcher = Pattern.compile("^/?(\\S+)").matcher(command);
+        if (matcher.find())
+        {
+            command = matcher.group(1);
+            if (command == null)
+            {
+                return false;
+            }
+            else
+            {
+                command = command.toLowerCase().trim();
+            }
+        }
+        else
+        {
+            return false;
+        }
+
+        final CommandBlockerEntry blockedCommandEntry = blockedCommands.get(command);
+
+        if (blockedCommandEntry != null)
+        {
+            if (!blockedCommandEntry.getRank().hasPermission(sender))
+            {
+                if (doAction)
+                {
+                    blockedCommandEntry.doActions(sender);
+                }
+
+                return true;
+            }
+        }
+
         return false;
     }
 
-    public enum SenderRank
+    private static enum CommandBlockerRank
     {
         ANYONE("a", 0),
         OP("o", 1),
@@ -108,57 +162,171 @@ public class TFM_CommandBlocker
         TELNET("t", 3),
         SENIOR("c", 4),
         NOBODY("n", 5);
-        private String letter = "n";
+        private final String token;
-        private int rank = 5;
+        private final int level;
 
-        SenderRank(String letter, int rank)
+        private CommandBlockerRank(String token, int level)
         {
-            this.letter = letter;
+            this.token = token;
-            this.rank = rank;
+            this.level = level;
         }
 
-        public static boolean hasPermissions(CommandSender sender, String letter)
+        public String getToken()
         {
-            return (getSenderRank(sender).rank >= getSenderRankByLetter(letter).rank);
+            return this.token;
         }
 
-        public static SenderRank getSenderRank(CommandSender sender)
+        public boolean hasPermission(CommandSender sender)
         {
-            if (!(sender instanceof Player))
+            return getSenderRank(sender).level >= this.level;
+        }
+
+        public static CommandBlockerRank getSenderRank(CommandSender sender)
+        {
+            if (!TFM_SuperadminList.isUserSuperadmin(sender))
+            {
+                if (sender.isOp())
+                {
+                    return OP;
+                }
+
+                return ANYONE;
+            }
+            else
             {
                 if (TFM_SuperadminList.isSeniorAdmin(sender))
                 {
-                    return SenderRank.SENIOR;
+                    return SENIOR;
                 }
-                else
+
+                if (!(sender instanceof Player))
                 {
-                    return SenderRank.TELNET;
+                    return TELNET;
                 }
-            }
 
-            if (TFM_SuperadminList.isUserSuperadmin(sender))
+                return SUPER;
-            {
-                return SenderRank.SUPER;
             }
-
-            if (sender.isOp())
-            {
-                return SenderRank.OP;
-            }
-
-            return SenderRank.ANYONE;
         }
 
-        public static SenderRank getSenderRankByLetter(String letter)
+        public static CommandBlockerRank fromToken(String token)
         {
-            for (SenderRank rank : SenderRank.values())
+            for (CommandBlockerRank rank : CommandBlockerRank.values())
             {
-                if (letter.equals(rank.letter))
+                if (rank.getToken().equalsIgnoreCase(token))
                 {
                     return rank;
                 }
             }
-            return SenderRank.NOBODY;
+            return ANYONE;
         }
     }
+
+    private enum CommandBlockerAction
+    {
+        BLOCK("b"),
+        BLOCK_AND_EJECT("a"),
+        BLOCK_UNKNOWN("u");
+        private final String token;
+
+        private CommandBlockerAction(String token)
+        {
+            this.token = token;
+        }
+
+        public String getToken()
+        {
+            return this.token;
+        }
+
+        public static CommandBlockerAction fromToken(String token)
+        {
+            for (CommandBlockerAction action : CommandBlockerAction.values())
+            {
+                if (action.getToken().equalsIgnoreCase(token))
+                {
+                    return action;
+                }
+            }
+            return null;
+        }
+    }
+
+    private static class CommandBlockerEntry
+    {
+        private final CommandBlockerRank rank;
+        private final CommandBlockerAction action;
+        private String command;
+        private final String message;
+
+        public CommandBlockerEntry(CommandBlockerRank rank, CommandBlockerAction action, String command, String message)
+        {
+            this.rank = rank;
+            this.action = action;
+            this.command = command;
+            this.message = message;
+        }
+
+        public CommandBlockerAction getAction()
+        {
+            return this.action;
+        }
+
+        public String getCommand()
+        {
+            return this.command;
+        }
+
+        public String getMessage()
+        {
+            return this.message;
+        }
+
+        public CommandBlockerRank getRank()
+        {
+            return this.rank;
+        }
+
+        public void setCommand(String command)
+        {
+            this.command = command;
+        }
+
+        private void doActions(CommandSender sender)
+        {
+            if (this.action == CommandBlockerAction.BLOCK_AND_EJECT && sender instanceof Player)
+            {
+                TFM_Util.autoEject((Player) sender, "You used a prohibited command: " + this.command);
+                TFM_Util.bcastMsg(sender.getName() + " was automatically kicked for using harmful commands.", ChatColor.RED);
+            }
+            else
+            {
+                String response;
+
+                if (this.action == CommandBlockerAction.BLOCK_UNKNOWN)
+                {
+                    response = "Unknown command. Type \"help\" for help.";
+                }
+                else if (this.message == null || "_".equals(this.message))
+                {
+                    response = ChatColor.GRAY + "That command is blocked.";
+                }
+                else
+                {
+                    response = ChatColor.GRAY + TFM_Util.colorize(this.message);
+                }
+
+                sender.sendMessage(response);
+            }
+        }
+    }
+
+    public static TFM_CommandBlocker getInstance()
+    {
+        return TFM_CommandBlockerHolder.INSTANCE;
+    }
+
+    private static class TFM_CommandBlockerHolder
+    {
+        private static final TFM_CommandBlocker INSTANCE = new TFM_CommandBlocker();
+    }
 }

src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlockerNew.java

@@ -1,328 +0,0 @@
-package me.StevenLawson.TotalFreedomMod;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import me.StevenLawson.TotalFreedomMod.Commands.TFM_CommandLoader;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandMap;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-public class TFM_CommandBlockerNew
-{
-    private Map<String, TFM_CommandBlocker_BlockedCommandEntry> blockedCommands = new HashMap<String, TFM_CommandBlocker_BlockedCommandEntry>();
-
-    private TFM_CommandBlockerNew()
-    {
-        parseBlockingRules();
-    }
-
-    public final void parseBlockingRules()
-    {
-        blockedCommands.clear();
-
-        CommandMap commandMap = TFM_CommandLoader.getInstance().getCommandMap();
-        if (commandMap == null)
-        {
-            TFM_Log.severe("Error loading commandMap.");
-            return;
-        }
-
-        for (String rawEntry : TotalFreedomMod.blockedCommands)
-        {
-            String[] parts = rawEntry.split(":");
-            if (parts.length < 3 || parts.length > 4)
-            {
-                continue;
-            }
-
-            CommandBlockerRank rank = CommandBlockerRank.fromToken(parts[0]);
-            if (rank == null)
-            {
-                continue;
-            }
-
-            CommandBlockerAction action = CommandBlockerAction.fromToken(parts[1]);
-            if (action == null)
-            {
-                continue;
-            }
-
-            String command = parts[2];
-            if (command == null || command.isEmpty())
-            {
-                continue;
-            }
-            Matcher matcher = Pattern.compile("^/?(\\S+)").matcher(command);
-            if (matcher.find())
-            {
-                command = matcher.group(1);
-                if (command == null)
-                {
-                    continue;
-                }
-                else
-                {
-                    command = command.toLowerCase().trim();
-                }
-            }
-            else
-            {
-                continue;
-            }
-
-            String message = null;
-            if (parts.length == 4)
-            {
-                message = parts[3];
-            }
-
-            TFM_CommandBlocker_BlockedCommandEntry blockedCommandEntry = new TFM_CommandBlocker_BlockedCommandEntry(rank, action, command, message);
-
-            Command bukkitCommand = commandMap.getCommand(command);
-            if (bukkitCommand == null)
-            {
-                //TFM_Log.info("Blocking unknown command: " + blockedCommandEntry.getCommand());
-                blockedCommands.put(blockedCommandEntry.getCommand(), blockedCommandEntry);
-            }
-            else
-            {
-                blockedCommandEntry.setCommand(bukkitCommand.getName().toLowerCase());
-
-                //TFM_Log.info("Blocking command: " + blockedCommandEntry.getCommand());
-                blockedCommands.put(blockedCommandEntry.getCommand(), blockedCommandEntry);
-
-                for (String alias : bukkitCommand.getAliases())
-                {
-                    //TFM_Log.info("Blocking alias: " + alias.toLowerCase() + " of " + blockedCommandEntry.getCommand());
-                    blockedCommands.put(alias.toLowerCase(), blockedCommandEntry);
-                }
-            }
-        }
-    }
-
-    public boolean isCommandBlocked(String command, CommandSender sender)
-    {
-        return isCommandBlocked(command, sender, true);
-    }
-
-    public boolean isCommandBlocked(String command, CommandSender sender, boolean doAction)
-    {
-        if (command == null || command.isEmpty())
-        {
-            return false;
-        }
-
-        Matcher matcher = Pattern.compile("^/?(\\S+)").matcher(command);
-        if (matcher.find())
-        {
-            command = matcher.group(1);
-            if (command == null)
-            {
-                return false;
-            }
-            else
-            {
-                command = command.toLowerCase().trim();
-            }
-        }
-        else
-        {
-            return false;
-        }
-
-        TFM_CommandBlocker_BlockedCommandEntry blockedCommandEntry = blockedCommands.get(command);
-
-        if (blockedCommandEntry != null)
-        {
-            if (!blockedCommandEntry.getRank().hasPermission(sender))
-            {
-                if (doAction)
-                {
-                    blockedCommandEntry.doActions(sender);
-                }
-
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private static enum CommandBlockerRank
-    {
-        ANYONE("a", 0),
-        OP("o", 1),
-        SUPER("s", 2),
-        TELNET("t", 3),
-        SENIOR("c", 4),
-        NOBODY("n", 5);
-        private final String token;
-        private final int level;
-
-        private CommandBlockerRank(String token, int level)
-        {
-            this.token = token;
-            this.level = level;
-        }
-
-        public String getToken()
-        {
-            return this.token;
-        }
-
-        public boolean hasPermission(CommandSender sender)
-        {
-            return getSenderRank(sender).level >= this.level;
-        }
-
-        public static CommandBlockerRank getSenderRank(CommandSender sender)
-        {
-            if (!TFM_SuperadminList.isUserSuperadmin(sender))
-            {
-                if (sender.isOp())
-                {
-                    return OP;
-                }
-
-                return ANYONE;
-            }
-            else
-            {
-                if (TFM_SuperadminList.isSeniorAdmin(sender))
-                {
-                    return SENIOR;
-                }
-
-                if (!(sender instanceof Player))
-                {
-                    return TELNET;
-                }
-
-                return SUPER;
-            }
-        }
-
-        public static CommandBlockerRank fromToken(String token)
-        {
-            for (CommandBlockerRank rank : CommandBlockerRank.values())
-            {
-                if (rank.getToken().equalsIgnoreCase(token))
-                {
-                    return rank;
-                }
-            }
-            return ANYONE;
-        }
-    }
-
-    private enum CommandBlockerAction
-    {
-        BLOCK("b"), BLOCK_AND_EJECT("a"), BLOCK_UNKNOWN("u");
-        private final String token;
-
-        private CommandBlockerAction(String token)
-        {
-            this.token = token;
-        }
-
-        public String getToken()
-        {
-            return this.token;
-        }
-
-        public static CommandBlockerAction fromToken(String token)
-        {
-            for (CommandBlockerAction action : CommandBlockerAction.values())
-            {
-                if (action.getToken().equalsIgnoreCase(token))
-                {
-                    return action;
-                }
-            }
-            return null;
-        }
-    }
-
-    private static class TFM_CommandBlocker_BlockedCommandEntry
-    {
-        private final CommandBlockerRank rank;
-        private final CommandBlockerAction action;
-        private String command;
-        private final String message;
-
-        public TFM_CommandBlocker_BlockedCommandEntry(CommandBlockerRank rank, CommandBlockerAction action, String command, String message)
-        {
-            this.rank = rank;
-            this.action = action;
-            this.command = command;
-            this.message = message;
-        }
-
-        public CommandBlockerAction getAction()
-        {
-            return this.action;
-        }
-
-        public String getCommand()
-        {
-            return this.command;
-        }
-
-        public String getMessage()
-        {
-            return this.message;
-        }
-
-        public CommandBlockerRank getRank()
-        {
-            return this.rank;
-        }
-
-        public void setCommand(String command)
-        {
-            this.command = command;
-        }
-
-        private void doActions(CommandSender sender)
-        {
-            if (this.action == CommandBlockerAction.BLOCK_AND_EJECT && sender instanceof Player)
-            {
-                TFM_Util.autoEject((Player) sender, "You used a prohibited command: " + this.command);
-                TFM_Util.bcastMsg(sender.getName() + " was automatically kicked for using harmful commands.", ChatColor.RED);
-            }
-            else
-            {
-                String response;
-
-                if (this.action == CommandBlockerAction.BLOCK_UNKNOWN)
-                {
-                    response = "Unknown command. Type \"help\" for help.";
-                }
-                else if (this.message == null || "_".equals(this.message))
-                {
-                    response = ChatColor.GRAY + "That command is blocked.";
-                }
-                else
-                {
-                    response = ChatColor.GRAY + TFM_Util.colorise(this.message);
-                }
-
-                sender.sendMessage(response);
-            }
-        }
-    }
-
-    public static TFM_CommandBlockerNew getInstance()
-    {
-        return TFM_CommandBlockerNewHolder.INSTANCE;
-    }
-
-    private static class TFM_CommandBlockerNewHolder
-    {
-        private static final TFM_CommandBlockerNew INSTANCE = new TFM_CommandBlockerNew();
-    }
-}

src/me/StevenLawson/TotalFreedomMod/TFM_Config.java

@@ -0,0 +1,293 @@
+package me.StevenLawson.TotalFreedomMod;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.EnumMap;
+import java.util.List;
+import net.minecraft.util.org.apache.commons.io.FileUtils;
+import org.bukkit.configuration.InvalidConfigurationException;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+public class TFM_Config
+{
+    public static final String CONFIG_FILENAME = "config.yml";
+    public static final File CONFIG_FILE = new File(TotalFreedomMod.plugin.getDataFolder(), CONFIG_FILENAME);
+    //
+    private final EnumMap<TFM_ConfigEntry, Object> configEntryMap = new EnumMap<TFM_ConfigEntry, Object>(TFM_ConfigEntry.class);
+
+    private TFM_Config()
+    {
+        try
+        {
+            try
+            {
+                InputStream defaultConfig = getDefaultConfig();
+                TFM_Config_DefaultsLoader defaultsLoader = new TFM_Config_DefaultsLoader(defaultConfig);
+                for (TFM_ConfigEntry entry : TFM_ConfigEntry.values())
+                {
+                    configEntryMap.put(entry, defaultsLoader.get(entry.getConfigName()));
+                }
+                defaultConfig.close();
+            }
+            catch (IOException ex)
+            {
+                TFM_Log.severe(ex);
+            }
+
+            copyDefaultConfig(CONFIG_FILE);
+
+            load();
+        }
+        catch (Exception ex)
+        {
+            TFM_Log.severe(ex);
+        }
+    }
+
+    public final void load()
+    {
+        try
+        {
+            YamlConfiguration config = new YamlConfiguration();
+
+            config.load(CONFIG_FILE);
+
+            for (TFM_ConfigEntry entry : TFM_ConfigEntry.values())
+            {
+                String path = entry.getConfigName();
+                if (config.contains(path))
+                {
+                    Object value = config.get(path);
+                    if (value == null || entry.getType().isAssignableFrom(value.getClass()))
+                    {
+                        configEntryMap.put(entry, value);
+                    }
+                    else
+                    {
+                        TFM_Log.warning("Value for " + entry.getConfigName() + " is of type " + value.getClass().getSimpleName() + ". Needs to be " + entry.getType().getSimpleName() + ". Using default value.");
+                    }
+                }
+                else
+                {
+                    TFM_Log.warning("Missing configuration entry " + entry.getConfigName() + ". Using default value.");
+                }
+            }
+        }
+        catch (FileNotFoundException ex)
+        {
+            TFM_Log.severe(ex);
+        }
+        catch (IOException ex)
+        {
+            TFM_Log.severe(ex);
+        }
+        catch (InvalidConfigurationException ex)
+        {
+            TFM_Log.severe(ex);
+        }
+    }
+
+    public String getString(TFM_ConfigEntry entry)
+    {
+        try
+        {
+            return get(entry, String.class);
+        }
+        catch (IllegalArgumentException ex)
+        {
+            TFM_Log.severe(ex);
+        }
+        return null;
+    }
+
+    public void setString(TFM_ConfigEntry entry, String value)
+    {
+        try
+        {
+            set(entry, value, String.class);
+        }
+        catch (IllegalArgumentException ex)
+        {
+            TFM_Log.severe(ex);
+        }
+    }
+
+    public Double getDouble(TFM_ConfigEntry entry)
+    {
+        try
+        {
+            return get(entry, Double.class);
+        }
+        catch (IllegalArgumentException ex)
+        {
+            TFM_Log.severe(ex);
+        }
+        return null;
+    }
+
+    public void setDouble(TFM_ConfigEntry entry, Double value)
+    {
+        try
+        {
+            set(entry, value, Double.class);
+        }
+        catch (IllegalArgumentException ex)
+        {
+            TFM_Log.severe(ex);
+        }
+    }
+
+    public Boolean getBoolean(TFM_ConfigEntry entry)
+    {
+        try
+        {
+            return get(entry, Boolean.class);
+        }
+        catch (IllegalArgumentException ex)
+        {
+            TFM_Log.severe(ex);
+        }
+        return null;
+    }
+
+    public void setBoolean(TFM_ConfigEntry entry, Boolean value)
+    {
+        try
+        {
+            set(entry, value, Boolean.class);
+        }
+        catch (IllegalArgumentException ex)
+        {
+            TFM_Log.severe(ex);
+        }
+    }
+
+    public Integer getInteger(TFM_ConfigEntry entry)
+    {
+        try
+        {
+            return get(entry, Integer.class);
+        }
+        catch (IllegalArgumentException ex)
+        {
+            TFM_Log.severe(ex);
+        }
+        return null;
+    }
+
+    public void setInteger(TFM_ConfigEntry entry, Integer value)
+    {
+        try
+        {
+            set(entry, value, Integer.class);
+        }
+        catch (IllegalArgumentException ex)
+        {
+            TFM_Log.severe(ex);
+        }
+    }
+
+    public List getList(TFM_ConfigEntry entry)
+    {
+        try
+        {
+            return get(entry, List.class);
+        }
+        catch (IllegalArgumentException ex)
+        {
+            TFM_Log.severe(ex);
+        }
+        return null;
+    }
+
+    public <T> T get(TFM_ConfigEntry entry, Class<T> type) throws IllegalArgumentException
+    {
+        Object value = configEntryMap.get(entry);
+        try
+        {
+            return type.cast(value);
+        }
+        catch (ClassCastException ex)
+        {
+            throw new IllegalArgumentException(entry.name() + " is not of type " + type.getSimpleName());
+        }
+    }
+
+    public <T> void set(TFM_ConfigEntry entry, T value, Class<T> type) throws IllegalArgumentException
+    {
+        if (!type.isAssignableFrom(entry.getType()))
+        {
+            throw new IllegalArgumentException(entry.name() + " is not of type " + type.getSimpleName());
+        }
+        if (value != null && !type.isAssignableFrom(value.getClass()))
+        {
+            throw new IllegalArgumentException("Value is not of type " + type.getSimpleName());
+        }
+        configEntryMap.put(entry, value);
+    }
+
+    private static void copyDefaultConfig(File targetFile)
+    {
+        if (targetFile.exists())
+        {
+            return;
+        }
+
+        TFM_Log.info("Installing default configuration file template: " + targetFile.getPath());
+
+        try
+        {
+            InputStream defaultConfig = getDefaultConfig();
+            FileUtils.copyInputStreamToFile(defaultConfig, targetFile);
+            defaultConfig.close();
+        }
+        catch (IOException ex)
+        {
+            TFM_Log.severe(ex);
+        }
+    }
+
+    private static InputStream getDefaultConfig()
+    {
+        return TotalFreedomMod.plugin.getResource(CONFIG_FILENAME);
+    }
+
+    private static class TFM_Config_DefaultsLoader
+    {
+        private YamlConfiguration defaults = null;
+
+        public TFM_Config_DefaultsLoader(InputStream defaultConfig)
+        {
+            try
+            {
+                defaults = new YamlConfiguration();
+                defaults.load(defaultConfig);
+            }
+            catch (IOException ex)
+            {
+                TFM_Log.severe(ex);
+            }
+            catch (InvalidConfigurationException ex)
+            {
+                TFM_Log.severe(ex);
+            }
+        }
+
+        public Object get(String path)
+        {
+            return defaults.get(path);
+        }
+    }
+
+    public static TFM_Config getInstance()
+    {
+        return TFM_ConfigHolder.INSTANCE;
+    }
+
+    private static class TFM_ConfigHolder
+    {
+        private static final TFM_Config INSTANCE = new TFM_Config();
+    }
+}

src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java

@@ -0,0 +1,141 @@
+package me.StevenLawson.TotalFreedomMod;
+
+import java.util.List;
+
+public enum TFM_ConfigEntry
+{
+    ADMIN_ONLY_MODE(Boolean.class, "admin_only_mode"),
+    ALLOW_EXPLOSIONS(Boolean.class, "allow_explosions"),
+    ALLOW_FIRE_PLACE(Boolean.class, "allow_fire_place"),
+    ALLOW_FIRE_SPREAD(Boolean.class, "allow_fire_spread"),
+    ALLOW_FLUID_SPREAD(Boolean.class, "allow_fluid_spread"),
+    ALLOW_LAVA_DAMAGE(Boolean.class, "allow_lava_damage"),
+    ALLOW_LAVA_PLACE(Boolean.class, "allow_lava_place"),
+    ALLOW_TNT_MINECARTS(Boolean.class, "allow_tnt_minecarts"),
+    ALLOW_WATER_PLACE(Boolean.class, "allow_water_place"),
+    AUTO_ENTITY_WIPE(Boolean.class, "auto_wipe"),
+    AUTO_PROTECT_SPAWNPOINTS(Boolean.class, "auto_protect_spawnpoints"),
+    DISABLE_NIGHT(Boolean.class, "disable_night"),
+    DISABLE_WEATHER(Boolean.class, "disable_weather"),
+    GENERATE_FLATLANDS(Boolean.class, "generate_flatlands"),
+    LANDMINES_ENABLED(Boolean.class, "landmines_enabled"),
+    MOB_LIMITER_DISABLE_DRAGON(Boolean.class, "mob_limiter_disable_dragon"),
+    MOB_LIMITER_DISABLE_GHAST(Boolean.class, "mob_limiter_disable_ghast"),
+    MOB_LIMITER_DISABLE_GIANT(Boolean.class, "mob_limiter_disable_giant"),
+    MOB_LIMITER_DISABLE_SLIME(Boolean.class, "mob_limiter_disable_slime"),
+    MOB_LIMITER_ENABLED(Boolean.class, "mob_limiter_enabled"),
+    MP44_ENABLED(Boolean.class, "mp44_enabled"),
+    NUKE_MONITOR(Boolean.class, "nuke_monitor"),
+    PET_PROTECT_ENABLED(Boolean.class, "pet_protect_enabled"),
+    PREPROCESS_LOG_ENABLED(Boolean.class, "preprocess_log"),
+    PROTECTED_AREAS_ENABLED(Boolean.class, "protected_areas_enabled"),
+    TOSSMOB_ENABLED(Boolean.class, "tossmob_enabled"),
+    TWITTERBOT_ENABLED(Boolean.class, "twitterbot_enabled"),
+    HTTPD_ENABLED(Boolean.class, "httpd_enabled"),
+    AUTOKICK_ENABLED(Boolean.class, "autokick_enabled"),
+    //
+    AUTO_PROTECT_RADIUS(Double.class, "auto_protect_radius"),
+    EXPLOSIVE_RADIUS(Double.class, "explosive_radius"),
+    NUKE_MONITOR_RANGE(Double.class, "nuke_monitor_range"),
+    AUTOKICK_THRESHOLD(Double.class, "autokick_threshold"),
+    //
+    FREECAM_TRIGGER_COUNT(Integer.class, "freecam_trigger_count"),
+    MOB_LIMITER_MAX(Integer.class, "mob_limiter_max"),
+    NUKE_MONITOR_COUNT_BREAK(Integer.class, "nuke_monitor_count_break"),
+    NUKE_MONITOR_COUNT_PLACE(Integer.class, "nuke_monitor_count_place"),
+    HTTPD_PORT(Integer.class, "httpd_port"),
+    AUTOKICK_TIME(Integer.class, "autokick_time"),
+    //
+    FLATLANDS_GENERATION_PARAMS(String.class, "flatlands_generation_params"),
+    LOGS_REGISTER_PASSWORD(String.class, "logs_register_password"),
+    LOGS_REGISTER_URL(String.class, "logs_register_url"),
+    SERVICE_CHECKER_URL(String.class, "service_checker_url"),
+    TWITTERBOT_SECRET(String.class, "twitterbot_secret"),
+    TWITTERBOT_URL(String.class, "twitterbot_url"),
+    HTTPD_PUBLIC_FOLDER(String.class, "httpd_public_folder"),
+    //
+    BLOCKED_COMMANDS(List.class, "blocked_commands"),
+    HOST_SENDER_NAMES(List.class, "host_sender_names"),
+    UNBANNABLE_USERNAMES(List.class, "unbannable_usernames");
+    //
+    private final Class<?> type;
+    private final String configName;
+
+    private TFM_ConfigEntry(Class<?> type, String configName)
+    {
+        this.type = type;
+        this.configName = configName;
+    }
+
+    public Class<?> getType()
+    {
+        return type;
+    }
+
+    public String getConfigName()
+    {
+        return configName;
+    }
+
+    public String getString()
+    {
+        return TFM_Config.getInstance().getString(this);
+    }
+
+    public String setString(String value)
+    {
+        TFM_Config.getInstance().setString(this, value);
+        return value;
+    }
+
+    public Double getDouble()
+    {
+        return TFM_Config.getInstance().getDouble(this);
+    }
+
+    public Double setDouble(Double value)
+    {
+        TFM_Config.getInstance().setDouble(this, value);
+        return value;
+    }
+
+    public Boolean getBoolean()
+    {
+        return TFM_Config.getInstance().getBoolean(this);
+    }
+
+    public Boolean setBoolean(Boolean value)
+    {
+        TFM_Config.getInstance().setBoolean(this, value);
+        return value;
+    }
+
+    public Integer getInteger()
+    {
+        return TFM_Config.getInstance().getInteger(this);
+    }
+
+    public Integer setInteger(Integer value)
+    {
+        TFM_Config.getInstance().setInteger(this, value);
+        return value;
+    }
+
+    public List getList()
+    {
+        return TFM_Config.getInstance().getList(this);
+    }
+
+    public static TFM_ConfigEntry findConfigEntry(String name)
+    {
+        name = name.toLowerCase().replace("_", "");
+        for (TFM_ConfigEntry entry : values())
+        {
+            if (entry.toString().toLowerCase().replace("_", "").equals(name))
+            {
+                return entry;
+            }
+        }
+        return null;
+    }
+}

src/me/StevenLawson/TotalFreedomMod/TFM_CustomWorld.java

@@ -0,0 +1,39 @@
+package me.StevenLawson.TotalFreedomMod;
+
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+public abstract class TFM_CustomWorld
+{
+    private World world;
+
+    protected abstract World generateWorld();
+
+    public void sendToWorld(Player player)
+    {
+        try
+        {
+            player.teleport(getWorld().getSpawnLocation());
+        }
+        catch (Exception ex)
+        {
+            player.sendMessage(ex.getMessage());
+        }
+    }
+
+    public final World getWorld() throws Exception
+    {
+        if (world == null || !Bukkit.getWorlds().contains(world))
+        {
+            world = generateWorld();
+        }
+
+        if (world == null)
+        {
+            throw new Exception("World not loaded.");
+        }
+
+        return world;
+    }
+}

src/me/StevenLawson/TotalFreedomMod/TFM_EssentialsBridge.java

@@ -0,0 +1,116 @@
+package me.StevenLawson.TotalFreedomMod;
+
+import com.earth2me.essentials.Essentials;
+import com.earth2me.essentials.User;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+
+public class TFM_EssentialsBridge
+{
+    private Essentials essentialsPlugin = null;
+
+    private TFM_EssentialsBridge()
+    {
+    }
+
+    public Essentials getEssentialsPlugin()
+    {
+        if (this.essentialsPlugin == null)
+        {
+            try
+            {
+                final Plugin essentials = Bukkit.getServer().getPluginManager().getPlugin("Essentials");
+                if (essentials != null)
+                {
+                    if (essentials instanceof Essentials)
+                    {
+                        this.essentialsPlugin = (Essentials) essentials;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                TFM_Log.severe(ex);
+            }
+        }
+        return this.essentialsPlugin;
+    }
+
+    public 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 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 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 boolean isEssentialsEnabled()
+    {
+        try
+        {
+            final Essentials essentials = getEssentialsPlugin();
+            if (essentials != null)
+            {
+                return essentials.isEnabled();
+            }
+        }
+        catch (Exception ex)
+        {
+            TFM_Log.severe(ex);
+        }
+        return false;
+    }
+
+    public static TFM_EssentialsBridge getInstance()
+    {
+        return TFM_EssentialsBridgeHolder.INSTANCE;
+    }
+
+    private static class TFM_EssentialsBridgeHolder
+    {
+        private static final TFM_EssentialsBridge INSTANCE = new TFM_EssentialsBridge();
+    }
+}

src/me/StevenLawson/TotalFreedomMod/TFM_Flatlands.java

@@ -0,0 +1,97 @@
+package me.StevenLawson.TotalFreedomMod;
+
+import java.io.File;
+import net.minecraft.util.org.apache.commons.io.FileUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.WorldCreator;
+import org.bukkit.WorldType;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+
+public class TFM_Flatlands extends TFM_CustomWorld
+{
+    private static final String GENERATION_PARAMETERS = TFM_ConfigEntry.FLATLANDS_GENERATION_PARAMS.getString();
+    private static final String WORLD_NAME = "flatlands";
+
+    private TFM_Flatlands()
+    {
+    }
+
+    @Override
+    protected World generateWorld()
+    {
+        if (!TFM_ConfigEntry.GENERATE_FLATLANDS.getBoolean())
+        {
+            return null;
+        }
+
+        wipeFlatlandsIfFlagged();
+
+        WorldCreator worldCreator = new WorldCreator(WORLD_NAME);
+        worldCreator.generateStructures(false);
+        worldCreator.type(WorldType.NORMAL);
+        worldCreator.environment(World.Environment.NORMAL);
+        worldCreator.generator(new CleanroomChunkGenerator(GENERATION_PARAMETERS));
+
+        World world = Bukkit.getServer().createWorld(worldCreator);
+
+        world.setSpawnFlags(false, false);
+        world.setSpawnLocation(0, 50, 0);
+
+        Block welcomeSignBlock = world.getBlockAt(0, 50, 0);
+        welcomeSignBlock.setType(Material.SIGN_POST);
+        org.bukkit.block.Sign welcomeSign = (org.bukkit.block.Sign) welcomeSignBlock.getState();
+
+        org.bukkit.material.Sign signData = (org.bukkit.material.Sign) welcomeSign.getData();
+        signData.setFacingDirection(BlockFace.NORTH);
+
+        welcomeSign.setLine(0, ChatColor.GREEN + "Flatlands");
+        welcomeSign.setLine(1, ChatColor.DARK_GRAY + "---");
+        welcomeSign.setLine(2, ChatColor.YELLOW + "Spawn Point");
+        welcomeSign.setLine(3, ChatColor.DARK_GRAY + "---");
+        welcomeSign.update();
+
+        TFM_GameRuleHandler.commitGameRules();
+
+        return world;
+    }
+
+    public static void wipeFlatlandsIfFlagged()
+    {
+        boolean doFlatlandsWipe = false;
+        try
+        {
+            doFlatlandsWipe = TFM_Util.getSavedFlag("do_wipe_flatlands");
+        }
+        catch (Exception ex)
+        {
+        }
+
+        if (doFlatlandsWipe)
+        {
+            if (Bukkit.getServer().getWorld("flatlands") == null)
+            {
+                TFM_Log.info("Wiping flatlands.");
+                TFM_Util.setSavedFlag("do_wipe_flatlands", false);
+                FileUtils.deleteQuietly(new File("./flatlands"));
+            }
+            else
+            {
+                TFM_Log.severe("Can't wipe flatlands, it is already loaded.");
+            }
+        }
+    }
+
+    public static TFM_Flatlands getInstance()
+    {
+        return TFM_FlatlandsHolder.INSTANCE;
+    }
+
+    private static class TFM_FlatlandsHolder
+    {
+        private static final TFM_Flatlands INSTANCE = new TFM_Flatlands();
+    }
+}