package name change to net.ess3

Essentials/src/com/earth2me/essentials/api/IWarp.java

@@ -1,9 +0,0 @@
-package com.earth2me.essentials.api;
-
-import com.earth2me.essentials.settings.Warp;
-import com.earth2me.essentials.storage.IStorageObjectHolder;
-
-
-public interface IWarp extends IStorageObjectHolder<Warp>
-{
-}

Essentials/src/com/earth2me/essentials/api/server/IPermission.java

@@ -1,5 +0,0 @@
-package com.earth2me.essentials.api.server;
-
-public interface IPermission {
-	
-}

Essentials/src/com/earth2me/essentials/api/server/IPlayer.java

@@ -1,5 +0,0 @@
-package com.earth2me.essentials.api.server;
-
-public interface IPlayer {
-
-}

Essentials/src/com/earth2me/essentials/api/server/IServer.java

@@ -1,5 +0,0 @@
-package com.earth2me.essentials.api.server;
-
-public interface IServer {
-
-}

Essentials/src/com/earth2me/essentials/storage/StorageObject.java

@@ -1,6 +0,0 @@
-package com.earth2me.essentials.storage;
-
-
-public interface StorageObject
-{
-}

Essentials/src/com/earth2me/essentials/user/IOfflineUser.java

@@ -1,9 +0,0 @@
-package com.earth2me.essentials.user;
-
-import com.earth2me.essentials.storage.IStorageObjectHolder;
-
-
-public interface IOfflineUser extends IStorageObjectHolder<UserData>, IOfflinePlayer
-{
-	
-}

Essentials/src/net/ess3/Console.java

@@ -1,6 +1,6 @@
-package com.earth2me.essentials;
+package net.ess3;
 
-import com.earth2me.essentials.api.IReplyTo;
+import net.ess3.api.IReplyTo;
 import org.bukkit.command.CommandSender;
 
 

Essentials/src/net/ess3/Essentials.java

@@ -15,27 +15,26 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.earth2me.essentials;
+package net.ess3;
 
-import static com.earth2me.essentials.I18n._;
+import net.ess3.api.*;
-import com.earth2me.essentials.api.*;
+import net.ess3.backup.Backup;
-import com.earth2me.essentials.backup.Backup;
+import net.ess3.commands.EssentialsCommandHandler;
-import com.earth2me.essentials.commands.EssentialsCommandHandler;
+import net.ess3.economy.Economy;
-import com.earth2me.essentials.economy.Economy;
+import net.ess3.economy.Trade;
-import com.earth2me.essentials.economy.Trade;
+import net.ess3.economy.WorthHolder;
-import com.earth2me.essentials.economy.WorthHolder;
+import net.ess3.economy.register.Methods;
-import com.earth2me.essentials.economy.register.Methods;
+import net.ess3.listener.*;
-import com.earth2me.essentials.listener.*;
+import net.ess3.metrics.Metrics;
-import com.earth2me.essentials.metrics.Metrics;
+import net.ess3.metrics.MetricsListener;
-import com.earth2me.essentials.metrics.MetricsListener;
+import net.ess3.metrics.MetricsStarter;
-import com.earth2me.essentials.metrics.MetricsStarter;
+import net.ess3.ranks.RanksStorage;
-import com.earth2me.essentials.ranks.RanksStorage;
+import net.ess3.settings.SettingsHolder;
-import com.earth2me.essentials.settings.SettingsHolder;
+import net.ess3.settings.SpawnsHolder;
-import com.earth2me.essentials.settings.SpawnsHolder;
+import net.ess3.user.IOfflinePlayer;
-import com.earth2me.essentials.user.IOfflinePlayer;
+import net.ess3.user.User;
-import com.earth2me.essentials.user.User;
+import net.ess3.user.UserMap;
-import com.earth2me.essentials.user.UserMap;
+import net.ess3.utils.ExecuteTimer;
-import com.earth2me.essentials.utils.ExecuteTimer;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
@@ -112,7 +111,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 		}
 		i18n = new I18n(this);
 		i18n.onEnable();
-		LOGGER.log(Level.INFO, _("usingTempFolderForTesting"));
+		LOGGER.log(Level.INFO, I18n._("usingTempFolderForTesting"));
 		LOGGER.log(Level.INFO, dataFolder.toString());
 		this.initialize(null, server, new PluginDescriptionFile(new FileReader(new File("src" + File.separator + "plugin.yml"))), dataFolder, null, null);
 		settings = new SettingsHolder(this);
@@ -137,7 +136,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 				&& !plugin.getDescription().getVersion().equals(this.getDescription().getVersion())
 				&& !plugin.getDescription().getName().equals("EssentialsAntiCheat"))
 			{
-				LOGGER.log(Level.WARNING, _("versionMismatch", plugin.getDescription().getName()));
+				LOGGER.log(Level.WARNING, I18n._("versionMismatch", plugin.getDescription().getName()));
 			}
 		}
 		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(getServer().getVersion());
@@ -147,8 +146,8 @@ public class Essentials extends JavaPlugin implements IEssentials
 			if (versionNumber < BUKKIT_VERSION && versionNumber > 100)
 			{
 				LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
-				LOGGER.log(Level.SEVERE, _("notRecommendedBukkit"));
+				LOGGER.log(Level.SEVERE, I18n._("notRecommendedBukkit"));
-				LOGGER.log(Level.SEVERE, _("requiredBukkit", Integer.toString(BUKKIT_VERSION)));
+				LOGGER.log(Level.SEVERE, I18n._("requiredBukkit", Integer.toString(BUKKIT_VERSION)));
 				LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
 				this.setEnabled(false);
 				return;
@@ -156,7 +155,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 		}
 		else
 		{
-			LOGGER.log(Level.INFO, _("bukkitFormatChanged"));
+			LOGGER.log(Level.INFO, I18n._("bukkitFormatChanged"));
 			LOGGER.log(Level.INFO, getServer().getVersion());
 			LOGGER.log(Level.INFO, getServer().getBukkitVersion());
 		}
@@ -188,7 +187,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 			execTimer.mark("Init(Worth/ItemDB)");
 			kits = new Kits(this);
 			reloadList.add(kits);
-			commandHandler = new EssentialsCommandHandler(Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.", this);
+			commandHandler = new EssentialsCommandHandler(Essentials.class.getClassLoader(), "net.ess3.commands.Command", "essentials.", this);
 			reloadList.add(commandHandler);
 			economy = new Economy(this);
 			reloadList.add(economy);
@@ -200,11 +199,11 @@ public class Essentials extends JavaPlugin implements IEssentials
 		{
 			if (pm.getPlugin("EssentialsUpdate") != null)
 			{
-				LOGGER.log(Level.SEVERE, _("essentialsHelp2"));
+				LOGGER.log(Level.SEVERE, I18n._("essentialsHelp2"));
 			}
 			else
 			{
-				LOGGER.log(Level.SEVERE, _("essentialsHelp1"));
+				LOGGER.log(Level.SEVERE, I18n._("essentialsHelp1"));
 			}
 			LOGGER.log(Level.SEVERE, exception.toString());
 			pm.registerEvents(new Listener()
@@ -274,7 +273,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 			if (user.isVanished())
 			{
 				user.toggleVanished();
-				p.sendMessage(_("unvanishedReload"));
+				p.sendMessage(I18n._("unvanishedReload"));
 			}
 		}
 		i18n.onDisable();
@@ -299,7 +298,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 	public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args)
 	{
 		return commandHandler.handleCommand(sender, command, commandLabel, args);
-		//return onCommandEssentials(sender, command, commandLabel, args, Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.", null);
+		//return onCommandEssentials(sender, command, commandLabel, args, Essentials.class.getClassLoader(), "net.ess3.commands.Command", "essentials.", null);
 	}
 
 	@Override

Essentials/src/net/ess3/EssentialsTimer.java

@@ -1,11 +1,10 @@
-package com.earth2me.essentials;
+package net.ess3;
 
-import static com.earth2me.essentials.I18n._;
+import net.ess3.api.IEssentials;
-import com.earth2me.essentials.api.IEssentials;
+import net.ess3.api.ISettings;
-import com.earth2me.essentials.api.ISettings;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.permissions.Permissions;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.user.UserData.TimestampType;
-import com.earth2me.essentials.user.UserData.TimestampType;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -73,7 +72,7 @@ public class EssentialsTimer implements Runnable
 					final List<String> mail = user.getMails();
 					if (mail != null && !mail.isEmpty())
 					{
-						user.sendMessage(_("youHaveNewMail", mail.size()));
+						user.sendMessage(I18n._("youHaveNewMail", mail.size()));
 					}
 				}
 			}

Essentials/src/net/ess3/I18n.java

@@ -1,7 +1,7 @@
-package com.earth2me.essentials;
+package net.ess3;
 
-import com.earth2me.essentials.api.IEssentials;
+import net.ess3.api.IEssentials;
-import com.earth2me.essentials.api.II18n;
+import net.ess3.api.II18n;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;

Essentials/src/net/ess3/ItemDb.java

@@ -1,11 +1,11 @@
-package com.earth2me.essentials;
+package net.ess3;
 
-import com.earth2me.essentials.storage.ManagedFile;
+import net.ess3.storage.ManagedFile;
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IEssentials;
+import net.ess3.api.IEssentials;
-import com.earth2me.essentials.api.IItemDb;
+import net.ess3.api.IItemDb;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -67,7 +67,7 @@ public class ItemDb implements IItemDb
 		final ItemStack stack = get(id.toLowerCase(Locale.ENGLISH));
 
 		@Cleanup
-		com.earth2me.essentials.api.ISettings settings = ess.getSettings();
+		net.ess3.api.ISettings settings = ess.getSettings();
 		settings.acquireReadLock();
 
 		final int defaultStackSize = settings.getData().getGeneral().getDefaultStacksize();

Essentials/src/net/ess3/Jails.java

@@ -1,10 +1,10 @@
-package com.earth2me.essentials;
+package net.ess3;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IEssentials;
+import net.ess3.api.IEssentials;
-import com.earth2me.essentials.api.IJails;
+import net.ess3.api.IJails;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
+import net.ess3.storage.AsyncStorageObjectHolder;
 import java.io.File;
 import java.util.*;
 import java.util.logging.Level;
@@ -30,14 +30,14 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.plugin.PluginManager;
 
 
-public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Jails> implements IJails
+public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> implements IJails
 {
 	private static final transient Logger LOGGER = Bukkit.getLogger();
 	private static transient boolean enabled = false;
 
 	public Jails(final IEssentials ess)
 	{
-		super(ess, com.earth2me.essentials.settings.Jails.class);
+		super(ess, net.ess3.settings.Jails.class);
 		onReload();
 	}
 
@@ -168,9 +168,9 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		{
 			if (getData().getJails() == null)
 			{
-				getData().setJails(new HashMap<String, com.earth2me.essentials.storage.Location>());
+				getData().setJails(new HashMap<String, net.ess3.storage.Location>());
 			}
-			getData().getJails().put(jailName.toLowerCase(Locale.ENGLISH), new com.earth2me.essentials.storage.Location(loc));
+			getData().getJails().put(jailName.toLowerCase(Locale.ENGLISH), new net.ess3.storage.Location(loc));
 		}
 		finally
 		{

Essentials/src/net/ess3/Kits.java

@@ -1,25 +1,25 @@
-package com.earth2me.essentials;
+package net.ess3;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IEssentials;
+import net.ess3.api.IEssentials;
-import com.earth2me.essentials.api.IKits;
+import net.ess3.api.IKits;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.commands.NoChargeException;
+import net.ess3.commands.NoChargeException;
-import com.earth2me.essentials.settings.Kit;
+import net.ess3.settings.Kit;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
+import net.ess3.storage.AsyncStorageObjectHolder;
-import com.earth2me.essentials.user.UserData.TimestampType;
+import net.ess3.user.UserData.TimestampType;
-import com.earth2me.essentials.utils.DateUtil;
+import net.ess3.utils.DateUtil;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
 import org.bukkit.inventory.ItemStack;
 
 
-public class Kits extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Kits> implements IKits
+public class Kits extends AsyncStorageObjectHolder<net.ess3.settings.Kits> implements IKits
 {
 	public Kits(final IEssentials ess)
 	{
-		super(ess, com.earth2me.essentials.settings.Kits.class);
+		super(ess, net.ess3.settings.Kits.class);
 		onReload();
 	}
 

Essentials/src/net/ess3/Teleport.java

@@ -1,15 +1,15 @@
-package com.earth2me.essentials;
+package net.ess3;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IEssentials;
+import net.ess3.api.IEssentials;
-import com.earth2me.essentials.api.ITeleport;
+import net.ess3.api.ITeleport;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.economy.Trade;
+import net.ess3.economy.Trade;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
-import com.earth2me.essentials.user.CooldownException;
+import net.ess3.user.CooldownException;
-import com.earth2me.essentials.user.UserData.TimestampType;
+import net.ess3.user.UserData.TimestampType;
-import com.earth2me.essentials.utils.DateUtil;
+import net.ess3.utils.DateUtil;
-import com.earth2me.essentials.utils.LocationUtil;
+import net.ess3.utils.LocationUtil;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.logging.Logger;

Essentials/src/net/ess3/Warps.java

@@ -1,13 +1,13 @@
-package com.earth2me.essentials;
+package net.ess3;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IEssentials;
+import net.ess3.api.IEssentials;
-import com.earth2me.essentials.api.IWarp;
+import net.ess3.api.IWarp;
-import com.earth2me.essentials.api.IWarps;
+import net.ess3.api.IWarps;
-import com.earth2me.essentials.api.InvalidNameException;
+import net.ess3.api.InvalidNameException;
-import com.earth2me.essentials.commands.WarpNotFoundException;
+import net.ess3.commands.WarpNotFoundException;
-import com.earth2me.essentials.settings.WarpHolder;
+import net.ess3.settings.WarpHolder;
-import com.earth2me.essentials.storage.StorageObjectMap;
+import net.ess3.storage.StorageObjectMap;
 import java.io.File;
 import java.util.*;
 import java.util.logging.Logger;
@@ -77,10 +77,10 @@ public class Warps extends StorageObjectMap<IWarp> implements IWarps
 	@Override
 	public void setWarp(final String name, final Location loc) throws Exception
 	{
-		setWarp(name, new com.earth2me.essentials.storage.Location(loc));
+		setWarp(name, new net.ess3.storage.Location(loc));
 	}
 	
-	public void setWarp(final String name, final com.earth2me.essentials.storage.Location loc) throws Exception
+	public void setWarp(final String name, final net.ess3.storage.Location loc) throws Exception
 	{
 		IWarp warp = getObject(name);
 		if (warp == null)

Essentials/src/net/ess3/api/ChargeException.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 
 public class ChargeException extends Exception

Essentials/src/net/ess3/api/IBackup.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 
 public interface IBackup extends Runnable

Essentials/src/net/ess3/api/ICommandHandler.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 import java.util.Map;
 import org.bukkit.command.Command;

Essentials/src/net/ess3/api/IEconomy.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 
 public interface IEconomy extends IReload

Essentials/src/net/ess3/api/IEssentials.java

@@ -1,10 +1,11 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import com.earth2me.essentials.EssentialsTimer;
+import net.ess3.EssentialsTimer;
-import com.earth2me.essentials.economy.register.Methods;
+import net.ess3.economy.register.Methods;
-import com.earth2me.essentials.listener.TntExplodeListener;
+import net.ess3.listener.TntExplodeListener;
-import com.earth2me.essentials.metrics.Metrics;
+import net.ess3.metrics.Metrics;
 import java.util.List;
+
 import org.bukkit.World;
 import org.bukkit.plugin.Plugin;
 

Essentials/src/net/ess3/api/IEssentialsModule.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 
 public interface IEssentialsModule

Essentials/src/net/ess3/api/II18n.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 import java.util.Locale;
 

Essentials/src/net/ess3/api/IItemDb.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 import org.bukkit.inventory.ItemStack;
 

Essentials/src/net/ess3/api/IJails.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 import java.util.Collection;
 import org.bukkit.Location;

Essentials/src/net/ess3/api/IKits.java

@@ -1,7 +1,7 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import com.earth2me.essentials.commands.NoChargeException;
+import net.ess3.commands.NoChargeException;
-import com.earth2me.essentials.settings.Kit;
+import net.ess3.settings.Kit;
 import java.util.Collection;
 
 

Essentials/src/net/ess3/api/IPermission.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.Permission;

Essentials/src/net/ess3/api/IRanks.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 import java.text.MessageFormat;
 

Essentials/src/net/ess3/api/IReload.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 
 public interface IReload

Essentials/src/net/ess3/api/IReplyTo.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 import org.bukkit.command.CommandSender;
 

Essentials/src/net/ess3/api/ISettings.java

@@ -1,7 +1,7 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import com.earth2me.essentials.settings.Settings;
+import net.ess3.settings.Settings;
-import com.earth2me.essentials.storage.IStorageObjectHolder;
+import net.ess3.storage.IStorageObjectHolder;
 
 
 public interface ISettings extends IStorageObjectHolder<Settings>

Essentials/src/net/ess3/api/ITeleport.java

@@ -1,6 +1,6 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import com.earth2me.essentials.economy.Trade;
+import net.ess3.economy.Trade;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

Essentials/src/net/ess3/api/IUser.java

@@ -1,8 +1,8 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import com.earth2me.essentials.storage.IStorageObjectHolder;
+import net.ess3.storage.IStorageObjectHolder;
-import com.earth2me.essentials.user.CooldownException;
+import net.ess3.user.CooldownException;
-import com.earth2me.essentials.user.UserData;
+import net.ess3.user.UserData;
 import java.util.List;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;

Essentials/src/net/ess3/api/IUserMap.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 import java.io.File;
 import java.util.Set;

Essentials/src/net/ess3/api/IWarp.java

@@ -0,0 +1,9 @@
+package net.ess3.api;
+
+import net.ess3.settings.Warp;
+import net.ess3.storage.IStorageObjectHolder;
+
+
+public interface IWarp extends IStorageObjectHolder<Warp>
+{
+}

Essentials/src/net/ess3/api/IWarps.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 import java.io.File;
 import java.util.Collection;

Essentials/src/net/ess3/api/IWorth.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 import org.bukkit.inventory.ItemStack;
 

Essentials/src/net/ess3/api/InvalidNameException.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
 
 public class InvalidNameException extends Exception

Essentials/src/net/ess3/api/NoLoanPermittedException.java

@@ -1,6 +1,6 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 
 
 public class NoLoanPermittedException extends Exception

Essentials/src/net/ess3/api/UserDoesNotExistException.java

@@ -1,6 +1,6 @@
-package com.earth2me.essentials.api;
+package net.ess3.api;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 
 
 public class UserDoesNotExistException extends Exception

Essentials/src/net/ess3/api/server/IPermission.java

@@ -0,0 +1,5 @@
+package net.ess3.api.server;
+
+public interface IPermission {
+	
+}

Essentials/src/net/ess3/api/server/IPermissionsManager.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.api.server;
+package net.ess3.api.server;
 
 public interface IPermissionsManager {
 	

Essentials/src/net/ess3/api/server/IPlayer.java

@@ -0,0 +1,5 @@
+package net.ess3.api.server;
+
+public interface IPlayer {
+
+}

Essentials/src/net/ess3/api/server/IServer.java

@@ -0,0 +1,5 @@
+package net.ess3.api.server;
+
+public interface IServer {
+
+}

Essentials/src/net/ess3/backup/Backup.java

@@ -1,9 +1,9 @@
-package com.earth2me.essentials.backup;
+package net.ess3.backup;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IBackup;
+import net.ess3.api.IBackup;
-import com.earth2me.essentials.api.IEssentials;
+import net.ess3.api.IEssentials;
-import com.earth2me.essentials.api.ISettings;
+import net.ess3.api.ISettings;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;

Essentials/src/net/ess3/bukkit/Enchantments.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
 import java.util.HashMap;
 import java.util.Locale;

Essentials/src/net/ess3/bukkit/EssentialsPlugin.java

@@ -1,4 +1,4 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
 import org.bukkit.plugin.java.JavaPlugin;
 

Essentials/src/net/ess3/bukkit/Mob.java

@@ -1,6 +1,6 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Locale;

Essentials/src/net/ess3/bukkit/Server.java

@@ -1,6 +1,6 @@
-package com.earth2me.essentials.bukkit;
+package net.ess3.bukkit;
 
-import com.earth2me.essentials.api.server.IServer;
+import net.ess3.api.server.IServer;
 import lombok.Delegate;
 
 public class Server implements IServer {

Essentials/src/net/ess3/commands/Commandafk.java

@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
 

Essentials/src/net/ess3/commands/Commandantioch.java

@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.utils.LocationUtil;
+import net.ess3.utils.LocationUtil;
 import org.bukkit.Location;
 import org.bukkit.entity.TNTPrimed;
 

Essentials/src/net/ess3/commands/Commandback.java

@@ -1,9 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.economy.Trade;
+import net.ess3.economy.Trade;
-import com.earth2me.essentials.permissions.WorldPermissions;
+import net.ess3.permissions.WorldPermissions;
 
 
 public class Commandback extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandbackup.java

@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IBackup;
+import net.ess3.api.IBackup;
-import com.earth2me.essentials.api.ISettings;
+import net.ess3.api.ISettings;
 import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
 

Essentials/src/net/ess3/commands/Commandbalance.java

@@ -1,9 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
-import com.earth2me.essentials.utils.Util;
+import net.ess3.utils.Util;
 import org.bukkit.command.CommandSender;
 
 

Essentials/src/net/ess3/commands/Commandbalancetop.java

@@ -1,10 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.utils.Util;
+import net.ess3.utils.Util;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.utils.textreader.ArrayListInput;
+import net.ess3.utils.textreader.ArrayListInput;
-import com.earth2me.essentials.utils.textreader.TextPager;
+import net.ess3.utils.textreader.TextPager;
 import java.text.DateFormat;
 import java.util.*;
 import java.util.Map.Entry;

Essentials/src/net/ess3/commands/Commandban.java

@@ -1,11 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.Console;
+import net.ess3.Console;
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import org.bukkit.Server;
+import net.ess3.permissions.Permissions;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.user.Ban;
-import com.earth2me.essentials.user.Ban;
 import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

Essentials/src/net/ess3/commands/Commandbanip.java

@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
 import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
 

Essentials/src/net/ess3/commands/Commandbigtree.java

@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.utils.LocationUtil;
+import net.ess3.utils.LocationUtil;
 import org.bukkit.Location;
 import org.bukkit.TreeType;
 

Essentials/src/net/ess3/commands/Commandbreak.java

@@ -1,14 +1,12 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
+
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
+import static net.ess3.I18n._;
 
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
-import static com.earth2me.essentials.I18n._;
-import java.util.ArrayList;
-import java.util.List;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.inventory.ItemStack;
 
 
 public class Commandbreak extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandbroadcast.java

@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.utils.Util;
+import net.ess3.utils.Util;
 import org.bukkit.command.CommandSender;
 
 

Essentials/src/net/ess3/commands/Commandburn.java

@@ -1,6 +1,6 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

Essentials/src/net/ess3/commands/Commandclearinventory.java

@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
 import java.util.List;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

Essentials/src/net/ess3/commands/Commandcompass.java

@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
 
 
 public class Commandcompass extends EssentialsCommand

Essentials/src/net/ess3/commands/Commanddelhome.java

@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
 import java.util.Locale;
 import lombok.Cleanup;
 import org.bukkit.command.CommandSender;

Essentials/src/net/ess3/commands/Commanddeljail.java

@@ -1,6 +1,6 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 import org.bukkit.command.CommandSender;
 
 

Essentials/src/net/ess3/commands/Commanddelwarp.java

@@ -1,6 +1,6 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 import org.bukkit.command.CommandSender;
 
 

Essentials/src/net/ess3/commands/Commanddepth.java

@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
 
 
 public class Commanddepth extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandeco.java

@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.api.ISettings;
+import net.ess3.api.ISettings;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 import java.util.Locale;
 import lombok.Cleanup;
 import org.bukkit.command.CommandSender;

Essentials/src/net/ess3/commands/Commandenchant.java

@@ -1,10 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.bukkit.Enchantments;
+import net.ess3.bukkit.Enchantments;
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.utils.Util;
+import net.ess3.utils.Util;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.EnchantPermissions;
+import net.ess3.permissions.EnchantPermissions;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;

Essentials/src/net/ess3/commands/Commandessentials.java

@@ -1,12 +1,11 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.metrics.Metrics;
+import net.ess3.metrics.Metrics;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.logging.Level;
+
-import java.util.logging.Logger;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

Essentials/src/net/ess3/commands/Commandexp.java

@@ -1,139 +1,139 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
-
+
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.craftbukkit.SetExpFix;
+import net.ess3.craftbukkit.SetExpFix;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
-import com.earth2me.essentials.utils.Util;
+import net.ess3.utils.Util;
-import org.bukkit.command.CommandSender;
+import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
+import org.bukkit.entity.Player;
-
+
-
+
-public class Commandexp extends EssentialsCommand
+public class Commandexp extends EssentialsCommand
-{
+{
-	@Override
+	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
+	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
+	{
-		
+		
-		if (args.length == 0)
+		if (args.length == 0)
-		{
+		{
-			showExp(user, user);
+			showExp(user, user);
-		}
+		}
-		else if (args[0].equalsIgnoreCase("set") && Permissions.EXP_SET.isAuthorized(user))
+		else if (args[0].equalsIgnoreCase("set") && Permissions.EXP_SET.isAuthorized(user))
-		{
+		{
-			if (args.length == 3 && Permissions.EXP_SET_OTHERS.isAuthorized(user))
+			if (args.length == 3 && Permissions.EXP_SET_OTHERS.isAuthorized(user))
-			{
+			{
-				expMatch(user, args[1], args[2], false);
+				expMatch(user, args[1], args[2], false);
-			}
+			}
-			else
+			else
-			{
+			{
-				setExp(user, user, args[1], false);
+				setExp(user, user, args[1], false);
-			}
+			}
-		}
+		}
-		else if (args[0].equalsIgnoreCase("give") && Permissions.EXP_GIVE.isAuthorized(user))
+		else if (args[0].equalsIgnoreCase("give") && Permissions.EXP_GIVE.isAuthorized(user))
-		{
+		{
-			if (args.length == 3 && Permissions.EXP_GIVE_OTHERS.isAuthorized(user))
+			if (args.length == 3 && Permissions.EXP_GIVE_OTHERS.isAuthorized(user))
-			{
+			{
-				expMatch(user, args[1], args[2], true);
+				expMatch(user, args[1], args[2], true);
-			}
+			}
-			else
+			else
-			{
+			{
-				setExp(user, user, args[1], true);
+				setExp(user, user, args[1], true);
-			}
+			}
-		}
+		}
-		else
+		else
-		{
+		{
-			String match = args[0].trim();
+			String match = args[0].trim();
-			if (args.length == 2)
+			if (args.length == 2)
-			{
+			{
-				match = args[1].trim();
+				match = args[1].trim();
-			}
+			}
-			if (match.equalsIgnoreCase("show") || !Permissions.EXP_OTHERS.isAuthorized(user))
+			if (match.equalsIgnoreCase("show") || !Permissions.EXP_OTHERS.isAuthorized(user))
-			{
+			{
-				showExp(user, user);
+				showExp(user, user);
-			}
+			}
-			else
+			else
-			{
+			{
-				showMatch(user, match);
+				showMatch(user, match);
-			}
+			}
-		}
+		}
-	}
+	}
-
+
-	
+	
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
+	{
-		if (args.length < 1)
+		if (args.length < 1)
-		{
+		{
-			throw new NotEnoughArgumentsException();
+			throw new NotEnoughArgumentsException();
-		}
+		}
-		else if (args.length > 2 && args[0].equalsIgnoreCase("set"))
+		else if (args.length > 2 && args[0].equalsIgnoreCase("set"))
-		{
+		{
-			expMatch(sender, args[1], args[2], false);
+			expMatch(sender, args[1], args[2], false);
-		}
+		}
-		else if (args.length > 2 && args[0].equalsIgnoreCase("give"))
+		else if (args.length > 2 && args[0].equalsIgnoreCase("give"))
-		{
+		{
-			expMatch(sender, args[1], args[2], true);
+			expMatch(sender, args[1], args[2], true);
-		}
+		}
-		else
+		else
-		{
+		{
-			String match = args[0].trim();
+			String match = args[0].trim();
-			if (args.length == 2)
+			if (args.length == 2)
-			{
+			{
-				match = args[1].trim();
+				match = args[1].trim();
-			}
+			}
-			showMatch(sender, match);
+			showMatch(sender, match);
-		}
+		}
-	}
+	}
-
+
-	private void showMatch(final CommandSender sender, final String match) throws NotEnoughArgumentsException
+	private void showMatch(final CommandSender sender, final String match) throws NotEnoughArgumentsException
-	{
+	{
-		boolean foundUser = false;
+		boolean foundUser = false;
-		for (Player matchPlayer : server.matchPlayer(match))
+		for (Player matchPlayer : server.matchPlayer(match))
-		{
+		{
-			foundUser = true;
+			foundUser = true;
-			final IUser target = ess.getUser(matchPlayer);
+			final IUser target = ess.getUser(matchPlayer);
-			showExp(sender, target);
+			showExp(sender, target);
-		}
+		}
-		if (!foundUser)
+		if (!foundUser)
-		{
+		{
-			throw new NotEnoughArgumentsException(_("playerNotFound"));
+			throw new NotEnoughArgumentsException(_("playerNotFound"));
-		}
+		}
-	}
+	}
-
+
-	private void expMatch(final CommandSender sender, final String match, final String amount, final boolean toggle) throws NotEnoughArgumentsException
+	private void expMatch(final CommandSender sender, final String match, final String amount, final boolean toggle) throws NotEnoughArgumentsException
-	{
+	{
-		boolean foundUser = false;
+		boolean foundUser = false;
-		for (Player matchPlayer : server.matchPlayer(match))
+		for (Player matchPlayer : server.matchPlayer(match))
-		{
+		{
-			final IUser target = ess.getUser(matchPlayer);
+			final IUser target = ess.getUser(matchPlayer);
-			setExp(sender, target, amount, toggle);
+			setExp(sender, target, amount, toggle);
-			foundUser = true;
+			foundUser = true;
-		}
+		}
-		if (!foundUser)
+		if (!foundUser)
-		{
+		{
-			throw new NotEnoughArgumentsException(_("playerNotFound"));
+			throw new NotEnoughArgumentsException(_("playerNotFound"));
-		}
+		}
-	}
+	}
-
+
-	private void showExp(final CommandSender sender, final IUser target)
+	private void showExp(final CommandSender sender, final IUser target)
-	{
+	{
-		final int totalExp = SetExpFix.getTotalExperience(target);
+		final int totalExp = SetExpFix.getTotalExperience(target);
-		final int expLeft = (int)Util.roundDouble(((((3.5 * target.getLevel()) + 6.7) - (totalExp - ((1.75 * (target.getLevel() * target.getLevel())) + (5.00 * target.getLevel())))) + 1));
+		final int expLeft = (int)Util.roundDouble(((((3.5 * target.getLevel()) + 6.7) - (totalExp - ((1.75 * (target.getLevel() * target.getLevel())) + (5.00 * target.getLevel())))) + 1));
-		sender.sendMessage(_("exp", target.getDisplayName(), SetExpFix.getTotalExperience(target), target.getLevel(), expLeft));
+		sender.sendMessage(_("exp", target.getDisplayName(), SetExpFix.getTotalExperience(target), target.getLevel(), expLeft));
-	}
+	}
-
+
-	private void setExp(final CommandSender sender, final IUser target, final String strAmount, final boolean give)
+	private void setExp(final CommandSender sender, final IUser target, final String strAmount, final boolean give)
-	{
+	{
-		Long amount = Long.parseLong(strAmount);
+		Long amount = Long.parseLong(strAmount);
-		if (give)
+		if (give)
-		{
+		{
-			amount += SetExpFix.getTotalExperience(target);
+			amount += SetExpFix.getTotalExperience(target);
-		}
+		}
-		if (amount > Integer.MAX_VALUE)
+		if (amount > Integer.MAX_VALUE)
-		{
+		{
-			amount = (long)Integer.MAX_VALUE;
+			amount = (long)Integer.MAX_VALUE;
-		}
+		}
-		SetExpFix.setTotalExperience(target, amount.intValue());
+		SetExpFix.setTotalExperience(target, amount.intValue());
-		sender.sendMessage(_("expSet", target.getDisplayName(), amount));
+		sender.sendMessage(_("expSet", target.getDisplayName(), amount));
-	}
+	}
 }

Essentials/src/net/ess3/commands/Commandext.java

@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

Essentials/src/net/ess3/commands/Commandfeed.java

@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
 import java.util.List;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

Essentials/src/net/ess3/commands/Commandfireball.java

@@ -1,6 +1,6 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.SmallFireball;
 import org.bukkit.util.Vector;

Essentials/src/net/ess3/commands/Commandfly.java

@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

Essentials/src/net/ess3/commands/Commandgamemode.java

@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
 import java.util.Locale;
 import org.bukkit.GameMode;
 import org.bukkit.command.CommandSender;

Essentials/src/net/ess3/commands/Commandgc.java

@@ -1,8 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 import org.bukkit.ChatColor;
-import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 

Essentials/src/net/ess3/commands/Commandgetpos.java

@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 

Essentials/src/net/ess3/commands/Commandgive.java

@@ -1,9 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.GivePermissions;
+import net.ess3.permissions.GivePermissions;
-import com.earth2me.essentials.utils.Util;
+import net.ess3.utils.Util;
 import java.util.Locale;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;

Essentials/src/net/ess3/commands/Commandgod.java

@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

Essentials/src/net/ess3/commands/Commandhat.java

@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import net.ess3.craftbukkit.InventoryWorkaround;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;

Essentials/src/net/ess3/commands/Commandheal.java

@@ -1,9 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
-import com.earth2me.essentials.user.UserData.TimestampType;
+import net.ess3.user.UserData.TimestampType;
 import java.util.List;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

Essentials/src/net/ess3/commands/Commandhelp.java

@@ -1,13 +1,13 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.utils.Util;
+import net.ess3.utils.Util;
-import com.earth2me.essentials.utils.textreader.HelpInput;
+import net.ess3.utils.textreader.HelpInput;
-import com.earth2me.essentials.utils.textreader.IText;
+import net.ess3.utils.textreader.IText;
-import com.earth2me.essentials.utils.textreader.KeywordReplacer;
+import net.ess3.utils.textreader.KeywordReplacer;
-import com.earth2me.essentials.utils.textreader.TextInput;
+import net.ess3.utils.textreader.TextInput;
-import com.earth2me.essentials.utils.textreader.TextPager;
+import net.ess3.utils.textreader.TextPager;
 import java.util.Locale;
 import org.bukkit.command.CommandSender;
 

Essentials/src/net/ess3/commands/Commandhelpop.java

@@ -1,9 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.utils.Util;
+import net.ess3.utils.Util;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
 import java.util.logging.Level;
 import org.bukkit.entity.Player;
 

Essentials/src/net/ess3/commands/Commandhome.java

@@ -1,12 +1,12 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
+
+import static net.ess3.I18n._;
+import net.ess3.api.IUser;
+import net.ess3.economy.Trade;
+import net.ess3.permissions.Permissions;
+import net.ess3.permissions.WorldPermissions;
+import net.ess3.utils.Util;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.economy.Trade;
-import com.earth2me.essentials.permissions.Permissions;
-import com.earth2me.essentials.permissions.WorldPermissions;
-import com.earth2me.essentials.utils.Util;
-import de.bananaco.permissions.worlds.WorldPermissionSet;
 import java.util.List;
 import java.util.Locale;
 import org.bukkit.Location;

Essentials/src/net/ess3/commands/Commandignore.java

@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
 
 
 public class Commandignore extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandinfo.java

@@ -1,9 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.utils.textreader.IText;
+import net.ess3.utils.textreader.IText;
-import com.earth2me.essentials.utils.textreader.KeywordReplacer;
+import net.ess3.utils.textreader.KeywordReplacer;
-import com.earth2me.essentials.utils.textreader.TextInput;
+import net.ess3.utils.textreader.TextInput;
-import com.earth2me.essentials.utils.textreader.TextPager;
+import net.ess3.utils.textreader.TextPager;
 import org.bukkit.command.CommandSender;
 
 

Essentials/src/net/ess3/commands/Commandinvsee.java

@@ -1,6 +1,6 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
 
 
 public class Commandinvsee extends EssentialsCommand

Essentials/src/net/ess3/commands/Commanditem.java

@@ -1,9 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.ItemPermissions;
+import net.ess3.permissions.ItemPermissions;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
 import java.util.Locale;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;

Essentials/src/net/ess3/commands/Commanditemdb.java

@@ -1,6 +1,6 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

Essentials/src/net/ess3/commands/Commandjails.java

@@ -1,6 +1,6 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.utils.Util;
+import net.ess3.utils.Util;
 import org.bukkit.command.CommandSender;
 
 

Essentials/src/net/ess3/commands/Commandjump.java

@@ -1,9 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.economy.Trade;
+import net.ess3.economy.Trade;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.utils.LocationUtil;
+import net.ess3.utils.LocationUtil;
 import org.bukkit.Location;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 

Essentials/src/net/ess3/commands/Commandkick.java

@@ -1,9 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import com.earth2me.essentials.Console;
+import net.ess3.Console;
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

Essentials/src/net/ess3/commands/Commandkickall.java

@@ -1,6 +1,6 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

Essentials/src/net/ess3/commands/Commandkill.java

@@ -1,6 +1,6 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageEvent;

Essentials/src/net/ess3/commands/Commandkillall.java

@@ -1,7 +1,7 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.bukkit.Mob;
+import net.ess3.bukkit.Mob;
 import java.util.Collections;
 import java.util.Locale;
 import org.bukkit.Chunk;

Essentials/src/net/ess3/commands/Commandkit.java

@@ -1,16 +1,14 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.economy.Trade;
+import net.ess3.economy.Trade;
-import com.earth2me.essentials.permissions.KitPermissions;
+import net.ess3.permissions.KitPermissions;
-import com.earth2me.essentials.settings.Kit;
+import net.ess3.settings.Kit;
-import com.earth2me.essentials.utils.Util;
+import net.ess3.utils.Util;
 import java.util.Collection;
-import java.util.List;
 import java.util.Locale;
 import org.bukkit.command.CommandSender;
-import org.bukkit.inventory.ItemStack;
 
 
 public class Commandkit extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandkittycannon.java

@@ -1,8 +1,8 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
 
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.bukkit.Mob;
+import net.ess3.bukkit.Mob;
 import java.util.Random;
 import org.bukkit.Location;
 import org.bukkit.entity.Ocelot;

Essentials/src/net/ess3/commands/Commandlightning.java

@@ -1,9 +1,9 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.ISettings;
+import net.ess3.api.ISettings;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
 import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.LightningStrike;

Essentials/src/net/ess3/commands/Commandlist.java

@@ -1,10 +1,10 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.api.ISettings;
+import net.ess3.api.ISettings;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
-import com.earth2me.essentials.utils.Util;
+import net.ess3.utils.Util;
 import java.util.*;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

Essentials/src/net/ess3/commands/Commandmail.java

@@ -1,11 +1,11 @@
-package com.earth2me.essentials.commands;
+package net.ess3.commands;
 
-import static com.earth2me.essentials.I18n._;
+import static net.ess3.I18n._;
-import com.earth2me.essentials.utils.Util;
+import net.ess3.utils.Util;
-import com.earth2me.essentials.api.IUser;
+import net.ess3.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
+import net.ess3.permissions.Permissions;
 import java.util.List;
-import org.bukkit.Server;
+
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;