7 files changed, 35 insertions, 36 deletions
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandsetspawn.java b/EssentialsSpawn/src/org/mcess/essentials/spawn/Commandsetspawn.java
index 15d2ca2ab..de8a6f60a 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandsetspawn.java
+++ b/EssentialsSpawn/src/org/mcess/essentials/spawn/Commandsetspawn.java
@@ -1,9 +1,9 @@
-package com.earth2me.essentials.spawn;
+package org.mcess.essentials.spawn;
 
-import static com.earth2me.essentials.I18n.tl;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.commands.EssentialsCommand;
+import org.mcess.essentials.User;
+import org.mcess.essentials.commands.EssentialsCommand;
 import org.bukkit.Server;
+import org.mcess.essentials.I18n;
 
 
 public class Commandsetspawn extends EssentialsCommand
@@ -18,6 +18,6 @@ public class Commandsetspawn extends EssentialsCommand
 	{
 		final String group = args.length > 0 ? getFinalArg(args, 0) : "default";
 		((SpawnStorage)module).setSpawn(user.getLocation(), group);
-		user.sendMessage(tl("spawnSet", group));
+		user.sendMessage(I18n.tl("spawnSet", group));
 	}
 }
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java b/EssentialsSpawn/src/org/mcess/essentials/spawn/Commandspawn.java
index 34a4eb6bd..7914e078e 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
+++ b/EssentialsSpawn/src/org/mcess/essentials/spawn/Commandspawn.java
@@ -1,13 +1,13 @@
-package com.earth2me.essentials.spawn;
+package org.mcess.essentials.spawn;
 
-import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n.tl;
-import com.earth2me.essentials.Console;
-import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.NoChargeException;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
+import org.mcess.essentials.CommandSource;
+import static org.mcess.essentials.I18n.tl;
+import org.mcess.essentials.Console;
+import org.mcess.essentials.Trade;
+import org.mcess.essentials.User;
+import org.mcess.essentials.commands.EssentialsCommand;
+import org.mcess.essentials.commands.NoChargeException;
+import org.mcess.essentials.commands.NotEnoughArgumentsException;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java b/EssentialsSpawn/src/org/mcess/essentials/spawn/EssentialsSpawn.java
index d07637303..eab53303c 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
+++ b/EssentialsSpawn/src/org/mcess/essentials/spawn/EssentialsSpawn.java
@@ -1,6 +1,5 @@
-package com.earth2me.essentials.spawn;
+package org.mcess.essentials.spawn;
 
-import static com.earth2me.essentials.I18n.tl;
 import net.ess3.api.IEssentials;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -16,6 +15,7 @@ import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.plugin.EventExecutor;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.mcess.essentials.I18n;
 
 
 public class EssentialsSpawn extends JavaPlugin implements IEssentialsSpawn
@@ -31,7 +31,7 @@ public class EssentialsSpawn extends JavaPlugin implements IEssentialsSpawn
 		ess = (IEssentials)pluginManager.getPlugin("Essentials");
 		if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion()))
 		{
-			LOGGER.log(Level.WARNING, tl("versionMismatchAll"));
+			LOGGER.log(Level.WARNING, I18n.tl("versionMismatchAll"));
 		}
 		if (!ess.isEnabled())
 		{
@@ -69,7 +69,7 @@ public class EssentialsSpawn extends JavaPlugin implements IEssentialsSpawn
 	@Override
 	public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args)
 	{
-		return ess.onCommandEssentials(sender, command, commandLabel, args, EssentialsSpawn.class.getClassLoader(), "com.earth2me.essentials.spawn.Command", "essentials.", spawns);
+		return ess.onCommandEssentials(sender, command, commandLabel, args, EssentialsSpawn.class.getClassLoader(), "org.mcess.spawn.Command", "essentials.", spawns);
 	}
 
 	@Override
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/org/mcess/essentials/spawn/EssentialsSpawnPlayerListener.java
index d637014eb..a162d4944 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
+++ b/EssentialsSpawn/src/org/mcess/essentials/spawn/EssentialsSpawnPlayerListener.java
@@ -1,16 +1,14 @@
-package com.earth2me.essentials.spawn;
-
-import static com.earth2me.essentials.I18n.tl;
-import com.earth2me.essentials.Kit;
-import com.earth2me.essentials.OfflinePlayer;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.textreader.IText;
-import com.earth2me.essentials.textreader.KeywordReplacer;
-import com.earth2me.essentials.textreader.SimpleTextPager;
+package org.mcess.essentials.spawn;
+
+import org.mcess.essentials.Kit;
+import org.mcess.essentials.OfflinePlayer;
+import org.mcess.essentials.User;
+import org.mcess.essentials.textreader.IText;
+import org.mcess.essentials.textreader.KeywordReplacer;
+import org.mcess.essentials.textreader.SimpleTextPager;
 import net.ess3.api.IEssentials;
-import java.util.List;
+
 import java.util.Locale;
-import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Bukkit;
@@ -20,6 +18,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import org.mcess.essentials.I18n;
 
 
 public class EssentialsSpawnPlayerListener implements Listener
@@ -164,7 +163,7 @@ public class EssentialsSpawnPlayerListener implements Listener
 			}
 			catch (Exception ex)
 			{
-				Bukkit.getLogger().log(Level.WARNING, tl("teleportNewPlayerError"), ex);
+				Bukkit.getLogger().log(Level.WARNING, I18n.tl("teleportNewPlayerError"), ex);
 			}
 		}
 	}
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/IEssentialsSpawn.java b/EssentialsSpawn/src/org/mcess/essentials/spawn/IEssentialsSpawn.java
index a7c43bcb0..3356389e7 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/IEssentialsSpawn.java
+++ b/EssentialsSpawn/src/org/mcess/essentials/spawn/IEssentialsSpawn.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials.spawn;
+package org.mcess.essentials.spawn;
 
 import org.bukkit.Location;
 import org.bukkit.plugin.Plugin;
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java b/EssentialsSpawn/src/org/mcess/essentials/spawn/SpawnStorage.java
index 36b6f9662..aafd22342 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java
+++ b/EssentialsSpawn/src/org/mcess/essentials/spawn/SpawnStorage.java
@@ -1,8 +1,8 @@
-package com.earth2me.essentials.spawn;
+package org.mcess.essentials.spawn;
 
-import com.earth2me.essentials.IEssentialsModule;
-import com.earth2me.essentials.settings.Spawns;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
+import org.mcess.essentials.IEssentialsModule;
+import org.mcess.essentials.settings.Spawns;
+import org.mcess.essentials.storage.AsyncStorageObjectHolder;
 import net.ess3.api.IEssentials;
 import java.io.File;
 import java.util.HashMap;
diff --git a/EssentialsSpawn/src/plugin.yml b/EssentialsSpawn/src/plugin.yml
index 21f77db78..95e9b1973 100644
--- a/EssentialsSpawn/src/plugin.yml
+++ b/EssentialsSpawn/src/plugin.yml
@@ -1,6 +1,6 @@
 # This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
 name: EssentialsSpawn
-main: com.earth2me.essentials.spawn.EssentialsSpawn
+main: org.mcess.essentials.spawn.EssentialsSpawn
 # Note to developers: This next line cannot change, or the automatic versioning system will break.
 version: TeamCity
 website: http://tiny.cc/EssentialsCommands