From d786e4e389c1a8088b8f0baa126ab0b083ee2126 Mon Sep 17 00:00:00 2001
From: Steven Lawson <steven@smlawson.com>
Date: Mon, 17 Sep 2012 20:13:13 -0400
Subject: [PATCH] Derp.

---
 .../TotalFreedomMod/Commands/Command_ops.java |  4 +-
 .../Commands/Command_whitelist.java           |  3 +-
 .../TotalFreedomMod/TFM_Util.java             | 40 +++----------------
 3 files changed, 7 insertions(+), 40 deletions(-)

diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java
index 6976a510..73044e07 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java
@@ -2,7 +2,6 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
@@ -27,8 +26,7 @@ public class Command_ops extends TFM_Command
 
         if (args[0].equalsIgnoreCase("list"))
         {
-            TFM_Util.playerMsg(sender, "Operators: " + StringUtils.join(server.getOperators(), ", "));
-
+            TFM_Util.playerMsg(sender, "Operators: " + TFM_Util.playerListToNames(server.getOperators()));
             return true;
         }
 
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java
index 687c2fbd..85daecf2 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java
@@ -4,7 +4,6 @@ import java.util.Set;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import net.minecraft.server.MinecraftServer;
-import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
@@ -30,7 +29,7 @@ public class Command_whitelist extends TFM_Command
         // list
         if (args[0].equalsIgnoreCase("list"))
         {
-            TFM_Util.playerMsg(sender, "Whitelisted players: " + StringUtils.join(server.getWhitelistedPlayers(), ", "));
+            TFM_Util.playerMsg(sender, "Whitelisted players: " + TFM_Util.playerListToNames(server.getWhitelistedPlayers()));
             return true;
         }
 
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
index 72a27637..04708b5d 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
@@ -198,12 +198,6 @@ public class TFM_Util
         world.setTime(time + 24000 + ticks);
     }
 
-    @Deprecated
-    public static void createDefaultConfiguration(String name, TotalFreedomMod tfm, File plugin_file)
-    {
-        TFM_Util.createDefaultConfiguration(name, plugin_file);
-    }
-
     public static void createDefaultConfiguration(String name, File plugin_file)
     {
         TotalFreedomMod tfm = TotalFreedomMod.plugin;
@@ -277,12 +271,6 @@ public class TFM_Util
         }
     }
 
-    @Deprecated
-    public static boolean isUserSuperadmin(CommandSender user, TotalFreedomMod tfm)
-    {
-        return isUserSuperadmin(user);
-    }
-
     public static boolean isUserSuperadmin(CommandSender user)
     {
         try
@@ -325,12 +313,6 @@ public class TFM_Util
         return false;
     }
 
-    @Deprecated
-    public static boolean checkPartialSuperadminIP(String user_ip, TotalFreedomMod tfm)
-    {
-        return TFM_Util.checkPartialSuperadminIP(user_ip);
-    }
-
     public static boolean checkPartialSuperadminIP(String user_ip)
     {
         user_ip = user_ip.trim();
@@ -398,12 +380,6 @@ public class TFM_Util
         }
     }
 
-    @Deprecated
-    public static int wipeEntities(boolean wipe_explosives)
-    {
-        return wipeEntities(wipe_explosives, false);
-    }
-
     public static int wipeEntities(boolean wipe_explosives, boolean wipe_carts)
     {
         int removed = 0;
@@ -929,20 +905,14 @@ public class TFM_Util
         return c.getTime();
     }
 
-    @Deprecated
-    public static String arrayToString(Set<OfflinePlayer> set)
+    public static String playerListToNames(Set<OfflinePlayer> players)
     {
-        String players = "";
-        String delim = "";
-
-        for (OfflinePlayer p : set)
+        List<String> player_names = new ArrayList<String>();
+        for (OfflinePlayer p : players)
         {
-            players += delim;
-            players += p.getName();
-            delim = ", ";
+            player_names.add(p.getName());
         }
-
-        return players;
+        return StringUtils.join(player_names, ", ");
     }
 // I wrote all this before i discovered getTargetBlock >.> - might come in handy some day...
 //    public static final double LOOKAT_VIEW_HEIGHT = 1.65;