Merge branch '2.x' of github.com:essentials/Essentials into 2.x

Support aliases in rule and baltop output.

.gitignore

@@ -5,6 +5,7 @@
 /EssentialsGroupBridge/nbproject/private/
 /EssentialsGeoIP/nbproject/private/
 /EssentialsSpawn/nbproject/private/
+/EssentialsXMPP/nbproject/private/
 /EssentialsGroupManager/nbproject/private/
 /BuildAll/build/
 /EssentialsGroupBridge/dist/
@@ -18,6 +19,8 @@
 /EssentialsChat/dist/
 /EssentialsSpawn/build/
 /EssentialsSpawn/dist/
+/EssentialsXMPP/dist/
+/EssentialsXMPP/build/
 /EssentialsProtect/dist/
 /EssentialsProtect/build/
 /EssentialsPermissionsCommands/nbproject/private/

.travis.yml

@@ -15,6 +15,4 @@ notifications:
     recipients:
       - "khobbits@ess3.net"
     on_success: change
-    on_failure: always
-  slack:
-    secure: Au+u0l79voEjTbkxpak2RMIBmVQqp0lJLOFje2wyYYlBOjbbuL71hduuvo0aayQ95IJZkt2Sz33m0ZxdVRhZaMaJ5/miVkqbRnWR6hJ/EeAnFFpTeEjQd8nSrxucJlfd0iXgDoVe76d2MzakLfGReluHLP3TgiAapZF+rH4NCIw=
+    on_failure: always

Essentials/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.mcess</groupId>
+		<groupId>net.ess3</groupId>
 		<artifactId>EssentialsParent</artifactId>
 		<version>2.x-SNAPSHOT</version>
 	</parent>
@@ -87,7 +87,7 @@
 			<systemPath>${project.basedir}/../lib/iCo6.jar</systemPath>
 		</dependency>
 		<dependency>
-			<groupId>org.mcess</groupId>
+			<groupId>net.ess3</groupId>
 			<artifactId>GroupManager</artifactId>
 			<version>${project.version}</version>
 			<scope>system</scope>

Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java

@@ -1,4 +1,4 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
 import java.util.*;
 import java.util.logging.Level;
@@ -31,7 +31,7 @@ public class AlternativeCommandsHandler
 
 	public final void addPlugin(final Plugin plugin)
 	{
-		if (plugin.getDescription().getMain().contains("org.mcess.essentials"))
+		if (plugin.getDescription().getMain().contains("com.earth2me.essentials"))
 		{
 			return;
 		}

Essentials/src/com/earth2me/essentials/Backup.java

@@ -0,0 +1,168 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n.tl;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+
+
+public class Backup implements Runnable
+{
+	private static final Logger LOGGER = Logger.getLogger("Essentials");
+	private transient final Server server;
+	private transient final IEssentials ess;
+	private transient boolean running = false;
+	private transient int taskId = -1;
+	private transient boolean active = false;
+
+	public Backup(final IEssentials ess)
+	{
+		this.ess = ess;
+		server = ess.getServer();
+		if (!ess.getOnlinePlayers().isEmpty())
+		{
+			ess.runTaskAsynchronously(new Runnable()
+			{
+				@Override
+				public void run()
+				{
+					startTask();
+				}
+			});
+		}
+	}
+
+	public void onPlayerJoin()
+	{
+		startTask();
+	}
+
+	public synchronized void stopTask()
+	{
+		running = false;
+		if (taskId != -1)
+		{
+			server.getScheduler().cancelTask(taskId);
+		}
+		taskId = -1;
+	}
+
+	private synchronized void startTask()
+	{
+		if (!running)
+		{
+			final long interval = ess.getSettings().getBackupInterval() * 1200; // minutes -> ticks
+			if (interval < 1200)
+			{
+				return;
+			}
+			taskId = ess.scheduleSyncRepeatingTask(this, interval, interval);
+			running = true;
+		}
+	}
+
+	@Override
+	public void run()
+	{
+		if (active)
+		{
+			return;
+		}
+		active = true;
+		final String command = ess.getSettings().getBackupCommand();
+		if (command == null || "".equals(command))
+		{
+			return;
+		}
+		if ("save-all".equalsIgnoreCase(command))
+		{
+			final CommandSender cs = server.getConsoleSender();
+			server.dispatchCommand(cs, "save-all");
+			active = false;
+			return;
+		}
+		LOGGER.log(Level.INFO, tl("backupStarted"));
+		final CommandSender cs = server.getConsoleSender();
+		server.dispatchCommand(cs, "save-all");
+		server.dispatchCommand(cs, "save-off");
+
+		ess.runTaskAsynchronously(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				try
+				{
+					final ProcessBuilder childBuilder = new ProcessBuilder(command);
+					childBuilder.redirectErrorStream(true);
+					childBuilder.directory(ess.getDataFolder().getParentFile().getParentFile());
+					final Process child = childBuilder.start();
+					ess.runTaskAsynchronously(new Runnable()
+					{
+						@Override
+						public void run()
+						{
+							try
+							{
+								final BufferedReader reader = new BufferedReader(new InputStreamReader(child.getInputStream()));
+								try
+								{
+									String line;
+									do
+									{
+										line = reader.readLine();
+										if (line != null)
+										{
+											LOGGER.log(Level.INFO, line);
+										}
+									}
+									while (line != null);
+								}
+								finally
+								{
+									reader.close();
+								}
+							}
+							catch (IOException ex)
+							{
+								LOGGER.log(Level.SEVERE, null, ex);
+							}
+						}
+					});
+					child.waitFor();
+				}
+				catch (InterruptedException ex)
+				{
+					LOGGER.log(Level.SEVERE, null, ex);
+				}
+				catch (IOException ex)
+				{
+					LOGGER.log(Level.SEVERE, null, ex);
+				}
+				finally
+				{
+					class BackupEnableSaveTask implements Runnable
+					{
+						@Override
+						public void run()
+						{
+							server.dispatchCommand(cs, "save-on");
+							if (ess.getOnlinePlayers().isEmpty())
+							{
+								stopTask();
+							}
+							active = false;
+							LOGGER.log(Level.INFO, tl("backupFinished"));
+						}
+					}
+					ess.scheduleSyncDelayedTask(new BackupEnableSaveTask());
+				}
+			}
+		});
+	}
+}

Essentials/src/com/earth2me/essentials/ChargeException.java

@@ -1,4 +1,4 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
 
 public class ChargeException extends Exception

Essentials/src/com/earth2me/essentials/CommandSource.java

@@ -1,4 +1,4 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

Essentials/src/com/earth2me/essentials/Console.java

@@ -1,4 +1,4 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;

Essentials/src/com/earth2me/essentials/Enchantments.java

@@ -1,6 +1,6 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.NumberUtil;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;

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

@@ -15,26 +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 org.mcess.essentials;
+package com.earth2me.essentials;
 
-import static org.mcess.essentials.I18n.tl;
-import org.mcess.essentials.commands.EssentialsCommand;
-import org.mcess.essentials.commands.IEssentialsCommand;
-import org.mcess.essentials.commands.NoChargeException;
-import org.mcess.essentials.commands.NotEnoughArgumentsException;
-import org.mcess.essentials.commands.QuietAbortException;
-import org.mcess.essentials.metrics.Metrics;
-import org.mcess.essentials.metrics.MetricsListener;
-import org.mcess.essentials.metrics.MetricsStarter;
-import org.mcess.essentials.perm.PermissionsHandler;
-import org.mcess.essentials.register.payment.Methods;
-import org.mcess.essentials.signs.SignBlockListener;
-import org.mcess.essentials.signs.SignEntityListener;
-import org.mcess.essentials.signs.SignPlayerListener;
-import org.mcess.essentials.textreader.IText;
-import org.mcess.essentials.textreader.KeywordReplacer;
-import org.mcess.essentials.textreader.SimpleTextInput;
-import org.mcess.essentials.utils.DateUtil;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.commands.EssentialsCommand;
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import com.earth2me.essentials.commands.NoChargeException;
+import com.earth2me.essentials.commands.NotEnoughArgumentsException;
+import com.earth2me.essentials.commands.QuietAbortException;
+import com.earth2me.essentials.metrics.Metrics;
+import com.earth2me.essentials.metrics.MetricsListener;
+import com.earth2me.essentials.metrics.MetricsStarter;
+import com.earth2me.essentials.perm.PermissionsHandler;
+import com.earth2me.essentials.register.payment.Methods;
+import com.earth2me.essentials.signs.SignBlockListener;
+import com.earth2me.essentials.signs.SignEntityListener;
+import com.earth2me.essentials.signs.SignPlayerListener;
+import com.earth2me.essentials.textreader.IText;
+import com.earth2me.essentials.textreader.KeywordReplacer;
+import com.earth2me.essentials.textreader.SimpleTextInput;
+import com.earth2me.essentials.utils.DateUtil;
 import com.google.common.base.Function;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Iterables;
@@ -96,6 +96,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 	private transient Warps warps;
 	private transient Worth worth;
 	private transient List<IConf> confList;
+	private transient Backup backup;
 	private transient ItemDb itemDb;
 	private transient final Methods paymentMethod = new Methods();
 	private transient PermissionsHandler permissionsHandler;
@@ -114,7 +115,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 
 	public Essentials(final Server server)
 	{
-		super(new JavaPluginLoader(server), new PluginDescriptionFile("Essentials", "", "Essentials"), null, null);
+		super(new JavaPluginLoader(server), new PluginDescriptionFile("Essentials", "", "com.earth2me.essentials.Essentials"), null, null);
 	}
 
 	@Override
@@ -238,6 +239,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 				handleCrash(exception);
 				return;
 			}
+			backup = new Backup(this);
 			permissionsHandler = new PermissionsHandler(this, settings.useBukkitPermissions());
 			alternativeCommandsHandler = new AlternativeCommandsHandler(this);
 
@@ -337,6 +339,10 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 		{
 			i18n.onDisable();
 		}
+		if (backup != null)
+		{
+			backup.stopTask();
+		}
 		Economy.setEss(null);
 		Trade.closeLog();
 		getUserMap().getUUIDMap().forceWriteUUIDMap();
@@ -393,7 +399,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 	@Override
 	public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args)
 	{
-		return onCommandEssentials(sender, command, commandLabel, args, Essentials.class.getClassLoader(), "org.mcess.essentials.commands.Command", "essentials.", null);
+		return onCommandEssentials(sender, command, commandLabel, args, Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.", null);
 	}
 
 	@Override
@@ -609,7 +615,16 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 	}
 
 	@Override
-	public Worth getWorth() { return worth; }
+	public Worth getWorth()
+	{
+		return worth;
+	}
+
+	@Override
+	public Backup getBackup()
+	{
+		return backup;
+	}
 
 	@Override
 	public Metrics getMetrics()

Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java

@@ -1,8 +1,9 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.utils.LocationUtil;
+import com.earth2me.essentials.utils.LocationUtil;
 import java.util.Locale;
 import net.ess3.api.IEssentials;
+import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.CreatureSpawner;
@@ -51,5 +52,20 @@ public class EssentialsBlockListener implements Listener
 				}
 			}
 		}
+
+		final User user = ess.getUser(event.getPlayer());
+		if (user.hasUnlimited(is) && user.getBase().getGameMode() == GameMode.SURVIVAL)
+		{
+			class UnlimitedItemSpawnTask implements Runnable
+			{
+				@Override
+				public void run()
+				{
+					user.getBase().getInventory().addItem(is);
+					user.getBase().updateInventory();
+				}
+			}
+			ess.scheduleSyncDelayedTask(new UnlimitedItemSpawnTask());
+		}
 	}
 }

Essentials/src/com/earth2me/essentials/EssentialsConf.java

@@ -1,5 +1,6 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n.tl;
 import com.google.common.io.Files;
 import java.io.*;
 import java.math.BigDecimal;
@@ -58,7 +59,7 @@ public class EssentialsConf extends YamlConfiguration
 		{
 			if (!configFile.getParentFile().mkdirs())
 			{
-				LOGGER.log(Level.SEVERE, I18n.tl("failedToCreateConfig", configFile.toString()));
+				LOGGER.log(Level.SEVERE, tl("failedToCreateConfig", configFile.toString()));
 			}
 		}
 		// This will delete files where the first character is 0. In most cases they are broken.
@@ -109,7 +110,7 @@ public class EssentialsConf extends YamlConfiguration
 			}
 			else if (templateName != null)
 			{
-				LOGGER.log(Level.INFO, I18n.tl("creatingConfigFromTemplate", configFile.toString()));
+				LOGGER.log(Level.INFO, tl("creatingConfigFromTemplate", configFile.toString()));
 				createFromTemplate();
 			}
 			else
@@ -218,7 +219,7 @@ public class EssentialsConf extends YamlConfiguration
 			istr = resourceClass.getResourceAsStream(templateName);
 			if (istr == null)
 			{
-				LOGGER.log(Level.SEVERE, I18n.tl("couldNotFindTemplate", templateName));
+				LOGGER.log(Level.SEVERE, tl("couldNotFindTemplate", templateName));
 				return;
 			}
 			ostr = new FileOutputStream(configFile);
@@ -233,7 +234,7 @@ public class EssentialsConf extends YamlConfiguration
 		}
 		catch (IOException ex)
 		{
-			LOGGER.log(Level.SEVERE, I18n.tl("failedToWriteConfig", configFile.toString()), ex);
+			LOGGER.log(Level.SEVERE, tl("failedToWriteConfig", configFile.toString()), ex);
 		}
 		finally
 		{
@@ -257,7 +258,7 @@ public class EssentialsConf extends YamlConfiguration
 			}
 			catch (IOException ex)
 			{
-				LOGGER.log(Level.SEVERE, I18n.tl("failedToCloseConfig", configFile.toString()), ex);
+				LOGGER.log(Level.SEVERE, tl("failedToCloseConfig", configFile.toString()), ex);
 			}
 		}
 	}
@@ -397,16 +398,16 @@ public class EssentialsConf extends YamlConfiguration
 					{
 						try
 						{
-							LOGGER.log(Level.INFO, I18n.tl("creatingEmptyConfig", configFile.toString()));
+							LOGGER.log(Level.INFO, tl("creatingEmptyConfig", configFile.toString()));
 							if (!configFile.createNewFile())
 							{
-								LOGGER.log(Level.SEVERE, I18n.tl("failedToCreateConfig", configFile.toString()));
+								LOGGER.log(Level.SEVERE, tl("failedToCreateConfig", configFile.toString()));
 								return;
 							}
 						}
 						catch (IOException ex)
 						{
-							LOGGER.log(Level.SEVERE, I18n.tl("failedToCreateConfig", configFile.toString()), ex);
+							LOGGER.log(Level.SEVERE, tl("failedToCreateConfig", configFile.toString()), ex);
 							return;
 						}
 					}

Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java

@@ -1,5 +1,6 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n.tl;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -151,7 +152,7 @@ public class EssentialsEntityListener implements Listener
 		if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back"))
 		{
 			user.setLastLocation();
-			user.sendMessage(I18n.tl("backAfterDeath"));
+			user.sendMessage(tl("backAfterDeath"));
 		}
 		if (!ess.getSettings().areDeathMessagesEnabled())
 		{

Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java

@@ -1,10 +1,11 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.textreader.IText;
-import org.mcess.essentials.textreader.KeywordReplacer;
-import org.mcess.essentials.textreader.TextInput;
-import org.mcess.essentials.textreader.TextPager;
-import org.mcess.essentials.utils.LocationUtil;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.textreader.IText;
+import com.earth2me.essentials.textreader.KeywordReplacer;
+import com.earth2me.essentials.textreader.TextInput;
+import com.earth2me.essentials.textreader.TextPager;
+import com.earth2me.essentials.utils.LocationUtil;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
@@ -28,6 +29,7 @@ import org.bukkit.event.player.PlayerLoginEvent.Result;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.inventory.ItemStack;
 
 
 public class EssentialsPlayerListener implements Listener
@@ -60,8 +62,8 @@ public class EssentialsPlayerListener implements Listener
 		if (user.isMuted())
 		{
 			event.setCancelled(true);
-			user.sendMessage(I18n.tl("voiceSilenced"));
-			LOGGER.info(I18n.tl("mutedUserSpeaks", user.getName()));
+			user.sendMessage(tl("voiceSilenced"));
+			LOGGER.info(tl("mutedUserSpeaks", user.getName()));
 		}
 		try
 		{
@@ -216,6 +218,8 @@ public class EssentialsPlayerListener implements Listener
 		{
 			return;
 		}
+
+		ess.getBackup().onPlayerJoin();
 		final User dUser = ess.getUser(player);
 
 
@@ -322,11 +326,11 @@ public class EssentialsPlayerListener implements Listener
 					final List<String> mail = user.getMails();
 					if (mail.isEmpty())
 					{
-						user.sendMessage(I18n.tl("noNewMail"));
+						user.sendMessage(tl("noNewMail"));
 					}
 					else
 					{
-						user.sendMessage(I18n.tl("youHaveNewMail", mail.size()));
+						user.sendMessage(tl("youHaveNewMail", mail.size()));
 					}
 				}
 
@@ -337,7 +341,7 @@ public class EssentialsPlayerListener implements Listener
 					{
 						user.getBase().setAllowFlight(true);
 						user.getBase().setFlying(true);
-						user.getBase().sendMessage(I18n.tl("flyMode", I18n.tl("enabled"), user.getDisplayName()));
+						user.getBase().sendMessage(tl("flyMode", tl("enabled"), user.getDisplayName()));
 					}
 				}
 
@@ -381,7 +385,7 @@ public class EssentialsPlayerListener implements Listener
 				event.allow();
 				return;
 			}
-			event.disallow(Result.KICK_FULL, I18n.tl("serverFull"));
+			event.disallow(Result.KICK_FULL, tl("serverFull"));
 			break;
 		default:
 			break;
@@ -408,6 +412,36 @@ public class EssentialsPlayerListener implements Listener
 		}
 	}
 
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+	public void onPlayerEggThrow(final PlayerEggThrowEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		final ItemStack stack = new ItemStack(Material.EGG, 1);
+		if (user.hasUnlimited(stack))
+		{
+			user.getBase().getInventory().addItem(stack);
+			user.getBase().updateInventory();
+		}
+	}
+
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+	public void onPlayerBucketEmpty(final PlayerBucketEmptyEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		if (user.hasUnlimited(new ItemStack(event.getBucket())))
+		{
+			event.getItemStack().setType(event.getBucket());
+			ess.scheduleSyncDelayedTask(new Runnable()
+			{
+				@Override
+				public void run()
+				{
+					user.getBase().updateInventory();
+				}
+			});
+		}
+	}
+
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event)
 	{
@@ -475,12 +509,12 @@ public class EssentialsPlayerListener implements Listener
 		updateCompass(user);
 		if (ess.getSettings().getNoGodWorlds().contains(newWorld) && user.isGodModeEnabledRaw())
 		{
-			user.sendMessage(I18n.tl("noGodWorldWarning"));
+			user.sendMessage(tl("noGodWorldWarning"));
 		}
 
 		if (!user.getWorld().getName().equals(newWorld))
 		{
-			user.sendMessage(I18n.tl("currentWorld", newWorld));
+			user.sendMessage(tl("currentWorld", newWorld));
 		}
 		if (user.isVanished())
 		{
@@ -500,7 +534,7 @@ public class EssentialsPlayerListener implements Listener
 				if (player.isAuthorized("essentials.sethome.bed"))
 				{
 					player.getBase().setBedSpawnLocation(event.getClickedBlock().getLocation());
-					player.sendMessage(I18n.tl("bedSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
+					player.sendMessage(tl("bedSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
 				}
 			}
 			break;

Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java

@@ -1,7 +1,7 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.perm.PermissionsHandler;
-import org.mcess.essentials.register.payment.Methods;
+import com.earth2me.essentials.perm.PermissionsHandler;
+import com.earth2me.essentials.register.payment.Methods;
 import java.util.logging.Level;
 import net.ess3.api.IEssentials;
 import org.bukkit.event.EventHandler;

Essentials/src/com/earth2me/essentials/EssentialsTimer.java

@@ -1,4 +1,4 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
 import java.util.HashSet;
 import java.util.Iterator;

Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java

@@ -1,10 +1,11 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.craftbukkit.BanLookup;
-import org.mcess.essentials.craftbukkit.FakeWorld;
-import org.mcess.essentials.settings.Spawns;
-import org.mcess.essentials.storage.YamlStorageWriter;
-import org.mcess.essentials.utils.StringUtil;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.craftbukkit.BanLookup;
+import com.earth2me.essentials.craftbukkit.FakeWorld;
+import com.earth2me.essentials.settings.Spawns;
+import com.earth2me.essentials.storage.YamlStorageWriter;
+import com.earth2me.essentials.utils.StringUtil;
 import com.google.common.base.Charsets;
 import java.io.*;
 import java.math.BigInteger;
@@ -18,7 +19,6 @@ import org.bukkit.BanList;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
-import org.mcess.essentials.settings.Jails;
 
 
 public class EssentialsUpgrade
@@ -78,7 +78,7 @@ public class EssentialsUpgrade
 		}
 		catch (IOException e)
 		{
-			LOGGER.log(Level.SEVERE, I18n.tl("upgradingFilesError"), e);
+			LOGGER.log(Level.SEVERE, tl("upgradingFilesError"), e);
 		}
 	}
 
@@ -128,11 +128,11 @@ public class EssentialsUpgrade
 		{
 			if (!file.renameTo(new File(file.getParentFile(), file.getName().concat("." + System.currentTimeMillis() + ".upgradebackup"))))
 			{
-				throw new Exception(I18n.tl("configFileMoveError"));
+				throw new Exception(tl("configFileMoveError"));
 			}
 			if (!tempFile.renameTo(file))
 			{
-				throw new Exception(I18n.tl("configFileRenameError"));
+				throw new Exception(tl("configFileRenameError"));
 			}
 		}
 		else
@@ -296,17 +296,17 @@ public class EssentialsUpgrade
 			final File newFile = new File(listOfFile.getParentFile(), sanitizedFilename);
 			if (!listOfFile.renameTo(tmpFile))
 			{
-				LOGGER.log(Level.WARNING, I18n.tl("userdataMoveError", filename, sanitizedFilename));
+				LOGGER.log(Level.WARNING, tl("userdataMoveError", filename, sanitizedFilename));
 				continue;
 			}
 			if (newFile.exists())
 			{
-				LOGGER.log(Level.WARNING, I18n.tl("duplicatedUserdata", filename, sanitizedFilename));
+				LOGGER.log(Level.WARNING, tl("duplicatedUserdata", filename, sanitizedFilename));
 				continue;
 			}
 			if (!tmpFile.renameTo(newFile))
 			{
-				LOGGER.log(Level.WARNING, I18n.tl("userdataMoveBackError", sanitizedFilename, sanitizedFilename));
+				LOGGER.log(Level.WARNING, tl("userdataMoveBackError", sanitizedFilename, sanitizedFilename));
 			}
 		}
 		doneFile.setProperty("sanitizeAllUserFilenames", true);
@@ -416,7 +416,7 @@ public class EssentialsUpgrade
 					}
 					if (!configFile.renameTo(new File(ess.getDataFolder(), "spawn.yml.old")))
 					{
-						throw new Exception(I18n.tl("fileRenameError", "spawn.yml"));
+						throw new Exception(tl("fileRenameError", "spawn.yml"));
 					}
 					PrintWriter writer = new PrintWriter(configFile);
 					try
@@ -454,7 +454,7 @@ public class EssentialsUpgrade
 				config.load();
 				if (!config.hasProperty("jails"))
 				{
-					final org.mcess.essentials.settings.Jails jails = new Jails();
+					final com.earth2me.essentials.settings.Jails jails = new com.earth2me.essentials.settings.Jails();
 					Set<String> keys = config.getKeys(false);
 					for (String jailName : keys)
 					{
@@ -463,7 +463,7 @@ public class EssentialsUpgrade
 					}
 					if (!configFile.renameTo(new File(ess.getDataFolder(), "jail.yml.old")))
 					{
-						throw new Exception(I18n.tl("fileRenameError", "jail.yml"));
+						throw new Exception(tl("fileRenameError", "jail.yml"));
 					}
 					PrintWriter writer = new PrintWriter(configFile);
 					try

Essentials/src/com/earth2me/essentials/EssentialsUserConf.java

@@ -1,4 +1,4 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Files;

Essentials/src/com/earth2me/essentials/ExecuteTimer.java

@@ -1,4 +1,4 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;

Essentials/src/com/earth2me/essentials/I18n.java

@@ -1,4 +1,4 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -12,6 +12,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import net.ess3.api.IEssentials;
+import org.bukkit.Bukkit;
 
 
 public class I18n implements net.ess3.api.II18n

Essentials/src/com/earth2me/essentials/IConf.java

@@ -1,4 +1,4 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
 public interface IConf
 {

Essentials/src/com/earth2me/essentials/IEssentials.java

@@ -1,11 +1,11 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.api.IItemDb;
-import org.mcess.essentials.api.IJails;
-import org.mcess.essentials.api.IWarps;
-import org.mcess.essentials.metrics.Metrics;
-import org.mcess.essentials.perm.PermissionsHandler;
-import org.mcess.essentials.register.payment.Methods;
+import com.earth2me.essentials.api.IItemDb;
+import com.earth2me.essentials.api.IJails;
+import com.earth2me.essentials.api.IWarps;
+import com.earth2me.essentials.metrics.Metrics;
+import com.earth2me.essentials.perm.PermissionsHandler;
+import com.earth2me.essentials.register.payment.Methods;
 import java.util.Collection;
 import java.util.List;
 import java.util.UUID;
@@ -57,6 +57,8 @@ public interface IEssentials extends Plugin
 
 	Worth getWorth();
 
+	Backup getBackup();
+
 	Methods getPaymentMethod();
 
 	BukkitTask runTaskAsynchronously(Runnable run);

Essentials/src/com/earth2me/essentials/IEssentialsModule.java

@@ -1,4 +1,4 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
 
 public interface IEssentialsModule

Essentials/src/com/earth2me/essentials/IReplyTo.java

@@ -1,4 +1,4 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
 public interface IReplyTo
 {

Essentials/src/com/earth2me/essentials/ISettings.java

@@ -1,8 +1,8 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.commands.IEssentialsCommand;
-import org.mcess.essentials.signs.EssentialsSign;
-import org.mcess.essentials.textreader.IText;
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import com.earth2me.essentials.signs.EssentialsSign;
+import com.earth2me.essentials.textreader.IText;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
@@ -22,6 +22,10 @@ public interface ISettings extends IConf
 
 	String getNewPlayerKit();
 
+	String getBackupCommand();
+
+	long getBackupInterval();
+
 	String getChatFormat(String group);
 
 	int getChatRadius();
@@ -86,6 +90,8 @@ public interface ISettings extends IConf
 
 	double getTeleportDelay();
 
+	boolean hidePermissionlessHelp();
+
 	boolean isCommandDisabled(final IEssentialsCommand cmd);
 
 	boolean isCommandDisabled(String label);
@@ -104,6 +110,8 @@ public interface ISettings extends IConf
 
 	boolean permissionBasedItemSpawn();
 
+	boolean showNonEssCommandsInHelp();
+
 	boolean warnOnBuildDisallow();
 
 	boolean warnOnSmite();

Essentials/src/com/earth2me/essentials/ITarget.java

@@ -1,4 +1,4 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
 import org.bukkit.Location;
 

Essentials/src/com/earth2me/essentials/IUser.java

@@ -1,6 +1,6 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.commands.IEssentialsCommand;
+import com.earth2me.essentials.commands.IEssentialsCommand;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;

Essentials/src/com/earth2me/essentials/ItemDb.java

@@ -1,7 +1,8 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.utils.NumberUtil;
-import org.mcess.essentials.utils.StringUtil;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.StringUtil;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -142,20 +143,20 @@ public class ItemDb implements IConf, net.ess3.api.IItemDb
 				}
 				catch (Throwable throwable)
 				{
-					throw new Exception(I18n.tl("unknownItemName", itemname), throwable);
+					throw new Exception(tl("unknownItemName", itemname), throwable);
 				}
 			}
 		}
 
 		if (itemid < 1)
 		{
-			throw new Exception(I18n.tl("unknownItemName", itemname));
+			throw new Exception(tl("unknownItemName", itemname));
 		}
 
 		final Material mat = Material.getMaterial(itemid);
 		if (mat == null)
 		{
-			throw new Exception(I18n.tl("unknownItemId", itemid));
+			throw new Exception(tl("unknownItemId", itemid));
 		}
 		final ItemStack retval = new ItemStack(mat);
 		retval.setAmount(mat.getMaxStackSize());
@@ -205,7 +206,7 @@ public class ItemDb implements IConf, net.ess3.api.IItemDb
 
 		if (is.isEmpty() || is.get(0).getType() == Material.AIR)
 		{
-			throw new Exception(I18n.tl("itemSellAir"));
+			throw new Exception(tl("itemSellAir"));
 		}
 
 		return is;

Essentials/src/com/earth2me/essentials/Jails.java

@@ -1,6 +1,7 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.storage.AsyncStorageObjectHolder;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
 import java.io.File;
 import java.util.*;
 import java.util.logging.Level;
@@ -28,14 +29,14 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.plugin.PluginManager;
 
 
-public class Jails extends AsyncStorageObjectHolder<org.mcess.essentials.settings.Jails> implements net.ess3.api.IJails
+public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Jails> implements net.ess3.api.IJails
 {
 	private static final transient Logger LOGGER = Bukkit.getLogger();
 	private static transient boolean enabled = false;
 
 	public Jails(final IEssentials ess)
 	{
-		super(ess, org.mcess.essentials.settings.Jails.class);
+		super(ess, com.earth2me.essentials.settings.Jails.class);
 		reloadConfig();
 	}
 
@@ -92,12 +93,12 @@ public class Jails extends AsyncStorageObjectHolder<org.mcess.essentials.setting
 			if (getData().getJails() == null || jailName == null
 				|| !getData().getJails().containsKey(jailName.toLowerCase(Locale.ENGLISH)))
 			{
-				throw new Exception(I18n.tl("jailNotExist"));
+				throw new Exception(tl("jailNotExist"));
 			}
 			Location loc = getData().getJails().get(jailName.toLowerCase(Locale.ENGLISH));
 			if (loc == null || loc.getWorld() == null)
 			{
-				throw new Exception(I18n.tl("jailNotExist"));
+				throw new Exception(tl("jailNotExist"));
 			}
 			return loc;
 		}
@@ -271,11 +272,11 @@ public class Jails extends AsyncStorageObjectHolder<org.mcess.essentials.setting
 			{
 				if (ess.getSettings().isDebug())
 				{
-					LOGGER.log(Level.INFO, I18n.tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
+					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
 				}
 				else
 				{
-					LOGGER.log(Level.INFO, I18n.tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
+					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
 				}
 			}
 		}
@@ -297,14 +298,14 @@ public class Jails extends AsyncStorageObjectHolder<org.mcess.essentials.setting
 			{
 				if (ess.getSettings().isDebug())
 				{
-					LOGGER.log(Level.INFO, I18n.tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
+					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
 				}
 				else
 				{
-					LOGGER.log(Level.INFO, I18n.tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
+					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
 				}
 			}
-			user.sendMessage(I18n.tl("jailMessage"));
+			user.sendMessage(tl("jailMessage"));
 		}
 
 		@EventHandler(priority = EventPriority.HIGHEST)
@@ -326,14 +327,14 @@ public class Jails extends AsyncStorageObjectHolder<org.mcess.essentials.setting
 			{
 				if (ess.getSettings().isDebug())
 				{
-					LOGGER.log(Level.INFO, I18n.tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
+					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
 				}
 				else
 				{
-					LOGGER.log(Level.INFO, I18n.tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
+					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
 				}
 			}
-			user.sendMessage(I18n.tl("jailMessage"));
+			user.sendMessage(tl("jailMessage"));
 		}
 	}
 }

Essentials/src/com/earth2me/essentials/Kit.java

@@ -1,12 +1,15 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.commands.NoChargeException;
-import org.mcess.essentials.craftbukkit.InventoryWorkaround;
-import org.mcess.essentials.textreader.IText;
-import org.mcess.essentials.textreader.KeywordReplacer;
-import org.mcess.essentials.textreader.SimpleTextInput;
-import org.mcess.essentials.utils.DateUtil;
-import org.mcess.essentials.utils.NumberUtil;
+import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n.capitalCase;
+import com.earth2me.essentials.Trade.OverflowType;
+import com.earth2me.essentials.commands.NoChargeException;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import com.earth2me.essentials.textreader.IText;
+import com.earth2me.essentials.textreader.KeywordReplacer;
+import com.earth2me.essentials.textreader.SimpleTextInput;
+import com.earth2me.essentials.utils.DateUtil;
+import com.earth2me.essentials.utils.NumberUtil;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.logging.Level;
@@ -32,7 +35,7 @@ public class Kit
 
 		if (kit == null)
 		{
-			throw new Exception(I18n.tl("kitNotFound"));
+			throw new Exception(tl("kitNotFound"));
 		}
 	}
 
@@ -47,22 +50,22 @@ public class Kit
 			{
 				if (user == null)
 				{
-					list.append(" ").append(I18n.capitalCase(kitItem));
+					list.append(" ").append(capitalCase(kitItem));
 				}
 				else if (user.isAuthorized("essentials.kits." + kitItem.toLowerCase(Locale.ENGLISH)))
 				{
 					String cost = "";
-					String name = I18n.capitalCase(kitItem);
+					String name = capitalCase(kitItem);
 					BigDecimal costPrice = new Trade("kit-" + kitItem.toLowerCase(Locale.ENGLISH), ess).getCommandCost(user);
 					if (costPrice.signum() > 0)
 					{
-						cost = I18n.tl("kitCost", NumberUtil.displayCurrency(costPrice, ess));
+						cost = tl("kitCost", NumberUtil.displayCurrency(costPrice, ess));
 					}
 
 					Kit kit = new Kit(kitItem, ess);
 					if (kit.getNextUse(user) != 0)
 					{
-						name = I18n.tl("kitDelay", name);
+						name = tl("kitDelay", name);
 					}
 
 					list.append(" ").append(name).append(cost);
@@ -72,7 +75,7 @@ public class Kit
 		}
 		catch (Exception ex)
 		{
-			throw new Exception(I18n.tl("kitError"), ex);
+			throw new Exception(tl("kitError"), ex);
 		}
 
 	}
@@ -86,7 +89,7 @@ public class Kit
 	{
 		if (!user.isAuthorized("essentials.kits." + kitName))
 		{
-			throw new Exception(I18n.tl("noKitPermission", "essentials.kits." + kitName));
+			throw new Exception(tl("noKitPermission", "essentials.kits." + kitName));
 		}
 	}
 
@@ -100,12 +103,12 @@ public class Kit
 		}
 		else if (nextUse < 0L)
 		{
-			user.sendMessage(I18n.tl("kitOnce"));
+			user.sendMessage(tl("kitOnce"));
 			throw new NoChargeException();
 		}
 		else
 		{
-			user.sendMessage(I18n.tl("kitTimed", DateUtil.formatDateDiff(nextUse)));
+			user.sendMessage(tl("kitTimed", DateUtil.formatDateDiff(nextUse)));
 			throw new NoChargeException();
 		}
 	}
@@ -143,7 +146,7 @@ public class Kit
 		}
 		catch (Exception e)
 		{
-			throw new Exception(I18n.tl("kitError2"));
+			throw new Exception(tl("kitError2"));
 		}
 
 		// When was the last kit used?
@@ -181,7 +184,7 @@ public class Kit
 	{
 		if (kit == null)
 		{
-			throw new Exception(I18n.tl("kitNotFound"));
+			throw new Exception(tl("kitNotFound"));
 		}
 		try
 		{
@@ -205,7 +208,7 @@ public class Kit
 		catch (Exception e)
 		{
 			ess.getLogger().log(Level.WARNING, "Error parsing kit " + kitName + ": " + e.getMessage());
-			throw new Exception(I18n.tl("kitError2"), e);
+			throw new Exception(tl("kitError2"), e);
 		}
 	}
 
@@ -229,7 +232,7 @@ public class Kit
 				{
 					BigDecimal value = new BigDecimal(kitItem.substring(ess.getSettings().getCurrencySymbol().length()).trim());
 					Trade t = new Trade(value, ess);
-					t.pay(user, Trade.OverflowType.DROP);
+					t.pay(user, OverflowType.DROP);
 					continue;
 				}
 
@@ -277,14 +280,14 @@ public class Kit
 			user.getBase().updateInventory();
 			if (spew)
 			{
-				user.sendMessage(I18n.tl("kitInvFull"));
+				user.sendMessage(tl("kitInvFull"));
 			}
 		}
 		catch (Exception e)
 		{
 			user.getBase().updateInventory();
 			ess.getLogger().log(Level.WARNING, e.getMessage());
-			throw new Exception(I18n.tl("kitError2"), e);
+			throw new Exception(tl("kitError2"), e);
 		}
 	}
 }

Essentials/src/com/earth2me/essentials/LocationTarget.java

@@ -1,4 +1,4 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
 import org.bukkit.Location;
 

Essentials/src/com/earth2me/essentials/ManagedFile.java

@@ -1,5 +1,6 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n.tl;
 import java.io.*;
 import java.math.BigInteger;
 import java.security.DigestInputStream;
@@ -46,7 +47,7 @@ public class ManagedFile
 			}
 			catch (IOException ex)
 			{
-				Bukkit.getLogger().log(Level.SEVERE, I18n.tl("itemsCsvNotLoaded"), ex);
+				Bukkit.getLogger().log(Level.SEVERE, tl("itemsCsvNotLoaded"), ex);
 			}
 		}
 	}

Essentials/src/com/earth2me/essentials/MetaItemStack.java

@@ -1,10 +1,11 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.textreader.BookInput;
-import org.mcess.essentials.textreader.BookPager;
-import org.mcess.essentials.textreader.IText;
-import org.mcess.essentials.utils.FormatUtil;
-import org.mcess.essentials.utils.NumberUtil;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.textreader.BookInput;
+import com.earth2me.essentials.textreader.BookPager;
+import com.earth2me.essentials.textreader.IText;
+import com.earth2me.essentials.utils.FormatUtil;
+import com.earth2me.essentials.utils.NumberUtil;
 import java.util.*;
 import java.util.regex.Pattern;
 
@@ -142,7 +143,7 @@ public class MetaItemStack
 			}
 			catch (NoSuchMethodError nsme)
 			{
-				throw new Exception(I18n.tl("noMetaJson"), nsme);
+				throw new Exception(tl("noMetaJson"), nsme);
 			}
 			catch (Throwable throwable)
 			{
@@ -159,14 +160,14 @@ public class MetaItemStack
 			{
 				if (!hasMetaPermission(sender, "firework", true, true, ess))
 				{
-					throw new Exception(I18n.tl("noMetaFirework"));
+					throw new Exception(tl("noMetaFirework"));
 				}
 				FireworkEffect effect = builder.build();
 				FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta();
 				fmeta.addEffect(effect);
 				if (fmeta.getEffects().size() > 1 && !hasMetaPermission(sender, "firework-multiple", true, true, ess))
 				{
-					throw new Exception(I18n.tl("multipleCharges"));
+					throw new Exception(tl("multipleCharges"));
 				}
 				stack.setItemMeta(fmeta);
 			}
@@ -210,7 +211,7 @@ public class MetaItemStack
 			}
 			else
 			{
-				throw new Exception(I18n.tl("onlyPlayerSkulls"));
+				throw new Exception(tl("onlyPlayerSkulls"));
 			}
 		}
 		else if (split.length > 1 && split[0].equalsIgnoreCase("book") && stack.getType() == Material.WRITTEN_BOOK
@@ -271,7 +272,7 @@ public class MetaItemStack
 			}
 			else
 			{
-				throw new Exception(I18n.tl("leatherSyntax"));
+				throw new Exception(tl("leatherSyntax"));
 			}
 		}
 		else
@@ -297,14 +298,14 @@ public class MetaItemStack
 				{
 					if (!hasMetaPermission(sender, "firework", true, true, ess))
 					{
-						throw new Exception(I18n.tl("noMetaFirework"));
+						throw new Exception(tl("noMetaFirework"));
 					}
 					FireworkEffect effect = builder.build();
 					FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta();
 					fmeta.addEffect(effect);
 					if (fmeta.getEffects().size() > 1 && !hasMetaPermission(sender, "firework-multiple", true, true, ess))
 					{
-						throw new Exception(I18n.tl("multipleCharges"));
+						throw new Exception(tl("multipleCharges"));
 					}
 					stack.setItemMeta(fmeta);
 					builder = FireworkEffect.builder();
@@ -321,7 +322,7 @@ public class MetaItemStack
 					}
 					else
 					{
-						throw new Exception(I18n.tl("invalidFireworkFormat", split[1], split[0]));
+						throw new Exception(tl("invalidFireworkFormat", split[1], split[0]));
 					}
 				}
 				builder.withColor(primaryColors);
@@ -336,7 +337,7 @@ public class MetaItemStack
 				}
 				else
 				{
-					throw new Exception(I18n.tl("invalidFireworkFormat", split[1], split[0]));
+					throw new Exception(tl("invalidFireworkFormat", split[1], split[0]));
 				}
 				if (finalEffect != null)
 				{
@@ -355,7 +356,7 @@ public class MetaItemStack
 					}
 					else
 					{
-						throw new Exception(I18n.tl("invalidFireworkFormat", split[1], split[0]));
+						throw new Exception(tl("invalidFireworkFormat", split[1], split[0]));
 					}
 				}
 				if (!fadeColors.isEmpty())
@@ -378,7 +379,7 @@ public class MetaItemStack
 					}
 					else
 					{
-						throw new Exception(I18n.tl("invalidFireworkFormat", split[1], split[0]));
+						throw new Exception(tl("invalidFireworkFormat", split[1], split[0]));
 					}
 				}
 			}
@@ -407,12 +408,12 @@ public class MetaItemStack
 					}
 					else
 					{
-						throw new Exception(I18n.tl("noPotionEffectPerm", pEffectType.getName().toLowerCase(Locale.ENGLISH)));
+						throw new Exception(tl("noPotionEffectPerm", pEffectType.getName().toLowerCase(Locale.ENGLISH)));
 					}
 				}
 				else
 				{
-					throw new Exception(I18n.tl("invalidPotionMeta", split[1]));
+					throw new Exception(tl("invalidPotionMeta", split[1]));
 				}
 			}
 			else if (split[0].equalsIgnoreCase("power") || (allowShortName && split[0].equalsIgnoreCase("p")))
@@ -428,7 +429,7 @@ public class MetaItemStack
 				}
 				else
 				{
-					throw new Exception(I18n.tl("invalidPotionMeta", split[1]));
+					throw new Exception(tl("invalidPotionMeta", split[1]));
 				}
 			}
 			else if (split[0].equalsIgnoreCase("duration") || (allowShortName && split[0].equalsIgnoreCase("d")))
@@ -440,7 +441,7 @@ public class MetaItemStack
 				}
 				else
 				{
-					throw new Exception(I18n.tl("invalidPotionMeta", split[1]));
+					throw new Exception(tl("invalidPotionMeta", split[1]));
 				}
 			}
 
@@ -450,7 +451,7 @@ public class MetaItemStack
 				pEffect = pEffectType.createEffect(duration, power);
 				if (pmeta.getCustomEffects().size() > 1 && !hasMetaPermission(sender, "potions.multiple", true, false, ess))
 				{
-					throw new Exception(I18n.tl("multiplePotionEffects"));
+					throw new Exception(tl("multiplePotionEffects"));
 				}
 				pmeta.addCustomEffect(pEffect, true);
 				stack.setItemMeta(pmeta);
@@ -491,7 +492,7 @@ public class MetaItemStack
 	{
 		if (enchantment == null)
 		{
-			throw new Exception(I18n.tl("enchantmentNotFound"));
+			throw new Exception(tl("enchantmentNotFound"));
 		}
 		try
 		{
@@ -545,7 +546,7 @@ public class MetaItemStack
 
 		if (!hasMetaPermission(user, "enchantments." + enchantmentName, true, false))
 		{
-			throw new Exception(I18n.tl("enchantmentPerm", enchantmentName));
+			throw new Exception(tl("enchantmentPerm", enchantmentName));
 		}
 		return enchantment;
 	}
@@ -570,7 +571,7 @@ public class MetaItemStack
 		}
 		else
 		{
-			throw new Exception(I18n.tl("noMetaPerm", metaPerm));
+			throw new Exception(tl("noMetaPerm", metaPerm));
 		}
 	}
 }

Essentials/src/com/earth2me/essentials/Mob.java

@@ -1,6 +1,6 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import static org.mcess.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n.tl;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;

Essentials/src/com/earth2me/essentials/MobData.java

@@ -1,6 +1,7 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.utils.StringUtil;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.utils.StringUtil;
 import java.util.*;
 import java.util.logging.Logger;
 import org.bukkit.DyeColor;
@@ -285,7 +286,7 @@ public enum MobData
 			}
 			catch (Exception e)
 			{
-				throw new Exception(I18n.tl("sheepMalformedColor"), e);
+				throw new Exception(tl("sheepMalformedColor"), e);
 			}
 		}
 		else if (this.value.equals(Data.EXP))
@@ -297,7 +298,7 @@ public enum MobData
 			}
 			catch (NumberFormatException e)
 			{
-				throw new Exception(I18n.tl("invalidNumber"), e);
+				throw new Exception(tl("invalidNumber"), e);
 			}
 		}
 		else if (this.value.equals(Data.SIZE))
@@ -309,7 +310,7 @@ public enum MobData
 			}
 			catch (NumberFormatException e)
 			{
-				throw new Exception(I18n.tl("slimeMalformedSize"), e);
+				throw new Exception(tl("slimeMalformedSize"), e);
 			}
 		}
 		else if (this.value instanceof Horse.Color)

Essentials/src/com/earth2me/essentials/OfflinePlayer.java

@@ -1,5 +1,6 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n.tl;
 import java.net.InetSocketAddress;
 import java.util.*;
 import org.bukkit.*;
@@ -186,25 +187,25 @@ public class OfflinePlayer implements Player
 	@Override
 	public int getRemainingAir()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void setRemainingAir(int i)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public int getMaximumAir()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void setMaximumAir(int i)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
@@ -216,73 +217,73 @@ public class OfflinePlayer implements Player
 	@Override
 	public void setSneaking(boolean bln)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void updateInventory()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void chat(String string)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public double getEyeHeight()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public double getEyeHeight(boolean bln)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public List<Block> getLineOfSight(HashSet<Byte> hs, int i)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public Block getTargetBlock(HashSet<Byte> hs, int i)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public List<Block> getLastTwoTargetBlocks(HashSet<Byte> hs, int i)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public int getFireTicks()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public int getMaxFireTicks()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void setFireTicks(int i)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void remove()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
@@ -293,168 +294,168 @@ public class OfflinePlayer implements Player
 
 	public Vector getMomentum()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	public void setMomentum(Vector vector)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void setVelocity(Vector vector)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public Vector getVelocity()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void damage(double d)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void damage(double d, Entity entity)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public Location getEyeLocation()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void sendRawMessage(String string)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public Location getCompassTarget()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public int getMaximumNoDamageTicks()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void setMaximumNoDamageTicks(int i)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public double getLastDamage()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void setLastDamage(double d)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public int getNoDamageTicks()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void setNoDamageTicks(int i)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public boolean teleport(Location lctn)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public boolean teleport(Entity entity)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public Entity getPassenger()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public boolean setPassenger(Entity entity)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public boolean isEmpty()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public boolean eject()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void saveData()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void loadData()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public boolean isSleeping()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public int getSleepTicks()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public List<Entity> getNearbyEntities(double d, double d1, double d2)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public boolean isDead()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public float getFallDistance()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
@@ -465,175 +466,175 @@ public class OfflinePlayer implements Player
 	@Override
 	public void setSleepingIgnored(boolean bln)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public boolean isSleepingIgnored()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void awardAchievement(Achievement a)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void removeAchievement(Achievement achievement)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public boolean hasAchievement(Achievement achievement)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void incrementStatistic(Statistic ststc)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void decrementStatistic(Statistic statistic) throws IllegalArgumentException
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void incrementStatistic(Statistic ststc, int i)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void decrementStatistic(Statistic statistic, int i) throws IllegalArgumentException
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void setStatistic(Statistic statistic, int i) throws IllegalArgumentException
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public int getStatistic(Statistic statistic) throws IllegalArgumentException
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void incrementStatistic(Statistic ststc, Material mtrl)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void decrementStatistic(Statistic statistic, Material material) throws IllegalArgumentException
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public int getStatistic(Statistic statistic, Material material) throws IllegalArgumentException
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void incrementStatistic(Statistic ststc, Material mtrl, int i)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void decrementStatistic(Statistic statistic, Material material, int i) throws IllegalArgumentException
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void setStatistic(Statistic statistic, Material material, int i) throws IllegalArgumentException
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void incrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void decrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public int getStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void incrementStatistic(Statistic statistic, EntityType entityType, int i) throws IllegalArgumentException
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void decrementStatistic(Statistic statistic, EntityType entityType, int i)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void setStatistic(Statistic statistic, EntityType entityType, int i)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void playNote(Location lctn, byte b, byte b1)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void sendBlockChange(Location lctn, Material mtrl, byte b)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void sendBlockChange(Location lctn, int i, byte b)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void setLastDamageCause(EntityDamageEvent ede)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public EntityDamageEvent getLastDamageCause()
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override
 	public void playEffect(Location lctn, Effect effect, int i)
 	{
-		throw new UnsupportedOperationException(I18n.tl("notSupportedYet"));
+		throw new UnsupportedOperationException(tl("notSupportedYet"));
 	}
 
 	@Override

Essentials/src/com/earth2me/essentials/PlayerExtension.java

@@ -1,9 +1,17 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
+import lombok.Delegate;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.serialization.ConfigurationSerializable;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permissible;
+import org.bukkit.permissions.ServerOperator;
 
 
 public class PlayerExtension

Essentials/src/com/earth2me/essentials/PlayerList.java

@@ -1,6 +1,7 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.utils.FormatUtil;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.utils.FormatUtil;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -9,6 +10,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import org.bukkit.Server;
+import org.bukkit.entity.Player;
 
 
 public class PlayerList
@@ -28,11 +30,11 @@ public class PlayerList
 			needComma = true;
 			if (user.isAfk())
 			{
-				groupString.append(I18n.tl("listAfkTag"));
+				groupString.append(tl("listAfkTag"));
 			}
 			if (user.isHidden())
 			{
-				groupString.append(I18n.tl("listHiddenTag"));
+				groupString.append(tl("listHiddenTag"));
 			}
 			user.setDisplayNick();
 			groupString.append(user.getDisplayName());
@@ -61,11 +63,11 @@ public class PlayerList
 		String online;
 		if (hiddenCount > 0)
 		{
-			online = I18n.tl("listAmountHidden", ess.getOnlinePlayers().size() - playerHidden, hiddenCount, server.getMaxPlayers());
+			online = tl("listAmountHidden", ess.getOnlinePlayers().size() - playerHidden, hiddenCount, server.getMaxPlayers());
 		}
 		else
 		{
-			online = I18n.tl("listAmount", ess.getOnlinePlayers().size() - playerHidden, server.getMaxPlayers());
+			online = tl("listAmount", ess.getOnlinePlayers().size() - playerHidden, server.getMaxPlayers());
 		}
 		return online;
 	}
@@ -135,7 +137,7 @@ public class PlayerList
 		}
 		if (users == null || users.isEmpty())
 		{
-			throw new Exception(I18n.tl("groupDoesNotExist"));
+			throw new Exception(tl("groupDoesNotExist"));
 		}
 		final StringBuilder displayGroupName = new StringBuilder();
 		displayGroupName.append(Character.toTitleCase(groupName.charAt(0)));
@@ -147,7 +149,7 @@ public class PlayerList
 	public static String outputFormat(final String group, final String message)
 	{
 		final StringBuilder outputString = new StringBuilder();
-		outputString.append(I18n.tl("listGroupTag", FormatUtil.replaceFormat(group)));
+		outputString.append(tl("listGroupTag", FormatUtil.replaceFormat(group)));
 		outputString.append(message);
 		return outputString.toString();
 	}

Essentials/src/com/earth2me/essentials/PlayerTarget.java

@@ -1,4 +1,4 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

Essentials/src/com/earth2me/essentials/Potions.java

@@ -1,6 +1,6 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.NumberUtil;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;

Essentials/src/com/earth2me/essentials/Settings.java

@@ -1,12 +1,12 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import static org.mcess.essentials.I18n.tl;
-import org.mcess.essentials.commands.IEssentialsCommand;
-import org.mcess.essentials.signs.EssentialsSign;
-import org.mcess.essentials.signs.Signs;
-import org.mcess.essentials.textreader.IText;
-import org.mcess.essentials.textreader.SimpleTextInput;
-import org.mcess.essentials.utils.FormatUtil;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import com.earth2me.essentials.signs.EssentialsSign;
+import com.earth2me.essentials.signs.Signs;
+import com.earth2me.essentials.textreader.IText;
+import com.earth2me.essentials.textreader.SimpleTextInput;
+import com.earth2me.essentials.utils.FormatUtil;
 import java.io.File;
 import java.math.BigDecimal;
 import java.util.*;
@@ -14,6 +14,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import net.ess3.api.IEssentials;
 import org.bukkit.ChatColor;
+import org.bukkit.command.PluginCommand;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.MemoryConfiguration;
 import org.bukkit.event.EventPriority;
@@ -399,7 +400,22 @@ public class Settings implements net.ess3.api.ISettings
 	}
 
 	@Override
-	public int getSpawnMobLimit() { return config.getInt("spawnmob-limit", 10); }
+	public int getSpawnMobLimit()
+	{
+		return config.getInt("spawnmob-limit", 10);
+	}
+
+	@Override
+	public boolean showNonEssCommandsInHelp()
+	{
+		return config.getBoolean("non-ess-in-help", true);
+	}
+
+	@Override
+	public boolean hidePermissionlessHelp()
+	{
+		return config.getBoolean("hide-permissionless-help", true);
+	}
 
 	@Override
 	public int getProtectCreeperMaxHeight()
@@ -408,8 +424,22 @@ public class Settings implements net.ess3.api.ISettings
 	}
 
 	@Override
-	public boolean areSignsDisabled() { return !signsEnabled; }
+	public boolean areSignsDisabled()
+	{
+		return !signsEnabled;
+	}
 
+	@Override
+	public long getBackupInterval()
+	{
+		return config.getInt("backup.interval", 1440); // 1440 = 24 * 60
+	}
+
+	@Override
+	public String getBackupCommand()
+	{
+		return config.getString("backup.command", null);
+	}
 	private final Map<String, String> chatFormats = Collections.synchronizedMap(new HashMap<String, String>());
 
 	@Override

Essentials/src/com/earth2me/essentials/SpawnMob.java

@@ -1,7 +1,9 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.utils.LocationUtil;
-import org.mcess.essentials.utils.StringUtil;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.Mob.MobException;
+import com.earth2me.essentials.utils.LocationUtil;
+import com.earth2me.essentials.utils.StringUtil;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -32,7 +34,7 @@ public class SpawnMob
 		}
 		if (availableList.isEmpty())
 		{
-			availableList.add(I18n.tl("none"));
+			availableList.add(tl("none"));
 		}
 		return StringUtil.joinList(availableList);
 	}
@@ -86,7 +88,7 @@ public class SpawnMob
 		final Block block = LocationUtil.getTarget(user.getBase()).getBlock();
 		if (block == null)
 		{
-			throw new Exception(I18n.tl("unableToSpawnMob"));
+			throw new Exception(tl("unableToSpawnMob"));
 		}
 		spawnmob(ess, server, user.getSource(), user, block.getLocation(), parts, data, mobCount);
 	}
@@ -123,7 +125,7 @@ public class SpawnMob
 		if (mobCount > effectiveLimit)
 		{
 			mobCount = effectiveLimit;
-			sender.sendMessage(I18n.tl("mobSpawnLimit"));
+			sender.sendMessage(tl("mobSpawnLimit"));
 		}
 
 		Mob mob = Mob.fromName(parts.get(0)); // Get the first mob
@@ -133,19 +135,19 @@ public class SpawnMob
 			{
 				spawnMob(ess, server, sender, target, sloc, parts, data);
 			}
-			sender.sendMessage(mobCount * parts.size() + " " + mob.name.toLowerCase(Locale.ENGLISH) + mob.suffix + " " + I18n.tl("spawned"));
+			sender.sendMessage(mobCount * parts.size() + " " + mob.name.toLowerCase(Locale.ENGLISH) + mob.suffix + " " + tl("spawned"));
 		}
-		catch (Mob.MobException e1)
+		catch (MobException e1)
 		{
-			throw new Exception(I18n.tl("unableToSpawnMob"), e1);
+			throw new Exception(tl("unableToSpawnMob"), e1);
 		}
 		catch (NumberFormatException e2)
 		{
-			throw new Exception(I18n.tl("numberRequired"), e2);
+			throw new Exception(tl("numberRequired"), e2);
 		}
 		catch (NullPointerException np)
 		{
-			throw new Exception(I18n.tl("soloMob"), np);
+			throw new Exception(tl("soloMob"), np);
 		}
 	}
 
@@ -192,17 +194,17 @@ public class SpawnMob
 	{
 		if (mob == null)
 		{
-			throw new Exception(I18n.tl("invalidMob"));
+			throw new Exception(tl("invalidMob"));
 		}
 
 		if (ess.getSettings().getProtectPreventSpawn(mob.getType().toString().toLowerCase(Locale.ENGLISH)))
 		{
-			throw new Exception(I18n.tl("disabledToSpawnMob"));
+			throw new Exception(tl("disabledToSpawnMob"));
 		}
 
 		if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.spawnmob." + mob.name.toLowerCase(Locale.ENGLISH)))
 		{
-			throw new Exception(I18n.tl("noPermToSpawnMob"));
+			throw new Exception(tl("noPermToSpawnMob"));
 		}
 	}
 
@@ -212,7 +214,7 @@ public class SpawnMob
 
 		if (data.isEmpty())
 		{
-			sender.sendMessage(I18n.tl("mobDataList", StringUtil.joinList(MobData.getValidHelp(spawned))));
+			sender.sendMessage(tl("mobDataList", StringUtil.joinList(MobData.getValidHelp(spawned))));
 		}
 		
 		if (spawned instanceof Zombie)

Essentials/src/com/earth2me/essentials/TNTExplodeListener.java

@@ -1,4 +1,4 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
 import net.ess3.api.IEssentials;
 import org.bukkit.entity.LivingEntity;

Essentials/src/com/earth2me/essentials/Teleport.java

@@ -1,7 +1,8 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.utils.DateUtil;
-import org.mcess.essentials.utils.LocationUtil;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.utils.DateUtil;
+import com.earth2me.essentials.utils.LocationUtil;
 import java.math.BigDecimal;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -53,7 +54,7 @@ public class Teleport implements net.ess3.api.ITeleport
 				time.setTimeInMillis(lastTime);
 				time.add(Calendar.SECOND, (int)cooldown);
 				time.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
-				throw new Exception(I18n.tl("timeBeforeTeleport", DateUtil.formatDateDiff(time.getTimeInMillis())));
+				throw new Exception(tl("timeBeforeTeleport", DateUtil.formatDateDiff(time.getTimeInMillis())));
 			}
 		}
 		// if justCheck is set, don't update lastTeleport; we're just checking
@@ -68,7 +69,7 @@ public class Teleport implements net.ess3.api.ITeleport
 		Calendar c = new GregorianCalendar();
 		c.add(Calendar.SECOND, (int)delay);
 		c.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
-		user.sendMessage(I18n.tl("dontMoveMessage", DateUtil.formatDateDiff(c.getTimeInMillis())));
+		user.sendMessage(tl("dontMoveMessage", DateUtil.formatDateDiff(c.getTimeInMillis())));
 	}
 
 	//The now function is used when you want to skip tp delay when teleporting someone to a location or player.
@@ -92,7 +93,7 @@ public class Teleport implements net.ess3.api.ITeleport
 		}
 		final ITarget target = new PlayerTarget(entity);
 		now(teleportOwner, target, cause);
-		teleportOwner.sendMessage(I18n.tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ()));
+		teleportOwner.sendMessage(tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ()));
 	}
 
 	protected void now(IUser teleportee, ITarget target, TeleportCause cause) throws Exception
@@ -113,7 +114,7 @@ public class Teleport implements net.ess3.api.ITeleport
 			}
 			else
 			{
-				throw new Exception(I18n.tl("unsafeTeleportDestination", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+				throw new Exception(tl("unsafeTeleportDestination", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
 			}
 		}
 		else
@@ -146,7 +147,7 @@ public class Teleport implements net.ess3.api.ITeleport
 	public void teleport(Player entity, Trade chargeFor, TeleportCause cause) throws Exception
 	{
 		ITarget target = new PlayerTarget(entity);
-		teleportOwner.sendMessage(I18n.tl("teleportToPlayer", entity.getDisplayName()));
+		teleportOwner.sendMessage(tl("teleportToPlayer", entity.getDisplayName()));
 		teleport(teleportOwner, target, chargeFor, cause);
 	}
 
@@ -163,8 +164,8 @@ public class Teleport implements net.ess3.api.ITeleport
 	{
 		ITarget target = new PlayerTarget(entity);
 		teleport(teleportee, target, chargeFor, cause);
-		teleportee.sendMessage(I18n.tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ()));
-		teleportOwner.sendMessage(I18n.tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ()));
+		teleportee.sendMessage(tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ()));
+		teleportOwner.sendMessage(tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ()));
 	}
 
 	private void teleport(IUser teleportee, ITarget target, Trade chargeFor, TeleportCause cause) throws Exception
@@ -254,10 +255,10 @@ public class Teleport implements net.ess3.api.ITeleport
 	public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception
 	{
 		Location loc = ess.getWarps().getWarp(warp);
-		teleportee.sendMessage(I18n.tl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+		teleportee.sendMessage(tl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
 		if (!teleportee.equals(teleportOwner))
 		{
-			teleportOwner.sendMessage(I18n.tl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+			teleportOwner.sendMessage(tl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
 		}
 		teleport(teleportee, new LocationTarget(loc), chargeFor, cause);
 	}
@@ -267,7 +268,7 @@ public class Teleport implements net.ess3.api.ITeleport
 	public void back(Trade chargeFor) throws Exception
 	{
 		final Location loc = teleportOwner.getLastLocation();
-		teleportOwner.sendMessage(I18n.tl("backUsageMsg", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+		teleportOwner.sendMessage(tl("backUsageMsg", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
 		teleport(teleportOwner, new LocationTarget(loc), chargeFor, TeleportCause.COMMAND);
 	}
 

Essentials/src/com/earth2me/essentials/TimedTeleport.java

@@ -1,5 +1,6 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n.tl;
 import java.util.UUID;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
@@ -104,16 +105,16 @@ public class TimedTeleport implements Runnable
 					}
 					catch (Exception ex)
 					{
-						teleportOwner.sendMessage(I18n.tl("cooldownWithMessage", ex.getMessage()));
+						teleportOwner.sendMessage(tl("cooldownWithMessage", ex.getMessage()));
 						if (teleportOwner != teleportUser)
 						{
-							teleportUser.sendMessage(I18n.tl("cooldownWithMessage", ex.getMessage()));
+							teleportUser.sendMessage(tl("cooldownWithMessage", ex.getMessage()));
 						}
 					}
 					try
 					{
 						cancelTimer(false);
-						teleportUser.sendMessage(I18n.tl("teleportationCommencing"));
+						teleportUser.sendMessage(tl("teleportationCommencing"));
 
 						try
 						{
@@ -161,10 +162,10 @@ public class TimedTeleport implements Runnable
 			ess.getServer().getScheduler().cancelTask(timer_task);
 			if (notifyUser)
 			{
-				teleportOwner.sendMessage(I18n.tl("pendingTeleportCancelled"));
+				teleportOwner.sendMessage(tl("pendingTeleportCancelled"));
 				if (timer_teleportee != null && !timer_teleportee.equals(teleportOwner.getBase().getUniqueId()))
 				{
-					ess.getUser(timer_teleportee).sendMessage(I18n.tl("pendingTeleportCancelled"));
+					ess.getUser(timer_teleportee).sendMessage(tl("pendingTeleportCancelled"));
 				}
 			}
 		}

Essentials/src/com/earth2me/essentials/Trade.java

@@ -1,9 +1,9 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import static org.mcess.essentials.I18n.tl;
-import org.mcess.essentials.craftbukkit.InventoryWorkaround;
-import org.mcess.essentials.craftbukkit.SetExpFix;
-import org.mcess.essentials.utils.NumberUtil;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import com.earth2me.essentials.craftbukkit.SetExpFix;
+import com.earth2me.essentials.utils.NumberUtil;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -58,7 +58,7 @@ public class Trade
 	}
 
 	@Deprecated
-	public Trade(final double money, final org.mcess.essentials.IEssentials ess)
+	public Trade(final double money, final com.earth2me.essentials.IEssentials ess)
 	{
 		this(null, null, BigDecimal.valueOf(money), null, null, (IEssentials)ess);
 	}

Essentials/src/com/earth2me/essentials/UUIDMap.java

@@ -1,4 +1,4 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
 import com.google.common.io.Files;
 import java.io.BufferedReader;

Essentials/src/com/earth2me/essentials/User.java

@@ -1,11 +1,12 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.commands.IEssentialsCommand;
-import org.mcess.essentials.register.payment.Method;
-import org.mcess.essentials.register.payment.Methods;
-import org.mcess.essentials.utils.DateUtil;
-import org.mcess.essentials.utils.FormatUtil;
-import org.mcess.essentials.utils.NumberUtil;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import com.earth2me.essentials.register.payment.Method;
+import com.earth2me.essentials.register.payment.Methods;
+import com.earth2me.essentials.utils.DateUtil;
+import com.earth2me.essentials.utils.FormatUtil;
+import com.earth2me.essentials.utils.NumberUtil;
 import java.math.BigDecimal;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -128,7 +129,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 			cooldownTime.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
 			if (cooldownTime.after(now) && !isAuthorized("essentials.heal.cooldown.bypass"))
 			{
-				throw new Exception(I18n.tl("timeBeforeHeal", DateUtil.formatDateDiff(cooldownTime.getTimeInMillis())));
+				throw new Exception(tl("timeBeforeHeal", DateUtil.formatDateDiff(cooldownTime.getTimeInMillis())));
 			}
 		}
 		setLastHealTimestamp(now.getTimeInMillis());
@@ -148,10 +149,10 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 			return;
 		}
 		setMoney(getMoney().add(value));
-		sendMessage(I18n.tl("addedToAccount", NumberUtil.displayCurrency(value, ess)));
+		sendMessage(tl("addedToAccount", NumberUtil.displayCurrency(value, ess)));
 		if (initiator != null)
 		{
-			initiator.sendMessage(I18n.tl("addedToOthersAccount", NumberUtil.displayCurrency(value, ess), this.getDisplayName(), NumberUtil.displayCurrency(getMoney(), ess)));
+			initiator.sendMessage(tl("addedToOthersAccount", NumberUtil.displayCurrency(value, ess), this.getDisplayName(), NumberUtil.displayCurrency(getMoney(), ess)));
 		}
 	}
 
@@ -166,12 +167,12 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 		{
 			setMoney(getMoney().subtract(value));
 			reciever.setMoney(reciever.getMoney().add(value));
-			sendMessage(I18n.tl("moneySentTo", NumberUtil.displayCurrency(value, ess), reciever.getDisplayName()));
-			reciever.sendMessage(I18n.tl("moneyRecievedFrom", NumberUtil.displayCurrency(value, ess), getDisplayName()));
+			sendMessage(tl("moneySentTo", NumberUtil.displayCurrency(value, ess), reciever.getDisplayName()));
+			reciever.sendMessage(tl("moneyRecievedFrom", NumberUtil.displayCurrency(value, ess), getDisplayName()));
 		}
 		else
 		{
-			throw new ChargeException(I18n.tl("notEnoughMoney", NumberUtil.displayCurrency(value, ess)));
+			throw new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(value, ess)));
 		}
 	}
 
@@ -196,10 +197,10 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 		{
 			ess.getLogger().log(Level.WARNING, "Invalid call to takeMoney, total balance can't be more than the max-money limit.", ex);
 		}
-		sendMessage(I18n.tl("takenFromAccount", NumberUtil.displayCurrency(value, ess)));
+		sendMessage(tl("takenFromAccount", NumberUtil.displayCurrency(value, ess)));
 		if (initiator != null)
 		{
-			initiator.sendMessage(I18n.tl("takenFromOthersAccount", NumberUtil.displayCurrency(value, ess), this.getDisplayName(), NumberUtil.displayCurrency(getMoney(), ess)));
+			initiator.sendMessage(tl("takenFromOthersAccount", NumberUtil.displayCurrency(value, ess), this.getDisplayName(), NumberUtil.displayCurrency(getMoney(), ess)));
 		}
 	}
 
@@ -559,7 +560,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 		{
 			setJailTimeout(0);
 			setJailed(false);
-			sendMessage(I18n.tl("haveBeenReleased"));
+			sendMessage(tl("haveBeenReleased"));
 			setJail(null);
 			try
 			{
@@ -586,7 +587,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 		if (getMuteTimeout() > 0 && getMuteTimeout() < currentTime && isMuted())
 		{
 			setMuteTimeout(0);
-			sendMessage(I18n.tl("canTalkAgain"));
+			sendMessage(tl("canTalkAgain"));
 			setMuted(false);
 			return true;
 		}
@@ -601,7 +602,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 			if (broadcast && !isHidden())
 			{
 				setDisplayNick();
-				final String msg = I18n.tl("userIsNotAway", getDisplayName());
+				final String msg = tl("userIsNotAway", getDisplayName());
 				if (!msg.isEmpty())
 				{
 					ess.broadcastMessage(this, msg);
@@ -617,7 +618,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 		if (autoafkkick > 0 && lastActivity > 0 && (lastActivity + (autoafkkick * 1000)) < System.currentTimeMillis()
 			&& !isHidden() && !isAuthorized("essentials.kick.exempt") && !isAuthorized("essentials.afk.kickexempt"))
 		{
-			final String kickReason = I18n.tl("autoAfkKickReason", autoafkkick / 60.0);
+			final String kickReason = tl("autoAfkKickReason", autoafkkick / 60.0);
 			lastActivity = 0;
 			this.getBase().kickPlayer(kickReason);
 
@@ -626,7 +627,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 			{
 				if (user.isAuthorized("essentials.kick.notify"))
 				{
-					user.sendMessage(I18n.tl("playerKicked", Console.NAME, getName(), kickReason));
+					user.sendMessage(tl("playerKicked", Console.NAME, getName(), kickReason));
 				}
 			}
 		}
@@ -637,7 +638,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 			if (!isHidden())
 			{
 				setDisplayNick();
-				final String msg = I18n.tl("userIsAway", getDisplayName());
+				final String msg = tl("userIsAway", getDisplayName());
 				if (!msg.isEmpty())
 				{
 					ess.broadcastMessage(this, msg);

Essentials/src/com/earth2me/essentials/UserData.java

@@ -1,8 +1,8 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import static org.mcess.essentials.I18n.tl;
-import org.mcess.essentials.utils.NumberUtil;
-import org.mcess.essentials.utils.StringUtil;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.StringUtil;
 import java.io.File;
 import java.math.BigDecimal;
 import java.util.*;
@@ -66,6 +66,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 	{
 		config.load();
 		money = _getMoney();
+		unlimited = _getUnlimited();
 		powertools = _getPowertools();
 		homes = _getHomes();
 		lastLocation = _getLastLocation();
@@ -265,7 +266,36 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("nickname", nick);
 		config.save();
 	}
+	private List<Integer> unlimited;
 
+	private List<Integer> _getUnlimited()
+	{
+		return config.getIntegerList("unlimited");
+	}
+
+	public List<Integer> getUnlimited()
+	{
+		return unlimited;
+	}
+
+	public boolean hasUnlimited(ItemStack stack)
+	{
+		return unlimited.contains(stack.getTypeId());
+	}
+
+	public void setUnlimited(ItemStack stack, boolean state)
+	{
+		if (unlimited.contains(stack.getTypeId()))
+		{
+			unlimited.remove(Integer.valueOf(stack.getTypeId()));
+		}
+		if (state)
+		{
+			unlimited.add(stack.getTypeId());
+		}
+		config.setProperty("unlimited", unlimited);
+		config.save();
+	}
 	private Map<String, Object> powertools;
 
 	private Map<String, Object> _getPowertools()

Essentials/src/com/earth2me/essentials/UserMap.java

@@ -1,9 +1,12 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.utils.StringUtil;
+import com.earth2me.essentials.utils.StringUtil;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
+import com.google.common.cache.RemovalCause;
+import com.google.common.cache.RemovalListener;
+import com.google.common.cache.RemovalNotification;
 import com.google.common.util.concurrent.UncheckedExecutionException;
 import java.io.File;
 import java.util.ArrayList;

Essentials/src/com/earth2me/essentials/Warps.java

@@ -1,7 +1,8 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import org.mcess.essentials.commands.WarpNotFoundException;
-import org.mcess.essentials.utils.StringUtil;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.commands.WarpNotFoundException;
+import com.earth2me.essentials.utils.StringUtil;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
@@ -70,7 +71,7 @@ public class Warps implements IConf, net.ess3.api.IWarps
 			File confFile = new File(warpsFolder, filename + ".yml");
 			if (confFile.exists())
 			{
-				throw new Exception(I18n.tl("similarWarpExist"));
+				throw new Exception(tl("similarWarpExist"));
 			}
 			conf = new EssentialsConf(confFile);
 			warpPoints.put(new StringIgnoreCase(name), conf);
@@ -83,7 +84,7 @@ public class Warps implements IConf, net.ess3.api.IWarps
 		}
 		catch (IOException ex)
 		{
-			throw new IOException(I18n.tl("invalidWarpName"));
+			throw new IOException(tl("invalidWarpName"));
 		}
 	}
 
@@ -93,11 +94,11 @@ public class Warps implements IConf, net.ess3.api.IWarps
 		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
 		if (conf == null)
 		{
-			throw new Exception(I18n.tl("warpNotExist"));
+			throw new Exception(tl("warpNotExist"));
 		}
 		if (!conf.getFile().delete())
 		{
-			throw new Exception(I18n.tl("warpDeleteError"));
+			throw new Exception(tl("warpDeleteError"));
 		}
 		warpPoints.remove(new StringIgnoreCase(name));
 	}
@@ -126,7 +127,7 @@ public class Warps implements IConf, net.ess3.api.IWarps
 					}
 					catch (Exception ex)
 					{
-						logger.log(Level.WARNING, I18n.tl("loadWarpError", filename), ex);
+						logger.log(Level.WARNING, tl("loadWarpError", filename), ex);
 					}
 				}
 			}

Essentials/src/com/earth2me/essentials/Worth.java

@@ -1,11 +1,11 @@
-package org.mcess.essentials;
+package com.earth2me.essentials;
 
-import static org.mcess.essentials.I18n.tl;
-import org.mcess.essentials.commands.NotEnoughArgumentsException;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.commands.NotEnoughArgumentsException;
 import java.io.File;
 import java.math.BigDecimal;
 import java.util.Locale;
-
+import java.util.logging.Logger;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;

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

@@ -1,19 +1,22 @@
-package org.mcess.essentials.api;
+package com.earth2me.essentials.api;
 
-import org.mcess.essentials.EssentialsUserConf;
-import org.mcess.essentials.Trade;
-import org.mcess.essentials.User;
-import static org.mcess.essentials.api.Economy.add;
-import static org.mcess.essentials.api.Economy.divide;
-import static org.mcess.essentials.api.Economy.format;
-import static org.mcess.essentials.api.Economy.hasEnough;
-import static org.mcess.essentials.api.Economy.hasLess;
-import static org.mcess.essentials.api.Economy.hasMore;
-import static org.mcess.essentials.api.Economy.multiply;
-import static org.mcess.essentials.api.Economy.setMoney;
-
-import org.mcess.essentials.utils.NumberUtil;
-import org.mcess.essentials.utils.StringUtil;
+import com.earth2me.essentials.EssentialsConf;
+import com.earth2me.essentials.EssentialsUserConf;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.User;
+import static com.earth2me.essentials.api.Economy.add;
+import static com.earth2me.essentials.api.Economy.divide;
+import static com.earth2me.essentials.api.Economy.format;
+import static com.earth2me.essentials.api.Economy.getMoneyExact;
+import static com.earth2me.essentials.api.Economy.hasEnough;
+import static com.earth2me.essentials.api.Economy.hasLess;
+import static com.earth2me.essentials.api.Economy.hasMore;
+import static com.earth2me.essentials.api.Economy.multiply;
+import static com.earth2me.essentials.api.Economy.setMoney;
+import static com.earth2me.essentials.api.Economy.substract;
+import com.earth2me.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.StringUtil;
 import com.google.common.base.Charsets;
 import java.io.File;
 import java.math.BigDecimal;

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

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

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

@@ -1,7 +1,7 @@
 
-package org.mcess.essentials.api;
+package com.earth2me.essentials.api;
 
-import org.mcess.essentials.User;
+import com.earth2me.essentials.User;
 import java.util.List;
 import org.bukkit.inventory.ItemStack;
 

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

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

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

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

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

@@ -1,6 +1,6 @@
-package org.mcess.essentials.api;
+package com.earth2me.essentials.api;
 
-import org.mcess.essentials.Trade;
+import com.earth2me.essentials.Trade;
 import net.ess3.api.IUser;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;

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

@@ -1,7 +1,7 @@
-package org.mcess.essentials.api;
+package com.earth2me.essentials.api;
 
-import org.mcess.essentials.IConf;
-import org.mcess.essentials.commands.WarpNotFoundException;
+import com.earth2me.essentials.IConf;
+import com.earth2me.essentials.commands.WarpNotFoundException;
 import java.io.File;
 import java.util.Collection;
 import org.bukkit.Location;

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

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

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

@@ -1,6 +1,6 @@
-package org.mcess.essentials.api;
+package com.earth2me.essentials.api;
 
-import static org.mcess.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n.tl;
 
 
 public class InvalidWorldException extends Exception

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

@@ -1,4 +1,4 @@
-package org.mcess.essentials.api;
+package com.earth2me.essentials.api;
 
 
 public class NoLoanPermittedException extends net.ess3.api.NoLoanPermittedException

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

@@ -0,0 +1,12 @@
+package com.earth2me.essentials.api;
+
+import static com.earth2me.essentials.I18n.tl;
+
+
+public class UserDoesNotExistException extends Exception
+{
+	public UserDoesNotExistException(String name)
+	{
+		super(tl("userDoesNotExist", name));
+	}
+}

Essentials/src/com/earth2me/essentials/commands/Commandafk.java

@@ -1,9 +1,9 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import org.mcess.essentials.User;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
 import org.bukkit.Server;
-import org.mcess.essentials.I18n;
 
 
 public class Commandafk extends EssentialsCommand
@@ -50,7 +50,7 @@ public class Commandafk extends EssentialsCommand
 			//user.sendMessage(_("markedAsNotAway"));
 			if (!user.isHidden())
 			{
-				msg = I18n.tl("userIsNotAway", user.getDisplayName());
+				msg = tl("userIsNotAway", user.getDisplayName());
 			}
 			user.updateActivity(false);
 		}
@@ -59,7 +59,7 @@ public class Commandafk extends EssentialsCommand
 			//user.sendMessage(_("markedAsAway"));
 			if (!user.isHidden())
 			{
-				msg = I18n.tl("userIsAway", user.getDisplayName());
+				msg = tl("userIsAway", user.getDisplayName());
 			}
 		}
 		if (!msg.isEmpty())

Essentials/src/com/earth2me/essentials/commands/Commandantioch.java

@@ -1,7 +1,7 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.User;
-import org.mcess.essentials.utils.LocationUtil;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.LocationUtil;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.entity.TNTPrimed;

Essentials/src/com/earth2me/essentials/commands/Commandback.java

@@ -1,9 +1,9 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.Trade;
-import org.mcess.essentials.User;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.User;
 import org.bukkit.Server;
-import org.mcess.essentials.I18n;
 
 
 public class Commandback extends EssentialsCommand
@@ -18,12 +18,12 @@ public class Commandback extends EssentialsCommand
 	{
 		if (user.getLastLocation() == null)
 		{
-			throw new Exception(I18n.tl("noLocationFound"));
+			throw new Exception(tl("noLocationFound"));
 		}
 		if (user.getWorld() != user.getLastLocation().getWorld() && ess.getSettings().isWorldTeleportPermissions()
 			&& !user.isAuthorized("essentials.worlds." + user.getLastLocation().getWorld().getName()))
 		{
-			throw new Exception(I18n.tl("noPerm", "essentials.worlds." + user.getLastLocation().getWorld().getName()));
+			throw new Exception(tl("noPerm", "essentials.worlds." + user.getLastLocation().getWorld().getName()));
 		}
 		final Trade charge = new Trade(this.getName(), ess);
 		charge.isAffordableFor(user);

Essentials/src/com/earth2me/essentials/commands/Commandbackup.java

@@ -0,0 +1,32 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.Backup;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import org.bukkit.Server;
+
+
+public class Commandbackup extends EssentialsCommand
+{
+	public Commandbackup()
+	{
+		super("backup");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		final Backup backup = ess.getBackup();
+		if (backup == null)
+		{
+			throw new Exception(tl("backupDisabled"));
+		}
+		final String command = ess.getSettings().getBackupCommand();
+		if (command == null || "".equals(command) || "save-all".equalsIgnoreCase(command))
+		{
+			throw new Exception(tl("backupDisabled"));
+		}
+		backup.run();
+		sender.sendMessage(tl("backupStarted"));
+	}
+}

Essentials/src/com/earth2me/essentials/commands/Commandbalance.java

@@ -1,11 +1,11 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import org.mcess.essentials.User;
-import org.mcess.essentials.utils.NumberUtil;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.NumberUtil;
 import java.math.BigDecimal;
 import org.bukkit.Server;
-import org.mcess.essentials.I18n;
 
 
 public class Commandbalance extends EssentialsCommand
@@ -24,7 +24,7 @@ public class Commandbalance extends EssentialsCommand
 		}
 
 		User target = getPlayer(server, args, 0, true, true);
-		sender.sendMessage(I18n.tl("balanceOther", target.isHidden() ? target.getName() : target.getDisplayName(), NumberUtil.displayCurrency(target.getMoney(), ess)));
+		sender.sendMessage(tl("balanceOther", target.isHidden() ? target.getName() : target.getDisplayName(), NumberUtil.displayCurrency(target.getMoney(), ess)));
 	}
 
 	@Override
@@ -34,12 +34,12 @@ public class Commandbalance extends EssentialsCommand
 		{
 			final User target = getPlayer(server, args, 0, true, true);
 			final BigDecimal bal = target.getMoney();
-			user.sendMessage(I18n.tl("balanceOther", target.isHidden() ? target.getName() : target.getDisplayName(), NumberUtil.displayCurrency(bal, ess)));
+			user.sendMessage(tl("balanceOther", target.isHidden() ? target.getName() : target.getDisplayName(), NumberUtil.displayCurrency(bal, ess)));
 		}
 		else if (args.length < 2)
 		{
 			final BigDecimal bal = user.getMoney();
-			user.sendMessage(I18n.tl("balance", NumberUtil.displayCurrency(bal, ess)));
+			user.sendMessage(tl("balance", NumberUtil.displayCurrency(bal, ess)));
 		}
 		else
 		{

Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java

@@ -1,17 +1,17 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import org.mcess.essentials.User;
-import org.mcess.essentials.textreader.SimpleTextInput;
-import org.mcess.essentials.textreader.TextPager;
-import org.mcess.essentials.utils.NumberUtil;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.textreader.SimpleTextInput;
+import com.earth2me.essentials.textreader.TextPager;
+import com.earth2me.essentials.utils.NumberUtil;
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import org.bukkit.Server;
-import org.mcess.essentials.I18n;
 
 
 public class Commandbalancetop extends EssentialsCommand
@@ -58,7 +58,7 @@ public class Commandbalancetop extends EssentialsCommand
 				}
 				if (ess.getUserMap().getUniqueUsers() > MINUSERS)
 				{
-					sender.sendMessage(I18n.tl("orderBalances", ess.getUserMap().getUniqueUsers()));
+					sender.sendMessage(tl("orderBalances", ess.getUserMap().getUniqueUsers()));
 				}
 			}
 			finally
@@ -71,7 +71,7 @@ public class Commandbalancetop extends EssentialsCommand
 		{
 			if (ess.getUserMap().getUniqueUsers() > MINUSERS)
 			{
-				sender.sendMessage(I18n.tl("orderBalances", ess.getUserMap().getUniqueUsers()));
+				sender.sendMessage(tl("orderBalances", ess.getUserMap().getUniqueUsers()));
 			}
 			ess.runTaskAsynchronously(new Viewer(sender, commandLabel, page, force));
 		}
@@ -83,7 +83,7 @@ public class Commandbalancetop extends EssentialsCommand
 		final Calendar cal = Calendar.getInstance();
 		cal.setTimeInMillis(cacheage);
 		final DateFormat format = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-		sender.sendMessage(I18n.tl("balanceTop", format.format(cal.getTime())));
+		sender.sendMessage(tl("balanceTop", format.format(cal.getTime())));
 		new TextPager(cache).showPage(Integer.toString(page), null, "balancetop", sender);
 	}
 
@@ -143,7 +143,7 @@ public class Commandbalancetop extends EssentialsCommand
 						}
 					});
 
-					cache.getLines().add(I18n.tl("serverTotal", NumberUtil.displayCurrency(totalMoney, ess)));
+					cache.getLines().add(tl("serverTotal", NumberUtil.displayCurrency(totalMoney, ess)));
 					int pos = 1;
 					for (Map.Entry<String, BigDecimal> entry : sortedEntries)
 					{

Essentials/src/com/earth2me/essentials/commands/Commandban.java

@@ -1,14 +1,15 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import org.mcess.essentials.Console;
-import org.mcess.essentials.OfflinePlayer;
-import org.mcess.essentials.User;
-import org.mcess.essentials.utils.FormatUtil;
+import com.earth2me.essentials.CommandSource;
+import com.earth2me.essentials.Console;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.OfflinePlayer;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.FormatUtil;
 import java.util.logging.Level;
 import org.bukkit.BanList;
+import org.bukkit.Bukkit;
 import org.bukkit.Server;
-import org.mcess.essentials.I18n;
 
 
 public class Commandban extends EssentialsCommand
@@ -40,14 +41,14 @@ public class Commandban extends EssentialsCommand
 		{
 			if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.ban.offline"))
 			{
-				throw new Exception(I18n.tl("banExemptOffline"));
+				throw new Exception(tl("banExemptOffline"));
 			}
 		}
 		else
 		{
 			if (user.isAuthorized("essentials.ban.exempt") && sender.isPlayer())
 			{
-				throw new Exception(I18n.tl("banExempt"));
+				throw new Exception(tl("banExempt"));
 			}
 		}
 
@@ -59,21 +60,21 @@ public class Commandban extends EssentialsCommand
 		}
 		else
 		{
-			banReason = I18n.tl("defaultBanReason");
+			banReason = tl("defaultBanReason");
 		}
 		
 		ess.getServer().getBanList(BanList.Type.NAME).addBan(user.getName(), banReason, null, senderName);
 
-		String banDisplay = I18n.tl("banFormat", banReason, senderName);
+		String banDisplay = tl("banFormat",  banReason, senderName);
 		
 		user.getBase().kickPlayer(banDisplay);
-		server.getLogger().log(Level.INFO, I18n.tl("playerBanned", senderName, user.getName(), banDisplay));
+		server.getLogger().log(Level.INFO, tl("playerBanned", senderName, user.getName(), banDisplay));
 
 		if (nomatch)
 		{
-			sender.sendMessage(I18n.tl("userUnknown", user.getName()));
+			sender.sendMessage(tl("userUnknown", user.getName()));
 		}
 
-		ess.broadcastMessage("essentials.ban.notify", I18n.tl("playerBanned", senderName, user.getName(), banReason));
+		ess.broadcastMessage("essentials.ban.notify", tl("playerBanned", senderName, user.getName(), banReason));
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandbanip.java

@@ -1,12 +1,13 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import org.mcess.essentials.Console;
-import static org.mcess.essentials.I18n.tl;
-import org.mcess.essentials.User;
-import org.mcess.essentials.utils.FormatUtil;
+import com.earth2me.essentials.CommandSource;
+import com.earth2me.essentials.Console;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.FormatUtil;
 import java.util.logging.Level;
 import org.bukkit.BanList;
+import org.bukkit.Bukkit;
 import org.bukkit.Server;
 
 

Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java

@@ -0,0 +1,51 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.LocationUtil;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.TreeType;
+
+
+public class Commandbigtree extends EssentialsCommand
+{
+	public Commandbigtree()
+	{
+		super("bigtree");
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		TreeType tree;
+		if (args.length > 0 && args[0].equalsIgnoreCase("redwood"))
+		{
+			tree = TreeType.TALL_REDWOOD;
+		}
+		else if (args.length > 0 && args[0].equalsIgnoreCase("tree"))
+		{
+			tree = TreeType.BIG_TREE;
+		}
+		else if (args.length > 0 && args[0].equalsIgnoreCase("jungle"))
+		{
+			tree = TreeType.JUNGLE;
+		}
+		else
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		final Location loc = LocationUtil.getTarget(user.getBase());
+		final Location safeLocation = LocationUtil.getSafeDestination(loc);
+		final boolean success = user.getWorld().generateTree(safeLocation, tree);
+		if (success)
+		{
+			user.sendMessage(tl("bigTreeSuccess"));
+		}
+		else
+		{
+			throw new Exception(tl("bigTreeFailure"));
+		}
+	}
+}

Essentials/src/com/earth2me/essentials/commands/Commandbook.java

@@ -1,11 +1,11 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.User;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.BookMeta;
-import org.mcess.essentials.I18n;
 
 
 public class Commandbook extends EssentialsCommand
@@ -31,11 +31,11 @@ public class Commandbook extends EssentialsCommand
 				{
 					bmeta.setAuthor(args[1]);
 					item.setItemMeta(bmeta);
-					user.sendMessage(I18n.tl("bookAuthorSet", getFinalArg(args, 1)));
+					user.sendMessage(tl("bookAuthorSet", getFinalArg(args, 1)));
 				}
 				else
 				{
-					throw new Exception(I18n.tl("denyChangeAuthor"));
+					throw new Exception(tl("denyChangeAuthor"));
 				}
 			}
 			else if (args.length > 1 && args[0].equalsIgnoreCase("title"))
@@ -44,11 +44,11 @@ public class Commandbook extends EssentialsCommand
 				{
 					bmeta.setTitle(args[1]);
 					item.setItemMeta(bmeta);
-					user.sendMessage(I18n.tl("bookTitleSet", getFinalArg(args, 1)));
+					user.sendMessage(tl("bookTitleSet", getFinalArg(args, 1)));
 				}
 				else
 				{
-					throw new Exception(I18n.tl("denyChangeTitle"));
+					throw new Exception(tl("denyChangeTitle"));
 				}
 			}
 			else
@@ -58,11 +58,11 @@ public class Commandbook extends EssentialsCommand
 					ItemStack newItem = new ItemStack(Material.BOOK_AND_QUILL, item.getAmount());
 					newItem.setItemMeta(bmeta);
 					user.getBase().setItemInHand(newItem);
-					user.sendMessage(I18n.tl("editBookContents"));
+					user.sendMessage(tl("editBookContents"));
 				}
 				else
 				{
-					throw new Exception(I18n.tl("denyBookEdit"));
+					throw new Exception(tl("denyBookEdit"));
 				}
 			}
 		}
@@ -76,11 +76,11 @@ public class Commandbook extends EssentialsCommand
 			ItemStack newItem = new ItemStack(Material.WRITTEN_BOOK, item.getAmount());
 			newItem.setItemMeta(bmeta);
 			user.getBase().setItemInHand(newItem);
-			user.sendMessage(I18n.tl("bookLocked"));
+			user.sendMessage(tl("bookLocked"));
 		}
 		else
 		{
-			throw new Exception(I18n.tl("holdBook"));
+			throw new Exception(tl("holdBook"));
 		}
 	}
 

Essentials/src/com/earth2me/essentials/commands/Commandbreak.java

@@ -1,7 +1,7 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import static org.mcess.essentials.I18n.tl;
-import org.mcess.essentials.User;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.block.Block;

Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java

@@ -1,10 +1,10 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import org.mcess.essentials.User;
-import org.mcess.essentials.utils.FormatUtil;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.FormatUtil;
 import org.bukkit.Server;
-import org.mcess.essentials.I18n;
 
 
 public class Commandbroadcast extends EssentialsCommand
@@ -33,6 +33,6 @@ public class Commandbroadcast extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 
-		ess.broadcastMessage(I18n.tl("broadcast", FormatUtil.replaceFormat(getFinalArg(args, 0)).replace("\\n", "\n"), name));
+		ess.broadcastMessage(tl("broadcast", FormatUtil.replaceFormat(getFinalArg(args, 0)).replace("\\n", "\n"), name));
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandburn.java

@@ -1,9 +1,9 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import org.mcess.essentials.User;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
 import org.bukkit.Server;
-import org.mcess.essentials.I18n;
 
 
 public class Commandburn extends EssentialsCommand
@@ -28,6 +28,6 @@ public class Commandburn extends EssentialsCommand
 
 		User user = getPlayer(server, sender, args, 0);
 		user.getBase().setFireTicks(Integer.parseInt(args[1]) * 20);
-		sender.sendMessage(I18n.tl("burnMsg", user.getDisplayName(), Integer.parseInt(args[1])));
+		sender.sendMessage(tl("burnMsg", user.getDisplayName(), Integer.parseInt(args[1])));
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java

@@ -1,15 +1,15 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import org.mcess.essentials.User;
-import org.mcess.essentials.utils.NumberUtil;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.NumberUtil;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Locale;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.mcess.essentials.I18n;
 
 
 public class Commandclearinventory extends EssentialsCommand
@@ -45,7 +45,7 @@ public class Commandclearinventory extends EssentialsCommand
 
 		if (allowAll && args.length > 0 && args[0].contentEquals("*"))
 		{
-			sender.sendMessage(I18n.tl("inventoryClearingFromAll"));
+			sender.sendMessage(tl("inventoryClearingFromAll"));
 			offset = 1;
 			players = ess.getOnlinePlayers();
 		}
@@ -102,7 +102,7 @@ public class Commandclearinventory extends EssentialsCommand
 		{
 			if (showExtended)
 			{
-				sender.sendMessage(I18n.tl("inventoryClearingAllItems", player.getDisplayName()));
+				sender.sendMessage(tl("inventoryClearingAllItems", player.getDisplayName()));
 			}
 			player.getInventory().clear();
 		}
@@ -110,7 +110,7 @@ public class Commandclearinventory extends EssentialsCommand
 		{
 			if (showExtended)
 			{
-				sender.sendMessage(I18n.tl("inventoryClearingAllArmor", player.getDisplayName()));
+				sender.sendMessage(tl("inventoryClearingAllArmor", player.getDisplayName()));
 			}
 			player.getInventory().clear();
 			player.getInventory().setArmorContents(null);
@@ -122,7 +122,7 @@ public class Commandclearinventory extends EssentialsCommand
 				ItemStack stack = new ItemStack(type);
 				if (showExtended)
 				{
-					sender.sendMessage(I18n.tl("inventoryClearingAllStack", stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
+					sender.sendMessage(tl("inventoryClearingAllStack", stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
 				}
 				player.getInventory().clear(type, data);
 			}
@@ -133,7 +133,7 @@ public class Commandclearinventory extends EssentialsCommand
 				final int removedAmount = (BASE_AMOUNT - removedStack.getAmount());
 				if (removedAmount > 0 || showExtended)
 				{
-					sender.sendMessage(I18n.tl("inventoryClearingStack", removedAmount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
+					sender.sendMessage(tl("inventoryClearingStack", removedAmount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
 				}
 			}
 			else
@@ -145,14 +145,14 @@ public class Commandclearinventory extends EssentialsCommand
 				ItemStack stack = new ItemStack(type, amount, data);
 				if (player.getInventory().containsAtLeast(stack, amount))
 				{
-					sender.sendMessage(I18n.tl("inventoryClearingStack", amount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
+					sender.sendMessage(tl("inventoryClearingStack", amount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
 					player.getInventory().removeItem(stack);
 				}
 				else
 				{
 					if (showExtended)
 					{
-						sender.sendMessage(I18n.tl("inventoryClearFail", player.getDisplayName(), amount, stack.getType().toString().toLowerCase(Locale.ENGLISH)));
+						sender.sendMessage(tl("inventoryClearFail", player.getDisplayName(), amount, stack.getType().toString().toLowerCase(Locale.ENGLISH)));
 					}
 				}
 			}

Essentials/src/com/earth2me/essentials/commands/Commandcompass.java

@@ -1,8 +1,8 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.User;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
 import org.bukkit.Server;
-import org.mcess.essentials.I18n;
 
 
 public class Commandcompass extends EssentialsCommand
@@ -53,6 +53,6 @@ public class Commandcompass extends EssentialsCommand
 		{
 			dir = "N";
 		}
-		user.sendMessage(I18n.tl("compassBearing", dir, bearing));
+		user.sendMessage(tl("compassBearing", dir, bearing));
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandcondense.java

@@ -1,17 +1,19 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
+import static com.earth2me.essentials.I18n.tl;
 import java.util.*;
 import org.bukkit.Material;
 import org.bukkit.Server;
+import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.Recipe;
 import org.bukkit.inventory.ShapedRecipe;
 import org.bukkit.inventory.ShapelessRecipe;
-import org.mcess.essentials.ChargeException;
-import org.mcess.essentials.Trade;
-import org.mcess.essentials.User;
+import com.earth2me.essentials.ChargeException;
+import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.Trade.OverflowType;
+import com.earth2me.essentials.User;
 import net.ess3.api.MaxMoneyException;
-import org.mcess.essentials.I18n;
 
 
 public class Commandcondense extends EssentialsCommand
@@ -57,11 +59,11 @@ public class Commandcondense extends EssentialsCommand
 
 		if (didConvert)
 		{
-			user.sendMessage(I18n.tl("itemsConverted"));
+			user.sendMessage(tl("itemsConverted"));
 		}
 		else
 		{
-			user.sendMessage(I18n.tl("itemsNotConverted"));
+			user.sendMessage(tl("itemsNotConverted"));
 			throw new NoChargeException();
 		}
 	}
@@ -111,7 +113,7 @@ public class Commandcondense extends EssentialsCommand
 				final Trade remove = new Trade(input, ess);
 				final Trade add = new Trade(result, ess);
 				remove.charge(user);
-				add.pay(user, Trade.OverflowType.DROP);
+				add.pay(user, OverflowType.DROP);
 				return true;
 			}
 		}

Essentials/src/com/earth2me/essentials/commands/Commandcustomtext.java

@@ -1,11 +1,11 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import org.mcess.essentials.textreader.IText;
-import org.mcess.essentials.textreader.KeywordReplacer;
-import org.mcess.essentials.textreader.TextInput;
-import org.mcess.essentials.textreader.TextPager;
-import org.mcess.essentials.utils.NumberUtil;
+import com.earth2me.essentials.CommandSource;
+import com.earth2me.essentials.textreader.IText;
+import com.earth2me.essentials.textreader.KeywordReplacer;
+import com.earth2me.essentials.textreader.TextInput;
+import com.earth2me.essentials.textreader.TextPager;
+import com.earth2me.essentials.utils.NumberUtil;
 import org.bukkit.Server;
 
 

Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java

@@ -1,8 +1,8 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import static org.mcess.essentials.I18n.tl;
-import org.mcess.essentials.User;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
 import java.util.Locale;
 import org.bukkit.Server;
 

Essentials/src/com/earth2me/essentials/commands/Commanddeljail.java

@@ -1,7 +1,7 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import static org.mcess.essentials.I18n.tl;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
 import org.bukkit.Server;
 
 

Essentials/src/com/earth2me/essentials/commands/Commanddelwarp.java

@@ -1,7 +1,7 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import static org.mcess.essentials.I18n.tl;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
 import org.bukkit.Server;
 
 

Essentials/src/com/earth2me/essentials/commands/Commanddepth.java

@@ -1,8 +1,8 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.User;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
 import org.bukkit.Server;
-import org.mcess.essentials.I18n;
 
 
 public class Commanddepth extends EssentialsCommand
@@ -18,15 +18,15 @@ public class Commanddepth extends EssentialsCommand
 		final int depth = user.getLocation().getBlockY() - 63;
 		if (depth > 0)
 		{
-			user.sendMessage(I18n.tl("depthAboveSea", depth));
+			user.sendMessage(tl("depthAboveSea", depth));
 		}
 		else if (depth < 0)
 		{
-			user.sendMessage(I18n.tl("depthBelowSea", (-depth)));
+			user.sendMessage(tl("depthBelowSea", (-depth)));
 		}
 		else
 		{
-			user.sendMessage(I18n.tl("depth"));
+			user.sendMessage(tl("depth"));
 		}
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandeco.java

@@ -1,14 +1,14 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.ChargeException;
-import org.mcess.essentials.CommandSource;
-import org.mcess.essentials.User;
-import org.mcess.essentials.utils.NumberUtil;
+import com.earth2me.essentials.ChargeException;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.NumberUtil;
 import java.math.BigDecimal;
 import java.util.Locale;
 import net.ess3.api.MaxMoneyException;
 import org.bukkit.Server;
-import org.mcess.essentials.I18n;
 
 
 public class Commandeco extends EssentialsLoopCommand
@@ -47,11 +47,11 @@ public class Commandeco extends EssentialsLoopCommand
 		{
 			if (args[1].contentEquals("**"))
 			{
-				server.broadcastMessage(I18n.tl("resetBalAll", NumberUtil.displayCurrency(amount, ess)));
+				server.broadcastMessage(tl("resetBalAll", NumberUtil.displayCurrency(amount, ess)));
 			}
 			else if (args[1].contentEquals("*"))
 			{
-				server.broadcastMessage(I18n.tl("resetBal", NumberUtil.displayCurrency(amount, ess)));
+				server.broadcastMessage(tl("resetBal", NumberUtil.displayCurrency(amount, ess)));
 			}
 		}
 	}
@@ -94,11 +94,11 @@ public class Commandeco extends EssentialsLoopCommand
 			{
 				// Take shouldn't be able to throw a max money exception
 			}
-			player.sendMessage(I18n.tl("takenFromAccount", NumberUtil.displayCurrency(player.getMoney(), ess)));
+			player.sendMessage(tl("takenFromAccount", NumberUtil.displayCurrency(player.getMoney(), ess)));
 		}
 		else
 		{
-			throw new ChargeException(I18n.tl("insufficientFunds"));
+			throw new ChargeException(tl("insufficientFunds"));
 		}
 	}
 
@@ -109,10 +109,10 @@ public class Commandeco extends EssentialsLoopCommand
 		boolean underMinimum = (amount.compareTo(minBalance) < 0);
 		boolean aboveMax = (amount.compareTo(maxBalance) > 0);
 		player.setMoney(underMinimum ? minBalance : aboveMax ? maxBalance : amount);
-		player.sendMessage(I18n.tl("setBal", NumberUtil.displayCurrency(player.getMoney(), ess)));
+		player.sendMessage(tl("setBal", NumberUtil.displayCurrency(player.getMoney(), ess)));
 		if (sender != null)
 		{
-			sender.sendMessage(I18n.tl("setBalOthers", player.getDisplayName(), NumberUtil.displayCurrency(player.getMoney(), ess)));
+			sender.sendMessage(tl("setBalOthers", player.getDisplayName(), NumberUtil.displayCurrency(player.getMoney(), ess)));
 		}
 	}
 

Essentials/src/com/earth2me/essentials/commands/Commandenchant.java

@@ -1,9 +1,10 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.Enchantments;
-import org.mcess.essentials.MetaItemStack;
-import org.mcess.essentials.User;
-import org.mcess.essentials.utils.StringUtil;
+import com.earth2me.essentials.Enchantments;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.MetaItemStack;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.StringUtil;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -12,7 +13,6 @@ import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
-import org.mcess.essentials.I18n;
 
 
 public class Commandenchant extends EssentialsCommand
@@ -29,7 +29,7 @@ public class Commandenchant extends EssentialsCommand
 		final ItemStack stack = user.getBase().getItemInHand();
 		if (stack == null || stack.getType() == Material.AIR)
 		{
-			throw new Exception(I18n.tl("nothingInHand"));
+			throw new Exception(tl("nothingInHand"));
 		}
 		if (args.length == 0)
 		{
@@ -43,7 +43,7 @@ public class Commandenchant extends EssentialsCommand
 					//enchantmentslist.add(enchantmentName);
 				}
 			}
-			throw new NotEnoughArgumentsException(I18n.tl("enchantments", StringUtil.joinList(enchantmentslist.toArray())));
+			throw new NotEnoughArgumentsException(tl("enchantments", StringUtil.joinList(enchantmentslist.toArray())));
 		}
 
 		int level = -1;
@@ -70,11 +70,11 @@ public class Commandenchant extends EssentialsCommand
 		final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
 		if (level == 0)
 		{
-			user.sendMessage(I18n.tl("enchantmentRemoved", enchantmentName.replace('_', ' ')));
+			user.sendMessage(tl("enchantmentRemoved", enchantmentName.replace('_', ' ')));
 		}
 		else
 		{
-			user.sendMessage(I18n.tl("enchantmentApplied", enchantmentName.replace('_', ' ')));
+			user.sendMessage(tl("enchantmentApplied", enchantmentName.replace('_', ' ')));
 		}
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandenderchest.java

@@ -1,6 +1,6 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.User;
+import com.earth2me.essentials.User;
 import org.bukkit.Server;
 
 

Essentials/src/com/earth2me/essentials/commands/Commandessentials.java

@@ -1,12 +1,13 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import org.mcess.essentials.EssentialsUpgrade;
-import org.mcess.essentials.User;
-import org.mcess.essentials.UserMap;
-import org.mcess.essentials.metrics.Metrics;
-import org.mcess.essentials.utils.DateUtil;
-import org.mcess.essentials.utils.NumberUtil;
+import com.earth2me.essentials.CommandSource;
+import com.earth2me.essentials.EssentialsUpgrade;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.UserMap;
+import com.earth2me.essentials.metrics.Metrics;
+import com.earth2me.essentials.utils.DateUtil;
+import com.earth2me.essentials.utils.NumberUtil;
 import com.google.common.base.Charsets;
 import java.io.IOException;
 import java.util.HashMap;
@@ -18,7 +19,6 @@ import org.bukkit.Server;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
-import org.mcess.essentials.I18n;
 
 // This command has 4 undocumented behaviours #EasterEgg
 public class Commandessentials extends EssentialsCommand
@@ -91,7 +91,7 @@ public class Commandessentials extends EssentialsCommand
 		}
 		if (disabledCommands.length() > 0)
 		{
-			sender.sendMessage(I18n.tl("blockList"));
+			sender.sendMessage(tl("blockList"));
 			sender.sendMessage(disabledCommands.toString());
 		}
 	}
@@ -116,7 +116,7 @@ public class Commandessentials extends EssentialsCommand
 	private void run_reload(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
 	{
 		ess.reload();
-		sender.sendMessage(I18n.tl("essentialsReload", ess.getDescription().getVersion()));
+		sender.sendMessage(tl("essentialsReload", ess.getDescription().getVersion()));
 	}
 
 	private void run_nya(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
@@ -267,7 +267,7 @@ public class Commandessentials extends EssentialsCommand
 			sender.sendMessage("Unless you define larger default values, this command wil ignore people who have more than 0 money/homes.");
 			throw new Exception("/<command> cleanup <days> [money] [homes]");
 		}
-		sender.sendMessage(I18n.tl("cleaning"));
+		sender.sendMessage(tl("cleaning"));
 
 		final long daysArg = Long.parseLong(args[1]);
 		final double moneyArg = args.length >= 3 ? Double.parseDouble(args[2].replaceAll("[^0-9\\.]", "")) : 0;
@@ -321,7 +321,7 @@ public class Commandessentials extends EssentialsCommand
 
 					user.reset();
 				}
-				sender.sendMessage(I18n.tl("cleaned"));
+				sender.sendMessage(tl("cleaned"));
 			}
 		});
 

Essentials/src/com/earth2me/essentials/commands/Commandexp.java

@@ -1,10 +1,10 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import static org.mcess.essentials.I18n.tl;
-import org.mcess.essentials.User;
-import org.mcess.essentials.craftbukkit.SetExpFix;
-import org.mcess.essentials.utils.NumberUtil;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.craftbukkit.SetExpFix;
+import com.earth2me.essentials.utils.NumberUtil;
 import java.util.List;
 import java.util.Locale;
 import org.bukkit.Server;

Essentials/src/com/earth2me/essentials/commands/Commandext.java

@@ -1,8 +1,8 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import static org.mcess.essentials.I18n.tl;
-import org.mcess.essentials.User;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 

Essentials/src/com/earth2me/essentials/commands/Commandfeed.java

@@ -1,11 +1,11 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import org.mcess.essentials.User;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
-import org.mcess.essentials.I18n;
 
 
 public class Commandfeed extends EssentialsLoopCommand
@@ -30,7 +30,7 @@ public class Commandfeed extends EssentialsLoopCommand
 		}
 
 		feedPlayer(user.getBase());
-		user.sendMessage(I18n.tl("feed"));
+		user.sendMessage(tl("feed"));
 	}
 
 	@Override
@@ -50,7 +50,7 @@ public class Commandfeed extends EssentialsLoopCommand
 		try
 		{
 			feedPlayer(player.getBase());
-			sender.sendMessage(I18n.tl("feedOther", player.getDisplayName()));
+			sender.sendMessage(tl("feedOther", player.getDisplayName()));
 		}
 		catch (QuietAbortException e)
 		{

Essentials/src/com/earth2me/essentials/commands/Commandfireball.java

@@ -1,6 +1,6 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.User;
+import com.earth2me.essentials.User;
 import org.bukkit.Server;
 import org.bukkit.entity.*;
 import org.bukkit.util.Vector;

Essentials/src/com/earth2me/essentials/commands/Commandfirework.java

@@ -1,9 +1,10 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import static org.mcess.essentials.I18n.tl;
-import org.mcess.essentials.MetaItemStack;
-import org.mcess.essentials.User;
-import org.mcess.essentials.utils.NumberUtil;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.MetaItemStack;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.NumberUtil;
+import java.util.regex.Pattern;
 import org.bukkit.FireworkEffect;
 import org.bukkit.Material;
 import org.bukkit.Server;

Essentials/src/com/earth2me/essentials/commands/Commandfly.java

@@ -1,9 +1,9 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import org.mcess.essentials.User;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
 import org.bukkit.Server;
-import org.mcess.essentials.I18n;
 
 
 public class Commandfly extends EssentialsToggleCommand
@@ -60,10 +60,10 @@ public class Commandfly extends EssentialsToggleCommand
 			user.getBase().setFlying(false);
 		}
 
-		user.sendMessage(I18n.tl("flyMode", I18n.tl(enabled ? "enabled" : "disabled"), user.getDisplayName()));
+		user.sendMessage(tl("flyMode", tl(enabled ? "enabled" : "disabled"), user.getDisplayName()));
 		if (!sender.isPlayer() || !sender.getPlayer().equals(user.getBase()))
 		{
-			sender.sendMessage(I18n.tl("flyMode", I18n.tl(enabled ? "enabled" : "disabled"), user.getDisplayName()));
+			sender.sendMessage(tl("flyMode", tl(enabled ? "enabled" : "disabled"), user.getDisplayName()));
 		}
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java

@@ -1,13 +1,13 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import org.mcess.essentials.User;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
 import java.util.List;
 import java.util.Locale;
 import org.bukkit.GameMode;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
-import org.mcess.essentials.I18n;
 
 
 public class Commandgamemode extends EssentialsCommand
@@ -74,14 +74,14 @@ public class Commandgamemode extends EssentialsCommand
 			gameMode = user.getBase().getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : user.getBase().getGameMode() == GameMode.CREATIVE ? GameMode.ADVENTURE : GameMode.SURVIVAL;
 		}
 		user.getBase().setGameMode(gameMode);
-		user.sendMessage(I18n.tl("gameMode", I18n.tl(user.getBase().getGameMode().toString().toLowerCase(Locale.ENGLISH)), user.getDisplayName()));
+		user.sendMessage(tl("gameMode", tl(user.getBase().getGameMode().toString().toLowerCase(Locale.ENGLISH)), user.getDisplayName()));
 	}
 
 	private void gamemodeOtherPlayers(final Server server, final CommandSource sender, final GameMode gameMode, final String name) throws NotEnoughArgumentsException, PlayerNotFoundException
 	{
 		if (name.trim().length() < 2 || gameMode == null)
 		{
-			throw new NotEnoughArgumentsException(I18n.tl("gameModeInvalid"));
+			throw new NotEnoughArgumentsException(tl("gameModeInvalid"));
 		}
 
 		boolean skipHidden = sender.isPlayer() && !ess.getUser(sender.getPlayer()).canInteractVanished();
@@ -96,7 +96,7 @@ public class Commandgamemode extends EssentialsCommand
 			}
 			foundUser = true;
 			player.getBase().setGameMode(gameMode);
-			sender.sendMessage(I18n.tl("gameMode", I18n.tl(player.getBase().getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getDisplayName()));
+			sender.sendMessage(tl("gameMode", tl(player.getBase().getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getDisplayName()));
 		}
 		if (!foundUser)
 		{

Essentials/src/com/earth2me/essentials/commands/Commandgc.java

@@ -1,9 +1,9 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import static org.mcess.essentials.I18n.tl;
-import org.mcess.essentials.utils.DateUtil;
-import org.mcess.essentials.utils.NumberUtil;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.utils.DateUtil;
+import com.earth2me.essentials.utils.NumberUtil;
 import java.lang.management.ManagementFactory;
 import java.util.List;
 import java.util.logging.Level;

Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java

@@ -1,10 +1,10 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import org.mcess.essentials.User;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
 import org.bukkit.Location;
 import org.bukkit.Server;
-import org.mcess.essentials.I18n;
 
 
 public class Commandgetpos extends EssentialsCommand
@@ -39,15 +39,15 @@ public class Commandgetpos extends EssentialsCommand
 
 	private void outputPosition(final CommandSource sender, final Location coords, final Location distance)
 	{
-		sender.sendMessage(I18n.tl("currentWorld", coords.getWorld().getName()));
-		sender.sendMessage(I18n.tl("posX", coords.getBlockX()));
-		sender.sendMessage(I18n.tl("posY", coords.getBlockY()));
-		sender.sendMessage(I18n.tl("posZ", coords.getBlockZ()));
-		sender.sendMessage(I18n.tl("posYaw", (coords.getYaw() + 180 + 360) % 360));
-		sender.sendMessage(I18n.tl("posPitch", coords.getPitch()));
+		sender.sendMessage(tl("currentWorld", coords.getWorld().getName()));
+		sender.sendMessage(tl("posX", coords.getBlockX()));
+		sender.sendMessage(tl("posY", coords.getBlockY()));
+		sender.sendMessage(tl("posZ", coords.getBlockZ()));
+		sender.sendMessage(tl("posYaw", (coords.getYaw() + 180 + 360) % 360));
+		sender.sendMessage(tl("posPitch", coords.getPitch()));
 		if (distance != null && coords.getWorld().equals(distance.getWorld()))
 		{
-			sender.sendMessage(I18n.tl("distance", coords.distance(distance)));
+			sender.sendMessage(tl("distance", coords.distance(distance)));
 		}
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandgive.java

@@ -1,16 +1,16 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import org.mcess.essentials.MetaItemStack;
-import org.mcess.essentials.User;
-import org.mcess.essentials.craftbukkit.InventoryWorkaround;
-import org.mcess.essentials.utils.NumberUtil;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.MetaItemStack;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import com.earth2me.essentials.utils.NumberUtil;
 import java.util.Locale;
 import java.util.Map;
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.inventory.ItemStack;
-import org.mcess.essentials.I18n;
 
 
 public class Commandgive extends EssentialsCommand
@@ -39,7 +39,7 @@ public class Commandgive extends EssentialsCommand
 				: (!ess.getUser(sender.getPlayer()).isAuthorized("essentials.itemspawn.exempt")
 				   && !ess.getUser(sender.getPlayer()).canSpawnItem(stack.getTypeId()))))
 		{
-			throw new Exception(I18n.tl("cantSpawnItem", itemname));
+			throw new Exception(tl("cantSpawnItem", itemname));
 		}
 
 		final User giveTo = getPlayer(server, sender, args, 0);
@@ -72,7 +72,7 @@ public class Commandgive extends EssentialsCommand
 		MetaItemStack metaStack = new MetaItemStack(stack);
 		if (!metaStack.canSpawn(ess))
 		{
-			throw new Exception(I18n.tl("unableToSpawnItem", itemname));
+			throw new Exception(tl("unableToSpawnItem", itemname));
 		}
 
 		if (args.length > 3)
@@ -95,11 +95,11 @@ public class Commandgive extends EssentialsCommand
 
 		if (stack.getType() == Material.AIR)
 		{
-			throw new Exception(I18n.tl("cantSpawnItem", "Air"));
+			throw new Exception(tl("cantSpawnItem", "Air"));
 		}
 
 		final String itemName = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' ');
-		sender.sendMessage(I18n.tl("giveSpawn", stack.getAmount(), itemName, giveTo.getDisplayName()));
+		sender.sendMessage(tl("giveSpawn", stack.getAmount(), itemName, giveTo.getDisplayName()));
 
 		Map<Integer, ItemStack> leftovers;
 
@@ -114,7 +114,7 @@ public class Commandgive extends EssentialsCommand
 
 		for (ItemStack item : leftovers.values())
 		{
-			sender.sendMessage(I18n.tl("giveSpawnFailure", item.getAmount(), itemName, giveTo.getDisplayName()));
+			sender.sendMessage(tl("giveSpawnFailure", item.getAmount(), itemName, giveTo.getDisplayName()));
 		}
 
 		giveTo.getBase().updateInventory();

Essentials/src/com/earth2me/essentials/commands/Commandgod.java

@@ -1,10 +1,10 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.CommandSource;
-import org.mcess.essentials.User;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
 import net.ess3.api.events.GodStatusChangeEvent;
 import org.bukkit.Server;
-import org.mcess.essentials.I18n;
 
 
 public class Commandgod extends EssentialsToggleCommand
@@ -66,10 +66,10 @@ public class Commandgod extends EssentialsToggleCommand
 				user.getBase().setFoodLevel(20);
 			}
 
-			user.sendMessage(I18n.tl("godMode", enabled ? I18n.tl("enabled") : I18n.tl("disabled")));
+			user.sendMessage(tl("godMode", enabled ? tl("enabled") : tl("disabled")));
 			if (!sender.isPlayer() || !sender.getPlayer().equals(user.getBase()))
 			{
-				sender.sendMessage(I18n.tl("godMode", I18n.tl(enabled ? "godEnabledFor" : "godDisabledFor", user.getDisplayName())));
+				sender.sendMessage(tl("godMode", tl(enabled ? "godEnabledFor" : "godDisabledFor", user.getDisplayName())));
 			}
 		}
 	}

Essentials/src/com/earth2me/essentials/commands/Commandhat.java

@@ -1,12 +1,12 @@
-package org.mcess.essentials.commands;
+package com.earth2me.essentials.commands;
 
-import org.mcess.essentials.User;
-import org.mcess.essentials.craftbukkit.InventoryWorkaround;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
-import org.mcess.essentials.I18n;
 
 
 public class Commandhat extends EssentialsCommand
@@ -25,14 +25,14 @@ public class Commandhat extends EssentialsCommand
 			final ItemStack head = inv.getHelmet();
 			if (head == null || head.getType() == Material.AIR)
 			{
-				user.sendMessage(I18n.tl("hatEmpty"));
+				user.sendMessage(tl("hatEmpty"));
 			}
 			else
 			{
 				final ItemStack air = new ItemStack(Material.AIR);
 				inv.setHelmet(air);
 				InventoryWorkaround.addItems(user.getBase().getInventory(), head);
-				user.sendMessage(I18n.tl("hatRemoved"));
+				user.sendMessage(tl("hatRemoved"));
 			}
 		}
 		else
@@ -46,16 +46,16 @@ public class Commandhat extends EssentialsCommand
 					final ItemStack head = inv.getHelmet();
 					inv.setHelmet(hand);
 					inv.setItemInHand(head);
-					user.sendMessage(I18n.tl("hatPlaced"));
+					user.sendMessage(tl("hatPlaced"));
 				}
 				else
 				{
-					user.sendMessage(I18n.tl("hatArmor"));
+					user.sendMessage(tl("hatArmor"));
 				}
 			}
 			else
 			{
-				user.sendMessage(I18n.tl("hatFail"));
+				user.sendMessage(tl("hatFail"));
 			}
 		}
 	}