From 7153676137a23f6780b21682456377b0f86b6fb1 Mon Sep 17 00:00:00 2001 From: snowleo Date: Tue, 3 Jan 2012 00:07:44 +0100 Subject: Starting to break Protect --- .../essentials/protect/EssentialsProtect.java | 28 ++++++++++++++-------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java') diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java index e313298cd..43975216e 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java @@ -1,9 +1,6 @@ package com.earth2me.essentials.protect; import com.earth2me.essentials.protect.data.IProtectedBlock; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; import java.util.logging.Filter; import java.util.logging.Level; import java.util.logging.LogRecord; @@ -20,11 +17,12 @@ public class EssentialsProtect extends JavaPlugin implements IProtect { private static final Logger LOGGER = Logger.getLogger("Minecraft"); private static com.mchange.v2.log.MLogger C3P0logger; - private final transient Map settingsBoolean = new EnumMap(ProtectConfig.class); - private final transient Map settingsString = new EnumMap(ProtectConfig.class); - private final transient Map> settingsList = new EnumMap>(ProtectConfig.class); + //private final transient Map settingsBoolean = new EnumMap(ProtectConfig.class); + //private final transient Map settingsString = new EnumMap(ProtectConfig.class); + //private final transient Map> settingsList = new EnumMap>(ProtectConfig.class); private transient IProtectedBlock storage = null; private transient EssentialsConnect ess = null; + private transient ProtectHolder settings = null; @Override public void onLoad() @@ -95,12 +93,12 @@ public class EssentialsProtect extends JavaPlugin implements IProtect LOGGER.log(Level.SEVERE, "Essentials not installed or failed to load. Essenials Protect is in emergency mode now."); } - @Override + /*@Override public boolean checkProtectionItems(final ProtectConfig list, final int id) { final List itemList = settingsList.get(list); return itemList != null && !itemList.isEmpty() && itemList.contains(id); - } + }*/ @Override public IProtectedBlock getStorage() @@ -119,7 +117,7 @@ public class EssentialsProtect extends JavaPlugin implements IProtect return ess; } - public Map getSettingsBoolean() + /*public Map getSettingsBoolean() { return settingsBoolean; } @@ -146,7 +144,7 @@ public class EssentialsProtect extends JavaPlugin implements IProtect { final String str = settingsString.get(protectConfig); return str == null ? protectConfig.getDefaultValueString() : str; - } + }*/ public void onDisable() { @@ -163,4 +161,14 @@ public class EssentialsProtect extends JavaPlugin implements IProtect { } } + + public ProtectHolder getSettings() + { + return settings; + } + + public void setSettings(final ProtectHolder settings) + { + this.settings = settings; + } } -- cgit v1.2.3 From c689b55c4ddff6483799e021334e403db745562e Mon Sep 17 00:00:00 2001 From: KHobbits Date: Wed, 25 Jan 2012 23:53:31 +0000 Subject: Fix depends --- .../src/com/earth2me/essentials/protect/EssentialsProtect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java') diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java index 75a462888..4f392e141 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java @@ -38,7 +38,7 @@ public class EssentialsProtect extends JavaPlugin implements IProtect public void onEnable() { final PluginManager pm = this.getServer().getPluginManager(); - final Plugin essPlugin = pm.getPlugin("Essentials"); + final Plugin essPlugin = pm.getPlugin("Essentials3"); if (essPlugin == null || !essPlugin.isEnabled()) { enableEmergencyMode(pm); -- cgit v1.2.3 From 7b8a9d60d7da4cba5013671920b1064f711b4538 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 2 Mar 2012 21:48:03 +1100 Subject: I honestly have no idea if this works, but on paper it does. Will be great, now to figure out how to test. --- .../essentials/protect/EssentialsProtect.java | 84 +++++----------------- 1 file changed, 17 insertions(+), 67 deletions(-) (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java') diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java index 72000eeba..5c3e3eab7 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java @@ -1,9 +1,7 @@ package com.earth2me.essentials.protect; import com.earth2me.essentials.protect.data.IProtectedBlock; -import java.util.logging.Filter; import java.util.logging.Level; -import java.util.logging.LogRecord; import java.util.logging.Logger; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; @@ -14,7 +12,6 @@ import org.bukkit.plugin.java.JavaPlugin; public class EssentialsProtect extends JavaPlugin implements IProtect { private static final Logger LOGGER = Logger.getLogger("Minecraft"); - private static com.mchange.v2.log.MLogger C3P0logger; //private final transient Map settingsBoolean = new EnumMap(ProtectConfig.class); //private final transient Map settingsString = new EnumMap(ProtectConfig.class); //private final transient Map> settingsList = new EnumMap>(ProtectConfig.class); @@ -23,18 +20,6 @@ public class EssentialsProtect extends JavaPlugin implements IProtect private transient ProtectHolder settings = null; @Override - public void onLoad() - { - C3P0logger = com.mchange.v2.log.MLog.getLogger(com.mchange.v2.c3p0.impl.AbstractPoolBackedDataSource.class); - C3P0logger.setFilter(new Filter() - { - public boolean isLoggable(LogRecord lr) - { - return lr.getLevel() != Level.INFO; - } - }); - } - public void onEnable() { final PluginManager pm = this.getServer().getPluginManager(); @@ -71,13 +56,10 @@ public class EssentialsProtect extends JavaPlugin implements IProtect LOGGER.log(Level.SEVERE, "Essentials not installed or failed to load. Essenials Protect is in emergency mode now."); } - /*@Override - public boolean checkProtectionItems(final ProtectConfig list, final int id) - { - final List itemList = settingsList.get(list); - return itemList != null && !itemList.isEmpty() && itemList.contains(id); - }*/ - + /* + * @Override public boolean checkProtectionItems(final ProtectConfig list, final int id) { final List + * itemList = settingsList.get(list); return itemList != null && !itemList.isEmpty() && itemList.contains(id); } + */ @Override public IProtectedBlock getStorage() { @@ -94,52 +76,20 @@ public class EssentialsProtect extends JavaPlugin implements IProtect { return ess; } - - /*public Map getSettingsBoolean() - { - return settingsBoolean; - } - - public Map getSettingsString() - { - return settingsString; - } - - public Map> getSettingsList() - { - return settingsList; - } - - @Override - public boolean getSettingBool(final ProtectConfig protectConfig) - { - final Boolean bool = settingsBoolean.get(protectConfig); - return bool == null ? protectConfig.getDefaultValueBoolean() : bool; - } - - @Override - public String getSettingString(final ProtectConfig protectConfig) - { - final String str = settingsString.get(protectConfig); - return str == null ? protectConfig.getDefaultValueString() : str; - }*/ - - public void onDisable() - { - if (storage != null) - { - storage.onPluginDeactivation(); - } - // Sleep for a second to allow the database to close. - try - { - Thread.sleep(1000); - } - catch (InterruptedException ex) - { - } - } + /* + * public Map getSettingsBoolean() { return settingsBoolean; } + * + * public Map getSettingsString() { return settingsString; } + * + * public Map> getSettingsList() { return settingsList; } + * + * @Override public boolean getSettingBool(final ProtectConfig protectConfig) { final Boolean bool = + * settingsBoolean.get(protectConfig); return bool == null ? protectConfig.getDefaultValueBoolean() : bool; } + * + * @Override public String getSettingString(final ProtectConfig protectConfig) { final String str = + * settingsString.get(protectConfig); return str == null ? protectConfig.getDefaultValueString() : str; } + */ public ProtectHolder getSettings() { return settings; -- cgit v1.2.3 From 22a37a0c1bfdad81196a38e23c120e9ddee4b43f Mon Sep 17 00:00:00 2001 From: snowleo Date: Sat, 3 Mar 2012 02:40:22 +0100 Subject: Revert "I honestly have no idea if this works, but on paper it does. Will be great, now to figure out how to test." until there is a real alternative. This reverts commit 7b8a9d60d7da4cba5013671920b1064f711b4538. --- .../essentials/protect/EssentialsProtect.java | 84 +++++++++++++++++----- 1 file changed, 67 insertions(+), 17 deletions(-) (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java') diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java index 5c3e3eab7..72000eeba 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java @@ -1,7 +1,9 @@ package com.earth2me.essentials.protect; import com.earth2me.essentials.protect.data.IProtectedBlock; +import java.util.logging.Filter; import java.util.logging.Level; +import java.util.logging.LogRecord; import java.util.logging.Logger; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; @@ -12,6 +14,7 @@ import org.bukkit.plugin.java.JavaPlugin; public class EssentialsProtect extends JavaPlugin implements IProtect { private static final Logger LOGGER = Logger.getLogger("Minecraft"); + private static com.mchange.v2.log.MLogger C3P0logger; //private final transient Map settingsBoolean = new EnumMap(ProtectConfig.class); //private final transient Map settingsString = new EnumMap(ProtectConfig.class); //private final transient Map> settingsList = new EnumMap>(ProtectConfig.class); @@ -20,6 +23,18 @@ public class EssentialsProtect extends JavaPlugin implements IProtect private transient ProtectHolder settings = null; @Override + public void onLoad() + { + C3P0logger = com.mchange.v2.log.MLog.getLogger(com.mchange.v2.c3p0.impl.AbstractPoolBackedDataSource.class); + C3P0logger.setFilter(new Filter() + { + public boolean isLoggable(LogRecord lr) + { + return lr.getLevel() != Level.INFO; + } + }); + } + public void onEnable() { final PluginManager pm = this.getServer().getPluginManager(); @@ -56,10 +71,13 @@ public class EssentialsProtect extends JavaPlugin implements IProtect LOGGER.log(Level.SEVERE, "Essentials not installed or failed to load. Essenials Protect is in emergency mode now."); } - /* - * @Override public boolean checkProtectionItems(final ProtectConfig list, final int id) { final List - * itemList = settingsList.get(list); return itemList != null && !itemList.isEmpty() && itemList.contains(id); } - */ + /*@Override + public boolean checkProtectionItems(final ProtectConfig list, final int id) + { + final List itemList = settingsList.get(list); + return itemList != null && !itemList.isEmpty() && itemList.contains(id); + }*/ + @Override public IProtectedBlock getStorage() { @@ -76,20 +94,52 @@ public class EssentialsProtect extends JavaPlugin implements IProtect { return ess; } + + /*public Map getSettingsBoolean() + { + return settingsBoolean; + } + + public Map getSettingsString() + { + return settingsString; + } + + public Map> getSettingsList() + { + return settingsList; + } + + @Override + public boolean getSettingBool(final ProtectConfig protectConfig) + { + final Boolean bool = settingsBoolean.get(protectConfig); + return bool == null ? protectConfig.getDefaultValueBoolean() : bool; + } + + @Override + public String getSettingString(final ProtectConfig protectConfig) + { + final String str = settingsString.get(protectConfig); + return str == null ? protectConfig.getDefaultValueString() : str; + }*/ + + public void onDisable() + { + if (storage != null) + { + storage.onPluginDeactivation(); + } + // Sleep for a second to allow the database to close. + try + { + Thread.sleep(1000); + } + catch (InterruptedException ex) + { + } + } - /* - * public Map getSettingsBoolean() { return settingsBoolean; } - * - * public Map getSettingsString() { return settingsString; } - * - * public Map> getSettingsList() { return settingsList; } - * - * @Override public boolean getSettingBool(final ProtectConfig protectConfig) { final Boolean bool = - * settingsBoolean.get(protectConfig); return bool == null ? protectConfig.getDefaultValueBoolean() : bool; } - * - * @Override public String getSettingString(final ProtectConfig protectConfig) { final String str = - * settingsString.get(protectConfig); return str == null ? protectConfig.getDefaultValueString() : str; } - */ public ProtectHolder getSettings() { return settings; -- cgit v1.2.3