From 2c4eca855185b04d1355495ca764e983415c4c52 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Sat, 10 Aug 2013 13:17:32 -0400 Subject: [PATCH] Remove deprecated methods and variables. --- .../TotalFreedomMod/TFM_Util.java | 68 ++----------------- .../TotalFreedomMod/TotalFreedomMod.java | 9 --- 2 files changed, 7 insertions(+), 70 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java index 17716b77..f65e54e7 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java @@ -83,12 +83,6 @@ public class TFM_Util TFM_Util.bcastMsg(adminName + " - " + action, (isRed ? ChatColor.RED : ChatColor.AQUA)); } - @Deprecated - public static String implodeStringList(String glue, List pieces) - { - return StringUtils.join(pieces, glue); - } - public static String formatLocation(Location in_loc) { return String.format("%s: (%d, %d, %d)", @@ -240,12 +234,6 @@ public class TFM_Util } } - @Deprecated - public static boolean isUserSuperadmin(CommandSender user) - { - return TFM_SuperadminList.isUserSuperadmin(user); - } - public static int wipeEntities(boolean wipe_explosives, boolean wipe_vehicles) { int removed = 0; @@ -404,8 +392,8 @@ public class TFM_Util TFM_Util.bcastMsg(ChatColor.RED + p.getName() + " has been banned for 1 minute."); - TFM_Util.banIP(player_ip, kickMessage, "AutoEject", expires); - TFM_Util.banUsername(p.getName(), kickMessage, "AutoEject", expires); + TFM_ServerInterface.banIP(player_ip, kickMessage, "AutoEject", expires); + TFM_ServerInterface.banUsername(p.getName(), kickMessage, "AutoEject", expires); p.kickPlayer(kickMessage); break; @@ -418,8 +406,8 @@ public class TFM_Util TFM_Util.bcastMsg(ChatColor.RED + p.getName() + " has been banned for 3 minutes."); - TFM_Util.banIP(player_ip, kickMessage, "AutoEject", expires); - TFM_Util.banUsername(p.getName(), kickMessage, "AutoEject", expires); + TFM_ServerInterface.banIP(player_ip, kickMessage, "AutoEject", expires); + TFM_ServerInterface.banUsername(p.getName(), kickMessage, "AutoEject", expires); p.kickPlayer(kickMessage); break; @@ -427,13 +415,13 @@ public class TFM_Util case STRIKE_THREE: { //Bukkit.banIP(player_ip); - TFM_Util.banIP(player_ip, kickMessage, "AutoEject", null); + TFM_ServerInterface.banIP(player_ip, kickMessage, "AutoEject", null); String[] ip_address_parts = player_ip.split("\\."); //Bukkit.banIP(); - TFM_Util.banIP(ip_address_parts[0] + "." + ip_address_parts[1] + ".*.*", kickMessage, "AutoEject", null); + TFM_ServerInterface.banIP(ip_address_parts[0] + "." + ip_address_parts[1] + ".*.*", kickMessage, "AutoEject", null); //p.setBanned(true); - TFM_Util.banUsername(p.getName(), kickMessage, "AutoEject", null); + TFM_ServerInterface.banUsername(p.getName(), kickMessage, "AutoEject", null); TFM_Util.bcastMsg(ChatColor.RED + p.getName() + " has been banned permanently."); @@ -459,12 +447,6 @@ public class TFM_Util Bukkit.getServer().createWorld(flatlands); } - @Deprecated - public static boolean isSuperadminImpostor(CommandSender user) - { - return TFM_SuperadminList.isSuperadminImpostor(user); - } - public static String getRank(CommandSender sender) { if (TFM_SuperadminList.isSuperadminImpostor(sender)) @@ -507,42 +489,6 @@ public class TFM_Util return "a " + ChatColor.GREEN + "non-OP" + ChatColor.AQUA + "."; } - @Deprecated - public static void banUsername(String name, String reason, String source, Date expire_date) - { - TFM_ServerInterface.banUsername(name, reason, source, expire_date); - } - - @Deprecated - public static void unbanUsername(String name) - { - TFM_ServerInterface.unbanUsername(name); - } - - @Deprecated - public static boolean isNameBanned(String name) - { - return TFM_ServerInterface.isNameBanned(name); - } - - @Deprecated - public static void banIP(String ip, String reason, String source, Date expire_date) - { - TFM_ServerInterface.banIP(ip, reason, source, expire_date); - } - - @Deprecated - public static void unbanIP(String ip) - { - TFM_ServerInterface.unbanIP(ip); - } - - @Deprecated - public static boolean isIPBanned(String ip) - { - return TFM_ServerInterface.isIPBanned(ip); - } - public static Date parseDateOffset(String time) { Pattern timePattern = Pattern.compile( diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java index 2b9a4af1..65937c19 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java +++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java @@ -154,7 +154,6 @@ public class TotalFreedomMod extends JavaPlugin TFM_CommandBlockerNew.getInstance().parseBlockingRules(); } }.runTaskLater(this, 20L); - } @Override @@ -327,11 +326,6 @@ public class TotalFreedomMod extends JavaPlugin TFM_Log.severe("Error loading main config: " + ex.getMessage()); } } - // - @Deprecated - public static List superadmins = new ArrayList(); - @Deprecated - public static List superadmin_ips = new ArrayList(); public static void loadSuperadminConfig() { @@ -339,9 +333,6 @@ public class TotalFreedomMod extends JavaPlugin { TFM_SuperadminList.backupSavedList(); TFM_SuperadminList.loadSuperadminList(); - - superadmins = TFM_SuperadminList.getSuperadminNames(); - superadmin_ips = TFM_SuperadminList.getSuperadminIPs(); } catch (Exception ex) {