Cleanup :: Standardize import organization :: lots of comments :: remove unused eco systems

14 files changed, 29 insertions, 31 deletions

diff --git a/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java b/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java
index b2da16187..a4629ce14 100644
--- a/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java
+++ b/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java
@@ -3,16 +3,16 @@ package net.ess3.update;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import net.ess3.update.chat.*;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerChatEvent;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
-import net.ess3.update.chat.*;
 
 
 public class EssentialsHelp implements Listener
@@ -154,8 +154,9 @@ public class EssentialsHelp implements Listener
 		ircBot = new IrcBot(player, "Ess_" + player.getName(), UsernameUtil.createUsername(player));
 	}
 
+	//Todo: make sure this is threadsafe
 	@EventHandler
-	public void onPlayerChat(final PlayerChatEvent event)
+	public void onPlayerChat(final AsyncPlayerChatEvent event)
 	{
 		if (event.getPlayer() == chatUser)
 		{
diff --git a/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java b/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java
index 901696a14..8e8b3e7ed 100644
--- a/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java
+++ b/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java
@@ -49,7 +49,7 @@ public class UpdateCheck
 
 	public void scheduleUpdateTask()
 	{
-		plugin.getServer().getScheduler().scheduleAsyncRepeatingTask(
+		plugin.getServer().getScheduler().scheduleAsyncRepeatingTask( //should probably not be async
 				plugin, new Runnable()
 		{
 			@Override
diff --git a/EssentialsUpdate/src/net/ess3/update/UpdateFile.java b/EssentialsUpdate/src/net/ess3/update/UpdateFile.java
index 7a44a2ade..a369ad44e 100644
--- a/EssentialsUpdate/src/net/ess3/update/UpdateFile.java
+++ b/EssentialsUpdate/src/net/ess3/update/UpdateFile.java
@@ -53,7 +53,6 @@ public class UpdateFile
 		catch (Exception ex)
 		{
 			LOGGER.log(Level.SEVERE, "Could not load update.yml!");
-			return;
 		}
 	}
 
diff --git a/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java b/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java
index 774dd4ac1..0e9f59283 100644
--- a/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java
+++ b/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java
@@ -1,18 +1,18 @@
 package net.ess3.update;
 
 import java.util.logging.Level;
+import net.ess3.update.states.InstallationFinishedEvent;
+import net.ess3.update.states.StateMachine;
+import net.ess3.update.tasks.SelfUpdate;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerChatEvent;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.plugin.Plugin;
-import net.ess3.update.states.InstallationFinishedEvent;
-import net.ess3.update.states.StateMachine;
-import net.ess3.update.tasks.SelfUpdate;
 
 
 // TODO: This whole thing should make use of the conversations api
@@ -96,9 +96,9 @@ public class UpdateProcess implements Listener
 	{
 		UpdateProcess.this.currentPlayer = null;
 	}
-
+    //TODO: make sure this is threadsafe
 	@EventHandler(priority = EventPriority.LOWEST)
-	public void onPlayerChat(final PlayerChatEvent event)
+	public void onPlayerChat(final AsyncPlayerChatEvent event)
 	{
 		if (event.getPlayer() == currentPlayer)
 		{
@@ -113,7 +113,6 @@ public class UpdateProcess implements Listener
 				startWork();
 			}
 			event.setCancelled(true);
-			return;
 		}
 	}
 
diff --git a/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java
index d01d0790f..fff363835 100644
--- a/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java
+++ b/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java
@@ -2,8 +2,8 @@ package net.ess3.update.chat;
 
 import java.io.*;
 import java.nio.charset.Charset;
-import org.bukkit.plugin.Plugin;
 import net.ess3.update.PastieUpload;
+import org.bukkit.plugin.Plugin;
 
 
 public abstract class AbstractFileCommand implements Command
diff --git a/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java b/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java
index ba202c1ff..783ba19a1 100644
--- a/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java
@@ -1,7 +1,7 @@
 package net.ess3.update.states;
 
-import org.bukkit.entity.Player;
 import net.ess3.update.AbstractWorkListener;
+import org.bukkit.entity.Player;
 
 
 public abstract class AbstractState
diff --git a/EssentialsUpdate/src/net/ess3/update/states/Changelog.java b/EssentialsUpdate/src/net/ess3/update/states/Changelog.java
index 033106041..eccc4548a 100644
--- a/EssentialsUpdate/src/net/ess3/update/states/Changelog.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/Changelog.java
@@ -1,9 +1,9 @@
 package net.ess3.update.states;
 
 import java.util.List;
-import org.bukkit.entity.Player;
 import net.ess3.update.UpdateCheck;
 import net.ess3.update.VersionInfo;
+import org.bukkit.entity.Player;
 
 
 public class Changelog extends AbstractState
diff --git a/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java
index 9fa9d763c..a62735f5e 100644
--- a/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java
@@ -1,10 +1,10 @@
 package net.ess3.update.states;
 
+import net.ess3.update.AbstractWorkListener;
+import net.ess3.update.tasks.InstallModule;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
-import net.ess3.update.AbstractWorkListener;
-import net.ess3.update.tasks.InstallModule;
 
 
 public class EssentialsChat extends AbstractYesNoState
diff --git a/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java
index 7ac34fa22..6d91a0cb9 100644
--- a/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java
@@ -1,10 +1,10 @@
 package net.ess3.update.states;
 
+import net.ess3.update.AbstractWorkListener;
+import net.ess3.update.tasks.InstallModule;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
-import net.ess3.update.AbstractWorkListener;
-import net.ess3.update.tasks.InstallModule;
 
 
 public class EssentialsGeoIP extends AbstractYesNoState
diff --git a/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java
index e2c33cd9b..bdc9984a2 100644
--- a/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java
@@ -1,10 +1,10 @@
 package net.ess3.update.states;
 
+import net.ess3.update.AbstractWorkListener;
+import net.ess3.update.tasks.InstallModule;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
-import net.ess3.update.AbstractWorkListener;
-import net.ess3.update.tasks.InstallModule;
 
 
 public class EssentialsProtect extends AbstractYesNoState
diff --git a/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java b/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java
index 76bfec87e..c9dbb1f6a 100644
--- a/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java
@@ -1,11 +1,11 @@
 package net.ess3.update.states;
 
 import java.util.Iterator;
+import net.ess3.update.AbstractWorkListener;
+import net.ess3.update.UpdateCheck;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
-import net.ess3.update.AbstractWorkListener;
-import net.ess3.update.UpdateCheck;
 
 
 public class StateMachine extends AbstractWorkListener implements Runnable
@@ -90,7 +90,7 @@ public class StateMachine extends AbstractWorkListener implements Runnable
 	public void startWork()
 	{
 		iterator = states.values().iterator();
-		Bukkit.getScheduler().scheduleAsyncDelayedTask(getPlugin(), this);
+		Bukkit.getScheduler().scheduleAsyncDelayedTask(getPlugin(), this); //Should this be async? (method deprecated)
 	}
 
 	@Override
@@ -149,7 +149,7 @@ public class StateMachine extends AbstractWorkListener implements Runnable
 				{
 					StateMachine.this.player.sendMessage(message);
 				}
-				Bukkit.getScheduler().scheduleAsyncDelayedTask(getPlugin(), StateMachine.this);
+				Bukkit.getScheduler().scheduleAsyncDelayedTask(getPlugin(), StateMachine.this); //Should this be async? (method deprecated)
 			}
 		});
 	}
diff --git a/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java b/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java
index 4a4b9e862..bc043c6de 100644
--- a/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java
@@ -1,7 +1,7 @@
 package net.ess3.update.states;
 
-import org.bukkit.entity.Player;
 import net.ess3.update.UpdateCheck;
+import org.bukkit.entity.Player;
 
 
 public class UpdateOrInstallation extends AbstractState
diff --git a/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java b/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java
index c6df0cae7..82e906d90 100644
--- a/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java
+++ b/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java
@@ -3,11 +3,11 @@ package net.ess3.update.tasks;
 import java.io.File;
 import java.net.URL;
 import java.util.logging.Level;
-import org.bukkit.Bukkit;
 import net.ess3.update.AbstractWorkListener;
 import net.ess3.update.GetFile;
 import net.ess3.update.ModuleInfo;
 import net.ess3.update.VersionInfo;
+import org.bukkit.Bukkit;
 
 
 public class InstallModule implements Runnable, Task
@@ -31,7 +31,7 @@ public class InstallModule implements Runnable, Task
 	@Override
 	public void start()
 	{
-		Bukkit.getScheduler().scheduleAsyncDelayedTask(listener.getPlugin(), this);
+		Bukkit.getScheduler().scheduleAsyncDelayedTask(listener.getPlugin(), this); //Should this be async? (method deprecated)
 	}
 
 	@Override
@@ -55,7 +55,6 @@ public class InstallModule implements Runnable, Task
 		{
 			Bukkit.getLogger().log(Level.SEVERE, "Failed to download module " + moduleName + " to " + fileName, ex);
 			listener.onWorkAbort("An error occured, please check your server log.");
-			return;
 		}
 	}
 }
diff --git a/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java b/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java
index 2ff6da55c..31d45e741 100644
--- a/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java
+++ b/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java
@@ -1,7 +1,7 @@
 package net.ess3.update.tasks;
 
-import org.bukkit.Bukkit;
 import net.ess3.update.AbstractWorkListener;
+import org.bukkit.Bukkit;
 
 
 public class SelfUpdate extends AbstractWorkListener implements Task, Runnable
@@ -44,7 +44,7 @@ public class SelfUpdate extends AbstractWorkListener implements Task, Runnable
 	@Override
 	public void run()
 	{
-		Bukkit.getScheduler().scheduleAsyncDelayedTask(
+		Bukkit.getScheduler().scheduleAsyncDelayedTask( //Should this be async? (method deprecated)
 				getPlugin(), new Runnable()
 		{
 			@Override