Increment version number to 4.2

Removed Legacy Login

.gitignore

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

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

@@ -1,11 +1,3 @@
 # TotalFreedomMod License #
-TotalFreedomMod is primarily derived from the Bukkit and CraftBukkit library and server, respectively. Therefore, we have chosen for it to inherit the GNU GPLv3 License as used by those programs. This license is available at http://www.gnu.org/licenses/gpl-3.0.txt
 
-We do, however, ask that you comply by several restrictions. These restrictions are in place to make sure that credit is given to the original authors, who remain the maintainers of the plugin and its source code.
-* A un-edited copy of this LICENSE.md shall always be included with this source code.
-* TotalFreedomMod source code and its derivations shall be freely distributable between anyone who chooses to download it.
-* You shall not remove the keywords "Madgeek1450", "StevenLawson", "DarthSalamon" or "JeromSar" from any part of the source code.
-* Compiled binaries (*.jar's) shall not to be distributed.
-  * If you wish to obtain a copy of TotalFreedomMod you must compile the original source code or it's derivations yourself.
-  * The primary developers, StevenLawson (Madgeek1450) and Jerom van der Sar (DarthSalamon), may choose to provide official binaries on a discretionary basis.
-* Any restrictions listed here may be waived by any of the above mentioned primary developers.
+TotalFreedomMod is licensed under the TotalFreedom General License. It is available [here](https://github.com/TotalFreedom/License/blob/master/LICENSE.md).

appinfo.properties

@@ -1,5 +0,0 @@
-#Tue, 20 Aug 2013 17:31:27 +0200
-
-program.VERSION=3.1
-program.BUILDNUM=469
-program.BUILDDATE=08/20/2013 05\:31 PM

build.xml

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

buildcreator.default.properties

@@ -0,0 +1,2 @@
+# Build creator configuration
+program.buildcreator=Unknown

buildnumber.properties

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Tue Aug 20 17:31:27 CEST 2013
-build.number=470
+#Tue May 13 17:55:47 CEST 2014
+build.number=846

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
@@ -48,9 +48,11 @@ jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
-    ${libs.CraftBukkit.classpath}:\
     ${libs.WorldEdit.classpath}:\
-    ${libs.DisguiseCraft.classpath}
+    ${libs.DisguiseCraft.classpath}:\
+    ${libs.Essentials.classpath}:\
+    ${libs.BukkitTelnet.classpath}:\
+    ${libs.CraftBukkit.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/bans.yml

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

src/config.yml

@@ -1,33 +1,32 @@
-# TotalFreedomMod v3.1 Configuration
+# TotalFreedomMod v4.2 Configuration
 # by Madgeek1450 and DarthSalamon
 
-# Block placement prevention:
-allow_fire_place: false
-allow_fire_spread: false
-allow_lava_damage: false
-allow_lava_place: false
-allow_water_place: false
-allow_fluid_spread: false
-allow_tnt_minecarts: false
+# Blocking certain events
+allow:
+  fire_place: false
+  fire_spread: false
+  fluid_spread: false
+  lava_place: false
+  lava_damage: false
+  water_place: false
+  tnt_minecarts: false
+  explosions: false
 
-# Explosion management:
-allow_explosions: false
 explosive_radius: 4.0
 
 # Blocked commands:
 #
 # How blocked commands work:
-# All sections described below are delimited by colon-characters.
-# Make sure that you block a command by it's main command name, not an alias
-# -as all aliases are blocked by default. Commands are case-insensitive ofcourse.
-# You can block specific subcommands aswell. eg: /mail sendall
+# All sections described below are delimited by colon characters.
+# Make sure that you block a command by its main command name, not an alias
+# -as all aliases are blocked by default. Commands are case-insensitive.
 #
 # * The first section is a letter which indicates which rank may use this command
 #   Valid ranks:
 #   n - Nobody (Completely disabled)
 #   c - Senior Admins (Console)
 #   t - Telnet Admins (Console)
-#   s - SuperAdmins
+#   s - Super Admins (Any in-game admin)
 #   o - Ops (Non-Ops won't be able to use it)
 #
 # * The second section is a letter which indicates what to do when a player executes that command.
@@ -50,46 +49,65 @@ explosive_radius: 4.0
 #
 blocked_commands:
   # Disabled commands
-  - n:b:/time:Server-side time changing is disabled. Please use /ptime to set your own personal time.
-  - n:b:/md:This server now uses DisguiseCraft instead of MobDisguise. Type /d to disguise and /u to undisguise.
-  - n:b:/gamemode:Use /creative and /survival to set your gamemode.
-  - n:b:/gamerule:_
-  - n:b:/ban:_
-  - n:b:/pardon:_
-  - n:b:/toggledownfall:_
-  - n:b:/ban-ip:_
-  - n:b:/pardon-ip:_
+  - 'n:b:/time:Server-side time changing is disabled. Please use /ptime to set your own personal time.'
+  - 'n:b:/md:This server now uses DisguiseCraft instead of MobDisguise. Type /d to disguise and /u to undisguise.'
+  - 'n:b:/gamemode:Use /creative and /survival to set your gamemode.'
+  - 'n:b:/gamerule:_'
+  - 'n:b:/ban:_'
+  - 'n:b:/pardon:_'
+  - 'n:b:/ban-ip:_'
+  - 'n:b:/pardon-ip:_'
+  - 'n:b:/toggledownfall:_'
+  - 'n:b:/effect:Please use /potion to set effects.'
+  - 'n:b:/enderchest:_'
 
   # Superadmin commands
-  - s:b:/kick:_
-  - s:b:/socialspy:_
-  - s:b:/kill:_
-  - s:b:/clearhistory:_
-  - s:a:/stop:_
-  - s:a:/reload:_
-  - s:a:/nuke:_
-  - s:a:/save-all:_
-  - s:a:/save-on:_
-  - s:a:/save-off:_
+  - 's:b:/kick:_'
+  - 's:b:/socialspy:_'
+  - 's:b:/kill:_'
+  - 's:b://generate:_'
+  - 's:b://:_'
+  - 's:b:/superpickaxe:_'
+  - 's:b:/brush:_'
+  - 's:b:/mat:_'
+  - 's:b:/tool:_'
+  - 's:b://butcher:_'
+  - 's:b:/scoreboard:_'
+  - 's:b:/setspawn:_'
+
+  # 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'
+  - 's:a:/mat'
+
+    # Spigot commands
+  - 's:a:/restart'
+  - 's:b:/setblock'
 
 # Automatically wipe dropped objects:
 auto_wipe: true
 
-# Nuking prevention:
-nuke_monitor: true
-nuke_monitor_count_break: 100
-nuke_monitor_count_place: 25
-nuke_monitor_range: 10.0
+# Nuking prevention
+nukemonitor:
+  enabled: true
+  count_break: 100
+  count_place: 40
+  range: 10.0
+
 freecam_trigger_count: 10
 
 # Show all attempted commands in the log, will result in duplicate log messages:
 preprocess_log: true
 
-# Disable nighttime:
-disable_night: true
+# Disable certain events
+disable:
+  night: true
+  weather: true
 
-# Disable weather:
-disable_weather: true
 
 # Enable misc. features:
 landmines_enabled: false
@@ -97,44 +115,109 @@ mp44_enabled: false
 tossmob_enabled: false
 
 # Moblimiter:
-mob_limiter_enabled: true
-# Max per world:
-mob_limiter_max: 50
-mob_limiter_disable_dragon: true
-mob_limiter_disable_ghast: true
-mob_limiter_disable_slime: true
-mob_limiter_disable_giant: true
+
+moblimiter:
+  enabled: true
+  max: 50
+  disable:
+    dragon: true
+    ghast: true
+    slime: true
+    giant: true
 
 # Flatlands
-generate_flatlands: true
+flatlands:
+  generate: true
   # Flatlands generation parameters, uses CleanroomGenerator syntax - http://dev.bukkit.org/server-mods/cleanroomgenerator/
-flatlands_generation_params: 16,stone,32,dirt,1,grass
+  generate_params: 16,stone,32,dirt,1,grass
 
 # Admin-Only Mode
 admin_only_mode: false
 
 # Protected Areas - Protect areas so that only superadmins can directly modify blocks in those areas. WorldEdit and other such plugins might bypass this.
-protected_areas_enabled: true
+protectarea:
+  enabled: true
   auto_protect_spawnpoints: true
   auto_protect_radius: 25.0
 
+# Give the default CONSOLE senior admin privileges.
+# Handy in development environments.
+console_is_senior: true
+
 # Host Sender Names - Names that indicate automated services or host-based consoles you want to block from using some commands.
 # Make sure these are all lower-case.
 host_sender_names:
   - rcon
   - remotebukkit
 
+# Players who cannot be banned by username
+unbannable_usernames:
+  - honeydew
+  - xephos
+  - captainsparklez
+  - truemu
+  - kiershar
+  - fvdisco
+  - sethbling
+  - notch
+  - jeb_
+  - gamechap
+  - bertiechap
+  - vechs
+  - antvenom
+  - chimneyswift
+  - deadmau5
+  - etho
+  - ethoslab
+  - skydoesminecraft
+  - skythekidrs
+  - tobyturner
+  - xxslyfoxhoundxx
+  - paulsoaresjr
+  - sips_
+  - deadlox
+  - xxslyxx
+  - jeromeasf
+  - dinnerbone
+  - grumm
+  - grum
+  - evilseph
+  - cavemanfilms
+  - herobrine
+  - whiteboy7thst
+  - stampylonghead
+  - stampylongnose
+  - dantdm
+  - gizzy14gazza
+
 # TwitterBot - Used to allow superadmins to verify themselves using twitter
-twitterbot_enabled: false
-twitterbot_url: ''
-twitterbot_secret: ''
+twitterbot:
+  enabled: false
+  url: ''
+  secret: ''
 
 # Pet Protect - Prevent tamed pets from being killed.
-pet_protect_enabled: true
+petprotect:
+  enabled: true
 
 # Logs Registration
-logs_register_password: ''
-logs_register_url: ''
+logs:
+  url: ''
+  secret: ''
 
 # Mojang service checker
 service_checker_url: http://status.mojang.com/check
+
+# HTTPD
+httpd:
+  enabled: true
+  port: 28966
+  public_folder: ./public_html
+
+# Inactivity Auto-Kick (Requires Essentials)
+autokick:
+  enabled: true
+  # autokick_threshold - Percentage of server player capacity used at which players will be automatically kicked for being inactive. Range: 0.0 - 1.0
+  threshold: 0.9
+  # autokick_time - Time, in seconds, after which a player should be kicked when inactive
+  time: 120

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

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

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

@@ -0,0 +1,118 @@
+package me.StevenLawson.TotalFreedomMod.Bridge;
+
+import com.earth2me.essentials.Essentials;
+import com.earth2me.essentials.User;
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+
+public class TFM_EssentialsBridge
+{
+    private 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/Bridge/TFM_WorldEditBridge.java

@@ -1,11 +1,20 @@
-package me.StevenLawson.TotalFreedomMod;
+package me.StevenLawson.TotalFreedomMod.Bridge;
 
+import com.sk89q.worldedit.IncompleteRegionException;
 import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.LocalWorld;
 import com.sk89q.worldedit.bukkit.BukkitPlayer;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
+import com.sk89q.worldedit.regions.Region;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
+import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitRunnable;
 
 public class TFM_WorldEditBridge
 {
@@ -111,6 +120,51 @@ public class TFM_WorldEditBridge
         }
     }
 
+    public void validateSelection(final Player player)
+    {
+        if (TFM_AdminList.isSuperAdmin(player))
+        {
+            return;
+        }
+
+        try
+        {
+            final LocalSession session = getPlayerSession(player);
+            if (session != null)
+            {
+                final LocalWorld selectionWorld = session.getSelectionWorld();
+                final Region selection = session.getSelection(selectionWorld);
+                if (TFM_ProtectedArea.isInProtectedArea(
+                        getBukkitVector(selection.getMinimumPoint()),
+                        getBukkitVector(selection.getMaximumPoint()),
+                        selectionWorld.getName()))
+                {
+                    new BukkitRunnable()
+                    {
+                        @Override
+                        public void run()
+                        {
+                            player.sendMessage(ChatColor.RED + "The region that you selected contained a protected area. Selection cleared.");
+                            session.getRegionSelector(selectionWorld).clear();
+                        }
+                    }.runTaskLater(TotalFreedomMod.plugin, 1L);
+                }
+            }
+        }
+        catch (IncompleteRegionException ex)
+        {
+        }
+        catch (Exception ex)
+        {
+            TFM_Log.severe(ex);
+        }
+    }
+
+    private static org.bukkit.util.Vector getBukkitVector(com.sk89q.worldedit.Vector worldEditVector)
+    {
+        return new org.bukkit.util.Vector(worldEditVector.getX(), worldEditVector.getY(), worldEditVector.getZ());
+    }
+
     public static TFM_WorldEditBridge getInstance()
     {
         return TFM_WorldEditBridgeHolder.INSTANCE;

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

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

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

@@ -1,13 +1,13 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE, block_host_console = true)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
 @CommandParameters(description = "Close server to non-superadmins.", usage = "/<command> [on | off]")
 public class Command_adminmode extends TFM_Command
 {
@@ -31,7 +31,7 @@ public class Command_adminmode extends TFM_Command
             TFM_Util.adminAction(sender.getName(), "Closing the server to non-superadmins.", true);
             for (Player player : server.getOnlinePlayers())
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(player))
+                if (!TFM_AdminList.isSuperAdmin(player))
                 {
                     player.kickPlayer("Server is now closed to non-superadmins.");
                 }

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

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

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

@@ -1,8 +1,9 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -36,18 +37,15 @@ public class Command_blockcmd extends TFM_Command
             return true;
         }
 
-        Player player;
-        try
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            playerMsg(ex.getMessage());
+            playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND);
             return true;
         }
 
-        if (TFM_SuperadminList.isUserSuperadmin(player))
+        if (TFM_AdminList.isSuperAdmin(player))
         {
             playerMsg(player.getName() + " is a Superadmin, and cannot have their commands blocked.");
             return true;

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

@@ -2,6 +2,7 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -10,7 +11,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Place a cage around someone.", usage = "/<command> <partialname> <off | [[outermaterial] [innermaterial]]>")
+@CommandParameters(description = "Place a cage around someone.", usage = "/<command> <purge | off | <partialname> [outermaterial] [innermaterial]>")
 public class Command_cage extends TFM_Command
 {
     @Override
@@ -21,26 +22,50 @@ public class Command_cage extends TFM_Command
             return false;
         }
 
-        Player player;
-        try
+        if ("off".equals(args[0]) && sender instanceof Player)
         {
-            player = getPlayer(args[0]);
+            TFM_Util.adminAction(sender.getName(), "Uncaging " + sender.getName(), true);
+            TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(sender_p);
+
+            playerdata.setCaged(false);
+            playerdata.regenerateHistory();
+            playerdata.clearHistory();
+
+            return true;
         }
-        catch (PlayerNotFoundException ex)
+        else if ("purge".equals(args[0]))
         {
-            sender.sendMessage(ex.getMessage());
+            TFM_Util.adminAction(sender.getName(), "Uncaging all players", true);
+
+            for (Player player : server.getOnlinePlayers())
+            {
+                TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
+                playerdata.setCaged(false);
+                playerdata.regenerateHistory();
+                playerdata.clearHistory();
+            }
+
+            return true;
+        }
+
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
+        {
+            sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
             return true;
         }
 
         TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
 
-        Material cage_material_outer = Material.GLASS;
-        Material cage_material_inner = Material.AIR;
+        Material outerMaterial = Material.GLASS;
+        Material innerMaterial = Material.AIR;
+
         if (args.length >= 2)
         {
-            if (TFM_Util.isStopCommand(args[1]))
+            if ("off".equals(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 +75,13 @@ public class Command_cage extends TFM_Command
             }
             else
             {
-                cage_material_outer = Material.matchMaterial(args[1]);
-                if (cage_material_outer == null)
+                if ("darth".equalsIgnoreCase(args[1]))
                 {
-                    cage_material_outer = Material.GLASS;
+                    outerMaterial = Material.SKULL;
+                }
+                else if (Material.matchMaterial(args[1]) != null)
+                {
+                    outerMaterial = Material.matchMaterial(args[1]);
                 }
             }
         }
@@ -62,25 +90,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);
-        playerdata.setCaged(true, targetPos, cage_material_outer, cage_material_inner);
+        Location targetPos = player.getLocation().clone().add(0, 1, 0);
+        playerdata.setCaged(true, targetPos, outerMaterial, innerMaterial);
         playerdata.regenerateHistory();
         playerdata.clearHistory();
         TFM_Util.buildHistory(targetPos, 2, playerdata);
-        TFM_Util.generateCube(targetPos, 2, playerdata.getCageMaterial(TFM_PlayerData.CageLayer.OUTER));
-        TFM_Util.generateCube(targetPos, 1, playerdata.getCageMaterial(TFM_PlayerData.CageLayer.INNER));
+        TFM_Util.generateHollowCube(targetPos, 2, outerMaterial);
+        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_cake.java

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

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

@@ -1,6 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Minecart;
@@ -17,13 +18,12 @@ public class Command_cartsit extends TFM_Command
 
         if (args.length == 1)
         {
-            try
-            {
+
             targetPlayer = getPlayer(args[0]);
-            }
-            catch (PlayerNotFoundException ex)
+
+            if (targetPlayer == null)
             {
-                sender.sendMessage(ex.getMessage());
+                sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
                 return true;
             }
         }
@@ -36,7 +36,7 @@ public class Command_cartsit extends TFM_Command
                 return true;
             }
         }
-        else if (targetPlayer != sender_p && !TFM_SuperadminList.isUserSuperadmin(sender))
+        else if (targetPlayer != sender_p && !TFM_AdminList.isSuperAdmin(sender))
         {
             sender.sendMessage("Only superadmins can select another player as a /cartsit target.");
             return true;

src/me/StevenLawson/TotalFreedomMod/Commands/Command_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.Bridge.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_creative.java

@@ -1,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.GameMode;
@@ -33,7 +33,7 @@ public class Command_creative extends TFM_Command
         {
             if (args[0].equalsIgnoreCase("-a"))
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(sender))
+                if (!TFM_AdminList.isSuperAdmin(sender))
                 {
                     sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS);
                     return true;
@@ -48,19 +48,18 @@ public class Command_creative extends TFM_Command
                 return true;
             }
 
-            if (!(senderIsConsole || TFM_SuperadminList.isUserSuperadmin(sender)))
+            if (!(senderIsConsole || TFM_AdminList.isSuperAdmin(sender)))
             {
                 playerMsg("Only superadmins can change other user's gamemode.");
                 return true;
             }
 
-            try
-            {
+
             player = getPlayer(args[0]);
-            }
-            catch (PlayerNotFoundException ex)
+
+            if (player == null)
             {
-                sender.sendMessage(ex.getMessage());
+                sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
                 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_deafen.java

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

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

@@ -1,8 +1,8 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.lang.reflect.Field;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import net.minecraft.util.org.apache.commons.lang3.ArrayUtils;
+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,25 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.Bridge.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);
+
+        for (Player player : server.getOnlinePlayers())
+        {
+            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_doom.java

@@ -1,17 +1,21 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Ban;
+import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.util.Vector;
 
 @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE)
-@CommandParameters(description = "For the bad Superadmins.", usage = "/<command> <playername>")
+@CommandParameters(description = "For the bad Superadmins", usage = "/<command> <playername>")
 public class Command_doom extends TFM_Command
 {
     @Override
@@ -22,27 +26,24 @@ public class Command_doom extends TFM_Command
             return false;
         }
 
-        final Player player;
-        try
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            sender.sendMessage(ex.getMessage());
+            sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
             return true;
         }
 
         TFM_Util.adminAction(sender.getName(), "Casting oblivion over " + player.getName(), true);
         TFM_Util.bcastMsg(player.getName() + " will be completely obliviated!", ChatColor.RED);
 
-        final String IP = player.getAddress().getAddress().getHostAddress().trim();
+        final String ip = player.getAddress().getAddress().getHostAddress().trim();
 
         // remove from superadmin
-        if (TFM_SuperadminList.isUserSuperadmin(player))
+        if (TFM_AdminList.isSuperAdmin(player))
         {
             TFM_Util.adminAction(sender.getName(), "Removing " + player.getName() + " from the superadmin list.", true);
-            TFM_SuperadminList.removeSuperadmin(player);
+            TFM_AdminList.removeSuperadmin(player);
         }
 
         // remove from whitelist
@@ -51,11 +52,14 @@ public class Command_doom extends TFM_Command
         // deop
         player.setOp(false);
 
-        // ban IP
-        TFM_ServerInterface.banIP(IP, null, null, null);
+        // ban IPs
+        for (String playerIp : TFM_PlayerList.getInstance().getEntry(player).getIps())
+        {
+            TFM_BanManager.getInstance().addIpBan(new TFM_Ban(playerIp, player.getName()));
+        }
 
         // ban name
-        TFM_ServerInterface.banUsername(player.getName(), null, null, null);
+        TFM_BanManager.getInstance().addUuidBan(new TFM_Ban(player.getUniqueId(), player.getName()));
 
         // set gamemode to survival
         player.setGameMode(GameMode.SURVIVAL);
@@ -70,6 +74,9 @@ public class Command_doom extends TFM_Command
         // generate explosion
         player.getWorld().createExplosion(player.getLocation(), 4F);
 
+        // Shoot the player in the sky
+        player.setVelocity(player.getVelocity().clone().add(new Vector(0, 20, 0)));
+
         new BukkitRunnable()
         {
             @Override
@@ -81,7 +88,7 @@ public class Command_doom extends TFM_Command
                 // kill (if not done already)
                 player.setHealth(0.0);
             }
-        }.runTaskLater(plugin, 20L * 2L);
+        }.runTaskLater(plugin, 2L * 20L);
 
         new BukkitRunnable()
         {
@@ -89,7 +96,7 @@ public class Command_doom extends TFM_Command
             public void run()
             {
                 // message
-                TFM_Util.adminAction(sender.getName(), "Banning " + player.getName() + ", IP: " + IP, true);
+                TFM_Util.adminAction(sender.getName(), "Banning " + player.getName() + ", IP: " + ip, true);
 
                 // generate explosion
                 player.getWorld().createExplosion(player.getLocation(), 4F);
@@ -97,7 +104,7 @@ public class Command_doom extends TFM_Command
                 // kick player
                 player.kickPlayer(ChatColor.RED + "FUCKOFF, and get your shit together!");
             }
-        }.runTaskLater(plugin, 20L * 3L);
+        }.runTaskLater(plugin, 3L * 20L);
 
         return true;
     }

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

@@ -1,25 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.Commands;
-
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
-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 = "Enable/disable auto entity wiper.", usage = "/<command> <on | off>")
-public class Command_droptoggle 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;
-        }
-        TFM_Util.adminAction(sender.getName(),
-                (TFM_ConfigEntry.AUTO_ENTITY_WIPE.setBoolean(!args[0].equalsIgnoreCase("off")) ? "Enabled" : "Disabled")
-                + " automatic entity wiping.", false);
-        return true;
-    }
-}

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

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

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

@@ -55,13 +55,6 @@ public class Command_enchant extends TFM_Command
         {
             for (Enchantment ench : Enchantment.values())
             {
-                /*
-                 2013-07-20 23:17:13 [INFO] [TotalFreedomMod]: Command Error: enchant
-                 java.lang.NullPointerException
-                 at net.minecraft.server.v1_6_R2.EnchantmentDurability.canEnchant(SourceFile:33)
-                 at org.bukkit.craftbukkit.v1_6_R2.enchantments.CraftEnchantment.canEnchantItem(CraftEnchantment.java:55)
-                 at me.StevenLawson.TotalFreedomMod.Commands.Command_enchant.run(Command_enchant.java:56)
-                 */
                 try
                 {
                     if (ench.canEnchantItem(itemInHand))
@@ -122,7 +115,7 @@ public class Command_enchant extends TFM_Command
                     playerMsg("Can't use this enchantment on held item.");
                 }
             }
-            else if (TFM_Util.isRemoveCommand(args[0]))
+            else if (args[0].equals("remove"))
             {
                 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 strength = 20.0;
+        double radius = 20.0;
+        double strength = 5.0;
 
         if (args.length >= 1)
         {
@@ -21,7 +25,7 @@ public class Command_expel extends TFM_Command
             {
                 radius = Math.max(1.0, Math.min(100.0, Double.parseDouble(args[0])));
             }
-            catch (NumberFormatException nfex)
+            catch (NumberFormatException ex)
             {
             }
         }
@@ -32,33 +36,50 @@ public class Command_expel extends TFM_Command
             {
                 strength = Math.max(0.0, Math.min(50.0, Double.parseDouble(args[1])));
             }
-            catch (NumberFormatException nfex)
+            catch (NumberFormatException ex)
             {
             }
         }
 
-        Location sender_pos = sender_p.getLocation();
-        for (Player player : sender_pos.getWorld().getPlayers())
-        {
-            if (!player.equals(sender_p))
-            {
-                Location targetPos = player.getLocation();
+        List<String> pushedPlayers = new ArrayList<String>();
 
-                boolean in_range = false;
+        final Vector senderPos = sender_p.getLocation().toVector();
+        final List<Player> players = sender_p.getWorld().getPlayers();
+        for (final Player player : players)
+        {
+            if (player.equals(sender_p))
+            {
+                continue;
+            }
+
+            final Location targetPos = player.getLocation();
+            final Vector targetPosVec = targetPos.toVector();
+
+            boolean inRange = false;
             try
             {
-                    in_range = targetPos.distanceSquared(sender_pos) < (radius * radius);
+                inRange = targetPosVec.distanceSquared(senderPos) < (radius * radius);
             }
             catch (IllegalArgumentException ex)
             {
             }
 
-                if (in_range)
+            if (inRange)
             {
-                    player.setVelocity(targetPos.clone().subtract(sender_pos).toVector().normalize().multiply(strength));
-                    playerMsg("Pushing " + player.getName() + ".");
+                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,47 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.Commands;
-
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
-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 = "Enable/disable explosives and set effect radius.", usage = "/<command> <on | off> [radius]")
-public class Command_explosives extends TFM_Command
-{
-    @Override
-    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length == 0)
-        {
-            return false;
-        }
-
-        if (args.length == 2)
-        {
-            try
-            {
-                TFM_ConfigEntry.EXPLOSIVE_RADIUS.setDouble(Math.max(1.0, Math.min(30.0, Double.parseDouble(args[1]))));
-            }
-            catch (NumberFormatException nfex)
-            {
-                TFM_Util.playerMsg(sender, nfex.getMessage());
-                return true;
-            }
-        }
-
-        if (args[0].equalsIgnoreCase("on"))
-        {
-            TFM_ConfigEntry.ALLOW_EXPLOSIONS.setBoolean(true);
-            playerMsg("Explosives are now enabled, radius set to " + TFM_ConfigEntry.EXPLOSIVE_RADIUS.getDouble() + " blocks.");
-        }
-        else
-        {
-            TFM_ConfigEntry.ALLOW_EXPLOSIONS.setBoolean(false);
-            playerMsg("Explosives are now disabled.");
-        }
-
-        return true;
-    }
-}

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

@@ -1,8 +1,8 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_UserList;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerList;
 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;
@@ -19,18 +19,16 @@ public class Command_findip extends TFM_Command
             return false;
         }
 
-        final Player player;
-        try
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            playerMsg(ex.getMessage());
+
+            playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND);
             return true;
         }
 
-        playerMsg("Player IPs: " + StringUtils.join(TFM_UserList.getInstance(TotalFreedomMod.plugin).getEntry(player).getIpAddresses(), ", "));
+        playerMsg("Player IPs: " + StringUtils.join(TFM_PlayerList.getInstance().getEntry(player).getIps(), ", "));
 
         return true;
     }

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

@@ -1,33 +0,0 @@
-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.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Enable/disable fire placement.", usage = "/<command> <on | off>")
-public class Command_fireplace extends TFM_Command
-{
-    @Override
-    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length != 1)
-        {
-            return false;
-        }
-
-        if (args[0].equalsIgnoreCase("on"))
-        {
-            TFM_ConfigEntry.ALLOW_FIRE_PLACE.setBoolean(true);
-            playerMsg("Fire placement is now enabled.");
-        }
-        else
-        {
-            TFM_ConfigEntry.ALLOW_FIRE_PLACE.setBoolean(false);
-            playerMsg("Fire placement is now disabled.");
-        }
-
-        return true;
-    }
-}

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

@@ -1,31 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.Commands;
-
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
-import me.StevenLawson.TotalFreedomMod.TFM_GameRuleHandler;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Enable/disable fire spread.", usage = "/<command> <on | off>")
-public class Command_firespread extends TFM_Command
-{
-    @Override
-    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length != 1)
-        {
-            return false;
-        }
-
-        boolean fireSpread = !args[0].equalsIgnoreCase("off");
-
-        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_ConfigEntry;
-import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.World.TFM_Flatlands;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
+@CommandPermissions(level = AdminLevel.ALL, source = SourceType.ONLY_IN_GAME)
 @CommandParameters(description = "Goto the flatlands.", usage = "/<command>")
 public class Command_flatlands extends TFM_Command
 {
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        if (TFM_ConfigEntry.GENERATE_FLATLANDS.getBoolean())
+        if (TFM_ConfigEntry.FLATLANDS_GENERATE.getBoolean())
         {
-            TFM_Util.gotoWorld(sender, "flatlands");
+            TFM_Flatlands.getInstance().sendToWorld(sender_p);
         }
         else
         {

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

@@ -1,24 +0,0 @@
-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.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Enable/disable fluid spread.", usage = "/<command> <on | off>")
-public class Command_fluidspread extends TFM_Command
-{
-    @Override
-    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length != 1)
-        {
-            return false;
-        }
-
-        playerMsg("Lava and water spread is now " + (TFM_ConfigEntry.ALLOW_FLIUD_SPREAD.setBoolean(!args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + ".");
-
-        return true;
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,9 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -25,7 +26,7 @@ public class Command_halt extends TFM_Command
             int counter = 0;
             for (Player player : server.getOnlinePlayers())
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(player))
+                if (!TFM_AdminList.isSuperAdmin(player))
                 {
                     TFM_PlayerData.getPlayerData(player).setHalted(true);
                     counter++;
@@ -76,18 +77,14 @@ public class Command_halt extends TFM_Command
             return true;
         }
 
-        Player player;
-        try
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            sender.sendMessage(ex.getMessage());
+            sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
             return true;
         }
 
-
         TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
         if (!playerdata.isHalted())
         {

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

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

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

@@ -29,7 +29,7 @@ public class Command_jumppads extends TFM_Command
                 return true;
             }
 
-            if (TFM_Util.isStopCommand(args[0]))
+            if ("off".equals(args[0]))
             {
                 TFM_Util.adminAction(sender.getName(), "Disabling Jumppads", false);
                 TFM_Jumppads.getInstance().setMode(TFM_Jumppads.JumpPadMode.OFF);
@@ -50,7 +50,7 @@ public class Command_jumppads extends TFM_Command
 
             if (args[0].equalsIgnoreCase("sideways"))
             {
-                if (TFM_Util.isStopCommand(args[1]))
+                if ("off".equals(args[1]))
                 {
                     TFM_Util.adminAction(sender.getName(), "Setting Jumppads mode to: Madgeek", false);
                     TFM_Jumppads.getInstance().setMode(TFM_Jumppads.JumpPadMode.MADGEEK);

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

@@ -1,13 +1,13 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH, block_host_console = true)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH, blockHostConsole = true)
 @CommandParameters(description = "Kick all non-superadmins on server.", usage = "/<command>")
 public class Command_kicknoob extends TFM_Command
 {
@@ -18,7 +18,7 @@ public class Command_kicknoob extends TFM_Command
 
         for (Player player : server.getOnlinePlayers())
         {
-            if (!TFM_SuperadminList.isUserSuperadmin(player))
+            if (!TFM_AdminList.isSuperAdmin(player))
             {
                 player.kickPlayer(ChatColor.RED + "Disconnected by admin.");
             }

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

@@ -1,8 +1,10 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
-import me.StevenLawson.TotalFreedomMod.TFM_LandmineData;
+import java.util.ArrayList;
+import java.util.List;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import org.bukkit.ChatColor;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -48,4 +50,20 @@ public class Command_landmine extends TFM_Command
 
         return true;
     }
+
+    public static class TFM_LandmineData
+    {
+        public static List<TFM_LandmineData> landmines = new ArrayList<TFM_LandmineData>();
+        public Location location;
+        public Player player;
+        public double radius;
+
+        public TFM_LandmineData(Location landmine_pos, Player player, double radius)
+        {
+            super();
+            this.location = landmine_pos;
+            this.player = player;
+            this.radius = radius;
+        }
+    }
 }

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

@@ -1,6 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -18,27 +19,24 @@ public class Command_lastcmd extends TFM_Command
             return false;
         }
 
-        Player player;
-        try
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            playerMsg(ex.getMessage(), ChatColor.RED);
+            playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND);
             return true;
         }
 
-        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
+        final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
 
         if (playerdata != null)
         {
-            String last_command = playerdata.getLastCommand();
-            if (last_command.isEmpty())
+            String lastCommand = playerdata.getLastCommand();
+            if (lastCommand.isEmpty())
             {
-                last_command = "(none)";
+                lastCommand = "(none)";
             }
-            playerMsg(player.getName() + " - Last Command: " + last_command, ChatColor.GRAY);
+            playerMsg(player.getName() + " - Last Command: " + lastCommand, ChatColor.GRAY);
         }
 
         return true;

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

@@ -1,24 +0,0 @@
-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.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Enable/disable lava damage.", usage = "/<command> <on | off>")
-public class Command_lavadmg extends TFM_Command
-{
-    @Override
-    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length != 1)
-        {
-            return false;
-        }
-
-        playerMsg("Lava damage is now " + (TFM_ConfigEntry.ALLOW_LAVA_DAMAGE.setBoolean(!args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + ".");
-
-        return true;
-    }
-}

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

@@ -1,24 +0,0 @@
-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.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Enable/disable lava placement.", usage = "/<command> <on | off>")
-public class Command_lavaplace extends TFM_Command
-{
-    @Override
-    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length != 1)
-        {
-            return false;
-        }
-
-        playerMsg("Lava placement is now " + (TFM_ConfigEntry.ALLOW_LAVA_PLACE.setBoolean(!args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + ".");
-
-        return true;
-    }
-}

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

@@ -2,98 +2,72 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.util.ArrayList;
 import java.util.List;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerRank;
+
+import me.StevenLawson.TotalFreedomMod.TFM_Admin;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 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;
-        if (args.length >= 1)
-        {
-            if (args[0].equalsIgnoreCase("-a"))
-            {
-                listFilter = ListFilter.SHOW_ADMINS;
-            }
-        }
+        final Command_list.ListFilter listFilter = (args.length == 1 && args[0].equals("-a") ? Command_list.ListFilter.ADMINS : Command_list.ListFilter.ALL);
 
-        StringBuilder onlineStats = new StringBuilder();
-        StringBuilder onlineUsers = new StringBuilder();
+        final StringBuilder onlineStats = new StringBuilder();
+        final StringBuilder onlineUsers = new StringBuilder();
 
         onlineStats.append(ChatColor.BLUE).append("There are ").append(ChatColor.RED).append(server.getOnlinePlayers().length);
         onlineStats.append(ChatColor.BLUE).append(" 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_AdminList.isSuperAdmin(player);
 
-            if (listFilter == ListFilter.SHOW_ADMINS && !userSuperadmin)
+            if (listFilter == Command_list.ListFilter.ADMINS && !userSuperadmin)
             {
                 continue;
             }
 
-            String prefix = "";
-
-            if (userSuperadmin)
-            {
-                if (TFM_SuperadminList.isSeniorAdmin(player))
-                {
-                    prefix = (ChatColor.LIGHT_PURPLE + "[SrA]");
-                }
-                else
-                {
-                    prefix = (ChatColor.GOLD + "[SA]");
+            names.add(TFM_PlayerRank.fromSender(player).getPrefix() + player.getName());
         }
 
-                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_listsync.java

@@ -1,44 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.Commands;
-
-import java.io.File;
-import me.StevenLawson.TotalFreedomMod.TFM_Log;
-import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
-@CommandParameters(description = "Download the superadmin and permban lists from the main TotalFreedom server.", usage = "/<command>")
-public class Command_listsync extends TFM_Command
-{
-    @Override
-    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        TFM_Util.adminAction(sender.getName(), "Downloading superadmin and permban lists from primary TotalFreedom server.", false);
-
-        try
-        {
-            TFM_Util.downloadFile("http://madgeekonline.com/apps/get_superadmins_raw.php", new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.SUPERADMIN_FILE));
-            TotalFreedomMod.loadSuperadminConfig();
-            TFM_Util.adminAction(sender.getName(), TotalFreedomMod.SUPERADMIN_FILE + " downloaded.", false);
-        }
-        catch (Exception ex)
-        {
-            TFM_Log.severe(ex);
-        }
-
-        try
-        {
-            TFM_Util.downloadFile("http://madgeekonline.com/apps/get_permbans_raw.php", new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.PERMBAN_FILE));
-            TotalFreedomMod.loadPermbanConfig();
-            TFM_Util.adminAction(sender.getName(), TotalFreedomMod.PERMBAN_FILE + " downloaded.", false);
-        }
-        catch (Exception ex)
-        {
-            TFM_Log.severe(ex);
-        }
-
-        return true;
-    }
-}

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

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

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

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

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

@@ -2,13 +2,14 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
 @CommandParameters(description = "Block target's minecraft input. This is evil, and I never should have wrote it.", usage = "/<command> <all | purge | <<partialname> on | off>>")
 public class Command_lockup extends TFM_Command
 {
@@ -46,14 +47,11 @@ public class Command_lockup extends TFM_Command
         {
             if (args[1].equalsIgnoreCase("on"))
             {
-                final Player player;
-                try
+                final Player player = getPlayer(args[0]);
+
+                if (player == null)
                 {
-                    player = getPlayer(args[0]);
-                }
-                catch (PlayerNotFoundException ex)
-                {
-                    sender.sendMessage(ex.getMessage());
+                    sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
                     return true;
                 }
 
@@ -61,16 +59,13 @@ public class Command_lockup extends TFM_Command
                 startLockup(player);
                 playerMsg("Locked up " + player.getName() + ".");
             }
-            else if (TFM_Util.isStopCommand(args[1]))
+            else if ("off".equals(args[1]))
             {
-                final Player player;
-                try
+                final Player player = getPlayer(args[0]);
+
+                if (player == null)
                 {
-                    player = getPlayer(args[0]);
-                }
-                catch (PlayerNotFoundException ex)
-                {
-                    sender.sendMessage(ex.getMessage());
+                    sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
                     return true;
                 }
 

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

@@ -9,12 +9,11 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_Log;
-import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
-import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TFM_Admin;
 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;
@@ -32,7 +31,7 @@ public class Command_logs extends TFM_Command
 
         if (args.length == 1)
         {
-            mode = (TFM_Util.isStopCommand(args[0]) ? LogsRegistrationMode.DELETE : LogsRegistrationMode.UPDATE);
+            mode = ("off".equals(args[0]) ? LogsRegistrationMode.DELETE : LogsRegistrationMode.UPDATE);
         }
 
         updateLogsRegistration(sender, sender_p, mode);
@@ -47,8 +46,8 @@ public class Command_logs extends TFM_Command
 
     public static void updateLogsRegistration(final CommandSender sender, final String targetName, final String targetIP, final LogsRegistrationMode mode)
     {
-        final String logsRegisterURL = TFM_ConfigEntry.LOGS_REGISTER_URL.getString();
-        final String logsRegisterPassword = TFM_ConfigEntry.LOGS_REGISTER_PASSWORD.getString();
+        final String logsRegisterURL = TFM_ConfigEntry.LOGS_URL.getString();
+        final String logsRegisterPassword = TFM_ConfigEntry.LOGS_SECRET.getString();
 
         if (logsRegisterURL == null || logsRegisterPassword == null || logsRegisterURL.isEmpty() || logsRegisterPassword.isEmpty())
         {
@@ -109,11 +108,11 @@ public class Command_logs extends TFM_Command
         }.runTaskAsynchronously(TotalFreedomMod.plugin);
     }
 
-    public static void deactivateSuperadmin(TFM_Superadmin superadmin)
+    public static void deactivateSuperadmin(TFM_Admin superadmin)
     {
         for (String ip : superadmin.getIps())
         {
-            updateLogsRegistration(null, superadmin.getName(), ip, Command_logs.LogsRegistrationMode.DELETE);
+            updateLogsRegistration(null, superadmin.getLastLoginName(), ip, Command_logs.LogsRegistrationMode.DELETE);
         }
     }
 

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

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

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

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

src/me/StevenLawson/TotalFreedomMod/Commands/Command_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;
@@ -34,20 +34,14 @@ public class Command_nf extends TFM_Command
                 if (matcher.find())
                 {
                     String displayName = matcher.group(1);
-                    try
-                    {
+
                     player = getPlayerByDisplayName(displayName);
-                    }
-                    catch (PlayerNotFoundException ex)
-                    {
-                    }
+
                     if (player == null)
-                    {
-                        try
                     {
                         player = getPlayerByDisplayNameAlt(displayName);
-                        }
-                        catch (PlayerNotFoundException ex)
+
+                        if (player == null)
                         {
                             sender.sendMessage(ChatColor.GRAY + "Can't find player by nickname: " + displayName);
                             return true;
@@ -80,7 +74,7 @@ public class Command_nf extends TFM_Command
         return true;
     }
 
-    private static Player getPlayerByDisplayName(String needle) throws PlayerNotFoundException
+    private static Player getPlayerByDisplayName(String needle)
     {
         needle = needle.toLowerCase().trim();
 
@@ -93,10 +87,10 @@ public class Command_nf extends TFM_Command
             }
         }
 
-        throw new PlayerNotFoundException();
+        return null;
     }
 
-    private static Player getPlayerByDisplayNameAlt(String needle) throws PlayerNotFoundException
+    private static Player getPlayerByDisplayNameAlt(String needle)
     {
         needle = needle.toLowerCase().trim();
 
@@ -115,11 +109,6 @@ public class Command_nf extends TFM_Command
             }
         }
 
-        if (minEditMatch == null)
-        {
-            throw new PlayerNotFoundException();
-        }
-
         return minEditMatch;
     }
 }

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

@@ -0,0 +1,72 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.Bridge.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 ("off".equals(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,57 +0,0 @@
-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, block_host_console = true)
-@CommandParameters(description = "Attempt to detect \"invisible griefers\" and \"nukers\".", usage = "/<command> <on | off> [range] [blockrate]")
-public class Command_nonuke extends TFM_Command
-{
-    @Override
-    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length < 1)
-        {
-            return false;
-        }
-
-        if (args.length >= 2)
-        {
-            try
-            {
-                TFM_ConfigEntry.NUKE_MONITOR_RANGE.setDouble(Math.max(1.0, Math.min(500.0, Double.parseDouble(args[1]))));
-            }
-            catch (NumberFormatException nfex)
-            {
-            }
-        }
-
-        if (args.length >= 3)
-        {
-            try
-            {
-                TFM_ConfigEntry.NUKE_MONITOR_COUNT_BREAK.setInteger(Math.max(1, Math.min(500, Integer.parseInt(args[2]))));
-            }
-            catch (NumberFormatException nfex)
-            {
-            }
-        }
-
-        if (args[0].equalsIgnoreCase("on"))
-        {
-            TFM_ConfigEntry.NUKE_MONITOR.setBoolean(true);
-            playerMsg("Nuke monitor is enabled.");
-            playerMsg("Anti-freecam range is set to " + TFM_ConfigEntry.NUKE_MONITOR_RANGE.getDouble() + " blocks.");
-            playerMsg("Block throttle rate is set to " + TFM_ConfigEntry.NUKE_MONITOR_COUNT_BREAK.getInteger() + " blocks destroyed per 5 seconds.");
-        }
-        else
-        {
-            TFM_ConfigEntry.NUKE_MONITOR.setBoolean(false);
-            playerMsg("Nuke monitor is disabled.");
-        }
-
-        return true;
-    }
-}

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

@@ -2,7 +2,7 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.StringUtils;
+import 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_AdminList;
 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_AdminList.isSeniorAdmin(sender, true))
+            {
+                playerMsg(TotalFreedomMod.MSG_NO_PERMS);
+                return true;
+            }
+
             if (args[0].equalsIgnoreCase("on"))
             {
                 online_mode = true;

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

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

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

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

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

@@ -2,6 +2,7 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.command.Command;
@@ -10,7 +11,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "POW!!! Right in the kisser! One of these days Alice, straight to the Moon!", usage = "/<command> <target> [power]")
+@CommandParameters(description = "POW!!! Right in the kisser! One of these days Alice, straight to the Moon!",
+        usage = "/<command> <target> [<<power> | stop>]")
 public class Command_orbit extends TFM_Command
 {
     @Override
@@ -21,14 +23,11 @@ public class Command_orbit extends TFM_Command
             return false;
         }
 
-        Player player;
-        try
+        Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            playerMsg(ex.getMessage(), ChatColor.RED);
+            playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND, ChatColor.RED);
             return true;
         }
 
@@ -38,7 +37,7 @@ public class Command_orbit extends TFM_Command
 
         if (args.length >= 2)
         {
-            if (TFM_Util.isStopCommand(args[1]))
+            if (args[1].equals("stop"))
             {
                 playerMsg("Stopped orbiting " + player.getName());
                 playerdata.stopOrbiting();
@@ -60,7 +59,7 @@ public class Command_orbit extends TFM_Command
         playerdata.startOrbiting(strength);
 
         player.setVelocity(new Vector(0, strength, 0));
-        TFM_Util.adminAction(sender.getName(), "Orbiting " + player.getName() + ".", false);
+        TFM_Util.adminAction(sender.getName(), "Orbiting " + player.getName(), false);
 
         return true;
     }

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

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

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

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

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

@@ -2,10 +2,10 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.util.ArrayList;
 import java.util.List;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.apache.commons.lang.StringUtils;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -38,7 +38,7 @@ public class Command_potion extends TFM_Command
             }
             else if (args[0].equalsIgnoreCase("clearall"))
             {
-                if (!(TFM_SuperadminList.isUserSuperadmin(sender) || senderIsConsole))
+                if (!(TFM_AdminList.isSuperAdmin(sender) || senderIsConsole))
                 {
                     playerMsg(TotalFreedomMod.MSG_NO_PERMS);
                     return true;
@@ -57,21 +57,19 @@ public class Command_potion extends TFM_Command
                 Player target = sender_p;
 
                 if (args.length == 2)
-                {
-                    try
                 {
                     target = getPlayer(args[1]);
-                    }
-                    catch (PlayerNotFoundException ex)
+
+                    if (target == null)
                     {
-                        playerMsg(ex.getMessage(), ChatColor.RED);
+                        playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND, ChatColor.RED);
                         return true;
                     }
                 }
 
                 if (!target.equals(sender_p))
                 {
-                    if (!TFM_SuperadminList.isUserSuperadmin(sender))
+                    if (!TFM_AdminList.isSuperAdmin(sender))
                     {
                         playerMsg("Only superadmins can clear potion effects from other players.");
                         return true;
@@ -103,20 +101,19 @@ public class Command_potion extends TFM_Command
 
                 if (args.length == 5)
                 {
-                    try
-                    {
+
                     target = getPlayer(args[4]);
-                    }
-                    catch (PlayerNotFoundException ex)
+
+                    if (target == null)
                     {
-                        playerMsg(ex.getMessage(), ChatColor.RED);
+                        playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND, ChatColor.RED);
                         return true;
                     }
                 }
 
                 if (!target.equals(sender_p))
                 {
-                    if (!TFM_SuperadminList.isUserSuperadmin(sender))
+                    if (!TFM_AdminList.isSuperAdmin(sender))
                     {
                         sender.sendMessage("Only superadmins can apply potion effects to other players.");
                         return true;

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

@@ -1,35 +0,0 @@
-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, block_host_console = true)
-@CommandParameters(
-        description = "Enable/disable the command prelogger. When this is on, logs will be filled with many duplicate messages.",
-        usage = "/<command> <on | off>")
-public class Command_prelog extends TFM_Command
-{
-    @Override
-    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length != 1)
-        {
-            return false;
-        }
-
-        if (args[0].equalsIgnoreCase("on"))
-        {
-            TFM_ConfigEntry.PREPROCESS_LOG_ENABLED.setBoolean(true);
-            playerMsg("Command preprocess logging is now enabled. This will be spammy in the log.");
-        }
-        else
-        {
-            TFM_ConfigEntry.PREPROCESS_LOG_ENABLED.setBoolean(false);
-            playerMsg("Command preprocess logging is now disabled.");
-        }
-
-        return true;
-    }
-}

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;
@@ -24,17 +23,18 @@ public class Command_premium extends TFM_Command
             return false;
         }
 
-        String name;
-        try
+        final Player player = getPlayer(args[0]);
+        final String name;
+
+        if (player != null)
         {
-            name = getPlayer(args[0]).getName();
+            name = player.getName();
         }
-        catch (PlayerNotFoundException ex)
+        else
         {
             name = args[0];
         }
 
-        final String playername = name;
         new BukkitRunnable()
         {
             @Override
@@ -42,7 +42,7 @@ public class Command_premium extends TFM_Command
             {
                 try
                 {
-                    final URL getUrl = new URL("https://minecraft.net/haspaid.jsp?user=" + playername);
+                    final URL getUrl = new URL("https://minecraft.net/haspaid.jsp?user=" + name);
                     final URLConnection urlConnection = getUrl.openConnection();
                     // Read the response
                     final BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
@@ -54,14 +54,14 @@ public class Command_premium extends TFM_Command
                         @Override
                         public void run()
                         {
-                            playerMsg("Player " + playername + " is premium: " + message);
+                            playerMsg("Player " + name + " is premium: " + message);
                         }
                     }.runTask(plugin);
 
                 }
                 catch (Exception ex)
                 {
-                    TFM_Log.severe(ExceptionUtils.getStackTrace(ex));
+                    TFM_Log.severe(ex);
                     playerMsg("There was an error querying the mojang server.", ChatColor.RED);
                 }
             }

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

@@ -1,9 +1,9 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.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;
@@ -44,7 +44,7 @@ public class Command_protectarea extends TFM_Command
         }
         else if (args.length == 2)
         {
-            if (TFM_Util.isRemoveCommand(args[0]))
+            if ("remove".equals(args[0]))
             {
                 TFM_ProtectedArea.removeProtectedArea(args[1]);
 

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

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

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

@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
 @CommandParameters(description = "Quick Op - op someone based on a partial name.", usage = "/<command> <partialname>")
 public class Command_qop extends TFM_Command
 {

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

@@ -1,6 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerRank;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -17,7 +18,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,22 +30,20 @@ public class Command_rank extends TFM_Command
 
         if (args.length == 0)
         {
-            playerMsg(sender.getName() + " is " + TFM_Util.getRank(sender), ChatColor.AQUA);
+            playerMsg(sender.getName() + " is " + TFM_PlayerRank.fromSender(sender).getLoginMessage(), ChatColor.AQUA);
             return true;
         }
 
-        Player player;
-        try
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            sender.sendMessage(ex.getMessage());
+            sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
             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,12 +1,12 @@
 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;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
 @CommandParameters(description = "Broadcasts the given message. Supports colors.", usage = "/<command> <message>")
 public class Command_rawsay extends TFM_Command
 {
@@ -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_ro.java

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

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

@@ -1,14 +1,14 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_RollbackManager;
-import me.StevenLawson.TotalFreedomMod.TFM_UserList;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, block_host_console = true)
-@CommandParameters(description = "Issues a rollback on a player", usage = "/<command> <[partialname] | purge [partialname] | purgeall>", aliases = "rb")
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, blockHostConsole = true)
+@CommandParameters(description = "Issues a rollback on a player", usage = "/<command> <[partialname] | undo [partialname] purge [partialname] | purgeall>", aliases = "rb")
 public class Command_rollback extends TFM_Command
 {
     @Override
@@ -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 40 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;
@@ -52,21 +85,16 @@ public class Command_rollback extends TFM_Command
     {
         String playerName = null;
 
-        try
-        {
-            Player player = getPlayer(playerNameInput);
+
+        final Player player = getPlayer(playerNameInput);
         if (player != null)
         {
             playerName = player.getName();
         }
-        }
-        catch (PlayerNotFoundException ex)
-        {
-        }
 
         if (playerName == null)
         {
-            playerName = TFM_UserList.getInstance(plugin).searchByPartialName(playerNameInput);
+            playerName = TFM_PlayerList.getInstance().getEntry(playerNameInput).getLastJoinName();
         }
 
         return playerName;

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

@@ -1,86 +1,143 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
-import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.TFM_Admin;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_TwitterHandler;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import 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.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Manage superadmins.", usage = "/<command> <list | clean | <add|delete|info> <username>>")
+@CommandParameters(description = "Manage superadmins.",
+        usage = "/<command> <list | clean | clear [ip] | <add | delete | info> <username>>")
 public class Command_saconfig extends TFM_Command
 {
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
+        if (args.length == 0 || args.length > 2)
+        {
+            return false;
+        }
+
         if (args.length == 1)
         {
             if (args[0].equals("list"))
             {
-                playerMsg("Superadmins: " + StringUtils.join(TFM_SuperadminList.getSuperadminNames(), ", "), ChatColor.GOLD);
-            }
-            else
-            {
-                if (!TFM_SuperadminList.isSeniorAdmin(sender))
-                {
-                    playerMsg(TotalFreedomMod.MSG_NO_PERMS);
+                playerMsg("Superadmins: " + StringUtils.join(TFM_AdminList.getSuperNames(), ", "), ChatColor.GOLD);
                 return true;
             }
 
             if (args[0].equals("clean"))
             {
-                    TFM_Util.adminAction(sender.getName(), "Cleaning superadmin list", true);
-                    TFM_SuperadminList.cleanSuperadminList(true);
-                    playerMsg("Superadmins: " + StringUtils.join(TFM_SuperadminList.getSuperadminNames(), ", "), ChatColor.YELLOW);
-                }
-                else
-                {
-                    return false;
-                }
-
-                return true;
-            }
-
-            return true;
-        }
-        else if (args.length == 2)
-        {
-            if (args[0].equalsIgnoreCase("info"))
-            {
-                if (!TFM_SuperadminList.isUserSuperadmin(sender))
+                if (!TFM_AdminList.isSeniorAdmin(sender, true))
                 {
                     playerMsg(TotalFreedomMod.MSG_NO_PERMS);
                     return true;
                 }
 
-                TFM_Superadmin superadmin = TFM_SuperadminList.getAdminEntry(args[1].toLowerCase());
+                TFM_Util.adminAction(sender.getName(), "Cleaning superadmin list", true);
+                TFM_AdminList.cleanSuperadminList(true);
+                playerMsg("Superadmins: " + StringUtils.join(TFM_AdminList.getSuperNames(), ", "), ChatColor.YELLOW);
+                return true;
+            }
+        }
+
+        // All commands below are superadmin+ commands.
+        if (!TFM_AdminList.isSuperAdmin(sender))
+        {
+            playerMsg(TotalFreedomMod.MSG_NO_PERMS);
+            return true;
+        }
+
+        if (args[0].equals("clear"))
+        {
+            if (senderIsConsole)
+            {
+                playerMsg(TotalFreedomMod.NOT_FROM_CONSOLE);
+                return true;
+            }
+
+            final TFM_Admin admin = TFM_AdminList.getEntry(sender_p);
+
+            final String ip = TFM_Util.getIp(sender_p);
+
+            if (args.length == 1)
+            {
+                TFM_Util.adminAction(sender.getName(), "Cleaning my supered IPs", true);
+
+                int counter = 0;
+                for (int i = 0; i < admin.getIps().size(); i++)
+                {
+                    if (admin.getIps().get(i).equals(ip))
+                    {
+                        continue;
+                    }
+
+                    admin.removeIp(admin.getIps().get(i));
+                    counter++;
+                }
+
+                TFM_AdminList.save();
+
+                playerMsg(counter + " IPs removed.");
+                playerMsg(admin.getIps().get(0) + " is now your only IP address");
+                return true;
+            }
+
+            // args.length == 2
+            if (!admin.getIps().contains(args[1]))
+            {
+                playerMsg("That IP is not registered to you.");
+                return true;
+            }
+
+            if (ip.equals(args[1]))
+            {
+                playerMsg("You cannot remove your current IP.");
+                return true;
+            }
+
+            TFM_Util.adminAction(sender.getName(), "Removing a supered IP", true);
+
+            admin.removeIp(args[1]);
+            TFM_AdminList.save();
+
+            playerMsg("Removed IP " + args[1]);
+            playerMsg("Current IPs: " + StringUtils.join(admin.getIps(), ", "));
+            return true;
+        }
+
+        if (args[0].equals("info"))
+        {
+
+            TFM_Admin superadmin = TFM_AdminList.getEntry(args[1].toLowerCase());
 
             if (superadmin == null)
             {
-                    try
-                    {
-                        superadmin = TFM_SuperadminList.getAdminEntry(getPlayer(args[1]).getName().toLowerCase());
-                    }
-                    catch (PlayerNotFoundException ex)
+
+                final Player player = getPlayer(args[1]);
+
+                if (player != null)
                 {
+                    superadmin = TFM_AdminList.getEntry(player.getName().toLowerCase());
                 }
             }
 
             if (superadmin == null)
             {
                 playerMsg("Superadmin not found: " + args[1]);
-                }
-                else
-                {
-                    playerMsg(ChatColor.stripColor(TFM_Util.colorise(superadmin.toString())));
+                return true;
             }
 
+            playerMsg(superadmin.toString());
             return true;
         }
 
@@ -90,43 +147,32 @@ public class Command_saconfig extends TFM_Command
             return true;
         }
 
-            if (args[0].equalsIgnoreCase("add"))
+        if (args[0].equals("add"))
         {
-                Player player = null;
-                String admin_name = null;
+            OfflinePlayer player = getPlayer(args[1]);
 
-                try
+            if (player == null)
             {
-                    player = getPlayer(args[1]);
-                }
-                catch (PlayerNotFoundException ex)
+                final TFM_Admin superadmin = TFM_AdminList.getEntry(args[1]);
+
+                if (superadmin == null)
                 {
-                    TFM_Superadmin superadmin = TFM_SuperadminList.getAdminEntry(args[1].toLowerCase());
-                    if (superadmin != null)
-                    {
-                        admin_name = superadmin.getName();
-                    }
-                    else
-                    {
-                        playerMsg(ex.getMessage(), ChatColor.RED);
+                    playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND);
                     return true;
                 }
+
+                player = Bukkit.getOfflinePlayer(superadmin.getLastLoginName());
             }
 
-                if (player != null)
-                {
-                    TFM_Util.adminAction(sender.getName(), "Adding " + player.getName() + " to the superadmin list.", true);
-                    TFM_SuperadminList.addSuperadmin(player);
+            TFM_Util.adminAction(sender.getName(), "Adding " + player.getName() + " to the superadmin list", true);
+            TFM_AdminList.addSuperadmin(player);
+
+            return true;
         }
-                else if (admin_name != null)
+
+        if ("remove".equals(args[0]))
         {
-                    TFM_Util.adminAction(sender.getName(), "Adding " + admin_name + " to the superadmin list.", true);
-                    TFM_SuperadminList.addSuperadmin(admin_name);
-                }
-            }
-            else if (TFM_Util.isRemoveCommand(args[0]))
-            {
-                if (!TFM_SuperadminList.isSeniorAdmin(sender))
+            if (!TFM_AdminList.isSeniorAdmin(sender))
             {
                 playerMsg(TotalFreedomMod.MSG_NO_PERMS);
                 return true;
@@ -134,71 +180,31 @@ public class Command_saconfig extends TFM_Command
 
             String targetName = args[1];
 
-                try
-                {
-                    targetName = getPlayer(targetName).getName();
-                }
-                catch (PlayerNotFoundException ex)
+
+            final Player player = getPlayer(targetName);
+
+            if (player != null)
             {
+                targetName = player.getName();
             }
 
-                if (!TFM_SuperadminList.getSuperadminNames().contains(targetName.toLowerCase()))
+            if (!TFM_AdminList.getLowerSuperNames().contains(targetName.toLowerCase()))
             {
                 playerMsg("Superadmin not found: " + targetName);
                 return true;
             }
 
             TFM_Util.adminAction(sender.getName(), "Removing " + targetName + " from the superadmin list", true);
-                TFM_SuperadminList.removeSuperadmin(targetName);
-
-                if (!TFM_ConfigEntry.TWITTERBOT_ENABLED.getBoolean())
-                {
-                    return true;
-                }
+            TFM_AdminList.removeSuperadmin(Bukkit.getOfflinePlayer(targetName));
 
             // Twitterbot
-                TFM_TwitterHandler twitterbot = TFM_TwitterHandler.getInstance();
-                String reply = twitterbot.delTwitter(targetName);
-                if ("ok".equals(reply))
+            if (TFM_ConfigEntry.TWITTERBOT_ENABLED.getBoolean())
             {
-                    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
-            {
-                return false;
-            }
-
             return true;
         }
-        else
-        {
         return false;
-        }
+
     }
 }

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("Last Check" + ChatColor.WHITE + ": " + TFM_ServiceChecker.getInstance().lastCheck, ChatColor.DARK_PURPLE);
+        playerMsg("Version" + ChatColor.WHITE + ": " + TFM_ServiceChecker.getInstance().getVersion(), ChatColor.DARK_PURPLE);
+        playerMsg("Last Check" + ChatColor.WHITE + ": " + TFM_ServiceChecker.getInstance().getLastCheck(), ChatColor.DARK_PURPLE);
 
         return true;
     }

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

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

src/me/StevenLawson/TotalFreedomMod/Commands/Command_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,6 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import org.bukkit.Location;

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

@@ -1,6 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -21,14 +22,11 @@ public class Command_smite extends TFM_Command
             return false;
         }
 
-        Player player;
-        try
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            playerMsg(ex.getMessage(), ChatColor.RED);
+            playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND);
             return true;
         }
 

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

@@ -1,7 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.command.Command;
@@ -68,7 +68,7 @@ public class Command_stfu extends TFM_Command
             int counter = 0;
             for (Player player : server.getOnlinePlayers())
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(player))
+                if (!TFM_AdminList.isSuperAdmin(player))
                 {
                     playerdata = TFM_PlayerData.getPlayerData(player);
                     playerdata.setMuted(true);
@@ -98,14 +98,11 @@ public class Command_stfu extends TFM_Command
         }
         else
         {
-            Player player;
-            try
+            final Player player = getPlayer(args[0]);
+
+            if (player == null)
             {
-                player = getPlayer(args[0]);
-            }
-            catch (PlayerNotFoundException ex)
-            {
-                sender.sendMessage(ex.getMessage());
+                sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
                 return true;
             }
 
@@ -118,7 +115,7 @@ public class Command_stfu extends TFM_Command
             }
             else
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(player))
+                if (!TFM_AdminList.isSuperAdmin(player))
                 {
                     TFM_Util.adminAction(sender.getName(), "Muting " + player.getName(), true);
                     playerdata.setMuted(true);

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

@@ -1,9 +1,8 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -35,7 +34,7 @@ public class Command_survival extends TFM_Command
         {
             if (args[0].equalsIgnoreCase("-a"))
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(sender) || senderIsConsole)
+                if (!TFM_AdminList.isSuperAdmin(sender) || senderIsConsole)
                 {
                     sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS);
                     return true;
@@ -50,15 +49,13 @@ public class Command_survival extends TFM_Command
                 return true;
             }
 
-            if (senderIsConsole || TFM_SuperadminList.isUserSuperadmin(sender))
-            {
-                try
+            if (senderIsConsole || TFM_AdminList.isSuperAdmin(sender))
             {
                 player = getPlayer(args[0]);
-                }
-                catch (PlayerNotFoundException ex)
+
+                if (player == null)
                 {
-                    playerMsg(ex.getMessage(), ChatColor.RED);
+                    playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND);
                     return true;
                 }
             }

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

@@ -3,16 +3,17 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 import java.util.Arrays;
 import java.util.List;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import 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.BOTH)
-@CommandParameters(description = "Sets yourself a prefix", usage = "/<command> <<prefix> | off | clear <player> | clearall>")
+@CommandParameters(description = "Sets yourself a prefix", usage = "/<command> <set <tag..> | off | clear <player> | clearall>")
 public class Command_tag extends TFM_Command
 {
     public static final List<String> FORBIDDEN_WORDS = Arrays.asList(new String[]
@@ -23,11 +24,16 @@ public class Command_tag extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
+        if (args.length < 1)
+        {
+            return false;
+        }
+
         if (args.length == 1)
         {
             if ("clearall".equals(args[0]))
             {
-                if (!TFM_SuperadminList.isUserSuperadmin(sender))
+                if (!TFM_AdminList.isSuperAdmin(sender))
                 {
                     playerMsg(TotalFreedomMod.MSG_NO_PERMS);
                     return true;
@@ -56,25 +62,59 @@ public class Command_tag extends TFM_Command
                 return true;
             }
 
-            if (TFM_Util.isStopCommand(args[0]))
+            if ("remove".equals(args[0]))
             {
                 TFM_PlayerData.getPlayerData(sender_p).setTag(null);
                 playerMsg("Your tag has been removed.");
                 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;
             }
 
-            if (!TFM_SuperadminList.isUserSuperadmin(sender))
+            return false;
+        }
+
+        if (args.length == 2)
+        {
+            if ("clear".equals(args[0]))
+            {
+                if (!TFM_AdminList.isSuperAdmin(sender))
+                {
+                    playerMsg(TotalFreedomMod.MSG_NO_PERMS);
+                    return true;
+                }
+
+                final Player player = getPlayer(args[1]);
+
+                if (player == null)
+                {
+                    playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND);
+                    return true;
+                }
+
+                TFM_PlayerData.getPlayerData(player).setTag(null);
+                playerMsg("Removed " + player.getName() + "'s tag.");
+                return true;
+            }
+        }
+
+        if ("set".equals(args[0]))
+        {
+            final String tag = StringUtils.join(args, " ", 1, args.length);
+
+            if (!TFM_AdminList.isSuperAdmin(sender))
             {
                 for (String word : FORBIDDEN_WORDS)
                 {
-                    if (args[0].toLowerCase().contains(word.toLowerCase()))
+                    if (!tag.toLowerCase().contains(word))
                     {
+                        continue;
+                    }
+
                     if (word.contains(String.valueOf(ChatColor.COLOR_CHAR)))
                     {
                         playerMsg("That tag contains a forbidden color-code.");
@@ -85,43 +125,14 @@ public class Command_tag extends TFM_Command
                     }
                     return true;
                 }
-                }
 
             }
 
-            TFM_PlayerData.getPlayerData(sender_p).setTag(args[0]);
-            playerMsg("Tag set.");
+            TFM_PlayerData.getPlayerData(sender_p).setTag(TFM_Util.colorize(tag));
+            playerMsg("Tag set to " + TFM_Util.colorize(tag));
 
             return true;
         }
-        else if (args.length == 2)
-        {
-            if ("clear".equals(args[0]))
-            {
-                if (!TFM_SuperadminList.isUserSuperadmin(sender))
-                {
-                    playerMsg(TotalFreedomMod.MSG_NO_PERMS);
-                    return true;
-                }
-
-                final Player player;
-                try
-                {
-                    player = getPlayer(args[1]);
-                }
-                catch (PlayerNotFoundException ex)
-                {
-                    playerMsg(ex.getMessage());
-                    return true;
-                }
-
-                TFM_PlayerData.getPlayerData(player).setTag(null);
-                playerMsg("Removed " + player.getName() + "'s tag.");
-                return true;
-            }
-
-            return false;
-        }
 
         return false;
     }

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

@@ -0,0 +1,37 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
+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 = "Gives you a tag with random colors", usage = "/<command> <tag>", aliases = "tn")
+public class Command_tagnyan extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length < 1)
+        {
+            return false;
+        }
+
+        final StringBuilder tag = new StringBuilder();
+
+        for (char c : ChatColor.stripColor(TFM_Util.colorize(StringUtils.join(args, " "))).toCharArray())
+        {
+            tag.append(TFM_Util.randomChatColor()).append(c);
+        }
+
+        final TFM_PlayerData data = TFM_PlayerData.getPlayerData(sender_p);
+        data.setTag(tag.toString());
+
+        playerMsg("Set tag to " + tag);
+
+        return true;
+    }
+}

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

@@ -1,8 +1,12 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_Ban;
+import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
+import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -19,19 +23,29 @@ public class Command_tban extends TFM_Command
             return false;
         }
 
-        Player player;
-        try
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            playerMsg(ex.getMessage(), ChatColor.RED);
+            playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND, ChatColor.RED);
             return true;
         }
 
+
+        // 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(), "Tempbanning: " + player.getName() + " for 5 minutes.", true);
-        TFM_ServerInterface.banUsername(player.getName(), ChatColor.RED + "You have been temporarily banned for 5 minutes.", sender.getName(), TFM_Util.parseDateOffset("5m"));
+        TFM_BanManager.getInstance().addUuidBan(
+                new TFM_Ban(player.getUniqueId(), player.getName(), sender.getName(), TFM_Util.parseDateOffset("5m"), ChatColor.RED + "You have been temporarily banned for 5 minutes."));
         player.kickPlayer(ChatColor.RED + "You have been temporarily banned for five minutes. Please read totalfreedom.me for more info.");
 
         return true;

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

@@ -2,14 +2,16 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
+import me.StevenLawson.TotalFreedomMod.TFM_Ban;
+import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.ChatColor;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import net.minecraft.util.org.apache.commons.lang3.ArrayUtils;
+import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 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]")
@@ -25,41 +27,52 @@ public class Command_tempban extends TFM_Command
             return false;
         }
 
-        Player player;
-        try
+        final Player player = getPlayer(args[0]);
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            playerMsg(ex.getMessage(), ChatColor.RED);
+            playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND);
             return true;
         }
 
-        StringBuilder bcast_msg = new StringBuilder("Temporarily banned " + player.getName());
+        final StringBuilder message = new StringBuilder("Temporarily banned " + player.getName());
 
-        Date ban_duration = TFM_Util.parseDateOffset("30m");
+        Date expires = TFM_Util.parseDateOffset("30m");
         if (args.length >= 2)
         {
             Date parsed_offset = TFM_Util.parseDateOffset(args[1]);
             if (parsed_offset != null)
             {
-                ban_duration = parsed_offset;
+                expires = parsed_offset;
             }
         }
-        bcast_msg.append(" until ").append(date_format.format(ban_duration));
+        message.append(" until ").append(date_format.format(expires));
 
-        String ban_reason = "Banned by " + sender.getName();
+        String reason = "Banned by " + sender.getName();
         if (args.length >= 3)
         {
-            ban_reason = StringUtils.join(ArrayUtils.subarray(args, 2, args.length), " ") + " (" + sender.getName() + ")";
-            bcast_msg.append(", Reason: \"").append(ban_reason).append("\"");
+            reason = StringUtils.join(ArrayUtils.subarray(args, 2, args.length), " ") + " (" + sender.getName() + ")";
+            message.append(", Reason: \"").append(reason).append("\"");
         }
 
-        TFM_Util.adminAction(sender.getName(), bcast_msg.toString(), true);
-        TFM_ServerInterface.banUsername(player.getName(), ban_reason, sender.getName(), ban_duration);
-        TFM_ServerInterface.banIP(player.getAddress().getAddress().getHostAddress().trim(), ban_reason, sender.getName(), ban_duration);
-        player.kickPlayer(sender.getName() + " - " + bcast_msg.toString());
+
+        // 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(), message.toString(), true);
+
+        TFM_BanManager.getInstance().addIpBan(new TFM_Ban(TFM_Util.getIp(player), player.getName(), sender.getName(), expires, reason));
+        TFM_BanManager.getInstance().addUuidBan(new TFM_Ban(player.getUniqueId(), player.getName(), sender.getName(), expires, reason));
+
+        player.kickPlayer(sender.getName() + " - " + message.toString());
 
         return true;
     }

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

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

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

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

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

@@ -1,5 +1,11 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
+import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
+import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker;
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
+import me.StevenLawson.TotalFreedomMod.TFM_PermbanList;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerList;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -7,14 +13,50 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
-@CommandParameters(description = "Shows information about TotalFreedomMod", usage = "/<command>")
+@CommandParameters(description = "Shows information about TotalFreedomMod or reloads it", usage = "/<command> [reload]")
 public class Command_tfm extends TFM_Command
 {
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
+        if (args.length == 1)
+        {
+            if (!args[0].equals("reload"))
+            {
+                return false;
+            }
+
+            if (!TFM_AdminList.isSuperAdmin(sender))
+            {
+                playerMsg(TotalFreedomMod.MSG_NO_PERMS);
+            }
+
+            TFM_AdminList.load();
+            TFM_PermbanList.load();
+            TFM_PlayerList.getInstance().load();
+            TFM_BanManager.getInstance().load();
+            TFM_CommandBlocker.getInstance().load();
+
+
+            final String message = String.format("%s v%s.%s reloaded.",
+                    TotalFreedomMod.pluginName,
+                    TotalFreedomMod.pluginVersion,
+                    TotalFreedomMod.buildNumber);
+
+            playerMsg(message);
+            TFM_Log.info(message);
+            return true;
+        }
+
         playerMsg("TotalFreedomMod for 'Total Freedom', the original all-op server.", ChatColor.GOLD);
-        playerMsg(String.format("Version " + ChatColor.BLUE + "%s.%s" + ChatColor.BLUE + ", built %s.", TotalFreedomMod.pluginVersion, TotalFreedomMod.buildNumber, TotalFreedomMod.buildDate), ChatColor.GOLD);
+        playerMsg(String.format("Version "
+                + ChatColor.BLUE + "%s.%s" + ChatColor.GOLD + ", built "
+                + ChatColor.BLUE + "%s" + ChatColor.GOLD + " by "
+                + ChatColor.BLUE + "%s" + ChatColor.GOLD + ".",
+                TotalFreedomMod.pluginVersion,
+                TotalFreedomMod.buildNumber,
+                TotalFreedomMod.buildDate,
+                TotalFreedomMod.buildCreator), ChatColor.GOLD);
         playerMsg("Created by Madgeek1450 and DarthSalamon.", ChatColor.GOLD);
         playerMsg("Visit " + ChatColor.AQUA + "http://totalfreedom.me/" + ChatColor.GREEN + " for more information.", ChatColor.GREEN);