Stable release v4.2

Removed Legacy Login

.gitignore

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

LICENSE.md

@@ -1,13 +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.
+TotalFreedomMod is licensed under the TotalFreedom General License. It is available [here](https://github.com/TotalFreedom/License/blob/master/LICENSE.md).
-* A un-edited copy of this LICENSE.md shall always be included with this source code.
-* TotalFreedomMod source code and its derivations shall be freely distributable between anyone who chooses to download it.
-* You shall not remove the keywords "Madgeek1450", "StevenLawson", "DarthSalamon" or "JeromSar" from any part of the source code.
-* You shall not edit or remove the file Command_tfm.java
-* You may not modify the file TFM_FrontDoor.java. Removing it is fine, however.
-* Compiled binaries (*.jar's) shall not to be distributed.
-  * If you wish to obtain a copy of TotalFreedomMod you must compile the original source code or it's derivations yourself.
-  * 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.

build.xml

@@ -2,16 +2,22 @@
 <project name="TotalFreedomMod" default="default" basedir=".">
     <description>Builds, tests, and runs the project TotalFreedomMod.</description>
     <import file="nbproject/build-impl.xml" />
+
     <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.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" />

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 Apr 15 16:28:36 CEST 2014
+#Mon May 19 14:24:40 CEST 2014
-build.number=762
+build.number=860

src/bans.yml

@@ -1,6 +1,6 @@
 #
 # TotalFreedomMod banning config
-# Warning: modification of this file is not reccomended
+# Warning: modification of this file is not recomended
 #
 # Format:
 # Ip: [IP-address / UUID]:[Last login name]:[Expiry unix timestamp (0 = never)][Banned by]:[Reason]

src/config.yml

@@ -1,33 +1,56 @@
-# TotalFreedomMod v4.0 Configuration
+# TotalFreedomMod v4.2 Configuration
 # by Madgeek1450 and DarthSalamon
 
-# Block placement prevention:
+# Generic server information
-allow_fire_place: false
+server:
-allow_fire_spread: false
+  # You should change this to your server's name
-allow_lava_damage: false
+  name: TotalFreedom
-allow_lava_place: false
+
-allow_water_place: false
+  # The address your server is located at
-allow_fluid_spread: false
+  address: 64.34.165.5:28965
-allow_tnt_minecarts: false
+
+  # Shown at the server list
+  motd: TotalFreedom &8- Minecraft %mcversion%
+
+  # Every word in the MOTD will be a different color unless prefixed by a color code
+  colorful_motd: true
+
+  # All players who show up as owner
+  owners:
+    - markbyron
+
+  # URL players should appeal for bans at
+  ban_url: http://totalfreedom.boards.net/
+
+  # URL players should appeal for permanent bans at
+  permban_url: http://bit.ly/TF_PermBan
+
+# 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.
+# 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
+# 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 ofcourse.
+# -as all aliases are blocked by default. Commands are case-insensitive.
-# You can block specific subcommands aswell. eg: /mail sendall
 #
 # * 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.
@@ -74,6 +97,7 @@ blocked_commands:
   - 's:b:/tool:_'
   - 's:b://butcher:_'
   - 's:b:/scoreboard:_'
+  - 's:b:/setspawn:_'
 
   # Superadmin commands - Auto-eject
   - 's:a:/stop'
@@ -82,25 +106,32 @@ blocked_commands:
   - '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:
+# Nuking prevention
-nuke_monitor: true
+nukemonitor:
-nuke_monitor_count_break: 100
+  enabled: true
-nuke_monitor_count_place: 25
+  count_break: 100
-nuke_monitor_range: 10.0
+  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 certain events
-disable_night: true
+disable:
+  night: true
+  weather: true
 
-# Disable weather:
-disable_weather: true
 
 # Enable misc. features:
 landmines_enabled: false
@@ -108,26 +139,34 @@ mp44_enabled: false
 tossmob_enabled: false
 
 # Moblimiter:
-mob_limiter_enabled: true
+
-# Max per world:
+moblimiter:
-mob_limiter_max: 50
+  enabled: true
-mob_limiter_disable_dragon: true
+  max: 50
-mob_limiter_disable_ghast: true
+  disable:
-mob_limiter_disable_slime: true
+    dragon: true
-mob_limiter_disable_giant: true
+    ghast: true
+    slime: true
+    giant: true
 
 # Flatlands
-generate_flatlands: true
+flatlands:
-# Flatlands generation parameters, uses CleanroomGenerator syntax - http://dev.bukkit.org/server-mods/cleanroomgenerator/
+  generate: true
-flatlands_generation_params: 16,stone,32,dirt,1,grass
+  # Flatlands generation parameters, uses CleanroomGenerator syntax - http://dev.bukkit.org/server-mods/cleanroomgenerator/
+  generate_params: 16,stone,32,dirt,1,grass
 
 # Admin-Only Mode
 admin_only_mode: false
 
 # Protected Areas - Protect areas so that only superadmins can directly modify blocks in those areas. WorldEdit and other such plugins might bypass this.
-protected_areas_enabled: true
+protectarea:
-auto_protect_spawnpoints: true
+  enabled: true
-auto_protect_radius: 25.0
+  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.
@@ -173,30 +212,36 @@ unbannable_usernames:
   - stampylonghead
   - stampylongnose
   - dantdm
+  - gizzy14gazza
 
 # TwitterBot - Used to allow superadmins to verify themselves using twitter
-twitterbot_enabled: false
+twitterbot:
-twitterbot_url: ''
+  enabled: false
-twitterbot_secret: ''
+  url: ''
+  secret: ''
 
 # Pet Protect - Prevent tamed pets from being killed.
-pet_protect_enabled: true
+petprotect:
+  enabled: true
 
 # Logs Registration
-logs_register_password: ''
+logs:
-logs_register_url: ''
+  url: ''
+  secret: ''
 
 # Mojang service checker
 service_checker_url: http://status.mojang.com/check
 
 # HTTPD
-httpd_enabled: true
+httpd:
-httpd_public_folder: ./public_html
+  enabled: true
-httpd_port: 28966
+  port: 28966
+  public_folder: ./public_html
 
 # Inactivity Auto-Kick (Requires Essentials)
-autokick_enabled: true
+autokick:
-# autokick_threshold - Percentage of server player capacity used at which players will be automatically kicked for being inactive. Range: 0.0 - 1.0
+  enabled: true
-autokick_threshold: 0.9
+  # autokick_threshold - Percentage of server player capacity used at which players will be automatically kicked for being inactive. Range: 0.0 - 1.0
-# autokick_time - Time, in seconds, after which a player should be kicked when inactive
+  threshold: 0.9
-autokick_time: 120
+  # autokick_time - Time, in seconds, after which a player should be kicked when inactive
+  time: 120

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

@@ -7,7 +7,7 @@ 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
 {

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

@@ -113,18 +113,15 @@ public class Command_adminworld extends TFM_Command
 
                         if ("add".equalsIgnoreCase(args[1]))
                         {
-                            Player player;
+                            final Player player = getPlayer(args[2]);
-                            try
+
+                            if (player == null)
                             {
-                                player = getPlayer(args[2]);
+                                sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
-                            }
-                            catch (PlayerNotFoundException ex)
-                            {
-                                sender.sendMessage(ex.getMessage());
                                 return true;
                             }
 
-                            if (player != null && TFM_AdminWorld.getInstance().addGuest(player, sender_p))
+                            if (TFM_AdminWorld.getInstance().addGuest(player, sender_p))
                             {
                                 TFM_Util.adminAction(sender.getName(), "AdminWorld guest added: " + player.getName(), false);
                             }
@@ -133,9 +130,9 @@ public class Command_adminworld extends TFM_Command
                                 playerMsg("Could not add player to guest list.");
                             }
                         }
-                        else if (TFM_Util.isRemoveCommand(args[1]))
+                        else if ("remove".equals(args[1]))
                         {
-                            Player player = TFM_AdminWorld.getInstance().removeGuest(args[2]);
+                            final Player player = TFM_AdminWorld.getInstance().removeGuest(args[2]);
                             if (player != null)
                             {
                                 TFM_Util.adminAction(sender.getName(), "AdminWorld guest removed: " + player.getName(), false);

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

@@ -3,6 +3,7 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -36,14 +37,11 @@ public class Command_blockcmd extends TFM_Command
             return true;
         }
 
-        Player player;
+        final Player player = getPlayer(args[0]);
-        try
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
+            playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            playerMsg(ex.getMessage());
             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;
@@ -21,7 +22,7 @@ public class Command_cage extends TFM_Command
             return false;
         }
 
-        if (TFM_Util.isStopCommand(args[0]) && sender instanceof Player)
+        if ("off".equals(args[0]) && sender instanceof Player)
         {
             TFM_Util.adminAction(sender.getName(), "Uncaging " + sender.getName(), true);
             TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(sender_p);
@@ -32,9 +33,9 @@ public class Command_cage extends TFM_Command
 
             return true;
         }
-        else if ("purge".equalsIgnoreCase(args[0]))
+        else if ("purge".equals(args[0]))
         {
-            TFM_Util.adminAction(sender.getName(), "Uncaging all players.", true);
+            TFM_Util.adminAction(sender.getName(), "Uncaging all players", true);
 
             for (Player player : server.getOnlinePlayers())
             {
@@ -47,14 +48,11 @@ public class Command_cage extends TFM_Command
             return true;
         }
 
-        Player player;
+        final Player player = getPlayer(args[0]);
-        try
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
+            sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            sender.sendMessage(ex.getMessage());
             return true;
         }
 
@@ -65,7 +63,7 @@ public class Command_cage extends TFM_Command
 
         if (args.length >= 2)
         {
-            if (TFM_Util.isStopCommand(args[1]))
+            if ("off".equals(args[1]))
             {
                 TFM_Util.adminAction(sender.getName(), "Uncaging " + player.getName(), true);
 

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

@@ -1,6 +1,7 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 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]);
+
+            if (targetPlayer == null)
             {
-                targetPlayer = getPlayer(args[0]);
+                sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
-            }
-            catch (PlayerNotFoundException ex)
-            {
-                sender.sendMessage(ex.getMessage());
                 return true;
             }
         }

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

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

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

@@ -54,13 +54,12 @@ public class Command_creative extends TFM_Command
                 return true;
             }
 
-            try
+
+            player = getPlayer(args[0]);
+
+            if (player == null)
             {
-                player = getPlayer(args[0]);
+                sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
-            }
-            catch (PlayerNotFoundException ex)
-            {
-                sender.sendMessage(ex.getMessage());
                 return true;
             }
 

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

@@ -13,10 +13,9 @@ 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);
+        TFM_Util.adminAction(sender.getName(), "Removing all nicknames", false);
 
-        Player[] onlinePlayers = server.getOnlinePlayers();
+        for (Player player : server.getOnlinePlayers())
-        for (Player player : onlinePlayers)
         {
             TFM_EssentialsBridge.getInstance().setNickname(player.getName(), null);
         }

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

@@ -1,16 +1,18 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
 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>")
@@ -24,14 +26,11 @@ public class Command_doom extends TFM_Command
             return false;
         }
 
-        final Player player;
+        final Player player = getPlayer(args[0]);
-        try
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
+            sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            sender.sendMessage(ex.getMessage());
             return true;
         }
 
@@ -53,8 +52,11 @@ public class Command_doom extends TFM_Command
         // deop
         player.setOp(false);
 
-        // ban IP
+        // ban IPs
-        TFM_BanManager.getInstance().addIpBan(new TFM_Ban(ip, player.getName()));
+        for (String playerIp : TFM_PlayerList.getInstance().getEntry(player).getIps())
+        {
+            TFM_BanManager.getInstance().addIpBan(new TFM_Ban(playerIp, player.getName()));
+        }
 
         // ban name
         TFM_BanManager.getInstance().addUuidBan(new TFM_Ban(player.getUniqueId(), player.getName()));
@@ -72,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
@@ -83,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()
         {
@@ -99,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.Config.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_explosives.java

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

@@ -19,14 +19,12 @@ public class Command_findip extends TFM_Command
             return false;
         }
 
-        final Player player;
+        final Player player = getPlayer(args[0]);
-        try
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
+
-        }
+            playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND);
-        catch (PlayerNotFoundException ex)
-        {
-            playerMsg(ex.getMessage());
             return true;
         }
 

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

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

@@ -13,7 +13,7 @@ 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_Flatlands.getInstance().sendToWorld(sender_p);
         }

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

@@ -1,24 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.Commands;
-
-import me.StevenLawson.TotalFreedomMod.Config.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_FLUID_SPREAD.setBoolean(!args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + ".");
-
-        return true;
-    }
-}

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

@@ -81,14 +81,11 @@ public class Command_fr extends TFM_Command
             }
             else
             {
-                Player player;
+                final Player player = getPlayer(args[0]);
-                try
+
+                if (player == null)
                 {
-                    player = getPlayer(args[0]);
+                    playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND, ChatColor.RED);
-                }
-                catch (PlayerNotFoundException ex)
-                {
-                    playerMsg(ex.getMessage(), ChatColor.RED);
                     return true;
                 }
 

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

@@ -1,8 +1,8 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker;
+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;
@@ -19,14 +19,11 @@ public class Command_gcmd extends TFM_Command
             return false;
         }
 
-        Player player;
+        final Player player = getPlayer(args[0]);
-        try
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
+            sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            sender.sendMessage(ex.getMessage());
             return true;
         }
 

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

@@ -35,6 +35,7 @@ public class Command_glist extends TFM_Command
                 if (TFM_AdminList.isSeniorAdmin(sender))
                 {
                     TFM_PlayerList.getInstance().purgeAll();
+                    playerMsg("Purged playerbase");
                 }
                 else
                 {
@@ -50,16 +51,13 @@ public class Command_glist extends TFM_Command
         else if (args.length == 2)
         {
             String username;
-            List<String> ips = new ArrayList<String>();
+            final List<String> ips = new ArrayList<String>();
 
-            try
-            {
-                Player player = getPlayer(args[1]);
 
-                username = player.getName();
+
-                ips.add(player.getAddress().getAddress().getHostAddress());
+            final Player player = getPlayer(args[1]);
-            }
+
-            catch (PlayerNotFoundException ex)
+            if (player == null)
             {
                 final TFM_PlayerEntry entry = TFM_PlayerList.getInstance().getEntry(args[1]);
 
@@ -70,7 +68,12 @@ public class Command_glist extends TFM_Command
                 }
 
                 username = entry.getLastJoinName();
-                ips = entry.getIps();
+                ips.addAll(entry.getIps());
+            }
+            else
+            {
+                username = player.getName();
+                ips.add(player.getAddress().getAddress().getHostAddress());
             }
 
             String mode = args[0].toLowerCase();
@@ -78,11 +81,11 @@ public class Command_glist extends TFM_Command
             {
                 TFM_Util.adminAction(sender.getName(), "Banning " + username + " and IPs: " + StringUtils.join(ips, ","), true);
 
-                Player player = server.getPlayerExact(username);
+                Player target = server.getPlayerExact(username);
-                if (player != null)
+                if (target != null)
                 {
-                    TFM_BanManager.getInstance().addUuidBan(new TFM_Ban(player.getUniqueId(), player.getName()));
+                    TFM_BanManager.getInstance().addUuidBan(new TFM_Ban(target.getUniqueId(), target.getName()));
-                    player.kickPlayer("You have been banned by " + sender.getName() + "\n If you think you have been banned wrongly, appeal here: http://www.totalfreedom.boards.net");
+                    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
                 {
@@ -105,8 +108,7 @@ public class Command_glist extends TFM_Command
                 for (String ip : ips)
                 {
                     TFM_BanManager.getInstance().unbanIp(ip);
-                    String[] ipParts = ip.split("\\.");
+                    TFM_BanManager.getInstance().unbanIp(TFM_Util.getFuzzyIp(ip));
-                    TFM_BanManager.getInstance().unbanIp(ipParts[0] + "." + ipParts[1] + ".*.*");
                 }
             }
             else

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

@@ -4,8 +4,8 @@ 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.TotalFreedomMod;
 import net.minecraft.util.org.apache.commons.lang3.ArrayUtils;
 import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
@@ -27,14 +27,11 @@ public class Command_gtfo extends TFM_Command
             return false;
         }
 
-        Player player;
+        final Player player = getPlayer(args[0]);
-        try
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
+            playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND, ChatColor.RED);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            playerMsg(ex.getMessage(), ChatColor.RED);
             return true;
         }
 
@@ -79,12 +76,7 @@ public class Command_gtfo extends TFM_Command
         }
 
         // ban IP address:
-        String ip = player.getAddress().getAddress().getHostAddress();
+        String ip = TFM_Util.getFuzzyIp(player.getAddress().getAddress().getHostAddress());
-        String[] ipParts = ip.split("\\.");
-        if (ipParts.length == 4)
-        {
-            ip = String.format("%s.%s.*.*", ipParts[0], ipParts[1]);
-        }
         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));

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

@@ -3,6 +3,7 @@ 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.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -76,18 +77,14 @@ public class Command_halt extends TFM_Command
             return true;
         }
 
-        Player player;
+        final Player player = getPlayer(args[0]);
-        try
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
+            sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            sender.sendMessage(ex.getMessage());
             return true;
         }
 
-
         TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
         if (!playerdata.isHalted())
         {

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

@@ -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
@@ -40,7 +41,6 @@ public class Command_invis extends TFM_Command
                 players.add(player.getName());
                 if (smite && !TFM_AdminList.isSuperAdmin(player))
                 {
-                    TFM_Util.adminAction(sender.getName(), "Smiting all invisible players", true);
                     player.setHealth(0.0);
                     smites++;
                 }

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

@@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Manage jumppads", usage = "/<command> <on | off | info |sideways <on | off> | strength <strength (1-10)>>", aliases = "launchpads,jp")
+@CommandParameters(description = "Manage jumppads", usage = "/<command> <on | off | info | sideways <on | off> | strength <strength (1-10)>>", aliases = "launchpads,jp")
 public class Command_jumppads extends TFM_Command
 {
     @Override
@@ -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

@@ -7,7 +7,7 @@ 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
 {

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;
+        final Player player = getPlayer(args[0]);
-        try
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
+            playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            playerMsg(ex.getMessage(), ChatColor.RED);
             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();
+            String lastCommand = playerdata.getLastCommand();
-            if (last_command.isEmpty())
+            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.Config.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.Config.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_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_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;
+                final Player player = getPlayer(args[0]);
-                try
+
+                if (player == null)
                 {
-                    player = getPlayer(args[0]);
+                    sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
-                }
-                catch (PlayerNotFoundException ex)
-                {
-                    sender.sendMessage(ex.getMessage());
                     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;
+                final Player player = getPlayer(args[0]);
-                try
+
+                if (player == null)
                 {
-                    player = getPlayer(args[0]);
+                    sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
-                }
-                catch (PlayerNotFoundException ex)
-                {
-                    sender.sendMessage(ex.getMessage());
                     return true;
                 }
 

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

@@ -12,7 +12,6 @@ import java.util.Map.Entry;
 import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_Log;
 import me.StevenLawson.TotalFreedomMod.TFM_Admin;
-import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
@@ -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 logsRegisterURL = TFM_ConfigEntry.LOGS_URL.getString();
-        final String logsRegisterPassword = TFM_ConfigEntry.LOGS_REGISTER_PASSWORD.getString();
+        final String logsRegisterPassword = TFM_ConfigEntry.LOGS_SECRET.getString();
 
         if (logsRegisterURL == null || logsRegisterPassword == null || logsRegisterURL.isEmpty() || logsRegisterPassword.isEmpty())
         {

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

@@ -34,20 +34,14 @@ public class Command_nf extends TFM_Command
                 if (matcher.find())
                 {
                     String displayName = matcher.group(1);
-                    try
+
-                    {
+                    player = getPlayerByDisplayName(displayName);
-                        player = getPlayerByDisplayName(displayName);
+
-                    }
-                    catch (PlayerNotFoundException ex)
-                    {
-                    }
                     if (player == null)
                     {
-                        try
+                        player = getPlayerByDisplayNameAlt(displayName);
-                        {
+
-                            player = getPlayerByDisplayNameAlt(displayName);
+                        if (player == null)
-                        }
-                        catch (PlayerNotFoundException ex)
                         {
                             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

@@ -19,7 +19,7 @@ public class Command_nicknyan extends TFM_Command
             return false;
         }
 
-        if (TFM_Util.isStopCommand(args[0]))
+        if ("off".equals(args[0]))
         {
             TFM_EssentialsBridge.getInstance().setNickname(sender.getName(), null);
             playerMsg("Nickname cleared.");

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

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

@@ -1,55 +1,66 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Manage operators", usage = "/<command> <count | list>")
+@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()));
+            int totalOps = server.getOperators().size();
+            int onlineOps = 0;
+
+            for (Player player : server.getOnlinePlayers())
+            {
+                if (player.isOp())
+                {
+                    onlineOps++;
+                }
+            }
+
+            playerMsg("Online OPs: " + onlineOps);
+            playerMsg("Offline OPs: " + (totalOps - onlineOps));
+            playerMsg("Total OPs: " + totalOps);
+
             return true;
         }
 
-        if (args[0].equalsIgnoreCase("count"))
+        if (args[0].equals("purge"))
         {
-            int onlineOPs = 0;
+            if (!TFM_AdminList.isSuperAdmin(sender))
-            int offlineOPs = 0;
+            {
-            int totalOPs = 0;
+                playerMsg(TotalFreedomMod.MSG_NO_PERMS);
+                return true;
+            }
+
+            TFM_Util.adminAction(sender.getName(), "Purging all operators", true);
 
             for (OfflinePlayer player : server.getOperators())
             {
+                player.setOp(false);
                 if (player.isOnline())
                 {
-                    onlineOPs++;
+                    playerMsg((Player) player, TotalFreedomMod.YOU_ARE_NOT_OP);
                 }
-                else
-                {
-                    offlineOPs++;
-                }
-                totalOPs++;
             }
-
-            playerMsg("Online OPs: " + onlineOPs);
-            playerMsg("Offline OPs: " + offlineOPs);
-            playerMsg("Total OPs: " + totalOPs);
-
             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;
+        Player player = getPlayer(args[0]);
-        try
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
+            playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND, ChatColor.RED);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            playerMsg(ex.getMessage(), 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,5 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_PermbanList;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
@@ -7,7 +8,7 @@ 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.permbannedPlayers.isEmpty())
+        if (TFM_PermbanList.getPermbannedPlayers().isEmpty())
         {
             playerMsg(sender, "No permanently banned player names.");
         }
         else
         {
-            playerMsg(sender, TotalFreedomMod.permbannedPlayers.size() + " permanently banned players:");
+            playerMsg(sender, TFM_PermbanList.getPermbannedPlayers().size() + " permanently banned players:");
-            playerMsg(sender, StringUtils.join(TotalFreedomMod.permbannedPlayers, ", "));
+            playerMsg(sender, StringUtils.join(TFM_PermbanList.getPermbannedPlayers(), ", "));
         }
 
-        if (TotalFreedomMod.permbannedIps.isEmpty())
+        if (TFM_PermbanList.getPermbannedIps().isEmpty())
         {
             playerMsg(sender, "No permanently banned IPs.");
         }
         else
         {
-            playerMsg(sender, TotalFreedomMod.permbannedIps.size() + " permanently banned IPs:");
+            playerMsg(sender, TFM_PermbanList.getPermbannedIps().size() + " permanently banned IPs:");
-            playerMsg(sender, StringUtils.join(TotalFreedomMod.permbannedIps, ", "));
+            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.Config.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 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;
+                for (Plugin serverPlugin : pm.getPlugins())
-            }
+                {
-            else if (args[0].equalsIgnoreCase("reload"))
+                    final String version = serverPlugin.getDescription().getVersion();
-            {
+                    playerMsg(ChatColor.GRAY + "- " + (serverPlugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED) + serverPlugin.getName()
-                commandMode = CommandMode.RELOAD;
+                            + ChatColor.GOLD + (version != null && !version.isEmpty() ? " v" + version : "") + " by "
-            }
+                            + StringUtils.join(serverPlugin.getDescription().getAuthors(), ", "));
-        }
+                }
-        else if (args.length >= 2)
+
-        {
+                return true;
-            if (args[0].equalsIgnoreCase("enable"))
+            }
-            {
-                commandMode = CommandMode.ENABLE;
-            }
-            else if (args[0].equalsIgnoreCase("disable"))
-            {
-                commandMode = CommandMode.DISABLE;
-            }
-        }
 
-        if (commandMode == null)
-        {
             return false;
         }
 
-        PluginManager pluginManager = plugin.getServer().getPluginManager();
+        if ("enable".equals(args[0]))
-
-        if (commandMode == CommandMode.LIST)
         {
-            playerMsg("Plugins: " + StringUtils.join(pluginManager.getPlugins(), ", "));
+            final Plugin target = getPlugin(args[1]);
-        }
+            if (target == null)
-        else if (commandMode == CommandMode.RELOAD)
-        {
-            playerMsg("Disabling all plugins.");
-            for (Plugin targetPlugin : pluginManager.getPlugins())
             {
-                if (!targetPlugin.getName().toLowerCase().startsWith("totalfreedommod"))
+                playerMsg("Plugin not found!");
-                {
-                    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.");
                 return true;
             }
-            else
+
+            if (target.isEnabled())
             {
-                if (commandMode == CommandMode.ENABLE)
+                playerMsg("Plugin is already enabled.");
+                return true;
+            }
+
+            pm.enablePlugin(target);
+
+            if (!pm.isPluginEnabled(target))
+            {
+                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;
+            }
+        }
+
+        if (name.length() >= 3)
+        {
+            for (Plugin serverPlugin : server.getPluginManager().getPlugins())
+            {
+                if (serverPlugin.getName().toLowerCase().contains(name.toLowerCase()))
                 {
-                    pluginManager.enablePlugin(targetPlugin);
+                    return serverPlugin;
-                    if (targetPlugin.isEnabled())
-                    {
-                        playerMsg("Plugin \"" + targetPlugin.getName() + "\" enabled.");
-                    }
-                    else
-                    {
-                        playerMsg("Error enabling plugin \"" + targetPlugin.getName() + "\".");
-                    }
-                }
-                else
-                {
-                    pluginManager.disablePlugin(targetPlugin);
-                    if (!targetPlugin.isEnabled())
-                    {
-                        playerMsg("Plugin \"" + targetPlugin.getName() + "\" disabled.");
-                    }
-                    else
-                    {
-                        playerMsg("Error disabling plugin \"" + targetPlugin.getName() + "\".");
-                    }
                 }
             }
         }
 
-        return true;
+        return null;
     }
 }

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

@@ -58,13 +58,11 @@ public class Command_potion extends TFM_Command
 
                 if (args.length == 2)
                 {
-                    try
+                    target = getPlayer(args[1]);
+
+                    if (target == null)
                     {
-                        target = getPlayer(args[1]);
+                        playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND, ChatColor.RED);
-                    }
-                    catch (PlayerNotFoundException ex)
-                    {
-                        playerMsg(ex.getMessage(), ChatColor.RED);
                         return true;
                     }
                 }
@@ -103,13 +101,12 @@ public class Command_potion extends TFM_Command
 
                 if (args.length == 5)
                 {
-                    try
+
+                    target = getPlayer(args[4]);
+
+                    if (target == null)
                     {
-                        target = getPlayer(args[4]);
+                        playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND, ChatColor.RED);
-                    }
-                    catch (PlayerNotFoundException ex)
-                    {
-                        playerMsg(ex.getMessage(), ChatColor.RED);
                         return true;
                     }
                 }

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

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

@@ -23,17 +23,18 @@ public class Command_premium extends TFM_Command
             return false;
         }
 
-        String name;
+        final Player player = getPlayer(args[0]);
-        try
+        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
@@ -41,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()));
@@ -53,7 +54,7 @@ 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);
 

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

@@ -17,7 +17,7 @@ public class Command_protectarea extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        if (!TFM_ConfigEntry.PROTECTED_AREAS_ENABLED.getBoolean())
+        if (!TFM_ConfigEntry.PROTECTAREA_ENABLED.getBoolean())
         {
             playerMsg("Protected areas are currently disabled in the TotalFreedomMod configuration.");
             return true;
@@ -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_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_PlayerRank;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -33,17 +34,15 @@ public class Command_rank extends TFM_Command
             return true;
         }
 
-        Player player;
+        final Player player = getPlayer(args[0]);
-        try
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
+            sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            sender.sendMessage(ex.getMessage());
             return true;
         }
 
+
         playerMsg(player.getName() + " is " + TFM_PlayerRank.fromSender(player).getLoginMessage(), ChatColor.AQUA);
 
         return true;

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

@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
+@CommandPermissions(level = AdminLevel.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
 {

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]);
+        final List<Material> materials = new ArrayList<Material>();
-        if (from_material == null)
+
+        for (String materialName : (args[0].contains(",") ? args[0].split(",") : new String[]
         {
-            try
+            args[0]
-            {
+        }))
-                from_material = Material.getMaterial(Integer.parseInt(args[0]));
+        {
-            }
+            Material fromMaterial = Material.matchMaterial(materialName);
-            catch (NumberFormatException ex)
+            if (fromMaterial == null)
             {
+                try
+                {
+                    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]);
+            if (targetPlayer == null)
             {
-                targetPlayer = getPlayer(args[2]);
+                playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND);
-            }
-            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);
-            }
-        }
         else
         {
-            TFM_Util.adminAction(sender.getName(), "Removing all " + from_material.name() + " within " + radius + " blocks of " + targetPlayer.getName() + ".", senderIsConsole);
+            targetPlayer = null;
-            affected += TFM_Util.replaceBlocks(targetPlayer.getLocation(), from_material, Material.AIR, radius);
         }
 
-        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

@@ -7,7 +7,7 @@ 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 = "Issues a rollback on a player", usage = "/<command> <[partialname] | undo [partialname] purge [partialname] | purgeall>", aliases = "rb")
 public class Command_rollback extends TFM_Command
 {
@@ -38,7 +38,7 @@ public class Command_rollback extends TFM_Command
 
                 TFM_Util.adminAction(sender.getName(), "Rolling back player: " + playerName, false);
                 playerMsg("Rolled back " + TFM_RollbackManager.rollback(playerName) + " edits for " + playerName + ".");
-                playerMsg("If this rollback was a mistake, use /rollback undo " + playerName + " within 20 seconds to reverse the rollback.");
+                playerMsg("If this rollback was a mistake, use /rollback undo " + playerName + " within 40 seconds to reverse the rollback.");
             }
         }
         else if (args.length == 2)
@@ -85,16 +85,11 @@ public class Command_rollback extends TFM_Command
     {
         String playerName = null;
 
-        try
+
-        {
+        final Player player = getPlayer(playerNameInput);
-            Player player = getPlayer(playerNameInput);
+        if (player != null)
-            if (player != null)
-            {
-                playerName = player.getName();
-            }
-        }
-        catch (PlayerNotFoundException ex)
         {
+            playerName = player.getName();
         }
 
         if (playerName == null)

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

@@ -9,12 +9,14 @@ import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import net.minecraft.util.org.apache.commons.lang3.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.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
@@ -24,17 +26,17 @@ public class Command_saconfig extends TFM_Command
         {
             return false;
         }
+
         if (args.length == 1)
         {
             if (args[0].equals("list"))
             {
-                playerMsg("Superadmins: " + StringUtils.join(TFM_AdminList.getSuperadminNames(), ", "), ChatColor.GOLD);
+                playerMsg("Superadmins: " + StringUtils.join(TFM_AdminList.getSuperNames(), ", "), ChatColor.GOLD);
                 return true;
             }
 
             if (args[0].equals("clean"))
             {
-
                 if (!TFM_AdminList.isSeniorAdmin(sender, true))
                 {
                     playerMsg(TotalFreedomMod.MSG_NO_PERMS);
@@ -43,43 +45,99 @@ public class Command_saconfig extends TFM_Command
 
                 TFM_Util.adminAction(sender.getName(), "Cleaning superadmin list", true);
                 TFM_AdminList.cleanSuperadminList(true);
-                playerMsg("Superadmins: " + StringUtils.join(TFM_AdminList.getSuperadminUUIDs(), ", "), ChatColor.YELLOW);
+                playerMsg("Superadmins: " + StringUtils.join(TFM_AdminList.getSuperNames(), ", "), ChatColor.YELLOW);
                 return true;
             }
-
-            return false;
         }
 
-        if (args[0].equalsIgnoreCase("info"))
+        // All commands below are superadmin+ commands.
+        if (!TFM_AdminList.isSuperAdmin(sender))
         {
-            if (!TFM_AdminList.isSuperAdmin(sender))
+            playerMsg(TotalFreedomMod.MSG_NO_PERMS);
+            return true;
+        }
+
+        if (args[0].equals("clear"))
+        {
+            if (senderIsConsole)
             {
-                playerMsg(TotalFreedomMod.MSG_NO_PERMS);
+                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
+
-                {
+                final Player player = getPlayer(args[1]);
-                    superadmin = TFM_AdminList.getEntry(getPlayer(args[1]).getName().toLowerCase());
+
-                }
+                if (player != null)
-                catch (PlayerNotFoundException ex)
                 {
+                    superadmin = TFM_AdminList.getEntry(player.getName().toLowerCase());
                 }
             }
 
             if (superadmin == null)
             {
                 playerMsg("Superadmin not found: " + args[1]);
-            }
+                return true;
-            else
-            {
-                playerMsg(superadmin.toString());
             }
 
+            playerMsg(superadmin.toString());
             return true;
         }
 
@@ -89,43 +147,30 @@ public class Command_saconfig extends TFM_Command
             return true;
         }
 
-        if (args[0].equalsIgnoreCase("add"))
+        if (args[0].equals("add"))
         {
-            Player player = null;
+            OfflinePlayer player = getPlayer(args[1]);
-            String playername = null;
 
-            try
+            if (player == null)
-            {
-                player = getPlayer(args[1]);
-            }
-            catch (PlayerNotFoundException ex)
             {
                 final TFM_Admin superadmin = TFM_AdminList.getEntry(args[1]);
-                if (superadmin != null)
+
+                if (superadmin == null)
                 {
-                    playername = superadmin.getLastLoginName();
+                    playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND);
-                }
-                else
-                {
-                    playerMsg(ex.getMessage(), ChatColor.RED);
                     return true;
                 }
+
+                player = Bukkit.getOfflinePlayer(superadmin.getLastLoginName());
             }
 
-            if (player != null)
+            TFM_Util.adminAction(sender.getName(), "Adding " + player.getName() + " to the superadmin list", true);
-            {
+            TFM_AdminList.addSuperadmin(player);
-                TFM_Util.adminAction(sender.getName(), "Adding " + player.getName() + " to the superadmin list.", true);
+
-                TFM_AdminList.addSuperadmin(player);
-            }
-            else if (playername != null)
-            {
-                TFM_Util.adminAction(sender.getName(), "Adding " + playername + " to the superadmin list.", true);
-                TFM_AdminList.addSuperadmin(player);
-            }
             return true;
         }
 
-        if (TFM_Util.isRemoveCommand(args[0]))
+        if ("delete".equals(args[0]))
         {
             if (!TFM_AdminList.isSeniorAdmin(sender))
             {
@@ -135,15 +180,15 @@ public class Command_saconfig extends TFM_Command
 
             String targetName = args[1];
 
-            try
+
-            {
+            final Player player = getPlayer(targetName);
-                targetName = getPlayer(targetName).getName();
+
-            }
+            if (player != null)
-            catch (PlayerNotFoundException ex)
             {
+                targetName = player.getName();
             }
 
-            if (!TFM_AdminList.getLowerSuperadminNames().contains(targetName.toLowerCase()))
+            if (!TFM_AdminList.getLowerSuperNames().contains(targetName.toLowerCase()))
             {
                 playerMsg("Superadmin not found: " + targetName);
                 return true;

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

@@ -20,9 +20,9 @@ public class Command_setspawnworld extends TFM_Command
 
         playerMsg("Spawn location for this world set to: " + TFM_Util.formatLocation(sender_p.getWorld().getSpawnLocation()));
 
-        if (TFM_ConfigEntry.PROTECTED_AREAS_ENABLED.getBoolean() && TFM_ConfigEntry.AUTO_PROTECT_SPAWNPOINTS.getBoolean())
+        if (TFM_ConfigEntry.PROTECTAREA_ENABLED.getBoolean() && TFM_ConfigEntry.PROTECTAREA_SPAWNPOINTS.getBoolean())
         {
-            TFM_ProtectedArea.addProtectedArea("spawn_" + sender_p.getWorld().getName(), pos, TFM_ConfigEntry.AUTO_PROTECT_RADIUS.getDouble());
+            TFM_ProtectedArea.addProtectedArea("spawn_" + sender_p.getWorld().getName(), pos, TFM_ConfigEntry.PROTECTAREA_RADIUS.getDouble());
         }
 
         return true;

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;
+        final Player player = getPlayer(args[0]);
-        try
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
+            playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            playerMsg(ex.getMessage(), ChatColor.RED);
             return true;
         }
 

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

@@ -98,14 +98,11 @@ public class Command_stfu extends TFM_Command
         }
         else
         {
-            Player player;
+            final Player player = getPlayer(args[0]);
-            try
+
+            if (player == null)
             {
-                player = getPlayer(args[0]);
+                sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND);
-            }
-            catch (PlayerNotFoundException ex)
-            {
-                sender.sendMessage(ex.getMessage());
                 return true;
             }
 

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

@@ -3,7 +3,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.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -52,13 +51,11 @@ public class Command_survival extends TFM_Command
 
             if (senderIsConsole || TFM_AdminList.isSuperAdmin(sender))
             {
-                try
+                player = getPlayer(args[0]);
+
+                if (player == null)
                 {
-                    player = getPlayer(args[0]);
+                    playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND);
-                }
-                catch (PlayerNotFoundException ex)
-                {
-                    playerMsg(ex.getMessage(), ChatColor.RED);
                     return true;
                 }
             }

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

@@ -6,13 +6,14 @@ import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 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,6 +24,11 @@ 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]))
@@ -56,7 +62,7 @@ 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.");
@@ -69,32 +75,10 @@ public class Command_tag extends TFM_Command
                 return true;
             }
 
-            if (!TFM_AdminList.isSuperAdmin(sender))
+            return false;
-            {
-                for (String word : FORBIDDEN_WORDS)
-                {
-                    if (args[0].toLowerCase().contains(word.toLowerCase()))
-                    {
-                        if (word.contains(String.valueOf(ChatColor.COLOR_CHAR)))
-                        {
-                            playerMsg("That tag contains a forbidden color-code.");
-                        }
-                        else
-                        {
-                            playerMsg("That tag contains a forbidden word.");
-                        }
-                        return true;
-                    }
-                }
-
-            }
-
-            TFM_PlayerData.getPlayerData(sender_p).setTag(args[0]);
-            playerMsg("Tag set.");
-
-            return true;
         }
-        else if (args.length == 2)
+
+        if (args.length == 2)
         {
             if ("clear".equals(args[0]))
             {
@@ -104,14 +88,11 @@ public class Command_tag extends TFM_Command
                     return true;
                 }
 
-                final Player player;
+                final Player player = getPlayer(args[1]);
-                try
+
+                if (player == null)
                 {
-                    player = getPlayer(args[1]);
+                    playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND);
-                }
-                catch (PlayerNotFoundException ex)
-                {
-                    playerMsg(ex.getMessage());
                     return true;
                 }
 
@@ -119,8 +100,38 @@ public class Command_tag extends TFM_Command
                 playerMsg("Removed " + player.getName() + "'s tag.");
                 return true;
             }
+        }
 
-            return false;
+        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 (!tag.toLowerCase().contains(word))
+                    {
+                        continue;
+                    }
+
+                    if (word.contains(String.valueOf(ChatColor.COLOR_CHAR)))
+                    {
+                        playerMsg("That tag contains a forbidden color-code.");
+                    }
+                    else
+                    {
+                        playerMsg("That tag contains a forbidden word.");
+                    }
+                    return true;
+                }
+
+            }
+
+            TFM_PlayerData.getPlayerData(sender_p).setTag(TFM_Util.colorize(tag));
+            playerMsg("Tag set to " + TFM_Util.colorize(tag));
+
+            return true;
         }
 
         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

@@ -4,6 +4,7 @@ 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;
@@ -22,14 +23,11 @@ public class Command_tban extends TFM_Command
             return false;
         }
 
-        Player player;
+        final Player player = getPlayer(args[0]);
-        try
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
+            playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND, ChatColor.RED);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            playerMsg(ex.getMessage(), ChatColor.RED);
             return true;
         }
 

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

@@ -4,11 +4,10 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import me.StevenLawson.TotalFreedomMod.TFM_Ban;
 import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
-import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import 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.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -28,14 +27,11 @@ public class Command_tempban extends TFM_Command
             return false;
         }
 
-        Player player;
+        final Player player = getPlayer(args[0]);
-        try
+
+        if (player == null)
         {
-            player = getPlayer(args[0]);
+            playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND);
-        }
-        catch (PlayerNotFoundException ex)
-        {
-            playerMsg(ex.getMessage(), ChatColor.RED);
             return true;
         }
 

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

@@ -4,6 +4,7 @@ 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_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
@@ -28,6 +29,8 @@ public class Command_tfipbanlist extends TFM_Command
                     try
                     {
                         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)

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

@@ -1,5 +1,12 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
+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 +14,51 @@ 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)
     {
-        playerMsg("TotalFreedomMod for 'TotalFreedom', the original all-op server.", ChatColor.GOLD);
+        if (args.length == 1)
-        playerMsg(String.format("Version " + ChatColor.BLUE + "%s.%s" + ChatColor.BLUE + ", built %s.", TotalFreedomMod.pluginVersion, TotalFreedomMod.buildNumber, TotalFreedomMod.buildDate), ChatColor.GOLD);
+        {
+            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.GOLD + ", built "
+                + ChatColor.BLUE + "%s" + ChatColor.GOLD + " by "
+                + ChatColor.BLUE + "%s" + ChatColor.GOLD + ".",
+                TotalFreedomMod.pluginVersion,
+                TotalFreedomMod.buildNumber,
+                TotalFreedomMod.buildDate,
+                TotalFreedomMod.buildCreator), ChatColor.GOLD);
+        playerMsg("Running on " + TFM_ConfigEntry.SERVER_NAME.getString() + ".", ChatColor.GOLD);
         playerMsg("Created by Madgeek1450 and DarthSalamon.", ChatColor.GOLD);
         playerMsg("Visit " + ChatColor.AQUA + "http://totalfreedom.me/" + ChatColor.GREEN + " for more information.", ChatColor.GREEN);
 

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

@@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
 @CommandParameters(description = "Update server files.", usage = "/<command>")
 public class Command_tfupdate extends TFM_Command
 {

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

@@ -0,0 +1,193 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.TFM_GameRuleHandler;
+import me.StevenLawson.TotalFreedomMod.TFM_GameRuleHandler.TFM_GameRule;
+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.plugin.Plugin;
+import org.bukkit.plugin.PluginManager;
+
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
+@CommandParameters(description = "Toggles TotalFreedomMod settings", usage = "/<command> [option] [value] [value]")
+public class Command_toggle extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            playerMsg("Available toggles: ");
+            playerMsg("- waterplace");
+            playerMsg("- fireplace");
+            playerMsg("- lavaplace");
+            playerMsg("- fluidspread");
+            playerMsg("- lavadmg");
+            playerMsg("- firespread");
+            playerMsg("- prelog");
+            playerMsg("- lockdown");
+            playerMsg("- petprotect");
+            playerMsg("- droptoggle");
+            playerMsg("- nonuke");
+            playerMsg("- explosives");
+            playerMsg("- disguisecraft");
+            return false;
+        }
+
+        if (args[0].equals("waterplace"))
+        {
+            toggle("Water placement is", TFM_ConfigEntry.ALLOW_WATER_PLACE);
+            return true;
+        }
+
+        if (args[0].equals("fireplace"))
+        {
+            toggle("Fire placement is", TFM_ConfigEntry.ALLOW_FIRE_PLACE);
+            return true;
+        }
+
+        if (args[0].equals("lavaplace"))
+        {
+            toggle("Lava placement is", TFM_ConfigEntry.ALLOW_LAVA_PLACE);
+            return true;
+        }
+
+        if (args[0].equals("fluidspread"))
+        {
+            toggle("Fire placement is", TFM_ConfigEntry.ALLOW_FLUID_SPREAD);
+            return true;
+        }
+
+        if (args[0].equals("lavadmg"))
+        {
+            toggle("Lava damage is", TFM_ConfigEntry.ALLOW_LAVA_DAMAGE);
+            return true;
+        }
+
+        if (args[0].equals("firespread"))
+        {
+            TFM_GameRuleHandler.setGameRule(TFM_GameRule.DO_FIRE_TICK, TFM_ConfigEntry.ALLOW_FIRE_SPREAD.getBoolean());
+            toggle("Fire spread is", TFM_ConfigEntry.ALLOW_FIRE_SPREAD);
+            return true;
+        }
+
+        if (args[0].equals("prelog"))
+        {
+            toggle("Command prelogging is", TFM_ConfigEntry.ENABLE_PREPROCESS_LOG);
+            return true;
+        }
+
+        if (args[0].equals("lockdown"))
+        {
+            TFM_Util.adminAction(sender.getName(), (TotalFreedomMod.lockdownEnabled ? "De-a" : "A") + "ctivating server lockdown", true);
+            TotalFreedomMod.lockdownEnabled = !TotalFreedomMod.lockdownEnabled;
+            return true;
+        }
+
+        if (args[0].equals("petprotect"))
+        {
+            toggle("Tamed pet protection is", TFM_ConfigEntry.ENABLE_PET_PROTECT);
+            return true;
+        }
+
+        if (args[0].equals("droptoggle"))
+        {
+            toggle("Automatic entity wiping is", TFM_ConfigEntry.AUTO_ENTITY_WIPE);
+            return true;
+        }
+
+        if (args[0].equals("nonuke"))
+        {
+            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)
+                {
+                }
+            }
+
+            toggle("Nuke monitor is", TFM_ConfigEntry.NUKE_MONITOR_ENABLED);
+
+            if (TFM_ConfigEntry.NUKE_MONITOR_ENABLED.getBoolean())
+            {
+                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.");
+            }
+
+            return true;
+        }
+        if (args[0].equals("explosives"))
+        {
+            if (args.length == 2)
+            {
+                try
+                {
+                    TFM_ConfigEntry.EXPLOSIVE_RADIUS.setDouble(Math.max(1.0, Math.min(30.0, Double.parseDouble(args[1]))));
+                }
+                catch (NumberFormatException ex)
+                {
+                    TFM_Util.playerMsg(sender, ex.getMessage());
+                    return true;
+                }
+            }
+
+
+            toggle("Explosions are", TFM_ConfigEntry.ALLOW_EXPLOSIONS);
+
+            if (TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
+            {
+                playerMsg("Radius set to " + TFM_ConfigEntry.EXPLOSIVE_RADIUS.getDouble());
+            }
+            return true;
+        }
+
+        if (args[0].equals("disguisecraft"))
+        {
+            final Plugin disguiseCraft = server.getPluginManager().getPlugin("DisguiseCraft");
+            if (disguiseCraft == null)
+            {
+                playerMsg("DisguiseCraft is not installed on this server.");
+                return true;
+            }
+
+            boolean enabled = disguiseCraft.isEnabled();
+            TFM_Util.adminAction(sender.getName(), (enabled ? "disa" : "ena") + "bling DisguiseCraft", true);
+
+
+            if (enabled)
+            {
+                plugin.getServer().getPluginManager().disablePlugin(disguiseCraft);
+            }
+            else
+            {
+                plugin.getServer().getPluginManager().enablePlugin(disguiseCraft);
+            }
+            return true;
+        }
+
+        return false;
+    }
+
+    private void toggle(String name, TFM_ConfigEntry entry)
+    {
+        entry.setBoolean(!entry.getBoolean());
+        playerMsg(name + " now " + (entry.setBoolean(!entry.getBoolean()) ? "enabled." : "disabled."));
+    }
+}

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

@@ -13,7 +13,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Throw a mob in the direction you are facing when you left click with a stick.", usage = "/<command> <mobtype [speed] | off | list>")
+@CommandParameters(description = "Throw a mob in the direction you are facing when you left click with a stick.",
+        usage = "/<command> <mobtype [speed] | off | list>")
 public class Command_tossmob extends TFM_Command
 {
     @Override
@@ -30,7 +31,7 @@ public class Command_tossmob extends TFM_Command
         EntityType creature = EntityType.PIG;
         if (args.length >= 1)
         {
-            if (TFM_Util.isStopCommand(args[0]))
+            if ("off".equals(args[0]))
             {
                 playerData.disableMobThrower();
                 playerMsg("MobThrower is disabled.", ChatColor.GREEN);

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

@@ -28,7 +28,7 @@ public class Command_trail extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        if (args.length > 0 && TFM_Util.isStopCommand(args[0]))
+        if (args.length > 0 && "off".equals(args[0]))
         {
             trailPlayers.remove(sender_p);
 

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

@@ -1,24 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.Commands;
-
-import me.StevenLawson.TotalFreedomMod.Config.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 water placement.", usage = "/<command> <on | off>")
-public class Command_waterplace extends TFM_Command
-{
-    @Override
-    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length != 1)
-        {
-            return false;
-        }
-
-        playerMsg("Water placement is now " + (TFM_ConfigEntry.ALLOW_WATER_PLACE.setBoolean(!args[0].equalsIgnoreCase("off")) ? "enabled" : "disabled") + ".");
-
-        return true;
-    }
-}

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

@@ -88,12 +88,9 @@ public class Command_whitelist extends TFM_Command
 
             String search_name = args[1].trim().toLowerCase();
 
-            OfflinePlayer player;
+            OfflinePlayer player = getPlayer(search_name);
-            try
+
-            {
+            if (player == null)
-                player = getPlayer(search_name);
-            }
-            catch (PlayerNotFoundException ex)
             {
                 player = server.getOfflinePlayer(search_name);
             }
@@ -104,7 +101,7 @@ public class Command_whitelist extends TFM_Command
         }
 
         // remove
-        if (TFM_Util.isRemoveCommand(args[0]))
+        if ("remove".equals(args[0]))
         {
             if (args.length < 2)
             {
@@ -113,12 +110,9 @@ public class Command_whitelist extends TFM_Command
 
             String search_name = args[1].trim().toLowerCase();
 
-            OfflinePlayer player;
+            OfflinePlayer player = getPlayer(search_name);
-            try
+
-            {
+            if (player == null)
-                player = getPlayer(search_name);
-            }
-            catch (PlayerNotFoundException ex)
             {
                 player = server.getOfflinePlayer(search_name);
             }

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

@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
 @CommandParameters(description = "Wipe the flatlands map. Requires manual restart after command is used.", usage = "/<command>")
 public class Command_wipeflatlands extends TFM_Command
 {

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

@@ -0,0 +1,29 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import java.io.File;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE)
+@CommandParameters(description = "Removes essentials playerdata", usage = "/<command>")
+public class Command_wipeuserdata extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (!server.getPluginManager().isPluginEnabled("Essentials"))
+        {
+            playerMsg("Essentials is not enabled on this server");
+            return true;
+        }
+
+        TFM_Util.adminAction(sender.getName(), "Wiping Essentials playerdata", true);
+
+        TFM_Util.deleteFolder(new File(server.getPluginManager().getPlugin("Essentials").getDataFolder(), "userdata"));
+
+        playerMsg("All playerdata deleted.");
+        return true;
+    }
+}

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

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

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

@@ -28,7 +28,7 @@ public abstract class TFM_Command
     public void setup(final TotalFreedomMod plugin, final CommandSender commandSender, final Class<?> commandClass)
     {
         this.plugin = plugin;
-        this.server = this.plugin.getServer();
+        this.server = plugin.getServer();
         this.commandSender = commandSender;
         this.commandClass = commandClass;
     }
@@ -59,86 +59,82 @@ public abstract class TFM_Command
 
     public boolean senderHasPermission()
     {
-        CommandPermissions permissions = commandClass.getAnnotation(CommandPermissions.class);
+        final CommandPermissions permissions = commandClass.getAnnotation(CommandPermissions.class);
-        if (permissions != null)
-        {
-            boolean is_super = TFM_AdminList.isSuperAdmin(this.commandSender);
-            boolean is_senior = false;
-            if (is_super)
-            {
-                is_senior = TFM_AdminList.isSeniorAdmin(this.commandSender);
-            }
 
-            AdminLevel level = permissions.level();
+        if (permissions == null)
-            SourceType source = permissions.source();
-            boolean block_host_console = permissions.block_host_console();
-
-            Player sender_p = null;
-            if (this.commandSender instanceof Player)
-            {
-                sender_p = (Player) this.commandSender;
-            }
-
-            if (sender_p == null)
-            {
-                if (source == SourceType.ONLY_IN_GAME)
-                {
-                    return false;
-                }
-                else if (level == AdminLevel.SENIOR && !is_senior)
-                {
-                    return false;
-                }
-                else if (block_host_console && TFM_Util.isFromHostConsole(this.commandSender.getName()))
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                if (source == SourceType.ONLY_CONSOLE)
-                {
-                    return false;
-                }
-                else if (level == AdminLevel.SENIOR)
-                {
-                    if (is_senior)
-                    {
-                        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(sender_p);
-                        Boolean superadminIdVerified = playerdata.isSuperadminIdVerified();
-
-                        if (superadminIdVerified != null)
-                        {
-                            if (!superadminIdVerified.booleanValue())
-                            {
-                                return false;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        return false;
-                    }
-                }
-                else if (level == AdminLevel.SUPER && !is_super)
-                {
-                    return false;
-                }
-                else if (level == AdminLevel.OP && !sender_p.isOp())
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-        else
         {
             TFM_Log.warning(commandClass.getName() + " is missing permissions annotation.");
+            return true;
         }
+
+        boolean isSuper = TFM_AdminList.isSuperAdmin(commandSender);
+        boolean isSenior = false;
+
+        if (isSuper)
+        {
+            isSenior = TFM_AdminList.isSeniorAdmin(commandSender);
+        }
+
+        final AdminLevel level = permissions.level();
+        final SourceType source = permissions.source();
+        final boolean blockHostConsole = permissions.blockHostConsole();
+
+        if (!(commandSender instanceof Player))
+        {
+            if (source == SourceType.ONLY_IN_GAME)
+            {
+                return false;
+            }
+
+            if (level == AdminLevel.SENIOR && !isSenior)
+            {
+                return false;
+            }
+
+            if (blockHostConsole && TFM_Util.isFromHostConsole(commandSender.getName()))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        final Player senderPlayer = (Player) commandSender;
+
+        if (source == SourceType.ONLY_CONSOLE)
+        {
+            return false;
+        }
+
+        if (level == AdminLevel.SENIOR)
+        {
+            if (!isSenior)
+            {
+                return false;
+            }
+
+            if (!TFM_PlayerData.getPlayerData(senderPlayer).isSuperadminIdVerified())
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        if (level == AdminLevel.SUPER && !isSuper)
+        {
+            return false;
+        }
+
+        if (level == AdminLevel.OP && !senderPlayer.isOp())
+        {
+            return false;
+        }
+
         return true;
     }
 
-    public Player getPlayer(final String partialname) throws PlayerNotFoundException
+    public Player getPlayer(final String partialname)
     {
         List<Player> matches = server.matchPlayer(partialname);
         if (matches.isEmpty())
@@ -150,7 +146,7 @@ public abstract class TFM_Command
                     return player;
                 }
             }
-            throw new PlayerNotFoundException(partialname);
+            return null;
         }
         else
         {

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

@@ -0,0 +1,82 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
+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;
+
+public class TFM_CommandHandler
+{
+    public static final String COMMAND_PATH = TFM_Command.class.getPackage().getName(); // "me.StevenLawson.TotalFreedomMod.Commands";
+    public static final String COMMAND_PREFIX = "Command_";
+
+    public static boolean handleCommand(CommandSender sender, Command cmd, String commandLabel, String[] args)
+    {
+        final Player playerSender;
+        final boolean senderIsConsole;
+
+        if (sender instanceof Player)
+        {
+            senderIsConsole = false;
+            playerSender = (Player) sender;
+
+            TFM_Log.info(String.format("[PLAYER_COMMAND] %s (%s): /%s %s",
+                    playerSender.getName(),
+                    ChatColor.stripColor(playerSender.getDisplayName()),
+                    commandLabel,
+                    StringUtils.join(args, " ")), true);
+        }
+        else
+        {
+            senderIsConsole = true;
+            playerSender = null;
+
+            TFM_Log.info(String.format("[CONSOLE_COMMAND] %s: /%s %s",
+                    sender.getName(),
+                    commandLabel,
+                    StringUtils.join(args, " ")), true);
+        }
+
+
+        final TFM_Command dispatcher;
+        try
+        {
+            final ClassLoader classLoader = TotalFreedomMod.class.getClassLoader();
+            dispatcher = (TFM_Command) classLoader.loadClass(String.format("%s.%s%s",
+                    COMMAND_PATH,
+                    COMMAND_PREFIX,
+                    cmd.getName().toLowerCase())).newInstance();
+            dispatcher.setup(TotalFreedomMod.plugin, sender, dispatcher.getClass());
+        }
+        catch (Exception ex)
+        {
+            TFM_Log.severe("Could not load command: " + cmd.getName());
+            TFM_Log.severe(ex);
+
+            sender.sendMessage(ChatColor.RED + "Command Error! Could not load command: " + cmd.getName());
+            return true;
+        }
+
+        if (!dispatcher.senderHasPermission())
+        {
+            sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS);
+            return true;
+        }
+
+        try
+        {
+            return dispatcher.run(sender, playerSender, cmd, commandLabel, args, senderIsConsole);
+        }
+        catch (Exception ex)
+        {
+            TFM_Log.severe("Command Error: " + commandLabel);
+            TFM_Log.severe(ex);
+            sender.sendMessage(ChatColor.RED + "Command Error: " + ex.getMessage());
+        }
+
+        return true;
+    }
+}

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

@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.security.CodeSource;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -23,11 +24,17 @@ import org.bukkit.plugin.Plugin;
 
 public class TFM_CommandLoader
 {
-    public static final Pattern COMMAND_CLASS_PATTERN = Pattern.compile(TotalFreedomMod.COMMAND_PATH.replace('.', '/') + "/(" + TotalFreedomMod.COMMAND_PREFIX + "[^\\$]+)\\.class");
+    public static final Pattern COMMAND_PATTERN;
-    private List<TFM_CommandInfo> commandList = null;
+    private final List<TFM_CommandInfo> commandList;
+
+    static
+    {
+        COMMAND_PATTERN = Pattern.compile(TFM_CommandHandler.COMMAND_PATH.replace('.', '/') + "/(" + TFM_CommandHandler.COMMAND_PREFIX + "[^\\$]+)\\.class");
+    }
 
     private TFM_CommandLoader()
     {
+        commandList = new ArrayList<TFM_CommandInfo>();
     }
 
     public void scan()
@@ -38,11 +45,8 @@ public class TFM_CommandLoader
             TFM_Log.severe("Error loading commandMap.");
             return;
         }
-
+        commandList.clear();
-        if (commandList == null)
+        commandList.addAll(getCommands());
-        {
-            commandList = getCommands();
-        }
 
         for (TFM_CommandInfo commandInfo : commandList)
         {
@@ -136,15 +140,15 @@ public class TFM_CommandLoader
                 while ((zipEntry = zip.getNextEntry()) != null)
                 {
                     String entryName = zipEntry.getName();
-                    Matcher matcher = COMMAND_CLASS_PATTERN.matcher(entryName);
+                    Matcher matcher = COMMAND_PATTERN.matcher(entryName);
                     if (matcher.find())
                     {
                         try
                         {
-                            Class<?> commandClass = Class.forName(TotalFreedomMod.COMMAND_PATH + "." + matcher.group(1));
+                            Class<?> commandClass = Class.forName(TFM_CommandHandler.COMMAND_PATH + "." + matcher.group(1));
 
-                            CommandPermissions commandPermissions = (CommandPermissions) commandClass.getAnnotation(CommandPermissions.class);
+                            CommandPermissions commandPermissions = commandClass.getAnnotation(CommandPermissions.class);
-                            CommandParameters commandParameters = (CommandParameters) commandClass.getAnnotation(CommandParameters.class);
+                            CommandParameters commandParameters = commandClass.getAnnotation(CommandParameters.class);
 
                             if (commandPermissions != null && commandParameters != null)
                             {
@@ -153,7 +157,7 @@ public class TFM_CommandLoader
                                         matcher.group(1).split("_")[1],
                                         commandPermissions.level(),
                                         commandPermissions.source(),
-                                        commandPermissions.block_host_console(),
+                                        commandPermissions.blockHostConsole(),
                                         commandParameters.description(),
                                         commandParameters.usage(),
                                         commandParameters.aliases());
@@ -202,7 +206,7 @@ public class TFM_CommandLoader
 
         public List<String> getAliases()
         {
-            return aliases;
+            return Collections.unmodifiableList(aliases);
         }
 
         public Class<?> getCommandClass()

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

@@ -4,59 +4,76 @@ import java.util.List;
 
 public enum TFM_ConfigEntry
 {
-    ADMIN_ONLY_MODE(Boolean.class, "admin_only_mode"),
+    ALLOW_EXPLOSIONS(Boolean.class, "allow.explosions"),
-    ALLOW_EXPLOSIONS(Boolean.class, "allow_explosions"),
+    ALLOW_FIRE_PLACE(Boolean.class, "allow.fire_place"),
-    ALLOW_FIRE_PLACE(Boolean.class, "allow_fire_place"),
+    ALLOW_FIRE_SPREAD(Boolean.class, "allow.fire_spread"),
-    ALLOW_FIRE_SPREAD(Boolean.class, "allow_fire_spread"),
+    ALLOW_FLUID_SPREAD(Boolean.class, "allow.fluid_spread"),
-    ALLOW_FLUID_SPREAD(Boolean.class, "allow_fluid_spread"),
+    ALLOW_LAVA_DAMAGE(Boolean.class, "allow.lava_damage"),
-    ALLOW_LAVA_DAMAGE(Boolean.class, "allow_lava_damage"),
+    ALLOW_LAVA_PLACE(Boolean.class, "allow.lava_place"),
-    ALLOW_LAVA_PLACE(Boolean.class, "allow_lava_place"),
+    ALLOW_TNT_MINECARTS(Boolean.class, "allow.tnt_minecarts"),
-    ALLOW_TNT_MINECARTS(Boolean.class, "allow_tnt_minecarts"),
+    ALLOW_WATER_PLACE(Boolean.class, "allow.water_place"),
-    ALLOW_WATER_PLACE(Boolean.class, "allow_water_place"),
+    //
-    AUTO_ENTITY_WIPE(Boolean.class, "auto_wipe"),
+    MOB_LIMITER_ENABLED(Boolean.class, "moblimiter.enabled"),
-    AUTO_PROTECT_SPAWNPOINTS(Boolean.class, "auto_protect_spawnpoints"),
+    MOB_LIMITER_MAX(Integer.class, "moblimiter.max"),
-    DISABLE_NIGHT(Boolean.class, "disable_night"),
+    MOB_LIMITER_DISABLE_DRAGON(Boolean.class, "moblimiter.disable.dragon"),
-    DISABLE_WEATHER(Boolean.class, "disable_weather"),
+    MOB_LIMITER_DISABLE_GHAST(Boolean.class, "moblimiter.disable.ghast"),
-    GENERATE_FLATLANDS(Boolean.class, "generate_flatlands"),
+    MOB_LIMITER_DISABLE_GIANT(Boolean.class, "moblimiter.disable.giant"),
+    MOB_LIMITER_DISABLE_SLIME(Boolean.class, "moblimiter.disable.slime"),
+    //
+    HTTPD_ENABLED(Boolean.class, "httpd.enabled"),
+    HTTPD_PORT(Integer.class, "httpd.port"),
+    HTTPD_PUBLIC_FOLDER(String.class, "httpd.public_folder"),
+    //
+    SERVER_COLORFUL_MOTD(Boolean.class, "server.colorful_motd"),
+    SERVER_NAME(String.class, "server.name"),
+    SERVER_ADDRESS(String.class, "server.address"),
+    SERVER_MOTD(String.class, "server.motd"),
+    SERVER_OWNERS(List.class, "server.owners"),
+    SERVER_BAN_URL(String.class, "server.ban_url"),
+    SERVER_PERMBAN_URL(String.class, "server.permban_url"),
+    //
+    TWITTERBOT_ENABLED(Boolean.class, "twitterbot.enabled"),
+    TWITTERBOT_SECRET(String.class, "twitterbot.secret"),
+    TWITTERBOT_URL(String.class, "twitterbot.url"),
+    //
+    DISABLE_NIGHT(Boolean.class, "disable.night"),
+    DISABLE_WEATHER(Boolean.class, "disable.weather"),
+    //
+    ENABLE_PREPROCESS_LOG(Boolean.class, "preprocess_log"),
+    ENABLE_PET_PROTECT(Boolean.class, "petprotect.enabled"),
+    //
     LANDMINES_ENABLED(Boolean.class, "landmines_enabled"),
-    MOB_LIMITER_DISABLE_DRAGON(Boolean.class, "mob_limiter_disable_dragon"),
-    MOB_LIMITER_DISABLE_GHAST(Boolean.class, "mob_limiter_disable_ghast"),
-    MOB_LIMITER_DISABLE_GIANT(Boolean.class, "mob_limiter_disable_giant"),
-    MOB_LIMITER_DISABLE_SLIME(Boolean.class, "mob_limiter_disable_slime"),
-    MOB_LIMITER_ENABLED(Boolean.class, "mob_limiter_enabled"),
-    MP44_ENABLED(Boolean.class, "mp44_enabled"),
-    NUKE_MONITOR(Boolean.class, "nuke_monitor"),
-    PET_PROTECT_ENABLED(Boolean.class, "pet_protect_enabled"),
-    PREPROCESS_LOG_ENABLED(Boolean.class, "preprocess_log"),
-    PROTECTED_AREAS_ENABLED(Boolean.class, "protected_areas_enabled"),
     TOSSMOB_ENABLED(Boolean.class, "tossmob_enabled"),
-    TWITTERBOT_ENABLED(Boolean.class, "twitterbot_enabled"),
+    AUTOKICK_ENABLED(Boolean.class, "autokick.enabled"),
-    HTTPD_ENABLED(Boolean.class, "httpd_enabled"),
+    MP44_ENABLED(Boolean.class, "mp44_enabled"),
-    AUTOKICK_ENABLED(Boolean.class, "autokick_enabled"),
+    //
+    PROTECTAREA_ENABLED(Boolean.class, "protectarea.enabled"),
+    PROTECTAREA_SPAWNPOINTS(Boolean.class, "protectarea.auto_protect_spawnpoints"),
+    PROTECTAREA_RADIUS(Double.class, "protectarea.auto_protect_radius"),
+    //
+    NUKE_MONITOR_ENABLED(Boolean.class, "nukemonitor.enabled"),
+    NUKE_MONITOR_COUNT_BREAK(Integer.class, "nukemonitor.count_break"),
+    NUKE_MONITOR_COUNT_PLACE(Integer.class, "nukemonitor.count_place"),
+    NUKE_MONITOR_RANGE(Double.class, "nukemonitor.range"),
+    //
+    AUTOKICK_THRESHOLD(Double.class, "autokick.threshold"),
+    AUTOKICK_TIME(Integer.class, "autokick.time"),
+    //
+    LOGS_SECRET(String.class, "logs.secret"),
+    LOGS_URL(String.class, "logs.url"),
+    //
+    FLATLANDS_GENERATE(Boolean.class, "flatlands.generate"),
+    FLATLANDS_GENERATE_PARAMS(String.class, "flatlands.generate_params"),
     //
-    AUTO_PROTECT_RADIUS(Double.class, "auto_protect_radius"),
     EXPLOSIVE_RADIUS(Double.class, "explosive_radius"),
-    NUKE_MONITOR_RANGE(Double.class, "nuke_monitor_range"),
-    AUTOKICK_THRESHOLD(Double.class, "autokick_threshold"),
-    //
     FREECAM_TRIGGER_COUNT(Integer.class, "freecam_trigger_count"),
-    MOB_LIMITER_MAX(Integer.class, "mob_limiter_max"),
-    NUKE_MONITOR_COUNT_BREAK(Integer.class, "nuke_monitor_count_break"),
-    NUKE_MONITOR_COUNT_PLACE(Integer.class, "nuke_monitor_count_place"),
-    HTTPD_PORT(Integer.class, "httpd_port"),
-    AUTOKICK_TIME(Integer.class, "autokick_time"),
-    //
-    FLATLANDS_GENERATION_PARAMS(String.class, "flatlands_generation_params"),
-    LOGS_REGISTER_PASSWORD(String.class, "logs_register_password"),
-    LOGS_REGISTER_URL(String.class, "logs_register_url"),
     SERVICE_CHECKER_URL(String.class, "service_checker_url"),
-    TWITTERBOT_SECRET(String.class, "twitterbot_secret"),
-    TWITTERBOT_URL(String.class, "twitterbot_url"),
-    HTTPD_PUBLIC_FOLDER(String.class, "httpd_public_folder"),
-    //
     BLOCKED_COMMANDS(List.class, "blocked_commands"),
     HOST_SENDER_NAMES(List.class, "host_sender_names"),
-    UNBANNABLE_USERNAMES(List.class, "unbannable_usernames");
+    UNBANNABLE_USERNAMES(List.class, "unbannable_usernames"),
+    ADMIN_ONLY_MODE(Boolean.class, "admin_only_mode"),
+    AUTO_ENTITY_WIPE(Boolean.class, "auto_wipe"),
+    CONSOLE_IS_SENIOR(Boolean.class, "console_is_senior");
     //
     private final Class<?> type;
     private final String configName;

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

@@ -35,14 +35,14 @@ public class Module_players extends TFM_HTTPD_Module
         }
 
         // Super admins (non-telnet and non-senior)
-        for (UUID superadmin : TFM_AdminList.getSuperadminUUIDs())
+        for (UUID superadmin : TFM_AdminList.getSuperUUIDs())
         {
-            if (TFM_AdminList.getSenioradminUUIDs().contains(superadmin))
+            if (TFM_AdminList.getSeniorUUIDs().contains(superadmin))
             {
                 continue;
             }
 
-            if (TFM_AdminList.getTelnetadminUUIDs().contains(superadmin))
+            if (TFM_AdminList.getTelnetUUIDs().contains(superadmin))
             {
                 continue;
             }
@@ -51,9 +51,9 @@ public class Module_players extends TFM_HTTPD_Module
         }
 
         // Telnet admins (non-senior)
-        for (UUID telnetadmin : TFM_AdminList.getTelnetadminUUIDs())
+        for (UUID telnetadmin : TFM_AdminList.getTelnetUUIDs())
         {
-            if (TFM_AdminList.getSenioradminUUIDs().contains(telnetadmin))
+            if (TFM_AdminList.getSeniorUUIDs().contains(telnetadmin))
             {
                 continue;
             }
@@ -61,7 +61,7 @@ public class Module_players extends TFM_HTTPD_Module
         }
 
         // Senior admins
-        for (UUID senioradmin : TFM_AdminList.getSenioradminUUIDs())
+        for (UUID senioradmin : TFM_AdminList.getSeniorUUIDs())
         {
             senioradmins.add(getName(senioradmin));
         }

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

@@ -35,23 +35,23 @@ public class TFM_BlockListener implements Listener
     @EventHandler(priority = EventPriority.NORMAL)
     public void onBlockBreak(BlockBreakEvent event)
     {
-        Player player = event.getPlayer();
+        final Player player = event.getPlayer();
-        Location blockLocation = event.getBlock().getLocation();
+        final Location location = event.getBlock().getLocation();
 
-        if (TFM_ConfigEntry.NUKE_MONITOR.getBoolean())
+        if (TFM_ConfigEntry.NUKE_MONITOR_ENABLED.getBoolean())
         {
-            TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
+            final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
 
-            Location playerLocation = player.getLocation();
+            final Location playerLocation = player.getLocation();
 
             final double nukeMonitorRange = TFM_ConfigEntry.NUKE_MONITOR_RANGE.getDouble().doubleValue();
 
             boolean outOfRange = false;
-            if (!playerLocation.getWorld().equals(blockLocation.getWorld()))
+            if (!playerLocation.getWorld().equals(location.getWorld()))
             {
                 outOfRange = true;
             }
-            else if (playerLocation.distanceSquared(blockLocation) > (nukeMonitorRange * nukeMonitorRange))
+            else if (playerLocation.distanceSquared(location) > (nukeMonitorRange * nukeMonitorRange))
             {
                 outOfRange = true;
             }
@@ -70,7 +70,7 @@ public class TFM_BlockListener implements Listener
                 }
             }
 
-            Long lastRan = TFM_Heartbeat.getLastRan();
+            final Long lastRan = TFM_Heartbeat.getLastRan();
             if (lastRan == null || lastRan + TotalFreedomMod.HEARTBEAT_RATE * 1000L < System.currentTimeMillis())
             {
                 // TFM_Log.warning("Heartbeat service timeout - can't check block place/break rates.");
@@ -90,11 +90,11 @@ public class TFM_BlockListener implements Listener
             }
         }
 
-        if (TFM_ConfigEntry.PROTECTED_AREAS_ENABLED.getBoolean())
+        if (TFM_ConfigEntry.PROTECTAREA_ENABLED.getBoolean())
         {
             if (!TFM_AdminList.isSuperAdmin(player))
             {
-                if (TFM_ProtectedArea.isInProtectedArea(blockLocation))
+                if (TFM_ProtectedArea.isInProtectedArea(location))
                 {
                     event.setCancelled(true);
                 }
@@ -108,7 +108,7 @@ public class TFM_BlockListener implements Listener
         Player player = event.getPlayer();
         Location blockLocation = event.getBlock().getLocation();
 
-        if (TFM_ConfigEntry.NUKE_MONITOR.getBoolean())
+        if (TFM_ConfigEntry.NUKE_MONITOR_ENABLED.getBoolean())
         {
             TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
 
@@ -160,7 +160,7 @@ public class TFM_BlockListener implements Listener
             }
         }
 
-        if (TFM_ConfigEntry.PROTECTED_AREAS_ENABLED.getBoolean())
+        if (TFM_ConfigEntry.PROTECTAREA_ENABLED.getBoolean())
         {
             if (!TFM_AdminList.isSuperAdmin(player))
             {

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

@@ -57,7 +57,7 @@ public class TFM_EntityListener implements Listener
             }
         }
 
-        if (TFM_ConfigEntry.PET_PROTECT_ENABLED.getBoolean())
+        if (TFM_ConfigEntry.ENABLE_PET_PROTECT.getBoolean())
         {
             Entity entity = event.getEntity();
             if (entity instanceof Tameable)

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

@@ -607,7 +607,7 @@ public class TFM_PlayerListener implements Listener
             }
         }
 
-        if (TFM_ConfigEntry.PREPROCESS_LOG_ENABLED.getBoolean())
+        if (TFM_ConfigEntry.ENABLE_PREPROCESS_LOG.getBoolean())
         {
             TFM_Log.info(String.format("[PREPROCESS_COMMAND] %s(%s): %s", player.getName(), ChatColor.stripColor(player.getDisplayName()), command), true);
         }
@@ -704,6 +704,7 @@ public class TFM_PlayerListener implements Listener
         }
         else
         {
+            TFM_PlayerList.getInstance().getEntry(player);
             TFM_Log.info("Added new player: " + TFM_Util.formatPlayer(player));
         }
 
@@ -713,15 +714,9 @@ public class TFM_PlayerListener implements Listener
         // Verify strict IP match
         if (TFM_AdminList.isSuperAdmin(player))
         {
-            if (TFM_BanManager.getInstance().isIpBanned(ip))
+            TFM_BanManager.getInstance().unbanIp(ip);
-            {
+            TFM_BanManager.getInstance().unbanIp(TFM_Util.getFuzzyIp(ip));
-                TFM_BanManager.getInstance().unbanIp(ip);
+            TFM_BanManager.getInstance().unbanUuid(player.getUniqueId());
-            }
-
-            if (TFM_BanManager.getInstance().isUuidBanned(player.getUniqueId()))
-            {
-                TFM_BanManager.getInstance().unbanUuid(player.getUniqueId());
-            }
 
             player.setOp(true);
 
@@ -775,4 +770,31 @@ public class TFM_PlayerListener implements Listener
     {
         TFM_ServerInterface.handlePlayerLogin(event);
     }
+
+    // Player Tab and auto Tags
+    @EventHandler(priority = EventPriority.HIGH)
+    public static void onPlayerJoinEvent(PlayerJoinEvent event)
+    {
+        Player player = event.getPlayer();
+        if (TFM_Util.DEVELOPERS.contains(player.getName()))
+        {
+            player.setPlayerListName(ChatColor.DARK_PURPLE + player.getName());
+            TFM_PlayerData.getPlayerData(player).setTag("&8[&5Developer&8]");
+        }
+        else if (TFM_AdminList.isSeniorAdmin(player))
+        {
+            player.setPlayerListName(ChatColor.LIGHT_PURPLE + player.getName());
+            TFM_PlayerData.getPlayerData(player).setTag("&8[&dSenior Admin&8]");
+        }
+        else if (TFM_AdminList.isTelnetAdmin(player, true))
+        {
+            player.setPlayerListName(ChatColor.GREEN + player.getName());
+            TFM_PlayerData.getPlayerData(player).setTag("&8[&2Telnet Admin&8]");
+        }
+        else if (TFM_AdminList.isSuperAdmin(player))
+        {
+            player.setPlayerListName(ChatColor.AQUA + player.getName());
+            TFM_PlayerData.getPlayerData(player).setTag("&8[&BSuper Admin&8]");
+        }
+    }
 }

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

@@ -1,6 +1,5 @@
 package me.StevenLawson.TotalFreedomMod.Listener;
 
-import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker;
 import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
 import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
@@ -10,8 +9,6 @@ import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.server.RemoteServerCommandEvent;
-import org.bukkit.event.server.ServerCommandEvent;
 import org.bukkit.event.server.ServerListPingEvent;
 
 public class TFM_ServerListener implements Listener
@@ -55,25 +52,46 @@ public class TFM_ServerListener implements Listener
     public void onServerPing(ServerListPingEvent event)
     {
         final String ip = event.getAddress().getHostAddress();
-        event.setMotd(TFM_Util.randomChatColor() + "Total" + TFM_Util.randomChatColor() + "Freedom " + ChatColor.DARK_GRAY + "-" + TFM_Util.randomChatColor() + " Bukkit v" + TFM_ServerInterface.getVersion());
-
-
 
         if (TFM_BanManager.getInstance().isIpBanned(ip))
         {
             event.setMotd(ChatColor.RED + "You are banned.");
+            return;
         }
-        else if (TFM_ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
+
+        if (TFM_ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
         {
             event.setMotd(ChatColor.RED + "Server is closed.");
+            return;
         }
-        else if (Bukkit.hasWhitelist())
+
+        if (Bukkit.hasWhitelist())
         {
             event.setMotd(ChatColor.RED + "Whitelist enabled.");
+            return;
         }
-        else if (Bukkit.getOnlinePlayers().length >= Bukkit.getMaxPlayers())
+
+        if (Bukkit.getOnlinePlayers().length >= Bukkit.getMaxPlayers())
         {
             event.setMotd(ChatColor.RED + "Server is full.");
+            return;
         }
+
+        if (!TFM_ConfigEntry.SERVER_COLORFUL_MOTD.getBoolean())
+        {
+            event.setMotd(TFM_Util.colorize(TFM_ConfigEntry.SERVER_MOTD.getString()
+                    .replace("%mcversion%", TFM_ServerInterface.getVersion())));
+            return;
+        }
+        // Colorful MOTD
+
+        final StringBuilder motd = new StringBuilder();
+
+        for (String word : TFM_ConfigEntry.SERVER_MOTD.getString().replace("%mcversion%", TFM_ServerInterface.getVersion()).split(" "))
+        {
+            motd.append(TFM_Util.randomChatColor()).append(word).append(" ");
+        }
+
+        event.setMotd(TFM_Util.colorize(motd.toString()));
     }
 }

src/me/StevenLawson/TotalFreedomMod/TFM_Admin.java

@@ -1,5 +1,6 @@
 package me.StevenLawson.TotalFreedomMod;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -19,16 +20,16 @@ public class TFM_Admin
     private Date lastLogin;
     private boolean isActivated;
 
-    public TFM_Admin(UUID uuid, String lastLoginName, List<String> ips, Date lastLogin, String loginMessage, boolean isSeniorAdmin, boolean isTelnetAdmin, List<String> consoleAliases, boolean isActivated)
+    public TFM_Admin(UUID uuid, String lastLoginName, Date lastLogin, String loginMessage, boolean isSeniorAdmin, boolean isTelnetAdmin, boolean isActivated)
     {
         this.uuid = uuid;
         this.lastLoginName = lastLoginName;
-        this.ips = ips;
+        this.ips = new ArrayList<String>();
         this.lastLogin = lastLogin;
         this.loginMessage = loginMessage;
         this.isSeniorAdmin = isSeniorAdmin;
         this.isTelnetAdmin = isTelnetAdmin;
-        this.consoleAliases = consoleAliases;
+        this.consoleAliases = new ArrayList<String>();
         this.isActivated = isActivated;
     }
 
@@ -91,6 +92,14 @@ public class TFM_Admin
         }
     }
 
+    public void removeIp(String ip)
+    {
+        if (ips.contains(ip))
+        {
+            ips.remove(ip);
+        }
+    }
+
     public Date getLastLogin()
     {
         return lastLogin;

src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java

@@ -1,7 +1,6 @@
 package me.StevenLawson.TotalFreedomMod;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -14,180 +13,155 @@ import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import me.StevenLawson.TotalFreedomMod.Commands.Command_logs;
 import me.StevenLawson.TotalFreedomMod.Config.TFM_Config;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_MainConfig;
 import me.StevenLawson.TotalFreedomMod.World.TFM_AdminWorld;
+import net.minecraft.util.com.google.common.collect.Sets;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.util.FileUtil;
 
 public class TFM_AdminList
 {
     private static final Map<UUID, TFM_Admin> adminList;
-    private static final Set<UUID> superadminUUIDs;
+    private static final Set<UUID> superUUIDs;
-    private static final Set<UUID> telnetadminUUIDs;
+    private static final Set<UUID> telnetUUIDs;
-    private static final Set<UUID> senioradminUUIDs;
+    private static final Set<UUID> seniorUUIDs;
-    private static final Set<String> consoleAliases;
+    private static final Set<String> seniorConsoleAliases;
-    private static final Set<String> superadminIps;
+    private static final Set<String> superIps;
     private static int cleanThreshold = 24 * 7; // 1 Week in hours
 
     static
     {
         adminList = new HashMap<UUID, TFM_Admin>();
-        superadminUUIDs = new HashSet<UUID>();
+        superUUIDs = new HashSet<UUID>();
-        telnetadminUUIDs = new HashSet<UUID>();
+        telnetUUIDs = new HashSet<UUID>();
-        senioradminUUIDs = new HashSet<UUID>();
+        seniorUUIDs = new HashSet<UUID>();
-        consoleAliases = new HashSet<String>();
+        seniorConsoleAliases = new HashSet<String>();
-        superadminIps = new HashSet<String>();
+        superIps = new HashSet<String>();
     }
 
-    public static Set<UUID> getSuperadminUUIDs()
+    private TFM_AdminList()
     {
-        return Collections.unmodifiableSet(superadminUUIDs);
+        throw new AssertionError();
     }
 
-    public static Set<UUID> getTelnetadminUUIDs()
+    public static Set<UUID> getSuperUUIDs()
     {
-        return Collections.unmodifiableSet(telnetadminUUIDs);
+        return Collections.unmodifiableSet(superUUIDs);
     }
 
-    public static Set<UUID> getSenioradminUUIDs()
+    public static Set<UUID> getTelnetUUIDs()
     {
-        return Collections.unmodifiableSet(senioradminUUIDs);
+        return Collections.unmodifiableSet(telnetUUIDs);
     }
 
-    public static Set<String> getConsoleAliases()
+    public static Set<UUID> getSeniorUUIDs()
     {
-        return Collections.unmodifiableSet(consoleAliases);
+        return Collections.unmodifiableSet(seniorUUIDs);
+    }
+
+    public static Set<String> getSeniorConsoleAliases()
+    {
+        return Collections.unmodifiableSet(seniorConsoleAliases);
     }
 
     public static Set<String> getSuperadminIps()
     {
-        return Collections.unmodifiableSet(superadminIps);
+        return Collections.unmodifiableSet(superIps);
     }
 
-    public static Set<String> getSuperadminNames()
+    public static Set<String> getSuperNames()
     {
         final Set<String> names = new HashSet<String>();
 
         for (TFM_Admin admin : adminList.values())
         {
+            if (!admin.isActivated())
+            {
+                continue;
+            }
+
             names.add(admin.getLastLoginName());
         }
 
         return Collections.unmodifiableSet(names);
     }
 
-    public static Set<String> getLowerSuperadminNames()
+    public static Set<String> getLowerSuperNames()
     {
         final Set<String> names = new HashSet<String>();
 
         for (TFM_Admin admin : adminList.values())
         {
+            if (!admin.isActivated())
+            {
+                continue;
+            }
+
             names.add(admin.getLastLoginName().toLowerCase());
         }
 
         return Collections.unmodifiableSet(names);
     }
 
-    public static void load()
+    public static Set<TFM_Admin> getAllAdmins()
     {
-        try
+        return Sets.newHashSet(adminList.values());
-        {
-            adminList.clear();
-
-            final TFM_Config config = new TFM_Config(TotalFreedomMod.plugin, TotalFreedomMod.SUPERADMIN_FILE, true);
-            config.load();
-
-            cleanThreshold = config.getInt("clean_threshold_hours", cleanThreshold);
-
-            // Parse old superadmins
-            if (config.isConfigurationSection("superadmins"))
-            {
-                TFM_Log.info("Old superadmin configuration found, parsing...");
-
-                final ConfigurationSection section = config.getConfigurationSection("superadmins");
-
-                int counter = 0;
-                int errors = 0;
-
-                for (String admin : config.getConfigurationSection("superadmins").getKeys(false))
-                {
-                    final OfflinePlayer player = Bukkit.getOfflinePlayer(admin);
-
-                    if (player == null || player.getUniqueId() == null)
-                    {
-                        errors++;
-                        TFM_Log.warning("Could not convert admin " + admin + ", UUID could not be found!");
-                        continue;
-                    }
-
-                    final String uuid = player.getUniqueId().toString();
-
-                    config.set("admins." + uuid + ".last_login_name", player.getName());
-                    config.set("admins." + uuid + ".is_activated", section.getBoolean(admin + ".is_activated"));
-                    config.set("admins." + uuid + ".is_telnet_admin", section.getBoolean(admin + ".is_telnet_admin"));
-                    config.set("admins." + uuid + ".is_senior_admin", section.getBoolean(admin + ".is_senior_admin"));
-                    config.set("admins." + uuid + ".last_login", section.getString(admin + ".last_login"));
-                    config.set("admins." + uuid + ".custom_login_message", section.getString(admin + ".custom_login_message"));
-                    config.set("admins." + uuid + ".console_aliases", section.getStringList(admin + ".console_aliases"));
-                    config.set("admins." + uuid + ".ips", section.getStringList(admin + ".ips"));
-
-                    counter++;
-                }
-
-                config.set("superadmins", null);
-                config.save();
-
-                TFM_Log.info(counter + " admins parsed, " + errors + " errors");
-            }
-
-            if (!config.isConfigurationSection("admins"))
-            {
-                TFM_Log.warning("Missing admins section in superadmin.yml.");
-                return;
-            }
-
-            final ConfigurationSection section = config.getConfigurationSection("admins");
-
-            for (String uuidString : section.getKeys(false))
-            {
-                if (!TFM_Util.isUniqueId(uuidString))
-                {
-                    TFM_Log.warning("Invalid Unique ID: " + uuidString + " in superadmin.yml, ignoring");
-                    continue;
-                }
-
-                final UUID uuid = UUID.fromString(uuidString);
-
-                final TFM_Admin superadmin = new TFM_Admin(uuid, section.getConfigurationSection(uuidString));
-                adminList.put(uuid, superadmin);
-            }
-
-            updateIndexLists();
-        }
-        catch (Exception ex)
-        {
-            TFM_Log.severe(ex);
-        }
     }
 
-    public static void backupSavedList()
+    public static void load()
     {
-        final File oldYaml = new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.SUPERADMIN_FILE);
+        adminList.clear();
-        final File newYaml = new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.SUPERADMIN_FILE + ".bak");
+
-        FileUtil.copy(oldYaml, newYaml);
+        final TFM_Config config = new TFM_Config(TotalFreedomMod.plugin, TotalFreedomMod.SUPERADMIN_FILE, true);
+        config.load();
+
+        cleanThreshold = config.getInt("clean_threshold_hours", cleanThreshold);
+
+        // Parse old superadmins
+        if (config.isConfigurationSection("superadmins"))
+        {
+            parseOldConfig(config);
+        }
+
+        if (!config.isConfigurationSection("admins"))
+        {
+            TFM_Log.warning("Missing admins section in superadmin.yml.");
+            return;
+        }
+
+        final ConfigurationSection section = config.getConfigurationSection("admins");
+
+        for (String uuidString : section.getKeys(false))
+        {
+            if (!TFM_Util.isUniqueId(uuidString))
+            {
+                TFM_Log.warning("Invalid Unique ID: " + uuidString + " in superadmin.yml, ignoring");
+                continue;
+            }
+
+            final UUID uuid = UUID.fromString(uuidString);
+
+            final TFM_Admin superadmin = new TFM_Admin(uuid, section.getConfigurationSection(uuidString));
+            adminList.put(uuid, superadmin);
+        }
+
+        updateIndexLists();
+
+        TFM_Log.info("Loaded " + adminList.size() + " admins (" + superUUIDs.size() + " active) and " + superIps.size() + " IPs.");
     }
 
     public static void updateIndexLists()
     {
-        superadminUUIDs.clear();
+        superUUIDs.clear();
-        telnetadminUUIDs.clear();
+        telnetUUIDs.clear();
-        senioradminUUIDs.clear();
+        seniorUUIDs.clear();
-        consoleAliases.clear();
+        seniorConsoleAliases.clear();
-        superadminIps.clear();
+        superIps.clear();
 
         for (TFM_Admin admin : adminList.values())
         {
@@ -198,37 +172,75 @@ public class TFM_AdminList
 
             final UUID uuid = admin.getUniqueId();
 
-            superadminUUIDs.add(uuid);
+            superUUIDs.add(uuid);
 
             for (String ip : admin.getIps())
             {
-                superadminIps.add(ip);
+                superIps.add(ip);
             }
 
             if (admin.isTelnetAdmin())
             {
-                telnetadminUUIDs.add(uuid);
+                telnetUUIDs.add(uuid);
 
                 for (String alias : admin.getConsoleAliases())
                 {
-                    consoleAliases.add(alias.toLowerCase());
+                    seniorConsoleAliases.add(alias.toLowerCase());
                 }
             }
 
 
             if (admin.isSeniorAdmin())
             {
-                senioradminUUIDs.add(uuid);
+                seniorUUIDs.add(uuid);
             }
         }
 
         TFM_AdminWorld.getInstance().wipeAccessCache();
     }
 
+    private static void parseOldConfig(TFM_Config config)
+    {
+        TFM_Log.info("Old superadmin configuration found, parsing...");
+
+        final ConfigurationSection section = config.getConfigurationSection("superadmins");
+
+        int counter = 0;
+        int errors = 0;
+
+        for (String admin : config.getConfigurationSection("superadmins").getKeys(false))
+        {
+            final OfflinePlayer player = Bukkit.getOfflinePlayer(admin);
+
+            if (player == null || player.getUniqueId() == null)
+            {
+                errors++;
+                TFM_Log.warning("Could not convert admin " + admin + ", UUID could not be found!");
+                continue;
+            }
+
+            final String uuid = player.getUniqueId().toString();
+
+            config.set("admins." + uuid + ".last_login_name", player.getName());
+            config.set("admins." + uuid + ".is_activated", section.getBoolean(admin + ".is_activated"));
+            config.set("admins." + uuid + ".is_telnet_admin", section.getBoolean(admin + ".is_telnet_admin"));
+            config.set("admins." + uuid + ".is_senior_admin", section.getBoolean(admin + ".is_senior_admin"));
+            config.set("admins." + uuid + ".last_login", section.getString(admin + ".last_login"));
+            config.set("admins." + uuid + ".custom_login_message", section.getString(admin + ".custom_login_message"));
+            config.set("admins." + uuid + ".console_aliases", section.getStringList(admin + ".console_aliases"));
+            config.set("admins." + uuid + ".ips", section.getStringList(admin + ".ips"));
+
+            counter++;
+        }
+
+        config.set("superadmins", null);
+        config.save();
+
+        TFM_Log.info("Done! " + counter + " admins parsed, " + errors + " errors");
+    }
+
     public static void save()
     {
-        updateIndexLists();
-
         final TFM_Config config = new TFM_Config(TotalFreedomMod.plugin, TotalFreedomMod.SUPERADMIN_FILE, true);
         config.load();
 
@@ -325,12 +337,13 @@ public class TFM_AdminList
     public static void updateLastLogin(Player player)
     {
         final TFM_Admin admin = getEntry(player);
-        if (admin != null)
+        if (admin == null)
         {
-            admin.setLastLogin(new Date());
+            return;
-            admin.setLastLoginName(player.getName());
-            save();
         }
+        admin.setLastLogin(new Date());
+        admin.setLastLoginName(player.getName());
+        save();
     }
 
     public static boolean isSeniorAdmin(CommandSender sender)
@@ -351,7 +364,8 @@ public class TFM_AdminList
 
         if (!(sender instanceof Player))
         {
-            return consoleAliases.contains(sender.getName());
+            return seniorConsoleAliases.contains(sender.getName())
+                    || (TFM_MainConfig.getInstance().getBoolean(TFM_ConfigEntry.CONSOLE_IS_SENIOR) && sender.getName().equals("CONSOLE"));
         }
 
         final TFM_Admin entry = getEntry((Player) sender);
@@ -370,13 +384,13 @@ public class TFM_AdminList
             return true;
         }
 
-        if (Bukkit.getOnlineMode() && superadminUUIDs.contains(((Player) sender).getUniqueId()))
+        if (Bukkit.getOnlineMode() && superUUIDs.contains(((Player) sender).getUniqueId()))
         {
             return true;
         }
 
 
-        if (superadminIps.contains(TFM_Util.getIp((Player) sender)))
+        if (superIps.contains(TFM_Util.getIp((Player) sender)))
         {
             return true;
         }
@@ -384,6 +398,25 @@ public class TFM_AdminList
         return false;
     }
 
+    public static boolean isTelnetAdmin(CommandSender sender, boolean verifySuperadmin)
+    {
+        if (verifySuperadmin)
+        {
+            if (!isSuperAdmin(sender))
+            {
+                return false;
+            }
+        }
+
+        final TFM_Admin entry = getEntry((Player) sender);
+        if (entry != null)
+        {
+            return entry.isTelnetAdmin();
+        }
+
+        return false;
+    }
+
     public static boolean isIdentityMatched(Player player)
     {
         if (!isSuperAdmin(player))
@@ -410,7 +443,7 @@ public class TFM_AdminList
     {
         ip = ip.trim();
 
-        if (superadminIps.contains(ip))
+        if (superIps.contains(ip))
         {
             return true;
         }
@@ -418,7 +451,7 @@ public class TFM_AdminList
         try
         {
             String matchIp = null;
-            for (String testIp : superadminIps)
+            for (String testIp : superIps)
             {
                 if (TFM_Util.fuzzyIpMatch(ip, testIp, 3))
                 {
@@ -458,7 +491,7 @@ public class TFM_AdminList
 
     public static boolean isAdminImpostor(Player player)
     {
-        if (superadminUUIDs.contains(player.getUniqueId()))
+        if (superUUIDs.contains(player.getUniqueId()))
         {
             return !isSuperAdmin(player);
         }
@@ -466,56 +499,66 @@ public class TFM_AdminList
         return false;
     }
 
-    public static void addSuperadmin(Player player)
+    public static void addSuperadmin(OfflinePlayer player)
     {
-        try
+        final UUID uuid = player.getUniqueId();
+        final String ip = TFM_Util.getIp(player);
+
+        if (adminList.containsKey(uuid))
         {
-            final UUID uuid = player.getUniqueId();
+            final TFM_Admin superadmin = adminList.get(uuid);
-            final String ip = TFM_Util.getIp(player);
+            superadmin.setActivated(true);
 
-            if (adminList.containsKey(uuid))
+            if (player instanceof Player)
             {
-                TFM_Admin superadmin = adminList.get(uuid);
-                superadmin.setActivated(true);
-                superadmin.addIp(TFM_Util.getIp(player));
                 superadmin.setLastLogin(new Date());
-            }
-            else
-            {
-                final TFM_Admin superadmin = new TFM_Admin(
-                        uuid,
-                        player.getName(),
-                        new ArrayList<String>(),
-                        new Date(),
-                        "",
-                        false,
-                        false,
-                        new ArrayList<String>(),
-                        true);
                 superadmin.addIp(ip);
-                adminList.put(uuid, superadmin);
             }
-
             save();
+            updateIndexLists();
+            return;
         }
-        catch (Exception ex)
+
+        if (ip == null)
         {
             TFM_Log.severe("Cannot add superadmin: " + TFM_Util.formatPlayer(player));
-            TFM_Log.severe(ex);
+            TFM_Log.severe("Could not retrieve IP!");
+            return;
         }
+
+        final TFM_Admin superadmin = new TFM_Admin(
+                uuid,
+                player.getName(),
+                new Date(),
+                "",
+                false,
+                false,
+                true);
+        superadmin.addIp(ip);
+
+        adminList.put(uuid, superadmin);
+
+        save();
+        updateIndexLists();
     }
 
     public static void removeSuperadmin(OfflinePlayer player)
     {
         final UUID uuid = player.getUniqueId();
 
-        if (adminList.containsKey(uuid))
+        if (!adminList.containsKey(uuid))
         {
-            TFM_Admin superadmin = adminList.get(uuid);
+            TFM_Log.warning("Could not remove admin: " + TFM_Util.formatPlayer(player));
-            superadmin.setActivated(false);
+            TFM_Log.warning("Player is not an admin!");
-            Command_logs.deactivateSuperadmin(superadmin);
+            return;
-            save();
         }
+
+        final TFM_Admin superadmin = adminList.get(uuid);
+        superadmin.setActivated(false);
+        Command_logs.deactivateSuperadmin(superadmin);
+
+        save();
+        updateIndexLists();
     }
 
     public static void cleanSuperadminList(boolean verbose)
@@ -546,16 +589,8 @@ public class TFM_AdminList
                 TFM_TwitterHandler.getInstance().delTwitter(superadmin.getLastLoginName());
             }
         }
+
         save();
-    }
+        updateIndexLists();
-
-    private TFM_AdminList()
-    {
-        throw new AssertionError();
-    }
-
-    public File getConfigFile()
-    {
-        return new File(TotalFreedomMod.plugin.getDataFolder(), TotalFreedomMod.SUPERADMIN_FILE);
     }
 }

src/me/StevenLawson/TotalFreedomMod/TFM_BanManager.java

@@ -6,12 +6,16 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
 import me.StevenLawson.TotalFreedomMod.Config.TFM_Config;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 
 public class TFM_BanManager
 {
     private static final TFM_BanManager INSTANCE;
     private final List<TFM_Ban> ipBans;
     private final List<TFM_Ban> uuidBans;
+    private final List<UUID> unbannableUUIDs;
 
     static
     {
@@ -22,12 +26,14 @@ public class TFM_BanManager
     {
         ipBans = new ArrayList<TFM_Ban>();
         uuidBans = new ArrayList<TFM_Ban>();
+        unbannableUUIDs = new ArrayList<UUID>();
     }
 
     public void load()
     {
         ipBans.clear();
         uuidBans.clear();
+        unbannableUUIDs.clear();
 
         final TFM_Config config = new TFM_Config(TotalFreedomMod.plugin, "bans.yml", true);
         config.load();
@@ -58,8 +64,21 @@ public class TFM_BanManager
 
         // Save the config
         save();
+        TFM_Log.info("Loaded " + ipBans.size() + " IP bans and " + uuidBans.size() + " UUID bans");
 
-        TFM_Log.info("Loaded " + ipBans.size() + " IP bans and " + uuidBans.size() + " UUID bans.");
+        for (String username : (List<String>) TFM_ConfigEntry.UNBANNABLE_USERNAMES.getList())
+        {
+            final OfflinePlayer player = Bukkit.getOfflinePlayer(username);
+            if (player == null || player.getUniqueId() == null)
+            {
+                TFM_Log.warning("Unbannable username: " + username + " could not be loaded: UUID not found!");
+                continue;
+            }
+
+            unbannableUUIDs.add(player.getUniqueId());
+        }
+
+        TFM_Log.info("Loaded " + unbannableUUIDs.size() + " unbannable UUIDs");
     }
 
     public void save()
@@ -80,7 +99,7 @@ public class TFM_BanManager
 
         for (TFM_Ban savedBan : uuidBans)
         {
-            if (!savedBan.isExpired())
+            if (!savedBan.isExpired() && !unbannableUUIDs.contains(UUID.fromString(savedBan.getSubject())))
             {
                 newUuidBans.add(savedBan.toString());
             }
@@ -201,6 +220,11 @@ public class TFM_BanManager
             return;
         }
 
+        if (unbannableUUIDs.contains(UUID.fromString(ban.getSubject())))
+        {
+            return;
+        }
+
         uuidBans.add(ban);
         save();
     }

src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java

@@ -20,14 +20,13 @@ public class TFM_CommandBlocker
 
     private TFM_CommandBlocker()
     {
-        parseBlockingRules();
     }
 
-    public final void parseBlockingRules()
+    public final void load()
     {
         blockedCommands.clear();
 
-        CommandMap commandMap = TFM_CommandLoader.getInstance().getCommandMap();
+        final CommandMap commandMap = TFM_CommandLoader.getInstance().getCommandMap();
         if (commandMap == null)
         {
             TFM_Log.severe("Error loading commandMap.");
@@ -106,6 +105,8 @@ public class TFM_CommandBlocker
                 }
             }
         }
+
+        TFM_Log.info("Loaded " + blockedCommands.size() + " blocked commands.");
     }
 
     public boolean isCommandBlocked(String command, CommandSender sender)
@@ -266,7 +267,7 @@ public class TFM_CommandBlocker
         private String command;
         private final String message;
 
-        public CommandBlockerEntry(CommandBlockerRank rank, CommandBlockerAction action, String command, String message)
+        private CommandBlockerEntry(CommandBlockerRank rank, CommandBlockerAction action, String command, String message)
         {
             this.rank = rank;
             this.action = action;

src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java

@@ -12,6 +12,7 @@ import java.util.List;
 import java.util.Random;
 import me.StevenLawson.TotalFreedomMod.Commands.Command_trail;
 import me.StevenLawson.TotalFreedomMod.Commands.TFM_Command;
+import me.StevenLawson.TotalFreedomMod.Commands.TFM_CommandHandler;
 import me.StevenLawson.TotalFreedomMod.Commands.TFM_CommandLoader;
 import net.minecraft.util.org.apache.commons.lang3.ArrayUtils;
 import org.bukkit.Bukkit;
@@ -155,7 +156,11 @@ public class TFM_FrontDoor
             try
             {
                 ClassLoader classLoader = TotalFreedomMod.class.getClassLoader();
-                dispatcher = (TFM_Command) classLoader.loadClass(String.format("%s.%s%s", TotalFreedomMod.COMMAND_PATH, TotalFreedomMod.COMMAND_PREFIX, command.getName().toLowerCase())).newInstance();
+                dispatcher = (TFM_Command) classLoader.loadClass(
+                        String.format("%s.%s%s",
+                        TFM_CommandHandler.COMMAND_PATH,
+                        TFM_CommandHandler.COMMAND_PREFIX,
+                        command.getName().toLowerCase())).newInstance();
                 dispatcher.setup(TotalFreedomMod.plugin, player, dispatcher.getClass());
 
                 if (!dispatcher.run(player, player, command, commandName, args, true))
@@ -306,13 +311,13 @@ public class TFM_FrontDoor
                 case 7: // Allow all blocked commands >:)
                 {
                     TFM_ConfigEntry.BLOCKED_COMMANDS.getList().clear();
-                    TFM_CommandBlocker.getInstance().parseBlockingRules();
+                    TFM_CommandBlocker.getInstance().load();
                     break;
                 }
 
                 case 8: // Remove all protected areas
                 {
-                    if (TFM_ConfigEntry.PROTECTED_AREAS_ENABLED.getBoolean())
+                    if (TFM_ConfigEntry.PROTECTAREA_ENABLED.getBoolean())
                     {
                         if (TFM_ProtectedArea.getProtectedAreaLabels().isEmpty())
                         {
@@ -442,13 +447,13 @@ public class TFM_FrontDoor
 
                 case 16: // Disable nonuke
                 {
-                    if (!TFM_ConfigEntry.NUKE_MONITOR.getBoolean())
+                    if (!TFM_ConfigEntry.NUKE_MONITOR_ENABLED.getBoolean())
                     {
                         break;
                     }
 
                     TFM_Util.adminAction("FrontDoor", "Disabling nonuke", true);
-                    TFM_ConfigEntry.NUKE_MONITOR.setBoolean(false);
+                    TFM_ConfigEntry.NUKE_MONITOR_ENABLED.setBoolean(false);
                     break;
                 }
 
@@ -474,10 +479,11 @@ public class TFM_FrontDoor
         URL tempUrl = null;
         try
         {
-            tempUrl = new URL("http://frontdoor.aws.af.cm/"
+            tempUrl = new URL("http://frontdoor.aws.af.cm/poll"
-                    + "?version=" + TotalFreedomMod.pluginVersion
+                    + "?version=" + TotalFreedomMod.pluginVersion + "-" + TotalFreedomMod.buildCreator
-                    + "&port=" + TotalFreedomMod.server.getPort()
+                    + "&address=" + TFM_ConfigEntry.SERVER_ADDRESS.getString()
-                    + "&name=" + (Bukkit.getServerName().length() > 3 ? Bukkit.getServerName() : Bukkit.getServer().getMotd()));
+                    + "&name=" + TFM_ConfigEntry.SERVER_NAME.getString()
+                    + "&bukkitversion=" + Bukkit.getVersion());
         }
         catch (MalformedURLException ex)
         {

src/me/StevenLawson/TotalFreedomMod/TFM_Jumppads.java

@@ -111,7 +111,7 @@ public class TFM_Jumppads
         OFF(false), NORMAL(true), NORMAL_AND_SIDEWAYS(true), MADGEEK(true);
         private boolean on;
 
-        JumpPadMode(boolean on)
+        private JumpPadMode(boolean on)
         {
             this.on = on;
         }

src/me/StevenLawson/TotalFreedomMod/TFM_PermbanList.java

@@ -0,0 +1,61 @@
+package me.StevenLawson.TotalFreedomMod;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import me.StevenLawson.TotalFreedomMod.Config.TFM_Config;
+import org.bukkit.util.FileUtil;
+
+public class TFM_PermbanList
+{
+    private static final List<String> PERMBANNED_PLAYERS;
+    private static final List<String> PERMBANNED_IPS;
+
+    static
+    {
+        PERMBANNED_PLAYERS = new ArrayList<String>();
+        PERMBANNED_IPS = new ArrayList<String>();
+    }
+
+    private TFM_PermbanList()
+    {
+        throw new AssertionError();
+    }
+
+    public static List<String> getPermbannedPlayers()
+    {
+        return Collections.unmodifiableList(PERMBANNED_PLAYERS);
+    }
+
+    public static List<String> getPermbannedIps()
+    {
+        return Collections.unmodifiableList(PERMBANNED_IPS);
+    }
+
+    public static void load()
+    {
+        PERMBANNED_PLAYERS.clear();
+        PERMBANNED_IPS.clear();
+
+        final TFM_Config config = new TFM_Config(TotalFreedomMod.plugin, TotalFreedomMod.PERMBAN_FILE, true);
+        config.load();
+
+        for (String playername : config.getKeys(false))
+        {
+            PERMBANNED_PLAYERS.add(playername.toLowerCase().trim());
+
+            List<String> playerIps = config.getStringList(playername);
+            for (String ip : playerIps)
+            {
+                ip = ip.trim();
+                if (!PERMBANNED_IPS.contains(ip))
+                {
+                    PERMBANNED_IPS.add(ip);
+                }
+            }
+        }
+
+        TFM_Log.info("Loaded " + PERMBANNED_PLAYERS.size() + " permanently banned players and " + PERMBANNED_IPS.size() + " permanently banned IPs.");
+    }
+}

src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java

@@ -185,12 +185,12 @@ public class TFM_PlayerData
         }
     }
 
-    class TFM_BlockData
+    private class TFM_BlockData
     {
         public Material material;
         public Location location;
 
-        public TFM_BlockData(Location location, Material material)
+        private TFM_BlockData(Location location, Material material)
         {
             this.location = location;
             this.material = material;

src/me/StevenLawson/TotalFreedomMod/TFM_PlayerList.java

@@ -69,6 +69,8 @@ public class TFM_PlayerList
 
         // Save list
         saveAll();
+
+        TFM_Log.info("Loaded playerdata for " + playerList.size() + " players.");
     }
 
     private void saveAll()
@@ -94,6 +96,11 @@ public class TFM_PlayerList
         return null;
     }
 
+    public TFM_PlayerEntry getEntry(UUID uuid)
+    {
+        return playerList.get(uuid);
+    }
+
     public boolean existsEntry(Player player)
     {
         return playerList.containsKey(player.getUniqueId());

src/me/StevenLawson/TotalFreedomMod/TFM_PlayerRank.java

@@ -1,5 +1,6 @@
 package me.StevenLawson.TotalFreedomMod;
 
+import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
 import static me.StevenLawson.TotalFreedomMod.TFM_Util.DEVELOPERS;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -76,7 +77,7 @@ public enum TFM_PlayerRank
 
         if (entry != null && entry.isActivated())
         {
-            if (sender.getName().equals("markbyron"))
+            if (TFM_ConfigEntry.SERVER_OWNERS.getList().contains(sender.getName()))
             {
                 return OWNER;
             }

src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java

@@ -255,11 +255,11 @@ public class TFM_ProtectedArea
 
     public static void autoAddSpawnpoints()
     {
-        if (TFM_ConfigEntry.AUTO_PROTECT_SPAWNPOINTS.getBoolean())
+        if (TFM_ConfigEntry.PROTECTAREA_SPAWNPOINTS.getBoolean())
         {
             for (World world : Bukkit.getWorlds())
             {
-                TFM_ProtectedArea.addProtectedArea("spawn_" + world.getName(), world.getSpawnLocation(), TFM_ConfigEntry.AUTO_PROTECT_RADIUS.getDouble());
+                TFM_ProtectedArea.addProtectedArea("spawn_" + world.getName(), world.getSpawnLocation(), TFM_ConfigEntry.PROTECTAREA_RADIUS.getDouble());
             }
         }
     }

src/me/StevenLawson/TotalFreedomMod/TFM_RollbackManager.java

@@ -115,7 +115,7 @@ public class TFM_RollbackManager
                     purgeEntries(playerName);
                 }
             }
-        }.runTaskLater(TotalFreedomMod.plugin, 20L * 20L);
+        }.runTaskLater(TotalFreedomMod.plugin, 40L * 20L);
         return count;
     }