From 541fc517808729ff5cd15b4c4dd688cc9cfc482b Mon Sep 17 00:00:00 2001 From: ementalo Date: Fri, 3 Jun 2011 20:56:29 +0000 Subject: [trunk] Protect, merging changes in git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1581 e251c2fe-e539-e718-e476-b85c1f46cddb --- .../src/com/earth2me/essentials/Settings.java | 40 +++++++++++----------- .../essentials/protect/EssentialsProtect.java | 32 +++++++++-------- 2 files changed, 37 insertions(+), 35 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index 01500d850..80f7615e4 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -198,9 +198,9 @@ public class Settings implements IConf return config.getBoolean("non-ess-in-help", true); } - public HashMap getEpSettings() + public Map getEpSettings() { - HashMap epSettings = new HashMap(); + Map epSettings = new HashMap(); epSettings.put("protect.protect.signs", config.getBoolean("protect.protect.signs", true)); epSettings.put("protect.protect.rails", config.getBoolean("protect.protect.rails", true)); @@ -210,9 +210,9 @@ public class Settings implements IConf return epSettings; } - public HashMap getEpDBSettings() + public Map getEpDBSettings() { - HashMap epSettings = new HashMap(); + Map epSettings = new HashMap(); epSettings.put("protect.datatype", config.getString("protect.datatype", "sqlite")); epSettings.put("protect.username", config.getString("protect.username", "root")); epSettings.put("protect.password", config.getString("protect.password", "root")); @@ -220,9 +220,9 @@ public class Settings implements IConf return epSettings; } - public ArrayList getEpAlertOnPlacement() + public List getEpAlertOnPlacement() { - final ArrayList epAlertPlace = new ArrayList(); + final List epAlertPlace = new ArrayList(); for (String itemName : config.getString("protect.alert.on-placement", "").split(",")) { itemName = itemName.trim(); if (itemName.isEmpty()) { @@ -239,9 +239,9 @@ public class Settings implements IConf return epAlertPlace; } - public ArrayList getEpAlertOnUse() + public List getEpAlertOnUse() { - final ArrayList epAlertUse = new ArrayList(); + final List epAlertUse = new ArrayList(); for (String itemName : config.getString("protect.alert.on-use", "").split(",")) { itemName = itemName.trim(); if (itemName.isEmpty()) { @@ -258,9 +258,9 @@ public class Settings implements IConf return epAlertUse; } - public ArrayList getEpAlertOnBreak() + public List getEpAlertOnBreak() { - final ArrayList epAlertPlace = new ArrayList(); + final List epAlertPlace = new ArrayList(); for (String itemName : config.getString("protect.alert.on-break", "").split(",")) { itemName = itemName.trim(); if (itemName.isEmpty()) { @@ -277,9 +277,9 @@ public class Settings implements IConf return epAlertPlace; } - public ArrayList epBlackListPlacement() + public List epBlackListPlacement() { - final ArrayList epBlacklistPlacement = new ArrayList(); + final List epBlacklistPlacement = new ArrayList(); for (String itemName : config.getString("protect.blacklist.placement", "").split(",")) { itemName = itemName.trim(); if (itemName.isEmpty()) { @@ -296,9 +296,9 @@ public class Settings implements IConf return epBlacklistPlacement; } - public ArrayList epBlackListUsage() + public List epBlackListUsage() { - final ArrayList epBlackListUsage = new ArrayList(); + final List epBlackListUsage = new ArrayList(); for (String itemName : config.getString("protect.blacklist.usage", "").split(",")) { itemName = itemName.trim(); if (itemName.isEmpty()) { @@ -315,9 +315,9 @@ public class Settings implements IConf return epBlackListUsage; } - public HashMap getEpGuardSettings() + public Map getEpGuardSettings() { - final HashMap epSettings = new HashMap(); + final Map epSettings = new HashMap(); epSettings.put("protect.prevent.lava-flow", config.getBoolean("protect.prevent.lava-flow", false)); epSettings.put("protect.prevent.water-flow", config.getBoolean("protect.prevent.water-flow", false)); epSettings.put("protect.prevent.water-bucket-flow", config.getBoolean("protect.prevent.water-bucket-flow", false)); @@ -338,9 +338,9 @@ public class Settings implements IConf return epSettings; } - public HashMap getEpPlayerSettings() + public Map getEpPlayerSettings() { - final HashMap epPlayerSettings = new HashMap(); + final Map epPlayerSettings = new HashMap(); epPlayerSettings.put("protect.disable.fall", config.getBoolean("protect.disable.fall", false)); epPlayerSettings.put("protect.disable.pvp", config.getBoolean("protect.disable.pvp", false)); epPlayerSettings.put("protect.disable.drown", config.getBoolean("protect.disable.drown", false)); @@ -441,9 +441,9 @@ public class Settings implements IConf return epItemSpwn; } - public ArrayList epBlockBreakingBlacklist() + public ArrayList epBlockBreakingBlacklist() { - ArrayList epBreakList = new ArrayList(); + ArrayList epBreakList = new ArrayList(); for (String itemName : config.getString("protect.blacklist.break", "").split(",")) { itemName = itemName.trim(); if (itemName.isEmpty()) { diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java index 7a7772ea6..8dc8ebd10 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java @@ -12,6 +12,8 @@ import com.earth2me.essentials.protect.data.ProtectedBlockSQLite; import java.beans.PropertyVetoException; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.Location; @@ -30,16 +32,16 @@ public class EssentialsProtect extends JavaPlugin implements IConf private EssentialsProtectWeatherListener weatherListener = null; public static final String AUTHORS = Essentials.AUTHORS; private static final Logger logger = Logger.getLogger("Minecraft"); - public static HashMap genSettings = null; - public static HashMap dataSettings = null; - public static HashMap guardSettings = null; - public static HashMap playerSettings = null; - public static ArrayList usageList = null; - public static ArrayList blackListPlace = null; - public static ArrayList breakBlackList = null; - public static ArrayList onPlaceAlert = null; - public static ArrayList onUseAlert = null; - public static ArrayList onBreakAlert = null; + public static Map genSettings = null; + public static Map dataSettings = null; + public static Map guardSettings = null; + public static Map playerSettings = null; + public static List usageList = null; + public static List blackListPlace = null; + public static List breakBlackList = null; + public static List onPlaceAlert = null; + public static List onUseAlert = null; + public static List onBreakAlert = null; private IProtectedBlock storage = null; IEssentials ess = null; private static EssentialsProtect instance = null; @@ -54,8 +56,6 @@ public class EssentialsProtect extends JavaPlugin implements IConf PluginManager pm = this.getServer().getPluginManager(); ess = Essentials.getStatic(); ess.getDependancyChecker().checkProtectDependancies(); - instance = this; - reloadConfig(); playerListener = new EssentialsProtectPlayerListener(this); blockListener = new EssentialsProtectBlockListener(this); @@ -77,13 +77,15 @@ public class EssentialsProtect extends JavaPlugin implements IConf if (!this.getDescription().getVersion().equals(Essentials.getStatic().getDescription().getVersion())) { logger.log(Level.WARNING, "Version mismatch! Please update all Essentials jars to the same version."); + reloadConfig(); + Essentials.getStatic().addReloadListener(this); } - logger.info("Loaded " + this.getDescription().getName() + " build " + this.getDescription().getVersion() + " maintained by " + AUTHORS); + logger.info(Util.format("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), Essentials.AUTHORS)); } - public static boolean checkProtectionItems(ArrayList itemList, int id) + public static boolean checkProtectionItems(List itemList, int id) { - return !itemList.isEmpty() && itemList.contains(String.valueOf(id)); + return !itemList.isEmpty() && itemList.contains(id); } @Override -- cgit v1.2.3