Making TFM at least somewhat standardized

src/main/java/me/totalfreedom/totalfreedommod/banning/IndefiniteBanList.java

@@ -64,7 +64,7 @@ public void onStart()
 
         updateCount();
 
-        FLog.info("Loaded " + nameBanCount + " indefinite name bans, " + uuidBanCount + " UUID bans, and " + ipBanCount + " ip bans");
+        FLog.info("Loaded " + nameBanCount + " indefinite name bans, " + uuidBanCount + " UUID bans, and " + ipBanCount + " ip bans.");
     }
 
     @Override

src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerEntry.java

@@ -40,7 +40,7 @@ public void doActions(CommandSender sender)
     {
         if (action == CommandBlockerAction.BLOCK_AND_EJECT && sender instanceof Player)
         {
-            TotalFreedomMod.plugin().ae.autoEject((Player)sender, "You used a prohibited command: " + command);
+            TotalFreedomMod.plugin().ae.autoEject((Player)sender, "You used a prohibited command: \"" + command + "\".");
             FUtil.bcastMsg(sender.getName() + " was automatically kicked for using harmful commands.", ChatColor.RED);
             return;
         }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java

@@ -8,7 +8,7 @@
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Quickly change your own gamemode to adventure, define someone's username to change theirs, or change everyone's gamemode on the server.", usage = "/<command> <[partialname] | -a>", aliases = "gma")
+@CommandParameters(description = "Change your own gamemode to adventure, change everyone's gamemode to adventure, or change someone else's gamemode to adventure.", usage = "/<command> <player | -a>", aliases = "gma")
 public class Command_adventure extends FreedomCommand
 {
 
@@ -37,7 +37,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
                 targetPlayer.setGameMode(GameMode.ADVENTURE);
             }
 
-            FUtil.staffAction(sender.getName(), "Changing everyone's gamemode to adventure", false);
+            FUtil.staffAction(sender.getName(), "Changing everyone's gamemode to adventure.", false);
             msg("Your gamemode has been set to adventure.");
             return true;
         }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_aeclear.java

@@ -30,6 +30,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
                 }
             }
         }
+
         msg(removed + " area effect clouds removed.");
         return true;
     }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_autoclear.java

@@ -6,7 +6,7 @@
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Toggle whether or not a player has their inventory automatically cleared when they join", usage = "/<command> <player>")
+@CommandParameters(description = "Toggle whether or not a player has their inventory automatically cleared when they join.", usage = "/<command> <player>")
 public class Command_autoclear extends FreedomCommand
 {
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_autotp.java

@@ -6,7 +6,7 @@
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Toggle whether or not a player is automatically teleported when they join", usage = "/<command> <player>")
+@CommandParameters(description = "Toggle whether or not a player is automatically teleported when they join.", usage = "/<command> <player>")
 public class Command_autotp extends FreedomCommand
 {
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_ban.java

@@ -104,10 +104,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
                     }
                 }
             }
-            else
-            {
-                msg("Banned " + player.getName() + " quietly.");
-            }
+
             // Kill player
             player.setHealth(0.0);
         }
@@ -156,7 +153,10 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
             msg(sender, ChatColor.GRAY + username + " has been banned and IP is: " + StringUtils.join(ips, ", "));
             FUtil.staffAction(sender.getName(), String.format(bcast.toString()), true);
         }
-
+        else
+        {
+            msg("Banned " + player.getName() + " quietly.");
+        }
         // Kick player and handle others on IP
         if (player != null)
         {

src/main/java/me/totalfreedom/totalfreedommod/command/Command_banip.java

@@ -32,13 +32,13 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
 
         if (!FUtil.isValidIPv4(ip))
         {
-            msg(ip + " is not a valid IP address", ChatColor.RED);
+            msg(ip + " is not a valid IP address.", ChatColor.RED);
             return true;
         }
 
         if (plugin.bm.getByIp(ip) != null)
         {
-            msg("The IP " + ip + " is already banned", ChatColor.RED);
+            msg("The IP " + ip + " is already banned.", ChatColor.RED);
             return true;
         }
 
@@ -75,6 +75,10 @@ else if (args.length > 1)
                 String message = ChatColor.RED + sender.getName() + " - Banned " + (plugin.sl.isStaff(player) ? "the IP " + ip : "an IP");
                 player.sendMessage(message);
             }
+            else
+            {
+                msg("Banned the ip " + ip + " quietly.");
+            }            
         }
 
         return true;

src/main/java/me/totalfreedom/totalfreedommod/command/Command_banlist.java

@@ -7,7 +7,7 @@
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Shows all banned player names. Admins may optionally use 'purge' to clear the list.", usage = "/<command> [purge]")
+@CommandParameters(description = "Shows all banned player names. Senior Admins may optionally use 'purge' to clear the list.", usage = "/<command> [purge]")
 public class Command_banlist extends FreedomCommand
 {
 
@@ -20,7 +20,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
             {
                 checkRank(Rank.SENIOR_ADMIN);
 
-                FUtil.staffAction(sender.getName(), "Purging the ban list", true);
+                FUtil.staffAction(sender.getName(), "Purging the ban list.", true);
                 int amount = plugin.bm.purge();
                 msg("Purged " + amount + " player bans.");
                 return true;

src/main/java/me/totalfreedom/totalfreedommod/command/Command_banname.java

@@ -31,7 +31,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
 
         if (plugin.bm.getByUsername(name) != null)
         {
-            msg("The name " + name + " is already banned", ChatColor.RED);
+            msg("The name " + name + " is already banned.", ChatColor.RED);
             return true;
         }
 
@@ -57,7 +57,11 @@ else if (args.length > 1)
         {
             FUtil.staffAction(sender.getName(), "Banned the name " + name, true);
         }
-
+        else
+        {
+            msg("Banned the name " + name + " quietly.");
+        }
+
         Player player = getPlayer(name);
         if (player != null)
         {

src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockcmd.java

@@ -23,7 +23,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
 
         if (args[0].equals("purge"))
         {
-            FUtil.staffAction(sender.getName(), "Unblocking commands for all players", true);
+            FUtil.staffAction(sender.getName(), "Unblocking commands for all players.", true);
             int counter = 0;
             for (Player player : server.getOnlinePlayers())
             {
@@ -40,7 +40,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
 
         if (args[0].equals("-a"))
         {
-            FUtil.staffAction(sender.getName(), "Blocking commands for all non-staff", true);
+            FUtil.staffAction(sender.getName(), "Blocking commands for all non-staff.", true);
             int counter = 0;
             for (Player player : server.getOnlinePlayers())
             {
@@ -77,7 +77,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
         {
             playerdata.setCommandsBlocked(true);
             FUtil.staffAction(sender.getName(), "Blocking all commands for " + player.getName(), true);
-            msg("Blocked commands for " + player.getName() + ".");
+            msg("Blocked commands for " + player.getName());
         }
         else
         {

src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java

@@ -11,7 +11,7 @@
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Restricts/unrestricts block modification abilities for everyone on the server or a certain player.", usage = "/<command> [[-s] <player> [reason] | list | purge | all]")
+@CommandParameters(description = "Restricts/unrestricts block modification abilities for everyone on the server or a certain player.", usage = "/<command> [[-s] <player> [reason] | list | purge | -a]")
 public class Command_blockedit extends FreedomCommand
 {
 
@@ -61,7 +61,7 @@ public boolean run(final CommandSender sender, final Player playerSender, final
             return true;
         }
 
-        if (args[0].equals("all"))
+        if (args[0].equals("-a"))
         {
             FUtil.staffAction(sender.getName(), "Blocking block modification abilities for all non-staff.", true);
             int counter = 0;
@@ -131,4 +131,4 @@ public boolean run(final CommandSender sender, final Player playerSender, final
         }
         return true;
     }
-}
+}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockpvp.java

@@ -11,7 +11,7 @@
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Toggle PVP mode for everyone or a certain player.", usage = "/<command> [[-s] <player> [reason] | list | purge | all]", aliases = "pvpblock,pvpmode")
+@CommandParameters(description = "Toggle PVP mode for everyone or a certain player.", usage = "/<command> [[-s] <player> [reason] | list | purge | -a]", aliases = "pvpblock,pvpmode")
 public class Command_blockpvp extends FreedomCommand
 {
 
@@ -62,7 +62,7 @@ public boolean run(final CommandSender sender, final Player playerSender, final
             return true;
         }
 
-        if (args[0].equals("all"))
+        if (args[0].equals("-a"))
         {
             FUtil.staffAction(sender.getName(), "Disabling PVP for all non-staff", true);
             int counter = 0;
@@ -131,4 +131,4 @@ public boolean run(final CommandSender sender, final Player playerSender, final
         }
         return true;
     }
-}
+}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockredstone.java

@@ -18,14 +18,14 @@ public boolean run(final CommandSender sender, final Player playerSender, final
         if (ConfigEntry.ALLOW_REDSTONE.getBoolean())
         {
             ConfigEntry.ALLOW_REDSTONE.setBoolean(false);
-            FUtil.staffAction(sender.getName(), "Blocking all redstone", true);
+            FUtil.staffAction(sender.getName(), "Blocking all redstone.", true);
             new BukkitRunnable()
             {
                 public void run()
                 {
                     if (!ConfigEntry.ALLOW_REDSTONE.getBoolean())
                     {
-                        FUtil.staffAction("TotalFreedom", "Unblocking all redstone", false);
+                        FUtil.staffAction("TotalFreedom", "Unblocking all redstone.", false);
                         ConfigEntry.ALLOW_REDSTONE.setBoolean(true);
                     }
                 }
@@ -34,7 +34,7 @@ public void run()
         else
         {
             ConfigEntry.ALLOW_REDSTONE.setBoolean(true);
-            FUtil.staffAction(sender.getName(), "Unblocking all redstone", true);
+            FUtil.staffAction(sender.getName(), "Unblocking all redstone.", true);
         }
         return true;
     }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java

@@ -16,7 +16,7 @@
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Place a cage around someone with certain blocks, or someone's player head.", usage = "/<command> <purge | <partialname> [head | block] [playername | blockname]")
+@CommandParameters(description = "Place a cage around someone with certain blocks, or someone's player head.", usage = "/<command> <purge | <player> [head | block] [playername | blockname]")
 public class Command_cage extends FreedomCommand
 {
 
@@ -30,7 +30,7 @@ public boolean run(final CommandSender sender, final Player playerSender, final
         String skullName = null;
         if ("purge".equals(args[0]))
         {
-            FUtil.staffAction(sender.getName(), "Uncaging all players", true);
+            FUtil.staffAction(sender.getName(), "Uncaging all players.", true);
             for (Player player : server.getOnlinePlayers())
             {
                 final FPlayer fPlayer = plugin.pl.getPlayer(player);

src/main/java/me/totalfreedom/totalfreedommod/command/Command_cartsit.java

@@ -7,7 +7,7 @@
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.NON_OP, source = SourceType.BOTH)
-@CommandParameters(description = "Sit in nearest minecart. If target is in a minecart already, they will disembark.", usage = "/<command> [partialname]")
+@CommandParameters(description = "Sit in nearest minecart. If target is in a minecart already, they will disembark.", usage = "/<command> <player>")
 public class Command_cartsit extends FreedomCommand
 {
 
@@ -32,7 +32,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
         {
             if (targetPlayer == null)
             {
-                sender.sendMessage("When used from the console, you must define a target player: /cartsit <player>");
+                sender.sendMessage("When used from the console, you must define a target player: /cartsit <player>.");
                 return true;
             }
         }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearchat.java

@@ -24,7 +24,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
                 }
             }
         }
-        FUtil.staffAction(sender.getName(), "Cleared chat", true);
+        FUtil.staffAction(sender.getName(), "Cleared chat.", true);
         return true;
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearinventory.java

@@ -9,7 +9,7 @@
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Clear your inventory.", usage = "/<command> [player]", aliases = "ci,clear")
+@CommandParameters(description = "Clear your inventory.", usage = "/<command> <player | -a>", aliases = "ci,clear")
 public class Command_clearinventory extends FreedomCommand
 {
 
@@ -33,7 +33,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
             {
                 if (args[0].equals("-a"))
                 {
-                    FUtil.staffAction(sender.getName(), "Clearing everyone's inventory", true);
+                    FUtil.staffAction(sender.getName(), "Clearing everyone's inventory.", true);
                     for (Player player : server.getOnlinePlayers())
                     {
                         player.getInventory().clear();

src/main/java/me/totalfreedom/totalfreedommod/command/Command_clownfish.java

@@ -8,7 +8,7 @@
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Obtain a clown fish", usage = "/<command>")
+@CommandParameters(description = "Obtain a clown fish.", usage = "/<command>")
 public class Command_clownfish extends FreedomCommand
 {
 
@@ -18,7 +18,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
         if (plugin.pl.getData(playerSender).hasItem(ShopItem.CLOWN_FISH))
         {
             playerSender.getInventory().addItem(plugin.sh.getClownFish());
-            msg("You have been given a Clown Fish", ChatColor.GREEN);
+            msg("You have been given a Clown Fish.", ChatColor.GREEN);
         }
         else
         {

src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java

@@ -7,7 +7,7 @@
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Spy on commands", usage = "/<command>", aliases = "commandspy")
+@CommandParameters(description = "Allows Admins to view commands executed by lower ranks.", usage = "/<command>", aliases = "commandspy")
 public class Command_cmdspy extends FreedomCommand
 {
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_coins.java

@@ -10,7 +10,7 @@
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Shows the amount of coins you have or another player has", usage = "/<command> [playername]")
+@CommandParameters(description = "Shows the amount of coins you have or another player has.", usage = "/<command> <player>")
 public class Command_coins extends FreedomCommand
 {
     @Override
@@ -39,7 +39,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
         {
             if (senderIsConsole)
             {
-                msg(prefix + ChatColor.RED + "You are not a player, use /coins <playername>");
+                msg(prefix + ChatColor.RED + "You are not a player, use /coins <player>.");
                 return true;
             }
             else
@@ -51,4 +51,4 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
         msg(prefix + ChatColor.GREEN + (args.length > 0 ? p.getName() + " has " : "You have ") + ChatColor.RED + playerData.getCoins() + ChatColor.GREEN + " coins.");
         return true;
     }
-}
+}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_colorme.java

@@ -11,7 +11,7 @@
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Essentials Interface Command - Set your nickname to a certain color.", usage = "/<command> <color>")
+@CommandParameters(description = "Essentials Interface Command - Set your nickname to a certain color.", usage = "/<command> <color | list>")
 public class Command_colorme extends FreedomCommand
 {
 
@@ -52,7 +52,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
 
         plugin.esb.setNickname(sender.getName(), newNick);
 
-        msg("Your nickname is now: " + newNick);
+        msg("Your nickname is now: " + newNick + ".");
 
         return true;
     }