40 files changed, 120 insertions, 152 deletions
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsSpawn.java b/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsSpawn.java
deleted file mode 100644
index 2a87638ba..000000000
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsSpawn.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.earth2me.essentials.update.states;
-
-import com.earth2me.essentials.update.AbstractWorkListener;
-import com.earth2me.essentials.update.tasks.InstallModule;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-
-public class EssentialsSpawn extends AbstractYesNoState
-{
-	public EssentialsSpawn(final StateMap states)
-	{
-		super(states, null);
-	}
-
-	@Override
-	public boolean guessAnswer()
-	{
-		final Plugin plugin = Bukkit.getPluginManager().getPlugin("EssentialsSpawn");
-		if (plugin != null)
-		{
-			setAnswer(true);
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public void askQuestion(final Player sender)
-	{
-		sender.sendMessage("Do you want to install EssentialsSpawn? (yes/no)");
-		sender.sendMessage("EssentialsSpawn lets you control player spawning");
-		sender.sendMessage("It allows you to set different places where players spawn on death, new players join and allows players to return to spawn.");
-	}
-
-	@Override
-	public void doWork(final AbstractWorkListener listener)
-	{
-		if (getAnswer())
-		{
-			new InstallModule(listener, "EssentialsSpawn").start();
-			return;
-		}
-		listener.onWorkDone();
-	}
-}
-\ No newline at end of file
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/InstallationFinishedEvent.java b/EssentialsUpdate/src/com/earth2me/essentials/update/states/InstallationFinishedEvent.java
deleted file mode 100644
index 2f27421f9..000000000
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/InstallationFinishedEvent.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.earth2me.essentials.update.states;
-
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-
-public class InstallationFinishedEvent extends Event
-{
-    private static final HandlerList handlers = new HandlerList();
-
-    @Override
-    public HandlerList getHandlers()
-    {
-        return handlers;
-    }
-}
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/Task.java b/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/Task.java
deleted file mode 100644
index 3f1d572ed..000000000
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/Task.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.earth2me.essentials.update.tasks;
-
-
-public interface Task
-{
-	void start();
-}
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/AbstractWorkListener.java b/EssentialsUpdate/src/net/ess3/update/AbstractWorkListener.java
index d2cbb8a64..7a927d4db 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/AbstractWorkListener.java
+++ b/EssentialsUpdate/src/net/ess3/update/AbstractWorkListener.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update;
+package net.ess3.update;
 
 import org.bukkit.plugin.Plugin;
 
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsHelp.java b/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java
index 7dd46451a..0d433ecc0 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsHelp.java
+++ b/EssentialsUpdate/src/net/ess3/update/EssentialsHelp.java
@@ -1,6 +1,6 @@
-package com.earth2me.essentials.update;
+package net.ess3.update;
 
-import com.earth2me.essentials.update.chat.*;
+import net.ess3.update.chat.*;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsUpdate.java b/EssentialsUpdate/src/net/ess3/update/EssentialsUpdate.java
index be6e42ce9..33875423a 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsUpdate.java
+++ b/EssentialsUpdate/src/net/ess3/update/EssentialsUpdate.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update;
+package net.ess3.update;
 
 import java.util.logging.Level;
 import org.bukkit.Bukkit;
@@ -27,8 +27,6 @@ public class EssentialsUpdate extends JavaPlugin
 		updateProcess = new UpdateProcess(this, updateCheck);
 		updateProcess.registerEvents();
 
-		Bukkit.getLogger().log(Level.INFO, "EssentialsUpdate {0} loaded.", getDescription().getVersion());
-
 		if (updateCheck.isEssentialsInstalled())
 		{
 			updateCheck.scheduleUpdateTask();
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/GetFile.java b/EssentialsUpdate/src/net/ess3/update/GetFile.java
index 06b414e93..9636e3bd1 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/GetFile.java
+++ b/EssentialsUpdate/src/net/ess3/update/GetFile.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update;
+package net.ess3.update;
 
 import java.io.*;
 import java.math.BigInteger;
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/ModuleInfo.java b/EssentialsUpdate/src/net/ess3/update/ModuleInfo.java
index 722fca3e1..993575cbf 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/ModuleInfo.java
+++ b/EssentialsUpdate/src/net/ess3/update/ModuleInfo.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update;
+package net.ess3.update;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/PastieUpload.java b/EssentialsUpdate/src/net/ess3/update/PastieUpload.java
index 6cad44e4d..9fba2351d 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/PastieUpload.java
+++ b/EssentialsUpdate/src/net/ess3/update/PastieUpload.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update;
+package net.ess3.update;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -37,4 +37,4 @@ public class PastieUpload
 			throw new IOException("Failed to upload to pastie.org");
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/PostToUrl.java b/EssentialsUpdate/src/net/ess3/update/PostToUrl.java
index c8978961b..28fc13c55 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/PostToUrl.java
+++ b/EssentialsUpdate/src/net/ess3/update/PostToUrl.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update;
+package net.ess3.update;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateCheck.java b/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java
index 29afc4d3f..98a9983e8 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateCheck.java
+++ b/EssentialsUpdate/src/net/ess3/update/UpdateCheck.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update;
+package net.ess3.update;
 
 import java.io.File;
 import java.util.Map;
@@ -31,7 +31,7 @@ public class UpdateCheck
 	private void checkForEssentials()
 	{
 		final PluginManager pluginManager = plugin.getServer().getPluginManager();
-		final Plugin essentials = pluginManager.getPlugin("Essentials");
+		final Plugin essentials = pluginManager.getPlugin("Essentials-3");
 		essentialsInstalled = essentials != null;
 		if (essentialsInstalled)
 		{
@@ -187,10 +187,10 @@ public class UpdateCheck
 
 	private int getBukkitVersion()
 	{
-		final Matcher versionMatch = Pattern.compile("git-Bukkit-([0-9]+).([0-9]+).([0-9]+)-[0-9]+-[0-9a-z]+-b([0-9]+)jnks.*").matcher(plugin.getServer().getVersion());
+		final Matcher versionMatch = Pattern.compile("git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*").matcher(plugin.getServer().getVersion());
 		if (versionMatch.matches())
 		{
-			return Integer.parseInt(versionMatch.group(4));
+			return Integer.parseInt(versionMatch.group(1));
 		}
 		throw new NumberFormatException("Bukkit Version changed!");
 	}
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateFile.java b/EssentialsUpdate/src/net/ess3/update/UpdateFile.java
index 3d465e2e8..cdab65600 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateFile.java
+++ b/EssentialsUpdate/src/net/ess3/update/UpdateFile.java
@@ -1,8 +1,9 @@
-package com.earth2me.essentials.update;
+package net.ess3.update;
 
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.security.KeyFactory;
@@ -15,6 +16,7 @@ import java.util.TreeMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Bukkit;
+import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.Plugin;
 
@@ -25,7 +27,6 @@ public class UpdateFile
 	private final static String UPDATE_URL = "http://goo.gl/67jev";
 	private final static BigInteger PUBLIC_KEY = new BigInteger("5ha6a2d4qdy17ttkg8evh74sl5a87djojwenu12k1lvy8ui6003e6l06rntczpoh99mhc3txj8mqlxw111oyy9yl7s7qpyluyzix3j1odxrxx4u52gxvyu6qiteapczkzvi7rxgeqsozz7b19rdx73a7quo9ybwpz1cr82r7x5k0pg2a73pjjsv2j1awr13azo7klrcxp9y5xxwf5qv1s3tw4zqftli18u0ek5qkbzfbgk1v5n2f11pkwwk6p0mibrn26wnjbv11vyiqgu95o7busmt6vf5q7grpcenl637w83mbin56s3asj1131b2mscj9xep3cbj7la9tgsxl5bj87vzy8sk2d34kzwqdqgh9nry43nqqus12l1stmiv184r8r3jcy8w43e8h1u1mzklldb5eytkuhayqik8l3ns04hwt8sgacvw534be8sx26qrn5s1", 36);
 	private final transient File file;
-	private transient YamlConfiguration updateConfig;
 	private final transient Plugin plugin;
 	private final transient TreeMap<Version, VersionInfo> versions = new TreeMap<Version, VersionInfo>();
 
@@ -185,16 +186,14 @@ public class UpdateFile
 		return false;
 	}
 
-	private void readVersions() throws Exception
+	private void readVersions() throws FileNotFoundException, InvalidConfigurationException, IOException
 	{
-		updateConfig = new YamlConfiguration();
+		final YamlConfiguration updateConfig = new YamlConfiguration();
 		updateConfig.load(file);
 		versions.clear();
 		for (String versionString : updateConfig.getKeys(false))
 		{
-			final Version version = new Version(versionString);
-			final VersionInfo info = new VersionInfo(updateConfig, versionString);
-			versions.put(version, info);
+			versions.put(new Version(versionString), new VersionInfo(updateConfig, versionString));
 		}
 	}
 
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateProcess.java b/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java
index 9fa587f8f..f96cdd18f 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateProcess.java
+++ b/EssentialsUpdate/src/net/ess3/update/UpdateProcess.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.update;
+package net.ess3.update;
 
-import com.earth2me.essentials.update.states.InstallationFinishedEvent;
-import com.earth2me.essentials.update.states.StateMachine;
-import com.earth2me.essentials.update.tasks.SelfUpdate;
+import net.ess3.update.states.InstallationFinishedEvent;
+import net.ess3.update.states.StateMachine;
+import net.ess3.update.tasks.SelfUpdate;
 import java.util.logging.Level;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -14,7 +14,7 @@ import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.plugin.Plugin;
 
-
+// TODO: This whole thing should make use of the conversations api
 public class UpdateProcess implements Listener
 {
 	private transient Player currentPlayer;
@@ -123,7 +123,7 @@ public class UpdateProcess implements Listener
 	public void onPlayerJoin(final PlayerJoinEvent event)
 	{
 		final Player player = event.getPlayer();
-		if (currentPlayer.getName().equals(player.getName()))
+		if (currentPlayer != null && currentPlayer.getName().equals(player.getName()))
 		{
 			currentPlayer = player;
 			player.sendMessage("You quit the game, while the installation wizard was running.");
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/Version.java b/EssentialsUpdate/src/net/ess3/update/Version.java
index a82f49abf..5fc10eb18 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/Version.java
+++ b/EssentialsUpdate/src/net/ess3/update/Version.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update;
+package net.ess3.update;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -37,7 +37,7 @@ public class Version implements Comparable<Version>
 
 	public Version(final String versionString)
 	{
-		final Matcher matcher = Pattern.compile("(Pre|Dev)?([0-9]+)[_\\.]([0-9]+)[_\\.]([0-9]+).*").matcher(versionString);
+		final Matcher matcher = Pattern.compile("(Pre|Dev)?([0-9]+)[_\\.-]([0-9]+)[_\\.-]([0-9]+).*").matcher(versionString);
 		if (!matcher.matches() || matcher.groupCount() < 4)
 		{
 			type = Type.DEVELOPER;
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/VersionInfo.java b/EssentialsUpdate/src/net/ess3/update/VersionInfo.java
index c06aa2e64..afbe87de8 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/VersionInfo.java
+++ b/EssentialsUpdate/src/net/ess3/update/VersionInfo.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update;
+package net.ess3.update;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/AbstractFileCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java
index 7c99d28f6..2e6d44f20 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/AbstractFileCommand.java
+++ b/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java
@@ -1,8 +1,10 @@
-package com.earth2me.essentials.update.chat;
+package net.ess3.update.chat;
 
-import com.earth2me.essentials.update.PastieUpload;
+import net.ess3.update.PastieUpload;
 import java.io.*;
 import java.nio.charset.Charset;
+
+import net.ess3.update.PastieUpload;
 import org.bukkit.plugin.Plugin;
 
 
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/Command.java b/EssentialsUpdate/src/net/ess3/update/chat/Command.java
index ad4c75e43..1e7e94e1c 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/Command.java
+++ b/EssentialsUpdate/src/net/ess3/update/chat/Command.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update.chat;
+package net.ess3.update.chat;
 
 import org.bukkit.entity.Player;
 
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ConfigCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/ConfigCommand.java
index de2c6a830..913294b01 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ConfigCommand.java
+++ b/EssentialsUpdate/src/net/ess3/update/chat/ConfigCommand.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update.chat;
+package net.ess3.update.chat;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -21,7 +21,7 @@ public class ConfigCommand extends AbstractFileCommand implements Command
 		BufferedReader page = null;
 		try
 		{
-			page = getPluginConfig("Essentials", "config.yml");
+			page = getPluginConfig("Essentials-3", "config.yml");
 			final StringBuilder input = new StringBuilder();
 			do
 			{
@@ -61,6 +61,5 @@ public class ConfigCommand extends AbstractFileCommand implements Command
 				player.sendMessage(ex.getMessage());
 			}
 		}
-
 	}
 }
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ErrorsCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/ErrorsCommand.java
index 41aa551c4..6e3c29924 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ErrorsCommand.java
+++ b/EssentialsUpdate/src/net/ess3/update/chat/ErrorsCommand.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update.chat;
+package net.ess3.update.chat;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/HelpCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/HelpCommand.java
index a6f76cece..1e82953f0 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/HelpCommand.java
+++ b/EssentialsUpdate/src/net/ess3/update/chat/HelpCommand.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update.chat;
+package net.ess3.update.chat;
 
 import org.bukkit.entity.Player;
 
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/IrcBot.java b/EssentialsUpdate/src/net/ess3/update/chat/IrcBot.java
index 31e9384ee..10ce9ad8a 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/IrcBot.java
+++ b/EssentialsUpdate/src/net/ess3/update/chat/IrcBot.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update.chat;
+package net.ess3.update.chat;
 
 import java.io.IOException;
 import java.util.logging.Level;
@@ -35,7 +35,6 @@ public class IrcBot extends PircBot
 		try
 		{
 			connect(SERVER, PORT);
-			return;
 		}
 		catch (IOException ex)
 		{
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ListCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/ListCommand.java
index 9aa932efa..218b6631b 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ListCommand.java
+++ b/EssentialsUpdate/src/net/ess3/update/chat/ListCommand.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update.chat;
+package net.ess3.update.chat;
 
 import org.bukkit.entity.Player;
 import org.jibble.pircbot.User;
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/StartupCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/StartupCommand.java
index f244d6e3a..978da60c2 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/StartupCommand.java
+++ b/EssentialsUpdate/src/net/ess3/update/chat/StartupCommand.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update.chat;
+package net.ess3.update.chat;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/UsernameUtil.java b/EssentialsUpdate/src/net/ess3/update/chat/UsernameUtil.java
index 3df615652..e9dfdf728 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/UsernameUtil.java
+++ b/EssentialsUpdate/src/net/ess3/update/chat/UsernameUtil.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update.chat;
+package net.ess3.update.chat;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -104,7 +104,7 @@ public final class UsernameUtil
 
 	private static void addEssentialsVersion(final Server server, final StringBuilder nameBuilder)
 	{
-		final Plugin essentials = server.getPluginManager().getPlugin("Essentials");
+		final Plugin essentials = server.getPluginManager().getPlugin("Essentials-3");
 		if (essentials != null)
 		{
 			nameBuilder.append(" ESS");
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractState.java b/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java
index 2c85c39fd..5d4e03a2c 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractState.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java
@@ -1,6 +1,7 @@
-package com.earth2me.essentials.update.states;
+package net.ess3.update.states;
 
-import com.earth2me.essentials.update.AbstractWorkListener;
+import net.ess3.update.AbstractWorkListener;
+import net.ess3.update.AbstractWorkListener;
 import org.bukkit.entity.Player;
 
 
@@ -39,7 +40,7 @@ public abstract class AbstractState
 
 	/**
 	 * Check if we already know the answer, so the user does not have to answer the question.
-	 * 
+	 *
 	 * @return true, if the answer could be guessed.
 	 */
 	public boolean guessAnswer()
@@ -49,12 +50,14 @@ public abstract class AbstractState
 
 	/**
 	 * Ask the user the question.
-	 * @param sender 
+	 *
+	 * @param sender
 	 */
 	public abstract void askQuestion(Player sender);
 
 	/**
 	 * React on the answer and set internal variables
+	 *
 	 * @param answer
 	 * @return true, if the answer could be recognized as a valid answer
 	 */
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractYesNoState.java b/EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java
index 67baf6bb6..3ee7d0ee2 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractYesNoState.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update.states;
+package net.ess3.update.states;
 
 
 public abstract class AbstractYesNoState extends AbstractState
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/AdvancedMode.java b/EssentialsUpdate/src/net/ess3/update/states/AdvancedMode.java
index 88d9efc4a..8ddf06eeb 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/AdvancedMode.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/AdvancedMode.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update.states;
+package net.ess3.update.states;
 
 import org.bukkit.entity.Player;
 
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/Changelog.java b/EssentialsUpdate/src/net/ess3/update/states/Changelog.java
index 10a4f33c5..42fdc8ca2 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/Changelog.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/Changelog.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.update.states;
+package net.ess3.update.states;
 
-import com.earth2me.essentials.update.UpdateCheck;
-import com.earth2me.essentials.update.VersionInfo;
+import net.ess3.update.UpdateCheck;
+import net.ess3.update.VersionInfo;
 import java.util.List;
 import org.bukkit.entity.Player;
 
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsChat.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java
index 6aaed634a..a62735f5e 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsChat.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java
@@ -1,7 +1,7 @@
-package com.earth2me.essentials.update.states;
+package net.ess3.update.states;
 
-import com.earth2me.essentials.update.AbstractWorkListener;
-import com.earth2me.essentials.update.tasks.InstallModule;
+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;
@@ -11,7 +11,7 @@ public class EssentialsChat extends AbstractYesNoState
 {
 	public EssentialsChat(final StateMap states)
 	{
-		super(states, EssentialsChatSettings.class, EssentialsSpawn.class);
+		super(states, EssentialsChatSettings.class);
 	}
 
 	@Override
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsChatSettings.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsChatSettings.java
index 6666ff371..db3202ab3 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsChatSettings.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsChatSettings.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update.states;
+package net.ess3.update.states;
 
 import org.bukkit.entity.Player;
 
@@ -7,7 +7,7 @@ public class EssentialsChatSettings extends AbstractYesNoState
 {
 	public EssentialsChatSettings(final StateMap states)
 	{
-		super(states, EssentialsSpawn.class);
+		super(states, null);
 	}
 
 	@Override
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsGeoIP.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java
index a91a44787..cd1865b42 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsGeoIP.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java
@@ -1,7 +1,8 @@
-package com.earth2me.essentials.update.states;
+package net.ess3.update.states;
 
-import com.earth2me.essentials.update.AbstractWorkListener;
-import com.earth2me.essentials.update.tasks.InstallModule;
+import net.ess3.update.AbstractWorkListener;
+import net.ess3.update.tasks.InstallModule;
+import net.ess3.update.AbstractWorkListener;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
@@ -44,4 +45,4 @@ public class EssentialsGeoIP extends AbstractYesNoState
 		}
 		listener.onWorkDone();
 	}
-}
-\ No newline at end of file
+}
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsProtect.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java
index ca0337d30..bb3a841a7 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/EssentialsProtect.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java
@@ -1,7 +1,8 @@
-package com.earth2me.essentials.update.states;
+package net.ess3.update.states;
 
-import com.earth2me.essentials.update.AbstractWorkListener;
-import com.earth2me.essentials.update.tasks.InstallModule;
+import net.ess3.update.AbstractWorkListener;
+import net.ess3.update.tasks.InstallModule;
+import net.ess3.update.AbstractWorkListener;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
@@ -44,4 +45,4 @@ public class EssentialsProtect extends AbstractYesNoState
 		}
 		listener.onWorkDone();
 	}
-}
-\ No newline at end of file
+}
diff --git a/EssentialsUpdate/src/net/ess3/update/states/InstallationFinishedEvent.java b/EssentialsUpdate/src/net/ess3/update/states/InstallationFinishedEvent.java
new file mode 100644
index 000000000..5c38db7ee
--- /dev/null
+++ b/EssentialsUpdate/src/net/ess3/update/states/InstallationFinishedEvent.java
@@ -0,0 +1,21 @@
+package net.ess3.update.states;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+
+public class InstallationFinishedEvent extends Event
+{
+	private static final HandlerList handlers = new HandlerList();
+
+	@Override
+	public HandlerList getHandlers()
+	{
+		return handlers;
+	}
+
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+}
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java b/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java
index 6ce926f92..b66ca4c58 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java
@@ -1,8 +1,10 @@
-package com.earth2me.essentials.update.states;
+package net.ess3.update.states;
 
-import com.earth2me.essentials.update.AbstractWorkListener;
-import com.earth2me.essentials.update.UpdateCheck;
+import net.ess3.update.AbstractWorkListener;
+import net.ess3.update.UpdateCheck;
 import java.util.Iterator;
+
+import net.ess3.update.UpdateCheck;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMap.java b/EssentialsUpdate/src/net/ess3/update/states/StateMap.java
index cca4223d6..397ef7c81 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMap.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/StateMap.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.update.states;
+package net.ess3.update.states;
 
 import java.util.LinkedHashMap;
 
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/UpdateOrInstallation.java b/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java
index 6b48f90be..c7bd5127a 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/UpdateOrInstallation.java
+++ b/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java
@@ -1,6 +1,7 @@
-package com.earth2me.essentials.update.states;
+package net.ess3.update.states;
 
-import com.earth2me.essentials.update.UpdateCheck;
+import net.ess3.update.UpdateCheck;
+import net.ess3.update.UpdateCheck;
 import org.bukkit.entity.Player;
 
 
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/InstallModule.java b/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java
index 778f5172f..1f7742026 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/InstallModule.java
+++ b/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java
@@ -1,12 +1,16 @@
-package com.earth2me.essentials.update.tasks;
+package net.ess3.update.tasks;
 
-import com.earth2me.essentials.update.AbstractWorkListener;
-import com.earth2me.essentials.update.GetFile;
-import com.earth2me.essentials.update.ModuleInfo;
-import com.earth2me.essentials.update.VersionInfo;
+import net.ess3.update.AbstractWorkListener;
+import net.ess3.update.GetFile;
+import net.ess3.update.AbstractWorkListener;
+import net.ess3.update.GetFile;
+import net.ess3.update.ModuleInfo;
+import net.ess3.update.VersionInfo;
 import java.io.File;
 import java.net.URL;
 import java.util.logging.Level;
+
+import net.ess3.update.VersionInfo;
 import org.bukkit.Bukkit;
 
 
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/SelfUpdate.java b/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java
index 3baf86be7..bc0d65b5e 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/SelfUpdate.java
+++ b/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java
@@ -1,6 +1,7 @@
-package com.earth2me.essentials.update.tasks;
+package net.ess3.update.tasks;
 
-import com.earth2me.essentials.update.AbstractWorkListener;
+import net.ess3.update.AbstractWorkListener;
+import net.ess3.update.AbstractWorkListener;
 import org.bukkit.Bukkit;
 
 
diff --git a/EssentialsUpdate/src/net/ess3/update/tasks/Task.java b/EssentialsUpdate/src/net/ess3/update/tasks/Task.java
new file mode 100644
index 000000000..0dc421446
--- /dev/null
+++ b/EssentialsUpdate/src/net/ess3/update/tasks/Task.java
@@ -0,0 +1,7 @@
+package net.ess3.update.tasks;
+
+
+public interface Task
+{
+	void start();
+}
diff --git a/EssentialsUpdate/src/plugin.yml b/EssentialsUpdate/src/plugin.yml
index 4e7700711..c2811ad63 100644
--- a/EssentialsUpdate/src/plugin.yml
+++ b/EssentialsUpdate/src/plugin.yml
@@ -1,6 +1,6 @@
 # This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
 name: EssentialsUpdate
-main: com.earth2me.essentials.update.EssentialsUpdate
+main: net.ess3.update.EssentialsUpdate
 # Note to developers: This next line cannot change, or the automatic versioning system will break.
 version: ${build.number}
 description: This plugin allows to install or update all Essentials plugins