Removing load info, bucket displays that now.

15 files changed, 7 insertions, 48 deletions

diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index c0c72abca..7e413f9cf 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -232,7 +232,6 @@ public class Essentials extends JavaPlugin implements IEssentials
 		getScheduler().scheduleSyncRepeatingTask(this, timer, 1, 100);
 		Economy.setEss(this);
 		execTimer.mark("RegListeners");
-		LOGGER.info(_("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), Util.joinList(this.getDescription().getAuthors())));
 		final String timeroutput = execTimer.end();
 		if (getSettings().isDebug())
 		{
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 56da9bbec..b39cfce0e 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -169,7 +169,6 @@ listAmount = \u00a79There are \u00a7c{0}\u00a79 out of maximum \u00a7c{1}\u00a79
 listAmountHidden = \u00a79There are \u00a7c{0}\u00a77/{1}\u00a79 out of maximum \u00a7c{2}\u00a79 players online.
 listHiddenTag = \u00a77[HIDDEN]\u00a7f
 loadWarpError=Failed to load warp {0}
-loadinfo=Loaded {0} build {1} by: {2}
 localFormat=Local: <{0}> {1}
 mailClear=\u00a7cTo mark your mail as read, type /mail clear
 mailCleared=\u00a77Mail Cleared!
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index ea2007b17..1b0aa75c6 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -169,7 +169,6 @@ listAmount = \u00a79Der er \u00a7c{0}\u00a79 ud af maksimum\u00a7c{1}\u00a79 spi
 listAmountHidden = \u00a79Der er \u00a7c{0}\u00a77/{1}\u00a79 ud af maksimum \u00a7c{2}\u00a79 spillere online.
 listHiddenTag = \u00a77[HIDDEN]\u00a7f
 loadWarpError=Kunne ikke l\u00c3\u00a6se warp {0}
-loadinfo=Loadede {0} build {1} af {2}
 localFormat=Local: <{0}> {1}
 mailClear=\u00a7cFor at markere din flaskepost som l\u00e6st, skriv /mail clear
 mailCleared=\u00a77Flaskepot ryddet!
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index 204625fd1..ac75b24cb 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -169,7 +169,6 @@ listAmount = \u00a79Es sind \u00a7c{0}\u00a79 von maximal \u00a7c{1}\u00a79 Spie
 listAmountHidden = \u00a79Es sind \u00a7c{0}\u00a77/{1}\u00a79 von maximal \u00a7c{2}\u00a79 Spielern online.
 listHiddenTag = \u00a77[Versteckt]\u00a7f
 loadWarpError=Fehler beim Laden von Warp-Punkt {0}
-loadinfo=Plugin {0} Version {1} geladen, erstellt von {2}, \u00fcbersetzt von snowleo
 localFormat=Lokal: <{0}> {1}
 mailClear=\u00a7cUm deine Nachrichten zu l\u00f6schen, schreibe /mail clear
 mailCleared=\u00a77Nachrichten gel\u00f6scht!
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 9476b8bcf..d9cc9a658 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -169,7 +169,6 @@ listAmount = \u00a79There are \u00a7c{0}\u00a79 out of maximum \u00a7c{1}\u00a79
 listAmountHidden = \u00a79There are \u00a7c{0}\u00a77/{1}\u00a79 out of maximum \u00a7c{2}\u00a79 players online.
 listHiddenTag = \u00a77[HIDDEN]\u00a7f
 loadWarpError=Failed to load warp {0}
-loadinfo=Loaded {0} build {1} by: {2}
 localFormat=Local: <{0}> {1}
 mailClear=\u00a7cTo mark your mail as read, type /mail clear
 mailCleared=\u00a77Mail Cleared!
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
index def9d9fb1..222adc2a0 100644
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@@ -169,7 +169,6 @@ listAmount = \u00a79There are \u00a7c{0}\u00a79 out of maximum \u00a7c{1}\u00a79
 listAmountHidden = \u00a79There are \u00a7c{0}\u00a77/{1}\u00a79 out of maximum \u00a7c{2}\u00a79 players online.
 listHiddenTag = \u00a77[HIDDEN]\u00a7f
 loadWarpError=Error al cargar el tenetransporte {0}
-loadinfo=Cargado {0}, construido {1} por: {2}
 localFormat=Local: <{0}> {1}
 mailClear=\u00a7cPara marcar tu email como leido, escribe /mail clear
 mailCleared=\u00a77Email limpiado!
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index b73603e4f..a3695080e 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -169,7 +169,6 @@ listAmount = \u00a79Il y a \u00a7c{0}\u00a79 joueurs en ligne sur \u00a7c{1}\u00
 listAmountHidden = \u00a79Il y a \u00a7c{0}\u00a77/{1}\u00a79 sur un maximum de \u00a7c{2}\u00a79 joueurs en ligne.
 listHiddenTag = \u00a77[MASQU\u00c9]\u00a7f
 loadWarpError=\u00c9chec du chargement du raccourci {0}
-loadinfo={0} version {1} par {2} a \u00e9t\u00e9 charg\u00e9
 localFormat=Locale :<{0}> {1}
 mailClear=\u00a7cPour marquer votre courrier en tant que lu, entrez /mail clear
 mailCleared=\u00a77Courrier supprim\u00e9 !
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index 546169060..f7253fd3e 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -169,7 +169,6 @@ listAmount = \u00a79There are \u00a7c{0}\u00a79 out of maximum \u00a7c{1}\u00a79
 listAmountHidden = \u00a79There are \u00a7c{0}\u00a77/{1}\u00a79 out of maximum \u00a7c{2}\u00a79 players online.
 listHiddenTag = \u00a77[HIDDEN]\u00a7f
 loadWarpError=Fout bij het laden van warp {0}
-loadinfo=Build {1} geladen {0} van {2}
 localFormat=Local: <{0}> {1}
 mailClear=\u00a7cType /mail clear, om ej berichten als gelezen te markeren.
 mailCleared=\u00a77Bericht geklaard!
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
index a81525f83..21a71f046 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
@@ -45,7 +45,6 @@ public class EssentialsChat extends JavaPlugin
 		pluginManager.registerEvents(playerListenerNormal, this);
 		pluginManager.registerEvents(playerListenerHighest, this);
 
-		LOGGER.info(_("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team"));
 	}
 
 	@Override
diff --git a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
index 5700a7472..eb401c6db 100644
--- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
+++ b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
@@ -3,17 +3,12 @@ package com.earth2me.essentials.geoip;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.IEssentials;
 import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.event.Event.Priority;
-import org.bukkit.event.Event.Type;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
 
 public class EssentialsGeoIP extends JavaPlugin
 {
-	private static final Logger logger = Logger.getLogger("Minecraft");
-
 	public EssentialsGeoIP()
 	{
 	}
@@ -30,7 +25,7 @@ public class EssentialsGeoIP extends JavaPlugin
 		final IEssentials ess = (IEssentials)pm.getPlugin("Essentials");
 		if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion()))
 		{
-			logger.log(Level.WARNING, _("versionMismatchAll"));
+			getLogger().log(Level.WARNING, _("versionMismatchAll"));
 		}
 		if (!ess.isEnabled()) {
 			this.setEnabled(false);
@@ -39,8 +34,7 @@ public class EssentialsGeoIP extends JavaPlugin
 		final EssentialsGeoIPPlayerListener playerListener = new EssentialsGeoIPPlayerListener(getDataFolder(), ess);
 		pm.registerEvents(playerListener, this);
 
-		logger.info(_("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team"));
 
-		logger.log(Level.INFO, "This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/.");
+		getLogger().log(Level.INFO, "This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/.");
 	}
 }
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
index 569123cd5..7503c334c 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
@@ -32,8 +32,6 @@ public class EssentialsConnect
 		ProtectReloader pr = new ProtectReloader();
 		pr.reloadConfig();
 		ess.addReloadListener(pr);
-		LOGGER.info(_("loadinfo", essProtect.getDescription().getName(), essProtect.getDescription().getVersion(), "essentials team"));
-
 	}
 
 	public void onDisable()
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
index 095296531..983ba0f80 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
@@ -9,8 +9,6 @@ import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event.Priority;
-import org.bukkit.event.Event.Type;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -51,29 +49,16 @@ public class EssentialsProtect extends JavaPlugin implements IProtect
 		ess = new EssentialsConnect(essPlugin, this);
 
 		final EssentialsProtectPlayerListener playerListener = new EssentialsProtectPlayerListener(this);
-		pm.registerEvent(Type.PLAYER_INTERACT, playerListener, Priority.Low, this);
+		pm.registerEvents(playerListener, this);
 
 		final EssentialsProtectBlockListener blockListener = new EssentialsProtectBlockListener(this);
-		pm.registerEvent(Type.BLOCK_PLACE, blockListener, Priority.Highest, this);
-		pm.registerEvent(Type.BLOCK_FROMTO, blockListener, Priority.Highest, this);
-		pm.registerEvent(Type.BLOCK_IGNITE, blockListener, Priority.Highest, this);
-		pm.registerEvent(Type.BLOCK_BURN, blockListener, Priority.Highest, this);
-		pm.registerEvent(Type.BLOCK_BREAK, blockListener, Priority.Highest, this);
-		pm.registerEvent(Type.BLOCK_PISTON_EXTEND, blockListener, Priority.Highest, this);
-		pm.registerEvent(Type.BLOCK_PISTON_RETRACT, blockListener, Priority.Highest, this);
+		pm.registerEvents(blockListener, this);
 
 		final EssentialsProtectEntityListener entityListener = new EssentialsProtectEntityListener(this);
-		pm.registerEvent(Type.ENTITY_EXPLODE, entityListener, Priority.Highest, this);
-		pm.registerEvent(Type.ENTITY_DAMAGE, entityListener, Priority.Highest, this);
-		pm.registerEvent(Type.CREATURE_SPAWN, entityListener, Priority.Highest, this);
-		pm.registerEvent(Type.ENTITY_TARGET, entityListener, Priority.Highest, this);
-		pm.registerEvent(Type.EXPLOSION_PRIME, entityListener, Priority.Highest, this);
-		pm.registerEvent(Type.ENDERMAN_PICKUP, entityListener, Priority.Highest, this);
+		pm.registerEvents(entityListener, this);
 
 		final EssentialsProtectWeatherListener weatherListener = new EssentialsProtectWeatherListener(this);
-		pm.registerEvent(Type.LIGHTNING_STRIKE, weatherListener, Priority.Highest, this);
-		pm.registerEvent(Type.THUNDER_CHANGE, weatherListener, Priority.Highest, this);
-		pm.registerEvent(Type.WEATHER_CHANGE, weatherListener, Priority.Highest, this);
+		pm.registerEvents(weatherListener, this);
 	}
 
 	private void enableEmergencyMode(final PluginManager pm)
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
index 6b49e70d8..401bf345d 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
@@ -24,7 +24,7 @@ public class EssentialsProtectPlayerListener implements Listener
 		this.ess = prot.getEssentialsConnect().getEssentials();
 	}
 
-	@EventHandler(priority = EventPriority.HIGHEST)
+	@EventHandler(priority = EventPriority.LOW)
 	public void onPlayerInteract(final PlayerInteractEvent event)
 	{
 		// Do not return if cancelled, because the interact event has 2 cancelled states.
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
index 565764aa6..f0c5ee466 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
@@ -2,15 +2,12 @@ package com.earth2me.essentials.spawn;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.IEssentials;
-import com.earth2me.essentials.IEssentialsModule;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.Event;
-import org.bukkit.event.Event.Priority;
-import org.bukkit.event.Event.Type;
 import org.bukkit.event.EventException;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
@@ -60,8 +57,6 @@ public class EssentialsSpawn extends JavaPlugin
 				((EssentialsSpawnPlayerListener)ll).onPlayerJoin((PlayerJoinEvent)event);
 			}
 		}, this);
-
-		LOGGER.info(_("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team"));
 	}
 
 	public void onDisable()
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
index 65925c00a..b5c011e55 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
@@ -10,8 +10,6 @@ import java.util.logging.Logger;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event.Priority;
-import org.bukkit.event.Event.Type;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -54,8 +52,6 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP
 
 		ess.addReloadListener(users);
 		ess.addReloadListener(xmpp);
-
-		LOGGER.info(_("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team"));
 	}
 
 	@Override