From 55d94b5d59aa628e7b585fbee48fac08a55debe2 Mon Sep 17 00:00:00 2001 From: JeromSar Date: Sun, 25 Aug 2013 17:32:24 +0200 Subject: [PATCH] Changed back to raw Lists in config --- appinfo.properties | 6 +++--- buildnumber.properties | 4 ++-- src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java | 2 +- src/me/StevenLawson/TotalFreedomMod/TFM_Config.java | 2 +- src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java | 4 ++-- .../StevenLawson/TotalFreedomMod/TFM_ServerInterface.java | 2 +- src/me/StevenLawson/TotalFreedomMod/TFM_Util.java | 3 +-- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/appinfo.properties b/appinfo.properties index e4e8cc0f..a37838e2 100644 --- a/appinfo.properties +++ b/appinfo.properties @@ -1,5 +1,5 @@ -#Sat, 24 Aug 2013 21:25:38 +0200 +#Sat, 24 Aug 2013 21:35:24 +0200 program.VERSION=3.1 -program.BUILDNUM=481 -program.BUILDDATE=08/24/2013 09\:25 PM +program.BUILDNUM=482 +program.BUILDDATE=08/24/2013 09\:35 PM diff --git a/buildnumber.properties b/buildnumber.properties index 723391df..4f2d1beb 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Sat Aug 24 21:25:38 CEST 2013 -build.number=482 +#Sat Aug 24 21:35:24 CEST 2013 +build.number=483 diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java b/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java index cbceb0ea..00d516ae 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java @@ -33,7 +33,7 @@ public class TFM_CommandBlocker return; } - List _blockedCommands = (List) TFM_ConfigEntry.BLOCKED_COMMANDS.getStringList(); + List _blockedCommands = (List) TFM_ConfigEntry.BLOCKED_COMMANDS.getList(); for (String rawEntry : _blockedCommands) { String[] parts = rawEntry.split(":"); diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Config.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Config.java index 896af6c9..38d26b6f 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Config.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Config.java @@ -189,7 +189,7 @@ public class TFM_Config } } - public List getStringList(TFM_ConfigEntry entry) + public List getList(TFM_ConfigEntry entry) { try { diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java index 3672b3af..e3dafb41 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ConfigEntry.java @@ -115,8 +115,8 @@ public enum TFM_ConfigEntry return value; } - public List getStringList() + public List getList() { - return TFM_Config.getInstance().getStringList(this); + return TFM_Config.getInstance().getList(this); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java index 967001a5..04bd5b62 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java @@ -58,7 +58,7 @@ public class TFM_ServerInterface return; } - for (String username : TFM_ConfigEntry.UNBANNABLE_USERNAMES.getStringList()) + for (String username : (List) TFM_ConfigEntry.UNBANNABLE_USERNAMES.getList()) { if (username.toLowerCase().trim().equals(name)) { diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java index a36d0f2e..58277f76 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java @@ -743,10 +743,9 @@ public class TFM_Util } } - @SuppressWarnings("unchecked") public static boolean isFromHostConsole(String sender_name) { - return ((List) TFM_ConfigEntry.HOST_SENDER_NAMES.getStringList()).contains(sender_name.toLowerCase()); + return ((List) TFM_ConfigEntry.HOST_SENDER_NAMES.getList()).contains(sender_name.toLowerCase()); } public static List removeDuplicates(List old_list)