Release the Player object reference on quit.

Fix error message typo

.gitignore

@@ -1,37 +1,53 @@
-# Eclipse stuff
-.classpath
-.project
-.settings
-
-# netbeans
-nbproject
-
-# we use maven!
-build.xml
-
-# maven
-target
-jars
-dependency-reduced-pom.xml
-
-# vim
-.*.sw[a-p]
-
-# various other potential build files
-build
-bin
-dist
-manifest.mf
-
-# Mac filesystem dust
-.DS_Store
-
-# intellij
-*.iml
-*.ipr
-*.iws
-.idea/
-
-/EssentialsRelease/
-*.mo
-*.po.~*~
+.DS_Store
+/BuildAll/nbproject/private/
+/EssentialsProtect/nbproject/private/
+/EssentialsChat/nbproject/private/
+/EssentialsGroupBridge/nbproject/private/
+/EssentialsGeoIP/nbproject/private/
+/EssentialsSpawn/nbproject/private/
+/EssentialsXMPP/nbproject/private/
+/EssentialsGroupManager/nbproject/private/
+/BuildAll/build/
+/EssentialsGroupBridge/dist/
+/EssentialsGroupBridge/build/
+/EssentialsGeoIP/dist/
+/EssentialsGeoIP/build/
+/EssentialsGroupManager/build/
+/EssentialsGroupManager/dist/
+/BuildAll/dist/
+/EssentialsChat/build/
+/EssentialsChat/dist/
+/EssentialsSpawn/build/
+/EssentialsSpawn/dist/
+/EssentialsXMPP/dist/
+/EssentialsXMPP/build/
+/EssentialsProtect/dist/
+/EssentialsProtect/build/
+/EssentialsPermissionsCommands/nbproject/private/
+/EssentialsPermissionsCommands/build/
+/EssentialsPermissionsCommands/dist/
+/Essentials/nbproject/private/
+/Essentials/dist/
+/Essentials/build/
+/YamlAnnotations/
+/EssentialsUpdate/nbproject/private/
+/EssentialsRelease/
+/EssentialsUpdate/dist/
+/EssentialsUpdate/build/
+/WebPush/apikey.php
+/WebPush/nbproject/private
+/EssentialsGroupManager/bin
+/EssentialsGroupManager/.externalToolBuilders
+/EssentialsAntiBuild/nbproject/private/
+/EssentialsAntiBuild/dist/
+/EssentialsAntiBuild/build/
+/jars
+/out
+.idea/
+*.iml
+target/
+dependency-reduced-pom.xml
+/Essentials/config.yml
+/Essentials/userdata/testplayer1.yml
+/Essentials/usermap.csv
+/Essentials/userdata

.travis.yml

@@ -3,7 +3,8 @@ jdk:
   - oraclejdk7
   - openjdk7
   - openjdk6
-script: mvn clean test
+script: mvn compile test
+install: true
 notifications:
   irc: 
     channels: 
@@ -12,6 +13,6 @@ notifications:
     on_failure: always
   email:
     recipients:
-      - "team@ess3.net"
+      - "khobbits@ess3.net"
     on_success: change
-    on_failure: always
+    on_failure: always

Essentials/nb-configuration.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-  <!--
-  This file contains additional configuration written by modules in the NetBeans IDE.
-  The configuration is intended to be shared among all the users of project and
-  therefore it is assumed to be part of version control checkout.
-  Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-  -->
-  <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-    <!--
-    Properties that influence various parts of the IDE, especially code formatting and the like. 
-    You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-    That way multiple projects can share the same settings (useful for formatting rules for example).
-    Any value defined here will override the pom.xml file value but is only applicable to the current project.
-    -->
-    <netbeans.compile.on.save>all</netbeans.compile.on.save>
-  </properties>
-</project-shared-configuration>

Essentials/pom.xml

@@ -1,119 +1,144 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>net.essentials3</groupId>
-    <artifactId>EssentialsParent</artifactId>
-    <version>3.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
+	<parent>
+		<groupId>net.ess3</groupId>
+		<artifactId>EssentialsParent</artifactId>
+		<version>2.x-SNAPSHOT</version>
+	</parent>
 
-  <artifactId>Essentials</artifactId>
-  <dependencies>
-    <!-- Internal Depends -->
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>EssentialsGroupManager</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-      <version>0.11.6</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.4.1</version>
-    </dependency>
-    <!-- Test Depends -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.10</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- External Plugin Depends -->
-    <dependency>
-      <groupId>cosine</groupId>
-      <artifactId>BOSEconomy</artifactId>
-      <version>0.7</version>
-    </dependency>
-    <dependency>
-      <groupId>com.iConomy</groupId>
-      <artifactId>iConomy</artifactId>
-      <version>5.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.iCo6</groupId>
-      <artifactId>iConomy</artifactId>
-      <version>6.0</version>
-    </dependency>
-    <dependency>
-      <groupId>me.ashtheking</groupId>
-      <artifactId>MultiCurrency</artifactId>
-      <version>0.05</version>
-    </dependency>
-    <dependency>
-      <groupId>net.milkbowl</groupId>
-      <artifactId>Vault</artifactId>
-      <version>1.2</version>
-    </dependency>
-  </dependencies>
+	<artifactId>Essentials</artifactId>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.0</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>commons-io:*</include>
-                  <include>org.apache.commons:commons-compress</include>
-                </includes>
-              </artifactSet>
-              <minimizeJar>true</minimizeJar>
-              <relocations>
-                <relocation>
-                  <pattern>org.apache.commons</pattern>
-                  <shadedPattern>net.ess3.commons</shadedPattern>
-                </relocation>
-              </relocations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.xnap.commons</groupId>
-        <artifactId>maven-gettext-plugin</artifactId>
-        <configuration>
-          <poDirectory>${basedir}/po/</poDirectory>
-          <targetBundle>messages2</targetBundle>
-          <keywords>-k_ -kComment -k -s --package-name=Essentials --package-version=${project.version} --copyright-holder="Essentials Team"</keywords>
-          <outputFormat>properties</outputFormat>
-          <sourceDirectory>${basedir}/../</sourceDirectory>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+	<url>http://ess3.net/</url>
+
+	<organization>
+		<name>Essentials Team</name>
+		<url>http://ess3.net/</url>
+	</organization>
+
+	<licenses>
+		<license>
+			<name>GPLv3</name>
+			<url>http://www.gnu.org/copyleft/gpl.html</url>
+		</license>
+	</licenses>
+
+	<scm>
+		<connection>scm:git:https://github.com/essentials/Essentials.git</connection>
+		<developerConnection>scm:git:https://github.com/essentials/Essentials.git</developerConnection>
+		<url>https://github.com/essentials/Essentials</url>
+	</scm>
+
+	<issueManagement>
+		<system>JIRA</system>
+		<url>http://essentials3.atlassian.net</url>
+	</issueManagement>
+
+	<ciManagement>
+		<system>TeamCity</system>
+		<url>http://ci.ess3.net/</url>
+	</ciManagement>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <showDeprecation>true</showDeprecation>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+		<dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.7.2-R0.3-SNAPSHOT</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/bukkit.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>BOSEconomy</groupId>
+			<artifactId>BOSEconomy</artifactId>
+			<version>v0.7.8.1</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/BOSEconomy.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>de.bananaco</groupId>
+			<artifactId>bPermissions</artifactId>
+			<version>v2.12-DEV</version>
+		</dependency>
+		<dependency>
+			<groupId>iConomy</groupId>
+			<artifactId>iConomy5</artifactId>
+			<version>5</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/iCo5.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>iConomy</groupId>
+			<artifactId>iConomy6</artifactId>
+			<version>6</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/iCo6.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>net.ess3</groupId>
+			<artifactId>GroupManager</artifactId>
+			<version>${project.version}</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../EssentialsGroupManager/dist/EssentialsGroupManager.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>MultiCurrency</groupId>
+			<artifactId>MultiCurrency</artifactId>
+			<version>2.2</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/MultiCurrency.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>com.platymuus</groupId>
+			<artifactId>bukkit-permissions</artifactId>
+			<version>2.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/PermissionsBukkit.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>ru.tehkode</groupId>
+			<artifactId>PermissionsEx</artifactId>
+			<version>1.20.4</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/PermissionsEx.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>Privileges</groupId>
+			<artifactId>Privileges</artifactId>
+			<version>1.8.1</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/Privileges.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>SimplyPerms</groupId>
+			<artifactId>SimplyPerms</artifactId>
+			<version>1.7.6</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/SimplyPerms.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>net.milkbowl.vault</groupId>
+			<artifactId>Vault</artifactId>
+			<version>1.2.32</version>
+		</dependency>
+		<dependency>
+			<groupId>zPermissions</groupId>
+			<artifactId>zPermissions</artifactId>
+			<version>1.1</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/zPermissions.jar</systemPath>
+		</dependency>
+	</dependencies>
 </project>

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

@@ -0,0 +1,139 @@
+package com.earth2me.essentials;
+
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
+import org.bukkit.command.Command;
+import org.bukkit.command.PluginCommand;
+import org.bukkit.command.PluginCommandYamlParser;
+import org.bukkit.plugin.Plugin;
+
+
+public class AlternativeCommandsHandler
+{
+	private static final Logger LOGGER = Logger.getLogger("Essentials");
+	private final transient Map<String, List<PluginCommand>> altcommands = new HashMap<String, List<PluginCommand>>();
+	private final transient Map<String, String> disabledList = new HashMap<String, String>();
+	private final transient IEssentials ess;
+
+	public AlternativeCommandsHandler(final IEssentials ess)
+	{
+		this.ess = ess;
+		for (Plugin plugin : ess.getServer().getPluginManager().getPlugins())
+		{
+			if (plugin.isEnabled())
+			{
+				addPlugin(plugin);
+			}
+		}
+	}
+
+	public final void addPlugin(final Plugin plugin)
+	{
+		if (plugin.getDescription().getMain().contains("com.earth2me.essentials"))
+		{
+			return;
+		}
+		final List<Command> commands = PluginCommandYamlParser.parse(plugin);
+		final String pluginName = plugin.getDescription().getName().toLowerCase(Locale.ENGLISH);
+
+		for (Command command : commands)
+		{
+			final PluginCommand pc = (PluginCommand)command;
+			final List<String> labels = new ArrayList<String>(pc.getAliases());
+			labels.add(pc.getName());
+
+			PluginCommand reg = ess.getServer().getPluginCommand(pluginName + ":" + pc.getName().toLowerCase(Locale.ENGLISH));
+			if (reg == null)
+			{
+				reg = ess.getServer().getPluginCommand(pc.getName().toLowerCase(Locale.ENGLISH));
+			}
+			if (reg == null || !reg.getPlugin().equals(plugin))
+			{
+				continue;
+			}
+			for (String label : labels)
+			{
+				List<PluginCommand> plugincommands = altcommands.get(label.toLowerCase(Locale.ENGLISH));
+				if (plugincommands == null)
+				{
+					plugincommands = new ArrayList<PluginCommand>();
+					altcommands.put(label.toLowerCase(Locale.ENGLISH), plugincommands);
+				}
+				boolean found = false;
+				for (PluginCommand pc2 : plugincommands)
+				{
+					if (pc2.getPlugin().equals(plugin))
+					{
+						found = true;
+					}
+				}
+				if (!found)
+				{
+					plugincommands.add(reg);
+				}
+			}
+		}
+	}
+
+	public void removePlugin(final Plugin plugin)
+	{
+		final Iterator<Map.Entry<String, List<PluginCommand>>> iterator = altcommands.entrySet().iterator();
+		while (iterator.hasNext())
+		{
+			final Map.Entry<String, List<PluginCommand>> entry = iterator.next();
+			final Iterator<PluginCommand> pcIterator = entry.getValue().iterator();
+			while (pcIterator.hasNext())
+			{
+				final PluginCommand pc = pcIterator.next();
+				if (pc.getPlugin() == null || pc.getPlugin().equals(plugin))
+				{
+					pcIterator.remove();
+				}
+			}
+			if (entry.getValue().isEmpty())
+			{
+				iterator.remove();
+			}
+		}
+	}
+
+	public PluginCommand getAlternative(final String label)
+	{
+		final List<PluginCommand> commands = altcommands.get(label);
+		if (commands == null || commands.isEmpty())
+		{
+			return null;
+		}
+		if (commands.size() == 1)
+		{
+			return commands.get(0);
+		}
+		// return the first command that is not an alias
+		for (PluginCommand command : commands)
+		{
+			if (command.getName().equalsIgnoreCase(label))
+			{
+				return command;
+			}
+		}
+		// return the first alias
+		return commands.get(0);
+	}
+
+	public void executed(final String label, final PluginCommand pc)
+	{
+		final String altString = pc.getPlugin().getName() + ":" + pc.getLabel();
+		if (ess.getSettings().isDebug())
+		{
+			LOGGER.log(Level.INFO, "Essentials: Alternative command " + label + " found, using " + altString);
+		}
+		disabledList.put(label, altString);
+	}
+
+	public Map<String, String> disabledCommands()
+	{
+		return disabledList;
+	}
+}

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

@@ -0,0 +1,167 @@
+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 (server.getOnlinePlayers().length > 0)
+		{
+			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
+				{
+					ess.scheduleSyncDelayedTask(new Runnable()
+					{
+						@Override
+						public void run()
+						{
+							server.dispatchCommand(cs, "save-on");
+							if (server.getOnlinePlayers().length == 0)
+							{
+								stopTask();
+							}
+							active = false;
+							LOGGER.log(Level.INFO, tl("backupFinished"));
+						}
+					});
+				}
+			}
+		});
+	}
+}

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

@@ -0,0 +1,15 @@
+package com.earth2me.essentials;
+
+
+public class ChargeException extends Exception
+{
+	public ChargeException(final String message)
+	{
+		super(message);
+	}
+
+	public ChargeException(final String message, final Throwable throwable)
+	{
+		super(message, throwable);
+	}
+}

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

@@ -0,0 +1,61 @@
+package com.earth2me.essentials;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class CommandSource implements IReplyTo
+{
+	private CommandSource replyTo = null;
+	protected CommandSender sender;
+
+	public CommandSource(final CommandSender base)
+	{
+		this.sender = base;
+	}
+
+	public final CommandSender getSender()
+	{
+		return sender;
+	}
+
+	public final Player getPlayer()
+	{
+		if (sender instanceof Player)
+		{
+			return (Player)sender;
+		}
+		return null;
+	}
+	
+	public final boolean isPlayer()
+	{
+		return (sender instanceof Player);
+	}
+
+	public final CommandSender setSender(final CommandSender base)
+	{
+		return this.sender = base;
+	}
+	
+	
+	public void sendMessage(String message)
+	{
+		if (!message.isEmpty())
+		{
+			sender.sendMessage(message);
+		}
+	}
+
+	@Override
+	public void setReplyTo(final CommandSource user)
+	{
+		replyTo = user;
+	}
+
+	@Override
+	public CommandSource getReplyTo()
+	{
+		return replyTo;
+	}
+}

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

@@ -0,0 +1,38 @@
+package com.earth2me.essentials;
+
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+
+
+public final class Console implements IReplyTo
+{
+	private static final Console instance = new Console();
+	private CommandSource replyTo;
+	public final static String NAME = "Console";
+
+	private Console()
+	{
+	}
+
+	public static CommandSender getCommandSender(Server server) throws Exception
+	{
+		return server.getConsoleSender();
+	}
+
+	@Override
+	public void setReplyTo(CommandSource user)
+	{
+		replyTo = user;
+	}
+
+	@Override
+	public CommandSource getReplyTo()
+	{
+		return replyTo;
+	}
+
+	public static Console getConsoleReplyTo()
+	{
+		return instance;
+	}
+}

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

@@ -0,0 +1,187 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.utils.NumberUtil;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import org.bukkit.enchantments.Enchantment;
+
+
+public class Enchantments
+{
+	private static final Map<String, Enchantment> ENCHANTMENTS = new HashMap<String, Enchantment>();
+	private static final Map<String, Enchantment> ALIASENCHANTMENTS = new HashMap<String, Enchantment>();
+
+	static
+	{
+		ENCHANTMENTS.put("alldamage", Enchantment.DAMAGE_ALL);
+		ALIASENCHANTMENTS.put("alldmg", Enchantment.DAMAGE_ALL);
+		ENCHANTMENTS.put("sharpness", Enchantment.DAMAGE_ALL);
+		ALIASENCHANTMENTS.put("sharp", Enchantment.DAMAGE_ALL);
+		ALIASENCHANTMENTS.put("dal", Enchantment.DAMAGE_ALL);
+
+		ENCHANTMENTS.put("ardmg", Enchantment.DAMAGE_ARTHROPODS);
+		ENCHANTMENTS.put("baneofarthropods", Enchantment.DAMAGE_ARTHROPODS);
+		ALIASENCHANTMENTS.put("baneofarthropod", Enchantment.DAMAGE_ARTHROPODS);
+		ALIASENCHANTMENTS.put("arthropod", Enchantment.DAMAGE_ARTHROPODS);
+		ALIASENCHANTMENTS.put("dar", Enchantment.DAMAGE_ARTHROPODS);
+
+		ENCHANTMENTS.put("undeaddamage", Enchantment.DAMAGE_UNDEAD);
+		ENCHANTMENTS.put("smite", Enchantment.DAMAGE_UNDEAD);
+		ALIASENCHANTMENTS.put("du", Enchantment.DAMAGE_UNDEAD);
+
+		ENCHANTMENTS.put("digspeed", Enchantment.DIG_SPEED);
+		ENCHANTMENTS.put("efficiency", Enchantment.DIG_SPEED);
+		ALIASENCHANTMENTS.put("minespeed", Enchantment.DIG_SPEED);
+		ALIASENCHANTMENTS.put("cutspeed", Enchantment.DIG_SPEED);
+		ALIASENCHANTMENTS.put("ds", Enchantment.DIG_SPEED);
+		ALIASENCHANTMENTS.put("eff", Enchantment.DIG_SPEED);
+
+		ENCHANTMENTS.put("durability", Enchantment.DURABILITY);
+		ALIASENCHANTMENTS.put("dura", Enchantment.DURABILITY);
+		ENCHANTMENTS.put("unbreaking", Enchantment.DURABILITY);
+		ALIASENCHANTMENTS.put("d", Enchantment.DURABILITY);
+
+		ENCHANTMENTS.put("thorns", Enchantment.THORNS);
+		ENCHANTMENTS.put("highcrit", Enchantment.THORNS);
+		ALIASENCHANTMENTS.put("thorn", Enchantment.THORNS);
+		ALIASENCHANTMENTS.put("highercrit", Enchantment.THORNS);
+		ALIASENCHANTMENTS.put("t", Enchantment.THORNS);
+
+		ENCHANTMENTS.put("fireaspect", Enchantment.FIRE_ASPECT);
+		ENCHANTMENTS.put("fire", Enchantment.FIRE_ASPECT);
+		ALIASENCHANTMENTS.put("meleefire", Enchantment.FIRE_ASPECT);
+		ALIASENCHANTMENTS.put("meleeflame", Enchantment.FIRE_ASPECT);
+		ALIASENCHANTMENTS.put("fa", Enchantment.FIRE_ASPECT);
+
+		ENCHANTMENTS.put("knockback", Enchantment.KNOCKBACK);
+		ALIASENCHANTMENTS.put("kback", Enchantment.KNOCKBACK);
+		ALIASENCHANTMENTS.put("kb", Enchantment.KNOCKBACK);
+		ALIASENCHANTMENTS.put("k", Enchantment.KNOCKBACK);
+
+		ALIASENCHANTMENTS.put("blockslootbonus", Enchantment.LOOT_BONUS_BLOCKS);
+		ENCHANTMENTS.put("fortune", Enchantment.LOOT_BONUS_BLOCKS);
+		ALIASENCHANTMENTS.put("fort", Enchantment.LOOT_BONUS_BLOCKS);
+		ALIASENCHANTMENTS.put("lbb", Enchantment.LOOT_BONUS_BLOCKS);
+
+		ALIASENCHANTMENTS.put("mobslootbonus", Enchantment.LOOT_BONUS_MOBS);
+		ENCHANTMENTS.put("mobloot", Enchantment.LOOT_BONUS_MOBS);
+		ENCHANTMENTS.put("looting", Enchantment.LOOT_BONUS_MOBS);
+		ALIASENCHANTMENTS.put("lbm", Enchantment.LOOT_BONUS_MOBS);
+
+		ALIASENCHANTMENTS.put("oxygen", Enchantment.OXYGEN);
+		ENCHANTMENTS.put("respiration", Enchantment.OXYGEN);
+		ALIASENCHANTMENTS.put("breathing", Enchantment.OXYGEN);
+		ENCHANTMENTS.put("breath", Enchantment.OXYGEN);
+		ALIASENCHANTMENTS.put("o", Enchantment.OXYGEN);
+
+		ENCHANTMENTS.put("protection", Enchantment.PROTECTION_ENVIRONMENTAL);
+		ALIASENCHANTMENTS.put("prot", Enchantment.PROTECTION_ENVIRONMENTAL);
+		ENCHANTMENTS.put("protect", Enchantment.PROTECTION_ENVIRONMENTAL);
+		ALIASENCHANTMENTS.put("p", Enchantment.PROTECTION_ENVIRONMENTAL);
+
+		ALIASENCHANTMENTS.put("explosionsprotection", Enchantment.PROTECTION_EXPLOSIONS);
+		ALIASENCHANTMENTS.put("explosionprotection", Enchantment.PROTECTION_EXPLOSIONS);
+		ALIASENCHANTMENTS.put("expprot", Enchantment.PROTECTION_EXPLOSIONS);
+		ALIASENCHANTMENTS.put("blastprotection", Enchantment.PROTECTION_EXPLOSIONS);
+		ALIASENCHANTMENTS.put("bprotection", Enchantment.PROTECTION_EXPLOSIONS);
+		ALIASENCHANTMENTS.put("bprotect", Enchantment.PROTECTION_EXPLOSIONS);
+		ENCHANTMENTS.put("blastprotect", Enchantment.PROTECTION_EXPLOSIONS);
+		ALIASENCHANTMENTS.put("pe", Enchantment.PROTECTION_EXPLOSIONS);
+
+		ALIASENCHANTMENTS.put("fallprotection", Enchantment.PROTECTION_FALL);
+		ENCHANTMENTS.put("fallprot", Enchantment.PROTECTION_FALL);
+		ENCHANTMENTS.put("featherfall", Enchantment.PROTECTION_FALL);
+		ALIASENCHANTMENTS.put("featherfalling", Enchantment.PROTECTION_FALL);
+		ALIASENCHANTMENTS.put("pfa", Enchantment.PROTECTION_FALL);
+
+		ALIASENCHANTMENTS.put("fireprotection", Enchantment.PROTECTION_FIRE);
+		ALIASENCHANTMENTS.put("flameprotection", Enchantment.PROTECTION_FIRE);
+		ENCHANTMENTS.put("fireprotect", Enchantment.PROTECTION_FIRE);
+		ALIASENCHANTMENTS.put("flameprotect", Enchantment.PROTECTION_FIRE);
+		ENCHANTMENTS.put("fireprot", Enchantment.PROTECTION_FIRE);
+		ALIASENCHANTMENTS.put("flameprot", Enchantment.PROTECTION_FIRE);
+		ALIASENCHANTMENTS.put("pf", Enchantment.PROTECTION_FIRE);
+
+		ENCHANTMENTS.put("projectileprotection", Enchantment.PROTECTION_PROJECTILE);
+		ENCHANTMENTS.put("projprot", Enchantment.PROTECTION_PROJECTILE);
+		ALIASENCHANTMENTS.put("pp", Enchantment.PROTECTION_PROJECTILE);
+
+		ENCHANTMENTS.put("silktouch", Enchantment.SILK_TOUCH);
+		ALIASENCHANTMENTS.put("softtouch", Enchantment.SILK_TOUCH);
+		ALIASENCHANTMENTS.put("st", Enchantment.SILK_TOUCH);
+
+		ENCHANTMENTS.put("waterworker", Enchantment.WATER_WORKER);
+		ENCHANTMENTS.put("aquaaffinity", Enchantment.WATER_WORKER);
+		ALIASENCHANTMENTS.put("watermine", Enchantment.WATER_WORKER);
+		ALIASENCHANTMENTS.put("ww", Enchantment.WATER_WORKER);
+
+		ALIASENCHANTMENTS.put("firearrow", Enchantment.ARROW_FIRE);
+		ENCHANTMENTS.put("flame", Enchantment.ARROW_FIRE);
+		ENCHANTMENTS.put("flamearrow", Enchantment.ARROW_FIRE);
+		ALIASENCHANTMENTS.put("af", Enchantment.ARROW_FIRE);
+
+		ENCHANTMENTS.put("arrowdamage", Enchantment.ARROW_DAMAGE);
+		ENCHANTMENTS.put("power", Enchantment.ARROW_DAMAGE);
+		ALIASENCHANTMENTS.put("arrowpower", Enchantment.ARROW_DAMAGE);
+		ALIASENCHANTMENTS.put("ad", Enchantment.ARROW_DAMAGE);
+
+		ENCHANTMENTS.put("arrowknockback", Enchantment.ARROW_KNOCKBACK);
+		ALIASENCHANTMENTS.put("arrowkb", Enchantment.ARROW_KNOCKBACK);
+		ENCHANTMENTS.put("punch", Enchantment.ARROW_KNOCKBACK);
+		ALIASENCHANTMENTS.put("arrowpunch", Enchantment.ARROW_KNOCKBACK);
+		ALIASENCHANTMENTS.put("ak", Enchantment.ARROW_KNOCKBACK);
+
+		ALIASENCHANTMENTS.put("infinitearrows", Enchantment.ARROW_INFINITE);
+		ENCHANTMENTS.put("infarrows", Enchantment.ARROW_INFINITE);
+		ENCHANTMENTS.put("infinity", Enchantment.ARROW_INFINITE);
+		ALIASENCHANTMENTS.put("infinite", Enchantment.ARROW_INFINITE);
+		ALIASENCHANTMENTS.put("unlimited", Enchantment.ARROW_INFINITE);
+		ALIASENCHANTMENTS.put("unlimitedarrows", Enchantment.ARROW_INFINITE);
+		ALIASENCHANTMENTS.put("ai", Enchantment.ARROW_INFINITE);
+
+		try // 1.7 update
+		{
+			ENCHANTMENTS.put("luck", Enchantment.LUCK);
+			ALIASENCHANTMENTS.put("luckofsea", Enchantment.LUCK);
+			ALIASENCHANTMENTS.put("luckofseas", Enchantment.LUCK);
+			ALIASENCHANTMENTS.put("rodluck", Enchantment.LUCK);
+
+			ENCHANTMENTS.put("lure", Enchantment.LURE);
+			ALIASENCHANTMENTS.put("rodlure", Enchantment.LURE);
+		}
+		catch (java.lang.NoSuchFieldError e)
+		{
+			Essentials.wrongVersion();
+		}
+	}
+
+	public static Enchantment getByName(String name)
+	{
+		Enchantment enchantment;
+		if (NumberUtil.isInt(name))
+		{
+			enchantment = Enchantment.getById(Integer.parseInt(name));
+		}
+		else
+		{
+			enchantment = Enchantment.getByName(name.toUpperCase(Locale.ENGLISH));
+		}
+		if (enchantment == null)
+		{
+			enchantment = ENCHANTMENTS.get(name.toLowerCase(Locale.ENGLISH));
+		}
+		if (enchantment == null)
+		{
+			enchantment = ALIASENCHANTMENTS.get(name.toLowerCase(Locale.ENGLISH));
+		}
+		return enchantment;
+	}
+
+	public static Set<Entry<String, Enchantment>> entrySet()
+	{
+		return ENCHANTMENTS.entrySet();
+	}
+}

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

@@ -0,0 +1,918 @@
+/*
+ * Essentials - a bukkit plugin
+ * Copyright (C) 2011  Essentials Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.earth2me.essentials;
+
+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 java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import net.ess3.api.Economy;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IItemDb;
+import net.ess3.api.IJails;
+import net.ess3.api.ISettings;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.command.BlockCommandSender;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.PluginCommand;
+import org.bukkit.command.TabCompleter;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.world.WorldLoadEvent;
+import org.bukkit.event.world.WorldUnloadEvent;
+import org.bukkit.plugin.InvalidDescriptionException;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.plugin.java.JavaPluginLoader;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.scheduler.BukkitTask;
+import org.yaml.snakeyaml.error.YAMLException;
+
+
+public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
+{
+	public static final int BUKKIT_VERSION = 3050;
+	private static final Logger LOGGER = Logger.getLogger("Essentials");
+	private transient ISettings settings;
+	private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this);
+	private transient Jails jails;
+	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;
+	private transient AlternativeCommandsHandler alternativeCommandsHandler;
+	private transient UserMap userMap;
+	private transient ExecuteTimer execTimer;
+	private transient I18n i18n;
+	private transient Metrics metrics;
+	private transient EssentialsTimer timer;
+	private final transient List<String> vanishedPlayers = new ArrayList<String>();
+
+	public Essentials()
+	{
+	}
+
+	public Essentials(final Server server)
+	{
+		super(new JavaPluginLoader(server), new PluginDescriptionFile("Essentials", "", "com.earth2me.essentials.Essentials"), null, null);
+	}
+
+	@Override
+	public ISettings getSettings()
+	{
+		return settings;
+	}
+
+	public void setupForTesting(final Server server) throws IOException, InvalidDescriptionException
+	{
+		final File dataFolder = File.createTempFile("essentialstest", "");
+		if (!dataFolder.delete())
+		{
+			throw new IOException();
+		}
+		if (!dataFolder.mkdir())
+		{
+			throw new IOException();
+		}
+		i18n = new I18n(this);
+		i18n.onEnable();
+		LOGGER.log(Level.INFO, tl("usingTempFolderForTesting"));
+		LOGGER.log(Level.INFO, dataFolder.toString());
+		this.initialize(null, server, new PluginDescriptionFile(new FileReader(new File("src" + File.separator + "plugin.yml"))), dataFolder, null, null);
+		settings = new Settings(this);
+		i18n.updateLocale("en");
+		userMap = new UserMap(this);
+		permissionsHandler = new PermissionsHandler(this, false);
+		Economy.setEss(this);
+	}
+
+	@Override
+	public void onEnable()
+	{
+		try
+		{
+			LOGGER.setParent(this.getLogger());
+			execTimer = new ExecuteTimer();
+			execTimer.start();
+			i18n = new I18n(this);
+			i18n.onEnable();
+			execTimer.mark("I18n1");
+			final PluginManager pm = getServer().getPluginManager();
+			for (Plugin plugin : pm.getPlugins())
+			{
+				if (plugin.getDescription().getName().startsWith("Essentials")
+					&& !plugin.getDescription().getVersion().equals(this.getDescription().getVersion())
+					&& !plugin.getDescription().getName().equals("EssentialsAntiCheat"))
+				{
+					LOGGER.log(Level.WARNING, tl("versionMismatch", plugin.getDescription().getName()));
+				}
+			}
+			final Matcher versionMatch = Pattern.compile("git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*").matcher(getServer().getVersion());
+			if (versionMatch.matches())
+			{
+				final int versionNumber = Integer.parseInt(versionMatch.group(1));
+				if (versionNumber < BUKKIT_VERSION && versionNumber > 100)
+				{
+					wrongVersion();
+					this.setEnabled(false);
+					return;
+				}
+			}
+			else
+			{
+				LOGGER.log(Level.INFO, tl("bukkitFormatChanged"));
+				LOGGER.log(Level.INFO, getServer().getVersion());
+				LOGGER.log(Level.INFO, getServer().getBukkitVersion());
+			}
+			execTimer.mark("BukkitCheck");
+			try
+			{
+				final EssentialsUpgrade upgrade = new EssentialsUpgrade(this);
+				upgrade.beforeSettings();
+				execTimer.mark("Upgrade");
+				confList = new ArrayList<IConf>();
+				settings = new Settings(this);
+				confList.add(settings);
+				execTimer.mark("Settings");
+				userMap = new UserMap(this);
+				confList.add(userMap);
+				execTimer.mark("Init(Usermap)");
+				upgrade.afterSettings();
+				execTimer.mark("Upgrade2");
+				i18n.updateLocale(settings.getLocale());
+				warps = new Warps(getServer(), this.getDataFolder());
+				confList.add(warps);
+				execTimer.mark("Init(Spawn/Warp)");
+				worth = new Worth(this.getDataFolder());
+				confList.add(worth);
+				itemDb = new ItemDb(this);
+				confList.add(itemDb);
+				execTimer.mark("Init(Worth/ItemDB)");
+				jails = new Jails(this);
+				confList.add(jails);
+				reload();
+			}
+			catch (YAMLException exception)
+			{
+				if (pm.getPlugin("EssentialsUpdate") != null)
+				{
+					LOGGER.log(Level.SEVERE, tl("essentialsHelp2"));
+				}
+				else
+				{
+					LOGGER.log(Level.SEVERE, tl("essentialsHelp1"));
+				}
+				handleCrash(exception);
+				return;
+			}
+			backup = new Backup(this);
+			permissionsHandler = new PermissionsHandler(this, settings.useBukkitPermissions());
+			alternativeCommandsHandler = new AlternativeCommandsHandler(this);
+
+			timer = new EssentialsTimer(this);
+			scheduleSyncRepeatingTask(timer, 1000, 50);
+
+			Economy.setEss(this);
+			execTimer.mark("RegHandler");
+
+			final MetricsStarter metricsStarter = new MetricsStarter(this);
+			if (metricsStarter.getStart() != null && metricsStarter.getStart() == true)
+			{
+				runTaskLaterAsynchronously(metricsStarter, 1);
+			}
+			else if (metricsStarter.getStart() != null && metricsStarter.getStart() == false)
+			{
+				final MetricsListener metricsListener = new MetricsListener(this, metricsStarter);
+				pm.registerEvents(metricsListener, this);
+			}
+
+			final String timeroutput = execTimer.end();
+			if (getSettings().isDebug())
+			{
+				LOGGER.log(Level.INFO, "Essentials load {0}", timeroutput);
+			}
+		}
+		catch (NumberFormatException ex)
+		{
+			handleCrash(ex);
+		}
+		catch (Error ex)
+		{
+			handleCrash(ex);
+			throw ex;
+		}
+	}
+
+	@Override
+	public void saveConfig()
+	{
+		// We don't use any of the bukkit config writing, as this breaks our config file formatting.
+	}
+
+	private void registerListeners(PluginManager pm)
+	{
+		HandlerList.unregisterAll(this);
+
+		if (getSettings().isDebug())
+		{
+			LOGGER.log(Level.INFO, "Registering Listeners");
+		}
+
+		final EssentialsPluginListener serverListener = new EssentialsPluginListener(this);
+		pm.registerEvents(serverListener, this);
+		confList.add(serverListener);
+
+		final EssentialsPlayerListener playerListener = new EssentialsPlayerListener(this);
+		pm.registerEvents(playerListener, this);
+
+		final EssentialsBlockListener blockListener = new EssentialsBlockListener(this);
+		pm.registerEvents(blockListener, this);
+
+		final SignBlockListener signBlockListener = new SignBlockListener(this);
+		pm.registerEvents(signBlockListener, this);
+
+		final SignPlayerListener signPlayerListener = new SignPlayerListener(this);
+		pm.registerEvents(signPlayerListener, this);
+
+		final SignEntityListener signEntityListener = new SignEntityListener(this);
+		pm.registerEvents(signEntityListener, this);
+
+		final EssentialsEntityListener entityListener = new EssentialsEntityListener(this);
+		pm.registerEvents(entityListener, this);
+
+		final EssentialsWorldListener worldListener = new EssentialsWorldListener(this);
+		pm.registerEvents(worldListener, this);
+
+		pm.registerEvents(tntListener, this);
+
+		jails.resetListener();
+	}
+
+	@Override
+	public void onDisable()
+	{
+		for (Player p : getServer().getOnlinePlayers())
+		{
+			User user = getUser(p);
+			if (user.isVanished())
+			{
+				user.setVanished(false);
+				user.sendMessage(tl("unvanishedReload"));
+			}
+		}
+		cleanupOpenInventories();
+		if (i18n != null)
+		{
+			i18n.onDisable();
+		}
+		if (backup != null)
+		{
+			backup.stopTask();
+		}
+		Economy.setEss(null);
+		Trade.closeLog();
+		getUserMap().getUUIDMap().forceWriteUUIDMap();
+	}
+
+	@Override
+	public void reload()
+	{
+		Trade.closeLog();
+
+		for (IConf iConf : confList)
+		{
+			iConf.reloadConfig();
+			execTimer.mark("Reload(" + iConf.getClass().getSimpleName() + ")");
+		}
+
+		i18n.updateLocale(settings.getLocale());
+
+		final PluginManager pm = getServer().getPluginManager();
+		registerListeners(pm);
+	}
+
+	@Override
+	public List<String> onTabComplete(CommandSender sender,
+									  Command command,
+									  String commandLabel,
+									  String[] args)
+	{
+		// Allow plugins to override the command via onCommand
+		if (!getSettings().isCommandOverridden(command.getName()) && (!commandLabel.startsWith("e") || commandLabel.equalsIgnoreCase(command.getName())))
+		{
+			final PluginCommand pc = alternativeCommandsHandler.getAlternative(commandLabel);
+			if (pc != null)
+			{
+				try
+				{
+					TabCompleter completer = pc.getTabCompleter();
+					if (completer != null)
+					{
+						return completer.onTabComplete(sender, command, commandLabel, args);
+					}
+				}
+				catch (final Exception ex)
+				{
+					Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+				}
+			}
+		}
+		return null;
+	}
+
+	@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(), "com.earth2me.essentials.commands.Command", "essentials.", null);
+	}
+
+	@Override
+	public boolean onCommandEssentials(final CommandSender cSender, final Command command, final String commandLabel, final String[] args, final ClassLoader classLoader, final String commandPath, final String permissionPrefix, final IEssentialsModule module)
+	{
+		// Allow plugins to override the command via onCommand
+		if (!getSettings().isCommandOverridden(command.getName()) && (!commandLabel.startsWith("e") || commandLabel.equalsIgnoreCase(command.getName())))
+		{
+			final PluginCommand pc = alternativeCommandsHandler.getAlternative(commandLabel);
+			if (pc != null)
+			{
+				alternativeCommandsHandler.executed(commandLabel, pc);
+				try
+				{
+					return pc.execute(cSender, commandLabel, args);
+				}
+				catch (final Exception ex)
+				{
+					Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+					cSender.sendMessage(ChatColor.RED + "An internal error occurred while attempting to perform this command");
+					return true;
+				}
+			}
+		}
+
+		try
+		{
+
+			User user = null;
+			Block bSenderBlock = null;
+			if (cSender instanceof Player)
+			{
+				user = getUser((Player)cSender);
+			}
+			else if (cSender instanceof BlockCommandSender)
+			{
+				BlockCommandSender bsender = (BlockCommandSender)cSender;
+				bSenderBlock = bsender.getBlock();
+			}
+
+			if (bSenderBlock != null)
+			{
+				Bukkit.getLogger().log(Level.INFO, "CommandBlock at {0},{1},{2} issued server command: /{3} {4}", new Object[]
+				{
+					bSenderBlock.getX(), bSenderBlock.getY(), bSenderBlock.getZ(), commandLabel, EssentialsCommand.getFinalArg(args, 0)
+				});
+			}
+			else if (user == null)
+			{
+				Bukkit.getLogger().log(Level.INFO, "{0} issued server command: /{1} {2}", new Object[]
+				{
+					cSender.getName(), commandLabel, EssentialsCommand.getFinalArg(args, 0)
+				});
+			}
+
+			CommandSource sender = new CommandSource(cSender);
+
+			// New mail notification
+			if (user != null && !getSettings().isCommandDisabled("mail") && !command.getName().equals("mail") && user.isAuthorized("essentials.mail"))
+			{
+				final List<String> mail = user.getMails();
+				if (mail != null && !mail.isEmpty())
+				{
+					user.sendMessage(tl("youHaveNewMail", mail.size()));
+				}
+			}
+
+			//Print version even if admin command is not available #easteregg
+			if (commandLabel.equalsIgnoreCase("essversion"))
+			{
+				sender.sendMessage("This server is running Essentials " + getDescription().getVersion());
+				return true;
+			}
+
+			// Check for disabled commands
+			if (getSettings().isCommandDisabled(commandLabel))
+			{
+				return true;
+			}
+
+			IEssentialsCommand cmd;
+			try
+			{
+				cmd = (IEssentialsCommand)classLoader.loadClass(commandPath + command.getName()).newInstance();
+				cmd.setEssentials(this);
+				cmd.setEssentialsModule(module);
+			}
+			catch (Exception ex)
+			{
+				sender.sendMessage(tl("commandNotLoaded", commandLabel));
+				LOGGER.log(Level.SEVERE, tl("commandNotLoaded", commandLabel), ex);
+				return true;
+			}
+
+			// Check authorization
+			if (user != null && !user.isAuthorized(cmd, permissionPrefix))
+			{
+				LOGGER.log(Level.INFO, tl("deniedAccessCommand", user.getName()));
+				user.sendMessage(tl("noAccessCommand"));
+				return true;
+			}
+
+			if (user != null && user.isJailed() && !user.isAuthorized(cmd, "essentials.jail.allow."))
+			{
+				if (user.getJailTimeout() > 0)
+				{
+					user.sendMessage(tl("playerJailedFor", user.getName(), DateUtil.formatDateDiff(user.getJailTimeout())));
+				}
+				else
+				{
+					user.sendMessage(tl("jailMessage"));
+				}
+				return true;
+			}
+
+			// Run the command
+			try
+			{
+				if (user == null)
+				{
+					cmd.run(getServer(), sender, commandLabel, command, args);
+				}
+				else
+				{
+					cmd.run(getServer(), user, commandLabel, command, args);
+				}
+				return true;
+			}
+			catch (NoChargeException ex)
+			{
+				return true;
+			}
+			catch (QuietAbortException ex)
+			{
+				return true;
+			}
+			catch (NotEnoughArgumentsException ex)
+			{
+				sender.sendMessage(command.getDescription());
+				sender.sendMessage(command.getUsage().replaceAll("<command>", commandLabel));
+				if (!ex.getMessage().isEmpty())
+				{
+					sender.sendMessage(ex.getMessage());
+				}
+				return true;
+			}
+			catch (Exception ex)
+			{
+				showError(sender, ex, commandLabel);
+				return true;
+			}
+		}
+		catch (Throwable ex)
+		{
+			LOGGER.log(Level.SEVERE, tl("commandFailed", commandLabel), ex);
+			return true;
+		}
+	}
+
+	public void cleanupOpenInventories()
+	{
+		for (Player player : getServer().getOnlinePlayers())
+		{
+			User user = getUser(player);
+			if (user.isRecipeSee())
+			{
+				user.getBase().getOpenInventory().getTopInventory().clear();
+				user.getBase().getOpenInventory().close();
+				user.setRecipeSee(false);
+			}
+			if (user.isInvSee() || user.isEnderSee())
+			{
+				user.getBase().getOpenInventory().close();
+				user.setInvSee(false);
+				user.setEnderSee(false);
+			}
+		}
+	}
+
+	@Override
+	public void showError(final CommandSource sender, final Throwable exception, final String commandLabel)
+	{
+		sender.sendMessage(tl("errorWithMessage", exception.getMessage()));
+		if (getSettings().isDebug())
+		{
+			LOGGER.log(Level.INFO, tl("errorCallingCommand", commandLabel), exception);
+		}
+	}
+
+	public static void wrongVersion()
+	{
+		LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
+		LOGGER.log(Level.SEVERE, tl("notRecommendedBukkit"));
+		LOGGER.log(Level.SEVERE, tl("requiredBukkit", Integer.toString(BUKKIT_VERSION)));
+		LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
+	}
+
+	@Override
+	public BukkitScheduler getScheduler()
+	{
+		return this.getServer().getScheduler();
+	}
+
+	@Override
+	public IJails getJails()
+	{
+		return jails;
+	}
+
+	@Override
+	public Warps getWarps()
+	{
+		return warps;
+	}
+
+	@Override
+	public Worth getWorth()
+	{
+		return worth;
+	}
+
+	@Override
+	public Backup getBackup()
+	{
+		return backup;
+	}
+
+	@Override
+	public Metrics getMetrics()
+	{
+		return metrics;
+	}
+
+	@Override
+	public void setMetrics(Metrics metrics)
+	{
+		this.metrics = metrics;
+	}
+
+	@Deprecated
+	@Override
+	public User getUser(final Object base)
+	{
+		if (base instanceof Player)
+		{
+			return getUser((Player)base);
+		}
+		if (base instanceof String)
+		{
+			return getOfflineUser((String)base);
+		}
+		return null;
+	}
+
+	//This will return null if there is not a match.
+	@Override
+	public User getUser(final String base)
+	{
+		return getOfflineUser(base);
+	}
+
+	//This will return null if there is not a match.
+	@Override
+	public User getUser(final UUID base)
+	{
+		return userMap.getUser(base);
+	}
+
+	//This will return null if there is not a match.
+	@Override
+	public User getOfflineUser(final String name)
+	{
+		final User user = userMap.getUser(name);		
+		if (user != null && user.getBase() instanceof OfflinePlayer)
+		{
+			//This code should attempt to use the last known name of a user, if Bukkit returns name as null.
+			final String lastName = user.getLastAccountName();
+			if (lastName != null)
+			{
+				((OfflinePlayer)user.getBase()).setName(lastName);
+			}
+			else
+			{
+				((OfflinePlayer)user.getBase()).setName(name);
+			}
+		}
+		return user;
+	}
+
+	//This will create a new user if there is not a match.
+	@Override
+	public User getUser(final Player base)
+	{
+		if (base == null)
+		{
+			return null;
+		}
+
+		if (userMap == null)
+		{
+			LOGGER.log(Level.WARNING, "Essentials userMap not initialized");
+			return null;
+		}
+
+		User user = userMap.getUser(base.getUniqueId());
+
+		if (user == null)
+		{
+			if (getSettings().isDebug())
+			{
+				LOGGER.log(Level.INFO, "Constructing new userfile from base player {0}", base.getName());
+			}
+			user = new User(base, this);
+			user.setLastAccountName(base.getName());
+		}
+		else
+		{
+			user.update(base);
+		}
+		return user;
+	}
+
+	private void handleCrash(Throwable exception)
+	{
+		final PluginManager pm = getServer().getPluginManager();
+		LOGGER.log(Level.SEVERE, exception.toString());
+		pm.registerEvents(new Listener()
+		{
+			@EventHandler(priority = EventPriority.LOW)
+			public void onPlayerJoin(final PlayerJoinEvent event)
+			{
+				event.getPlayer().sendMessage("Essentials failed to load, read the log file.");
+			}
+		}, this);
+		for (Player player : getServer().getOnlinePlayers())
+		{
+			player.sendMessage("Essentials failed to load, read the log file.");
+		}
+		this.setEnabled(false);
+	}
+
+	@Override
+	public World getWorld(final String name)
+	{
+		if (name.matches("[0-9]+"))
+		{
+			final int worldId = Integer.parseInt(name);
+			if (worldId < getServer().getWorlds().size())
+			{
+				return getServer().getWorlds().get(worldId);
+			}
+		}
+		return getServer().getWorld(name);
+	}
+
+	@Override
+	public void addReloadListener(final IConf listener)
+	{
+		confList.add(listener);
+	}
+
+	@Override
+	public Methods getPaymentMethod()
+	{
+		return paymentMethod;
+	}
+
+	@Override
+	public int broadcastMessage(final String message)
+	{
+		return broadcastMessage(null, null, message, true);
+	}
+
+	@Override
+	public int broadcastMessage(final IUser sender, final String message)
+	{
+		return broadcastMessage(sender, null, message, false);
+	}
+
+	@Override
+	public int broadcastMessage(final String permission, final String message)
+	{
+		return broadcastMessage(null, permission, message, false);
+	}
+
+	private int broadcastMessage(final IUser sender, final String permission, final String message, final boolean keywords)
+	{
+		if (sender != null && sender.isHidden())
+		{
+			return 0;
+		}
+
+		IText broadcast = new SimpleTextInput(message);
+
+		final Player[] players = getServer().getOnlinePlayers();
+
+		for (Player player : players)
+		{
+			final User user = getUser(player);
+			if ((permission == null && (sender == null || !user.isIgnoredPlayer(sender)))
+				|| (permission != null && user.isAuthorized(permission)))
+			{
+				if (keywords)
+				{
+					broadcast = new KeywordReplacer(broadcast, new CommandSource(player), this, false);
+				}
+				for (String messageText : broadcast.getLines())
+				{
+					user.sendMessage(messageText);
+				}
+			}
+		}
+
+		return players.length;
+	}
+
+	@Override
+	public BukkitTask runTaskAsynchronously(final Runnable run)
+	{
+		return this.getScheduler().runTaskAsynchronously(this, run);
+	}
+
+	@Override
+	public BukkitTask runTaskLaterAsynchronously(final Runnable run, final long delay)
+	{
+		return this.getScheduler().runTaskLaterAsynchronously(this, run, delay);
+	}
+
+	@Override
+	public int scheduleSyncDelayedTask(final Runnable run)
+	{
+		return this.getScheduler().scheduleSyncDelayedTask(this, run);
+	}
+
+	@Override
+	public int scheduleSyncDelayedTask(final Runnable run, final long delay)
+	{
+		return this.getScheduler().scheduleSyncDelayedTask(this, run, delay);
+	}
+
+	@Override
+	public int scheduleSyncRepeatingTask(final Runnable run, final long delay, final long period)
+	{
+		return this.getScheduler().scheduleSyncRepeatingTask(this, run, delay, period);
+	}
+
+	@Override
+	public TNTExplodeListener getTNTListener()
+	{
+		return tntListener;
+	}
+
+	@Override
+	public PermissionsHandler getPermissionsHandler()
+	{
+		return permissionsHandler;
+	}
+
+	@Override
+	public AlternativeCommandsHandler getAlternativeCommandsHandler()
+	{
+		return alternativeCommandsHandler;
+	}
+
+	@Override
+	public IItemDb getItemDb()
+	{
+		return itemDb;
+	}
+
+	@Override
+	public UserMap getUserMap()
+	{
+		return userMap;
+	}
+
+	@Override
+	public I18n getI18n()
+	{
+		return i18n;
+	}
+
+	@Override
+	public EssentialsTimer getTimer()
+	{
+		return timer;
+	}
+
+	@Override
+	public List<String> getVanishedPlayers()
+	{
+		return vanishedPlayers;
+	}
+
+
+	private static class EssentialsWorldListener implements Listener, Runnable
+	{
+		private transient final IEssentials ess;
+
+		public EssentialsWorldListener(final IEssentials ess)
+		{
+			this.ess = ess;
+		}
+
+		@EventHandler(priority = EventPriority.LOW)
+		public void onWorldLoad(final WorldLoadEvent event)
+		{
+			ess.getJails().onReload();
+			ess.getWarps().reloadConfig();
+			for (IConf iConf : ((Essentials)ess).confList)
+			{
+				if (iConf instanceof IEssentialsModule)
+				{
+					iConf.reloadConfig();
+				}
+			}
+		}
+
+		@EventHandler(priority = EventPriority.LOW)
+		public void onWorldUnload(final WorldUnloadEvent event)
+		{
+			ess.getJails().onReload();
+			ess.getWarps().reloadConfig();
+			for (IConf iConf : ((Essentials)ess).confList)
+			{
+				if (iConf instanceof IEssentialsModule)
+				{
+					iConf.reloadConfig();
+				}
+			}
+		}
+
+		@Override
+		public void run()
+		{
+			ess.reload();
+		}
+	}
+}

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

@@ -0,0 +1,71 @@
+package com.earth2me.essentials;
+
+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;
+import org.bukkit.entity.EntityType;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.inventory.ItemStack;
+
+
+public class EssentialsBlockListener implements Listener
+{
+	private final transient IEssentials ess;
+
+	public EssentialsBlockListener(final IEssentials ess)
+	{
+		this.ess = ess;
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onBlockPlace(final BlockPlaceEvent event)
+	{
+		// Do not rely on getItemInHand();
+		// http://leaky.bukkit.org/issues/663
+		final ItemStack is = LocationUtil.convertBlockToItem(event.getBlockPlaced());
+		if (is == null)
+		{
+			return;
+		}
+
+		if (is.getType() == Material.MOB_SPAWNER && event.getItemInHand() != null && event.getPlayer() != null
+			&& event.getItemInHand().getType() == Material.MOB_SPAWNER)
+		{
+			final BlockState blockState = event.getBlockPlaced().getState();
+			if (blockState instanceof CreatureSpawner)
+			{
+				final CreatureSpawner spawner = (CreatureSpawner)blockState;
+				final EntityType type = EntityType.fromId(event.getItemInHand().getData().getData());
+				if (type != null && Mob.fromBukkitType(type) != null)
+				{
+					if (ess.getUser(event.getPlayer()).isAuthorized("essentials.spawnerconvert." + Mob.fromBukkitType(type).name().toLowerCase(Locale.ENGLISH)))
+					{
+						spawner.setSpawnedType(type);
+					}
+				}
+			}
+		}
+
+		final User user = ess.getUser(event.getPlayer());
+		if (user.hasUnlimited(is) && user.getBase().getGameMode() == GameMode.SURVIVAL)
+		{
+			ess.scheduleSyncDelayedTask(
+					new Runnable()
+			{
+				@Override
+				public void run()
+				{
+					user.getBase().getInventory().addItem(is);
+					user.getBase().updateInventory();
+				}
+			});
+		}
+	}
+}

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

@@ -0,0 +1,841 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n.tl;
+import com.google.common.io.Files;
+import java.io.*;
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CoderResult;
+import java.util.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import net.ess3.api.InvalidWorldException;
+import org.bukkit.*;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.InvalidConfigurationException;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.util.Vector;
+
+
+public class EssentialsConf extends YamlConfiguration
+{
+	protected static final Logger LOGGER = Logger.getLogger("Essentials");
+	protected final File configFile;
+	protected String templateName = null;
+	protected static final Charset UTF8 = Charset.forName("UTF-8");
+	private Class<?> resourceClass = EssentialsConf.class;	
+	private static final ExecutorService EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
+	private final AtomicInteger pendingDiskWrites = new AtomicInteger(0);
+
+	public EssentialsConf(final File configFile)
+	{
+		super();
+		this.configFile = configFile.getAbsoluteFile();
+	}
+	private final byte[] bytebuffer = new byte[1024];
+
+	public synchronized void load()
+	{
+		if (pendingDiskWrites.get() != 0)
+		{
+			LOGGER.log(Level.INFO, "File {0} not read, because it''s not yet written to disk.", configFile);
+			return;
+		}
+		if (!configFile.getParentFile().exists())
+		{
+			if (!configFile.getParentFile().mkdirs())
+			{
+				LOGGER.log(Level.SEVERE, tl("failedToCreateConfig", configFile.toString()));
+			}
+		}
+		// This will delete files where the first character is 0. In most cases they are broken.
+		if (configFile.exists() && configFile.length() != 0)
+		{
+			try
+			{
+				final InputStream input = new FileInputStream(configFile);
+				try
+				{
+					if (input.read() == 0)
+					{
+						input.close();
+						configFile.delete();
+					}
+				}
+				catch (IOException ex)
+				{
+					LOGGER.log(Level.SEVERE, null, ex);
+				}
+				finally
+				{
+					try
+					{
+						input.close();
+					}
+					catch (IOException ex)
+					{
+						LOGGER.log(Level.SEVERE, null, ex);
+					}
+				}
+			}
+			catch (FileNotFoundException ex)
+			{
+				LOGGER.log(Level.SEVERE, null, ex);
+			}
+		}
+				
+		if (!configFile.exists())
+		{
+			if (legacyFileExists())
+			{
+				convertLegacyFile();
+			}
+			else if (altFileExists())
+			{
+				convertAltFile();
+			}
+			else if (templateName != null)
+			{
+				LOGGER.log(Level.INFO, tl("creatingConfigFromTemplate", configFile.toString()));
+				createFromTemplate();
+			}
+			else
+			{
+				return;
+			}
+		}
+
+
+		try
+		{
+			final FileInputStream inputStream = new FileInputStream(configFile);
+			try
+			{
+				long startSize = configFile.length();
+				if (startSize > Integer.MAX_VALUE)
+				{
+					throw new InvalidConfigurationException("File too big");
+				}
+				ByteBuffer buffer = ByteBuffer.allocate((int)startSize);
+				int length;
+				while ((length = inputStream.read(bytebuffer)) != -1)
+				{
+					if (length > buffer.remaining())
+					{
+						ByteBuffer resize = ByteBuffer.allocate(buffer.capacity() + length - buffer.remaining());
+						int resizePosition = buffer.position();
+						buffer.rewind();
+						resize.put(buffer);
+						resize.position(resizePosition);
+						buffer = resize;
+					}
+					buffer.put(bytebuffer, 0, length);
+				}
+				buffer.rewind();
+				final CharBuffer data = CharBuffer.allocate(buffer.capacity());
+				CharsetDecoder decoder = UTF8.newDecoder();
+				CoderResult result = decoder.decode(buffer, data, true);
+				if (result.isError())
+				{
+					buffer.rewind();
+					data.clear();
+					LOGGER.log(Level.INFO, "File " + configFile.getAbsolutePath().toString() + " is not utf-8 encoded, trying " + Charset.defaultCharset().displayName());
+					decoder = Charset.defaultCharset().newDecoder();
+					result = decoder.decode(buffer, data, true);
+					if (result.isError())
+					{
+						throw new InvalidConfigurationException("Invalid Characters in file " + configFile.getAbsolutePath().toString());
+					}
+					else
+					{
+						decoder.flush(data);
+					}
+				}
+				else
+				{
+					decoder.flush(data);
+				}
+				final int end = data.position();
+				data.rewind();
+				super.loadFromString(data.subSequence(0, end).toString());
+			}
+			finally
+			{
+				inputStream.close();
+			}
+		}
+		catch (IOException ex)
+		{
+			LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
+		}
+		catch (InvalidConfigurationException ex)
+		{
+			File broken = new File(configFile.getAbsolutePath() + ".broken." + System.currentTimeMillis());
+			configFile.renameTo(broken);
+			LOGGER.log(Level.SEVERE, "The file " + configFile.toString() + " is broken, it has been renamed to " + broken.toString(), ex.getCause());
+		}
+	}
+	
+	public boolean legacyFileExists()
+	{
+		return false;
+	}
+	
+	public void convertLegacyFile()
+	{
+		LOGGER.log(Level.SEVERE, "Unable to import legacy config file.");
+	}
+	
+	public boolean altFileExists()
+	{
+		return false;
+	}
+	
+	public void convertAltFile()
+	{
+		LOGGER.log(Level.SEVERE, "Unable to import alt config file.");
+	}
+
+	private void createFromTemplate()
+	{
+		InputStream istr = null;
+		OutputStream ostr = null;
+		try
+		{
+			istr = resourceClass.getResourceAsStream(templateName);
+			if (istr == null)
+			{
+				LOGGER.log(Level.SEVERE, tl("couldNotFindTemplate", templateName));
+				return;
+			}
+			ostr = new FileOutputStream(configFile);
+			byte[] buffer = new byte[1024];
+			int length = 0;
+			length = istr.read(buffer);
+			while (length > 0)
+			{
+				ostr.write(buffer, 0, length);
+				length = istr.read(buffer);
+			}
+		}
+		catch (IOException ex)
+		{
+			LOGGER.log(Level.SEVERE, tl("failedToWriteConfig", configFile.toString()), ex);
+		}
+		finally
+		{
+			try
+			{
+				if (istr != null)
+				{
+					istr.close();
+				}
+			}
+			catch (IOException ex)
+			{
+				Logger.getLogger(EssentialsConf.class.getName()).log(Level.SEVERE, null, ex);
+			}
+			try
+			{
+				if (ostr != null)
+				{
+					ostr.close();
+				}
+			}
+			catch (IOException ex)
+			{
+				LOGGER.log(Level.SEVERE, tl("failedToCloseConfig", configFile.toString()), ex);
+			}
+		}
+	}
+
+	public void setTemplateName(final String templateName)
+	{
+		this.templateName = templateName;
+	}
+
+	public File getFile()
+	{
+		return configFile;
+	}
+
+	public void setTemplateName(final String templateName, final Class<?> resClass)
+	{
+		this.templateName = templateName;
+		this.resourceClass = resClass;
+	}
+
+	public void save()
+	{
+		try
+		{
+			save(configFile);
+		}
+		catch (IOException ex)
+		{
+			LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
+		}
+	}
+
+	public void saveWithError() throws IOException
+	{
+		save(configFile);
+	}
+
+	@Override
+	public synchronized void save(final File file) throws IOException
+	{
+		delayedSave(file);
+	}
+
+	public synchronized void forceSave()
+	{
+		try
+		{
+			Future<?> future = delayedSave(configFile);
+			if (future != null)
+			{
+				future.get();
+			}
+		}
+		catch (InterruptedException ex)
+		{
+			LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
+		}
+		catch (ExecutionException ex)
+		{
+			LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
+		}
+	}
+
+	private Future<?> delayedSave(final File file)
+	{
+		//long startTime = System.nanoTime();
+		if (file == null)
+		{
+			throw new IllegalArgumentException("File cannot be null");
+		}
+
+		final String data = saveToString();
+
+		if (data.length() == 0)
+		{
+			return null;
+		}
+
+		pendingDiskWrites.incrementAndGet();
+
+		Future<?> future = EXECUTOR_SERVICE.submit(new WriteRunner(configFile, data, pendingDiskWrites));
+
+		//LOGGER.log(Level.INFO, configFile + " prepared for writing in " + (System.nanoTime() - startTime) + " nsec.");
+
+		return future;
+	}
+
+
+	private static class WriteRunner implements Runnable
+	{
+		private final File configFile;
+		private final String data;
+		private final AtomicInteger pendingDiskWrites;
+
+		private WriteRunner(final File configFile, final String data, final AtomicInteger pendingDiskWrites)
+		{
+			this.configFile = configFile;
+			this.data = data;
+			this.pendingDiskWrites = pendingDiskWrites;
+		}
+
+		@Override
+		public void run()
+		{
+			//long startTime = System.nanoTime();
+			synchronized (configFile)
+			{
+				if (pendingDiskWrites.get() > 1)
+				{
+					// Writes can be skipped, because they are stored in a queue (in the executor).
+					// Only the last is actually written.
+					pendingDiskWrites.decrementAndGet();
+					//LOGGER.log(Level.INFO, configFile + " skipped writing in " + (System.nanoTime() - startTime) + " nsec.");
+					return;
+				}
+				try
+				{
+					Files.createParentDirs(configFile);
+
+					if (!configFile.exists())
+					{
+						try
+						{
+							LOGGER.log(Level.INFO, tl("creatingEmptyConfig", configFile.toString()));
+							if (!configFile.createNewFile())
+							{
+								LOGGER.log(Level.SEVERE, tl("failedToCreateConfig", configFile.toString()));
+								return;
+							}
+						}
+						catch (IOException ex)
+						{
+							LOGGER.log(Level.SEVERE, tl("failedToCreateConfig", configFile.toString()), ex);
+							return;
+						}
+					}
+
+					final FileOutputStream fos = new FileOutputStream(configFile);
+					try
+					{
+						final OutputStreamWriter writer = new OutputStreamWriter(fos, UTF8);
+
+						try
+						{
+							writer.write(data);
+						}
+						finally
+						{
+							writer.close();
+						}
+					}
+					finally
+					{
+						fos.close();
+					}
+				}
+				catch (IOException e)
+				{
+					LOGGER.log(Level.SEVERE, e.getMessage(), e);
+				}
+				finally
+				{
+					//LOGGER.log(Level.INFO, configFile + " written to disk in " + (System.nanoTime() - startTime) + " nsec.");
+					pendingDiskWrites.decrementAndGet();
+				}
+			}
+		}
+	}
+
+	public boolean hasProperty(final String path)
+	{
+		return isSet(path);
+	}
+
+	public Location getLocation(final String path, final Server server) throws InvalidWorldException
+	{
+		final String worldString = (path == null ? "" : path + ".") + "world";
+		final String worldName = getString(worldString);
+		if (worldName == null || worldName.isEmpty())
+		{
+			return null;
+		}
+		final World world = server.getWorld(worldName);
+		if (world == null)
+		{
+			throw new InvalidWorldException(worldName);
+		}
+		return new Location(world,
+							getDouble((path == null ? "" : path + ".") + "x", 0),
+							getDouble((path == null ? "" : path + ".") + "y", 0),
+							getDouble((path == null ? "" : path + ".") + "z", 0),
+							(float)getDouble((path == null ? "" : path + ".") + "yaw", 0),
+							(float)getDouble((path == null ? "" : path + ".") + "pitch", 0));
+	}
+
+	public void setProperty(final String path, final Location loc)
+	{
+		set((path == null ? "" : path + ".") + "world", loc.getWorld().getName());
+		set((path == null ? "" : path + ".") + "x", loc.getX());
+		set((path == null ? "" : path + ".") + "y", loc.getY());
+		set((path == null ? "" : path + ".") + "z", loc.getZ());
+		set((path == null ? "" : path + ".") + "yaw", loc.getYaw());
+		set((path == null ? "" : path + ".") + "pitch", loc.getPitch());
+	}
+
+	@Override
+	public ItemStack getItemStack(final String path)
+	{
+		final ItemStack stack = new ItemStack(
+				Material.valueOf(getString(path + ".type", "AIR")),
+				getInt(path + ".amount", 1),
+				(short)getInt(path + ".damage", 0));
+		final ConfigurationSection enchants = getConfigurationSection(path + ".enchant");
+		if (enchants != null)
+		{
+			for (String enchant : enchants.getKeys(false))
+			{
+				final Enchantment enchantment = Enchantment.getByName(enchant.toUpperCase(Locale.ENGLISH));
+				if (enchantment == null)
+				{
+					continue;
+				}
+				final int level = getInt(path + ".enchant." + enchant, enchantment.getStartLevel());
+				stack.addUnsafeEnchantment(enchantment, level);
+			}
+		}
+		return stack;
+		/*
+		 * ,
+		 * (byte)getInt(path + ".data", 0)
+		 */
+	}
+
+	public void setProperty(final String path, final ItemStack stack)
+	{
+		final Map<String, Object> map = new HashMap<String, Object>();
+		map.put("type", stack.getType().toString());
+		map.put("amount", stack.getAmount());
+		map.put("damage", stack.getDurability());
+		Map<Enchantment, Integer> enchantments = stack.getEnchantments();
+		if (!enchantments.isEmpty())
+		{
+			Map<String, Integer> enchant = new HashMap<String, Integer>();
+			for (Map.Entry<Enchantment, Integer> entry : enchantments.entrySet())
+			{
+				enchant.put(entry.getKey().getName().toLowerCase(Locale.ENGLISH), entry.getValue());
+			}
+			map.put("enchant", enchant);
+		}
+		// getData().getData() is broken
+		//map.put("data", stack.getDurability());
+		set(path, map);
+	}
+
+	public void setProperty(String path, List object)
+	{
+		set(path, new ArrayList(object));
+	}
+
+	public void setProperty(String path, Map object)
+	{
+		set(path, new LinkedHashMap(object));
+	}
+
+	public Object getProperty(String path)
+	{
+		return get(path);
+	}
+
+	public void setProperty(final String path, final BigDecimal bigDecimal)
+	{
+		set(path, bigDecimal.toString());
+	}
+
+	public void setProperty(String path, Object object)
+	{
+		set(path, object);
+	}
+
+	public void removeProperty(String path)
+	{
+		set(path, null);
+	}
+
+	@Override
+	public synchronized Object get(String path)
+	{
+		return super.get(path);
+	}
+
+	@Override
+	public synchronized Object get(String path, Object def)
+	{
+		return super.get(path, def);
+	}
+
+	public synchronized BigDecimal getBigDecimal(final String path, final BigDecimal def)
+	{
+		final String input = super.getString(path);
+		return toBigDecimal(input, def);
+	}
+
+	public static BigDecimal toBigDecimal(final String input, final BigDecimal def)
+	{
+		if (input == null || input.isEmpty())
+		{
+			return def;
+		}
+		else
+		{
+			try
+			{
+				return new BigDecimal(input, MathContext.DECIMAL128);
+			}
+			catch (NumberFormatException e)
+			{
+				return def;
+			}
+			catch (ArithmeticException e)
+			{
+				return def;
+			}
+		}
+	}
+
+	@Override
+	public synchronized boolean getBoolean(String path)
+	{
+		return super.getBoolean(path);
+	}
+
+	@Override
+	public synchronized boolean getBoolean(String path, boolean def)
+	{
+		return super.getBoolean(path, def);
+	}
+
+	@Override
+	public synchronized List<Boolean> getBooleanList(String path)
+	{
+		return super.getBooleanList(path);
+	}
+
+	@Override
+	public synchronized List<Byte> getByteList(String path)
+	{
+		return super.getByteList(path);
+	}
+
+	@Override
+	public synchronized List<Character> getCharacterList(String path)
+	{
+		return super.getCharacterList(path);
+	}
+
+	@Override
+	public synchronized ConfigurationSection getConfigurationSection(String path)
+	{
+		return super.getConfigurationSection(path);
+	}
+
+	@Override
+	public synchronized double getDouble(String path)
+	{
+		return super.getDouble(path);
+	}
+
+	@Override
+	public synchronized double getDouble(final String path, final double def)
+	{
+		return super.getDouble(path, def);
+	}
+
+	@Override
+	public synchronized List<Double> getDoubleList(String path)
+	{
+		return super.getDoubleList(path);
+	}
+
+	@Override
+	public synchronized List<Float> getFloatList(String path)
+	{
+		return super.getFloatList(path);
+	}
+
+	@Override
+	public synchronized int getInt(String path)
+	{
+		return super.getInt(path);
+	}
+
+	@Override
+	public synchronized int getInt(String path, int def)
+	{
+		return super.getInt(path, def);
+	}
+
+	@Override
+	public synchronized List<Integer> getIntegerList(String path)
+	{
+		return super.getIntegerList(path);
+	}
+
+	@Override
+	public synchronized ItemStack getItemStack(String path, ItemStack def)
+	{
+		return super.getItemStack(path, def);
+	}
+
+	@Override
+	public synchronized Set<String> getKeys(boolean deep)
+	{
+		return super.getKeys(deep);
+	}
+
+	@Override
+	public synchronized List<?> getList(String path)
+	{
+		return super.getList(path);
+	}
+
+	@Override
+	public synchronized List<?> getList(String path, List<?> def)
+	{
+		return super.getList(path, def);
+	}
+
+	@Override
+	public synchronized long getLong(String path)
+	{
+		return super.getLong(path);
+	}
+
+	@Override
+	public synchronized long getLong(final String path, final long def)
+	{
+		return super.getLong(path, def);
+	}
+
+	@Override
+	public synchronized List<Long> getLongList(String path)
+	{
+		return super.getLongList(path);
+	}
+
+	public synchronized Map<String, Object> getMap()
+	{
+		return map;
+	}
+
+	@Override
+	public synchronized List<Map<?, ?>> getMapList(String path)
+	{
+		return super.getMapList(path);
+	}
+
+	@Override
+	public synchronized OfflinePlayer getOfflinePlayer(String path)
+	{
+		return super.getOfflinePlayer(path);
+	}
+
+	@Override
+	public synchronized OfflinePlayer getOfflinePlayer(String path, OfflinePlayer def)
+	{
+		return super.getOfflinePlayer(path, def);
+	}
+
+	@Override
+	public synchronized List<Short> getShortList(String path)
+	{
+		return super.getShortList(path);
+	}
+
+	@Override
+	public synchronized String getString(String path)
+	{
+		return super.getString(path);
+	}
+
+	@Override
+	public synchronized String getString(String path, String def)
+	{
+		return super.getString(path, def);
+	}
+
+	@Override
+	public synchronized List<String> getStringList(String path)
+	{
+		return super.getStringList(path);
+	}
+
+	@Override
+	public synchronized Map<String, Object> getValues(boolean deep)
+	{
+		return super.getValues(deep);
+	}
+
+	@Override
+	public synchronized Vector getVector(String path)
+	{
+		return super.getVector(path);
+	}
+
+	@Override
+	public synchronized Vector getVector(String path, Vector def)
+	{
+		return super.getVector(path, def);
+	}
+
+	@Override
+	public synchronized boolean isBoolean(String path)
+	{
+		return super.isBoolean(path);
+	}
+
+	@Override
+	public synchronized boolean isConfigurationSection(String path)
+	{
+		return super.isConfigurationSection(path);
+	}
+
+	@Override
+	public synchronized boolean isDouble(String path)
+	{
+		return super.isDouble(path);
+	}
+
+	@Override
+	public synchronized boolean isInt(String path)
+	{
+		return super.isInt(path);
+	}
+
+	@Override
+	public synchronized boolean isItemStack(String path)
+	{
+		return super.isItemStack(path);
+	}
+
+	@Override
+	public synchronized boolean isList(String path)
+	{
+		return super.isList(path);
+	}
+
+	@Override
+	public synchronized boolean isLong(String path)
+	{
+		return super.isLong(path);
+	}
+
+	@Override
+	public synchronized boolean isOfflinePlayer(String path)
+	{
+		return super.isOfflinePlayer(path);
+	}
+
+	@Override
+	public synchronized boolean isSet(String path)
+	{
+		return super.isSet(path);
+	}
+
+	@Override
+	public synchronized boolean isString(String path)
+	{
+		return super.isString(path);
+	}
+
+	@Override
+	public synchronized boolean isVector(String path)
+	{
+		return super.isVector(path);
+	}
+
+	@Override
+	public synchronized void set(String path, Object value)
+	{
+		super.set(path, value);
+	}
+}

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

@@ -0,0 +1,225 @@
+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;
+import java.util.regex.Pattern;
+import net.ess3.api.IEssentials;
+import org.bukkit.Material;
+import org.bukkit.entity.*;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.*;
+import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
+import org.bukkit.inventory.ItemStack;
+
+
+public class EssentialsEntityListener implements Listener
+{
+	private static final Logger LOGGER = Logger.getLogger("Essentials");
+	private static final transient Pattern powertoolPlayer = Pattern.compile("\\{player\\}");
+	private final IEssentials ess;
+
+	public EssentialsEntityListener(IEssentials ess)
+	{
+		this.ess = ess;
+	}
+
+	// This method does something undocumented reguarding certain bucket types #EasterEgg
+	@EventHandler(priority = EventPriority.LOW)
+	public void onEntityDamage(final EntityDamageByEntityEvent event)
+	{
+		final Entity eAttack = event.getDamager();
+		final Entity eDefend = event.getEntity();
+		if (eAttack instanceof Player)
+		{
+			final User attacker = ess.getUser((Player)eAttack);
+			if (eDefend instanceof Player)
+			{
+				onPlayerVsPlayerDamage(event, (Player)eDefend, attacker);
+			}
+			else if (eDefend instanceof Ageable)
+			{
+				final ItemStack hand = attacker.getBase().getItemInHand();
+				if (hand != null && hand.getType() == Material.MILK_BUCKET)
+				{
+					((Ageable)eDefend).setBaby();
+					hand.setType(Material.BUCKET);
+					attacker.getBase().setItemInHand(hand);
+					attacker.getBase().updateInventory();
+					event.setCancelled(true);
+				}
+			}
+			attacker.updateActivity(true);
+		}
+		else if (eAttack instanceof Projectile && eDefend instanceof Player)
+		{			
+			final Projectile projectile = (Projectile)event.getDamager();
+			//This should return a ProjectileSource on 1.7.3 beta +
+			final Object shooter = projectile.getShooter();
+			if (shooter instanceof Player)
+			{
+				final User attacker = ess.getUser((Player)shooter);
+				onPlayerVsPlayerDamage(event, (Player)eDefend, attacker);
+				attacker.updateActivity(true);
+			}
+		}
+	}
+
+	private void onPlayerVsPlayerDamage(final EntityDamageByEntityEvent event, final Player defender, final User attacker)
+	{
+		if (ess.getSettings().getLoginAttackDelay() > 0
+			&& (System.currentTimeMillis() < (attacker.getLastLogin() + ess.getSettings().getLoginAttackDelay()))
+			&& !attacker.isAuthorized("essentials.pvpdelay.exempt"))
+		{
+			event.setCancelled(true);
+		}
+
+		if (!defender.equals(attacker.getBase()) && (attacker.hasInvulnerabilityAfterTeleport() || ess.getUser(defender).hasInvulnerabilityAfterTeleport()))
+		{
+			event.setCancelled(true);
+		}
+
+		if (attacker.isGodModeEnabled() && !attacker.isAuthorized("essentials.god.pvp"))
+		{
+			event.setCancelled(true);
+		}
+
+		if (attacker.isHidden() && !attacker.isAuthorized("essentials.vanish.pvp"))
+		{
+			event.setCancelled(true);
+		}
+
+		onPlayerVsPlayerPowertool(event, defender, attacker);
+	}
+
+	private void onPlayerVsPlayerPowertool(final EntityDamageByEntityEvent event, final Player defender, final User attacker)
+	{
+		final List<String> commandList = attacker.getPowertool(attacker.getBase().getItemInHand());
+		if (commandList != null && !commandList.isEmpty())
+		{
+			for (final String tempCommand : commandList)
+			{
+				final String command = powertoolPlayer.matcher(tempCommand).replaceAll(defender.getName());
+				if (command != null && !command.isEmpty() && !command.equals(tempCommand))
+				{
+					ess.scheduleSyncDelayedTask(
+							new Runnable()
+					{
+						@Override
+						public void run()
+						{
+							attacker.getServer().dispatchCommand(attacker.getBase(), command);
+							LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", attacker.getName(), command));
+						}
+					});
+
+					event.setCancelled(true);
+					return;
+				}
+			}
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onEntityDamage(final EntityDamageEvent event)
+	{
+		if (event.getEntity() instanceof Player && ess.getUser((Player)event.getEntity()).isGodModeEnabled())
+		{
+			final Player player = (Player)event.getEntity();
+			player.setFireTicks(0);
+			player.setRemainingAir(player.getMaximumAir());
+			event.setCancelled(true);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onEntityCombust(final EntityCombustEvent event)
+	{
+		if (event.getEntity() instanceof Player && ess.getUser((Player)event.getEntity()).isGodModeEnabled())
+		{
+			event.setCancelled(true);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void onPlayerDeathEvent(final PlayerDeathEvent event)
+	{
+		final User user = ess.getUser(event.getEntity());
+		if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back"))
+		{
+			user.setLastLocation();
+			user.sendMessage(tl("backAfterDeath"));
+		}
+		if (!ess.getSettings().areDeathMessagesEnabled())
+		{
+			event.setDeathMessage("");
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOW)
+	public void onPlayerDeathExpEvent(final PlayerDeathEvent event)
+	{
+		final User user = ess.getUser(event.getEntity());
+		if (user.isAuthorized("essentials.keepxp"))
+		{
+			event.setKeepLevel(true);
+			event.setDroppedExp(0);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onFoodLevelChange(final FoodLevelChangeEvent event)
+	{
+		if (event.getEntity() instanceof Player)
+		{
+			final User user = ess.getUser((Player)event.getEntity());
+			if (user.isGodModeEnabled())
+			{
+				if (user.isGodModeEnabledRaw())
+				{
+					user.getBase().setFoodLevel(20);
+					user.getBase().setSaturation(10);
+				}
+				event.setCancelled(true);
+			}
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onEntityRegainHealth(final EntityRegainHealthEvent event)
+	{
+		if (event.getRegainReason() == RegainReason.SATIATED && event.getEntity() instanceof Player
+			&& ess.getUser((Player)event.getEntity()).isAfk() && ess.getSettings().getFreezeAfkPlayers())
+		{
+			event.setCancelled(true);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onPotionSplashEvent(final PotionSplashEvent event)
+	{
+		for (LivingEntity entity : event.getAffectedEntities())
+		{
+			if (entity instanceof Player && ess.getUser((Player)entity).isGodModeEnabled())
+			{
+				event.setIntensity(entity, 0d);
+			}
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onEntityShootBow(EntityShootBowEvent event)
+	{
+		if (event.getEntity() instanceof Player)
+		{
+			final User user = ess.getUser((Player)event.getEntity());
+			if (user.isAfk())
+			{
+				user.updateActivity(true);
+			}
+		}
+	}
+}

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

@@ -0,0 +1,776 @@
+package com.earth2me.essentials;
+
+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.DateUtil;
+import com.earth2me.essentials.utils.LocationUtil;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.event.player.*;
+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
+{
+	private static final Logger LOGGER = Logger.getLogger("Essentials");
+	private final transient IEssentials ess;
+	
+	public EssentialsPlayerListener(final IEssentials parent)
+	{
+		this.ess = parent;
+	}
+	
+	@EventHandler(priority = EventPriority.NORMAL)
+	public void onPlayerRespawn(final PlayerRespawnEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		updateCompass(user);
+		user.setDisplayNick();
+		
+		if (ess.getSettings().isTeleportInvulnerability())
+		{
+			user.enableInvulnerabilityAfterTeleport();
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void onPlayerChat(final AsyncPlayerChatEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		if (user.isMuted())
+		{
+			event.setCancelled(true);
+			user.sendMessage(tl("voiceSilenced"));
+			LOGGER.info(tl("mutedUserSpeaks", user.getName()));
+		}
+		try
+		{
+			final Iterator<Player> it = event.getRecipients().iterator();
+			while (it.hasNext())
+			{
+				final User u = ess.getUser(it.next());
+				if (u.isIgnoredPlayer(user))
+				{
+					it.remove();
+				}
+			}
+		}
+		catch (UnsupportedOperationException ex)
+		{
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.INFO, "Ignore could not block chat due to custom chat plugin event.", ex);
+			}
+			else
+			{
+				ess.getLogger().info("Ignore could not block chat due to custom chat plugin event.");
+			}
+		}
+		
+		user.updateActivity(true);
+		user.setDisplayNick();
+	}
+	
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+	public void onPlayerMove(final PlayerMoveEvent event)
+	{
+		if (event.getFrom().getBlockX() == event.getTo().getBlockX()
+			&& event.getFrom().getBlockZ() == event.getTo().getBlockZ()
+			&& event.getFrom().getBlockY() == event.getTo().getBlockY())
+		{
+			return;
+		}
+		
+		if (!ess.getSettings().cancelAfkOnMove() && !ess.getSettings().getFreezeAfkPlayers())
+		{
+			event.getHandlers().unregister(this);
+			
+			if (ess.getSettings().isDebug())
+			{
+				LOGGER.log(Level.INFO, "Unregistering move listener");
+			}
+			
+			return;
+		}
+		
+		final User user = ess.getUser(event.getPlayer());
+		if (user.isAfk() && ess.getSettings().getFreezeAfkPlayers())
+		{
+			final Location from = event.getFrom();
+			final Location origTo = event.getTo();
+			final Location to = origTo.clone();
+			if (ess.getSettings().cancelAfkOnMove() && origTo.getY() >= from.getBlockY() + 1)
+			{
+				user.updateActivity(true);
+				return;
+			}
+			to.setX(from.getX());
+			to.setY(from.getY());
+			to.setZ(from.getZ());
+			try
+			{
+				event.setTo(LocationUtil.getSafeDestination(to));
+			}
+			catch (Exception ex)
+			{
+				event.setTo(to);
+			}
+			return;
+		}
+		final Location afk = user.getAfkPosition();
+		if (afk == null || !event.getTo().getWorld().equals(afk.getWorld()) || afk.distanceSquared(event.getTo()) > 9)
+		{
+			user.updateActivity(true);
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.HIGHEST)
+	public void onPlayerQuit(final PlayerQuitEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		
+		if (ess.getSettings().allowSilentJoinQuit() && user.isAuthorized("essentials.silentquit"))
+		{
+			event.setQuitMessage(null);
+		}
+		else if (ess.getSettings().isCustomQuitMessage() && event.getQuitMessage() != null)
+		{
+			final Player player = event.getPlayer();
+			event.setQuitMessage(
+					ess.getSettings().getCustomQuitMessage()
+					.replace("{PLAYER}", player.getDisplayName())
+					.replace("{USERNAME}", player.getName()));
+		}
+		
+		if (ess.getSettings().removeGodOnDisconnect() && user.isGodModeEnabled())
+		{
+			user.setGodModeEnabled(false);
+		}
+		if (user.isVanished())
+		{
+			user.setVanished(false);
+		}
+		user.setLogoutLocation();
+		if (user.isRecipeSee())
+		{
+			user.getBase().getOpenInventory().getTopInventory().clear();
+		}
+		user.updateActivity(false);
+		user.dispose();
+	}
+	
+	@EventHandler(priority = EventPriority.HIGHEST)
+	public void onPlayerJoin(final PlayerJoinEvent event)
+	{
+		final String joinMessage = event.getJoinMessage();
+		ess.runTaskAsynchronously(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				delayedJoin(event.getPlayer(), joinMessage);
+			}
+		});
+		if (ess.getSettings().allowSilentJoinQuit() || ess.getSettings().isCustomJoinMessage())
+		{
+			event.setJoinMessage(null);
+		}
+	}
+	
+	public void delayedJoin(final Player player, final String message)
+	{
+		if (!player.isOnline())
+		{
+			return;
+		}
+		
+		ess.getBackup().onPlayerJoin();
+		final User user = ess.getUser(player);
+		
+		
+		if (user.isNPC())
+		{
+			user.setNPC(false);
+		}
+		
+		final long currentTime = System.currentTimeMillis();
+		user.checkMuteTimeout(currentTime);
+		user.updateActivity(false);
+		
+		ess.scheduleSyncDelayedTask(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				if (!user.getBase().isOnline())
+				{
+					return;
+				}
+				
+				user.setLastAccountName(user.getBase().getName());
+				user.setLastLogin(currentTime);
+				user.setDisplayNick();
+				updateCompass(user);
+				
+				if (!ess.getVanishedPlayers().isEmpty() && !user.isAuthorized("essentials.vanish.see"))
+				{
+					for (String p : ess.getVanishedPlayers())
+					{
+						Player toVanish = ess.getServer().getPlayerExact(p);
+						if (toVanish != null && toVanish.isOnline())
+						{
+							user.getBase().hidePlayer(toVanish);
+						}
+					}
+				}
+				
+				if (user.isAuthorized("essentials.sleepingignored"))
+				{
+					user.getBase().setSleepingIgnored(true);
+				}
+				
+				if ((ess.getSettings().allowSilentJoinQuit() && user.isAuthorized("essentials.silentjoin")) || message == null)
+				{
+					// Do nothing - silently join
+				}
+				else if (ess.getSettings().isCustomJoinMessage())
+				{
+					ess.getServer().broadcastMessage(
+							ess.getSettings().getCustomJoinMessage()
+							.replace("{PLAYER}", player.getDisplayName())
+							.replace("{USERNAME}", player.getName()));
+				}
+				else if (ess.getSettings().allowSilentJoinQuit())
+				{
+					ess.getServer().broadcastMessage(message);
+				}
+				
+				if (!ess.getSettings().isCommandDisabled("motd") && user.isAuthorized("essentials.motd"))
+				{
+					try
+					{
+						final IText input = new TextInput(user.getSource(), "motd", true, ess);
+						final IText output = new KeywordReplacer(input, user.getSource(), ess);
+						final TextPager pager = new TextPager(output, true);
+						pager.showPage("1", null, "motd", user.getSource());
+					}
+					catch (IOException ex)
+					{
+						if (ess.getSettings().isDebug())
+						{
+							LOGGER.log(Level.WARNING, ex.getMessage(), ex);
+						}
+						else
+						{
+							LOGGER.log(Level.WARNING, ex.getMessage());
+						}
+					}
+				}
+				
+				if (!ess.getSettings().isCommandDisabled("mail") && user.isAuthorized("essentials.mail"))
+				{
+					final List<String> mail = user.getMails();
+					if (mail.isEmpty())
+					{
+						user.sendMessage(tl("noNewMail"));
+					}
+					else
+					{
+						user.sendMessage(tl("youHaveNewMail", mail.size()));
+					}
+				}
+				
+				if (user.isAuthorized("essentials.fly.safelogin"))
+				{
+					user.getBase().setFallDistance(0);
+					if (LocationUtil.shouldFly(user.getLocation()))
+					{
+						user.getBase().setAllowFlight(true);
+						user.getBase().setFlying(true);
+						user.getBase().sendMessage(tl("flyMode", tl("enabled"), user.getDisplayName()));
+					}					
+				}
+				user.getBase().setFlySpeed(0.1f);
+				user.getBase().setWalkSpeed(0.2f);
+				
+			}
+		});
+	}
+
+	// Makes the compass item ingame always point to the first essentials home.  #EasterEgg
+	private void updateCompass(final User user)
+	{
+		Location loc = user.getHome(user.getLocation());
+		if (loc == null)
+		{
+			loc = user.getBase().getBedSpawnLocation();
+		}
+		if (loc != null)
+		{
+			final Location updateLoc = loc;
+			user.getBase().setCompassTarget(updateLoc);
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void onPlayerLogin2(final PlayerLoginEvent event)
+	{
+		switch (event.getResult())
+		{
+		case KICK_BANNED:
+			break;
+		default:
+			return;
+		}
+		
+		final String banReason = tl("banFormat", tl("defaultBanReason"), "Console");
+		event.disallow(Result.KICK_BANNED, banReason);
+	}
+	
+	@EventHandler(priority = EventPriority.HIGH)
+	public void onPlayerLogin(final PlayerLoginEvent event)
+	{
+		switch (event.getResult())
+		{
+		case KICK_FULL:
+		case KICK_BANNED:
+			break;
+		default:
+			return;
+		}
+		
+		final User user = ess.getUser(event.getPlayer());
+		
+		if (event.getResult() == Result.KICK_BANNED || user.getBase().isBanned())
+		{
+			final boolean banExpired = user.checkBanTimeout(System.currentTimeMillis());
+			if (!banExpired)
+			{
+				String banReason = user.getBanReason();
+				if (banReason == null || banReason.isEmpty() || banReason.equalsIgnoreCase("ban"))
+				{
+					banReason = event.getKickMessage();
+				}
+				if (user.getBanTimeout() > 0)
+				{
+					//TODO: TL This
+					banReason += "\n\n" + "Expires in " + DateUtil.formatDateDiff(user.getBanTimeout());
+				}
+				event.disallow(Result.KICK_BANNED, banReason);
+				return;
+			}
+		}
+		
+		if (event.getResult() == Result.KICK_FULL && !user.isAuthorized("essentials.joinfullserver"))
+		{
+			event.disallow(Result.KICK_FULL, tl("serverFull"));
+			return;
+		}
+		event.allow();
+	}
+	
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+	public void onPlayerTeleport(final PlayerTeleportEvent event)
+	{
+		final boolean backListener = ess.getSettings().registerBackInListener();
+		final boolean teleportInvulnerability = ess.getSettings().isTeleportInvulnerability();
+		if (backListener || teleportInvulnerability)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			//There is TeleportCause.COMMMAND but plugins have to actively pass the cause in on their teleports.
+			if (backListener && (event.getCause() == TeleportCause.PLUGIN || event.getCause() == TeleportCause.COMMAND))
+			{
+				user.setLastLocation();
+			}
+			if (teleportInvulnerability && (event.getCause() == TeleportCause.PLUGIN || event.getCause() == TeleportCause.COMMAND))
+			{
+				user.enableInvulnerabilityAfterTeleport();
+			}
+		}
+	}
+	
+	@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)
+	{
+		final Player player = event.getPlayer();
+		final String cmd = event.getMessage().toLowerCase(Locale.ENGLISH).split(" ")[0].replace("/", "").toLowerCase(Locale.ENGLISH);
+		if (ess.getSettings().getSocialSpyCommands().contains(cmd) || ess.getSettings().getSocialSpyCommands().contains("*"))
+		{
+			for (Player onlinePlayer : ess.getServer().getOnlinePlayers())
+			{
+				final User spyer = ess.getUser(onlinePlayer);
+				if (spyer.isSocialSpyEnabled() && !player.equals(onlinePlayer))
+				{
+					spyer.sendMessage(player.getDisplayName() + " : " + event.getMessage());
+				}
+			}
+		}
+		else if (!cmd.equalsIgnoreCase("afk"))
+		{
+			final User user = ess.getUser(player);
+			user.updateActivity(true);
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.NORMAL)
+	public void onPlayerChangedWorldFlyReset(final PlayerChangedWorldEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		if (user.getBase().getGameMode() != GameMode.CREATIVE && !user.isAuthorized("essentials.fly"))
+		{
+			user.getBase().setFallDistance(0f);
+			user.getBase().setAllowFlight(false);
+		}
+		if (!user.isAuthorized("essentials.speed"))
+		{
+			user.getBase().setFlySpeed(0.1f);
+			user.getBase().setWalkSpeed(0.2f);
+		}
+		else
+		{
+			if (user.getBase().getFlySpeed() > ess.getSettings().getMaxFlySpeed() && !user.isAuthorized("essentials.speed.bypass"))
+			{
+				user.getBase().setFlySpeed((float)ess.getSettings().getMaxFlySpeed());
+			}
+			else
+			{
+				user.getBase().setFlySpeed(user.getBase().getFlySpeed() * 0.99999f);
+			}
+			
+			if (user.getBase().getWalkSpeed() > ess.getSettings().getMaxWalkSpeed() && !user.isAuthorized("essentials.speed.bypass"))
+			{
+				user.getBase().setWalkSpeed((float)ess.getSettings().getMaxWalkSpeed());
+			}
+			else
+			{
+				user.getBase().setWalkSpeed(user.getBase().getWalkSpeed() * 0.99999f);
+			}
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onPlayerChangedWorld(final PlayerChangedWorldEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		final String newWorld = event.getPlayer().getLocation().getWorld().getName();
+		user.setDisplayNick();
+		updateCompass(user);
+		if (ess.getSettings().getNoGodWorlds().contains(newWorld) && user.isGodModeEnabledRaw())
+		{
+			user.sendMessage(tl("noGodWorldWarning"));
+		}
+		
+		if (!user.getWorld().getName().equals(newWorld))
+		{
+			user.sendMessage(tl("currentWorld", newWorld));
+		}
+		if (user.isVanished())
+		{
+			user.setVanished(user.isAuthorized("essentials.vanish"));
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.NORMAL)
+	public void onPlayerInteract(final PlayerInteractEvent event)
+	{
+		switch (event.getAction())
+		{
+		case RIGHT_CLICK_BLOCK:
+			if (!event.isCancelled() && event.getClickedBlock().getType() == Material.BED_BLOCK && ess.getSettings().getUpdateBedAtDaytime())
+			{
+				User player = ess.getUser(event.getPlayer());
+				if (player.isAuthorized("essentials.sethome.bed"))
+				{
+					player.getBase().setBedSpawnLocation(event.getClickedBlock().getLocation());
+					player.sendMessage(tl("bedSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
+				}
+			}
+			break;
+		case LEFT_CLICK_AIR:
+			if (event.getPlayer().isFlying())
+			{
+				final User user = ess.getUser(event.getPlayer());
+				if (user.isFlyClickJump())
+				{
+					useFlyClickJump(user);
+					return;
+				}
+			}
+		case LEFT_CLICK_BLOCK:
+			if (event.getItem() != null && event.getItem().getType() != Material.AIR)
+			{
+				final User user = ess.getUser(event.getPlayer());
+				user.updateActivity(true);
+				if (user.hasPowerTools() && user.arePowerToolsEnabled() && usePowertools(user, event.getItem().getTypeId()))
+				{
+					event.setCancelled(true);
+				}
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
+	// This method allows the /jump lock feature to work, allows teleporting while flying #EasterEgg
+	private void useFlyClickJump(final User user)
+	{
+		try
+		{
+			final Location otarget = LocationUtil.getTarget(user.getBase());
+			
+			ess.scheduleSyncDelayedTask(
+					new Runnable()
+			{
+				@Override
+				public void run()
+				{
+					Location loc = user.getLocation();
+					loc.setX(otarget.getX());
+					loc.setZ(otarget.getZ());
+					while (LocationUtil.isBlockDamaging(loc.getWorld(), loc.getBlockX(), loc.getBlockY() - 1, loc.getBlockZ()))
+					{
+						loc.setY(loc.getY() + 1d);
+					}
+					user.getBase().teleport(loc, TeleportCause.PLUGIN);
+				}
+			});
+		}
+		catch (Exception ex)
+		{
+			if (ess.getSettings().isDebug())
+			{
+				LOGGER.log(Level.WARNING, ex.getMessage(), ex);
+			}
+		}
+	}
+	
+	private boolean usePowertools(final User user, final int id)
+	{
+		final List<String> commandList = user.getPowertool(id);
+		if (commandList == null || commandList.isEmpty())
+		{
+			return false;
+		}
+		boolean used = false;
+		// We need to loop through each command and execute
+		for (final String command : commandList)
+		{
+			if (command.contains("{player}"))
+			{
+				continue;
+			}
+			else if (command.startsWith("c:"))
+			{
+				used = true;
+				user.getBase().chat(command.substring(2));
+			}
+			else
+			{
+				used = true;
+				ess.scheduleSyncDelayedTask(
+						new Runnable()
+				{
+					@Override
+					public void run()
+					{
+						user.getServer().dispatchCommand(user.getBase(), command);
+						LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", user.getName(), command));
+					}
+				});
+			}
+		}
+		return used;
+	}
+	
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onPlayerPickupItem(final PlayerPickupItemEvent event)
+	{
+		if (ess.getSettings().getDisableItemPickupWhileAfk())
+		{
+			if (ess.getUser(event.getPlayer()).isAfk())
+			{
+				event.setCancelled(true);
+			}
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onInventoryClickEvent(final InventoryClickEvent event)
+	{
+		Player refreshPlayer = null;
+		final Inventory top = event.getView().getTopInventory();
+		final InventoryType type = top.getType();
+		
+		if (type == InventoryType.PLAYER)
+		{
+			final User user = ess.getUser((Player)event.getWhoClicked());
+			final InventoryHolder invHolder = top.getHolder();
+			if (invHolder != null && invHolder instanceof HumanEntity)
+			{
+				final User invOwner = ess.getUser((Player)invHolder);
+				if (user.isInvSee() && (!user.isAuthorized("essentials.invsee.modify")
+										|| invOwner.isAuthorized("essentials.invsee.preventmodify")
+										|| !invOwner.getBase().isOnline()))
+				{
+					event.setCancelled(true);
+					refreshPlayer = user.getBase();
+				}
+			}
+		}
+		else if (type == InventoryType.ENDER_CHEST)
+		{
+			final User user = ess.getUser((Player)event.getWhoClicked());
+			if (user.isEnderSee() && (!user.isAuthorized("essentials.enderchest.modify")))
+			{
+				event.setCancelled(true);
+				refreshPlayer = user.getBase();
+			}
+		}
+		else if (type == InventoryType.WORKBENCH)
+		{
+			User user = ess.getUser((Player)event.getWhoClicked());
+			if (user.isRecipeSee())
+			{
+				event.setCancelled(true);
+				refreshPlayer = user.getBase();
+			}
+		}
+		else if (type == InventoryType.CHEST && top.getSize() == 9)
+		{
+			final User user = ess.getUser((Player)event.getWhoClicked());
+			final InventoryHolder invHolder = top.getHolder();
+			if (invHolder != null && invHolder instanceof HumanEntity && user.isInvSee())
+			{
+				event.setCancelled(true);
+				refreshPlayer = user.getBase();
+			}
+		}
+		
+		if (refreshPlayer != null)
+		{
+			final Player player = refreshPlayer;
+			ess.scheduleSyncDelayedTask(new Runnable()
+			{
+				@Override
+				public void run()
+				{
+					player.updateInventory();
+				}
+			}, 1);
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onInventoryCloseEvent(final InventoryCloseEvent event)
+	{
+		Player refreshPlayer = null;
+		final Inventory top = event.getView().getTopInventory();
+		final InventoryType type = top.getType();
+		if (type == InventoryType.PLAYER)
+		{
+			final User user = ess.getUser((Player)event.getPlayer());
+			user.setInvSee(false);
+			refreshPlayer = user.getBase();
+		}
+		else if (type == InventoryType.ENDER_CHEST)
+		{
+			final User user = ess.getUser((Player)event.getPlayer());
+			user.setEnderSee(false);
+			refreshPlayer = user.getBase();
+		}
+		else if (type == InventoryType.WORKBENCH)
+		{
+			final User user = ess.getUser((Player)event.getPlayer());
+			if (user.isRecipeSee())
+			{
+				user.setRecipeSee(false);
+				event.getView().getTopInventory().clear();
+				refreshPlayer = user.getBase();
+			}
+		}
+		else if (type == InventoryType.CHEST && top.getSize() == 9)
+		{
+			final InventoryHolder invHolder = top.getHolder();
+			if (invHolder != null && invHolder instanceof HumanEntity)
+			{
+				final User user = ess.getUser((Player)event.getPlayer());
+				user.setInvSee(false);
+				refreshPlayer = user.getBase();
+			}
+		}
+		
+		if (refreshPlayer != null)
+		{
+			final Player player = refreshPlayer;
+			ess.scheduleSyncDelayedTask(new Runnable()
+			{
+				@Override
+				public void run()
+				{
+					player.updateInventory();
+				}
+			}, 1);
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onPlayerFishEvent(final PlayerFishEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		user.updateActivity(true);
+	}
+}

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

@@ -0,0 +1,65 @@
+package com.earth2me.essentials;
+
+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;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.server.PluginDisableEvent;
+import org.bukkit.event.server.PluginEnableEvent;
+
+
+public class EssentialsPluginListener implements Listener, IConf
+{
+	private final transient IEssentials ess;
+
+	public EssentialsPluginListener(final IEssentials ess)
+	{
+		this.ess = ess;
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onPluginEnable(final PluginEnableEvent event)
+	{
+		if (event.getPlugin().getName().equals("EssentialsChat"))
+		{
+			ess.getSettings().setEssentialsChatActive(true);
+		}
+		ess.getPermissionsHandler().checkPermissions();
+		ess.getAlternativeCommandsHandler().addPlugin(event.getPlugin());
+		if (!Methods.hasMethod() && Methods.setMethod(ess.getServer().getPluginManager()))
+		{
+			ess.getLogger().log(Level.INFO, "Payment method found (" + Methods.getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
+		}
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onPluginDisable(final PluginDisableEvent event)
+	{
+		if (event.getPlugin().getName().equals("EssentialsChat"))
+		{
+			ess.getSettings().setEssentialsChatActive(false);
+		}
+		PermissionsHandler permHandler = ess.getPermissionsHandler();
+		if (permHandler != null)
+		{
+			permHandler.checkPermissions();
+		}
+		ess.getAlternativeCommandsHandler().removePlugin(event.getPlugin());
+		// Check to see if the plugin thats being disabled is the one we are using
+		if (ess.getPaymentMethod() != null && Methods.hasMethod() && Methods.checkDisabled(event.getPlugin()))
+		{
+			ess.getPaymentMethod().reset();
+			ess.getLogger().log(Level.INFO, "Payment method was disabled. No longer accepting payments.");
+		}
+	}
+
+	@Override
+	public void reloadConfig()
+	{
+		ess.getPermissionsHandler().setUseSuperperms(ess.getSettings().useBukkitPermissions());
+		ess.getPermissionsHandler().checkPermissions();
+	}
+}

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

@@ -0,0 +1,125 @@
+package com.earth2me.essentials;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Set;
+import java.util.UUID;
+import java.util.logging.Level;
+import net.ess3.api.IEssentials;
+import org.bukkit.entity.Player;
+
+
+public class EssentialsTimer implements Runnable
+{
+	private final transient IEssentials ess;
+	private final transient Set<UUID> onlineUsers = new HashSet<UUID>();
+	private transient long lastPoll = System.nanoTime();
+	private final LinkedList<Double> history = new LinkedList<Double>();
+	private int skip1 = 0;
+	private int skip2 = 0;
+	private final long maxTime = 10 * 1000000;
+	private final long tickInterval = 50;
+	
+	EssentialsTimer(final IEssentials ess)
+	{
+		this.ess = ess;
+		history.add(20d);
+	}
+	
+	@Override
+	public void run()
+	{
+		final long startTime = System.nanoTime();
+		final long currentTime = System.currentTimeMillis();
+		long timeSpent = (startTime - lastPoll) / 1000;
+		if (timeSpent == 0)
+		{
+			timeSpent = 1;
+		}
+		if (history.size() > 10)
+		{
+			history.remove();
+		}
+		double tps = tickInterval * 1000000.0 / timeSpent;
+		if (tps <= 21)
+		{
+			history.add(tps);
+		}
+		lastPoll = startTime;
+		int count = 0;
+		for (Player player : ess.getServer().getOnlinePlayers())
+		{
+			count++;
+			if (skip1 > 0)
+			{
+				skip1--;
+				continue;
+			}
+			if (count % 10 == 0)
+			{
+				if (System.nanoTime() - startTime > maxTime / 2)
+				{
+					skip1 = count - 1;
+					break;
+				}
+			}
+			try
+			{
+				final User user = ess.getUser(player);
+				onlineUsers.add(user.getBase().getUniqueId());
+				user.setLastOnlineActivity(currentTime);
+				user.checkActivity();
+			}
+			catch (Exception e)
+			{
+				ess.getLogger().log(Level.WARNING, "EssentialsTimer Error:", e);
+			}
+		}
+		
+		count = 0;
+		final Iterator<UUID> iterator = onlineUsers.iterator();
+		while (iterator.hasNext())
+		{
+			count++;
+			if (skip2 > 0)
+			{
+				skip2--;
+				continue;
+			}
+			if (count % 10 == 0)
+			{
+				if (System.nanoTime() - startTime > maxTime)
+				{
+					skip2 = count - 1;
+					break;
+				}
+			}
+			final User user = ess.getUser(iterator.next());
+			if (user.getLastOnlineActivity() < currentTime && user.getLastOnlineActivity() > user.getLastLogout())
+			{
+				if (!user.isHidden()) {
+					user.setLastLogout(user.getLastOnlineActivity());
+				}
+				iterator.remove();
+				continue;
+			}
+			user.checkMuteTimeout(currentTime);
+			user.checkJailTimeout(currentTime);
+			user.resetInvulnerabilityAfterTeleport();
+		}
+	}
+	
+	public double getAverageTPS()
+	{
+		double avg = 0;
+		for (Double f : history)
+		{
+			if (f != null)
+			{
+				avg += f;
+			}
+		}		
+		return avg / history.size();
+	}
+}

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

@@ -0,0 +1,679 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n.tl;
+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;
+import java.security.DigestInputStream;
+import java.security.MessageDigest;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+
+
+public class EssentialsUpgrade
+{
+	private final static Logger LOGGER = Logger.getLogger("Essentials");
+	private final transient IEssentials ess;
+	private final transient EssentialsConf doneFile;
+
+	EssentialsUpgrade(final IEssentials essentials)
+	{
+		ess = essentials;
+		if (!ess.getDataFolder().exists())
+		{
+			ess.getDataFolder().mkdirs();
+		}
+		doneFile = new EssentialsConf(new File(ess.getDataFolder(), "upgrades-done.yml"));
+		doneFile.load();
+	}
+
+	private void moveMotdRulesToFile(String name)
+	{
+		if (doneFile.getBoolean("move" + name + "ToFile", false))
+		{
+			return;
+		}
+		try
+		{
+			final File file = new File(ess.getDataFolder(), name + ".txt");
+			if (file.exists())
+			{
+				return;
+			}
+			final File configFile = new File(ess.getDataFolder(), "config.yml");
+			if (!configFile.exists())
+			{
+				return;
+			}
+			final EssentialsConf conf = new EssentialsConf(configFile);
+			conf.load();
+			List<String> lines = conf.getStringList(name);
+			if (lines != null && !lines.isEmpty())
+			{
+				if (!file.createNewFile())
+				{
+					throw new IOException("Failed to create file " + file);
+				}
+				PrintWriter writer = new PrintWriter(file);
+
+				for (String line : lines)
+				{
+					writer.println(line);
+				}
+				writer.close();
+			}
+			doneFile.setProperty("move" + name + "ToFile", true);
+			doneFile.save();
+		}
+		catch (IOException e)
+		{
+			LOGGER.log(Level.SEVERE, tl("upgradingFilesError"), e);
+		}
+	}
+
+	private void removeLinesFromConfig(File file, String regex, String info) throws Exception
+	{
+		boolean needUpdate = false;
+		final BufferedReader bReader = new BufferedReader(new FileReader(file));
+		final File tempFile = File.createTempFile("essentialsupgrade", ".tmp.yml", ess.getDataFolder());
+		final BufferedWriter bWriter = new BufferedWriter(new FileWriter(tempFile));
+		do
+		{
+			final String line = bReader.readLine();
+			if (line == null)
+			{
+				break;
+			}
+			if (line.matches(regex))
+			{
+				if (!needUpdate && info != null)
+				{
+					bWriter.write(info, 0, info.length());
+					bWriter.newLine();
+				}
+				needUpdate = true;
+			}
+			else
+			{
+				if (line.endsWith("\r\n"))
+				{
+					bWriter.write(line, 0, line.length() - 2);
+				}
+				else if (line.endsWith("\r") || line.endsWith("\n"))
+				{
+					bWriter.write(line, 0, line.length() - 1);
+				}
+				else
+				{
+					bWriter.write(line, 0, line.length());
+				}
+				bWriter.newLine();
+			}
+		}
+		while (true);
+		bReader.close();
+		bWriter.close();
+		if (needUpdate)
+		{
+			if (!file.renameTo(new File(file.getParentFile(), file.getName().concat("." + System.currentTimeMillis() + ".upgradebackup"))))
+			{
+				throw new Exception(tl("configFileMoveError"));
+			}
+			if (!tempFile.renameTo(file))
+			{
+				throw new Exception(tl("configFileRenameError"));
+			}
+		}
+		else
+		{
+			tempFile.delete();
+		}
+	}
+
+	private void updateUsersPowerToolsFormat()
+	{
+		if (doneFile.getBoolean("updateUsersPowerToolsFormat", false))
+		{
+			return;
+		}
+		final File userdataFolder = new File(ess.getDataFolder(), "userdata");
+		if (!userdataFolder.exists() || !userdataFolder.isDirectory())
+		{
+			return;
+		}
+		final File[] userFiles = userdataFolder.listFiles();
+
+		for (File file : userFiles)
+		{
+			if (!file.isFile() || !file.getName().endsWith(".yml"))
+			{
+				continue;
+			}
+			final EssentialsConf config = new EssentialsConf(file);
+			try
+			{
+				config.load();
+				if (config.hasProperty("powertools"))
+				{
+					@SuppressWarnings("unchecked")
+					final Map<String, Object> powertools = config.getConfigurationSection("powertools").getValues(false);
+					if (powertools == null)
+					{
+						continue;
+					}
+					for (Map.Entry<String, Object> entry : powertools.entrySet())
+					{
+						if (entry.getValue() instanceof String)
+						{
+							List<String> temp = new ArrayList<String>();
+							temp.add((String)entry.getValue());
+							((Map<String, Object>)powertools).put(entry.getKey(), temp);
+						}
+					}
+					config.forceSave();
+				}
+			}
+			catch (RuntimeException ex)
+			{
+				LOGGER.log(Level.INFO, "File: " + file.toString());
+				throw ex;
+			}
+		}
+		doneFile.setProperty("updateUsersPowerToolsFormat", true);
+		doneFile.save();
+	}
+
+	private void updateUsersHomesFormat()
+	{
+		if (doneFile.getBoolean("updateUsersHomesFormat", false))
+		{
+			return;
+		}
+		final File userdataFolder = new File(ess.getDataFolder(), "userdata");
+		if (!userdataFolder.exists() || !userdataFolder.isDirectory())
+		{
+			return;
+		}
+		final File[] userFiles = userdataFolder.listFiles();
+
+		for (File file : userFiles)
+		{
+			if (!file.isFile() || !file.getName().endsWith(".yml"))
+			{
+				continue;
+			}
+			final EssentialsConf config = new EssentialsConf(file);
+			try
+			{
+
+				config.load();
+				if (config.hasProperty("home") && config.hasProperty("home.default"))
+				{
+					@SuppressWarnings("unchecked")
+					final String defworld = (String)config.getProperty("home.default");
+					final Location defloc = getFakeLocation(config, "home.worlds." + defworld);
+					if (defloc != null)
+					{
+						config.setProperty("homes.home", defloc);
+					}
+
+					Set<String> worlds = config.getConfigurationSection("home.worlds").getKeys(false);
+					Location loc;
+					String worldName;
+
+					if (worlds == null)
+					{
+						continue;
+					}
+					for (String world : worlds)
+					{
+						if (defworld.equalsIgnoreCase(world))
+						{
+							continue;
+						}
+						loc = getFakeLocation(config, "home.worlds." + world);
+						if (loc == null)
+						{
+							continue;
+						}
+						worldName = loc.getWorld().getName().toLowerCase(Locale.ENGLISH);
+						if (worldName != null && !worldName.isEmpty())
+						{
+							config.setProperty("homes." + worldName, loc);
+						}
+					}
+					config.removeProperty("home");
+					config.forceSave();
+				}
+
+			}
+			catch (RuntimeException ex)
+			{
+				LOGGER.log(Level.INFO, "File: " + file.toString());
+				throw ex;
+			}
+		}
+		doneFile.setProperty("updateUsersHomesFormat", true);
+		doneFile.save();
+	}
+
+	private void sanitizeAllUserFilenames()
+	{
+		if (doneFile.getBoolean("sanitizeAllUserFilenames", false))
+		{
+			return;
+		}
+		final File usersFolder = new File(ess.getDataFolder(), "userdata");
+		if (!usersFolder.exists())
+		{
+			return;
+		}
+		final File[] listOfFiles = usersFolder.listFiles();
+		for (File listOfFile : listOfFiles)
+		{
+			final String filename = listOfFile.getName();
+			if (!listOfFile.isFile() || !filename.endsWith(".yml"))
+			{
+				continue;
+			}
+			final String sanitizedFilename = StringUtil.sanitizeFileName(filename.substring(0, filename.length() - 4)) + ".yml";
+			if (sanitizedFilename.equals(filename))
+			{
+				continue;
+			}
+			final File tmpFile = new File(listOfFile.getParentFile(), sanitizedFilename + ".tmp");
+			final File newFile = new File(listOfFile.getParentFile(), sanitizedFilename);
+			if (!listOfFile.renameTo(tmpFile))
+			{
+				LOGGER.log(Level.WARNING, tl("userdataMoveError", filename, sanitizedFilename));
+				continue;
+			}
+			if (newFile.exists())
+			{
+				LOGGER.log(Level.WARNING, tl("duplicatedUserdata", filename, sanitizedFilename));
+				continue;
+			}
+			if (!tmpFile.renameTo(newFile))
+			{
+				LOGGER.log(Level.WARNING, tl("userdataMoveBackError", sanitizedFilename, sanitizedFilename));
+			}
+		}
+		doneFile.setProperty("sanitizeAllUserFilenames", true);
+		doneFile.save();
+	}
+
+	private World getFakeWorld(final String name)
+	{
+		final File bukkitDirectory = ess.getDataFolder().getParentFile().getParentFile();
+		final File worldDirectory = new File(bukkitDirectory, name);
+		if (worldDirectory.exists() && worldDirectory.isDirectory())
+		{
+			return new FakeWorld(worldDirectory.getName(), World.Environment.NORMAL);
+		}
+		return null;
+	}
+
+	public Location getFakeLocation(EssentialsConf config, String path)
+	{
+		String worldName = config.getString((path != null ? path + "." : "") + "world");
+		if (worldName == null || worldName.isEmpty())
+		{
+			return null;
+		}
+		World world = getFakeWorld(worldName);
+		if (world == null)
+		{
+			return null;
+		}
+		return new Location(world,
+							config.getDouble((path != null ? path + "." : "") + "x", 0),
+							config.getDouble((path != null ? path + "." : "") + "y", 0),
+							config.getDouble((path != null ? path + "." : "") + "z", 0),
+							(float)config.getDouble((path != null ? path + "." : "") + "yaw", 0),
+							(float)config.getDouble((path != null ? path + "." : "") + "pitch", 0));
+	}
+
+	private void deleteOldItemsCsv()
+	{
+		if (doneFile.getBoolean("deleteOldItemsCsv", false))
+		{
+			return;
+		}
+		final File file = new File(ess.getDataFolder(), "items.csv");
+		if (file.exists())
+		{
+			try
+			{
+				final Set<BigInteger> oldconfigs = new HashSet<BigInteger>();
+				oldconfigs.add(new BigInteger("66ec40b09ac167079f558d1099e39f10", 16)); // sep 1
+				oldconfigs.add(new BigInteger("34284de1ead43b0bee2aae85e75c041d", 16)); // crlf
+				oldconfigs.add(new BigInteger("c33bc9b8ee003861611bbc2f48eb6f4f", 16)); // jul 24
+				oldconfigs.add(new BigInteger("6ff17925430735129fc2a02f830c1daa", 16)); // crlf
+
+				MessageDigest digest = ManagedFile.getDigest();
+				final BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
+				final DigestInputStream dis = new DigestInputStream(bis, digest);
+				final byte[] buffer = new byte[1024];
+				try
+				{
+					while (dis.read(buffer) != -1)
+					{
+					}
+				}
+				finally
+				{
+					dis.close();
+				}
+
+				BigInteger hash = new BigInteger(1, digest.digest());
+				if (oldconfigs.contains(hash) && !file.delete())
+				{
+					throw new IOException("Could not delete file " + file.toString());
+				}
+				doneFile.setProperty("deleteOldItemsCsv", true);
+				doneFile.save();
+			}
+			catch (IOException ex)
+			{
+				Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+			}
+		}
+	}
+
+	private void updateSpawnsToNewSpawnsConfig()
+	{
+		if (doneFile.getBoolean("updateSpawnsToNewSpawnsConfig", false))
+		{
+			return;
+		}
+		final File configFile = new File(ess.getDataFolder(), "spawn.yml");
+		if (configFile.exists())
+		{
+
+			final EssentialsConf config = new EssentialsConf(configFile);
+			try
+			{
+				config.load();
+				if (!config.hasProperty("spawns"))
+				{
+					final Spawns spawns = new Spawns();
+					Set<String> keys = config.getKeys(false);
+					for (String group : keys)
+					{
+						Location loc = getFakeLocation(config, group);
+						spawns.getSpawns().put(group.toLowerCase(Locale.ENGLISH), loc);
+					}
+					if (!configFile.renameTo(new File(ess.getDataFolder(), "spawn.yml.old")))
+					{
+						throw new Exception(tl("fileRenameError", "spawn.yml"));
+					}
+					PrintWriter writer = new PrintWriter(configFile);
+					try
+					{
+						new YamlStorageWriter(writer).save(spawns);
+					}
+					finally
+					{
+						writer.close();
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+			}
+		}
+		doneFile.setProperty("updateSpawnsToNewSpawnsConfig", true);
+		doneFile.save();
+	}
+
+	private void updateJailsToNewJailsConfig()
+	{
+		if (doneFile.getBoolean("updateJailsToNewJailsConfig", false))
+		{
+			return;
+		}
+		final File configFile = new File(ess.getDataFolder(), "jail.yml");
+		if (configFile.exists())
+		{
+
+			final EssentialsConf config = new EssentialsConf(configFile);
+			try
+			{
+				config.load();
+				if (!config.hasProperty("jails"))
+				{
+					final com.earth2me.essentials.settings.Jails jails = new com.earth2me.essentials.settings.Jails();
+					Set<String> keys = config.getKeys(false);
+					for (String jailName : keys)
+					{
+						Location loc = getFakeLocation(config, jailName);
+						jails.getJails().put(jailName.toLowerCase(Locale.ENGLISH), loc);
+					}
+					if (!configFile.renameTo(new File(ess.getDataFolder(), "jail.yml.old")))
+					{
+						throw new Exception(tl("fileRenameError", "jail.yml"));
+					}
+					PrintWriter writer = new PrintWriter(configFile);
+					try
+					{
+						new YamlStorageWriter(writer).save(jails);
+					}
+					finally
+					{
+						writer.close();
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+			}
+		}
+		doneFile.setProperty("updateJailsToNewJailsConfig", true);
+		doneFile.save();
+	}
+
+	private void warnMetrics()
+	{
+		if (doneFile.getBoolean("warnMetrics", false))
+		{
+			return;
+		}
+		ess.getSettings().setMetricsEnabled(false);
+		doneFile.setProperty("warnMetrics", true);
+		doneFile.save();
+	}
+
+	private void uuidFileChange()
+	{
+		if (doneFile.getBoolean("uuidFileChange", false))
+		{
+			return;
+		}
+		
+		final File userdir = new File(ess.getDataFolder(), "userdata");
+		if (!userdir.exists())
+		{
+			return;
+		}
+		
+		int countFiles = 0;
+		int countReqFiles = 0;
+		for (String string : userdir.list())
+		{
+			if (!string.endsWith(".yml") || string.length() < 5)
+			{
+				continue;
+			}
+			
+			countFiles++;
+			
+			final String name = string.substring(0, string.length() - 4);
+			UUID uuid = null;
+			
+			try
+			{
+				uuid = UUID.fromString(name);
+			}
+			catch (IllegalArgumentException ex)
+			{
+				countReqFiles++;
+			}
+			
+			if (countFiles > 100)
+			{
+				break;
+			}			
+		}
+		
+		if (countReqFiles < 1)
+		{
+			return;
+		}
+				
+		ess.getLogger().info("#### Starting Essentials UUID userdata conversion in a few seconds. ####");
+		ess.getLogger().info("We recommend you take a backup of your server before upgrading from the old username system.");
+		
+		try
+		{
+			Thread.sleep(10000);
+		}
+		catch (InterruptedException ex)
+		{
+			// NOOP
+		}
+
+		uuidFileConvert(ess);
+
+		doneFile.setProperty("uuidFileChange", true);
+		doneFile.save();
+	}
+
+	public static void uuidFileConvert(IEssentials ess)
+	{
+		ess.getLogger().info("Starting Essentials UUID userdata conversion");
+
+		final File userdir = new File(ess.getDataFolder(), "userdata");
+		if (!userdir.exists())
+		{
+			return;
+		}
+
+		int countFiles = 0;
+		int countFails = 0;
+		int countEssCache = 0;
+		int countBukkit = 0;
+
+		ess.getLogger().info("Found " + userdir.list().length + " files to convert...");
+
+		for (String string : userdir.list())
+		{
+			if (!string.endsWith(".yml") || string.length() < 5)
+			{
+				continue;
+			}
+
+			final int showProgress = countFiles % 250;
+
+			if (showProgress == 0)
+			{
+				ess.getUserMap().getUUIDMap().forceWriteUUIDMap();
+				ess.getLogger().info("Converted " + countFiles + "/" + userdir.list().length);
+			}
+
+			countFiles++;
+
+			final String name = string.substring(0, string.length() - 4);
+			EssentialsUserConf config;
+			UUID uuid = null;
+			try
+			{
+				uuid = UUID.fromString(name);
+			}
+			catch (IllegalArgumentException ex)
+			{
+				File file = new File(userdir, string);
+				EssentialsConf conf = new EssentialsConf(file);
+				conf.load();
+				conf.setProperty("lastAccountName", name);
+				conf.save();
+
+				String uuidString = conf.getString("uuid", null);
+
+				for (int i = 0; i < 4; i++)
+				{
+					try
+					{
+						uuid = UUID.fromString(uuidString);
+						countEssCache++;
+						break;
+					}
+					catch (Exception ex2)
+					{
+						if (conf.getBoolean("npc", false))
+						{
+							uuid = UUID.nameUUIDFromBytes(("NPC:" + name).getBytes(Charsets.UTF_8));
+							break;
+						}
+						
+						org.bukkit.OfflinePlayer player = ess.getServer().getOfflinePlayer(name);
+						uuid = player.getUniqueId();
+					}
+
+					if (uuid != null)
+					{
+						countBukkit++;
+						break;
+					}					
+				}
+
+				if (uuid != null)
+				{
+					conf.forceSave();
+					config = new EssentialsUserConf(name, uuid, new File(userdir, uuid + ".yml"));
+					config.convertLegacyFile();
+					ess.getUserMap().trackUUID(uuid, name);
+					continue;
+				}
+				countFails++;
+			}
+		}
+		ess.getUserMap().getUUIDMap().forceWriteUUIDMap();
+        
+		ess.getLogger().info("Converted " + countFiles + "/" + countFiles + ".  Conversion complete.");
+		ess.getLogger().info("Converted via cache: " + countEssCache + " :: Converted via lookup: " + countBukkit + " :: Failed to convert: " + countFails);
+		ess.getLogger().info("To rerun the conversion type /essentials uuidconvert");
+	}
+
+	public void beforeSettings()
+	{
+		if (!ess.getDataFolder().exists())
+		{
+			ess.getDataFolder().mkdirs();
+		}
+		moveMotdRulesToFile("motd");
+		moveMotdRulesToFile("rules");
+	}
+
+	public void afterSettings()
+	{
+		sanitizeAllUserFilenames();
+		updateUsersPowerToolsFormat();
+		updateUsersHomesFormat();
+		deleteOldItemsCsv();
+		updateSpawnsToNewSpawnsConfig();
+		updateJailsToNewJailsConfig();
+		uuidFileChange();
+		warnMetrics();
+	}
+}

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

@@ -0,0 +1,76 @@
+package com.earth2me.essentials;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Files;
+import java.io.File;
+import java.io.IOException;
+import java.util.Locale;
+import java.util.UUID;
+import java.util.logging.Level;
+import org.bukkit.Bukkit;
+
+
+public class EssentialsUserConf extends EssentialsConf
+{
+	final String username;
+	final UUID uuid;
+
+	public EssentialsUserConf(final String username, final UUID uuid, final File configFile)
+	{
+		super(configFile);
+		this.username = username;
+		this.uuid = uuid;
+	}
+
+	@Override
+	public boolean legacyFileExists()
+	{
+		final File file = new File(configFile.getParentFile(), username + ".yml");
+		return file.exists();
+	}
+
+	@Override
+	public void convertLegacyFile()
+	{
+		final File file = new File(configFile.getParentFile(), username + ".yml");
+		try
+		{
+			Files.move(file, new File(configFile.getParentFile(), uuid + ".yml"));
+		}
+		catch (IOException ex)
+		{
+			Bukkit.getLogger().log(Level.WARNING, "Failed to migrate user: " + username, ex);
+		}
+
+		setProperty("lastAccountName", username);
+	}
+
+	private File getAltFile()
+	{
+		final UUID fn = UUID.nameUUIDFromBytes(("OfflinePlayer:" + username.toLowerCase(Locale.ENGLISH)).getBytes(Charsets.UTF_8));
+		return new File(configFile.getParentFile(), fn.toString() + ".yml");
+	}
+
+	@Override
+	public boolean altFileExists()
+	{
+		if (username.equals(username.toLowerCase()))
+		{
+			return false;
+		}
+		return getAltFile().exists();
+	}
+
+	@Override
+	public void convertAltFile()
+	{
+		try
+		{
+			Files.move(getAltFile(), new File(configFile.getParentFile(), uuid + ".yml"));
+		}
+		catch (IOException ex)
+		{
+			Bukkit.getLogger().log(Level.WARNING, "Failed to migrate user: " + username, ex);
+		}
+	}
+}

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

@@ -1,4 +1,4 @@
-package net.ess3.utils;
+package com.earth2me.essentials;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -9,8 +9,9 @@ import java.util.Locale;
 
 public class ExecuteTimer
 {
-	private final List<ExecuteRecord> times;
-	private final DecimalFormat decimalFormat = new DecimalFormat("#0.000", DecimalFormatSymbols.getInstance(Locale.US));
+	private final transient List<ExecuteRecord> times;
+	private final transient DecimalFormat decimalFormat = new DecimalFormat("#0.000", DecimalFormatSymbols.getInstance(Locale.US));
+
 
 	public ExecuteTimer()
 	{
@@ -48,7 +49,7 @@ public class ExecuteTimer
 			time2 = (Long)pair.getTime();
 			if (time1 > 0)
 			{
-				duration = (time2 - time1) / 1000000.0;
+				duration = (time2 - time1)/1000000.0;
 				output.append(mark).append(": ").append(decimalFormat.format(duration)).append("ms - ");
 			}
 			else
@@ -57,14 +58,14 @@ public class ExecuteTimer
 			}
 			time1 = time2;
 		}
-		duration = (time1 - time0) / 1000000.0;
+		duration = (time1 - time0)/1000000.0;
 		output.append("Total: ").append(decimalFormat.format(duration)).append("ms");
 		times.clear();
 		return output.toString();
 	}
 
 
-	static private class ExecuteRecord
+	private static class ExecuteRecord
 	{
 		private final String mark;
 		private final long time;
@@ -85,4 +86,4 @@ public class ExecuteTimer
 			return time;
 		}
 	}
-}
+}

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

@@ -1,4 +1,4 @@
-package net.ess3;
+package com.earth2me.essentials;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -9,27 +9,30 @@ import java.net.URL;
 import java.text.MessageFormat;
 import java.util.*;
 import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import net.ess3.api.IEssentials;
-import net.ess3.api.II18n;
 
 
-public class I18n implements II18n
+public class I18n implements net.ess3.api.II18n
 {
 	private static I18n instance;
 	private static final String MESSAGES = "messages";
-	private final Locale defaultLocale = Locale.getDefault();
-	private Locale currentLocale = defaultLocale;
-	private ResourceBundle customBundle;
-	private ResourceBundle localeBundle;
-	private final Map<String, MessageFormat> messageFormatCache = new HashMap<String, MessageFormat>();
-	private final IEssentials ess;
+	private final transient Locale defaultLocale = Locale.getDefault();
+	private transient Locale currentLocale = defaultLocale;
+	private transient ResourceBundle customBundle;
+	private transient ResourceBundle localeBundle;
+	private final transient ResourceBundle defaultBundle;
+	private final transient Map<String, MessageFormat> messageFormatCache = new HashMap<String, MessageFormat>();
+	private final transient IEssentials ess;
+	private static final Pattern NODOUBLEMARK = Pattern.compile("''");
 
 	public I18n(final IEssentials ess)
 	{
 		this.ess = ess;
 		customBundle = ResourceBundle.getBundle(MESSAGES, defaultLocale, new FileResClassLoader(I18n.class.getClassLoader(), ess));
 		localeBundle = ResourceBundle.getBundle(MESSAGES, defaultLocale);
+		defaultBundle = ResourceBundle.getBundle(MESSAGES, Locale.ENGLISH);
 	}
 
 	public void onEnable()
@@ -48,7 +51,7 @@ public class I18n implements II18n
 		return currentLocale;
 	}
 
-	public String translate(final String string)
+	private String translate(final String string)
 	{
 		try
 		{
@@ -63,20 +66,12 @@ public class I18n implements II18n
 		}
 		catch (MissingResourceException ex)
 		{
-			return string;
+			Logger.getLogger("Essentials").log(Level.WARNING, String.format("Missing translation key \"%s\" in translation file %s", ex.getKey(), localeBundle.getLocale().toString()), ex);
+			return defaultBundle.getString(string);
 		}
 	}
 
-	public static String _(final String string)
-	{
-		if (instance == null)
-		{
-			return "";
-		}
-		return instance.translate(string);
-	}
-
-	public static String _(final String string, final Object... objects)
+	public static String tl(final String string, final Object... objects)
 	{
 		if (instance == null)
 		{
@@ -84,7 +79,7 @@ public class I18n implements II18n
 		}
 		if (objects.length == 0)
 		{
-			return instance.translate(string);
+			return NODOUBLEMARK.matcher(instance.translate(string)).replaceAll("'");
 		}
 		else
 		{
@@ -94,16 +89,24 @@ public class I18n implements II18n
 
 	public String format(final String string, final Object... objects)
 	{
-		final String format = translate(string);
+		String format = translate(string);
 		MessageFormat messageFormat = messageFormatCache.get(format);
 		if (messageFormat == null)
 		{
-			messageFormat = new MessageFormat(format.replace("'", "''"));
+			try
+			{
+				messageFormat = new MessageFormat(format);
+			}
+			catch (IllegalArgumentException e)
+			{
+				ess.getLogger().log(Level.SEVERE, "Invalid Translation key for '" + string + "': " + e.getMessage());
+				format = format.replaceAll("\\{(\\D*?)\\}", "\\[$1\\]");
+				messageFormat = new MessageFormat(format);
+			}
 			messageFormatCache.put(format, messageFormat);
 		}
 		return messageFormat.format(objects);
 	}
-	private final Pattern partSplit = Pattern.compile("[_\\.]");
 
 	public void updateLocale(final String loc)
 	{
@@ -111,7 +114,7 @@ public class I18n implements II18n
 		{
 			return;
 		}
-		final String[] parts = partSplit.split(loc);
+		final String[] parts = loc.split("[_\\.]");
 		if (parts.length == 1)
 		{
 			currentLocale = new Locale(parts[0]);
@@ -125,25 +128,28 @@ public class I18n implements II18n
 			currentLocale = new Locale(parts[0], parts[1], parts[2]);
 		}
 		ResourceBundle.clearCache();
-		ess.getLogger().log(Level.INFO, String.format("Using locale %s", currentLocale.toString()));
+		Logger.getLogger("Essentials").log(Level.INFO, String.format("Using locale %s", currentLocale.toString()));
 		customBundle = ResourceBundle.getBundle(MESSAGES, currentLocale, new FileResClassLoader(I18n.class.getClassLoader(), ess));
 		localeBundle = ResourceBundle.getBundle(MESSAGES, currentLocale);
 	}
 
 	public static String capitalCase(final String input)
 	{
-		return input == null || input.length() == 0 ? input : input.toUpperCase(Locale.ENGLISH).charAt(0) + input.toLowerCase(Locale.ENGLISH).substring(1);
+		return input == null || input.length() == 0
+			   ? input
+			   : input.toUpperCase(Locale.ENGLISH).charAt(0)
+				 + input.toLowerCase(Locale.ENGLISH).substring(1);
 	}
 
 
 	private static class FileResClassLoader extends ClassLoader
 	{
-		private final File dataFolder;
+		private final transient File dataFolder;
 
-		public FileResClassLoader(final ClassLoader classLoader, final IEssentials ess)
+		FileResClassLoader(final ClassLoader classLoader, final IEssentials ess)
 		{
 			super(classLoader);
-			this.dataFolder = ess.getPlugin().getDataFolder();
+			this.dataFolder = ess.getDataFolder();
 		}
 
 		@Override

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

@@ -0,0 +1,6 @@
+package com.earth2me.essentials;
+
+public interface IConf
+{
+	public void reloadConfig();
+}

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

@@ -0,0 +1,92 @@
+package com.earth2me.essentials;
+
+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.List;
+import java.util.UUID;
+import org.bukkit.World;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.scheduler.BukkitTask;
+
+
+public interface IEssentials extends Plugin
+{
+	void addReloadListener(IConf listener);
+
+	void reload();
+
+	boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentialsModule module);
+
+	@Deprecated
+	User getUser(Object base);
+	
+	User getUser(UUID base);
+	
+	User getUser(String base);
+	
+	User getUser(Player base);
+
+	I18n getI18n();
+
+	User getOfflineUser(String name);
+
+	World getWorld(String name);
+
+	int broadcastMessage(String message);
+
+	int broadcastMessage(IUser sender, String message);
+
+	int broadcastMessage(String permission, String message);
+
+	ISettings getSettings();
+
+	BukkitScheduler getScheduler();
+
+	IJails getJails();
+
+	IWarps getWarps();
+
+	Worth getWorth();
+
+	Backup getBackup();
+
+	Methods getPaymentMethod();
+
+	BukkitTask runTaskAsynchronously(Runnable run);
+
+	BukkitTask runTaskLaterAsynchronously(Runnable run, long delay);
+
+	int scheduleSyncDelayedTask(Runnable run);
+
+	int scheduleSyncDelayedTask(Runnable run, long delay);
+
+	int scheduleSyncRepeatingTask(final Runnable run, long delay, long period);
+
+	TNTExplodeListener getTNTListener();
+
+	PermissionsHandler getPermissionsHandler();
+
+	AlternativeCommandsHandler getAlternativeCommandsHandler();
+
+	void showError(final CommandSource sender, final Throwable exception, final String commandLabel);
+
+	IItemDb getItemDb();
+
+	UserMap getUserMap();
+
+	Metrics getMetrics();
+
+	void setMetrics(Metrics metrics);
+
+	EssentialsTimer getTimer();
+
+	List<String> getVanishedPlayers();
+}

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

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

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

@@ -0,0 +1,16 @@
+package com.earth2me.essentials;
+
+public interface IReplyTo
+{
+	/**
+	 * Sets the user to reply to
+	 * @param user
+	 */
+	public void setReplyTo(CommandSource user);
+
+	/**
+	 * Gets the user the sender should reply to
+	 * @return
+	 */
+	public CommandSource getReplyTo();
+}

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

@@ -1,5 +1,9 @@
 package com.earth2me.essentials;
 
+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;
 import java.util.Set;
@@ -8,11 +12,11 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.event.EventPriority;
 
 
-public interface ISettings
+public interface ISettings extends IConf
 {
 	boolean areSignsDisabled();
 
-	String getAnnounceNewPlayerFormat();
+	IText getAnnounceNewPlayerFormat();
 
 	boolean getAnnounceNewPlayers();
 
@@ -22,10 +26,17 @@ public interface ISettings
 
 	long getBackupInterval();
 
-	//MessageFormat getChatFormat(String group);
-	int getChatRadius();
+	String getChatFormat(String group);
 
-	double getCommandCost(String label);
+	int getChatRadius();
+	
+	char getChatShout();
+	
+	char getChatQuestion();
+
+	BigDecimal getCommandCost(IEssentialsCommand cmd);
+
+	BigDecimal getCommandCost(String label);
 
 	String getCurrencySymbol();
 
@@ -35,6 +46,8 @@ public interface ISettings
 
 	double getHealCooldown();
 
+	Set<String> getSocialSpyCommands();
+
 	Map<String, Object> getKit(String name);
 
 	ConfigurationSection getKits();
@@ -65,11 +78,13 @@ public interface ISettings
 
 	int getHomeLimit(String set);
 
-	boolean getSortListByGroups();
+	int getHomeLimit(User user);
 
 	int getSpawnMobLimit();
 
-	int getStartingBalance();
+	BigDecimal getStartingBalance();
+
+	boolean isTeleportSafetyEnabled();
 
 	double getTeleportCooldown();
 
@@ -77,6 +92,8 @@ public interface ISettings
 
 	boolean hidePermissionlessHelp();
 
+	boolean isCommandDisabled(final IEssentialsCommand cmd);
+
 	boolean isCommandDisabled(String label);
 
 	boolean isCommandOverridden(String name);
@@ -89,7 +106,7 @@ public interface ISettings
 
 	List<Integer> itemSpawnBlacklist();
 
-	List<String> enabledSigns();
+	List<EssentialsSign> enabledSigns();
 
 	boolean permissionBasedItemSpawn();
 
@@ -99,9 +116,9 @@ public interface ISettings
 
 	boolean warnOnSmite();
 
-	double getMaxMoney();
+	BigDecimal getMaxMoney();
 
-	double getMinMoney();
+	BigDecimal getMinMoney();
 
 	boolean isEcoLogEnabled();
 
@@ -131,14 +148,18 @@ public interface ISettings
 
 	boolean cancelAfkOnMove();
 
+	boolean cancelAfkOnInteract();
+
 	boolean areDeathMessagesEnabled();
 
-	public void setDebug(boolean debug);
+	void setDebug(boolean debug);
 
 	Set<String> getNoGodWorlds();
 
 	boolean getUpdateBedAtDaytime();
 
+	boolean allowUnsafeEnchantments();
+
 	boolean getRepairEnchanted();
 
 	boolean isWorldTeleportPermissions();
@@ -169,7 +190,27 @@ public interface ISettings
 
 	double getMaxWalkSpeed();
 
-	public int getMailsPerMinute();
+	int getMailsPerMinute();
 
-	public void setEssentialsChatActive(boolean b);
+	long getEconomyLagWarning();
+
+	void setEssentialsChatActive(boolean b);
+
+	long getMaxTempban();
+
+	Map<String, Object> getListGroupConfig();
+
+	int getMaxNickLength();
+
+	int getMaxUserCacheCount();
+
+	boolean allowSilentJoinQuit();
+
+	boolean isCustomJoinMessage();
+
+	String getCustomJoinMessage();
+
+	boolean isCustomQuitMessage();
+
+	String getCustomQuitMessage();
 }

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

@@ -0,0 +1,9 @@
+package com.earth2me.essentials;
+
+import org.bukkit.Location;
+
+
+public interface ITarget
+{
+	public Location getLocation();
+}

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

@@ -0,0 +1,144 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import net.ess3.api.ITeleport;
+import net.ess3.api.MaxMoneyException;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+
+public interface IUser
+{
+	boolean isAuthorized(String node);
+
+	boolean isAuthorized(IEssentialsCommand cmd);
+
+	boolean isAuthorized(IEssentialsCommand cmd, String permissionPrefix);
+
+	void healCooldown() throws Exception;
+
+	void giveMoney(BigDecimal value) throws MaxMoneyException;
+
+	void giveMoney(final BigDecimal value, final CommandSource initiator) throws MaxMoneyException;
+	
+	void payUser(final User reciever, final BigDecimal value) throws Exception;
+
+	void takeMoney(BigDecimal value);
+
+	void takeMoney(final BigDecimal value, final CommandSource initiator);
+
+	boolean canAfford(BigDecimal value);
+
+	Boolean canSpawnItem(final int itemId);
+
+	void setLastLocation();
+
+	void setLogoutLocation();
+
+	void requestTeleport(final User player, final boolean here);
+
+	ITeleport getTeleport();
+
+	BigDecimal getMoney();
+
+	void setMoney(final BigDecimal value) throws MaxMoneyException;
+
+	void setAfk(final boolean set);
+
+	/**
+	 * 'Hidden' Represents when a player is hidden from others. This status includes when the player is hidden via other
+	 * supported plugins. Use isVanished() if you want to check if a user is vanished by Essentials.
+	 *
+	 * @return If the user is hidden or not
+	 * @see isVanished
+	 */
+	boolean isHidden();
+
+	void setHidden(boolean vanish);
+
+	boolean isGodModeEnabled();
+
+	String getGroup();
+
+	boolean inGroup(final String group);
+
+	boolean canBuild();
+
+	long getTeleportRequestTime();
+
+	void enableInvulnerabilityAfterTeleport();
+
+	void resetInvulnerabilityAfterTeleport();
+
+	boolean hasInvulnerabilityAfterTeleport();
+
+	/**
+	 * 'Vanished' Represents when a player is hidden from others by Essentials. This status does NOT include when the
+	 * player is hidden via other plugins. Use isHidden() if you want to check if a user is vanished by any supported
+	 * plugin.
+	 *
+	 * @return If the user is vanished or not
+	 * @see isHidden
+	 */
+	boolean isVanished();
+
+	void setVanished(boolean vanish);
+
+	boolean isIgnoreExempt();
+
+	public void sendMessage(String message);
+
+	/*
+	 * UserData
+	 */
+	Location getHome(String name) throws Exception;
+
+	Location getHome(Location loc) throws Exception;
+
+	List<String> getHomes();
+
+	void setHome(String name, Location loc);
+
+	void delHome(String name) throws Exception;
+
+	boolean hasHome();
+
+	Location getLastLocation();
+
+	Location getLogoutLocation();
+
+	long getLastTeleportTimestamp();
+
+	void setLastTeleportTimestamp(long time);
+
+	String getJail();
+
+	void setJail(String jail);
+
+	List<String> getMails();
+
+	void addMail(String mail);
+
+	boolean isAfk();
+
+	void setConfigProperty(String node, Object object);
+
+	Set<String> getConfigKeys();
+
+	Map<String, Object> getConfigMap();
+
+	Map<String, Object> getConfigMap(String node);
+
+	/*
+	 *  PlayerExtension
+	 */
+	Player getBase();
+
+	CommandSource getSource();
+
+	public String getName();
+}

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

@@ -0,0 +1,313 @@
+package com.earth2me.essentials;
+
+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;
+import net.ess3.api.IEssentials;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+
+public class ItemDb implements IConf, net.ess3.api.IItemDb
+{
+	private final transient IEssentials ess;
+	private final transient Map<String, Integer> items = new HashMap<String, Integer>();
+	private final transient Map<ItemData, List<String>> names = new HashMap<ItemData, List<String>>();
+	private final transient Map<ItemData, String> primaryName = new HashMap<ItemData, String>();
+	private final transient Map<String, Short> durabilities = new HashMap<String, Short>();
+	private final transient ManagedFile file;
+	private final transient Pattern splitPattern = Pattern.compile("((.*)[:+',;.](\\d+))");
+
+	public ItemDb(final IEssentials ess)
+	{
+		this.ess = ess;
+		file = new ManagedFile("items.csv", ess);
+	}
+
+	@Override
+	public void reloadConfig()
+	{
+		final List<String> lines = file.getLines();
+
+		if (lines.isEmpty())
+		{
+			return;
+		}
+
+		durabilities.clear();
+		items.clear();
+		names.clear();
+		primaryName.clear();
+
+		for (String line : lines)
+		{
+			line = line.trim().toLowerCase(Locale.ENGLISH);
+			if (line.length() > 0 && line.charAt(0) == '#')
+			{
+				continue;
+			}
+
+			final String[] parts = line.split("[^a-z0-9]");
+			if (parts.length < 2)
+			{
+				continue;
+			}
+
+			final int numeric = Integer.parseInt(parts[1]);
+			final short data = parts.length > 2 && !parts[2].equals("0") ? Short.parseShort(parts[2]) : 0;
+			String itemName = parts[0].toLowerCase(Locale.ENGLISH);
+
+			durabilities.put(itemName, data);
+			items.put(itemName, numeric);
+
+			ItemData itemData = new ItemData(numeric, data);
+			if (names.containsKey(itemData))
+			{
+				List<String> nameList = names.get(itemData);
+				nameList.add(itemName);
+				Collections.sort(nameList, new LengthCompare());
+			}
+			else
+			{
+				List<String> nameList = new ArrayList<String>();
+				nameList.add(itemName);
+				names.put(itemData, nameList);
+				primaryName.put(itemData, itemName);
+			}
+		}
+	}
+
+	@Override
+	public ItemStack get(final String id, final int quantity) throws Exception
+	{
+		final ItemStack retval = get(id.toLowerCase(Locale.ENGLISH));
+		retval.setAmount(quantity);
+		return retval;
+	}
+
+	@Override
+	public ItemStack get(final String id) throws Exception
+	{
+		int itemid = 0;
+		String itemname = null;
+		short metaData = 0;
+		Matcher parts = splitPattern.matcher(id);
+		if (parts.matches())
+		{
+			itemname = parts.group(2);
+			metaData = Short.parseShort(parts.group(3));
+		}
+		else
+		{
+			itemname = id;
+		}
+
+		if (NumberUtil.isInt(itemname))
+		{
+			itemid = Integer.parseInt(itemname);
+		}
+		else if (NumberUtil.isInt(id))
+		{
+			itemid = Integer.parseInt(id);
+		}
+		else
+		{
+			itemname = itemname.toLowerCase(Locale.ENGLISH);
+		}
+
+		if (itemid < 1)
+		{
+			if (items.containsKey(itemname))
+			{
+				itemid = items.get(itemname);
+				if (durabilities.containsKey(itemname) && metaData == 0)
+				{
+					metaData = durabilities.get(itemname);
+				}
+			}
+			else if (Material.getMaterial(itemname.toUpperCase(Locale.ENGLISH)) != null)
+			{
+				Material bMaterial = Material.getMaterial(itemname.toUpperCase(Locale.ENGLISH));
+				itemid = bMaterial.getId();
+			}
+			else
+			{
+				try
+				{
+					Material bMaterial = Bukkit.getUnsafe().getMaterialFromInternalName(itemname.toLowerCase(Locale.ENGLISH));
+					itemid = bMaterial.getId();
+				}
+				catch (Throwable throwable)
+				{
+					throw new Exception(tl("unknownItemName", itemname), throwable);
+				}
+			}
+		}
+
+		if (itemid < 1)
+		{
+			throw new Exception(tl("unknownItemName", itemname));
+		}
+
+		final Material mat = Material.getMaterial(itemid);
+		if (mat == null)
+		{
+			throw new Exception(tl("unknownItemId", itemid));
+		}
+		final ItemStack retval = new ItemStack(mat);
+		retval.setAmount(mat.getMaxStackSize());
+		retval.setDurability(metaData);
+		return retval;
+	}
+
+	@Override
+	public List<ItemStack> getMatching(User user, String[] args) throws Exception
+	{
+		List<ItemStack> is = new ArrayList<ItemStack>();
+
+		if (args.length < 1)
+		{
+			is.add(user.getBase().getItemInHand());
+		}
+		else if (args[0].equalsIgnoreCase("hand"))
+		{
+			is.add(user.getBase().getItemInHand());
+		}
+		else if (args[0].equalsIgnoreCase("inventory") || args[0].equalsIgnoreCase("invent") || args[0].equalsIgnoreCase("all"))
+		{
+			for (ItemStack stack : user.getBase().getInventory().getContents())
+			{
+				if (stack == null || stack.getType() == Material.AIR)
+				{
+					continue;
+				}
+				is.add(stack);
+			}
+		}
+		else if (args[0].equalsIgnoreCase("blocks"))
+		{
+			for (ItemStack stack : user.getBase().getInventory().getContents())
+			{
+				if (stack == null || stack.getTypeId() > 255 || stack.getType() == Material.AIR)
+				{
+					continue;
+				}
+				is.add(stack);
+			}
+		}
+		else
+		{
+			is.add(get(args[0]));
+		}
+
+		if (is.isEmpty() || is.get(0).getType() == Material.AIR)
+		{
+			throw new Exception(tl("itemSellAir"));
+		}
+
+		return is;
+	}
+
+	@Override
+	public String names(ItemStack item)
+	{
+		ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
+		List<String> nameList = names.get(itemData);
+		if (nameList == null)
+		{
+			itemData = new ItemData(item.getTypeId(), (short)0);
+			nameList = names.get(itemData);
+			if (nameList == null)
+			{
+				return null;
+			}
+		}
+
+		if (nameList.size() > 15)
+		{
+			nameList = nameList.subList(0, 14);
+		}
+		return StringUtil.joinList(", ", nameList);
+	}
+
+	@Override
+	public String name(ItemStack item)
+	{
+		ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
+		String name = primaryName.get(itemData);
+		if (name == null)
+		{
+			itemData = new ItemData(item.getTypeId(), (short)0);
+			name = primaryName.get(itemData);
+			if (name == null)
+			{
+				return null;
+			}
+		}
+		return name;
+	}
+
+
+	static class ItemData
+	{
+		final private int itemNo;
+		final private short itemData;
+
+		ItemData(final int itemNo, final short itemData)
+		{
+			this.itemNo = itemNo;
+			this.itemData = itemData;
+		}
+
+		public int getItemNo()
+		{
+			return itemNo;
+		}
+
+		public short getItemData()
+		{
+			return itemData;
+		}
+
+		@Override
+		public int hashCode()
+		{
+			return (31 * itemNo) ^ itemData;
+		}
+
+		@Override
+		public boolean equals(Object o)
+		{
+			if (o == null)
+			{
+				return false;
+			}
+			if (!(o instanceof ItemData))
+			{
+				return false;
+			}
+			ItemData pairo = (ItemData)o;
+			return this.itemNo == pairo.getItemNo()
+				   && this.itemData == pairo.getItemData();
+		}
+	}
+
+
+	class LengthCompare implements java.util.Comparator<String>
+	{
+		public LengthCompare()
+		{
+			super();
+		}
+
+		@Override
+		public int compare(String s1, String s2)
+		{
+			return s1.length() - s2.length();
+		}
+	}
+}

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

@@ -0,0 +1,340 @@
+package com.earth2me.essentials;
+
+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;
+import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import org.bukkit.plugin.PluginManager;
+
+
+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, com.earth2me.essentials.settings.Jails.class);
+		reloadConfig();
+	}
+
+	private void registerListeners()
+	{
+		enabled = true;
+		final PluginManager pluginManager = ess.getServer().getPluginManager();
+		final JailListener blockListener = new JailListener();
+		pluginManager.registerEvents(blockListener, ess);
+		if (ess.getSettings().isDebug())
+		{
+			LOGGER.log(Level.INFO, "Registering Jail listener");
+		}
+	}
+
+	@Override
+	public File getStorageFile()
+	{
+		return new File(ess.getDataFolder(), "jail.yml");
+	}
+
+	@Override
+	public void finishRead()
+	{
+		checkRegister();
+	}
+
+	@Override
+	public void finishWrite()
+	{
+		checkRegister();
+	}
+
+	public void resetListener()
+	{
+		enabled = false;
+		checkRegister();
+	}
+
+	private void checkRegister()
+	{
+		if (enabled == false && getCount() > 0)
+		{
+			registerListeners();
+		}
+	}
+
+	@Override
+	public Location getJail(final String jailName) throws Exception
+	{
+		acquireReadLock();
+		try
+		{
+			if (getData().getJails() == null || jailName == null
+				|| !getData().getJails().containsKey(jailName.toLowerCase(Locale.ENGLISH)))
+			{
+				throw new Exception(tl("jailNotExist"));
+			}
+			Location loc = getData().getJails().get(jailName.toLowerCase(Locale.ENGLISH));
+			if (loc == null || loc.getWorld() == null)
+			{
+				throw new Exception(tl("jailNotExist"));
+			}
+			return loc;
+		}
+		finally
+		{
+			unlock();
+		}
+	}
+
+	@Override
+	public Collection<String> getList() throws Exception
+	{
+		acquireReadLock();
+		try
+		{
+			if (getData().getJails() == null)
+			{
+				return Collections.emptyList();
+			}
+			return new ArrayList<String>(getData().getJails().keySet());
+		}
+		finally
+		{
+			unlock();
+		}
+	}
+
+	@Override
+	public void removeJail(final String jail) throws Exception
+	{
+		acquireWriteLock();
+		try
+		{
+			if (getData().getJails() == null)
+			{
+				return;
+			}
+			getData().getJails().remove(jail.toLowerCase(Locale.ENGLISH));
+		}
+		finally
+		{
+			unlock();
+		}
+	}
+
+	@Override
+	public void sendToJail(final IUser user, final String jail) throws Exception
+	{
+		acquireReadLock();
+		try
+		{
+			if (user.getBase().isOnline())
+			{
+				Location loc = getJail(jail);
+				user.getTeleport().now(loc, false, TeleportCause.COMMAND);
+			}
+			user.setJail(jail);
+		}
+		finally
+		{
+			unlock();
+		}
+	}
+
+	@Override
+	public void setJail(final String jailName, final Location loc) throws Exception
+	{
+		acquireWriteLock();
+		try
+		{
+			if (getData().getJails() == null)
+			{
+				getData().setJails(new HashMap<String, Location>());
+			}
+			getData().getJails().put(jailName.toLowerCase(Locale.ENGLISH), loc);
+		}
+		finally
+		{
+			unlock();
+		}
+	}
+
+	@Override
+	public int getCount()
+	{
+		try
+		{
+			return getList().size();
+		}
+		catch (Exception ex)
+		{
+			return 0;
+		}
+	}
+
+
+	private class JailListener implements Listener
+	{
+		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+		public void onBlockBreak(final BlockBreakEvent event)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			if (user.isJailed())
+			{
+				event.setCancelled(true);
+			}
+		}
+
+		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+		public void onBlockPlace(final BlockPlaceEvent event)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			if (user.isJailed())
+			{
+				event.setCancelled(true);
+			}
+		}
+
+		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+		public void onBlockDamage(final BlockDamageEvent event)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			if (user.isJailed())
+			{
+				event.setCancelled(true);
+			}
+		}
+
+		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+		public void onEntityDamageByEntity(final EntityDamageByEntityEvent event)
+		{
+			if (event.getCause() != DamageCause.ENTITY_ATTACK || event.getEntity().getType() != EntityType.PLAYER)
+			{
+				return;
+			}
+			final Entity damager = event.getDamager();
+			if (damager.getType() == EntityType.PLAYER)
+			{
+				final User user = ess.getUser((Player)damager);
+				if (user != null && user.isJailed())
+				{
+					event.setCancelled(true);
+				}
+			}
+		}
+
+		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+		public void onPlayerInteract(final PlayerInteractEvent event)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			if (user.isJailed())
+			{
+				event.setCancelled(true);
+			}
+		}
+
+		@EventHandler(priority = EventPriority.HIGHEST)
+		public void onPlayerRespawn(final PlayerRespawnEvent event)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
+			{
+				return;
+			}
+
+			try
+			{
+				event.setRespawnLocation(getJail(user.getJail()));
+			}
+			catch (Exception ex)
+			{
+				if (ess.getSettings().isDebug())
+				{
+					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
+				}
+				else
+				{
+					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
+				}
+			}
+		}
+
+		@EventHandler(priority = EventPriority.HIGH)
+		public void onPlayerTeleport(final PlayerTeleportEvent event)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
+			{
+				return;
+			}
+
+			try
+			{
+				event.setTo(getJail(user.getJail()));
+			}
+			catch (Exception ex)
+			{
+				if (ess.getSettings().isDebug())
+				{
+					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
+				}
+				else
+				{
+					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
+				}
+			}
+			user.sendMessage(tl("jailMessage"));
+		}
+
+		@EventHandler(priority = EventPriority.HIGHEST)
+		public void onPlayerJoin(final PlayerJoinEvent event)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			final long currentTime = System.currentTimeMillis();
+			user.checkJailTimeout(currentTime);
+			if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
+			{
+				return;
+			}
+
+			try
+			{
+				sendToJail(user, user.getJail());
+			}
+			catch (Exception ex)
+			{
+				if (ess.getSettings().isDebug())
+				{
+					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
+				}
+				else
+				{
+					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
+				}
+			}
+			user.sendMessage(tl("jailMessage"));
+		}
+	}
+}

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

@@ -0,0 +1,239 @@
+package com.earth2me.essentials;
+
+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;
+import net.ess3.api.IEssentials;
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.inventory.ItemStack;
+
+
+public class Kit
+{
+	//TODO: Convert this to use one of the new text classes?
+	public static String listKits(final IEssentials ess, final User user) throws Exception
+	{
+		try
+		{
+			final ConfigurationSection kits = ess.getSettings().getKits();
+			final StringBuilder list = new StringBuilder();
+			for (String kitItem : kits.getKeys(false))
+			{
+				if (user == null)
+				{
+					list.append(" ").append(capitalCase(kitItem));
+				}
+				else if (user.isAuthorized("essentials.kits." + kitItem.toLowerCase(Locale.ENGLISH)))
+				{
+					String cost = "";
+					String name = capitalCase(kitItem);
+					BigDecimal costPrice = new Trade("kit-" + kitItem.toLowerCase(Locale.ENGLISH), ess).getCommandCost(user);
+					if (costPrice.signum() > 0)
+					{
+						cost = tl("kitCost", NumberUtil.displayCurrency(costPrice, ess));
+					}
+					final Map<String, Object> kit = ess.getSettings().getKit(kitItem);
+
+					if (Kit.getNextUse(user, kitItem, kit) != 0)
+					{
+						name = tl("kitDelay", name);
+					}
+
+					list.append(" ").append(name).append(cost);
+				}
+			}
+			return list.toString().trim();
+		}
+		catch (Exception ex)
+		{
+			throw new Exception(tl("kitError"), ex);
+		}
+
+	}
+
+	public static void checkTime(final User user, final String kitName, final Map<String, Object> els) throws Exception
+	{
+		final Calendar time = new GregorianCalendar();
+		long nextUse = getNextUse(user, kitName, els);
+
+		if (nextUse == 0L)
+		{
+			user.setKitTimestamp(kitName, time.getTimeInMillis());
+		}
+		else if (nextUse < 0L)
+		{
+			user.sendMessage(tl("kitOnce"));
+			throw new NoChargeException();
+		}
+		else
+		{
+			user.sendMessage(tl("kitTimed", DateUtil.formatDateDiff(nextUse)));
+			throw new NoChargeException();
+		}
+	}
+
+	public static long getNextUse(final User user, final String kitName, final Map<String, Object> els) throws Exception
+	{
+		if (user.isAuthorized("essentials.kit.exemptdelay"))
+		{
+			return 0L;
+		}
+
+		final Calendar time = new GregorianCalendar();
+
+		double delay = 0;
+		try
+		{
+			// Make sure delay is valid
+			delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0.0d;
+		}
+		catch (Exception e)
+		{
+			throw new Exception(tl("kitError2"));
+		}
+
+		// When was the last kit used?
+		final long lastTime = user.getKitTimestamp(kitName);
+
+		// When can be use the kit again?
+		final Calendar delayTime = new GregorianCalendar();
+		delayTime.setTimeInMillis(lastTime);
+		delayTime.add(Calendar.SECOND, (int)delay);
+		delayTime.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
+
+		if (lastTime == 0L || lastTime > time.getTimeInMillis())
+		{
+			// If we have no record of kit use, or its corrupted, give them benifit of the doubt.
+			return 0L;
+		}
+		else if (delay < 0d)
+		{
+			// If the kit has a negative kit time, it can only be used once.
+			return -1;
+		}
+		else if (delayTime.before(time))
+		{
+			// If the kit was used in the past, but outside the delay time, it can be used.
+			return 0L;
+		}
+		else
+		{
+			// If the kit has been used recently, return the next time it can be used.
+			return delayTime.getTimeInMillis();
+		}
+	}
+
+	public static List<String> getItems(final IEssentials ess, final User user, final String kitName, final Map<String, Object> kit) throws Exception
+	{
+		if (kit == null)
+		{
+			throw new Exception(tl("kitNotFound"));
+		}
+		try
+		{
+			final List<String> itemList = new ArrayList<String>();
+			final Object kitItems = kit.get("items");
+			if (kitItems instanceof List)
+			{
+				for (Object item : (List)kitItems)
+				{
+					if (item instanceof String)
+					{
+						itemList.add(item.toString());
+						continue;
+					}
+					throw new Exception("Invalid kit item: " + item.toString());
+				}
+				return itemList;
+			}
+			throw new Exception("Invalid item list");
+		}
+		catch (Exception e)
+		{
+			ess.getLogger().log(Level.WARNING, "Error parsing kit " + kitName + ": " + e.getMessage());
+			throw new Exception(tl("kitError2"), e);
+		}
+	}
+
+	public static void expandItems(final IEssentials ess, final User user, final List<String> items) throws Exception
+	{
+		try
+		{
+			IText input = new SimpleTextInput(items);
+			IText output = new KeywordReplacer(input, user.getSource(), ess);
+
+			boolean spew = false;
+			final boolean allowUnsafe = ess.getSettings().allowUnsafeEnchantments();
+			for (String kitItem : output.getLines())
+			{
+				if (kitItem.startsWith(ess.getSettings().getCurrencySymbol()))
+				{
+					BigDecimal value = new BigDecimal(kitItem.substring(ess.getSettings().getCurrencySymbol().length()).trim());
+					Trade t = new Trade(value, ess);
+					t.pay(user, OverflowType.DROP);
+					continue;
+				}
+
+				final String[] parts = kitItem.split(" +");
+				final ItemStack parseStack = ess.getItemDb().get(parts[0], parts.length > 1 ? Integer.parseInt(parts[1]) : 1);
+				
+				if (parseStack.getType() == Material.AIR) {
+					continue;
+				}
+				
+				final MetaItemStack metaStack = new MetaItemStack(parseStack);
+
+				if (parts.length > 2)
+				{
+					// We pass a null sender here because kits should not do perm checks
+					metaStack.parseStringMeta(null, allowUnsafe, parts, 2, ess);
+				}
+
+				final Map<Integer, ItemStack> overfilled;
+				final boolean allowOversizedStacks = user.isAuthorized("essentials.oversizedstacks");
+				if (allowOversizedStacks)
+				{
+					overfilled = InventoryWorkaround.addOversizedItems(user.getBase().getInventory(), ess.getSettings().getOversizedStackSize(), metaStack.getItemStack());
+				}
+				else
+				{
+					overfilled = InventoryWorkaround.addItems(user.getBase().getInventory(), metaStack.getItemStack());
+				}
+				for (ItemStack itemStack : overfilled.values())
+				{
+					int spillAmount = itemStack.getAmount();
+					if (!allowOversizedStacks) {
+							itemStack.setAmount(spillAmount < itemStack.getMaxStackSize() ? spillAmount : itemStack.getMaxStackSize());
+					}
+					while (spillAmount > 0) {						
+						user.getWorld().dropItemNaturally(user.getLocation(), itemStack);
+						spillAmount -= itemStack.getAmount();
+					}
+					spew = true;
+				}
+			}
+			user.getBase().updateInventory();
+			if (spew)
+			{
+				user.sendMessage(tl("kitInvFull"));
+			}
+		}
+		catch (Exception e)
+		{
+			user.getBase().updateInventory();
+			ess.getLogger().log(Level.WARNING, e.getMessage());
+			throw new Exception(tl("kitError2"), e);
+		}
+	}
+}

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

@@ -0,0 +1,20 @@
+package com.earth2me.essentials;
+
+import org.bukkit.Location;
+
+
+public class LocationTarget implements ITarget
+{
+	private final Location location;
+
+	LocationTarget(Location location)
+	{
+		this.location = location;
+	}
+
+	@Override
+	public Location getLocation()
+	{
+		return location;
+	}
+}

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

@@ -1,5 +1,6 @@
-package net.ess3.storage;
+package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n.tl;
 import java.io.*;
 import java.math.BigInteger;
 import java.security.DigestInputStream;
@@ -10,34 +11,31 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
-import static net.ess3.I18n._;
 import net.ess3.api.IEssentials;
 import org.bukkit.Bukkit;
 
 
 public class ManagedFile
 {
-	private final static int BUFFERSIZE = 1024 * 8;
-	private final File file;
-	protected final IEssentials ess;
+	private static final int BUFFERSIZE = 1024 * 8;
+	private final transient File file;
 
 	public ManagedFile(final String filename, final IEssentials ess)
 	{
-		this.ess = ess;
-		file = new File(ess.getPlugin().getDataFolder(), filename);
+		file = new File(ess.getDataFolder(), filename);
 
 		if (file.exists())
 		{
 			try
 			{
-				if (checkForVersion(file, ess.getPlugin().getVersion()) && !file.delete())
+				if (checkForVersion(file, ess.getDescription().getVersion()) && !file.delete())
 				{
 					throw new IOException("Could not delete file " + file.toString());
 				}
 			}
 			catch (IOException ex)
 			{
-				ess.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+				Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
 			}
 		}
 
@@ -49,7 +47,7 @@ public class ManagedFile
 			}
 			catch (IOException ex)
 			{
-				ess.getLogger().log(Level.SEVERE, _("Could not load items.csv!"), ex);
+				Bukkit.getLogger().log(Level.SEVERE, tl("itemsCsvNotLoaded"), ex);
 			}
 		}
 	}
@@ -158,8 +156,7 @@ public class ManagedFile
 								}
 								else
 								{
-									Bukkit.getLogger().warning(
-											"File " + file.toString() + " has been modified by user and file version differs, please update the file manually.");
+									Bukkit.getLogger().warning("File " + file.toString() + " has been modified by user and file version differs, please update the file manually.");
 								}
 							}
 							finally
@@ -224,7 +221,7 @@ public class ManagedFile
 		}
 		catch (IOException ex)
 		{
-			ess.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+			Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
 			return Collections.emptyList();
 		}
 	}

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

@@ -1,24 +1,22 @@
-package net.ess3;
+package com.earth2me.essentials;
 
+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;
-import static net.ess3.I18n._;
+
+import com.google.common.base.Joiner;
+import java.util.logging.Level;
 import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
-import net.ess3.bukkit.Enchantments;
-import net.ess3.permissions.Permissions;
-import net.ess3.utils.FormatUtil;
-import net.ess3.utils.Util;
-import net.ess3.utils.textreader.BookInput;
-import net.ess3.utils.textreader.BookPager;
-import net.ess3.utils.textreader.IText;
 import org.bukkit.Color;
 import org.bukkit.DyeColor;
 import org.bukkit.FireworkEffect;
 import org.bukkit.Material;
-import org.bukkit.command.CommandSender;
 import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.*;
 import org.bukkit.potion.PotionEffect;
@@ -27,20 +25,8 @@ import org.bukkit.potion.PotionEffectType;
 
 public class MetaItemStack
 {
-	private final transient Pattern splitPattern = Pattern.compile("[:+',;.]");
-	private final ItemStack stack;
-	private final static Map<String, DyeColor> colorMap = new HashMap<String, DyeColor>();
-	private final static Map<String, FireworkEffect.Type> fireworkShape = new HashMap<String, FireworkEffect.Type>();
-	private FireworkEffect.Builder builder = FireworkEffect.builder();
-	private PotionEffectType pEffectType;
-	private PotionEffect pEffect;
-	private boolean validFirework = false;
-	private boolean validPotionEffect = false;
-	private boolean validPotionDuration = false;
-	private boolean validPotionPower = false;
-	private boolean completePotion = false;
-	private int power = 1;
-	private int duration = 120;
+	private static final Map<String, DyeColor> colorMap = new HashMap<String, DyeColor>();
+	private static final Map<String, FireworkEffect.Type> fireworkShape = new HashMap<String, FireworkEffect.Type>();
 
 	static
 	{
@@ -53,6 +39,18 @@ public class MetaItemStack
 			fireworkShape.put(type.name(), type);
 		}
 	}
+	private final transient Pattern splitPattern = Pattern.compile("[:+',;.]");
+	private ItemStack stack;
+	private FireworkEffect.Builder builder = FireworkEffect.builder();
+	private PotionEffectType pEffectType;
+	private PotionEffect pEffect;
+	private boolean validFirework = false;
+	private boolean validPotionEffect = false;
+	private boolean validPotionDuration = false;
+	private boolean validPotionPower = false;
+	private boolean completePotion = false;
+	private int power = 1;
+	private int duration = 120;
 
 	public MetaItemStack(final ItemStack stack)
 	{
@@ -99,31 +97,84 @@ public class MetaItemStack
 		completePotion = true;
 	}
 
-	public void parseStringMeta(final CommandSender sender, final boolean allowUnsafe, String[] string, int fromArg, final IEssentials ess) throws Exception
+	public boolean canSpawn(final IEssentials ess)
 	{
-
-		for (int i = fromArg; i < string.length; i++)
+		try
 		{
-			addStringMeta(sender, allowUnsafe, string[i], ess);
+			ess.getServer().getUnsafe().modifyItemStack(stack, "{}");
+			return true;
 		}
-		if (validFirework)
+		catch (NullPointerException npe)
 		{
-			if (!hasMetaPermission(sender, "firework", true, true, ess))
+			if (ess.getSettings().isDebug())
 			{
-				throw new Exception(_("§4You do not have permission to apply firework meta."));
+				ess.getLogger().log(Level.INFO, "Itemstack is invalid", npe);
 			}
-			FireworkEffect effect = builder.build();
-			FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta();
-			fmeta.addEffect(effect);
-			if (fmeta.getEffects().size() > 1 && !hasMetaPermission(sender, "firework-multiple", true, true, ess))
+			return false;
+		}
+		catch (NoSuchMethodError nsme)
+		{
+			return true;
+		}
+		catch (Throwable throwable)
+		{
+			if (ess.getSettings().isDebug())
 			{
-				throw new Exception(_("§4You cannot apply more than one charge to this firework."));
+				ess.getLogger().log(Level.INFO, "Itemstack is invalid", throwable);
 			}
-			stack.setItemMeta(fmeta);
+			return false;
 		}
 	}
 
-	private void addStringMeta(final CommandSender sender, final boolean allowUnsafe, final String string, final IEssentials ess) throws Exception
+	public void parseStringMeta(final CommandSource sender, final boolean allowUnsafe, String[] string, int fromArg, final IEssentials ess) throws Exception
+	{
+		if (string[fromArg].startsWith("{"))
+		{
+			try
+			{
+				stack = ess.getServer().getUnsafe().modifyItemStack(stack, Joiner.on(' ').join(Arrays.asList(string).subList(fromArg, string.length)));
+			}
+			catch (NullPointerException npe)
+			{
+				if (ess.getSettings().isDebug())
+				{
+					ess.getLogger().log(Level.INFO, "Itemstack is invalid", npe);
+				}
+			}
+			catch (NoSuchMethodError nsme)
+			{
+				throw new Exception(tl("noMetaJson"), nsme);
+			}
+			catch (Throwable throwable)
+			{
+				throw new Exception(throwable.getMessage(), throwable);
+			}
+		}
+		else
+		{
+			for (int i = fromArg; i < string.length; i++)
+			{
+				addStringMeta(sender, allowUnsafe, string[i], ess);
+			}
+			if (validFirework)
+			{
+				if (!hasMetaPermission(sender, "firework", true, true, ess))
+				{
+					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(tl("multipleCharges"));
+				}
+				stack.setItemMeta(fmeta);
+			}
+		}
+	}
+
+	public void addStringMeta(final CommandSource sender, final boolean allowUnsafe, final String string, final IEssentials ess) throws Exception
 	{
 		final String[] split = splitPattern.split(string, 2);
 		if (split.length < 1)
@@ -160,30 +211,23 @@ public class MetaItemStack
 			}
 			else
 			{
-				throw new Exception(_("§4You can only set the owner of player skulls (397:3)."));
+				throw new Exception(tl("onlyPlayerSkulls"));
 			}
 		}
-		else if (split.length > 1 && split[0].equalsIgnoreCase("book") && stack.getType() == Material.WRITTEN_BOOK && hasMetaPermission(sender, "book", false, true, ess))
+		else if (split.length > 1 && split[0].equalsIgnoreCase("book") && stack.getType() == Material.WRITTEN_BOOK
+				 && (hasMetaPermission(sender, "book", true, true, ess) || hasMetaPermission(sender, "chapter-" + split[1].toLowerCase(Locale.ENGLISH), true, true, ess)))
 		{
 			final BookMeta meta = (BookMeta)stack.getItemMeta();
 			final IText input = new BookInput("book", true, ess);
 			final BookPager pager = new BookPager(input);
 
-			if (hasMetaPermission(sender, "chapter", true, true, ess) || hasMetaPermission(sender, "chapter-" + split[1].toLowerCase(Locale.ENGLISH), true, true, ess))
-			{
-				List<String> pages = pager.getPages(split[1]);
-				meta.setPages(pages);
-				stack.setItemMeta(meta);
-			}
-			else
-			{
-				throw new Exception(_("§4You do not have permission to create dynamic books."));
-			}
-
+			List<String> pages = pager.getPages(split[1]);
+			meta.setPages(pages);
+			stack.setItemMeta(meta);
 		}
 		else if (split.length > 1 && split[0].equalsIgnoreCase("author") && stack.getType() == Material.WRITTEN_BOOK && hasMetaPermission(sender, "author", false, true, ess))
 		{
-			final String author = split[1];
+			final String author = FormatUtil.replaceFormat(split[1]);
 			final BookMeta meta = (BookMeta)stack.getItemMeta();
 			meta.setAuthor(author);
 			stack.setItemMeta(meta);
@@ -197,7 +241,7 @@ public class MetaItemStack
 		}
 		else if (split.length > 1 && split[0].equalsIgnoreCase("power") && stack.getType() == Material.FIREWORK && hasMetaPermission(sender, "firework-power", false, true, ess))
 		{
-			final int power = Util.isInt(split[1]) ? Integer.parseInt(split[1]) : 0;
+			final int power = NumberUtil.isInt(split[1]) ? Integer.parseInt(split[1]) : 0;
 			final FireworkMeta meta = (FireworkMeta)stack.getItemMeta();
 			meta.setPower(power > 3 ? 4 : power);
 			stack.setItemMeta(meta);
@@ -206,7 +250,7 @@ public class MetaItemStack
 		{
 			addFireworkMeta(sender, false, string, ess);
 		}
-		else if (stack.getType() == Material.POTION) //WARNING - Meta for Potions: {0}. will be ignored after this point.
+		else if (stack.getType() == Material.POTION) //WARNING - Meta for potions will be ignored after this point.
 		{
 			addPotionMeta(sender, false, string, ess);
 		}
@@ -219,16 +263,16 @@ public class MetaItemStack
 			final String[] color = split[1].split("(\\||,)");
 			if (color.length == 3)
 			{
-				final int red = Util.isInt(color[0]) ? Integer.parseInt(color[0]) : 0;
-				final int green = Util.isInt(color[1]) ? Integer.parseInt(color[1]) : 0;
-				final int blue = Util.isInt(color[2]) ? Integer.parseInt(color[2]) : 0;
+				final int red = NumberUtil.isInt(color[0]) ? Integer.parseInt(color[0]) : 0;
+				final int green = NumberUtil.isInt(color[1]) ? Integer.parseInt(color[1]) : 0;
+				final int blue = NumberUtil.isInt(color[2]) ? Integer.parseInt(color[2]) : 0;
 				final LeatherArmorMeta meta = (LeatherArmorMeta)stack.getItemMeta();
 				meta.setColor(Color.fromRGB(red, green, blue));
 				stack.setItemMeta(meta);
 			}
 			else
 			{
-				throw new Exception(_("§6Leather Color Syntax: color:<red>,<green>,<blue> eg: color:255,0,0."));
+				throw new Exception(tl("leatherSyntax"));
 			}
 		}
 		else
@@ -237,7 +281,7 @@ public class MetaItemStack
 		}
 	}
 
-	public void addFireworkMeta(final CommandSender sender, final boolean allowShortName, final String string, final IEssentials ess) throws Exception
+	public void addFireworkMeta(final CommandSource sender, final boolean allowShortName, final String string, final IEssentials ess) throws Exception
 	{
 		if (stack.getType() == Material.FIREWORK)
 		{
@@ -254,14 +298,14 @@ public class MetaItemStack
 				{
 					if (!hasMetaPermission(sender, "firework", true, true, ess))
 					{
-						throw new Exception(_("§4You do not have permission to apply firework meta."));
+						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(_("§4You cannot apply more than one charge to this firework."));
+						throw new Exception(tl("multipleCharges"));
 					}
 					stack.setItemMeta(fmeta);
 					builder = FireworkEffect.builder();
@@ -278,14 +322,14 @@ public class MetaItemStack
 					}
 					else
 					{
-						throw new Exception(_("§6The option §4{0} §6is not a valid value for §4{1}§6.", split[1], split[0]));
+						throw new Exception(tl("invalidFireworkFormat", split[1], split[0]));
 					}
 				}
 				builder.withColor(primaryColors);
 			}
 			else if (split[0].equalsIgnoreCase("shape") || split[0].equalsIgnoreCase("type") || (allowShortName && (split[0].equalsIgnoreCase("s") || split[0].equalsIgnoreCase("t"))))
 			{
-				FireworkEffect.Type finalEffect;
+				FireworkEffect.Type finalEffect = null;
 				split[1] = (split[1].equalsIgnoreCase("large") ? "BALL_LARGE" : split[1]);
 				if (fireworkShape.containsKey(split[1].toUpperCase()))
 				{
@@ -293,7 +337,7 @@ public class MetaItemStack
 				}
 				else
 				{
-					throw new Exception(_("§6The option §4{0} §6is not a valid value for §4{1}§6.", split[1], split[0]));
+					throw new Exception(tl("invalidFireworkFormat", split[1], split[0]));
 				}
 				if (finalEffect != null)
 				{
@@ -312,7 +356,7 @@ public class MetaItemStack
 					}
 					else
 					{
-						throw new Exception(_("§6The option §4{0} §6is not a valid value for §4{1}§6.", split[1], split[0]));
+						throw new Exception(tl("invalidFireworkFormat", split[1], split[0]));
 					}
 				}
 				if (!fadeColors.isEmpty())
@@ -335,14 +379,14 @@ public class MetaItemStack
 					}
 					else
 					{
-						throw new Exception(_("§6The option §4{0} §6is not a valid value for §4{1}§6.", split[1], split[0]));
+						throw new Exception(tl("invalidFireworkFormat", split[1], split[0]));
 					}
 				}
 			}
 		}
 	}
 
-	public void addPotionMeta(final CommandSender sender, final boolean allowShortName, final String string, final IEssentials ess) throws Exception
+	public void addPotionMeta(final CommandSource sender, final boolean allowShortName, final String string, final IEssentials ess) throws Exception
 	{
 		if (stack.getType() == Material.POTION)
 		{
@@ -358,23 +402,23 @@ public class MetaItemStack
 				pEffectType = Potions.getByName(split[1]);
 				if (pEffectType != null && pEffectType.getName() != null)
 				{
-					if (hasMetaPermission(sender, "Potions: {0}.." + pEffectType.getName().toLowerCase(Locale.ENGLISH), true, false, ess))
+					if (hasMetaPermission(sender, "potions." + pEffectType.getName().toLowerCase(Locale.ENGLISH), true, false, ess))
 					{
 						validPotionEffect = true;
 					}
 					else
 					{
-						throw new Exception(_("§4You do not have permission to apply potion effect §c{0} §4to this potion.", pEffectType.getName().toLowerCase(Locale.ENGLISH)));
+						throw new Exception(tl("noPotionEffectPerm", pEffectType.getName().toLowerCase(Locale.ENGLISH)));
 					}
 				}
 				else
 				{
-					throw new Exception(_("§4Invalid potion meta: §c{0}§4.", split[1]));
+					throw new Exception(tl("invalidPotionMeta", split[1]));
 				}
 			}
 			else if (split[0].equalsIgnoreCase("power") || (allowShortName && split[0].equalsIgnoreCase("p")))
 			{
-				if (Util.isInt(split[1]))
+				if (NumberUtil.isInt(split[1]))
 				{
 					validPotionPower = true;
 					power = Integer.parseInt(split[1]);
@@ -385,19 +429,19 @@ public class MetaItemStack
 				}
 				else
 				{
-					throw new Exception(_("§4Invalid potion meta: §c{0}§4.", split[1]));
+					throw new Exception(tl("invalidPotionMeta", split[1]));
 				}
 			}
 			else if (split[0].equalsIgnoreCase("duration") || (allowShortName && split[0].equalsIgnoreCase("d")))
 			{
-				if (Util.isInt(split[1]))
+				if (NumberUtil.isInt(split[1]))
 				{
 					validPotionDuration = true;
 					duration = Integer.parseInt(split[1]) * 20; //Duration is in ticks by default, converted to seconds
 				}
 				else
 				{
-					throw new Exception(_("§4Invalid potion meta: §c{0}§4.", split[1]));
+					throw new Exception(tl("invalidPotionMeta", split[1]));
 				}
 			}
 
@@ -405,9 +449,9 @@ public class MetaItemStack
 			{
 				PotionMeta pmeta = (PotionMeta)stack.getItemMeta();
 				pEffect = pEffectType.createEffect(duration, power);
-				if (pmeta.getCustomEffects().size() > 1 && !hasMetaPermission(sender, "Potions: {0}..multiple", true, false, ess))
+				if (pmeta.getCustomEffects().size() > 1 && !hasMetaPermission(sender, "potions.multiple", true, false, ess))
 				{
-					throw new Exception(_("§4You cannot apply more than one effect to this potion."));
+					throw new Exception(tl("multiplePotionEffects"));
 				}
 				pmeta.addCustomEffect(pEffect, true);
 				stack.setItemMeta(pmeta);
@@ -416,7 +460,7 @@ public class MetaItemStack
 		}
 	}
 
-	private void parseEnchantmentStrings(final CommandSender sender, final boolean allowUnsafe, final String[] split, final IEssentials ess) throws Exception
+	private void parseEnchantmentStrings(final CommandSource sender, final boolean allowUnsafe, final String[] split, final IEssentials ess) throws Exception
 	{
 		final Enchantment enchantment = Enchantments.getByName(split[0]);
 		if (enchantment == null || !hasMetaPermission(sender, "enchantments." + enchantment.getName().toLowerCase(Locale.ENGLISH), false, false, ess))
@@ -444,8 +488,12 @@ public class MetaItemStack
 		addEnchantment(sender, allowUnsafe, enchantment, level);
 	}
 
-	public void addEnchantment(final CommandSender sender, final boolean allowUnsafe, final Enchantment enchantment, final int level) throws Exception
+	public void addEnchantment(final CommandSource sender, final boolean allowUnsafe, final Enchantment enchantment, final int level) throws Exception
 	{
+		if (enchantment == null)
+		{
+			throw new Exception(tl("enchantmentNotFound"));
+		}
 		try
 		{
 			if (stack.getType().equals(Material.ENCHANTED_BOOK))
@@ -486,7 +534,7 @@ public class MetaItemStack
 		}
 	}
 
-	public Enchantment getEnchantment(final IUser user, final String name) throws Exception
+	public Enchantment getEnchantment(final User user, final String name) throws Exception
 	{
 		final Enchantment enchantment = Enchantments.getByName(name);
 		if (enchantment == null)
@@ -498,21 +546,21 @@ public class MetaItemStack
 
 		if (!hasMetaPermission(user, "enchantments." + enchantmentName, true, false))
 		{
-			throw new Exception(_("§4You do not have the permission for§c {0}§4.", enchantmentName));
+			throw new Exception(tl("enchantmentPerm", enchantmentName));
 		}
 		return enchantment;
 	}
 
-	private boolean hasMetaPermission(final CommandSender sender, final String metaPerm, final boolean graceful, final boolean includeBase, final IEssentials ess) throws Exception
+	private boolean hasMetaPermission(final CommandSource sender, final String metaPerm, final boolean graceful, final boolean includeBase, final IEssentials ess) throws Exception
 	{
-		final IUser user = ess.getUserMap().getUser((Player)sender);
-
+		final User user = sender != null && sender.isPlayer() ? ess.getUser(sender.getPlayer()) : null;
 		return hasMetaPermission(user, metaPerm, graceful, includeBase);
 	}
 
-	private boolean hasMetaPermission(final IUser user, final String metaPerm, final boolean graceful, final boolean includeBase) throws Exception
+	private boolean hasMetaPermission(final User user, final String metaPerm, final boolean graceful, final boolean includeBase) throws Exception
 	{
-		if (user == null || (includeBase ? Permissions.ITEMSPAWN.isAuthorized(user, "meta-" + metaPerm) : Permissions.ESSENTIALS.isAuthorized(user, metaPerm)))
+		final String permBase = includeBase ? "essentials.itemspawn.meta-" : "essentials.";
+		if (user == null || user.isAuthorized(permBase + metaPerm))
 		{
 			return true;
 		}
@@ -523,7 +571,7 @@ public class MetaItemStack
 		}
 		else
 		{
-			throw new Exception(_("§4You do not have permission to apply §c{0}§4 meta to this item.", metaPerm));
+			throw new Exception(tl("noMetaPerm", metaPerm));
 		}
 	}
 }

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

@@ -0,0 +1,138 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n.tl;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+
+
+// Suffixes can be appended on the end of a mob name to make it plural
+// Entities without a suffix, will default to 's'
+public enum Mob
+{
+	CHICKEN("Chicken", Enemies.FRIENDLY, EntityType.CHICKEN),
+	COW("Cow", Enemies.FRIENDLY, EntityType.COW),
+	CREEPER("Creeper", Enemies.ENEMY, EntityType.CREEPER),
+	GHAST("Ghast", Enemies.ENEMY, EntityType.GHAST),
+	GIANT("Giant", Enemies.ENEMY, EntityType.GIANT),
+	HORSE("Horse", Enemies.FRIENDLY, EntityType.HORSE),
+	PIG("Pig", Enemies.FRIENDLY, EntityType.PIG),
+	PIGZOMB("PigZombie", Enemies.NEUTRAL, EntityType.PIG_ZOMBIE),
+	SHEEP("Sheep", Enemies.FRIENDLY, "", EntityType.SHEEP),
+	SKELETON("Skeleton", Enemies.ENEMY, EntityType.SKELETON),
+	SLIME("Slime", Enemies.ENEMY, EntityType.SLIME),
+	SPIDER("Spider", Enemies.ENEMY, EntityType.SPIDER),
+	SQUID("Squid", Enemies.FRIENDLY, EntityType.SQUID),
+	ZOMBIE("Zombie", Enemies.ENEMY, EntityType.ZOMBIE),
+	WOLF("Wolf", Enemies.NEUTRAL, "", EntityType.WOLF),
+	CAVESPIDER("CaveSpider", Enemies.ENEMY, EntityType.CAVE_SPIDER),
+	ENDERMAN("Enderman", Enemies.ENEMY, "", EntityType.ENDERMAN),
+	SILVERFISH("Silverfish", Enemies.ENEMY, "", EntityType.SILVERFISH),
+	ENDERDRAGON("EnderDragon", Enemies.ENEMY, EntityType.ENDER_DRAGON),
+	VILLAGER("Villager", Enemies.FRIENDLY, EntityType.VILLAGER),
+	BLAZE("Blaze", Enemies.ENEMY, EntityType.BLAZE),
+	MUSHROOMCOW("MushroomCow", Enemies.FRIENDLY, EntityType.MUSHROOM_COW),
+	MAGMACUBE("MagmaCube", Enemies.ENEMY, EntityType.MAGMA_CUBE),
+	SNOWMAN("Snowman", Enemies.FRIENDLY, "", EntityType.SNOWMAN),
+	OCELOT("Ocelot", Enemies.NEUTRAL, EntityType.OCELOT),
+	IRONGOLEM("IronGolem", Enemies.NEUTRAL, EntityType.IRON_GOLEM),
+	WITHER("Wither", Enemies.ENEMY, EntityType.WITHER),
+	BAT("Bat", Enemies.FRIENDLY, EntityType.BAT),
+	WITCH("Witch", Enemies.ENEMY, EntityType.WITCH),
+	BOAT("Boat", Enemies.NEUTRAL, EntityType.BOAT),
+	MINECART("Minecart", Enemies.NEUTRAL, EntityType.MINECART),
+	MINECART_CHEST("ChestMinecart", Enemies.NEUTRAL, EntityType.MINECART_CHEST),
+	MINECART_FURNACE("FurnaceMinecart", Enemies.NEUTRAL, EntityType.MINECART_FURNACE),
+	MINECART_TNT("TNTMinecart", Enemies.NEUTRAL, EntityType.MINECART_TNT),
+	MINECART_HOPPER("HopperMinecart", Enemies.NEUTRAL, EntityType.MINECART_HOPPER),
+	MINECART_MOB_SPAWNER("SpawnerMinecart", Enemies.NEUTRAL, EntityType.MINECART_MOB_SPAWNER),
+	ENDERCRYSTAL("EnderCrystal", Enemies.NEUTRAL, EntityType.ENDER_CRYSTAL),
+	EXPERIENCEORB("ExperienceOrb", Enemies.NEUTRAL, EntityType.EXPERIENCE_ORB);
+	public static final Logger logger = Logger.getLogger("Essentials");
+
+	private Mob(String n, Enemies en, String s, EntityType type)
+	{
+		this.suffix = s;
+		this.name = n;
+		this.type = en;
+		this.bukkitType = type;
+	}
+
+	private Mob(String n, Enemies en, EntityType type)
+	{
+		this.name = n;
+		this.type = en;
+		this.bukkitType = type;
+	}
+	public String suffix = "s";
+	final public String name;
+	final public Enemies type;
+	final private EntityType bukkitType;
+	private static final Map<String, Mob> hashMap = new HashMap<String, Mob>();
+	private static final Map<EntityType, Mob> bukkitMap = new HashMap<EntityType, Mob>();
+
+	static
+	{
+		for (Mob mob : Mob.values())
+		{
+			hashMap.put(mob.name.toLowerCase(Locale.ENGLISH), mob);
+			bukkitMap.put(mob.bukkitType, mob);
+		}
+	}
+
+	public static Set<String> getMobList()
+	{
+		return Collections.unmodifiableSet(hashMap.keySet());
+	}
+
+	public Entity spawn(final World world, final Server server, final Location loc) throws MobException
+	{
+		final Entity entity = world.spawn(loc, (Class<? extends Entity>)this.bukkitType.getEntityClass());
+		if (entity == null)
+		{
+			logger.log(Level.WARNING, tl("unableToSpawnMob"));
+			throw new MobException();
+		}
+		return entity;
+	}
+
+
+	public enum Enemies
+	{
+		FRIENDLY("friendly"),
+		NEUTRAL("neutral"),
+		ENEMY("enemy");
+
+		private Enemies(final String type)
+		{
+			this.type = type;
+		}
+		final protected String type;
+	}
+
+	public EntityType getType()
+	{
+		return bukkitType;
+	}
+
+	public static Mob fromName(final String name)
+	{
+		return hashMap.get(name.toLowerCase(Locale.ENGLISH));
+	}
+
+	public static Mob fromBukkitType(final EntityType type)
+	{
+		return bukkitMap.get(type);
+	}
+
+
+	public static class MobException extends Exception
+	{
+		private static final long serialVersionUID = 1L;
+	}
+}

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

@@ -0,0 +1,339 @@
+package com.earth2me.essentials;
+
+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;
+import org.bukkit.Material;
+import org.bukkit.entity.Ageable;
+import org.bukkit.entity.Creeper;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.ExperienceOrb;
+import org.bukkit.entity.Horse;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Ocelot;
+import org.bukkit.entity.Pig;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Skeleton;
+import org.bukkit.entity.Slime;
+import org.bukkit.entity.Tameable;
+import org.bukkit.entity.Villager;
+import org.bukkit.entity.Wolf;
+import org.bukkit.entity.Zombie;
+import org.bukkit.inventory.EntityEquipment;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.material.Colorable;
+
+
+public enum MobData
+{
+	BABY_AGEABLE("baby", Ageable.class, Data.BABY, true),
+	BABY_PIG("piglet", EntityType.PIG, Data.BABY, false),
+	BABY_WOLF("puppy", EntityType.WOLF, Data.BABY, false),
+	BABY_CHICKEN("chick", EntityType.CHICKEN, Data.BABY, false),
+	BABY_HORSE("colt", EntityType.HORSE, Data.BABY, false),
+	BABY_OCELOT("kitten", EntityType.OCELOT, Data.BABY, false),
+	BABY_SHEEP("lamb", EntityType.SHEEP, Data.BABY, false),
+	BABY_COW("calf", EntityType.COW.getEntityClass(), Data.BABY, false),
+	BABY_VILLAGER("child", EntityType.VILLAGER, Data.BABY, false),
+	TAMED_TAMEABLE("tamed", Tameable.class, Data.TAMED, true),
+	TAME_TAMEABLE("tame", Tameable.class, Data.TAMED, false),
+	RANDOM_SHEEP("random", EntityType.SHEEP, Data.COLORABLE, true),
+	COLORABLE_SHEEP("", StringUtil.joinList(DyeColor.values()).toLowerCase(Locale.ENGLISH), EntityType.SHEEP, Data.COLORABLE, true),
+	DONKEY_HORSE("donkey", EntityType.HORSE, Horse.Variant.DONKEY, true),
+	MULE_HORSE("mule", EntityType.HORSE, Horse.Variant.MULE, true),
+	SKELETON_HORSE("skeleton", EntityType.HORSE, Horse.Variant.SKELETON_HORSE, true),
+	UNDEAD_HORSE("undead", EntityType.HORSE, Horse.Variant.UNDEAD_HORSE, true),
+	ZOMBIE_HORSE("zombie", EntityType.HORSE, Horse.Variant.UNDEAD_HORSE, false),
+	POLKA_HORSE("polka", EntityType.HORSE, Horse.Style.BLACK_DOTS, true),
+	SOOTY_HORSE("sooty", EntityType.HORSE, Horse.Style.BLACK_DOTS, false),
+	BLAZE_HORSE("blaze", EntityType.HORSE, Horse.Style.WHITE, true),
+	SOCKS_HORSE("socks", EntityType.HORSE, Horse.Style.WHITE, false),
+	LEOPARD_HORSE("leopard", EntityType.HORSE, Horse.Style.WHITE_DOTS, true),
+	APPALOOSA_HORSE("appaloosa", EntityType.HORSE, Horse.Style.WHITE_DOTS, false),
+	PAINT_HORSE("paint", EntityType.HORSE, Horse.Style.WHITEFIELD, true),
+	MILKY_HORSE("milky", EntityType.HORSE, Horse.Style.WHITEFIELD, false),
+	SPLOTCHY_HORSE("splotchy", EntityType.HORSE, Horse.Style.WHITEFIELD, false),
+	BLACK_HORSE("black", EntityType.HORSE, Horse.Color.BLACK, true),
+	CHESTNUT_HORSE("chestnut", EntityType.HORSE, Horse.Color.CHESTNUT, true),
+	LIVER_HORSE("liver", EntityType.HORSE, Horse.Color.CHESTNUT, false),
+	CREAMY_HORSE("creamy", EntityType.HORSE, Horse.Color.CREAMY, true),
+	FLAXEN_HORSE("flaxen", EntityType.HORSE, Horse.Color.CREAMY, false),
+	GRAY_HORSE("gray", EntityType.HORSE, Horse.Color.GRAY, true),
+	DAPPLE_HORSE("dapple", EntityType.HORSE, Horse.Color.GRAY, false),
+	BUCKSKIN_HORSE("buckskin", EntityType.HORSE, Horse.Color.DARK_BROWN, true),
+	DARKBROWN_HORSE("darkbrown", EntityType.HORSE, Horse.Color.DARK_BROWN, false),
+	DARK_HORSE("dark", EntityType.HORSE, Horse.Color.DARK_BROWN, false),
+	DBROWN_HORSE("dbrown", EntityType.HORSE, Horse.Color.DARK_BROWN, false),
+	BAY_HORSE("bay", EntityType.HORSE, Horse.Color.BROWN, true),
+	BROWN_HORSE("brown", EntityType.HORSE, Horse.Color.BROWN, false),
+	CHEST_HORSE("chest", EntityType.HORSE, Data.CHEST, true),
+	SADDLE_HORSE("saddle", EntityType.HORSE, Data.HORSESADDLE, true),
+	GOLD_ARMOR_HORSE("goldarmor", EntityType.HORSE, Material.GOLD_BARDING, true),
+	DIAMOND_ARMOR_HORSE("diamondarmor", EntityType.HORSE, Material.DIAMOND_BARDING, true),
+	ARMOR_HORSE("armor", EntityType.HORSE, Material.IRON_BARDING, true),
+	SIAMESE_CAT("siamese", EntityType.OCELOT, Ocelot.Type.SIAMESE_CAT, true),
+	WHITE_CAT("white", EntityType.OCELOT, Ocelot.Type.SIAMESE_CAT, false),
+	RED_CAT("red", EntityType.OCELOT, Ocelot.Type.RED_CAT, true),
+	ORANGE_CAT("orange", EntityType.OCELOT, Ocelot.Type.RED_CAT, false),
+	TABBY_CAT("tabby", EntityType.OCELOT, Ocelot.Type.RED_CAT, false),
+	BLACK_CAT("black", EntityType.OCELOT, Ocelot.Type.BLACK_CAT, true),
+	TUXEDO_CAT("tuxedo", EntityType.OCELOT, Ocelot.Type.BLACK_CAT, false),
+	VILLAGER_ZOMBIE("villager", EntityType.ZOMBIE.getEntityClass(), Data.VILLAGER, true),
+	BABY_ZOMBIE("baby", EntityType.ZOMBIE.getEntityClass(), Data.BABYZOMBIE, true),
+	DIAMOND_SWORD_ZOMBIE("diamondsword", EntityType.ZOMBIE.getEntityClass(), Material.DIAMOND_SWORD, true),
+	GOLD_SWORD_ZOMBIE("goldsword", EntityType.ZOMBIE.getEntityClass(), Material.GOLD_SWORD, true),
+	IRON_SWORD_ZOMBIE("ironsword", EntityType.ZOMBIE.getEntityClass(), Material.IRON_SWORD, true),
+	STONE_SWORD_ZOMBIE("stonesword", EntityType.ZOMBIE.getEntityClass(), Material.STONE_SWORD, false),
+	SWORD_ZOMBIE("sword", EntityType.ZOMBIE.getEntityClass(), Material.STONE_SWORD, true),
+	DIAMOND_SWORD_SKELETON("diamondsword", EntityType.SKELETON, Material.DIAMOND_SWORD, true),
+	GOLD_SWORD_SKELETON("goldsword", EntityType.SKELETON, Material.GOLD_SWORD, true),
+	IRON_SWORD_SKELETON("ironsword", EntityType.SKELETON, Material.IRON_SWORD, true),
+	STONE_SWORD_SKELETON("stonesword", EntityType.SKELETON, Material.STONE_SWORD, false),
+	SWORD_SKELETON("sword", EntityType.SKELETON, Material.STONE_SWORD, true),
+	BOW_SKELETON("bow", EntityType.SKELETON, Material.BOW, true),
+	WHITHER_SKELETON("wither", EntityType.SKELETON, Data.WITHER, true),
+	POWERED_CREEPER("powered", EntityType.CREEPER, Data.ELECTRIFIED, true),
+	ELECTRIC_CREEPER("electric", EntityType.CREEPER, Data.ELECTRIFIED, false),
+	CHARGED_CREEPER("charged", EntityType.CREEPER, Data.ELECTRIFIED, false),
+	SADDLE_PIG("saddle", EntityType.PIG, Data.PIGSADDLE, true),
+	ANGRY_WOLF("angry", EntityType.WOLF, Data.ANGRY, true),
+	RABID_WOLF("rabid", EntityType.WOLF, Data.ANGRY, false),
+	FARMER_VILLAGER("farmer", EntityType.VILLAGER, Villager.Profession.FARMER, true),
+	LIBRARIAN_VILLAGER("librarian", EntityType.VILLAGER, Villager.Profession.LIBRARIAN, true),
+	PRIEST_VILLAGER("priest", EntityType.VILLAGER, Villager.Profession.PRIEST, true),
+	FATHER_VILLAGER("father", EntityType.VILLAGER, Villager.Profession.PRIEST, false),
+	SMITH_VILLAGER("smith", EntityType.VILLAGER, Villager.Profession.BLACKSMITH, true),
+	BUTCHER_VILLAGER("butcher", EntityType.VILLAGER, Villager.Profession.BUTCHER, true),
+	SIZE_SLIME("", "<1-100>", EntityType.SLIME.getEntityClass(), Data.SIZE, true),
+	NUM_EXPERIENCE_ORB("", "<1-2000000000>", EntityType.EXPERIENCE_ORB, Data.EXP, true);
+
+
+	public enum Data
+	{
+		BABY,
+		CHEST,
+		BABYZOMBIE,
+		VILLAGER,
+		HORSESADDLE,
+		PIGSADDLE,
+		ELECTRIFIED,
+		WITHER,
+		ANGRY,
+		TAMED,
+		COLORABLE,
+		EXP,
+		SIZE;
+	}
+	public static final Logger logger = Logger.getLogger("Essentials");
+
+	private MobData(String n, Object type, Object value, boolean isPublic)
+	{
+		this.nickname = n;
+		this.matched = n;
+		this.helpMessage = n;
+		this.type = type;
+		this.value = value;
+		this.isPublic = isPublic;
+	}
+
+	private MobData(String n, String h, Object type, Object value, boolean isPublic)
+	{
+		this.nickname = n;
+		this.matched = n;
+		this.helpMessage = h;
+		this.type = type;
+		this.value = value;
+		this.isPublic = isPublic;
+	}
+	final private String nickname;
+	final private String helpMessage;
+	final private Object type;
+	final private Object value;
+	final private boolean isPublic;
+	private String matched;
+
+	public static LinkedHashMap<String, MobData> getPossibleData(final Entity spawned, boolean publicOnly)
+	{
+		LinkedHashMap<String, MobData> mobList = new LinkedHashMap<String, MobData>();
+		for (MobData data : MobData.values())
+		{
+			if (data.type instanceof EntityType && spawned.getType().equals(data.type) && ((publicOnly && data.isPublic) || !publicOnly))
+			{
+				mobList.put(data.nickname.toLowerCase(Locale.ENGLISH), data);
+			}
+			else if (data.type instanceof Class && ((Class)data.type).isAssignableFrom(spawned.getClass()) && ((publicOnly && data.isPublic) || !publicOnly))
+			{
+				mobList.put(data.nickname.toLowerCase(Locale.ENGLISH), data);
+			}
+		}
+
+		return mobList;
+	}
+
+	public static List<String> getValidHelp(final Entity spawned)
+	{
+		List<String> output = new ArrayList<String>();
+		LinkedHashMap<String, MobData> posData = getPossibleData(spawned, true);
+
+		for (MobData data : posData.values())
+		{
+			output.add(data.helpMessage);
+		}
+		return output;
+	}
+
+	public static MobData fromData(final Entity spawned, final String name)
+	{
+		if (name.isEmpty())
+		{
+			return null;
+		}
+
+		LinkedHashMap<String, MobData> posData = getPossibleData(spawned, false);
+		for (String data : posData.keySet())
+		{
+			if (name.contains(data))
+			{
+				return posData.get(data);
+			}
+		}
+		return null;
+	}
+
+	public String getMatched()
+	{
+		return this.matched;
+	}
+
+	public void setData(final Entity spawned, final Player target, final String rawData) throws Exception
+	{
+		if (this.value.equals(Data.ANGRY))
+		{
+			((Wolf)spawned).setAngry(true);
+		}
+		else if (this.value.equals(Data.BABY))
+		{
+			((Ageable)spawned).setBaby();
+		}
+		else if (this.value.equals(Data.BABYZOMBIE))
+		{
+			((Zombie)spawned).setBaby(true);
+		}
+		else if (this.value.equals(Data.CHEST))
+		{
+			((Horse)spawned).setTamed(true);
+			((Horse)spawned).setCarryingChest(true);
+		}
+		else if (this.value.equals(Data.ELECTRIFIED))
+		{
+			((Creeper)spawned).setPowered(true);
+		}
+		else if (this.value.equals(Data.HORSESADDLE))
+		{
+			final Horse horse = ((Horse)spawned);
+			horse.setTamed(true);
+			horse.setOwner(target);
+			horse.getInventory().setSaddle(new ItemStack(Material.SADDLE, 1));
+		}
+		else if (this.value.equals(Data.PIGSADDLE))
+		{
+			((Pig)spawned).setSaddle(true);
+		}
+		else if (this.value.equals(Data.TAMED))
+		{
+			final Tameable tameable = ((Tameable)spawned);
+			tameable.setTamed(true);
+			tameable.setOwner(target);
+		}
+		else if (this.value.equals(Data.VILLAGER))
+		{
+			((Zombie)spawned).setVillager(this.value.equals(Data.VILLAGER));
+		}
+		else if (this.value.equals(Data.WITHER))
+		{
+			((Skeleton)spawned).setSkeletonType(Skeleton.SkeletonType.WITHER);
+		}
+		else if (this.value.equals(Data.COLORABLE))
+		{
+			final String color = rawData.toUpperCase(Locale.ENGLISH);
+			try
+			{
+				if (color.equals("RANDOM"))
+				{
+					final Random rand = new Random();
+					((Colorable)spawned).setColor(DyeColor.values()[rand.nextInt(DyeColor.values().length)]);
+				}
+				else if (!color.isEmpty())
+				{
+					((Colorable)spawned).setColor(DyeColor.valueOf(color));
+				}
+				this.matched = rawData;
+			}
+			catch (Exception e)
+			{
+				throw new Exception(tl("sheepMalformedColor"), e);
+			}
+		}
+		else if (this.value.equals(Data.EXP))
+		{
+			try
+			{
+				((ExperienceOrb)spawned).setExperience(Integer.parseInt(rawData));
+				this.matched = rawData;
+			}
+			catch (NumberFormatException e)
+			{
+				throw new Exception(tl("invalidNumber"), e);
+			}
+		}
+		else if (this.value.equals(Data.SIZE))
+		{
+			try
+			{
+				((Slime)spawned).setSize(Integer.parseInt(rawData));
+				this.matched = rawData;
+			}
+			catch (NumberFormatException e)
+			{
+				throw new Exception(tl("slimeMalformedSize"), e);
+			}
+		}
+		else if (this.value instanceof Horse.Color)
+		{
+			((Horse)spawned).setColor((Horse.Color)this.value);
+		}
+		else if (this.value instanceof Horse.Style)
+		{
+			((Horse)spawned).setStyle((Horse.Style)this.value);
+		}
+		else if (this.value instanceof Horse.Variant)
+		{
+			((Horse)spawned).setVariant((Horse.Variant)this.value);
+		}
+		else if (this.value instanceof Ocelot.Type)
+		{
+			((Ocelot)spawned).setCatType((Ocelot.Type)this.value);
+		}
+		else if (this.value instanceof Villager.Profession)
+		{
+			((Villager)spawned).setProfession((Villager.Profession)this.value);
+		}
+		else if (this.value instanceof Material)
+		{
+			if (this.type.equals(EntityType.HORSE))
+			{
+				((Horse)spawned).setTamed(true);
+				((Horse)spawned).getInventory().setArmor(new ItemStack((Material)this.value, 1));
+			}
+			else if (this.type.equals(EntityType.ZOMBIE.getEntityClass()) || this.type.equals(EntityType.SKELETON))
+			{
+				final EntityEquipment invent = ((LivingEntity)spawned).getEquipment();
+				invent.setItemInHand(new ItemStack((Material)this.value, 1));
+				invent.setItemInHandDropChance(0.1f);
+			}
+		}
+	}
+}

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

@@ -0,0 +1,48 @@
+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
+{
+	protected Player base;
+
+	public PlayerExtension(final Player base)
+	{
+		this.base = base;
+	}
+
+	public final Player getBase()
+	{
+		return base;
+	}
+
+	public final Player setBase(final Player base)
+	{
+		return this.base = base;
+	}
+	
+	public Server getServer()
+	{
+		return base.getServer();
+	}
+	
+	public World getWorld() {
+		return base.getWorld();
+	}
+	
+	public Location getLocation() {
+		return base.getLocation();
+	}
+}

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

@@ -0,0 +1,151 @@
+package com.earth2me.essentials;
+
+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;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import org.bukkit.Server;
+import org.bukkit.entity.Player;
+
+
+public class PlayerList
+{
+	// Cosmetic list formatting
+	public static String listUsers(final IEssentials ess, final List<User> users, final String seperator)
+	{
+		final StringBuilder groupString = new StringBuilder();
+		Collections.sort(users);
+		boolean needComma = false;
+		for (User user : users)
+		{
+			if (needComma)
+			{
+				groupString.append(seperator);
+			}
+			needComma = true;
+			if (user.isAfk())
+			{
+				groupString.append(tl("listAfkTag"));
+			}
+			if (user.isHidden())
+			{
+				groupString.append(tl("listHiddenTag"));
+			}
+			user.setDisplayNick();
+			groupString.append(user.getDisplayName());
+			groupString.append("\u00a7f");
+		}
+		return groupString.toString();
+	}
+
+	// Produce a user summary: There are 5 out of maximum 10 players online.
+	public static String listSummary(final IEssentials ess, final boolean showHidden)
+	{
+		Server server = ess.getServer();
+		int playerHidden = 0;
+		for (Player onlinePlayer : server.getOnlinePlayers())
+		{
+			if (ess.getUser(onlinePlayer).isHidden())
+			{
+				playerHidden++;
+			}
+		}
+		String online;
+		if (showHidden && playerHidden > 0)
+		{
+			online = tl("listAmountHidden", server.getOnlinePlayers().length - playerHidden, playerHidden, server.getMaxPlayers());
+		}
+		else
+		{
+			online = tl("listAmount", server.getOnlinePlayers().length - playerHidden, server.getMaxPlayers());
+		}
+		return online;
+	}
+
+	// Build the basic player list, divided by groups.
+	public static Map<String, List<User>> getPlayerLists(final IEssentials ess, final boolean showHidden)
+	{
+		Server server = ess.getServer();
+		final Map<String, List<User>> playerList = new HashMap<String, List<User>>();
+		for (Player onlinePlayer : server.getOnlinePlayers())
+		{
+			final User onlineUser = ess.getUser(onlinePlayer);
+			if (onlineUser.isHidden() && !showHidden)
+			{
+				continue;
+			}
+			final String group = FormatUtil.stripFormat(FormatUtil.stripEssentialsFormat(onlineUser.getGroup().toLowerCase()));
+			List<User> list = playerList.get(group);
+			if (list == null)
+			{
+				list = new ArrayList<User>();
+				playerList.put(group, list);
+			}
+			list.add(onlineUser);
+		}
+		return playerList;
+	}
+
+	// Handle the merging of groups
+	public static List<User> getMergedList(final IEssentials ess, final Map<String, List<User>> playerList, final String groupName)
+	{
+		final Set<String> configGroups = ess.getSettings().getListGroupConfig().keySet();
+		final List<User> users = new ArrayList<User>();
+		for (String configGroup : configGroups)
+		{
+			if (configGroup.equalsIgnoreCase(groupName))
+			{
+				String[] groupValues = ess.getSettings().getListGroupConfig().get(configGroup).toString().trim().split(" ");
+				for (String groupValue : groupValues)
+				{
+					groupValue = groupValue.toLowerCase(Locale.ENGLISH);
+					if (groupValue == null || groupValue.isEmpty())
+					{
+						continue;
+					}
+					List<User> u = playerList.get(groupValue.trim());
+					if (u == null || u.isEmpty())
+					{
+						continue;
+					}
+					playerList.remove(groupValue);
+					users.addAll(u);
+				}
+			}
+		}
+		return users;
+	}
+
+	// Output a playerlist of just a single group, /list <groupname>
+	public static String listGroupUsers(final IEssentials ess, final Map<String, List<User>> playerList, final String groupName) throws Exception
+	{
+		final List<User> users = getMergedList(ess, playerList, groupName);
+		final List<User> groupUsers = playerList.get(groupName);
+		if (groupUsers != null && !groupUsers.isEmpty())
+		{
+			users.addAll(groupUsers);
+		}
+		if (users == null || users.isEmpty())
+		{
+			throw new Exception(tl("groupDoesNotExist"));
+		}
+		final StringBuilder displayGroupName = new StringBuilder();
+		displayGroupName.append(Character.toTitleCase(groupName.charAt(0)));
+		displayGroupName.append(groupName.substring(1));
+		return outputFormat(displayGroupName.toString(), listUsers(ess, users, ", "));
+	}
+
+	// Build the output string
+	public static String outputFormat(final String group, final String message)
+	{
+		final StringBuilder outputString = new StringBuilder();
+		outputString.append(tl("listGroupTag", FormatUtil.replaceFormat(group)));
+		outputString.append(message);
+		return outputString.toString();
+	}
+}

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

@@ -0,0 +1,22 @@
+package com.earth2me.essentials;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+
+public class PlayerTarget implements ITarget
+{
+	private final String name;
+
+	public PlayerTarget(Player entity)
+	{
+		this.name = entity.getName();
+	}
+
+	@Override
+	public Location getLocation()
+	{
+		return Bukkit.getServer().getPlayerExact(name).getLocation();
+	}
+}

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

@@ -1,11 +1,11 @@
-package net.ess3;
+package com.earth2me.essentials;
 
+import com.earth2me.essentials.utils.NumberUtil;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import net.ess3.utils.Util;
 import org.bukkit.potion.PotionEffectType;
 
 
@@ -67,7 +67,6 @@ public class Potions
 		POTIONS.put("resistance", PotionEffectType.DAMAGE_RESISTANCE);
 		ALIASPOTIONS.put("dmgresist", PotionEffectType.DAMAGE_RESISTANCE);
 		ALIASPOTIONS.put("armor", PotionEffectType.DAMAGE_RESISTANCE);
-		ALIASPOTIONS.put("dmgresist", PotionEffectType.DAMAGE_RESISTANCE);
 
 		POTIONS.put("fireresist", PotionEffectType.FIRE_RESISTANCE);
 		ALIASPOTIONS.put("fireresistance", PotionEffectType.FIRE_RESISTANCE);
@@ -100,12 +99,42 @@ public class Potions
 
 		POTIONS.put("wither", PotionEffectType.WITHER);
 		ALIASPOTIONS.put("decay", PotionEffectType.WITHER);
+
+
+		try // 1.6 update
+		{
+			POTIONS.put("healthboost", PotionEffectType.HEALTH_BOOST);
+			ALIASPOTIONS.put("boost", PotionEffectType.HEALTH_BOOST);
+
+			POTIONS.put("absorption", PotionEffectType.ABSORPTION);
+			ALIASPOTIONS.put("absorb", PotionEffectType.ABSORPTION);
+
+			POTIONS.put("saturation", PotionEffectType.SATURATION);
+			ALIASPOTIONS.put("food", PotionEffectType.SATURATION);
+		}
+		catch (java.lang.NoSuchFieldError e)
+		{
+			Essentials.wrongVersion();
+		}
+		
+		try // 1.7 update
+		{
+			POTIONS.put("waterbreathing", PotionEffectType.WATER_BREATHING);
+			ALIASPOTIONS.put("underwaterbreathing", PotionEffectType.WATER_BREATHING);
+			ALIASPOTIONS.put("waterbreath", PotionEffectType.WATER_BREATHING);
+			ALIASPOTIONS.put("underwaterbreath", PotionEffectType.WATER_BREATHING);
+			ALIASPOTIONS.put("air", PotionEffectType.WATER_BREATHING);
+		}
+		catch (java.lang.NoSuchFieldError e)
+		{
+			Essentials.wrongVersion();
+		}
 	}
 
 	public static PotionEffectType getByName(String name)
 	{
 		PotionEffectType peffect;
-		if (Util.isInt(name))
+		if (NumberUtil.isInt(name))
 		{
 			peffect = PotionEffectType.getById(Integer.parseInt(name));
 		}

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

@@ -1,30 +1,38 @@
 package com.earth2me.essentials;
 
+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.text.MessageFormat;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import static net.ess3.I18n._;
 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;
 import org.bukkit.inventory.ItemStack;
 
 
-public final class Settings implements ISettings
+public class Settings implements net.ess3.api.ISettings
 {
-	private final EssentialsConf config;
-	private final IEssentials ess;
+	private final transient EssentialsConf config;
+	private static final Logger logger = Logger.getLogger("Essentials");
+	private final transient IEssentials ess;
 	private boolean metricsEnabled = true;
 
-	public Settings(IEssentials ess, File file)
+	public Settings(IEssentials ess)
 	{
 		this.ess = ess;
-		config = new EssentialsConf(file);
-		//config.setTemplateName("/config.yml");
+		config = new EssentialsConf(new File(ess.getDataFolder(), "config.yml"));
+		config.setTemplateName("/config.yml");
 		reloadConfig();
 	}
 
@@ -46,6 +54,29 @@ public final class Settings implements ISettings
 		return config.getConfigurationSection("sethome-multiple").getKeys(false);
 	}
 
+	@Override
+	public int getHomeLimit(final User user)
+	{
+		int limit = 1;
+		if (user.isAuthorized("essentials.sethome.multiple"))
+		{
+			limit = getHomeLimit("default");
+		}
+
+		final Set<String> homeList = getMultipleHomes();
+		if (homeList != null)
+		{
+			for (String set : homeList)
+			{
+				if (user.isAuthorized("essentials.sethome.multiple." + set) && (limit < getHomeLimit(set)))
+				{
+					limit = getHomeLimit(set);
+				}
+			}
+		}
+		return limit;
+	}
+
 	@Override
 	public int getHomeLimit(final String set)
 	{
@@ -63,6 +94,47 @@ public final class Settings implements ISettings
 	{
 		return chatRadius;
 	}
+	
+	// #easteregg
+	private char chatShout = '!';
+
+	private char _getChatShout()
+	{
+		return config.getString("chat.shout", "!").charAt(0);
+	}
+
+	@Override
+	public char getChatShout()
+	{
+		return chatShout;
+	}
+	
+	// #easteregg
+	private char chatQuestion = '?';
+
+	private char _getChatQuestion()
+	{
+		return config.getString("chat.question", "?").charAt(0);
+	}
+
+	@Override
+	public char getChatQuestion()
+	{
+		return chatQuestion;
+	}
+
+	private boolean teleportSafety;
+
+	public boolean _isTeleportSafetyEnabled()
+	{
+		return config.getBoolean("teleport-safety", true);
+	}
+
+	@Override
+	public boolean isTeleportSafetyEnabled()
+	{
+		return teleportSafety;
+	}
 
 	@Override
 	public double getTeleportDelay()
@@ -83,9 +155,15 @@ public final class Settings implements ISettings
 	}
 
 	@Override
-	public int getStartingBalance()
+	public BigDecimal getStartingBalance()
 	{
-		return config.getInt("starting-balance", 0);
+		return config.getBigDecimal("starting-balance", BigDecimal.ZERO);
+	}
+
+	@Override
+	public boolean isCommandDisabled(final IEssentialsCommand cmd)
+	{
+		return isCommandDisabled(cmd.getName());
 	}
 	private Set<String> disabledCommands = new HashSet<String>();
 
@@ -141,7 +219,13 @@ public final class Settings implements ISettings
 	}
 	private ConfigurationSection commandCosts;
 
-	public ConfigurationSection _getCommandCosts()
+	@Override
+	public BigDecimal getCommandCost(IEssentialsCommand cmd)
+	{
+		return getCommandCost(cmd.getName());
+	}
+
+	private ConfigurationSection _getCommandCosts()
 	{
 		if (config.isConfigurationSection("command-costs"))
 		{
@@ -149,6 +233,10 @@ public final class Settings implements ISettings
 			final ConfigurationSection newSection = new MemoryConfiguration();
 			for (String command : section.getKeys(false))
 			{
+				if (command.charAt(0) == '/')
+				{
+					ess.getLogger().warning("Invalid command cost. '" + command + "' should not start with '/'.");
+				}
 				if (section.isDouble(command))
 				{
 					newSection.set(command.toLowerCase(Locale.ENGLISH), section.getDouble(command));
@@ -157,6 +245,24 @@ public final class Settings implements ISettings
 				{
 					newSection.set(command.toLowerCase(Locale.ENGLISH), (double)section.getInt(command));
 				}
+				else if (section.isString(command))
+				{
+					String costString = section.getString(command);
+					try
+					{
+						double cost = Double.parseDouble(costString.trim().replace(getCurrencySymbol(), "").replaceAll("\\W", ""));
+						newSection.set(command.toLowerCase(Locale.ENGLISH), cost);
+					}
+					catch (NumberFormatException ex)
+					{
+						ess.getLogger().warning("Invalid command cost for: " + command + " (" + costString + ")");
+					}
+
+				}
+				else
+				{
+					ess.getLogger().warning("Invalid command cost for: " + command);
+				}
 			}
 			return newSection;
 		}
@@ -164,14 +270,40 @@ public final class Settings implements ISettings
 	}
 
 	@Override
-	public double getCommandCost(String name)
+	public BigDecimal getCommandCost(String name)
 	{
 		name = name.replace('.', '_').replace('/', '_');
 		if (commandCosts != null)
 		{
-			return commandCosts.getDouble(name, 0.0);
+			return EssentialsConf.toBigDecimal(commandCosts.getString(name), BigDecimal.ZERO);
 		}
-		return 0.0;
+		return BigDecimal.ZERO;
+	}
+	private Set<String> socialSpyCommands = new HashSet<String>();
+
+	private Set<String> _getSocialSpyCommands()
+	{
+		Set<String> socialspyCommands = new HashSet<String>();
+
+		if (config.isList("socialspy-commands"))
+		{
+			for (String c : config.getStringList("socialspy-commands"))
+			{
+				socialspyCommands.add(c.toLowerCase(Locale.ENGLISH));
+			}
+		}
+		else
+		{
+			socialspyCommands.addAll(Arrays.asList("msg", "r", "mail", "m", "whisper", "emsg", "t", "tell", "er", "reply", "ereply", "email", "action", "describe", "eme", "eaction", "edescribe", "etell", "ewhisper", "pm"));
+		}
+
+		return socialspyCommands;
+	}
+
+	@Override
+	public Set<String> getSocialSpyCommands()
+	{
+		return socialSpyCommands;
 	}
 	private String nicknamePrefix = "~";
 
@@ -199,7 +331,7 @@ public final class Settings implements ISettings
 	}
 	private ConfigurationSection kits;
 
-	public ConfigurationSection _getKits()
+	private ConfigurationSection _getKits()
 	{
 		if (config.isConfigurationSection("kits"))
 		{
@@ -310,32 +442,30 @@ public final class Settings implements ISettings
 	{
 		return config.getString("backup.command", null);
 	}
-	private Map<String, MessageFormat> chatFormats = Collections.synchronizedMap(new HashMap<String, MessageFormat>());
+	private final Map<String, String> chatFormats = Collections.synchronizedMap(new HashMap<String, String>());
 
-	/*@Override //TODO: implement this
-	 public MessageFormat getChatFormat(String group)
-	 {
-	 MessageFormat mFormat = chatFormats.get(group);
-	 if (mFormat == null)
-	 {
-	 String format = config.getString("chat.group-formats." + (group == null ? "Default" : group),
-	 config.getString("chat.format", "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}"));
-	 format = Util.replaceFormat(format);
-	 format = format.replace("{DISPLAYNAME}", "%1$s");
-	 format = format.replace("{GROUP}", "{0}");
-	 format = format.replace("{MESSAGE}", "%2$s");
-	 format = format.replace("{WORLDNAME}", "{1}");
-	 format = format.replace("{SHORTWORLDNAME}", "{2}");
-	 format = format.replaceAll("\\{(\\D*?)\\}", "\\[$1\\]");
-	 format = "§r".concat(format);
-	 mFormat = new MessageFormat(format);
-	 chatFormats.put(group, mFormat);
-	 }
-	 return mFormat;
-	 }*/
-	public String getDefaultChatformat()
+	@Override
+	public String getChatFormat(String group)
 	{
-		return config.getString("chat.format", "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}");
+		String mFormat = chatFormats.get(group);
+		if (mFormat == null)
+		{
+			mFormat = config.getString("chat.group-formats." + (group == null ? "Default" : group),
+									   config.getString("chat.format", "&7[{GROUP}]&r {DISPLAYNAME}&7:&r {MESSAGE}"));
+			mFormat = FormatUtil.replaceFormat(mFormat);
+			mFormat = mFormat.replace("{DISPLAYNAME}", "%1$s");
+			mFormat = mFormat.replace("{MESSAGE}", "%2$s");
+			mFormat = mFormat.replace("{GROUP}", "{0}");
+			mFormat = mFormat.replace("{WORLD}", "{1}");
+			mFormat = mFormat.replace("{WORLDNAME}", "{1}");
+			mFormat = mFormat.replace("{SHORTWORLDNAME}", "{2}");
+			mFormat = mFormat.replace("{TEAMPREFIX}", "{3}");
+			mFormat = mFormat.replace("{TEAMSUFFIX}", "{4}");
+			mFormat = mFormat.replace("{TEAMNAME}", "{5}");
+			mFormat = "§r".concat(mFormat);
+			chatFormats.put(group, mFormat);
+		}
+		return mFormat;
 	}
 
 	@Override
@@ -345,9 +475,9 @@ public final class Settings implements ISettings
 	}
 
 	@Override
-	public String getAnnounceNewPlayerFormat()
+	public IText getAnnounceNewPlayerFormat()
 	{
-		return config.getString("newbies.announce-format", "&dWelcome {DISPLAYNAME} to the server!");
+		return new SimpleTextInput(FormatUtil.replaceFormat(config.getString("newbies.announce-format", "&dWelcome {DISPLAYNAME} to the server!")));
 	}
 
 	@Override
@@ -369,20 +499,41 @@ public final class Settings implements ISettings
 	}
 
 	@Override
-	public boolean getSortListByGroups()
+	public Map<String, Object> getListGroupConfig()
 	{
-		return config.getBoolean("sort-list-by-groups", true);
+		if (config.isConfigurationSection("list"))
+		{
+			Map<String, Object> values = config.getConfigurationSection("list").getValues(false);
+			if (!values.isEmpty())
+			{
+				return values;
+			}
+		}
+		Map<String, Object> defaultMap = new HashMap<String, Object>();
+		if (config.getBoolean("sort-list-by-groups", false))
+		{
+			defaultMap.put("ListByGroup", "ListByGroup");
+		}
+		else
+		{
+			defaultMap.put("Players", "*");
+		}
+		return defaultMap;
 	}
 
+	@Override
 	public void reloadConfig()
 	{
 		config.load();
 		noGodWorlds = new HashSet<String>(config.getStringList("no-god-in-worlds"));
 		enabledSigns = _getEnabledSigns();
+		teleportSafety = _isTeleportSafetyEnabled();
+		teleportInvulnerabilityTime = _getTeleportInvulnerability();
 		teleportInvulnerability = _isTeleportInvulnerability();
 		disableItemPickupWhileAfk = _getDisableItemPickupWhileAfk();
 		registerBackInListener = _registerBackInListener();
-		cancelAfkOnMove = _cancelAfkOnMove();
+		cancelAfkOnInteract = _cancelAfkOnInteract();
+		cancelAfkOnMove = _cancelAfkOnMove() && cancelAfkOnInteract;
 		getFreezeAfkPlayers = _getFreezeAfkPlayers();
 		itemSpawnBl = _getItemSpawnBlacklist();
 		loginAttackDelay = _getLoginAttackDelay();
@@ -400,9 +551,23 @@ public final class Settings implements ISettings
 		disablePrefix = _disablePrefix();
 		disableSuffix = _disableSuffix();
 		chatRadius = _getChatRadius();
+		chatShout = _getChatShout();
+		chatQuestion = _getChatQuestion();
 		commandCosts = _getCommandCosts();
+		socialSpyCommands = _getSocialSpyCommands();
 		warnOnBuildDisallow = _warnOnBuildDisallow();
 		mailsPerMinute = _getMailsPerMinute();
+		maxMoney = _getMaxMoney();
+		minMoney = _getMinMoney();
+		economyLagWarning = _getEconomyLagWarning();
+		economyLog = _isEcoLogEnabled();
+		economyLogUpdate = _isEcoLogUpdateEnabled();
+		economyDisabled = _isEcoDisabled();
+		allowSilentJoin = _isJoinQuitMessagesDisabled();
+		customJoinMessage = _getCustomJoinMessage();
+		isCustomJoinMessage = !customJoinMessage.equals("none");
+		customQuitMessage = _getCustomQuitMessage();
+		isCustomQuitMessage = !customQuitMessage.equals("none");
 	}
 	private List<Integer> itemSpawnBl = new ArrayList<Integer>();
 
@@ -417,7 +582,7 @@ public final class Settings implements ISettings
 		final List<Integer> epItemSpwn = new ArrayList<Integer>();
 		if (ess.getItemDb() == null)
 		{
-			ess.getLogger().log(Level.FINE, "Aborting ItemSpawnBL read, itemDB not yet loaded.");
+			logger.log(Level.FINE, "Aborting ItemSpawnBL read, itemDB not yet loaded.");
 			return epItemSpwn;
 		}
 		for (String itemName : config.getString("item-spawn-blacklist", "").split(","))
@@ -434,23 +599,23 @@ public final class Settings implements ISettings
 			}
 			catch (Exception ex)
 			{
-				ess.getLogger().log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", itemName, "item-spawn-blacklist"));
+				logger.log(Level.SEVERE, tl("unknownItemInList", itemName, "item-spawn-blacklist"));
 			}
 		}
 		return epItemSpwn;
 	}
-	private List<String> enabledSigns = new ArrayList<String>();
+	private List<EssentialsSign> enabledSigns = new ArrayList<EssentialsSign>();
 	private boolean signsEnabled = false;
 
 	@Override
-	public List<String> enabledSigns()
+	public List<EssentialsSign> enabledSigns()
 	{
 		return enabledSigns;
 	}
 
-	private List<String> _getEnabledSigns()
+	private List<EssentialsSign> _getEnabledSigns()
 	{
-		List<String> newSigns = new ArrayList<String>();
+		List<EssentialsSign> newSigns = new ArrayList<EssentialsSign>();
 
 		for (String signName : config.getStringList("enabledSigns"))
 		{
@@ -466,11 +631,11 @@ public final class Settings implements ISettings
 			}
 			try
 			{
-				newSigns.add(signName);
+				newSigns.add(Signs.valueOf(signName).getSign());
 			}
 			catch (Exception ex)
 			{
-				ess.getLogger().log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", signName, "enabledSigns"));
+				logger.log(Level.SEVERE, tl("unknownItemInList", signName, "enabledSigns"));
 				continue;
 			}
 			signsEnabled = true;
@@ -521,22 +686,32 @@ public final class Settings implements ISettings
 		return config.getString("locale", "");
 	}
 
+	//This method should always only return one character due to the implementation of the calling methods
+	//If you need to use a string currency, for example "coins", use the translation key 'currency'.
 	@Override
 	public String getCurrencySymbol()
 	{
 		return config.getString("currency-symbol", "$").concat("$").substring(0, 1).replaceAll("[0-9]", "$");
 	}
 
+	// #easteregg
 	@Override
 	public boolean isTradeInStacks(int id)
 	{
 		return config.getBoolean("trade-in-stacks-" + id, false);
 	}
+	// #easteregg
+	private boolean economyDisabled = false;
+
+	public boolean _isEcoDisabled()
+	{
+		return config.getBoolean("disable-eco", false);
+	}
 
 	@Override
 	public boolean isEcoDisabled()
 	{
-		return config.getBoolean("disable-eco", false);
+		return economyDisabled;
 	}
 
 	@Override
@@ -564,7 +739,7 @@ public final class Settings implements ISettings
 			}
 			catch (Exception ex)
 			{
-				ess.getLogger().log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", itemName, configName));
+				logger.log(Level.SEVERE, tl("unknownItemInList", itemName, configName));
 			}
 		}
 		return list;
@@ -581,43 +756,59 @@ public final class Settings implements ISettings
 	{
 		return config.getBoolean(configName, def);
 	}
-	private final static double MAXMONEY = 10000000000000.0;
+	private static final BigDecimal MAXMONEY = new BigDecimal("10000000000000");
+	private BigDecimal maxMoney = MAXMONEY;
 
-	@Override
-	public double getMaxMoney()
+	private BigDecimal _getMaxMoney()
 	{
-		double max = config.getDouble("max-money", MAXMONEY);
-		if (Math.abs(max) > MAXMONEY)
-		{
-			max = max < 0 ? -MAXMONEY : MAXMONEY;
-		}
-		return max;
+		return config.getBigDecimal("max-money", MAXMONEY);
 	}
-	private final static double MINMONEY = -10000000000000.0;
 
 	@Override
-	public double getMinMoney()
+	public BigDecimal getMaxMoney()
 	{
-		double min = config.getDouble("min-money", MINMONEY);
-		if (min > 0)
+		return maxMoney;
+	}
+	private static final BigDecimal MINMONEY = new BigDecimal("-10000000000000");
+	private BigDecimal minMoney = MINMONEY;
+
+	private BigDecimal _getMinMoney()
+	{
+		BigDecimal min = config.getBigDecimal("min-money", MINMONEY);
+		if (min.signum() > 0)
 		{
-			min = -min;
-		}
-		if (min < MINMONEY)
-		{
-			min = MINMONEY;
+			min = min.negate();
 		}
 		return min;
 	}
 
+	@Override
+	public BigDecimal getMinMoney()
+	{
+		return minMoney;
+	}
+	private boolean economyLog = false;
+
 	@Override
 	public boolean isEcoLogEnabled()
+	{
+		return economyLog;
+	}
+
+	public boolean _isEcoLogEnabled()
 	{
 		return config.getBoolean("economy-log-enabled", false);
 	}
+	// #easteregg
+	private boolean economyLogUpdate = false;
 
 	@Override
 	public boolean isEcoLogUpdateEnabled()
+	{
+		return economyLogUpdate;
+	}
+
+	public boolean _isEcoLogUpdateEnabled()
 	{
 		return config.getBoolean("economy-log-update-enabled", false);
 	}
@@ -682,6 +873,7 @@ public final class Settings implements ISettings
 	{
 		return prefixsuffixconfigured ? addprefixsuffix : essentialsChatActive;
 	}
+	// #easteregg
 	private boolean disablePrefix = false;
 
 	private boolean _disablePrefix()
@@ -694,6 +886,7 @@ public final class Settings implements ISettings
 	{
 		return disablePrefix;
 	}
+	// #easteregg
 	private boolean disableSuffix = false;
 
 	private boolean _disableSuffix()
@@ -742,6 +935,18 @@ public final class Settings implements ISettings
 	{
 		return config.getBoolean("cancel-afk-on-move", true);
 	}
+	private boolean cancelAfkOnInteract;
+
+	@Override
+	public boolean cancelAfkOnInteract()
+	{
+		return cancelAfkOnInteract;
+	}
+
+	private boolean _cancelAfkOnInteract()
+	{
+		return config.getBoolean("cancel-afk-on-interact", true);
+	}
 
 	@Override
 	public boolean areDeathMessagesEnabled()
@@ -768,6 +973,12 @@ public final class Settings implements ISettings
 		return config.getBoolean("repair-enchanted", true);
 	}
 
+	@Override
+	public boolean allowUnsafeEnchantments()
+	{
+		return config.getBoolean("unsafe-enchantments", false);
+	}
+
 	@Override
 	public boolean isWorldTeleportPermissions()
 	{
@@ -834,7 +1045,7 @@ public final class Settings implements ISettings
 	@Override
 	public long getTpaAcceptCancellation()
 	{
-		return config.getLong("tpa-accept-cancellation", 0);
+		return config.getLong("tpa-accept-cancellation", 120);
 	}
 
 	@Override
@@ -848,13 +1059,19 @@ public final class Settings implements ISettings
 	{
 		this.metricsEnabled = metricsEnabled;
 	}
-	private boolean teleportInvulnerability;
+	private long teleportInvulnerabilityTime;
+
+	private long _getTeleportInvulnerability()
+	{
+		return config.getLong("teleport-invulnerability", 0) * 1000;
+	}
 
 	@Override
 	public long getTeleportInvulnerability()
 	{
-		return config.getLong("teleport-invulnerability", 0) * 1000;
+		return teleportInvulnerabilityTime;
 	}
+	private boolean teleportInvulnerability;
 
 	private boolean _isTeleportInvulnerability()
 	{
@@ -895,12 +1112,10 @@ public final class Settings implements ISettings
 	@Override
 	public double getMaxFlySpeed()
 	{
-		double maxSpeed = config.getDouble("max-fly-speed", 1.0);
+		double maxSpeed = config.getDouble("max-fly-speed", 0.8);
 		return maxSpeed > 1.0 ? 1.0 : Math.abs(maxSpeed);
 	}
 
-	//This option does not exist in the config.yml because it wasn't yet implemented in bukkit
-	//The code was commented out in the /speed command
 	@Override
 	public double getMaxWalkSpeed()
 	{
@@ -919,4 +1134,89 @@ public final class Settings implements ISettings
 	{
 		return mailsPerMinute;
 	}
+	// #easteregg
+	private long economyLagWarning;
+
+	private long _getEconomyLagWarning()
+	{
+		// Default to 20ms
+		final long value = (long)(config.getDouble("economy-lag-warning", 20.0) * 1000000);
+		return value;
+	}
+
+	@Override
+	public long getEconomyLagWarning()
+	{
+		return economyLagWarning;
+	}
+
+	@Override
+	public long getMaxTempban()
+	{
+		return config.getLong("max-tempban-time", -1);
+	}
+
+	@Override
+	public int getMaxNickLength()
+	{
+		return config.getInt("max-nick-length", 30);
+	}
+	private boolean allowSilentJoin;
+
+	public boolean _isJoinQuitMessagesDisabled()
+	{
+		return config.getBoolean("allow-silent-join-quit");
+	}
+
+	@Override
+	public boolean allowSilentJoinQuit()
+	{
+		return allowSilentJoin;
+	}
+	private String customJoinMessage;
+	private boolean isCustomJoinMessage;
+
+	public String _getCustomJoinMessage()
+	{
+		return FormatUtil.replaceFormat(config.getString("custom-join-message", "none"));
+	}
+
+	@Override
+	public String getCustomJoinMessage()
+	{
+		return customJoinMessage;
+	}
+
+	@Override
+	public boolean isCustomJoinMessage()
+	{
+		return isCustomJoinMessage;
+	}
+	private String customQuitMessage;
+	private boolean isCustomQuitMessage;
+
+	public String _getCustomQuitMessage()
+	{
+		return FormatUtil.replaceFormat(config.getString("custom-quit-message", "none"));
+	}
+
+	@Override
+	public String getCustomQuitMessage()
+	{
+		return customQuitMessage;
+	}
+
+	@Override
+	public boolean isCustomQuitMessage()
+	{
+		return isCustomQuitMessage;
+	}
+
+	// #easteregg
+	@Override
+	public int getMaxUserCacheCount()
+	{
+		long count = Runtime.getRuntime().maxMemory() / 1024 / 96;
+		return config.getInt("max-user-cache-count", (int)count);
+	}
 }

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

@@ -0,0 +1,308 @@
+package com.earth2me.essentials;
+
+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;
+import java.util.Locale;
+import java.util.Set;
+import net.ess3.api.IEssentials;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.block.Block;
+import org.bukkit.entity.*;
+import org.bukkit.inventory.EntityEquipment;
+import org.bukkit.inventory.ItemStack;
+
+
+public class SpawnMob
+{
+	public static String mobList(final User user)
+	{
+		final Set<String> mobList = Mob.getMobList();
+		final Set<String> availableList = new HashSet<String>();
+		for (String mob : mobList)
+		{
+			if (user.isAuthorized("essentials.spawnmob." + mob.toLowerCase(Locale.ENGLISH)))
+			{
+				availableList.add(mob);
+			}
+		}
+		if (availableList.isEmpty())
+		{
+			availableList.add(tl("none"));
+		}
+		return StringUtil.joinList(availableList);
+	}
+
+	public static List<String> mobParts(final String mobString)
+	{
+		String[] mobParts = mobString.split(",");
+
+		List<String> mobs = new ArrayList<String>();
+
+		for (String mobPart : mobParts)
+		{
+			String[] mobDatas = mobPart.split(":");
+			mobs.add(mobDatas[0]);
+		}
+		return mobs;
+	}
+
+	public static List<String> mobData(final String mobString)
+	{
+		String[] mobParts = mobString.split(",");
+
+		List<String> mobData = new ArrayList<String>();
+
+		for (String mobPart : mobParts)
+		{
+			String[] mobDatas = mobPart.split(":");
+			if (mobDatas.length == 1)
+			{
+				if (mobPart.contains(":"))
+				{
+					mobData.add("");
+				}
+				else
+				{
+					mobData.add(null);
+				}
+			}
+			else
+			{
+				mobData.add(mobDatas[1]);
+			}
+		}
+
+		return mobData;
+	}
+
+	// This method spawns a mob where the user is looking, owned by user
+	public static void spawnmob(final IEssentials ess, final Server server, final User user, final List<String> parts, final List<String> data, int mobCount) throws Exception
+	{
+		final Block block = LocationUtil.getTarget(user.getBase()).getBlock();
+		if (block == null)
+		{
+			throw new Exception(tl("unableToSpawnMob"));
+		}
+		spawnmob(ess, server, user.getSource(), user, block.getLocation(), parts, data, mobCount);
+	}
+
+	// This method spawns a mob at target, owned by target
+	public static void spawnmob(final IEssentials ess, final Server server, final CommandSource sender, final User target, final List<String> parts, final List<String> data, int mobCount) throws Exception
+	{
+		spawnmob(ess, server, sender, target, target.getLocation(), parts, data, mobCount);
+	}
+
+	// This method spawns a mob at loc, owned by target
+	public static void spawnmob(final IEssentials ess, final Server server, final CommandSource sender, final User target, final Location loc, final List<String> parts, final List<String> data, int mobCount) throws Exception
+	{
+		final Location sloc = LocationUtil.getSafeDestination(loc);
+
+		for (int i = 0; i < parts.size(); i++)
+		{
+			Mob mob = Mob.fromName(parts.get(i));
+			checkSpawnable(ess, sender, mob);
+		}
+
+		final int serverLimit = ess.getSettings().getSpawnMobLimit();
+		int effectiveLimit = serverLimit / parts.size();
+
+		if (effectiveLimit < 1)
+		{
+			effectiveLimit = 1;
+			while (parts.size() > serverLimit)
+			{
+				parts.remove(serverLimit);
+			}
+		}
+
+		if (mobCount > effectiveLimit)
+		{
+			mobCount = effectiveLimit;
+			sender.sendMessage(tl("mobSpawnLimit"));
+		}
+
+		Mob mob = Mob.fromName(parts.get(0)); // Get the first mob
+		try
+		{
+			for (int i = 0; i < mobCount; i++)
+			{
+				spawnMob(ess, server, sender, target, sloc, parts, data);
+			}
+			sender.sendMessage(mobCount * parts.size() + " " + mob.name.toLowerCase(Locale.ENGLISH) + mob.suffix + " " + tl("spawned"));
+		}
+		catch (MobException e1)
+		{
+			throw new Exception(tl("unableToSpawnMob"), e1);
+		}
+		catch (NumberFormatException e2)
+		{
+			throw new Exception(tl("numberRequired"), e2);
+		}
+		catch (NullPointerException np)
+		{
+			throw new Exception(tl("soloMob"), np);
+		}
+	}
+
+	private static void spawnMob(final IEssentials ess, final Server server, final CommandSource sender, final User target, final Location sloc, List<String> parts, List<String> data) throws Exception
+	{
+		Mob mob;
+		Entity spawnedMob = null;
+		Entity spawnedMount;
+
+		for (int i = 0; i < parts.size(); i++)
+		{
+			if (i == 0)
+			{
+				mob = Mob.fromName(parts.get(i));
+				spawnedMob = mob.spawn(sloc.getWorld(), server, sloc);
+				defaultMobData(mob.getType(), spawnedMob);
+
+				if (data.get(i) != null)
+				{
+					changeMobData(sender, mob.getType(), spawnedMob, data.get(i).toLowerCase(Locale.ENGLISH), target);
+				}
+			}
+
+			int next = (i + 1);
+			if (next < parts.size()) //If it's the last mob in the list, don't set the mount
+			{
+				Mob mMob = Mob.fromName(parts.get(next));
+				spawnedMount = mMob.spawn(sloc.getWorld(), server, sloc);
+				defaultMobData(mMob.getType(), spawnedMount);
+
+				if (data.get(next) != null)
+				{
+					changeMobData(sender, mMob.getType(), spawnedMount, data.get(next).toLowerCase(Locale.ENGLISH), target);
+				}
+
+				spawnedMob.setPassenger(spawnedMount);
+
+				spawnedMob = spawnedMount;
+			}
+		}
+	}
+
+	private static void checkSpawnable(IEssentials ess, CommandSource sender, Mob mob) throws Exception
+	{
+		if (mob == null)
+		{
+			throw new Exception(tl("invalidMob"));
+		}
+
+		if (ess.getSettings().getProtectPreventSpawn(mob.getType().toString().toLowerCase(Locale.ENGLISH)))
+		{
+			throw new Exception(tl("disabledToSpawnMob"));
+		}
+
+		if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.spawnmob." + mob.name.toLowerCase(Locale.ENGLISH)))
+		{
+			throw new Exception(tl("noPermToSpawnMob"));
+		}
+	}
+
+	private static void changeMobData(final CommandSource sender, final EntityType type, final Entity spawned, final String inputData, final User target) throws Exception
+	{
+		String data = inputData;
+
+		if (data.isEmpty())
+		{
+			sender.sendMessage(tl("mobDataList", StringUtil.joinList(MobData.getValidHelp(spawned))));
+		}
+
+		if (spawned instanceof Zombie || type == EntityType.SKELETON)
+		{
+			if (inputData.contains("armor") || inputData.contains("armour"))
+			{
+				final EntityEquipment invent = ((LivingEntity)spawned).getEquipment();
+				if (inputData.contains("noarmor") || inputData.contains("noarmour"))
+				{
+					invent.clear();
+				}
+				else if (inputData.contains("diamond"))
+				{
+					invent.setBoots(new ItemStack(Material.DIAMOND_BOOTS, 1));
+					invent.setLeggings(new ItemStack(Material.DIAMOND_LEGGINGS, 1));
+					invent.setChestplate(new ItemStack(Material.DIAMOND_CHESTPLATE, 1));
+					invent.setHelmet(new ItemStack(Material.DIAMOND_HELMET, 1));
+				}
+				else if (inputData.contains("gold"))
+				{
+					invent.setBoots(new ItemStack(Material.GOLD_BOOTS, 1));
+					invent.setLeggings(new ItemStack(Material.GOLD_LEGGINGS, 1));
+					invent.setChestplate(new ItemStack(Material.GOLD_CHESTPLATE, 1));
+					invent.setHelmet(new ItemStack(Material.GOLD_HELMET, 1));
+				}
+				else if (inputData.contains("leather"))
+				{
+					invent.setBoots(new ItemStack(Material.LEATHER_BOOTS, 1));
+					invent.setLeggings(new ItemStack(Material.LEATHER_LEGGINGS, 1));
+					invent.setChestplate(new ItemStack(Material.LEATHER_CHESTPLATE, 1));
+					invent.setHelmet(new ItemStack(Material.LEATHER_HELMET, 1));
+				}
+				else
+				{
+					invent.setBoots(new ItemStack(Material.IRON_BOOTS, 1));
+					invent.setLeggings(new ItemStack(Material.IRON_LEGGINGS, 1));
+					invent.setChestplate(new ItemStack(Material.IRON_CHESTPLATE, 1));
+					invent.setHelmet(new ItemStack(Material.IRON_HELMET, 1));
+				}
+				invent.setBootsDropChance(0f);
+				invent.setLeggingsDropChance(0f);
+				invent.setChestplateDropChance(0f);
+				invent.setHelmetDropChance(0f);
+			}
+
+		}
+
+		MobData newData = MobData.fromData(spawned, data);
+		while (newData != null)
+		{
+			newData.setData(spawned, target.getBase(), data);
+			data = data.replace(newData.getMatched(), "");
+			newData = MobData.fromData(spawned, data);
+		}
+	}
+
+	private static void defaultMobData(final EntityType type, final Entity spawned)
+	{
+		if (type == EntityType.SKELETON)
+		{
+			final EntityEquipment invent = ((LivingEntity)spawned).getEquipment();
+			invent.setItemInHand(new ItemStack(Material.BOW, 1));
+			invent.setItemInHandDropChance(0.1f);
+
+			invent.setBoots(new ItemStack(Material.GOLD_BOOTS, 1));
+			invent.setBootsDropChance(0.0f);
+		}
+
+		if (type == EntityType.PIG_ZOMBIE)
+		{
+			final EntityEquipment invent = ((LivingEntity)spawned).getEquipment();
+			invent.setItemInHand(new ItemStack(Material.GOLD_SWORD, 1));
+			invent.setItemInHandDropChance(0.1f);
+
+			invent.setBoots(new ItemStack(Material.GOLD_BOOTS, 1));
+			invent.setBootsDropChance(0.0f);
+		}
+
+		if (type == EntityType.ZOMBIE)
+		{
+			final EntityEquipment invent = ((LivingEntity)spawned).getEquipment();
+			invent.setBoots(new ItemStack(Material.GOLD_BOOTS, 1));
+			invent.setBootsDropChance(0.0f);
+		}
+
+		if (type == EntityType.HORSE)
+		{
+			((Horse)spawned).setJumpStrength(1.2);
+		}
+	}
+}

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

@@ -0,0 +1,62 @@
+package com.earth2me.essentials;
+
+import net.ess3.api.IEssentials;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityExplodeEvent;
+
+
+public class TNTExplodeListener implements Listener, Runnable
+{
+	private final transient IEssentials ess;
+	private transient boolean enabled = false;
+	private transient int timer = -1;
+
+	public TNTExplodeListener(final IEssentials ess)
+	{
+		super();
+		this.ess = ess;
+	}
+
+	public void enable()
+	{
+		if (!enabled)
+		{
+			enabled = true;
+			timer = ess.scheduleSyncDelayedTask(this, 200);
+			return;
+		}
+		if (timer != -1)
+		{
+			ess.getScheduler().cancelTask(timer);
+			timer = ess.scheduleSyncDelayedTask(this, 200);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOW)
+	public void onEntityExplode(final EntityExplodeEvent event)
+	{
+		if (!enabled)
+		{
+			return;
+		}
+		if (event.getEntity() instanceof LivingEntity)
+		{
+			return;
+		}
+		if (event.blockList().size() < 1)
+		{
+			return;
+		}
+		event.setCancelled(true);
+		event.getLocation().getWorld().createExplosion(event.getLocation(), 0F);
+	}
+
+	@Override
+	public void run()
+	{
+		enabled = false;
+	}
+}

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

@@ -0,0 +1,292 @@
+package com.earth2me.essentials;
+
+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;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+
+
+public class Teleport implements net.ess3.api.ITeleport
+{
+	private final IUser teleportOwner;
+	private final IEssentials ess;
+	private TimedTeleport timedTeleport;
+
+	public Teleport(IUser user, IEssentials ess)
+	{
+		this.teleportOwner = user;
+		this.ess = ess;
+	}
+
+	public void cooldown(boolean check) throws Exception
+	{
+		final Calendar time = new GregorianCalendar();
+		if (teleportOwner.getLastTeleportTimestamp() > 0)
+		{
+			// Take the current time, and remove the delay from it.
+			final double cooldown = ess.getSettings().getTeleportCooldown();
+			final Calendar earliestTime = new GregorianCalendar();
+			earliestTime.add(Calendar.SECOND, -(int)cooldown);
+			earliestTime.add(Calendar.MILLISECOND, -(int)((cooldown * 1000.0) % 1000.0));
+			// This value contains the most recent time a teleportPlayer could have been used that would allow another use.
+			final long earliestLong = earliestTime.getTimeInMillis();
+
+			// When was the last teleportPlayer used?
+			final Long lastTime = teleportOwner.getLastTeleportTimestamp();
+
+			if (lastTime > time.getTimeInMillis())
+			{
+				// This is to make sure time didn't get messed up on last teleportPlayer use.
+				// If this happens, let's give the user the benifit of the doubt.
+				teleportOwner.setLastTeleportTimestamp(time.getTimeInMillis());
+				return;
+			}
+			else if (lastTime > earliestLong && !teleportOwner.isAuthorized("essentials.teleport.cooldown.bypass"))
+			{
+				time.setTimeInMillis(lastTime);
+				time.add(Calendar.SECOND, (int)cooldown);
+				time.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
+				throw new Exception(tl("timeBeforeTeleport", DateUtil.formatDateDiff(time.getTimeInMillis())));
+			}
+		}
+		// if justCheck is set, don't update lastTeleport; we're just checking
+		if (!check)
+		{
+			teleportOwner.setLastTeleportTimestamp(time.getTimeInMillis());
+		}
+	}
+
+	private void warnUser(final IUser user, final double delay)
+	{
+		Calendar c = new GregorianCalendar();
+		c.add(Calendar.SECOND, (int)delay);
+		c.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
+		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.
+	@Override
+	public void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception
+	{
+		if (cooldown)
+		{
+			cooldown(false);
+		}
+		final ITarget target = new LocationTarget(loc);
+		now(teleportOwner, target, cause);
+	}
+
+	@Override
+	public void now(Player entity, boolean cooldown, TeleportCause cause) throws Exception
+	{
+		if (cooldown)
+		{
+			cooldown(false);
+		}
+		final ITarget target = new PlayerTarget(entity);
+		now(teleportOwner, target, cause);
+		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
+	{
+		cancel(false);
+		teleportee.setLastLocation();
+		final Location loc = target.getLocation();
+
+		if (LocationUtil.isBlockUnsafe(loc.getWorld(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()))
+		{
+			if (ess.getSettings().isTeleportSafetyEnabled())
+			{
+				if (teleportee.getBase().isInsideVehicle())
+				{
+					teleportee.getBase().leaveVehicle();
+				}
+				teleportee.getBase().teleport(LocationUtil.getSafeDestination(teleportee, loc), cause);
+			}
+			else
+			{
+				throw new Exception(tl("unsafeTeleportDestination", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+			}
+		}
+		else
+		{
+			if (teleportee.getBase().isInsideVehicle())
+			{
+				teleportee.getBase().leaveVehicle();
+			}
+			teleportee.getBase().teleport(LocationUtil.getRoundedDestination(loc), cause);
+		}
+	}
+
+	//The teleportPlayer function is used when you want to normally teleportPlayer someone to a location or player.
+	//This method is nolonger used internally and will be removed.
+	@Deprecated
+	@Override
+	public void teleport(Location loc, Trade chargeFor) throws Exception
+	{
+		teleport(loc, chargeFor, TeleportCause.PLUGIN);
+	}
+
+	@Override
+	public void teleport(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		teleport(teleportOwner, new LocationTarget(loc), chargeFor, cause);
+	}
+
+	//This is used when teleporting to a player
+	@Override
+	public void teleport(Player entity, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		ITarget target = new PlayerTarget(entity);
+		teleport(teleportOwner, target, chargeFor, cause);
+		teleportOwner.sendMessage(tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ()));
+	}
+
+	//This is used when teleporting to stored location
+	@Override
+	public void teleportPlayer(IUser teleportee, Location loc, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		teleport(teleportee, new LocationTarget(loc), chargeFor, cause);
+	}
+
+	//This is used on /tphere
+	@Override
+	public void teleportPlayer(IUser teleportee, Player entity, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		ITarget target = new PlayerTarget(entity);
+		teleport(teleportee, target, chargeFor, cause);
+		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
+	{
+		double delay = ess.getSettings().getTeleportDelay();
+
+		Trade cashCharge = chargeFor;
+
+		if (chargeFor != null)
+		{
+			chargeFor.isAffordableFor(teleportOwner);
+			
+			//This code is to make sure that commandcosts are checked in the initial world, and not in the resulting world.
+			if (!chargeFor.getCommandCost(teleportOwner).equals(BigDecimal.ZERO))
+			{
+				//By converting a command cost to a regular cost, the command cost permission isn't checked when executing the charge after teleport.
+				cashCharge = new Trade(chargeFor.getCommandCost(teleportOwner), ess);
+			}
+		}
+
+		cooldown(true);
+		if (delay <= 0 || teleportOwner.isAuthorized("essentials.teleport.timer.bypass")
+			|| teleportee.isAuthorized("essentials.teleport.timer.bypass"))
+		{
+			cooldown(false);
+			now(teleportee, target, cause);
+			if (cashCharge != null)
+			{
+				cashCharge.charge(teleportOwner);
+			}
+			return;
+		}
+
+		cancel(false);
+		warnUser(teleportee, delay);
+		initTimer((long)(delay * 1000.0), teleportee, target, cashCharge, cause, false);
+	}
+
+	//The respawn function is a wrapper used to handle tp fallback, on /jail and /home
+	@Override
+	public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		double delay = ess.getSettings().getTeleportDelay();
+		if (chargeFor != null)
+		{
+			chargeFor.isAffordableFor(teleportOwner);
+		}
+		cooldown(true);
+		if (delay <= 0 || teleportOwner.isAuthorized("essentials.teleport.timer.bypass"))
+		{
+			cooldown(false);
+			respawnNow(teleportOwner, cause);
+			if (chargeFor != null)
+			{
+				chargeFor.charge(teleportOwner);
+			}
+			return;
+		}
+
+		cancel(false);
+		warnUser(teleportOwner, delay);
+		initTimer((long)(delay * 1000.0), teleportOwner, null, chargeFor, cause, true);
+	}
+
+	protected void respawnNow(IUser teleportee, TeleportCause cause) throws Exception
+	{
+		final Player player = teleportee.getBase();
+		Location bed = player.getBedSpawnLocation();
+		if (bed != null)
+		{
+			now(teleportee, new LocationTarget(bed), cause);
+		}
+		else
+		{
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().info("Could not find bed spawn, forcing respawn event.");
+			}
+			final PlayerRespawnEvent pre = new PlayerRespawnEvent(player, player.getWorld().getSpawnLocation(), false);
+			ess.getServer().getPluginManager().callEvent(pre);
+			now(teleportee, new LocationTarget(pre.getRespawnLocation()), cause);
+		}
+	}
+
+	//The warp function is a wrapper used to teleportPlayer a player to a /warp
+	@Override
+	public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		Location loc = ess.getWarps().getWarp(warp);
+		teleportee.sendMessage(tl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+		teleport(teleportee, new LocationTarget(loc), chargeFor, cause);
+	}
+
+	//The back function is a wrapper used to teleportPlayer a player /back to their previous location.
+	@Override
+	public void back(Trade chargeFor) throws Exception
+	{
+		final Location loc = teleportOwner.getLastLocation();
+		teleportOwner.sendMessage(tl("backUsageMsg", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+		teleport(teleportOwner, new LocationTarget(loc), chargeFor, TeleportCause.COMMAND);
+	}
+
+	//This function is used to throw a user back after a jail sentence
+	@Override
+	public void back() throws Exception
+	{
+		now(teleportOwner, new LocationTarget(teleportOwner.getLastLocation()), TeleportCause.COMMAND);
+	}
+
+	//If we need to cancelTimer a pending teleportPlayer call this method
+	private void cancel(boolean notifyUser)
+	{
+		if (timedTeleport != null)
+		{
+			timedTeleport.cancelTimer(notifyUser);
+			timedTeleport = null;
+		}
+	}
+
+	private void initTimer(long delay, IUser teleportUser, ITarget target, Trade chargeFor, TeleportCause cause, boolean respawn)
+	{
+		timedTeleport = new TimedTeleport(teleportOwner, ess, this, delay, teleportUser, target, chargeFor, cause, respawn);
+	}
+}

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

@@ -0,0 +1,160 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n.tl;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
+import org.bukkit.Location;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+
+
+public class TimedTeleport implements Runnable
+{
+	private static final double MOVE_CONSTANT = 0.3;
+	private final IUser teleportOwner;
+	private final IEssentials ess;
+	private final Teleport teleport;
+	private final String timer_teleportee;
+	private int timer_task = -1;
+	private final long timer_started;	// time this task was initiated
+	private final long timer_delay;		// how long to delay the teleportPlayer
+	private double timer_health;
+	// note that I initially stored a clone of the location for reference, but...
+	// when comparing locations, I got incorrect mismatches (rounding errors, looked like)
+	// so, the X/Y/Z values are stored instead and rounded off
+	private final long timer_initX;
+	private final long timer_initY;
+	private final long timer_initZ;
+	private final ITarget timer_teleportTarget;
+	private final boolean timer_respawn;
+	private final boolean timer_canMove;
+	private final Trade timer_chargeFor;
+	private final TeleportCause timer_cause;
+
+	public TimedTeleport(IUser user, IEssentials ess, Teleport teleport, long delay, IUser teleportUser, ITarget target, Trade chargeFor, TeleportCause cause, boolean respawn)
+	{
+
+		this.teleportOwner = user;
+		this.ess = ess;
+		this.teleport = teleport;
+		this.timer_started = System.currentTimeMillis();
+		this.timer_delay = delay;
+		this.timer_health = teleportUser.getBase().getHealth();
+		this.timer_initX = Math.round(teleportUser.getBase().getLocation().getX() * MOVE_CONSTANT);
+		this.timer_initY = Math.round(teleportUser.getBase().getLocation().getY() * MOVE_CONSTANT);
+		this.timer_initZ = Math.round(teleportUser.getBase().getLocation().getZ() * MOVE_CONSTANT);
+		this.timer_teleportee = teleportUser.getName();
+		this.timer_teleportTarget = target;
+		this.timer_chargeFor = chargeFor;
+		this.timer_cause = cause;
+		this.timer_respawn = respawn;
+		this.timer_canMove = user.isAuthorized("essentials.teleport.timer.move");
+
+		timer_task = ess.scheduleSyncRepeatingTask(this, 20, 20);
+	}
+
+	@Override
+	public void run()
+	{
+
+		if (teleportOwner == null || !teleportOwner.getBase().isOnline() || teleportOwner.getBase().getLocation() == null)
+		{
+			cancelTimer(false);
+			return;
+		}
+
+		IUser teleportUser = ess.getUser(this.timer_teleportee);
+
+		if (teleportUser == null || !teleportUser.getBase().isOnline())
+		{
+			cancelTimer(false);
+			return;
+		}
+
+		final Location currLocation = teleportUser.getBase().getLocation();
+		if (currLocation == null)
+		{
+			cancelTimer(false);
+			return;
+		}
+
+		if (!timer_canMove
+			&& (Math.round(currLocation.getX() * MOVE_CONSTANT) != timer_initX
+				|| Math.round(currLocation.getY() * MOVE_CONSTANT) != timer_initY
+				|| Math.round(currLocation.getZ() * MOVE_CONSTANT) != timer_initZ
+				|| teleportUser.getBase().getHealth() < timer_health))
+		{
+			// user moved, cancelTimer teleportPlayer
+			cancelTimer(true);
+			return;
+		}
+
+		timer_health = teleportUser.getBase().getHealth();  // in case user healed, then later gets injured
+		final long now = System.currentTimeMillis();
+		if (now > timer_started + timer_delay)
+		{
+			try
+			{
+				teleport.cooldown(false);
+			}
+			catch (Exception ex)
+			{
+				teleportOwner.sendMessage(tl("cooldownWithMessage", ex.getMessage()));
+				if (teleportOwner != teleportUser)
+				{
+					teleportUser.sendMessage(tl("cooldownWithMessage", ex.getMessage()));
+				}
+			}
+			try
+			{
+				cancelTimer(false);
+				teleportUser.sendMessage(tl("teleportationCommencing"));
+				if (timer_chargeFor != null)
+				{
+					timer_chargeFor.isAffordableFor(teleportOwner);
+				}
+				if (timer_respawn)
+				{
+					teleport.respawnNow(teleportUser, timer_cause);
+				}
+				else
+				{
+					teleport.now(teleportUser, timer_teleportTarget, timer_cause);
+				}
+				if (timer_chargeFor != null)
+				{
+					timer_chargeFor.charge(teleportOwner);
+				}
+			}
+			catch (Exception ex)
+			{
+				ess.showError(teleportOwner.getSource(), ex, "\\ teleport");
+			}
+
+		}
+	}
+
+	//If we need to cancelTimer a pending teleportPlayer call this method
+	public void cancelTimer(boolean notifyUser)
+	{
+		if (timer_task == -1)
+		{
+			return;
+		}
+		try
+		{
+			ess.getServer().getScheduler().cancelTask(timer_task);
+			if (notifyUser)
+			{
+				teleportOwner.sendMessage(tl("pendingTeleportCancelled"));
+				if (timer_teleportee != null && !timer_teleportee.equals(teleportOwner.getName()))
+				{
+					ess.getUser(timer_teleportee).sendMessage(tl("pendingTeleportCancelled"));
+				}
+			}
+		}
+		finally
+		{
+			timer_task = -1;
+		}
+	}
+}

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

@@ -0,0 +1,451 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import com.earth2me.essentials.craftbukkit.SetExpFix;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
+import net.ess3.api.MaxMoneyException;
+import org.bukkit.Location;
+import org.bukkit.entity.Item;
+import org.bukkit.inventory.ItemStack;
+
+
+public class Trade
+{
+	private final transient String command;
+	private final transient Trade fallbackTrade;
+	private final transient BigDecimal money;
+	private final transient ItemStack itemStack;
+	private final transient Integer exp;
+	private final transient com.earth2me.essentials.IEssentials ess;
+
+
+	public enum TradeType
+	{
+		MONEY,
+		EXP,
+		ITEM
+	}
+
+
+	public enum OverflowType
+	{
+		ABORT,
+		DROP,
+		RETURN
+	}
+
+	public Trade(final String command, final IEssentials ess)
+	{
+		this(command, null, null, null, null, ess);
+	}
+
+	public Trade(final String command, final Trade fallback, final IEssentials ess)
+	{
+		this(command, fallback, null, null, null, ess);
+	}
+
+	@Deprecated
+	public Trade(final double money, final com.earth2me.essentials.IEssentials ess)
+	{
+		this(null, null, BigDecimal.valueOf(money), null, null, ess);
+	}
+
+	public Trade(final BigDecimal money, final IEssentials ess)
+	{
+		this(null, null, money, null, null, ess);
+	}
+
+	public Trade(final ItemStack items, final IEssentials ess)
+	{
+		this(null, null, null, items, null, ess);
+	}
+
+	public Trade(final int exp, final IEssentials ess)
+	{
+		this(null, null, null, null, exp, ess);
+	}
+
+	private Trade(final String command, final Trade fallback, final BigDecimal money, final ItemStack item, final Integer exp, final com.earth2me.essentials.IEssentials ess)
+	{
+		this.command = command;
+		this.fallbackTrade = fallback;
+		this.money = money;
+		this.itemStack = item;
+		this.exp = exp;
+		this.ess = ess;
+	}
+
+	public void isAffordableFor(final IUser user) throws ChargeException
+	{
+
+		if (ess.getSettings().isDebug())
+		{
+			ess.getLogger().log(Level.INFO, "checking if " + user.getName() + " can afford charge.");
+		}
+
+		if (getMoney() != null
+			&& getMoney().signum() > 0
+			&& !user.canAfford(getMoney()))
+		{
+			throw new ChargeException(tl("notEnoughMoney"));
+		}
+
+		if (getItemStack() != null
+			&& !user.getBase().getInventory().containsAtLeast(itemStack, itemStack.getAmount()))
+		{
+			throw new ChargeException(tl("missingItems", getItemStack().getAmount(), ess.getItemDb().name(getItemStack())));
+		}
+
+		BigDecimal money;
+		if (command != null && !command.isEmpty()
+			&& (money = getCommandCost(user)).signum() > 0
+			&& !user.canAfford(money))
+		{
+			throw new ChargeException(tl("notEnoughMoney"));
+		}
+
+		if (exp != null && exp > 0
+			&& SetExpFix.getTotalExperience(user.getBase()) < exp)
+		{
+			throw new ChargeException(tl("notEnoughExperience"));
+		}
+	}
+
+	public boolean pay(final IUser user) throws MaxMoneyException
+	{
+		return pay(user, OverflowType.ABORT) == null;
+	}
+
+	public Map<Integer, ItemStack> pay(final IUser user, final OverflowType type) throws MaxMoneyException
+	{
+		if (getMoney() != null && getMoney().signum() > 0)
+		{
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.INFO, "paying user " + user.getName() + " via trade " + getMoney().toPlainString());
+			}
+			user.giveMoney(getMoney());
+		}
+		if (getItemStack() != null)
+		{
+			// This stores the would be overflow
+			Map<Integer, ItemStack> overFlow = InventoryWorkaround.addAllItems(user.getBase().getInventory(), getItemStack());
+
+			if (overFlow != null)
+			{
+				switch (type)
+				{
+				case ABORT:
+					if (ess.getSettings().isDebug())
+					{
+						ess.getLogger().log(Level.INFO, "abort paying " + user.getName() + " itemstack " + getItemStack().toString() + " due to lack of inventory space ");
+					}
+
+					return overFlow;
+
+				case RETURN:
+					// Pay the user the items, and return overflow
+					final Map<Integer, ItemStack> returnStack = InventoryWorkaround.addItems(user.getBase().getInventory(), getItemStack());
+					user.getBase().updateInventory();
+
+					if (ess.getSettings().isDebug())
+					{
+						ess.getLogger().log(Level.INFO, "paying " + user.getName() + " partial itemstack " + getItemStack().toString() + " with overflow " + returnStack.get(0).toString());
+					}
+
+					return returnStack;
+
+				case DROP:
+					// Pay the users the items directly, and drop the rest, will always return no overflow.
+					final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItems(user.getBase().getInventory(), getItemStack());
+					final Location loc = user.getBase().getLocation();
+					for (ItemStack loStack : leftOver.values())
+					{
+						final int maxStackSize = loStack.getType().getMaxStackSize();
+						final int stacks = loStack.getAmount() / maxStackSize;
+						final int leftover = loStack.getAmount() % maxStackSize;
+						final Item[] itemStacks = new Item[stacks + (leftover > 0 ? 1 : 0)];
+						for (int i = 0; i < stacks; i++)
+						{
+							final ItemStack stack = loStack.clone();
+							stack.setAmount(maxStackSize);
+							itemStacks[i] = loc.getWorld().dropItem(loc, stack);
+						}
+						if (leftover > 0)
+						{
+							final ItemStack stack = loStack.clone();
+							stack.setAmount(leftover);
+							itemStacks[stacks] = loc.getWorld().dropItem(loc, stack);
+						}
+					}
+					if (ess.getSettings().isDebug())
+					{
+						ess.getLogger().log(Level.INFO, "paying " + user.getName() + " partial itemstack " + getItemStack().toString() + " and dropping overflow " + leftOver.get(0).toString());
+					}
+				}
+			}
+			else if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.INFO, "paying " + user.getName() + " itemstack " + getItemStack().toString());
+			}
+			user.getBase().updateInventory();
+		}
+		if (getExperience() != null)
+		{
+			SetExpFix.setTotalExperience(user.getBase(), SetExpFix.getTotalExperience(user.getBase()) + getExperience());
+		}
+		return null;
+	}
+
+	public void charge(final IUser user) throws ChargeException
+	{
+		if (ess.getSettings().isDebug())
+		{
+			ess.getLogger().log(Level.INFO, "attempting to charge user " + user.getName());
+		}
+		if (getMoney() != null)
+		{
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.INFO, "charging user " + user.getName() + " money " + getMoney().toPlainString());
+			}
+			if (!user.canAfford(getMoney()) && getMoney().signum() > 0)
+			{
+				throw new ChargeException(tl("notEnoughMoney"));
+			}
+			user.takeMoney(getMoney());
+		}
+		if (getItemStack() != null)
+		{
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.INFO, "charging user " + user.getName() + " itemstack " + getItemStack().toString());
+			}
+			if (!user.getBase().getInventory().containsAtLeast(getItemStack(), getItemStack().getAmount()))
+			{
+				throw new ChargeException(tl("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
+			}
+			user.getBase().getInventory().removeItem(getItemStack());
+			user.getBase().updateInventory();
+		}
+		if (command != null)
+		{
+			final BigDecimal cost = getCommandCost(user);
+			if (!user.canAfford(cost) && cost.signum() > 0)
+			{
+				throw new ChargeException(tl("notEnoughMoney"));
+			}
+			user.takeMoney(cost);
+		}
+		if (getExperience() != null)
+		{
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.INFO, "charging user " + user.getName() + " exp " + getExperience());
+			}
+			final int experience = SetExpFix.getTotalExperience(user.getBase());
+			if (experience < getExperience() && getExperience() > 0)
+			{
+				throw new ChargeException(tl("notEnoughExperience"));
+			}
+			SetExpFix.setTotalExperience(user.getBase(), experience - getExperience());
+		}
+		if (ess.getSettings().isDebug())
+		{
+			ess.getLogger().log(Level.INFO, "charge user " + user.getName() + " completed");
+		}
+	}
+
+	public BigDecimal getMoney()
+	{
+		return money;
+	}
+
+	public ItemStack getItemStack()
+	{
+		return itemStack;
+	}
+
+	public Integer getExperience()
+	{
+		return exp;
+	}
+
+	public TradeType getType()
+	{
+		if (getExperience() != null)
+		{
+			return TradeType.EXP;
+		}
+
+		if (getItemStack() != null)
+		{
+			return TradeType.ITEM;
+		}
+
+		return TradeType.MONEY;
+	}
+
+	public BigDecimal getCommandCost(final IUser user)
+	{
+		BigDecimal cost = BigDecimal.ZERO;
+		if (command != null && !command.isEmpty())
+		{
+			cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
+			if (cost.signum() == 0 && fallbackTrade != null)
+			{
+				cost = fallbackTrade.getCommandCost(user);
+			}
+
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.INFO, "calculated command (" + command + ") cost for " + user.getName() + " as " + cost);
+			}
+		}
+		if (cost.signum() != 0 && (user.isAuthorized("essentials.nocommandcost.all")
+								   || user.isAuthorized("essentials.nocommandcost." + command)))
+		{
+			return BigDecimal.ZERO;
+		}
+		return cost;
+	}
+	private static FileWriter fw = null;
+
+	public static void log(String type, String subtype, String event, String sender, Trade charge, String receiver, Trade pay, Location loc, IEssentials ess)
+	{
+		//isEcoLogUpdateEnabled() - This refers to log entries with no location, ie API updates #EasterEgg
+		//isEcoLogEnabled() - This refers to log entries with with location, ie /pay /sell and eco signs.
+
+		if ((loc == null && !ess.getSettings().isEcoLogUpdateEnabled())
+			|| (loc != null && !ess.getSettings().isEcoLogEnabled()))
+		{
+			return;
+		}
+		if (fw == null)
+		{
+			try
+			{
+				fw = new FileWriter(new File(ess.getDataFolder(), "trade.log"), true);
+			}
+			catch (IOException ex)
+			{
+				Logger.getLogger("Essentials").log(Level.SEVERE, null, ex);
+			}
+		}
+		StringBuilder sb = new StringBuilder();
+		sb.append(type).append(",").append(subtype).append(",").append(event).append(",\"");
+		sb.append(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).format(new Date()));
+		sb.append("\",\"");
+		if (sender != null)
+		{
+			sb.append(sender);
+		}
+		sb.append("\",");
+		if (charge == null)
+		{
+			sb.append("\"\",\"\",\"\"");
+		}
+		else
+		{
+			if (charge.getItemStack() != null)
+			{
+				sb.append(charge.getItemStack().getAmount()).append(",");
+				sb.append(charge.getItemStack().getType().toString()).append(",");
+				sb.append(charge.getItemStack().getDurability());
+			}
+			if (charge.getMoney() != null)
+			{
+				sb.append(charge.getMoney()).append(",");
+				sb.append("money").append(",");
+				sb.append(ess.getSettings().getCurrencySymbol());
+			}
+			if (charge.getExperience() != null)
+			{
+				sb.append(charge.getExperience()).append(",");
+				sb.append("exp").append(",");
+				sb.append("\"\"");
+			}
+		}
+		sb.append(",\"");
+		if (receiver != null)
+		{
+			sb.append(receiver);
+		}
+		sb.append("\",");
+		if (pay == null)
+		{
+			sb.append("\"\",\"\",\"\"");
+		}
+		else
+		{
+			if (pay.getItemStack() != null)
+			{
+				sb.append(pay.getItemStack().getAmount()).append(",");
+				sb.append(pay.getItemStack().getType().toString()).append(",");
+				sb.append(pay.getItemStack().getDurability());
+			}
+			if (pay.getMoney() != null)
+			{
+				sb.append(pay.getMoney()).append(",");
+				sb.append("money").append(",");
+				sb.append(ess.getSettings().getCurrencySymbol());
+			}
+			if (pay.getExperience() != null)
+			{
+				sb.append(pay.getExperience()).append(",");
+				sb.append("exp").append(",");
+				sb.append("\"\"");
+			}
+		}
+		if (loc == null)
+		{
+			sb.append(",\"\",\"\",\"\",\"\"");
+		}
+		else
+		{
+			sb.append(",\"");
+			sb.append(loc.getWorld().getName()).append("\",");
+			sb.append(loc.getBlockX()).append(",");
+			sb.append(loc.getBlockY()).append(",");
+			sb.append(loc.getBlockZ()).append(",");
+		}
+		sb.append("\n");
+		try
+		{
+			fw.write(sb.toString());
+			fw.flush();
+		}
+		catch (IOException ex)
+		{
+			Logger.getLogger("Essentials").log(Level.SEVERE, null, ex);
+		}
+	}
+
+	public static void closeLog()
+	{
+		if (fw != null)
+		{
+			try
+			{
+				fw.close();
+			}
+			catch (IOException ex)
+			{
+				Logger.getLogger("Essentials").log(Level.SEVERE, null, ex);
+			}
+			fw = null;
+		}
+	}
+}

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

@@ -0,0 +1,197 @@
+package com.earth2me.essentials;
+
+import com.google.common.io.Files;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
+import java.util.regex.Pattern;
+import org.bukkit.Bukkit;
+
+
+public class UUIDMap
+{
+	private final transient net.ess3.api.IEssentials ess;
+	private File userList;
+	private final transient Pattern splitPattern = Pattern.compile(",");
+	private static final ExecutorService EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
+	private final AtomicInteger pendingDiskWrites = new AtomicInteger(0);
+
+	public UUIDMap(final net.ess3.api.IEssentials ess)
+	{
+		this.ess = ess;
+		userList = new File(ess.getDataFolder(), "usermap.csv");
+
+	}
+
+	public void loadAllUsers(final ConcurrentSkipListMap<String, UUID> names, final ConcurrentSkipListMap<UUID, ArrayList<String>> history)
+	{
+		try
+		{
+			if (!userList.exists())
+			{
+				userList.createNewFile();
+			}
+
+			final BufferedReader reader = new BufferedReader(new FileReader(userList));
+			try
+			{
+				while (true)
+				{
+					final String line = reader.readLine();
+					if (line == null)
+					{
+						break;
+					}
+					else
+					{
+						final String[] values = splitPattern.split(line);
+						if (values.length == 2)
+						{
+							final String name = values[0];
+							final UUID uuid = UUID.fromString(values[1]);
+							names.put(name, uuid);
+							if (!history.containsKey(uuid))
+							{
+								final ArrayList<String> list = new ArrayList<String>();
+								list.add(name);
+								history.put(uuid, list);
+							}
+							else
+							{
+								final ArrayList<String> list = history.get(uuid);
+								if (!list.contains(name))
+								{
+									list.add(name);
+								}
+							}
+						}
+					}
+				}
+			}
+			finally
+			{
+				reader.close();
+			}
+		}
+		catch (IOException ex)
+		{
+			Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+		}
+	}
+
+	public void writeUUIDMap()
+	{
+		_writeUUIDMap();
+	}
+
+	public void forceWriteUUIDMap()
+	{
+		try
+		{
+			Future<?> future = _writeUUIDMap();;
+			if (future != null)
+			{
+				future.get();
+			}
+		}
+		catch (InterruptedException ex)
+		{
+			ess.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+		}
+		catch (ExecutionException ex)
+		{
+			ess.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+		}
+	}
+
+	public Future<?> _writeUUIDMap()
+	{
+		final ConcurrentSkipListMap<String, UUID> names = ess.getUserMap().getNames().clone();
+		if (names.size() < 1)
+		{
+			return null;
+		}
+		pendingDiskWrites.incrementAndGet();
+		Future<?> future = EXECUTOR_SERVICE.submit(new WriteRunner(ess.getDataFolder(), userList, names, pendingDiskWrites));
+		return future;
+	}
+
+
+	private static class WriteRunner implements Runnable
+	{
+		private final File location;
+		private final File endFile;
+		private final ConcurrentSkipListMap<String, UUID> names;
+		private final AtomicInteger pendingDiskWrites;
+
+		private WriteRunner(final File location, final File endFile, final ConcurrentSkipListMap<String, UUID> names, final AtomicInteger pendingDiskWrites)
+		{
+			this.location = location;
+			this.endFile = endFile;
+			this.names = names;
+			this.pendingDiskWrites = pendingDiskWrites;
+		}
+
+		@Override
+		public void run()
+		{
+			synchronized (pendingDiskWrites)
+			{
+				if (pendingDiskWrites.get() > 1)
+				{
+					pendingDiskWrites.decrementAndGet();
+					return;
+				}
+
+				File configFile = null;
+
+				try
+				{
+					configFile = File.createTempFile("usermap", ".tmp.csv", location);
+
+					final BufferedWriter bWriter = new BufferedWriter(new FileWriter(configFile));
+					for (Map.Entry<String, UUID> entry : names.entrySet())
+					{
+						bWriter.write(entry.getKey() + "," + entry.getValue().toString());
+						bWriter.newLine();
+					}
+
+					bWriter.close();
+					Files.move(configFile, endFile);
+				}
+				catch (IOException ex)
+				{
+					try
+					{
+						if (configFile != null && configFile.exists())
+						{
+							Files.move(configFile, new File(endFile.getParentFile(), "usermap.bak.csv"));
+						}
+					}
+					catch (Exception ex2)
+					{
+						Bukkit.getLogger().log(Level.SEVERE, ex2.getMessage(), ex2);
+					}
+					Bukkit.getLogger().log(Level.WARNING, ex.getMessage(), ex);
+				}
+				finally
+				{
+					pendingDiskWrites.decrementAndGet();
+				}
+			}
+		}
+	}
+}

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

@@ -0,0 +1,893 @@
+package com.earth2me.essentials;
+
+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;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
+import net.ess3.api.MaxMoneyException;
+import net.ess3.api.events.AfkStatusChangeEvent;
+import net.ess3.api.events.UserBalanceUpdateEvent;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+
+public class User extends UserData implements Comparable<User>, IReplyTo, net.ess3.api.IUser
+{
+	private static final Logger logger = Logger.getLogger("Essentials");
+	private CommandSource replyTo = null;
+	private transient String teleportRequester;
+	private transient boolean teleportRequestHere;
+	private transient Location teleportLocation;
+	private transient boolean vanished;
+	private transient final Teleport teleport;
+	private transient long teleportRequestTime;
+	private transient long lastOnlineActivity;
+	private transient long lastThrottledAction;
+	private transient long lastActivity = System.currentTimeMillis();
+	private boolean hidden = false;
+	private boolean rightClickJump = false;
+	private transient Location afkPosition = null;
+	private boolean invSee = false;
+	private boolean recipeSee = false;
+	private boolean enderSee = false;
+	private transient long teleportInvulnerabilityTimestamp = 0;
+
+	public User(final Player base, final IEssentials ess)
+	{
+		super(base, ess);
+		teleport = new Teleport(this, ess);
+		if (isAfk())
+		{
+			afkPosition = this.getLocation();
+		}
+		if (this.getBase().isOnline())
+		{
+			lastOnlineActivity = System.currentTimeMillis();
+		}
+	}
+
+	User update(final Player base)
+	{
+		setBase(base);
+		return this;
+	}
+
+	@Override
+	public boolean isAuthorized(final IEssentialsCommand cmd)
+	{
+		return isAuthorized(cmd, "essentials.");
+	}
+
+	@Override
+	public boolean isAuthorized(final IEssentialsCommand cmd, final String permissionPrefix)
+	{
+		return isAuthorized(permissionPrefix + (cmd.getName().equals("r") ? "msg" : cmd.getName()));
+	}
+
+	@Override
+	public boolean isAuthorized(final String node)
+	{
+		final boolean result = isAuthorizedCheck(node);
+		if (ess.getSettings().isDebug())
+		{
+			ess.getLogger().log(Level.INFO, "checking if " + base.getName() + " has " + node + " - " + result);
+		}
+		return result;
+	}
+
+	private boolean isAuthorizedCheck(final String node)
+	{
+
+		if (base instanceof OfflinePlayer)
+		{
+			return false;
+		}
+
+		try
+		{
+			return ess.getPermissionsHandler().hasPermission(base, node);
+		}
+		catch (Exception ex)
+		{
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.SEVERE, "Permission System Error: " + ess.getPermissionsHandler().getName() + " returned: " + ex.getMessage(), ex);
+			}
+			else
+			{
+				ess.getLogger().log(Level.SEVERE, "Permission System Error: " + ess.getPermissionsHandler().getName() + " returned: " + ex.getMessage());
+			}
+
+			return false;
+		}
+	}
+
+	@Override
+	public void healCooldown() throws Exception
+	{
+		final Calendar now = new GregorianCalendar();
+		if (getLastHealTimestamp() > 0)
+		{
+			final double cooldown = ess.getSettings().getHealCooldown();
+			final Calendar cooldownTime = new GregorianCalendar();
+			cooldownTime.setTimeInMillis(getLastHealTimestamp());
+			cooldownTime.add(Calendar.SECOND, (int)cooldown);
+			cooldownTime.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
+			if (cooldownTime.after(now) && !isAuthorized("essentials.heal.cooldown.bypass"))
+			{
+				throw new Exception(tl("timeBeforeHeal", DateUtil.formatDateDiff(cooldownTime.getTimeInMillis())));
+			}
+		}
+		setLastHealTimestamp(now.getTimeInMillis());
+	}
+
+	@Override
+	public void giveMoney(final BigDecimal value) throws MaxMoneyException
+	{
+		giveMoney(value, (CommandSource)null);
+	}
+
+	@Override
+	public void giveMoney(final BigDecimal value, final CommandSource initiator) throws MaxMoneyException
+	{
+		if (value.signum() == 0)
+		{
+			return;
+		}
+		setMoney(getMoney().add(value));
+		sendMessage(tl("addedToAccount", NumberUtil.displayCurrency(value, ess)));
+		if (initiator != null)
+		{
+			initiator.sendMessage(tl("addedToOthersAccount", NumberUtil.displayCurrency(value, ess), this.getDisplayName(), NumberUtil.displayCurrency(getMoney(), ess)));
+		}
+	}
+
+	@Override
+	public void payUser(final User reciever, final BigDecimal value) throws ChargeException, MaxMoneyException
+	{
+		if (value.signum() == 0)
+		{
+			return;
+		}
+		if (canAfford(value))
+		{
+			setMoney(getMoney().subtract(value));
+			reciever.setMoney(reciever.getMoney().add(value));
+			sendMessage(tl("moneySentTo", NumberUtil.displayCurrency(value, ess), reciever.getDisplayName()));
+			reciever.sendMessage(tl("moneyRecievedFrom", NumberUtil.displayCurrency(value, ess), getDisplayName()));
+		}
+		else
+		{
+			throw new ChargeException(tl("notEnoughMoney"));
+		}
+	}
+
+	@Override
+	public void takeMoney(final BigDecimal value)
+	{
+		takeMoney(value, (CommandSource)null);
+	}
+
+	@Override
+	public void takeMoney(final BigDecimal value, final CommandSource initiator)
+	{
+		if (value.signum() == 0)
+		{
+			return;
+		}
+		try
+		{
+			setMoney(getMoney().subtract(value));
+		}
+		catch (MaxMoneyException ex)
+		{
+			//We shouldn't be able to throw an exception on subtract money
+		}
+		sendMessage(tl("takenFromAccount", NumberUtil.displayCurrency(value, ess)));
+		if (initiator != null)
+		{
+			initiator.sendMessage(tl("takenFromOthersAccount", NumberUtil.displayCurrency(value, ess), this.getDisplayName(), NumberUtil.displayCurrency(getMoney(), ess)));
+		}
+	}
+
+	@Override
+	public boolean canAfford(final BigDecimal cost)
+	{
+		return canAfford(cost, true);
+	}
+
+	public boolean canAfford(final BigDecimal cost, final boolean permcheck)
+	{
+		if (cost.signum() <= 0)
+		{
+			return true;
+		}
+		final BigDecimal remainingBalance = getMoney().subtract(cost);
+		if (!permcheck || isAuthorized("essentials.eco.loan"))
+		{
+			return (remainingBalance.compareTo(ess.getSettings().getMinMoney()) >= 0);
+		}
+		return (remainingBalance.signum() >= 0);
+	}
+
+	public void dispose()
+	{
+		ess.runTaskAsynchronously(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				_dispose();
+			}
+		});
+	}
+
+	private void _dispose()
+	{
+		this.base = new OfflinePlayer(base.getUniqueId(), ess.getServer());
+	}
+
+	@Override
+	public Boolean canSpawnItem(final int itemId)
+	{
+		return !ess.getSettings().itemSpawnBlacklist().contains(itemId);
+	}
+
+	@Override
+	public void setLastLocation()
+	{
+		setLastLocation(this.getLocation());
+	}
+
+	@Override
+	public void setLogoutLocation()
+	{
+		setLogoutLocation(this.getLocation());
+	}
+
+	@Override
+	public void requestTeleport(final User player, final boolean here)
+	{
+		teleportRequestTime = System.currentTimeMillis();
+		teleportRequester = player == null ? null : player.getName();
+		teleportRequestHere = here;
+		if (player == null)
+		{
+			teleportLocation = null;
+		}
+		else
+		{
+			teleportLocation = here ? player.getLocation() : this.getLocation();
+		}
+	}
+
+	public String getTeleportRequest()
+	{
+		return teleportRequester;
+	}
+
+	public boolean isTpRequestHere()
+	{
+		return teleportRequestHere;
+	}
+
+	public Location getTpRequestLocation()
+	{
+		return teleportLocation;
+	}
+
+	public String getNick(final boolean longnick)
+	{
+		final StringBuilder prefix = new StringBuilder();
+		String nickname;
+		String suffix = "";
+		final String nick = getNickname();
+		if (ess.getSettings().isCommandDisabled("nick") || nick == null || nick.isEmpty() || nick.equalsIgnoreCase(getName()))
+		{
+			nickname = getName();
+		}
+		else
+		{
+			nickname = ess.getSettings().getNicknamePrefix() + nick;
+			suffix = "§r";
+		}
+
+		if (this.getBase().isOp())
+		{
+			try
+			{
+				final ChatColor opPrefix = ess.getSettings().getOperatorColor();
+				if (opPrefix != null && opPrefix.toString().length() > 0)
+				{
+					prefix.insert(0, opPrefix.toString());
+					suffix = "§r";
+				}
+			}
+			catch (Exception e)
+			{
+			}
+		}
+
+		if (ess.getSettings().addPrefixSuffix())
+		{
+			//These two extra toggles are not documented, because they are mostly redundant #EasterEgg
+			if (!ess.getSettings().disablePrefix())
+			{
+				final String ptext = ess.getPermissionsHandler().getPrefix(base).replace('&', '§');
+				prefix.insert(0, ptext);
+				suffix = "§r";
+			}
+			if (!ess.getSettings().disableSuffix())
+			{
+				final String stext = ess.getPermissionsHandler().getSuffix(base).replace('&', '§');
+				suffix = stext + "§r";
+				suffix = suffix.replace("§f§f", "§f").replace("§f§r", "§r").replace("§r§r", "§r");
+			}
+		}
+		final String strPrefix = prefix.toString();
+		String output = strPrefix + nickname + suffix;
+		if (!longnick && output.length() > 16)
+		{
+			output = strPrefix + nickname;
+		}
+		if (!longnick && output.length() > 16)
+		{
+			output = FormatUtil.lastCode(strPrefix) + nickname;
+		}
+		if (!longnick && output.length() > 16)
+		{
+			output = FormatUtil.lastCode(strPrefix) + nickname.substring(0, 14);
+		}
+		if (output.charAt(output.length() - 1) == '§')
+		{
+			output = output.substring(0, output.length() - 1);
+		}
+		return output;
+	}
+
+	public void setDisplayNick()
+	{
+		if (base.isOnline() && ess.getSettings().changeDisplayName())
+		{
+			this.getBase().setDisplayName(getNick(true));
+			if (ess.getSettings().changePlayerListName())
+			{
+				String name = getNick(false);
+				try
+				{
+					this.getBase().setPlayerListName(name);
+				}
+				catch (IllegalArgumentException e)
+				{
+					if (ess.getSettings().isDebug())
+					{
+						logger.log(Level.INFO, "Playerlist for " + name + " was not updated. Name clashed with another online player.");
+					}
+				}
+			}
+		}
+	}
+
+	public String getDisplayName()
+	{
+		return super.getBase().getDisplayName() == null ? super.getBase().getName() : super.getBase().getDisplayName();
+	}
+
+	@Override
+	public Teleport getTeleport()
+	{
+		return teleport;
+	}
+
+	public long getLastOnlineActivity()
+	{
+		return lastOnlineActivity;
+	}
+
+	public void setLastOnlineActivity(final long timestamp)
+	{
+		lastOnlineActivity = timestamp;
+	}
+
+	@Override
+	public BigDecimal getMoney()
+	{
+		final long start = System.nanoTime();
+		final BigDecimal value = _getMoney();
+		final long elapsed = System.nanoTime() - start;
+		if (elapsed > ess.getSettings().getEconomyLagWarning())
+		{
+			ess.getLogger().log(Level.INFO, "Lag Notice - Slow Economy Response - Request took over {0}ms!", elapsed / 1000000.0);
+		}
+		return value;
+	}
+
+	private BigDecimal _getMoney()
+	{
+		if (ess.getSettings().isEcoDisabled())
+		{
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().info("Internal economy functions disabled, aborting balance check.");
+			}
+			return BigDecimal.ZERO;
+		}
+		if (Methods.hasMethod())
+		{
+			try
+			{
+				final Method method = Methods.getMethod();
+				if (!method.hasAccount(this.getName()))
+				{
+					throw new Exception();
+				}
+				final Method.MethodAccount account = Methods.getMethod().getAccount(this.getName());
+				return BigDecimal.valueOf(account.balance());
+			}
+			catch (Exception ex)
+			{
+			}
+		}
+		return super.getMoney();
+	}
+
+	@Override
+	public void setMoney(final BigDecimal value) throws MaxMoneyException
+	{
+		if (ess.getSettings().isEcoDisabled())
+		{
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().info("Internal economy functions disabled, aborting balance change.");
+			}
+			return;
+		}
+		final BigDecimal oldBalance = _getMoney();
+		if (Methods.hasMethod())
+		{
+			try
+			{
+				final Method method = Methods.getMethod();
+				if (!method.hasAccount(this.getName()))
+				{
+					throw new Exception();
+				}
+				final Method.MethodAccount account = Methods.getMethod().getAccount(this.getName());
+				account.set(value.doubleValue());
+			}
+			catch (Exception ex)
+			{
+			}
+		}
+		super.setMoney(value, true);
+		ess.getServer().getPluginManager().callEvent(new UserBalanceUpdateEvent(this.getBase(), oldBalance, value));
+		Trade.log("Update", "Set", "API", getName(), new Trade(value, ess), null, null, null, ess);
+	}
+
+	public void updateMoneyCache(final BigDecimal value)
+	{
+		if (ess.getSettings().isEcoDisabled())
+		{
+			return;
+		}
+		if (Methods.hasMethod() && super.getMoney() != value)
+		{
+			try
+			{
+				super.setMoney(value, false);
+			}
+			catch (MaxMoneyException ex)
+			{
+				// We don't want to throw any errors here, just updating a cache
+			}
+		}
+	}
+
+	@Override
+	public void setAfk(final boolean set)
+	{
+		final AfkStatusChangeEvent afkEvent = new AfkStatusChangeEvent(this, set);
+		ess.getServer().getPluginManager().callEvent(afkEvent);
+		if (afkEvent.isCancelled())
+		{
+			return;
+		}
+
+		this.getBase().setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : set);
+		if (set && !isAfk())
+		{
+			afkPosition = this.getLocation();
+		}
+		else if (!set && isAfk())
+		{
+			afkPosition = null;
+		}
+		_setAfk(set);
+	}
+
+	public boolean toggleAfk()
+	{
+		setAfk(!isAfk());
+		return isAfk();
+	}
+
+	@Override
+	public boolean isHidden()
+	{
+		return hidden;
+	}
+
+	@Override
+	public void setHidden(final boolean hidden)
+	{
+		this.hidden = hidden;
+		if (hidden == true)
+		{
+			setLastLogout(getLastOnlineActivity());
+		}
+	}
+
+	//Returns true if status expired during this check
+	public boolean checkJailTimeout(final long currentTime)
+	{
+		if (getJailTimeout() > 0 && getJailTimeout() < currentTime && isJailed())
+		{
+			setJailTimeout(0);
+			setJailed(false);
+			sendMessage(tl("haveBeenReleased"));
+			setJail(null);
+			try
+			{
+				getTeleport().back();
+			}
+			catch (Exception ex)
+			{
+				try
+				{
+					getTeleport().respawn(null, TeleportCause.PLUGIN);
+				}
+				catch (Exception ex1)
+				{
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+
+	//Returns true if status expired during this check
+	public boolean checkMuteTimeout(final long currentTime)
+	{
+		if (getMuteTimeout() > 0 && getMuteTimeout() < currentTime && isMuted())
+		{
+			setMuteTimeout(0);
+			sendMessage(tl("canTalkAgain"));
+			setMuted(false);
+			return true;
+		}
+		return false;
+	}
+
+	//Returns true if status expired during this check
+	public boolean checkBanTimeout(final long currentTime)
+	{
+		if (getBanTimeout() > 0 && getBanTimeout() < currentTime && this.getBase().isBanned())
+		{
+			setBanTimeout(0);
+			this.getBase().setBanned(false);
+			return true;
+		}
+		return false;
+	}
+
+	public void updateActivity(final boolean broadcast)
+	{
+		if (isAfk() && ess.getSettings().cancelAfkOnInteract())
+		{
+			setAfk(false);
+			if (broadcast && !isHidden())
+			{
+				setDisplayNick();
+				final String msg = tl("userIsNotAway", getDisplayName());
+				if (!msg.isEmpty())
+				{
+					ess.broadcastMessage(this, msg);
+				}
+			}
+		}
+		lastActivity = System.currentTimeMillis();
+	}
+
+	public void checkActivity()
+	{
+		final long autoafkkick = ess.getSettings().getAutoAfkKick();
+		if (autoafkkick > 0 && lastActivity > 0 && (lastActivity + (autoafkkick * 1000)) < System.currentTimeMillis()
+			&& !isHidden() && !isAuthorized("essentials.kick.exempt") && !isAuthorized("essentials.afk.kickexempt"))
+		{
+			final String kickReason = tl("autoAfkKickReason", autoafkkick / 60.0);
+			lastActivity = 0;
+			this.getBase().kickPlayer(kickReason);
+
+
+			for (Player player : ess.getServer().getOnlinePlayers())
+			{
+				final User user = ess.getUser(player);
+				if (user.isAuthorized("essentials.kick.notify"))
+				{
+					user.sendMessage(tl("playerKicked", Console.NAME, getName(), kickReason));
+				}
+			}
+		}
+		final long autoafk = ess.getSettings().getAutoAfk();
+		if (!isAfk() && autoafk > 0 && lastActivity + autoafk * 1000 < System.currentTimeMillis() && isAuthorized("essentials.afk.auto"))
+		{
+			setAfk(true);
+			if (!isHidden())
+			{
+				setDisplayNick();
+				final String msg = tl("userIsAway", getDisplayName());
+				if (!msg.isEmpty())
+				{
+					ess.broadcastMessage(this, msg);
+				}
+			}
+		}
+	}
+
+	public Location getAfkPosition()
+	{
+		return afkPosition;
+	}
+
+	@Override
+	public boolean isGodModeEnabled()
+	{
+		return (super.isGodModeEnabled() && !ess.getSettings().getNoGodWorlds().contains(this.getLocation().getWorld().getName()))
+			   || (isAfk() && ess.getSettings().getFreezeAfkPlayers());
+	}
+
+	public boolean isGodModeEnabledRaw()
+	{
+		return super.isGodModeEnabled();
+	}
+
+	@Override
+	public String getGroup()
+	{
+		final String result = ess.getPermissionsHandler().getGroup(base);
+		if (ess.getSettings().isDebug())
+		{
+			ess.getLogger().log(Level.INFO, "looking up groupname of " + base.getName() + " - " + result);
+		}
+		return result;
+	}
+
+	@Override
+	public boolean inGroup(final String group)
+	{
+		final boolean result = ess.getPermissionsHandler().inGroup(base, group);
+		if (ess.getSettings().isDebug())
+		{
+			ess.getLogger().log(Level.INFO, "checking if " + base.getName() + " is in group " + group + " - " + result);
+		}
+		return result;
+	}
+
+	@Override
+	public boolean canBuild()
+	{
+		if (this.getBase().isOp())
+		{
+			return true;
+		}
+		return ess.getPermissionsHandler().canBuild(base, getGroup());
+	}
+
+	public long getTeleportRequestTime()
+	{
+		return teleportRequestTime;
+	}
+
+	public boolean isInvSee()
+	{
+		return invSee;
+	}
+
+	public void setInvSee(final boolean set)
+	{
+		invSee = set;
+	}
+
+	public boolean isEnderSee()
+	{
+		return enderSee;
+	}
+
+	public void setEnderSee(final boolean set)
+	{
+		enderSee = set;
+	}
+
+	@Override
+	public void enableInvulnerabilityAfterTeleport()
+	{
+		final long time = ess.getSettings().getTeleportInvulnerability();
+		if (time > 0)
+		{
+			teleportInvulnerabilityTimestamp = System.currentTimeMillis() + time;
+		}
+	}
+
+	@Override
+	public void resetInvulnerabilityAfterTeleport()
+	{
+		if (teleportInvulnerabilityTimestamp != 0
+			&& teleportInvulnerabilityTimestamp < System.currentTimeMillis())
+		{
+			teleportInvulnerabilityTimestamp = 0;
+		}
+	}
+
+	@Override
+	public boolean hasInvulnerabilityAfterTeleport()
+	{
+		return teleportInvulnerabilityTimestamp != 0 && teleportInvulnerabilityTimestamp >= System.currentTimeMillis();
+	}
+
+	@Override
+	public boolean isVanished()
+	{
+		return vanished;
+	}
+
+	@Override
+	public void setVanished(final boolean set)
+	{
+		vanished = set;
+		if (set)
+		{
+			for (Player p : ess.getServer().getOnlinePlayers())
+			{
+				if (!ess.getUser(p).isAuthorized("essentials.vanish.see"))
+				{
+					p.hidePlayer(getBase());
+				}
+			}
+			setHidden(true);
+			ess.getVanishedPlayers().add(getName());
+			if (isAuthorized("essentials.vanish.effect"))
+			{
+				this.getBase().addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, Integer.MAX_VALUE, 1, false));
+			}
+		}
+		else
+		{
+			for (Player p : ess.getServer().getOnlinePlayers())
+			{
+				p.showPlayer(getBase());
+			}
+			setHidden(false);
+			ess.getVanishedPlayers().remove(getName());
+			if (isAuthorized("essentials.vanish.effect"))
+			{
+				this.getBase().removePotionEffect(PotionEffectType.INVISIBILITY);
+			}
+		}
+	}
+
+	public boolean checkSignThrottle()
+	{
+		if (isSignThrottled())
+		{
+			return true;
+		}
+		updateThrottle();
+		return false;
+	}
+
+	public boolean isSignThrottled()
+	{
+		final long minTime = lastThrottledAction + (1000 / ess.getSettings().getSignUsePerSecond());
+		return (System.currentTimeMillis() < minTime);
+	}
+
+	public void updateThrottle()
+	{
+		lastThrottledAction = System.currentTimeMillis();
+	}
+
+	public boolean isFlyClickJump()
+	{
+		return rightClickJump;
+	}
+
+	public void setRightClickJump(boolean rightClickJump)
+	{
+		this.rightClickJump = rightClickJump;
+	}
+
+	@Override
+	public boolean isIgnoreExempt()
+	{
+		return this.isAuthorized("essentials.chat.ignoreexempt");
+	}
+
+	public boolean isRecipeSee()
+	{
+		return recipeSee;
+	}
+
+	public void setRecipeSee(boolean recipeSee)
+	{
+		this.recipeSee = recipeSee;
+	}
+
+	@Override
+	public void sendMessage(String message)
+	{
+		if (!message.isEmpty())
+		{
+			base.sendMessage(message);
+		}
+	}
+
+	@Override
+	public void setReplyTo(final CommandSource user)
+	{
+		replyTo = user;
+	}
+
+	@Override
+	public CommandSource getReplyTo()
+	{
+		return replyTo;
+	}
+
+	@Override
+	public int compareTo(final User other)
+	{
+		return FormatUtil.stripFormat(getDisplayName()).compareToIgnoreCase(FormatUtil.stripFormat(other.getDisplayName()));
+	}
+
+	@Override
+	public boolean equals(final Object object)
+	{
+		if (!(object instanceof User))
+		{
+			return false;
+		}
+		return this.getName().equalsIgnoreCase(((User)object).getName());
+
+	}
+
+	@Override
+	public int hashCode()
+	{
+		return this.getName().hashCode();
+	}
+
+	@Override
+	public CommandSource getSource()
+	{
+		return new CommandSource(getBase());
+	}
+
+	@Override
+	public String getName()
+	{
+		return this.getBase().getName();
+	}
+}

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

@@ -1,33 +1,59 @@
 package com.earth2me.essentials;
 
+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.*;
 import net.ess3.api.IEssentials;
-import net.ess3.storage.StoredLocation;
+import net.ess3.api.InvalidWorldException;
+import net.ess3.api.MaxMoneyException;
 import org.bukkit.Location;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.MemoryConfiguration;
+import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 
-public class UserData
+public abstract class UserData extends PlayerExtension implements IConf
 {
-	protected final IEssentials ess;
-	private EssentialsConf config;
+	protected final transient IEssentials ess;
+	private final EssentialsUserConf config;
 	private final File folder;
 
-	protected UserData(IEssentials ess, File file)
+	protected UserData(Player base, IEssentials ess)
 	{
+		super(base);
 		this.ess = ess;
-		folder = new File(ess.getPlugin().getDataFolder(), "userdata");
+		folder = new File(ess.getDataFolder(), "userdata");
 		if (!folder.exists())
 		{
 			folder.mkdirs();
 		}
-		config = new EssentialsConf(file);
+
+		String filename;
+		try
+		{
+			filename = base.getUniqueId().toString();
+		}
+		catch (Throwable ex)
+		{
+			ess.getLogger().warning("Falling back to old username system for " + base.getName());
+			filename = base.getName();
+		}
+
+		config = new EssentialsUserConf(base.getName(), base.getUniqueId(), new File(folder, filename + ".yml"));
 		reloadConfig();
 	}
 
+	public final void reset()
+	{
+		config.forceSave();
+		config.getFile().delete();
+		ess.getUserMap().removeUser(this.getBase().getName());
+	}
+
+	@Override
 	public final void reloadConfig()
 	{
 		config.load();
@@ -40,53 +66,72 @@ public class UserData
 		lastHealTimestamp = _getLastHealTimestamp();
 		jail = _getJail();
 		mails = _getMails();
-		teleportEnabled = getTeleportEnabled();
-		ignoredPlayers = getIgnoredPlayers();
+		teleportEnabled = _getTeleportEnabled();
 		godmode = _getGodModeEnabled();
-		muted = getMuted();
+		muted = _getMuted();
 		muteTimeout = _getMuteTimeout();
-		jailed = getJailed();
+		jailed = _getJailed();
 		jailTimeout = _getJailTimeout();
 		lastLogin = _getLastLogin();
 		lastLogout = _getLastLogout();
 		lastLoginAddress = _getLastLoginAddress();
-		afk = getAfk();
+		afk = _getAfk();
 		geolocation = _getGeoLocation();
 		isSocialSpyEnabled = _isSocialSpyEnabled();
 		isNPC = _isNPC();
 		arePowerToolsEnabled = _arePowerToolsEnabled();
 		kitTimestamps = _getKitTimestamps();
 		nickname = _getNickname();
+		ignoredPlayers = _getIgnoredPlayers();
+		logoutLocation = _getLogoutLocation();
+		lastAccountName = _getLastAccountName();
 	}
-	private double money;
+	private BigDecimal money;
 
-	private double _getMoney()
+	private BigDecimal _getMoney()
 	{
-		double money = ess.getSettings().getData().getEconomy().getStartingBalance();
+		BigDecimal result = ess.getSettings().getStartingBalance();
+		BigDecimal maxMoney = ess.getSettings().getMaxMoney();
+		BigDecimal minMoney = ess.getSettings().getMinMoney();
+
 		if (config.hasProperty("money"))
 		{
-			money = config.getDouble("money", money);
+			result = config.getBigDecimal("money", result);
 		}
-		if (Math.abs(money) > ess.getSettings().getData().getEconomy().getMaxMoney())
+		if (result.compareTo(maxMoney) > 0)
 		{
-			money = money < 0 ? -ess.getSettings().getData().getEconomy().getMaxMoney() : ess.getSettings().getData().getEconomy().getMaxMoney();
+			result = maxMoney;
 		}
-		return money;
+		if (result.compareTo(minMoney) < 0)
+		{
+			result = minMoney;
+		}
+		return result;
 	}
 
-	public double getMoney()
+	public BigDecimal getMoney()
 	{
 		return money;
 	}
 
-	public void setMoney(double value)
+	public void setMoney(BigDecimal value, boolean throwError) throws MaxMoneyException
 	{
 		money = value;
-		if (Math.abs(money) > ess.getSettings().getData().getEconomy().getMaxMoney())
+		BigDecimal maxMoney = ess.getSettings().getMaxMoney();
+		BigDecimal minMoney = ess.getSettings().getMinMoney();
+		if (money.compareTo(maxMoney) > 0)
 		{
-			money = money < 0 ? -ess.getSettings().getData().getEconomy().getMaxMoney() : ess.getSettings().getData().getEconomy().getMaxMoney();
+			money = maxMoney;
+			if (throwError)
+			{
+				throw new MaxMoneyException();
+			}
 		}
-		config.setProperty("money", value);
+		if (money.compareTo(minMoney) < 0)
+		{
+			money = minMoney;
+		}
+		config.setProperty("money", money);
 		config.save();
 	}
 	private Map<String, Object> homes;
@@ -102,23 +147,53 @@ public class UserData
 
 	private String getHomeName(String search)
 	{
-		if (Util.isInt(search))
+		if (NumberUtil.isInt(search))
 		{
 			try
 			{
 				search = getHomes().get(Integer.parseInt(search) - 1);
 			}
-			catch (Exception e)
+			catch (NumberFormatException e)
+			{
+			}
+			catch (IndexOutOfBoundsException e)
 			{
 			}
 		}
 		return search;
 	}
 
-	public StoredLocation getHome(String name) throws Exception
+	public Location getHome(String name) throws Exception
 	{
 		String search = getHomeName(name);
-		return config.getLocation("homes." + search, ess.getServer());
+		return config.getLocation("homes." + search, this.getBase().getServer());
+	}
+
+	public Location getHome(final Location world)
+	{
+		try
+		{
+			if (getHomes().isEmpty())
+			{
+				return null;
+			}
+			Location loc;
+			for (String home : getHomes())
+			{
+				loc = config.getLocation("homes." + home, this.getBase().getServer());
+				if (world.getWorld() == loc.getWorld())
+				{
+					return loc;
+				}
+
+			}
+			loc = config.getLocation("homes." + getHomes().get(0), this.getBase().getServer());
+			return loc;
+		}
+		catch (InvalidWorldException ex)
+		{
+			return null;
+		}
 	}
 
 	public List<String> getHomes()
@@ -129,7 +204,7 @@ public class UserData
 	public void setHome(String name, Location loc)
 	{
 		//Invalid names will corrupt the yaml
-		name = Util.safeString(name);
+		name = StringUtil.safeString(name);
 		homes.put(name, loc);
 		config.setProperty("homes." + name, loc);
 		config.save();
@@ -140,7 +215,7 @@ public class UserData
 		String search = getHomeName(name);
 		if (!homes.containsKey(search))
 		{
-			search = Util.safeString(search);
+			search = StringUtil.safeString(search);
 		}
 		if (homes.containsKey(search))
 		{
@@ -150,7 +225,7 @@ public class UserData
 		}
 		else
 		{
-			throw new Exception("invalidHome");
+			throw new Exception(tl("invalidHome", search));
 		}
 	}
 
@@ -221,11 +296,6 @@ public class UserData
 		return new HashMap<String, Object>();
 	}
 
-	public Set<String> getPowertools()
-	{
-		return powertools.keySet();
-	}
-
 	public void clearAllPowertools()
 	{
 		powertools.clear();
@@ -263,24 +333,64 @@ public class UserData
 	{
 		return !powertools.isEmpty();
 	}
-	private StoredLocation lastLocation;
+	private Location lastLocation;
 
-	private StoredLocation _getLastLocation()
+	private Location _getLastLocation()
 	{
 		try
 		{
-			return config.getLocation("lastlocation", ess.getServer());
+			return config.getLocation("lastlocation", this.getBase().getServer());
 		}
-		catch (Exception e)
+		catch (InvalidWorldException e)
 		{
 			return null;
 		}
 	}
 
-	public StoredLocation getLastLocation()
+	public Location getLastLocation()
 	{
 		return lastLocation;
 	}
+
+	public void setLastLocation(Location loc)
+	{
+		if (loc == null || loc.getWorld() == null)
+		{
+			return;
+		}
+		lastLocation = loc;
+		config.setProperty("lastlocation", loc);
+		config.save();
+	}
+	private Location logoutLocation;
+
+	private Location _getLogoutLocation()
+	{
+		try
+		{
+			return config.getLocation("logoutlocation", this.getBase().getServer());
+		}
+		catch (InvalidWorldException e)
+		{
+			return null;
+		}
+	}
+
+	public Location getLogoutLocation()
+	{
+		return logoutLocation;
+	}
+
+	public void setLogoutLocation(Location loc)
+	{
+		if (loc == null || loc.getWorld() == null)
+		{
+			return;
+		}
+		logoutLocation = loc;
+		config.setProperty("logoutlocation", loc);
+		config.save();
+	}
 	private long lastTeleportTimestamp;
 
 	private long _getLastTeleportTimestamp()
@@ -377,7 +487,7 @@ public class UserData
 	}
 	private boolean teleportEnabled;
 
-	private boolean getTeleportEnabled()
+	private boolean _getTeleportEnabled()
 	{
 		return config.getBoolean("teleportenabled", true);
 	}
@@ -393,23 +503,9 @@ public class UserData
 		config.setProperty("teleportenabled", set);
 		config.save();
 	}
-
-	public boolean toggleTeleportEnabled()
-	{
-		boolean ret = !isTeleportEnabled();
-		setTeleportEnabled(ret);
-		return ret;
-	}
-
-	public boolean toggleSocialSpy()
-	{
-		boolean ret = !isSocialSpyEnabled();
-		setSocialSpyEnabled(ret);
-		return ret;
-	}
 	private List<String> ignoredPlayers;
 
-	public List<String> getIgnoredPlayers()
+	public List<String> _getIgnoredPlayers()
 	{
 		return Collections.synchronizedList(config.getStringList("ignore"));
 	}
@@ -428,6 +524,35 @@ public class UserData
 		}
 		config.save();
 	}
+
+	@Deprecated
+	public boolean isIgnoredPlayer(final String userName)
+	{
+		final IUser user = ess.getUser(userName);
+		if (user == null || !user.getBase().isOnline())
+		{
+			return false;
+		}
+		return isIgnoredPlayer(user);
+	}
+
+	public boolean isIgnoredPlayer(IUser user)
+	{
+		return (ignoredPlayers.contains(user.getName().toLowerCase(Locale.ENGLISH)) && !user.isIgnoreExempt());
+	}
+
+	public void setIgnoredPlayer(IUser user, boolean set)
+	{
+		if (set)
+		{
+			ignoredPlayers.add(user.getName().toLowerCase(Locale.ENGLISH));
+		}
+		else
+		{
+			ignoredPlayers.remove(user.getName().toLowerCase(Locale.ENGLISH));
+		}
+		setIgnoredPlayers(ignoredPlayers);
+	}
 	private boolean godmode;
 
 	private boolean _getGodModeEnabled()
@@ -448,11 +573,16 @@ public class UserData
 	}
 	private boolean muted;
 
-	public boolean getMuted()
+	public boolean _getMuted()
 	{
 		return config.getBoolean("muted", false);
 	}
 
+	public boolean getMuted()
+	{
+		return muted;
+	}
+
 	public boolean isMuted()
 	{
 		return muted;
@@ -484,7 +614,7 @@ public class UserData
 	}
 	private boolean jailed;
 
-	private boolean getJailed()
+	private boolean _getJailed()
 	{
 		return config.getBoolean("jailed", false);
 	}
@@ -528,12 +658,12 @@ public class UserData
 
 	public String getBanReason()
 	{
-		return config.getString("ban.reason");
+		return config.getString("ban.reason", "");
 	}
 
 	public void setBanReason(String reason)
 	{
-		config.setProperty("ban.reason", Util.sanitizeString(reason));
+		config.setProperty("ban.reason", StringUtil.sanitizeString(reason));
 		config.save();
 	}
 
@@ -559,11 +689,21 @@ public class UserData
 		return lastLogin;
 	}
 
-	private void _setLastLogin(long time) //unused method
+	private void _setLastLogin(long time)
 	{
 		lastLogin = time;
 		config.setProperty("timestamps.login", time);
 	}
+
+	public void setLastLogin(long time)
+	{
+		_setLastLogin(time);
+		if (base.getAddress() != null && base.getAddress().getAddress() != null)
+		{
+			_setLastLoginAddress(base.getAddress().getAddress().getHostAddress());
+		}
+		config.save();
+	}
 	private long lastLogout;
 
 	private long _getLastLogout()
@@ -594,14 +734,14 @@ public class UserData
 		return lastLoginAddress;
 	}
 
-	private void _setLastLoginAddress(String address) //TODO: unused method?
+	private void _setLastLoginAddress(String address)
 	{
 		lastLoginAddress = address;
 		config.setProperty("ipAddress", address);
 	}
 	private boolean afk;
 
-	private boolean getAfk()
+	private boolean _getAfk()
 	{
 		return config.getBoolean("afk", false);
 	}
@@ -611,20 +751,13 @@ public class UserData
 		return afk;
 	}
 
-	public void setAfk(boolean set)
+	public void _setAfk(boolean set)
 	{
 		afk = set;
 		config.setProperty("afk", set);
 		config.save();
 	}
-
-	public boolean toggleAfk()
-	{
-		boolean ret = !isAfk();
-		setAfk(ret);
-		return ret;
-	}
-	private boolean newplayer; //TODO: unused variable?
+	private boolean newplayer;
 	private String geolocation;
 
 	private String _getGeoLocation()
@@ -680,6 +813,25 @@ public class UserData
 	{
 		return isNPC;
 	}
+	private String lastAccountName = null;
+
+	public String getLastAccountName()
+	{
+		return lastAccountName;
+	}
+
+	public String _getLastAccountName()
+	{
+		return config.getString("lastAccountName", null);
+	}
+
+	public void setLastAccountName(String lastAccountName)
+	{
+		this.lastAccountName = lastAccountName;
+		config.setProperty("lastAccountName", lastAccountName);
+		config.save();
+		ess.getUserMap().trackUUID(base.getUniqueId(), lastAccountName);
+	}
 
 	public void setNPC(boolean set)
 	{
@@ -712,53 +864,102 @@ public class UserData
 	{
 		return config.getBoolean("powertoolsenabled", true);
 	}
-	private ConfigurationSection kitTimestamps;
+	private Map<String, Long> kitTimestamps;
 
-	private ConfigurationSection _getKitTimestamps()
+	private Map<String, Long> _getKitTimestamps()
 	{
 
 		if (config.isConfigurationSection("timestamps.kits"))
 		{
 			final ConfigurationSection section = config.getConfigurationSection("timestamps.kits");
-			final ConfigurationSection newSection = new MemoryConfiguration();
+			final Map<String, Long> timestamps = new HashMap<String, Long>();
 			for (String command : section.getKeys(false))
 			{
 				if (section.isLong(command))
 				{
-					newSection.set(command.toLowerCase(Locale.ENGLISH), section.getLong(command));
+					timestamps.put(command.toLowerCase(Locale.ENGLISH), section.getLong(command));
 				}
 				else if (section.isInt(command))
 				{
-					newSection.set(command.toLowerCase(Locale.ENGLISH), (long)section.getInt(command));
+					timestamps.put(command.toLowerCase(Locale.ENGLISH), (long)section.getInt(command));
 				}
 			}
-			return newSection;
+			return timestamps;
 		}
-		return new MemoryConfiguration();
-	}
-
-	public Set<String> getKitTimestamps()
-	{
-		return kitTimestamps.getKeys(false);
+		return new HashMap<String, Long>();
 	}
 
 	public long getKitTimestamp(String name)
 	{
 		name = name.replace('.', '_').replace('/', '_');
-		if (kitTimestamps != null)
+		if (kitTimestamps != null && kitTimestamps.containsKey(name))
 		{
-			return kitTimestamps.getLong(name, 0l);
+			return kitTimestamps.get(name);
 		}
 		return 0l;
 	}
 
 	public void setKitTimestamp(final String name, final long time)
 	{
-		kitTimestamps.set(name.toLowerCase(Locale.ENGLISH), time);
+		kitTimestamps.put(name.toLowerCase(Locale.ENGLISH), time);
 		config.setProperty("timestamps.kits", kitTimestamps);
 		config.save();
 	}
 
+	public void setConfigProperty(String node, Object object)
+	{
+		final String prefix = "info.";
+		node = prefix + node;
+		if (object instanceof Map)
+		{
+			config.setProperty(node, (Map)object);
+		}
+		else if (object instanceof List)
+		{
+			config.setProperty(node, (List<String>)object);
+		}
+		else if (object instanceof Location)
+		{
+			config.setProperty(node, (Location)object);
+		}
+		else if (object instanceof ItemStack)
+		{
+			config.setProperty(node, (ItemStack)object);
+		}
+		else
+		{
+			config.setProperty(node, object);
+		}
+		config.save();
+	}
+
+	public Set<String> getConfigKeys()
+	{
+		if (config.isConfigurationSection("info"))
+		{
+			return config.getConfigurationSection("info").getKeys(true);
+		}
+		return new HashSet<String>();
+	}
+
+	public Map<String, Object> getConfigMap()
+	{
+		if (config.isConfigurationSection("info"))
+		{
+			return config.getConfigurationSection("info").getValues(true);
+		}
+		return new HashMap<String, Object>();
+	}
+
+	public Map<String, Object> getConfigMap(String node)
+	{
+		if (config.isConfigurationSection("info." + node))
+		{
+			return config.getConfigurationSection("info." + node).getValues(true);
+		}
+		return new HashMap<String, Object>();
+	}
+
 	public void save()
 	{
 		config.save();

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

@@ -0,0 +1,242 @@
+package com.earth2me.essentials;
+
+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.util.concurrent.UncheckedExecutionException;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.ExecutionException;
+import net.ess3.api.IEssentials;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+
+public class UserMap extends CacheLoader<UUID, User> implements IConf
+{
+	private final transient IEssentials ess;
+	private final transient Cache<UUID, User> users;
+	private final transient ConcurrentSkipListSet<UUID> keys = new ConcurrentSkipListSet<UUID>();
+	private final transient ConcurrentSkipListMap<String, UUID> names = new ConcurrentSkipListMap<String, UUID>();
+	private final transient ConcurrentSkipListMap<UUID, ArrayList<String>> history = new ConcurrentSkipListMap<UUID, ArrayList<String>>();
+	private UUIDMap uuidMap;
+
+	public UserMap(final IEssentials ess)
+	{
+		super();
+		this.ess = ess;
+		uuidMap = new UUIDMap(ess);
+		users = CacheBuilder.newBuilder().maximumSize(ess.getSettings().getMaxUserCacheCount()).softValues().build(this);
+	}
+
+	private void loadAllUsersAsync(final IEssentials ess)
+	{
+		ess.runTaskAsynchronously(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				synchronized (users)
+				{
+					final File userdir = new File(ess.getDataFolder(), "userdata");
+					if (!userdir.exists())
+					{
+						return;
+					}
+					keys.clear();
+					names.clear();
+					users.invalidateAll();
+					for (String string : userdir.list())
+					{
+						if (!string.endsWith(".yml"))
+						{
+							continue;
+						}
+						final String name = string.substring(0, string.length() - 4);
+						try
+						{
+							keys.add(UUID.fromString(name));
+						}
+						catch (IllegalArgumentException ex)
+						{
+							//Ignore these users till they rejoin.
+						}
+					}
+					uuidMap.loadAllUsers(names, history);
+				}
+			}
+		});
+	}
+
+	public boolean userExists(final UUID uuid)
+	{
+		return keys.contains(uuid);
+	}
+
+	public User getUser(final String name)
+	{
+		try
+		{
+			final String sanitizedName = StringUtil.sanitizeFileName(name);
+			if (names.containsKey(sanitizedName))
+			{
+				final UUID uuid = names.get(sanitizedName);
+				return users.get(uuid);
+			}
+
+			for (Player player : ess.getServer().getOnlinePlayers())
+			{
+				String sanitizedPlayer = StringUtil.sanitizeFileName(player.getName());
+				if (sanitizedPlayer.equalsIgnoreCase(sanitizedName))
+				{
+					User user = new User(player, ess);
+					trackUUID(user.getBase().getUniqueId(), user.getName());
+					return new User(player, ess);
+				}
+			}
+
+			final File userFile = getUserFileFromString(sanitizedName);
+			if (userFile.exists())
+			{
+				User user = new User(new OfflinePlayer(sanitizedName, ess.getServer()), ess);
+				trackUUID(user.getBase().getUniqueId(), user.getName());
+				return user;
+			}
+			return null;
+		}
+		catch (ExecutionException ex)
+		{
+			return null;
+		}
+		catch (UncheckedExecutionException ex)
+		{
+			return null;
+		}
+	}
+
+	public User getUser(final UUID uuid)
+	{
+		try
+		{
+			return users.get(uuid);
+		}
+		catch (ExecutionException ex)
+		{
+			return null;
+		}
+		catch (UncheckedExecutionException ex)
+		{
+			return null;
+		}
+	}
+
+	public void trackUUID(final UUID uuid, final String name)
+	{
+		if (uuid != null)
+		{
+			keys.add(uuid);
+			if (name != null && name.length() > 0)
+			{
+				final String keyName = StringUtil.sanitizeFileName(name);
+				if (!names.containsKey(keyName) || !names.get(keyName).equals(uuid))
+				{
+					names.put(keyName, uuid);
+					uuidMap.writeUUIDMap();
+				}
+			}
+		}
+	}
+
+	@Override
+	public User load(final UUID uuid) throws Exception
+	{
+		Player player = ess.getServer().getPlayer(uuid);
+		if (player != null)
+		{
+			final User user = new User(player, ess);
+			trackUUID(uuid, user.getName());
+			return user;
+		}
+
+		final File userFile = getUserFileFromID(uuid);
+
+		if (userFile.exists())
+		{
+			player = new OfflinePlayer(uuid, ess.getServer());
+			final User user = new User(player, ess);
+			((OfflinePlayer)player).setName(user.getLastAccountName());
+			trackUUID(uuid, user.getName());
+			return user;
+		}
+
+		throw new Exception("User not found!");
+	}
+
+	@Override
+	public void reloadConfig()
+	{
+		getUUIDMap().forceWriteUUIDMap();
+		loadAllUsersAsync(ess);
+	}
+
+	public void removeUser(final String name)
+	{
+		UUID uuid = names.get(name);
+		if (uuid != null)
+		{
+			keys.remove(uuid);
+			users.invalidate(uuid);
+		}
+		names.remove(name);
+		names.remove(StringUtil.sanitizeFileName(name));
+	}
+
+	public Set<UUID> getAllUniqueUsers()
+	{
+		return Collections.unmodifiableSet(keys);
+	}
+
+	public int getUniqueUsers()
+	{
+		return keys.size();
+	}
+
+	public ConcurrentSkipListMap<String, UUID> getNames()
+	{
+		return names;
+	}
+
+	public ConcurrentSkipListMap<UUID, ArrayList<String>> getHistory()
+	{
+		return history;
+	}
+
+	public List<String> getUserHistory(final UUID uuid)
+	{
+		return history.get(uuid);
+	}
+
+	public UUIDMap getUUIDMap()
+	{
+		return uuidMap;
+	}
+
+	private File getUserFileFromID(final UUID uuid)
+	{
+		final File userFolder = new File(ess.getDataFolder(), "userdata");
+		return new File(userFolder, uuid.toString() + ".yml");
+	}
+
+	public File getUserFileFromString(final String name)
+	{
+		final File userFolder = new File(ess.getDataFolder(), "userdata");
+		return new File(userFolder, StringUtil.sanitizeFileName(name) + ".yml");
+	}
+}

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

@@ -0,0 +1,180 @@
+package com.earth2me.essentials;
+
+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.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import net.ess3.api.InvalidNameException;
+import net.ess3.api.InvalidWorldException;
+import org.bukkit.Location;
+import org.bukkit.Server;
+
+
+public class Warps implements IConf, net.ess3.api.IWarps
+{
+	private static final Logger logger = Logger.getLogger("Essentials");
+	private final Map<StringIgnoreCase, EssentialsConf> warpPoints = new HashMap<StringIgnoreCase, EssentialsConf>();
+	private final File warpsFolder;
+	private final Server server;
+
+	public Warps(Server server, File dataFolder)
+	{
+		this.server = server;
+		warpsFolder = new File(dataFolder, "warps");
+		if (!warpsFolder.exists())
+		{
+			warpsFolder.mkdirs();
+		}
+		reloadConfig();
+	}
+
+	@Override
+	public boolean isEmpty()
+	{
+		return warpPoints.isEmpty();
+	}
+
+	@Override
+	public Collection<String> getList()
+	{
+		final List<String> keys = new ArrayList<String>();
+		for (StringIgnoreCase stringIgnoreCase : warpPoints.keySet())
+		{
+			keys.add(stringIgnoreCase.getString());
+		}
+		Collections.sort(keys, String.CASE_INSENSITIVE_ORDER);
+		return keys;
+	}
+
+	@Override
+	public Location getWarp(String warp) throws WarpNotFoundException, InvalidWorldException
+	{
+		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(warp));
+		if (conf == null)
+		{
+			throw new WarpNotFoundException();
+		}
+		return conf.getLocation(null, server);
+	}
+
+	@Override
+	public void setWarp(String name, Location loc) throws Exception
+	{
+		String filename = StringUtil.sanitizeFileName(name);
+		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
+		if (conf == null)
+		{
+			File confFile = new File(warpsFolder, filename + ".yml");
+			if (confFile.exists())
+			{
+				throw new Exception(tl("similarWarpExist"));
+			}
+			conf = new EssentialsConf(confFile);
+			warpPoints.put(new StringIgnoreCase(name), conf);
+		}
+		conf.setProperty(null, loc);
+		conf.setProperty("name", name);
+		try
+		{
+			conf.saveWithError();
+		}
+		catch (IOException ex)
+		{
+			throw new IOException(tl("invalidWarpName"));
+		}
+	}
+
+	@Override
+	public void removeWarp(String name) throws Exception
+	{
+		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
+		if (conf == null)
+		{
+			throw new Exception(tl("warpNotExist"));
+		}
+		if (!conf.getFile().delete())
+		{
+			throw new Exception(tl("warpDeleteError"));
+		}
+		warpPoints.remove(new StringIgnoreCase(name));
+	}
+
+	@Override
+	public final void reloadConfig()
+	{
+		warpPoints.clear();
+		File[] listOfFiles = warpsFolder.listFiles();
+		if (listOfFiles.length >= 1)
+		{
+			for (int i = 0; i < listOfFiles.length; i++)
+			{
+				String filename = listOfFiles[i].getName();
+				if (listOfFiles[i].isFile() && filename.endsWith(".yml"))
+				{
+					try
+					{
+						EssentialsConf conf = new EssentialsConf(listOfFiles[i]);
+						conf.load();
+						String name = conf.getString("name");
+						if (name != null)
+						{
+							warpPoints.put(new StringIgnoreCase(name), conf);
+						}
+					}
+					catch (Exception ex)
+					{
+						logger.log(Level.WARNING, tl("loadWarpError", filename), ex);
+					}
+				}
+			}
+		}
+	}
+
+	//This is here for future 3.x api support. Not implemented here becasue storage is handled differently
+	@Override
+	public File getWarpFile(String name) throws InvalidNameException
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public int getCount()
+	{
+		return getList().size();
+	}
+
+	private static class StringIgnoreCase
+	{
+		private final String string;
+
+		public StringIgnoreCase(String string)
+		{
+			this.string = string;
+		}
+
+		@Override
+		public int hashCode()
+		{
+			return getString().toLowerCase(Locale.ENGLISH).hashCode();
+		}
+
+		@Override
+		public boolean equals(Object o)
+		{
+			if (o instanceof StringIgnoreCase)
+			{
+				return getString().equalsIgnoreCase(((StringIgnoreCase)o).getString());
+			}
+			return false;
+		}
+
+		public String getString()
+		{
+			return string;
+		}
+	}
+}

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

@@ -0,0 +1,176 @@
+package com.earth2me.essentials;
+
+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;
+
+
+public class Worth implements IConf
+{
+	private final EssentialsConf config;
+
+	public Worth(File dataFolder)
+	{
+		config = new EssentialsConf(new File(dataFolder, "worth.yml"));
+		config.setTemplateName("/worth.yml");
+		config.load();
+	}
+
+	public BigDecimal getPrice(ItemStack itemStack)
+	{
+		String itemname = itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
+		BigDecimal result;
+
+		//First check for matches with item name
+		result = config.getBigDecimal("worth." + itemname + "." + itemStack.getDurability(), BigDecimal.ONE.negate());
+		if (result.signum() < 0)
+		{
+			final ConfigurationSection itemNameMatch = config.getConfigurationSection("worth." + itemname);
+			if (itemNameMatch != null && itemNameMatch.getKeys(false).size() == 1)
+			{
+				result = config.getBigDecimal("worth." + itemname + ".0", BigDecimal.ONE.negate());
+			}
+		}
+		if (result.signum() < 0)
+		{
+			result = config.getBigDecimal("worth." + itemname + ".*", BigDecimal.ONE.negate());
+		}
+		if (result.signum() < 0)
+		{
+			result = config.getBigDecimal("worth." + itemname, BigDecimal.ONE.negate());
+		}
+
+		//Now we should check for item ID
+		if (result.signum() < 0)
+		{
+			result = config.getBigDecimal("worth." + itemStack.getTypeId() + "." + itemStack.getDurability(), BigDecimal.ONE.negate());
+		}
+		if (result.signum() < 0)
+		{
+			final ConfigurationSection itemNumberMatch = config.getConfigurationSection("worth." + itemStack.getTypeId());
+			if (itemNumberMatch != null && itemNumberMatch.getKeys(false).size() == 1)
+			{
+				result = config.getBigDecimal("worth." + itemStack.getTypeId() + ".0", BigDecimal.ONE.negate());
+			}
+		}
+		if (result.signum() < 0)
+		{
+			result = config.getBigDecimal("worth." + itemStack.getTypeId() + ".*", BigDecimal.ONE.negate());
+		}
+		if (result.signum() < 0)
+		{
+			result = config.getBigDecimal("worth." + itemStack.getTypeId(), BigDecimal.ONE.negate());
+		}
+
+		//This is to match the old worth syntax
+		if (result.signum() < 0)
+		{
+			result = config.getBigDecimal("worth-" + itemStack.getTypeId(), BigDecimal.ONE.negate());
+		}
+		if (result.signum() < 0)
+		{
+			return null;
+		}
+		return result;
+	}
+
+	public int getAmount(IEssentials ess, User user, ItemStack is, String[] args, boolean isBulkSell) throws Exception
+	{
+		if (is == null || is.getType() == Material.AIR)
+		{
+			throw new Exception(tl("itemSellAir"));
+		}
+		int id = is.getTypeId();
+		int amount = 0;
+
+		if (args.length > 1)
+		{
+			try
+			{
+				amount = Integer.parseInt(args[1].replaceAll("[^0-9]", ""));
+			}
+			catch (NumberFormatException ex)
+			{
+				throw new NotEnoughArgumentsException(ex);
+			}
+			if (args[1].startsWith("-"))
+			{
+				amount = -amount;
+			}
+		}
+
+		boolean stack = args.length > 1 && args[1].endsWith("s");
+		boolean requireStack = ess.getSettings().isTradeInStacks(id);
+
+		if (requireStack && !stack)
+		{
+			throw new Exception(tl("itemMustBeStacked"));
+		}
+
+		int max = 0;
+		for (ItemStack s : user.getBase().getInventory().getContents())
+		{
+			if (s == null || !s.isSimilar(is))
+			{
+				continue;
+			}
+			max += s.getAmount();
+		}
+
+		if (stack)
+		{
+			amount *= is.getType().getMaxStackSize();
+		}
+		if (amount < 1)
+		{
+			amount += max;
+		}
+
+		if (requireStack)
+		{
+			amount -= amount % is.getType().getMaxStackSize();
+		}
+		if (amount > max || amount < 1)
+		{
+			if (!isBulkSell)
+			{
+				user.sendMessage(tl("itemNotEnough2"));
+				user.sendMessage(tl("itemNotEnough3"));
+				throw new Exception(tl("itemNotEnough1"));
+			}
+			else
+			{
+				return amount;
+			}
+		}
+
+		return amount;
+	}
+
+	public void setPrice(ItemStack itemStack, double price)
+	{
+		if (itemStack.getType().getData() == null)
+		{
+			config.setProperty("worth." + itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), price);
+		}
+		else
+		{
+			// Bukkit-bug: getDurability still contains the correct value, while getData().getData() is 0.
+			config.setProperty("worth." + itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "") + "." + itemStack.getDurability(), price);
+		}
+		config.removeProperty("worth-" + itemStack.getTypeId());
+		config.save();
+	}
+
+	@Override
+	public void reloadConfig()
+	{
+		config.load();
+	}
+}

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

@@ -0,0 +1,453 @@
+package com.earth2me.essentials.api;
+
+import com.earth2me.essentials.EssentialsConf;
+import com.earth2me.essentials.EssentialsUserConf;
+import static com.earth2me.essentials.I18n.tl;
+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;
+import java.math.MathContext;
+import java.util.UUID;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
+import net.ess3.api.MaxMoneyException;
+
+
+/**
+ * Instead of using this api directly, we recommend to use the register plugin: http://bit.ly/RegisterMethod
+ */
+public class Economy
+{
+	public Economy()
+	{
+	}
+	private static final Logger logger = Logger.getLogger("Essentials");
+	private static IEssentials ess;
+	private static final String noCallBeforeLoad = "Essentials API is called before Essentials is loaded.";
+	public static final MathContext MATH_CONTEXT = MathContext.DECIMAL128;
+
+	/**
+	 * @param aEss the ess to set
+	 */
+	public static void setEss(IEssentials aEss)
+	{
+		ess = aEss;
+	}
+
+	private static void createNPCFile(String name)
+	{
+		File folder = new File(ess.getDataFolder(), "userdata");
+		if (!folder.exists())
+		{
+			folder.mkdirs();
+		}
+		UUID npcUUID = UUID.nameUUIDFromBytes(("NPC:" + name).getBytes(Charsets.UTF_8));
+		EssentialsUserConf npcConfig = new EssentialsUserConf(name, npcUUID, new File(folder, npcUUID.toString() + ".yml"));
+		npcConfig.load();
+		npcConfig.setProperty("npc", true);
+		npcConfig.setProperty("lastAccountName", name);
+		npcConfig.setProperty("money", ess.getSettings().getStartingBalance());
+		npcConfig.forceSave();
+		ess.getUserMap().trackUUID(npcUUID, name);
+	}
+
+	private static void deleteNPC(String name)
+	{
+		User user = ess.getUser(name);
+		user.reset();
+	}
+
+	private static User getUserByName(String name)
+	{
+		if (ess == null)
+		{
+			throw new RuntimeException(noCallBeforeLoad);
+		}
+		return ess.getUser(name);
+	}
+
+	/**
+	 * Returns the balance of a user
+	 *
+	 * @param name Name of the user
+	 * @return balance
+	 * @throws UserDoesNotExistException
+	 */
+	@Deprecated
+	public static double getMoney(String name) throws UserDoesNotExistException
+	{
+		return getMoneyExact(name).doubleValue();
+	}
+
+	public static BigDecimal getMoneyExact(String name) throws UserDoesNotExistException
+	{
+		User user = getUserByName(name);
+		if (user == null)
+		{
+			throw new UserDoesNotExistException(name);
+		}
+		return user.getMoney();
+	}
+
+	/**
+	 * Sets the balance of a user
+	 *
+	 * @param name Name of the user
+	 * @param balance The balance you want to set
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
+	 */
+	@Deprecated
+	public static void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException
+	{
+		try
+		{
+			setMoney(name, BigDecimal.valueOf(balance));
+		}
+		catch (ArithmeticException e)
+		{
+			logger.log(Level.WARNING, "Failed to set balance of " + name + " to " + balance + ": " + e.getMessage(), e);
+		}
+	}
+
+	public static void setMoney(String name, BigDecimal balance) throws UserDoesNotExistException, NoLoanPermittedException
+	{
+		User user = getUserByName(name);
+		if (user == null)
+		{
+			throw new UserDoesNotExistException(name);
+		}
+		if (balance.compareTo(ess.getSettings().getMinMoney()) < 0)
+		{
+			throw new NoLoanPermittedException();
+		}
+		if (balance.signum() < 0 && !user.isAuthorized("essentials.eco.loan"))
+		{
+			throw new NoLoanPermittedException();
+		}
+		try
+		{
+			user.setMoney(balance);
+		}
+		catch (MaxMoneyException ex)
+		{
+			//TODO: Update API to show max balance errors
+		}
+	}
+
+	/**
+	 * Adds money to the balance of a user
+	 *
+	 * @param name Name of the user
+	 * @param amount The money you want to add
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
+	 */
+	@Deprecated
+	public static void add(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
+	{
+		try
+		{
+			add(name, BigDecimal.valueOf(amount));
+		}
+		catch (ArithmeticException e)
+		{
+			logger.log(Level.WARNING, "Failed to add " + amount + " to balance of " + name + ": " + e.getMessage(), e);
+		}
+	}
+
+	public static void add(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
+	{
+		BigDecimal result = getMoneyExact(name).add(amount, MATH_CONTEXT);
+		setMoney(name, result);
+	}
+
+	/**
+	 * Substracts money from the balance of a user
+	 *
+	 * @param name Name of the user
+	 * @param amount The money you want to substract
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
+	 */
+	@Deprecated
+	public static void subtract(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
+	{
+		try
+		{
+			substract(name, BigDecimal.valueOf(amount));
+		}
+		catch (ArithmeticException e)
+		{
+			logger.log(Level.WARNING, "Failed to substract " + amount + " of balance of " + name + ": " + e.getMessage(), e);
+		}
+	}
+
+	public static void substract(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
+	{
+		BigDecimal result = getMoneyExact(name).subtract(amount, MATH_CONTEXT);
+		setMoney(name, result);
+	}
+
+	/**
+	 * Divides the balance of a user by a value
+	 *
+	 * @param name Name of the user
+	 * @param value The balance is divided by this value
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
+	 */
+	@Deprecated
+	public static void divide(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
+	{
+		try
+		{
+			divide(name, BigDecimal.valueOf(amount));
+		}
+		catch (ArithmeticException e)
+		{
+			logger.log(Level.WARNING, "Failed to divide balance of " + name + " by " + amount + ": " + e.getMessage(), e);
+		}
+	}
+
+	public static void divide(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
+	{
+		BigDecimal result = getMoneyExact(name).divide(amount, MATH_CONTEXT);
+		setMoney(name, result);
+	}
+
+	/**
+	 * Multiplies the balance of a user by a value
+	 *
+	 * @param name Name of the user
+	 * @param value The balance is multiplied by this value
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
+	 */
+	@Deprecated
+	public static void multiply(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
+	{
+		try
+		{
+			multiply(name, BigDecimal.valueOf(amount));
+		}
+		catch (ArithmeticException e)
+		{
+			logger.log(Level.WARNING, "Failed to multiply balance of " + name + " by " + amount + ": " + e.getMessage(), e);
+		}
+	}
+
+	public static void multiply(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
+	{
+		BigDecimal result = getMoneyExact(name).multiply(amount, MATH_CONTEXT);
+		setMoney(name, result);
+	}
+
+	/**
+	 * Resets the balance of a user to the starting balance
+	 *
+	 * @param name Name of the user
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
+	 */
+	public static void resetBalance(String name) throws UserDoesNotExistException, NoLoanPermittedException
+	{
+		if (ess == null)
+		{
+			throw new RuntimeException(noCallBeforeLoad);
+		}
+		setMoney(name, ess.getSettings().getStartingBalance());
+	}
+
+	/**
+	 * @param name Name of the user
+	 * @param amount The amount of money the user should have
+	 * @return true, if the user has more or an equal amount of money
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 */
+	@Deprecated
+	public static boolean hasEnough(String name, double amount) throws UserDoesNotExistException
+	{
+		try
+		{
+			return hasEnough(name, BigDecimal.valueOf(amount));
+		}
+		catch (ArithmeticException e)
+		{
+			logger.log(Level.WARNING, "Failed to compare balance of " + name + " with " + amount + ": " + e.getMessage(), e);
+			return false;
+		}
+	}
+
+	public static boolean hasEnough(String name, BigDecimal amount) throws UserDoesNotExistException, ArithmeticException
+	{
+		return amount.compareTo(getMoneyExact(name)) <= 0;
+	}
+
+	/**
+	 * @param name Name of the user
+	 * @param amount The amount of money the user should have
+	 * @return true, if the user has more money
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 */
+	@Deprecated
+	public static boolean hasMore(String name, double amount) throws UserDoesNotExistException
+	{
+		try
+		{
+			return hasMore(name, BigDecimal.valueOf(amount));
+		}
+		catch (ArithmeticException e)
+		{
+			logger.log(Level.WARNING, "Failed to compare balance of " + name + " with " + amount + ": " + e.getMessage(), e);
+			return false;
+		}
+	}
+
+	public static boolean hasMore(String name, BigDecimal amount) throws UserDoesNotExistException, ArithmeticException
+	{
+		return amount.compareTo(getMoneyExact(name)) < 0;
+	}
+
+	/**
+	 * @param name Name of the user
+	 * @param amount The amount of money the user should not have
+	 * @return true, if the user has less money
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 */
+	@Deprecated
+	public static boolean hasLess(String name, double amount) throws UserDoesNotExistException
+	{
+		try
+		{
+			return hasLess(name, BigDecimal.valueOf(amount));
+		}
+		catch (ArithmeticException e)
+		{
+			logger.log(Level.WARNING, "Failed to compare balance of " + name + " with " + amount + ": " + e.getMessage(), e);
+			return false;
+		}
+	}
+
+	public static boolean hasLess(String name, BigDecimal amount) throws UserDoesNotExistException, ArithmeticException
+	{
+		return amount.compareTo(getMoneyExact(name)) > 0;
+	}
+
+	/**
+	 * Test if the user has a negative balance
+	 *
+	 * @param name Name of the user
+	 * @return true, if the user has a negative balance
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 */
+	public static boolean isNegative(String name) throws UserDoesNotExistException
+	{
+		return getMoneyExact(name).signum() < 0;
+	}
+
+	/**
+	 * Formats the amount of money like all other Essentials functions. Example: $100000 or $12345.67
+	 *
+	 * @param amount The amount of money
+	 * @return Formatted money
+	 */
+	@Deprecated
+	public static String format(double amount)
+	{
+		try
+		{
+			return format(BigDecimal.valueOf(amount));
+		}
+		catch (NumberFormatException e)
+		{
+			logger.log(Level.WARNING, "Failed to display " + amount + ": " + e.getMessage(), e);
+			return "NaN";
+		}
+	}
+
+	public static String format(BigDecimal amount)
+	{
+		if (ess == null)
+		{
+			throw new RuntimeException(noCallBeforeLoad);
+		}
+		return NumberUtil.displayCurrency(amount, ess);
+	}
+
+	/**
+	 * Test if a player exists to avoid the UserDoesNotExistException
+	 *
+	 * @param name Name of the user
+	 * @return true, if the user exists
+	 */
+	public static boolean playerExists(String name)
+	{
+		return getUserByName(name) != null;
+	}
+
+	/**
+	 * Test if a player is a npc
+	 *
+	 * @param name Name of the player
+	 * @return true, if it's a npc
+	 * @throws UserDoesNotExistException
+	 */
+	public static boolean isNPC(String name) throws UserDoesNotExistException
+	{
+		User user = getUserByName(name);
+		if (user == null)
+		{
+			throw new UserDoesNotExistException(name);
+		}
+		return user.isNPC();
+	}
+
+	/**
+	 * Creates dummy files for a npc, if there is no player yet with that name.
+	 *
+	 * @param name Name of the player
+	 * @return true, if a new npc was created
+	 */
+	public static boolean createNPC(String name)
+	{
+		User user = getUserByName(name);
+		if (user == null)
+		{
+			createNPCFile(name);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Deletes a user, if it is marked as npc.
+	 *
+	 * @param name Name of the player
+	 * @throws UserDoesNotExistException
+	 */
+	public static void removeNPC(String name) throws UserDoesNotExistException
+	{
+		User user = getUserByName(name);
+		if (user == null)
+		{
+			throw new UserDoesNotExistException(name);
+		}
+		deleteNPC(name);
+	}
+}
+

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

@@ -0,0 +1,13 @@
+package com.earth2me.essentials.api;
+
+import java.util.Locale;
+
+
+public interface II18n
+{
+	/**
+	 * Gets the current locale setting
+	 * @return the current locale, if not set it will return the default locale
+	 */
+	Locale getCurrentLocale();
+}

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

@@ -0,0 +1,20 @@
+
+package com.earth2me.essentials.api;
+
+import com.earth2me.essentials.User;
+import java.util.List;
+import org.bukkit.inventory.ItemStack;
+
+
+public interface IItemDb
+{
+	ItemStack get(final String name, final int quantity) throws Exception;
+
+	ItemStack get(final String name) throws Exception;
+	
+	public String names(ItemStack item);
+	
+	public String name(ItemStack item);
+	
+	List<ItemStack> getMatching(User user, String[] args) throws Exception;
+}

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

@@ -0,0 +1,53 @@
+package com.earth2me.essentials.api;
+
+import java.util.Collection;
+import net.ess3.api.IUser;
+import org.bukkit.Location;
+
+
+public interface IJails extends IReload
+{
+		/**
+	 * Gets the location of the jail with the given name
+	 * @param jailName The name of the jail
+	 * @return the location of the jail
+	 * @throws Exception if the jail does not exist
+	 */
+	Location getJail(String jailName) throws Exception;
+
+	/**
+	 * Gets a list of jails by names
+	 * @return a list of jails, if there are none the list will be empty
+	 * @throws Exception
+	 */
+	Collection<String> getList() throws Exception;
+
+	/**
+	 * Gets the number of jails
+	 * @return the size of the list of jails
+	 */
+	int getCount();
+
+	/**
+	 * Remove the jail with the given name
+	 * @param jail the jail to remove
+	 * @throws Exception if the jail does not exist
+	 */
+	void removeJail(String jail) throws Exception;
+
+	/**
+	 * Attempts to send the given user to the given jail
+	 * @param user the user to send to jail
+	 * @param jail the jail to send the user to
+	 * @throws Exception if the user is offline or jail does not exist
+	 */
+	void sendToJail(IUser user, String jail) throws Exception;
+
+	/**
+	 * Set a new jail with the given name and location
+	 * @param jailName the name of the jail being set
+	 * @param loc the location of the jail being set
+	 * @throws Exception
+	 */
+	void setJail(String jailName, Location loc) throws Exception;
+}

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

@@ -0,0 +1,7 @@
+package com.earth2me.essentials.api;
+
+
+public interface IReload
+{
+	void onReload();
+}

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

@@ -0,0 +1,112 @@
+package com.earth2me.essentials.api;
+
+import com.earth2me.essentials.Trade;
+import net.ess3.api.IUser;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerTeleportEvent;
+
+
+public interface ITeleport
+{
+	/**
+	 * Used to skip teleportPlayer delay when teleporting someone to a location or player.
+	 *
+	 * @param loc - Where should the player end up
+	 * @param cooldown - If cooldown should be enforced
+	 * @param cause - The reported teleportPlayer cause
+	 * @throws Exception
+	 */
+	void now(Location loc, boolean cooldown, PlayerTeleportEvent.TeleportCause cause) throws Exception;
+
+	/**
+	 * Used to skip teleportPlayer delay when teleporting someone to a location or player.
+	 *
+	 * @param entity - Where should the player end up
+	 * @param cooldown - If cooldown should be enforced
+	 * @param cause - The reported teleportPlayer cause
+	 * @throws Exception
+	 */
+	void now(Player entity, boolean cooldown, PlayerTeleportEvent.TeleportCause cause) throws Exception;
+
+	@Deprecated
+	void teleport(Location loc, Trade chargeFor) throws Exception;
+
+	/**
+	 * Teleport a player to a specific location
+	 *
+	 * @param loc - Where should the player end up
+	 * @param chargeFor - What the user will be charged if teleportPlayer is successful
+	 * @param cause - The reported teleportPlayer cause
+	 * @throws Exception
+	 */
+	void teleport(Location loc, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception;
+
+	/**
+	 * Teleport a player to a specific player
+	 *
+	 * @param entity - Where should the player end up
+	 * @param chargeFor - What the user will be charged if teleportPlayer is successful
+	 * @param cause - The reported teleportPlayer cause
+	 * @throws Exception
+	 */
+	void teleport(Player entity, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception;
+
+	/**
+	 * Teleport a player to a specific location
+	 *
+	 * @param otherUser - Which user will be teleported
+	 * @param loc - Where should the player end up
+	 * @param chargeFor - What the user will be charged if teleportPlayer is successful
+	 * @param cause - The reported teleportPlayer cause
+	 * @throws Exception
+	 */
+	void teleportPlayer(IUser otherUser, Location loc, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception;
+
+	/**
+	 * Teleport a player to a specific player
+	 *
+	 * @param otherUser - Which user will be teleported
+	 * @param entity - Where should the player end up
+	 * @param chargeFor - What the user will be charged if teleportPlayer is successful
+	 * @param cause - The reported teleportPlayer cause
+	 * @throws Exception
+	 */
+	void teleportPlayer(IUser otherUser, Player entity, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception;
+
+	/**
+	 * Teleport wrapper used to handle tp fallback on /jail and /home
+	 *
+	 * @param chargeFor - What the user will be charged if teleportPlayer is successful
+	 * @param cause - The reported teleportPlayer cause
+	 * @throws Exception
+	 */
+	public void respawn(final Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception;
+
+	/**
+	 * Teleport wrapper used to handle /warp teleports
+	 *
+	 * @param otherUser - Which user will be teleported
+	 * @param warp - The name of the warp the user will be teleported too.
+	 * @param chargeFor - What the user will be charged if teleportPlayer is successful
+	 * @param cause - The reported teleportPlayer cause
+	 * @throws Exception
+	 */
+	public void warp(IUser otherUser, String warp, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception;
+
+	/**
+	 * Teleport wrapper used to handle /back teleports
+	 *
+	 * @param chargeFor - What the user will be charged if teleportPlayer is successful
+	 * @throws Exception
+	 */
+	public void back(Trade chargeFor) throws Exception;
+
+	/**
+	 * Teleport wrapper used to handle throwing user home after a jail sentence
+	 *
+	 * @throws Exception
+	 */
+	public void back() throws Exception;
+
+}

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

@@ -0,0 +1,68 @@
+package com.earth2me.essentials.api;
+
+import com.earth2me.essentials.IConf;
+import com.earth2me.essentials.commands.WarpNotFoundException;
+import java.io.File;
+import java.util.Collection;
+import org.bukkit.Location;
+
+
+public interface IWarps extends IConf
+{
+	/**
+	 * Get a warp by name
+	 *
+	 * @param warp - Warp name
+	 * @return - Location the warp is set to
+	 * @throws WarpNotFoundException When the warp is not found
+	 * @throws InvalidWorldException When the world the warp is in is not found
+	 */
+	Location getWarp(String warp) throws WarpNotFoundException, net.ess3.api.InvalidWorldException;
+
+	/**
+	 * Gets a list of warps
+	 *
+	 * @return - A {@link Collection} of warps
+	 */
+	Collection<String> getList();
+
+	/**
+	 * Gets the number of warps
+	 *
+	 * @return the size of the list of warps
+	 */
+	int getCount();
+
+	/**
+	 * Delete a warp from the warp DB
+	 *
+	 * @param name - Name of warp
+	 * @throws Exception
+	 */
+	void removeWarp(String name) throws Exception;
+
+	/**
+	 * Set a warp
+	 *
+	 * @param name - Name of warp
+	 * @param loc - Location of warp
+	 * @throws Exception
+	 */
+	void setWarp(String name, Location loc) throws Exception;
+
+	/**
+	 * Check to see if the file is empty
+	 *
+	 * @return
+	 */
+	boolean isEmpty();
+
+	/**
+	 * Get a warp file note: this is not yet implemented, as 3.x uses different storage methods
+	 *
+	 * @param name - name of file
+	 * @return - an instance of the file
+	 * @throws InvalidNameException - When the file is not found
+	 */
+	File getWarpFile(String name) throws net.ess3.api.InvalidNameException;
+}

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

@@ -0,0 +1,16 @@
+package com.earth2me.essentials.api;
+
+
+public class InvalidNameException extends Exception
+{
+	/**
+	 * NOTE: This is not implemented yet, just here for future 3.x api support
+	 * Allow serialization of the InvalidNameException exception
+	 */
+	private static final long serialVersionUID = 1485321420293663139L;
+
+	public InvalidNameException(Throwable thrwbl)
+	{
+		super(thrwbl);
+	}
+}

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

@@ -0,0 +1,20 @@
+package com.earth2me.essentials.api;
+
+import static com.earth2me.essentials.I18n.tl;
+
+
+public class InvalidWorldException extends Exception
+{
+	private final String world;
+
+	public InvalidWorldException(final String world)
+	{
+		super(tl("invalidWorld"));
+		this.world = world;
+	}
+
+	public String getWorld()
+	{
+		return this.world;
+	}
+}

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

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,71 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+
+
+public class Commandafk extends EssentialsCommand
+{
+	public Commandafk()
+	{
+		super("afk");
+	}
+
+	@Override
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length > 0 && user.isAuthorized("essentials.afk.others"))
+		{
+			User afkUser = getPlayer(server, user, args, 0);
+			toggleAfk(afkUser);
+		}
+		else
+		{
+			toggleAfk(user);
+		}
+	}
+	
+	@Override
+	public void run(Server server, CommandSource sender, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length > 0)
+		{
+			User afkUser = getPlayer(server, args, 0, true, false);
+			toggleAfk(afkUser);
+		}
+		else
+		{
+			throw new NotEnoughArgumentsException();
+		}
+	}
+
+	private void toggleAfk(User user)
+	{
+		user.setDisplayNick();
+		String msg = "";
+		if (!user.toggleAfk())
+		{
+			//user.sendMessage(_("markedAsNotAway"));
+			if (!user.isHidden())
+			{
+				msg = tl("userIsNotAway", user.getDisplayName());
+			}
+			user.updateActivity(false);
+		}
+		else
+		{
+			//user.sendMessage(_("markedAsAway"));
+			if (!user.isHidden())
+			{
+				msg = tl("userIsAway", user.getDisplayName());
+			}
+		}
+		if (!msg.isEmpty())
+		{
+			ess.broadcastMessage(user, msg);
+		}
+	}
+}
+

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

@@ -0,0 +1,29 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.LocationUtil;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.entity.TNTPrimed;
+
+// This command has a in theme message that only shows if you supply a parameter #EasterEgg
+public class Commandantioch extends EssentialsCommand
+{
+	public Commandantioch()
+	{
+		super("antioch");
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length > 0)
+		{
+			ess.broadcastMessage(user, "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,");
+			ess.broadcastMessage(user, "who being naughty in My sight, shall snuff it.");
+		}
+
+		final Location loc = LocationUtil.getTarget(user.getBase());
+		loc.getWorld().spawn(loc, TNTPrimed.class);
+	}
+}

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

@@ -0,0 +1,33 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+
+
+public class Commandback extends EssentialsCommand
+{
+	public Commandback()
+	{
+		super("back");
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (user.getLastLocation() == null)
+		{
+			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(tl("noPerm", "essentials.worlds." + user.getLastLocation().getWorld().getName()));
+		}
+		final Trade charge = new Trade(this.getName(), ess);
+		charge.isAffordableFor(user);
+		user.getTeleport().back(charge);
+		throw new NoChargeException();
+	}
+}

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

@@ -0,0 +1,49 @@
+package com.earth2me.essentials.commands;
+
+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;
+
+
+public class Commandbalance extends EssentialsCommand
+{
+	public Commandbalance()
+	{
+		super("balance");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		User target = getPlayer(server, args, 0, true, true);
+		sender.sendMessage(tl("balanceOther", target.isHidden() ? target.getName() : target.getDisplayName(), NumberUtil.displayCurrency(target.getMoney(), ess)));
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length == 1 && user.isAuthorized("essentials.balance.others"))
+		{
+			final User target = getPlayer(server, args, 0, true, true);
+			final BigDecimal bal = target.getMoney();
+			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(tl("balance", NumberUtil.displayCurrency(bal, ess)));
+		}
+		else
+		{
+			throw new NotEnoughArgumentsException();
+		}
+	}
+}

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

@@ -0,0 +1,197 @@
+package com.earth2me.essentials.commands;
+
+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;
+
+
+public class Commandbalancetop extends EssentialsCommand
+{
+	public Commandbalancetop()
+	{
+		super("balancetop");
+	}
+	private static final int CACHETIME = 2 * 60 * 1000;
+	public static final int MINUSERS = 50;
+	private static final SimpleTextInput cache = new SimpleTextInput();
+	private static long cacheage = 0;
+	private static final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
+
+	@Override
+	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		int page = 0;
+		boolean force = false;
+		if (args.length > 0)
+		{
+			try
+			{
+				page = Integer.parseInt(args[0]);
+			}
+			catch (NumberFormatException ex)
+			{
+				if (args[0].equalsIgnoreCase("force")
+					&& (!sender.isPlayer() || ess.getUser(sender.getPlayer()).isAuthorized("essentials.balancetop.force")))
+				{
+					force = true;
+				}
+			}
+		}
+
+		if (!force && lock.readLock().tryLock())
+		{
+			try
+			{
+				if (cacheage > System.currentTimeMillis() - CACHETIME)
+				{
+					outputCache(sender, page);
+					return;
+				}
+				if (ess.getUserMap().getUniqueUsers() > MINUSERS)
+				{
+					sender.sendMessage(tl("orderBalances", ess.getUserMap().getUniqueUsers()));
+				}
+			}
+			finally
+			{
+				lock.readLock().unlock();
+			}
+			ess.runTaskAsynchronously(new Viewer(sender, page, force));
+		}
+		else
+		{
+			if (ess.getUserMap().getUniqueUsers() > MINUSERS)
+			{
+				sender.sendMessage(tl("orderBalances", ess.getUserMap().getUniqueUsers()));
+			}
+			ess.runTaskAsynchronously(new Viewer(sender, page, force));
+		}
+
+	}
+
+	private static void outputCache(final CommandSource sender, int page)
+	{
+		final Calendar cal = Calendar.getInstance();
+		cal.setTimeInMillis(cacheage);
+		final DateFormat format = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
+		sender.sendMessage(tl("balanceTop", format.format(cal.getTime())));
+		new TextPager(cache).showPage(Integer.toString(page), null, "balancetop", sender);
+	}
+
+
+	private class Calculator implements Runnable
+	{
+		private final transient Viewer viewer;
+		private final boolean force;
+
+		public Calculator(final Viewer viewer, final boolean force)
+		{
+			this.viewer = viewer;
+			this.force = force;
+		}
+
+		@Override
+		public void run()
+		{
+			lock.writeLock().lock();
+			try
+			{
+				if (force || cacheage <= System.currentTimeMillis() - CACHETIME)
+				{
+					cache.getLines().clear();
+					final Map<String, BigDecimal> balances = new HashMap<String, BigDecimal>();
+					BigDecimal totalMoney = BigDecimal.ZERO;
+					if (ess.getSettings().isEcoDisabled())
+					{
+						if (ess.getSettings().isDebug())
+						{
+							ess.getLogger().info("Internal economy functions disabled, aborting baltop.");
+						}
+					}
+					else
+					{
+						for (UUID u : ess.getUserMap().getAllUniqueUsers())
+						{
+							final User user = ess.getUserMap().getUser(u);
+							if (user != null)
+							{
+								final BigDecimal userMoney = user.getMoney();
+								user.updateMoneyCache(userMoney);
+								totalMoney = totalMoney.add(userMoney);
+								final String name = user.isHidden() ? user.getName() : user.getDisplayName();
+								balances.put(name, userMoney);
+							}
+						}
+					}
+
+					final List<Map.Entry<String, BigDecimal>> sortedEntries = new ArrayList<Map.Entry<String, BigDecimal>>(balances.entrySet());
+					Collections.sort(sortedEntries, new Comparator<Map.Entry<String, BigDecimal>>()
+					{
+						@Override
+						public int compare(final Entry<String, BigDecimal> entry1, final Entry<String, BigDecimal> entry2)
+						{
+							return entry2.getValue().compareTo(entry1.getValue());
+						}
+					});
+
+					cache.getLines().add(tl("serverTotal", NumberUtil.displayCurrency(totalMoney, ess)));
+					int pos = 1;
+					for (Map.Entry<String, BigDecimal> entry : sortedEntries)
+					{
+						cache.getLines().add(pos + ". " + entry.getKey() + ", " + NumberUtil.displayCurrency(entry.getValue(), ess));
+						pos++;
+					}
+					cacheage = System.currentTimeMillis();
+				}
+			}
+			finally
+			{
+				lock.writeLock().unlock();
+			}
+			ess.runTaskAsynchronously(viewer);
+		}
+	}
+
+
+	private class Viewer implements Runnable
+	{
+		private final transient CommandSource sender;
+		private final transient int page;
+		private final transient boolean force;
+
+		public Viewer(final CommandSource sender, final int page, final boolean force)
+		{
+			this.sender = sender;
+			this.page = page;
+			this.force = force;
+		}
+
+		@Override
+		public void run()
+		{
+			lock.readLock().lock();
+			try
+			{
+				if (!force && cacheage > System.currentTimeMillis() - CACHETIME)
+				{
+					outputCache(sender, page);
+					return;
+				}
+			}
+			finally
+			{
+				lock.readLock().unlock();
+			}
+			ess.runTaskAsynchronously(new Calculator(new Viewer(sender, page, false), force));
+		}
+	}
+}

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

@@ -0,0 +1,78 @@
+package com.earth2me.essentials.commands;
+
+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.Server;
+
+
+public class Commandban extends EssentialsCommand
+{
+	public Commandban()
+	{
+		super("ban");
+	}
+
+	@Override
+	public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		boolean nomatch = false;
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		User user;
+		try
+		{
+			user = getPlayer(server, args, 0, true, true);
+		}
+		catch (PlayerNotFoundException e)
+		{
+			nomatch = true;
+			user = ess.getUser(new OfflinePlayer(args[0], ess.getServer()));
+		}
+		if (!user.getBase().isOnline())
+		{
+			if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.ban.offline"))
+			{
+				throw new Exception(tl("banExemptOffline"));
+			}
+		}
+		else
+		{
+			if (user.isAuthorized("essentials.ban.exempt") && sender.isPlayer())
+			{
+				throw new Exception(tl("banExempt"));
+			}
+		}
+
+		final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
+		String banReason;
+		if (args.length > 1)
+		{
+			banReason = FormatUtil.replaceFormat(getFinalArg(args, 1).replace("\\n", "\n").replace("|", "\n"));
+		}
+		else
+		{
+			banReason = tl("defaultBanReason");
+		}
+
+		user.setBanReason(tl("banFormat", banReason, senderName));
+		user.getBase().setBanned(true);
+		user.setBanTimeout(0);
+		user.getBase().kickPlayer(tl("banFormat", banReason, senderName));
+
+		server.getLogger().log(Level.INFO, tl("playerBanned", senderName, user.getName(), banReason));
+
+		if (nomatch)
+		{
+			sender.sendMessage(tl("userUnknown", user.getName()));
+		}
+
+		ess.broadcastMessage("essentials.ban.notify", tl("playerBanned", senderName, user.getName(), banReason));
+	}
+}

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

@@ -0,0 +1,57 @@
+package com.earth2me.essentials.commands;
+
+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.Server;
+
+
+public class Commandbanip extends EssentialsCommand
+{
+	public Commandbanip()
+	{
+		super("banip");
+	}
+
+	@Override
+	public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
+
+		String ipAddress;
+		if (FormatUtil.validIP(args[0]))
+		{
+			ipAddress = args[0];
+		}
+		else
+		{
+			try
+			{
+				User player = getPlayer(server, args, 0, true, true);
+				ipAddress = player.getLastLoginAddress();
+			}
+			catch (PlayerNotFoundException ex)
+			{
+				ipAddress = args[0];
+			}
+		}
+
+		if (ipAddress.isEmpty())
+		{
+			throw new PlayerNotFoundException();
+		}
+
+		ess.getServer().banIP(ipAddress);
+		server.getLogger().log(Level.INFO, tl("playerBanIpAddress", senderName, ipAddress));
+
+		ess.broadcastMessage("essentials.ban.notify", tl("playerBanIpAddress", senderName, ipAddress));
+	}
+}

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

@@ -0,0 +1,92 @@
+package com.earth2me.essentials.commands;
+
+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;
+
+
+public class Commandbook extends EssentialsCommand
+{
+	public Commandbook()
+	{
+		super("book");
+	}
+
+	//TODO: Translate this
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		final ItemStack item = user.getBase().getItemInHand();
+		final String player = user.getName();
+		if (item.getType() == Material.WRITTEN_BOOK)
+		{
+			BookMeta bmeta = (BookMeta)item.getItemMeta();
+
+			if (args.length > 1 && args[0].equalsIgnoreCase("author"))
+			{
+				if (user.isAuthorized("essentials.book.author") && (isAuthor(bmeta, player) || user.isAuthorized("essentials.book.others")))
+				{
+					bmeta.setAuthor(args[1]);
+					item.setItemMeta(bmeta);
+					user.sendMessage(tl("bookAuthorSet", getFinalArg(args, 1)));
+				}
+				else
+				{
+					throw new Exception(tl("denyChangeAuthor"));
+				}
+			}
+			else if (args.length > 1 && args[0].equalsIgnoreCase("title"))
+			{
+				if (user.isAuthorized("essentials.book.title") && (isAuthor(bmeta, player) || user.isAuthorized("essentials.book.others")))
+				{
+					bmeta.setTitle(args[1]);
+					item.setItemMeta(bmeta);
+					user.sendMessage(tl("bookTitleSet", getFinalArg(args, 1)));
+				}
+				else
+				{
+					throw new Exception(tl("denyChangeTitle"));
+				}
+			}
+			else
+			{
+				if (isAuthor(bmeta, player) || user.isAuthorized("essentials.book.others"))
+				{
+					ItemStack newItem = new ItemStack(Material.BOOK_AND_QUILL, item.getAmount());
+					newItem.setItemMeta(bmeta);
+					user.getBase().setItemInHand(newItem);
+					user.sendMessage(tl("editBookContents"));
+				}
+				else
+				{
+					throw new Exception(tl("denyBookEdit"));
+				}
+			}
+		}
+		else if (item.getType() == Material.BOOK_AND_QUILL)
+		{
+			BookMeta bmeta = (BookMeta)item.getItemMeta();
+			if (!user.isAuthorized("essentials.book.author"))
+			{
+				bmeta.setAuthor(player);
+			}
+			ItemStack newItem = new ItemStack(Material.WRITTEN_BOOK, item.getAmount());
+			newItem.setItemMeta(bmeta);
+			user.getBase().setItemInHand(newItem);
+			user.sendMessage(tl("bookLocked"));
+		}
+		else
+		{
+			throw new Exception(tl("holdBook"));
+		}
+	}
+
+	private boolean isAuthor(BookMeta bmeta, String player)
+	{
+		String author = bmeta.getAuthor();
+		return author != null && author.equalsIgnoreCase(player);
+	}
+}

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

@@ -1,20 +1,25 @@
-package net.ess3.commands;
+package com.earth2me.essentials.commands;
 
-import static net.ess3.I18n._;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
+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;
 import org.bukkit.event.block.BlockBreakEvent;
 
 
 public class Commandbreak extends EssentialsCommand
 {
+	public Commandbreak()
+	{
+		super("break");
+	}
+
 	//TODO: Switch to use util class
 	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		final Block block = user.getPlayer().getTargetBlock(null, 20);
+		final Block block = user.getBase().getTargetBlock(null, 20);
 		if (block == null)
 		{
 			throw new NoChargeException();
@@ -23,13 +28,13 @@ public class Commandbreak extends EssentialsCommand
 		{
 			throw new NoChargeException();
 		}
-		if (block.getType() == Material.BEDROCK && !Permissions.BREAK_BEDROCK.isAuthorized(user))
+		if (block.getType() == Material.BEDROCK && !user.isAuthorized("essentials.break.bedrock"))
 		{
-			throw new Exception(_("§4You are not allowed to destroy bedrock."));
+			throw new Exception(tl("noBreakBedrock"));
 		}
 		//final List<ItemStack> list = (List<ItemStack>)block.getDrops();		
 		//final BlockBreakEvent event = new BlockBreakEvent(block, user.getBase(), list);
-		final BlockBreakEvent event = new BlockBreakEvent(block, user.getPlayer());
+		final BlockBreakEvent event = new BlockBreakEvent(block, user.getBase());
 		server.getPluginManager().callEvent(event);
 		if (event.isCancelled())
 		{
@@ -40,4 +45,4 @@ public class Commandbreak extends EssentialsCommand
 			block.setType(Material.AIR);
 		}
 	}
-}
+}

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

@@ -0,0 +1,38 @@
+package com.earth2me.essentials.commands;
+
+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;
+
+
+public class Commandbroadcast extends EssentialsCommand
+{
+	public Commandbroadcast()
+	{
+		super("broadcast");
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		sendBroadcast(user.getDisplayName(), args);
+	}
+
+	@Override
+	public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		sendBroadcast(sender.getSender().getName(), args);
+	}
+
+	private void sendBroadcast(final String name, final String[] args) throws NotEnoughArgumentsException
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		ess.broadcastMessage(tl("broadcast", FormatUtil.replaceFormat(getFinalArg(args, 0)).replace("\\n", "\n"), name));
+	}
+}

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

@@ -0,0 +1,33 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+
+
+public class Commandburn extends EssentialsCommand
+{
+	public Commandburn()
+	{
+		super("burn");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 2)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		if (args[0].trim().length() < 2)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		User user = getPlayer(server, sender, args, 0);
+		user.getBase().setFireTicks(Integer.parseInt(args[1]) * 20);
+		sender.sendMessage(tl("burnMsg", user.getDisplayName(), Integer.parseInt(args[1])));
+	}
+}

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

@@ -0,0 +1,162 @@
+package com.earth2me.essentials.commands;
+
+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.Arrays;
+import java.util.List;
+import java.util.Locale;
+import org.bukkit.Server;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+
+public class Commandclearinventory extends EssentialsCommand
+{
+	public Commandclearinventory()
+	{
+		super("clearinventory");
+	}
+	private static final int BASE_AMOUNT = 100000;
+	private static final int EXTENDED_CAP = 8;
+
+	@Override
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		parseCommand(server, user.getSource(), args, user.isAuthorized("essentials.clearinventory.others"), user.isAuthorized("essentials.clearinventory.all") || user.isAuthorized("essentials.clearinventory.multiple"));
+	}
+
+	@Override
+	protected void run(Server server, CommandSource sender, String commandLabel, String[] args) throws Exception
+	{
+		parseCommand(server, sender, args, true, true);
+	}
+
+	private void parseCommand(Server server, CommandSource sender, String[] args, boolean allowOthers, boolean allowAll) throws Exception
+	{
+		List<Player> players = new ArrayList<Player>();
+		int offset = 0;
+
+		if (sender.isPlayer())
+		{
+			players.add(sender.getPlayer());
+		}
+
+		if (allowAll && args.length > 0 && args[0].contentEquals("*"))
+		{
+			sender.sendMessage(tl("inventoryClearingFromAll"));
+			offset = 1;
+			players = Arrays.asList(server.getOnlinePlayers());
+		}
+		else if (allowOthers && args.length > 0 && args[0].trim().length() > 2)
+		{
+			offset = 1;
+			players = server.matchPlayer(args[0].trim());
+		}
+
+		if (players.size() < 1)
+		{
+			throw new PlayerNotFoundException();
+		}
+		for (Player player : players)
+		{
+			clearHandler(sender, player, args, offset, players.size() < EXTENDED_CAP);
+		}
+	}
+
+	protected void clearHandler(CommandSource sender, Player player, String[] args, int offset, boolean showExtended) throws Exception
+	{
+		short data = -1;
+		int type = -1;
+		int amount = -1;
+
+		if (args.length > (offset + 1) && NumberUtil.isInt(args[(offset + 1)]))
+		{
+			amount = Integer.parseInt(args[(offset + 1)]);
+		}
+		if (args.length > offset)
+		{
+			if (args[offset].equalsIgnoreCase("**"))
+			{
+				type = -2;
+			}
+			else if (!args[offset].equalsIgnoreCase("*"))
+			{
+				final String[] split = args[offset].split(":");
+				final ItemStack item = ess.getItemDb().get(split[0]);
+				type = item.getTypeId();
+
+				if (split.length > 1 && NumberUtil.isInt(split[1]))
+				{
+					data = Short.parseShort(split[1]);
+				}
+				else
+				{
+					data = item.getDurability();
+				}
+			}
+		}
+
+		if (type == -1) // type -1 represents wildcard or all items
+		{
+			if (showExtended)
+			{
+				sender.sendMessage(tl("inventoryClearingAllItems", player.getDisplayName()));
+			}
+			player.getInventory().clear();
+		}
+		else if (type == -2) // type -2 represents double wildcard or all items and armor
+		{
+			if (showExtended)
+			{
+				sender.sendMessage(tl("inventoryClearingAllArmor", player.getDisplayName()));
+			}
+			player.getInventory().clear();
+			player.getInventory().setArmorContents(null);
+		}
+		else
+		{
+			if (data == -1) // data -1 means that all subtypes will be cleared
+			{
+				ItemStack stack = new ItemStack(type);
+				if (showExtended)
+				{
+					sender.sendMessage(tl("inventoryClearingAllStack", stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
+				}
+				player.getInventory().clear(type, data);
+			}
+			else if (amount == -1) // amount -1 means all items will be cleared
+			{
+				ItemStack stack = new ItemStack(type, BASE_AMOUNT, data);
+				ItemStack removedStack = player.getInventory().removeItem(stack).get(0);
+				final int removedAmount = (BASE_AMOUNT - removedStack.getAmount());
+				if (removedAmount > 0 || showExtended)
+				{
+					sender.sendMessage(tl("inventoryClearingStack", removedAmount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
+				}
+			}
+			else
+			{
+				if (amount < 0)
+				{
+					amount = 1;
+				}
+				ItemStack stack = new ItemStack(type, amount, data);
+				if (player.getInventory().containsAtLeast(stack, amount))
+				{
+					sender.sendMessage(tl("inventoryClearingStack", amount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
+					player.getInventory().removeItem(stack);
+				}
+				else
+				{
+					if (showExtended)
+					{
+						sender.sendMessage(tl("inventoryClearFail", player.getDisplayName(), amount, stack.getType().toString().toLowerCase(Locale.ENGLISH)));
+					}
+				}
+			}
+		}
+	}
+}

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

@@ -1,16 +1,22 @@
-package net.ess3.commands;
+package com.earth2me.essentials.commands;
 
-import static net.ess3.I18n._;
-import net.ess3.api.IUser;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
 
 
 public class Commandcompass extends EssentialsCommand
 {
-	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
+	public Commandcompass()
 	{
-		final int bearing = (int)(user.getPlayer().getLocation().getYaw() + 180 + 360) % 360;
-		final String dir;
+		super("compass");
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		final int bearing = (int)(user.getLocation().getYaw() + 180 + 360) % 360;
+		String dir;
 		if (bearing < 23)
 		{
 			dir = "N";
@@ -47,6 +53,6 @@ public class Commandcompass extends EssentialsCommand
 		{
 			dir = "N";
 		}
-		user.sendMessage(_("§6Bearing:  {0} ({1} degrees).", dir, bearing));
+		user.sendMessage(tl("compassBearing", dir, bearing));
 	}
 }

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

@@ -0,0 +1,40 @@
+package com.earth2me.essentials.commands;
+
+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;
+
+
+public class Commandcustomtext extends EssentialsCommand
+{
+	public Commandcustomtext()
+	{
+		super("customtext");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		final IText input = new TextInput(sender, "custom", true, ess);
+		final IText output = new KeywordReplacer(input, sender, ess);
+		final TextPager pager = new TextPager(output);
+		String chapter = commandLabel;
+		String page;
+
+		if (commandLabel.equalsIgnoreCase("customtext") && args.length > 0 && !NumberUtil.isInt(commandLabel))
+		{
+			chapter = args[0];
+			page = args.length > 1 ? args[1] : null;
+		}
+		else
+		{
+			page = args.length > 0 ? args[0] : null;
+		}
+		
+		pager.showPage(chapter, page, null, sender);
+	}
+}

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

@@ -0,0 +1,62 @@
+package com.earth2me.essentials.commands;
+
+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;
+
+
+public class Commanddelhome extends EssentialsCommand
+{
+	public Commanddelhome()
+	{
+		super("delhome");
+	}
+
+	@Override
+	public void run(final Server server, final CommandSource sender, final String commandLabel, String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		User user = ess.getUser(sender.getPlayer());
+		String name;
+		String[] expandedArg;
+
+		//Allowing both formats /sethome khobbits house | /sethome khobbits:house
+		final String[] nameParts = args[0].split(":");
+		if (nameParts[0].length() != args[0].length())
+		{
+			expandedArg = nameParts;
+		}
+		else
+		{
+			expandedArg = args;
+		}
+
+		if (expandedArg.length > 1 && (user == null || user.isAuthorized("essentials.delhome.others")))
+		{
+			user = getPlayer(server, expandedArg, 0, true, true);
+			name = expandedArg[1];
+		}
+		else if (user == null)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		else
+		{
+			name = expandedArg[0];
+		}
+
+		if (name.equalsIgnoreCase("bed"))
+		{
+			throw new Exception(tl("invalidHomeName"));
+		}
+
+		user.delHome(name.toLowerCase(Locale.ENGLISH));
+		sender.sendMessage(tl("deleteHome", name));
+	}
+}

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

@@ -0,0 +1,26 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import org.bukkit.Server;
+
+
+public class Commanddeljail extends EssentialsCommand
+{
+	public Commanddeljail()
+	{
+		super("deljail");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		
+		ess.getJails().removeJail(args[0]);
+		sender.sendMessage(tl("deleteJail", args[0]));
+	}
+}

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

@@ -0,0 +1,26 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import org.bukkit.Server;
+
+
+public class Commanddelwarp extends EssentialsCommand
+{
+	public Commanddelwarp()
+	{
+		super("delwarp");
+	}
+
+	@Override
+	public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		
+		ess.getWarps().removeWarp(args[0]);
+		sender.sendMessage(tl("deleteWarp", args[0]));
+	}
+}

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

@@ -0,0 +1,32 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+
+
+public class Commanddepth extends EssentialsCommand
+{
+	public Commanddepth()
+	{
+		super("depth");
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		final int depth = user.getLocation().getBlockY() - 63;
+		if (depth > 0)
+		{
+			user.sendMessage(tl("depthAboveSea", depth));
+		}
+		else if (depth < 0)
+		{
+			user.sendMessage(tl("depthBelowSea", (-depth)));
+		}
+		else
+		{
+			user.sendMessage(tl("depth"));
+		}
+	}
+}

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

@@ -0,0 +1,122 @@
+package com.earth2me.essentials.commands;
+
+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;
+
+
+public class Commandeco extends EssentialsLoopCommand
+{
+	Commandeco.EcoCommands cmd;
+	BigDecimal amount;
+
+	public Commandeco()
+	{
+		super("eco");
+	}
+
+	@Override
+	public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 2)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		BigDecimal startingBalance = ess.getSettings().getStartingBalance();
+
+		try
+		{
+			cmd = Commandeco.EcoCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH));
+			amount = (cmd == Commandeco.EcoCommands.RESET) ? startingBalance : new BigDecimal(args[2].replaceAll("[^0-9\\.]", ""));
+		}
+		catch (Exception ex)
+		{
+			throw new NotEnoughArgumentsException(ex);
+		}
+
+		loopOfflinePlayers(server, sender, false, true, args[1], args);
+
+		if (cmd == Commandeco.EcoCommands.RESET || cmd == Commandeco.EcoCommands.SET)
+		{
+			if (args[1].contentEquals("**"))
+			{
+				server.broadcastMessage(tl("resetBalAll", NumberUtil.displayCurrency(amount, ess)));
+			}
+			else if (args[1].contentEquals("*"))
+			{
+				server.broadcastMessage(tl("resetBal", NumberUtil.displayCurrency(amount, ess)));
+			}
+		}
+	}
+
+	@Override
+	protected void updatePlayer(final Server server, final CommandSource sender, final User player, final String[] args) throws NotEnoughArgumentsException, ChargeException, MaxMoneyException
+	{
+		switch (cmd)
+		{
+		case GIVE:
+			player.giveMoney(amount, sender);
+			break;
+
+		case TAKE:
+			take(amount, player, sender);
+			break;
+
+		case RESET:
+		case SET:
+			set(amount, player, sender);
+			break;
+		}
+	}
+
+	private void take(BigDecimal amount, final User player, final CommandSource sender) throws ChargeException
+	{
+		BigDecimal money = player.getMoney();
+		BigDecimal minBalance = ess.getSettings().getMinMoney();
+		if (money.subtract(amount).compareTo(minBalance) > 0)
+		{
+			player.takeMoney(amount, sender);
+		}
+		else if (sender == null)
+		{
+			try
+			{
+				player.setMoney(minBalance);
+			}
+			catch (MaxMoneyException ex)
+			{
+				// Take shouldn't be able to throw a max money exception
+			}
+			player.sendMessage(tl("takenFromAccount", NumberUtil.displayCurrency(player.getMoney(), ess)));
+		}
+		else
+		{
+			throw new ChargeException(tl("insufficientFunds"));
+		}
+	}
+
+	private void set(BigDecimal amount, final User player, final CommandSource sender) throws MaxMoneyException
+	{
+		BigDecimal minBalance = ess.getSettings().getMinMoney();
+		boolean underMinimum = (amount.compareTo(minBalance) < 0);
+		player.setMoney(underMinimum ? minBalance : amount);
+		player.sendMessage(tl("setBal", NumberUtil.displayCurrency(player.getMoney(), ess)));
+		if (sender != null)
+		{
+			sender.sendMessage(tl("setBalOthers", player.getDisplayName(), NumberUtil.displayCurrency(player.getMoney(), ess)));
+		}
+	}
+
+
+	private enum EcoCommands
+	{
+		GIVE, TAKE, SET, RESET
+	}
+}

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

@@ -0,0 +1,80 @@
+package com.earth2me.essentials.commands;
+
+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;
+import java.util.TreeSet;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.ItemStack;
+
+
+public class Commandenchant extends EssentialsCommand
+{
+	public Commandenchant()
+	{
+		super("enchant");
+	}
+
+	//TODO: Implement charge costs: final Trade charge = new Trade("enchant-" + enchantmentName, ess);
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		final ItemStack stack = user.getBase().getItemInHand();
+		if (stack == null || stack.getType() == Material.AIR)
+		{
+			throw new Exception(tl("nothingInHand"));
+		}
+		if (args.length == 0)
+		{
+			final Set<String> enchantmentslist = new TreeSet<String>();
+			for (Map.Entry<String, Enchantment> entry : Enchantments.entrySet())
+			{
+				final String enchantmentName = entry.getValue().getName().toLowerCase(Locale.ENGLISH);
+				if (enchantmentslist.contains(enchantmentName) || (user.isAuthorized("essentials.enchantments." + enchantmentName) && entry.getValue().canEnchantItem(stack)))
+				{
+					enchantmentslist.add(entry.getKey());
+					//enchantmentslist.add(enchantmentName);
+				}
+			}
+			throw new NotEnoughArgumentsException(tl("enchantments", StringUtil.joinList(enchantmentslist.toArray())));
+		}
+
+		int level = -1;
+		if (args.length > 1)
+		{
+			try
+			{
+				level = Integer.parseInt(args[1]);
+			}
+			catch (NumberFormatException ex)
+			{
+				level = -1;
+			}
+		}
+
+		final boolean allowUnsafe = ess.getSettings().allowUnsafeEnchantments() && user.isAuthorized("essentials.enchantments.allowunsafe");
+		
+		final MetaItemStack metaStack = new MetaItemStack(stack);
+		final Enchantment enchantment = metaStack.getEnchantment(user, args[0]);
+		metaStack.addEnchantment(user.getSource(), allowUnsafe, enchantment, level);
+		user.getBase().getInventory().setItemInHand(metaStack.getItemStack());
+		
+		user.getBase().updateInventory();
+		final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
+		if (level == 0)
+		{
+			user.sendMessage(tl("enchantmentRemoved", enchantmentName.replace('_', ' ')));
+		}
+		else
+		{
+			user.sendMessage(tl("enchantmentApplied", enchantmentName.replace('_', ' ')));
+		}
+	}
+}

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

@@ -0,0 +1,32 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+
+
+public class Commandenderchest extends EssentialsCommand
+{
+	public Commandenderchest()
+	{
+		super("enderchest");
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length > 0 && user.isAuthorized("essentials.enderchest.others"))
+		{
+			final User invUser = getPlayer(server, user, args, 0);
+			user.getBase().closeInventory();
+			user.getBase().openInventory(invUser.getBase().getEnderChest());
+			user.setEnderSee(true);
+		}
+		else
+		{
+			user.getBase().closeInventory();
+			user.getBase().openInventory(user.getBase().getEnderChest());
+			user.setEnderSee(false);
+		}
+
+	}
+}

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

@@ -0,0 +1,366 @@
+package com.earth2me.essentials.commands;
+
+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;
+import java.util.Map;
+import java.util.UUID;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+
+// This command has 4 undocumented behaviours #EasterEgg
+public class Commandessentials extends EssentialsCommand
+{
+	public Commandessentials()
+	{
+		super("essentials");
+	}
+	private transient int taskid;
+	private final transient Map<Player, Block> noteBlocks = new HashMap<Player, Block>();
+
+	@Override
+	public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length == 0)
+		{
+			run_disabled(server, sender, commandLabel, args);
+		}
+		else if (args[0].equalsIgnoreCase("debug"))
+		{
+			run_debug(server, sender, commandLabel, args);
+		}
+		else if (args[0].equalsIgnoreCase("nya"))
+		{
+			run_nya(server, sender, commandLabel, args);
+		}
+		else if (args[0].equalsIgnoreCase("moo"))
+		{
+			run_moo(server, sender, commandLabel, args);
+		}
+		else if (args[0].equalsIgnoreCase("reset"))
+		{
+			run_reset(server, sender, commandLabel, args);
+		}
+		else if (args[0].equalsIgnoreCase("opt-out"))
+		{
+			run_optout(server, sender, commandLabel, args);
+		}
+		else if (args[0].equalsIgnoreCase("cleanup"))
+		{
+			run_cleanup(server, sender, commandLabel, args);
+		}
+		else if (args[0].equalsIgnoreCase("uuidconvert"))
+		{
+			run_uuidconvert(server, sender, commandLabel, args);
+		}
+		else if (args[0].equalsIgnoreCase("uuidtest"))
+		{
+			run_uuidtest(server, sender, commandLabel, args);
+		}
+		else
+		{
+			run_reload(server, sender, commandLabel, args);
+		}
+	}
+
+	//If you do not supply an argument this command will list 'overridden' commands.
+	private void run_disabled(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		sender.sendMessage("/<command> <reload/debug>");
+
+		final StringBuilder disabledCommands = new StringBuilder();
+		for (Map.Entry<String, String> entry : ess.getAlternativeCommandsHandler().disabledCommands().entrySet())
+		{
+			if (disabledCommands.length() > 0)
+			{
+				disabledCommands.append(", ");
+			}
+			disabledCommands.append(entry.getKey()).append(" => ").append(entry.getValue());
+		}
+		if (disabledCommands.length() > 0)
+		{
+			sender.sendMessage(tl("blockList"));
+			sender.sendMessage(disabledCommands.toString());
+		}
+	}
+
+	private void run_reset(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 2)
+		{
+			throw new Exception("/<command> reset <player>");
+		}
+		final User user = getPlayer(server, args, 1, true, true);
+		user.reset();
+		sender.sendMessage("Reset Essentials userdata for player: " + user.getDisplayName());
+	}
+
+	private void run_debug(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		ess.getSettings().setDebug(!ess.getSettings().isDebug());
+		sender.sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
+	}
+
+	private void run_reload(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		ess.reload();
+		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
+	{
+		final Map<String, Float> noteMap = new HashMap<String, Float>();
+		noteMap.put("1F#", 0.5f);
+		noteMap.put("1G", 0.53f);
+		noteMap.put("1G#", 0.56f);
+		noteMap.put("1A", 0.6f);
+		noteMap.put("1A#", 0.63f);
+		noteMap.put("1B", 0.67f);
+		noteMap.put("1C", 0.7f);
+		noteMap.put("1C#", 0.76f);
+		noteMap.put("1D", 0.8f);
+		noteMap.put("1D#", 0.84f);
+		noteMap.put("1E", 0.9f);
+		noteMap.put("1F", 0.94f);
+		noteMap.put("2F#", 1.0f);
+		noteMap.put("2G", 1.06f);
+		noteMap.put("2G#", 1.12f);
+		noteMap.put("2A", 1.18f);
+		noteMap.put("2A#", 1.26f);
+		noteMap.put("2B", 1.34f);
+		noteMap.put("2C", 1.42f);
+		noteMap.put("2C#", 1.5f);
+		noteMap.put("2D", 1.6f);
+		noteMap.put("2D#", 1.68f);
+		noteMap.put("2E", 1.78f);
+		noteMap.put("2F", 1.88f);
+		final String tuneStr = "1D#,1E,2F#,,2A#,1E,1D#,1E,2F#,2B,2D#,2E,2D#,2A#,2B,,2F#,,1D#,1E,2F#,2B,2C#,2A#,2B,2C#,2E,2D#,2E,2C#,,2F#,,2G#,,1D,1D#,,1C#,1D,1C#,1B,,1B,,1C#,,1D,,1D,1C#,1B,1C#,1D#,2F#,2G#,1D#,2F#,1C#,1D#,1B,1C#,1B,1D#,,2F#,,2G#,1D#,2F#,1C#,1D#,1B,1D,1D#,1D,1C#,1B,1C#,1D,,1B,1C#,1D#,2F#,1C#,1D,1C#,1B,1C#,,1B,,1C#,,2F#,,2G#,,1D,1D#,,1C#,1D,1C#,1B,,1B,,1C#,,1D,,1D,1C#,1B,1C#,1D#,2F#,2G#,1D#,2F#,1C#,1D#,1B,1C#,1B,1D#,,2F#,,2G#,1D#,2F#,1C#,1D#,1B,1D,1D#,1D,1C#,1B,1C#,1D,,1B,1C#,1D#,2F#,1C#,1D,1C#,1B,1C#,,1B,,1B,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1B,,";
+		final String[] tune = tuneStr.split(",");
+		taskid = ess.scheduleSyncRepeatingTask(new Runnable()
+		{
+			int i = 0;
+
+			@Override
+			public void run()
+			{
+				final String note = tune[i];
+				i++;
+				if (i >= tune.length)
+				{
+					Commandessentials.this.stopTune();
+				}
+				if (note == null || note.isEmpty())
+				{
+					return;
+				}
+				for (Player onlinePlayer : server.getOnlinePlayers())
+				{
+					onlinePlayer.playSound(onlinePlayer.getLocation(), Sound.NOTE_PIANO, 1, noteMap.get(note));
+				}
+			}
+		}, 20, 2);
+	}
+
+	private void stopTune()
+	{
+		ess.getScheduler().cancelTask(taskid);
+		for (Block block : noteBlocks.values())
+		{
+			if (block.getType() == Material.NOTE_BLOCK)
+			{
+				block.setType(Material.AIR);
+			}
+		}
+		noteBlocks.clear();
+	}
+	private final String[] consoleMoo = new String[]
+	{
+		"         (__)",
+		"         (oo)",
+		"   /------\\/",
+		"  / |    ||",
+		" *  /\\---/\\",
+		"    ~~   ~~",
+		"....\"Have you mooed today?\"..."
+	};
+	private final String[] playerMoo = new String[]
+	{
+		"            (__)",
+		"            (oo)",
+		"   /------\\/",
+		"  /  |      | |",
+		" *  /\\---/\\",
+		"    ~~    ~~",
+		"....\"Have you mooed today?\"..."
+	};
+
+	private void run_moo(final Server server, final CommandSource sender, final String command, final String args[])
+	{
+		if (args.length == 2 && args[1].equals("moo"))
+		{
+			for (String s : consoleMoo)
+			{
+				logger.info(s);
+			}
+			for (Player player : ess.getServer().getOnlinePlayers())
+			{
+				player.sendMessage(playerMoo);
+				player.playSound(player.getLocation(), Sound.COW_IDLE, 1, 1.0f);
+			}
+		}
+		else
+		{
+			if (sender.isPlayer())
+			{
+				sender.getSender().sendMessage(playerMoo);
+				final Player player = sender.getPlayer();
+				player.playSound(player.getLocation(), Sound.COW_IDLE, 1, 1.0f);
+
+			}
+			else
+			{
+				sender.getSender().sendMessage(consoleMoo);
+			}
+		}
+	}
+
+	private void run_optout(final Server server, final CommandSource sender, final String command, final String args[])
+	{
+		final Metrics metrics = ess.getMetrics();
+		try
+		{
+			sender.sendMessage("Essentials collects simple metrics to highlight which features to concentrate work on in the future.");
+			if (metrics.isOptOut())
+			{
+				metrics.enable();
+			}
+			else
+			{
+				metrics.disable();
+			}
+			sender.sendMessage("Anonymous Metrics are now " + (metrics.isOptOut() ? "disabled" : "enabled") + " for all plugins.");
+		}
+		catch (IOException ex)
+		{
+			sender.sendMessage("Unable to modify 'plugins/PluginMetrics/config.yml': " + ex.getMessage());
+		}
+	}
+
+	private void run_cleanup(final Server server, final CommandSource sender, final String command, final String args[]) throws Exception
+	{
+		if (args.length < 2 || !NumberUtil.isInt(args[1]))
+		{
+			sender.sendMessage("This sub-command will delete users who havent logged in in the last <days> days.");
+			sender.sendMessage("Optional parameters define the minium amount required to prevent deletion.");
+			sender.sendMessage("Unless you define larger default values, this command wil ignore people who have more than 0 money/homes/bans.");
+			throw new Exception("/<command> cleanup <days> [money] [homes] [ban count]");
+		}
+		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;
+		final int homesArg = args.length >= 4 && NumberUtil.isInt(args[3]) ? Integer.parseInt(args[3]) : 0;
+		final int bansArg = args.length >= 5 && NumberUtil.isInt(args[4]) ? Integer.parseInt(args[4]) : 0;
+		final UserMap userMap = ess.getUserMap();
+
+		ess.runTaskAsynchronously(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				Long currTime = System.currentTimeMillis();
+				for (UUID u : userMap.getAllUniqueUsers())
+				{
+					final User user = ess.getUserMap().getUser(u);
+					if (user == null)
+					{
+						continue;
+					}
+
+					int ban = user.getBanReason().isEmpty() ? 0 : 1;
+
+					long lastLog = user.getLastLogout();
+					if (lastLog == 0)
+					{
+						lastLog = user.getLastLogin();
+					}
+					if (lastLog == 0)
+					{
+						user.setLastLogin(currTime);
+					}
+					
+					if (user.isNPC())
+					{
+						continue;
+					}
+
+					long timeDiff = currTime - lastLog;
+					long milliDays = daysArg * 24L * 60L * 60L * 1000L;
+					int homeCount = user.getHomes().size();
+					double moneyCount = user.getMoney().doubleValue();
+
+					if ((lastLog == 0) || (ban > bansArg) || (timeDiff < milliDays)
+						|| (homeCount > homesArg) || (moneyCount > moneyArg))
+					{
+						continue;
+					}
+
+					if (ess.getSettings().isDebug())
+					{
+						ess.getLogger().info("Deleting user: " + user.getName() + " Money: " + moneyCount + " Homes: " + homeCount + " Last seen: " + DateUtil.formatDateDiff(lastLog));
+					}
+
+					user.reset();
+				}
+				sender.sendMessage(tl("cleaned"));
+			}
+		});
+
+	}
+	
+	private void run_uuidconvert(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		sender.sendMessage("Starting Essentials UUID userdata conversion, this may lag the server.");
+		EssentialsUpgrade.uuidFileConvert(ess);
+		sender.sendMessage("UUID conversion complete, check your server log for more information.");
+	}
+	
+	private void run_uuidtest(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 2)
+		{
+			throw new Exception("/<command> uuidtest <name>");
+		}
+		String name = args[1];
+		sender.sendMessage("Looking up UUID for " + name);
+		
+		for (Player player : server.getOnlinePlayers())
+		{
+			if (player.getName().equalsIgnoreCase(name))
+			{
+				sender.sendMessage("Online player: " + player.getUniqueId().toString());
+			}
+		}
+		
+		org.bukkit.OfflinePlayer player = ess.getServer().getOfflinePlayer(name);
+		UUID bukkituuid = player.getUniqueId();
+		sender.sendMessage("Bukkit Lookup: " + bukkituuid.toString());
+		
+		UUID npcuuid = UUID.nameUUIDFromBytes(("NPC:" + name).getBytes(Charsets.UTF_8));		
+		sender.sendMessage("NPC UUID: " + npcuuid.toString());
+		
+		UUID offlineuuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(Charsets.UTF_8));
+		sender.sendMessage("Offline Mode UUID: " + offlineuuid.toString());		
+	}
+}

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

@@ -0,0 +1,205 @@
+package com.earth2me.essentials.commands;
+
+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;
+import org.bukkit.entity.Player;
+
+
+public class Commandexp extends EssentialsCommand
+{
+	public Commandexp()
+	{
+		super("exp");
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length == 0)
+		{
+			showExp(user.getSource(), user);
+		}
+		else if (args.length > 1 && args[0].equalsIgnoreCase("set") && user.isAuthorized("essentials.exp.set"))
+		{
+			if (args.length == 3 && user.isAuthorized("essentials.exp.set.others"))
+			{
+				expMatch(server, user.getSource(), args[1], args[2], false);
+			}
+			else
+			{
+				setExp(user.getSource(), user, args[1], false);
+			}
+		}
+		else if (args.length > 1 && args[0].equalsIgnoreCase("give") && user.isAuthorized("essentials.exp.give"))
+		{
+			if (args.length == 3 && user.isAuthorized("essentials.exp.give.others"))
+			{
+				expMatch(server, user.getSource(), args[1], args[2], true);
+			}
+			else
+			{
+				setExp(user.getSource(), user, args[1], true);
+			}
+		}
+		else if (args[0].equalsIgnoreCase("show"))
+		{
+			if (args.length >= 2 && user.isAuthorized("essentials.exp.others"))
+			{
+				String match = args[1].trim();
+				showMatch(server, user.getSource(), match);
+			}
+			else
+			{
+				showExp(user.getSource(), user);
+			}
+		}
+		else
+		{
+			if (args.length >= 1 && NumberUtil.isInt(args[0].toLowerCase(Locale.ENGLISH).replace("l", "")) && user.isAuthorized("essentials.exp.give"))
+			{
+				if (args.length >= 2 && user.isAuthorized("essentials.exp.give.others"))
+				{
+					expMatch(server, user.getSource(), args[1], args[0], true);
+				}
+				else
+				{
+					setExp(user.getSource(), user, args[0], true);
+				}
+			}
+			else if (args.length >= 1 && user.isAuthorized("essentials.exp.others"))
+			{
+				String match = args[0].trim();
+				showMatch(server, user.getSource(), match);
+			}
+			else
+			{
+				showExp(user.getSource(), user);
+			}
+		}
+	}
+
+	@Override
+	public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		else if (args.length > 2 && args[0].equalsIgnoreCase("set"))
+		{
+			expMatch(server, sender, args[1], args[2], false);
+		}
+		else if (args.length > 2 && args[0].equalsIgnoreCase("give"))
+		{
+			expMatch(server, sender, args[1], args[2], true);
+		}
+		else
+		{
+			String match = args[0].trim();
+			if (args.length >= 2 && NumberUtil.isInt(args[0].toLowerCase(Locale.ENGLISH).replace("l", "")))
+			{
+				match = args[1].trim();
+				expMatch(server, sender, match, args[0], true);
+			}
+			else if (args.length == 1)
+			{
+				match = args[0].trim();
+			}
+			showMatch(server, sender, match);
+		}
+	}
+
+	private void showMatch(final Server server, final CommandSource sender, final String match) throws PlayerNotFoundException
+	{
+		boolean skipHidden = sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.vanish.interact");
+		boolean foundUser = false;
+		final List<Player> matchedPlayers = server.matchPlayer(match);
+		for (Player matchPlayer : matchedPlayers)
+		{
+			final User player = ess.getUser(matchPlayer);
+			if (skipHidden && player.isHidden())
+			{
+				continue;
+			}
+			foundUser = true;
+			showExp(sender, player);
+		}
+		if (!foundUser)
+		{
+			throw new PlayerNotFoundException();
+		}
+	}
+
+	private void expMatch(final Server server, final CommandSource sender, final String match, String amount, final boolean give) throws NotEnoughArgumentsException, PlayerNotFoundException
+	{
+		boolean skipHidden = sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.vanish.interact");
+		boolean foundUser = false;
+		final List<Player> matchedPlayers = server.matchPlayer(match);
+		for (Player matchPlayer : matchedPlayers)
+		{
+			final User player = ess.getUser(matchPlayer);
+			if (skipHidden && player.isHidden())
+			{
+				continue;
+			}
+			foundUser = true;
+			setExp(sender, player, amount, give);
+		}
+		if (!foundUser)
+		{
+			throw new PlayerNotFoundException();
+		}
+	}
+
+	private void showExp(final CommandSource sender, final User target)
+	{
+		sender.sendMessage(tl("exp", target.getDisplayName(), SetExpFix.getTotalExperience(target.getBase()), target.getBase().getLevel(), SetExpFix.getExpUntilNextLevel(target.getBase())));
+	}
+
+	//TODO: Limit who can give negative exp?
+	private void setExp(final CommandSource sender, final User target, String strAmount, final boolean give) throws NotEnoughArgumentsException
+	{
+		long amount;
+		strAmount = strAmount.toLowerCase(Locale.ENGLISH);
+		if (strAmount.contains("l"))
+		{
+			strAmount = strAmount.replaceAll("l", "");
+			int neededLevel = Integer.parseInt(strAmount);
+			if (give)
+			{
+				neededLevel += target.getBase().getLevel();
+			}
+			amount = (long)SetExpFix.getExpToLevel(neededLevel);
+			SetExpFix.setTotalExperience(target.getBase(), 0);
+		}
+		else
+		{
+			amount = Long.parseLong(strAmount);
+			if (amount > Integer.MAX_VALUE || amount < Integer.MIN_VALUE)
+			{
+				throw new NotEnoughArgumentsException();
+			}
+		}
+
+		if (give)
+		{
+			amount += SetExpFix.getTotalExperience(target.getBase());
+		}
+		if (amount > Integer.MAX_VALUE)
+		{
+			amount = (long)Integer.MAX_VALUE;
+		}
+		if (amount < 0l)
+		{
+			amount = 0l;
+		}
+		SetExpFix.setTotalExperience(target.getBase(), (int)amount);
+		sender.sendMessage(tl("expSet", target.getDisplayName(), amount));
+	}
+}

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

@@ -0,0 +1,52 @@
+package com.earth2me.essentials.commands;
+
+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;
+
+
+public class Commandext extends EssentialsLoopCommand
+{
+	public Commandext()
+	{
+		super("ext");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		loopOnlinePlayers(server, sender, true, true, args[0], null);
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			extPlayer(user.getBase());
+			user.sendMessage(tl("extinguish"));
+			return;
+		}
+
+		loopOnlinePlayers(server, user.getSource(), true, true, args[0], null);
+	}
+
+	@Override
+	protected void updatePlayer(final Server server, final CommandSource sender, final User player, final String[] args)
+	{
+		extPlayer(player.getBase());
+		sender.sendMessage(tl("extinguishOthers", player.getDisplayName()));
+	}
+
+	private void extPlayer(final Player player)
+	{
+		player.setFireTicks(0);
+	}
+}

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

@@ -0,0 +1,76 @@
+package com.earth2me.essentials.commands;
+
+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;
+
+
+public class Commandfeed extends EssentialsLoopCommand
+{
+	public Commandfeed()
+	{
+		super("feed");
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (!user.isAuthorized("essentials.feed.cooldown.bypass"))
+		{
+			user.healCooldown();
+		}
+
+		if (args.length > 0 && user.isAuthorized("essentials.feed.others"))
+		{
+			loopOnlinePlayers(server, user.getSource(), true, true, args[0], null);
+			return;
+		}
+
+		feedPlayer(user.getBase());
+		user.sendMessage(tl("feed"));
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		loopOnlinePlayers(server, sender, true, true, args[0], null);
+	}
+
+	@Override
+	protected void updatePlayer(final Server server, final CommandSource sender, final User player, final String[] args) throws PlayerExemptException
+	{
+		try
+		{
+			feedPlayer(player.getBase());
+			sender.sendMessage(tl("feedOther", player.getDisplayName()));
+		}
+		catch (QuietAbortException e)
+		{
+			//Handle Quietly
+		}
+	}
+
+	private void feedPlayer(final Player player) throws QuietAbortException
+	{
+		final int amount = 30;
+
+		final FoodLevelChangeEvent flce = new FoodLevelChangeEvent(player, amount);
+		ess.getServer().getPluginManager().callEvent(flce);
+		if (flce.isCancelled())
+		{
+			throw new QuietAbortException();
+		}
+
+		player.setFoodLevel(flce.getFoodLevel() > 20 ? 20 : flce.getFoodLevel());
+		player.setSaturation(10);
+		player.setExhaustion(0F);
+	}
+}

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

@@ -0,0 +1,58 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+import org.bukkit.entity.*;
+import org.bukkit.util.Vector;
+
+
+public class Commandfireball extends EssentialsCommand
+{
+	public Commandfireball()
+	{
+		super("fireball");
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		Class<? extends Entity> type = Fireball.class;
+		Projectile projectile;
+		int speed = 2;
+		if (args.length > 0)
+		{
+			if (args[0].equalsIgnoreCase("small"))
+			{
+				type = SmallFireball.class;
+			}
+			else if (args[0].equalsIgnoreCase("arrow"))
+			{
+				type = Arrow.class;
+			}
+			else if (args[0].equalsIgnoreCase("skull"))
+			{
+				type = WitherSkull.class;
+			}
+			else if (args[0].equalsIgnoreCase("egg"))
+			{
+				type = Egg.class;
+			}
+			else if(args[0].equalsIgnoreCase("snowball"))
+			{
+				type = Snowball.class;
+			}
+			else if(args[0].equalsIgnoreCase("expbottle"))
+			{
+				type = ThrownExpBottle.class;
+			}
+			else if(args[0].equalsIgnoreCase("large"))
+			{
+				type = LargeFireball.class;
+			}
+		}
+		final Vector direction = user.getBase().getEyeLocation().getDirection().multiply(speed);
+		projectile = (Projectile)user.getWorld().spawn(user.getBase().getEyeLocation().add(direction.getX(), direction.getY(), direction.getZ()), type);
+		projectile.setShooter(user.getBase());
+		projectile.setVelocity(direction);
+	}
+}

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

@@ -1,23 +1,20 @@
-package net.ess3.commands;
+package com.earth2me.essentials.commands;
 
+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 static net.ess3.I18n._;
-import net.ess3.MetaItemStack;
-import net.ess3.api.ISettings;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
-import net.ess3.utils.Util;
 import org.bukkit.FireworkEffect;
 import org.bukkit.Material;
+import org.bukkit.Server;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Firework;
-import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.FireworkMeta;
 import org.bukkit.util.Vector;
 
-
-//This command has quite a complicated syntax, in theory it has 4 separate syntaxes which are all variable:
+//This command has quite a complicated syntax, in theory it has 4 seperate syntaxes which are all variable:
 //
 //1: /firework clear             - This clears all of the effects on a firework stack
 //
@@ -32,15 +29,19 @@ import org.bukkit.util.Vector;
 //4: Full Syntax:                  color:<color[,color,..]> [fade:<color[,color,..]>] [shape:<shape>] [effect:<effect[,effect]>]
 //4: Possible Shapes:              star, ball, large, creeper, burst
 //4: Possible Effects              trail, twinkle
+
 public class Commandfirework extends EssentialsCommand
 {
-	private final transient Pattern splitPattern = Pattern.compile("[:+',;.]");
+
+	public Commandfirework()
+	{
+		super("firework");
+	}
 
 	@Override
-	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		final Player player = user.getPlayer();
-		final ItemStack stack = user.getPlayer().getItemInHand();
+		final ItemStack stack = user.getBase().getItemInHand();
 		if (stack.getType() == Material.FIREWORK)
 		{
 			if (args.length > 0)
@@ -50,7 +51,7 @@ public class Commandfirework extends EssentialsCommand
 					FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta();
 					fmeta.clearEffects();
 					stack.setItemMeta(fmeta);
-					user.sendMessage(_("§6Removed all effects from held stack."));
+					user.sendMessage(tl("fireworkEffectsCleared"));
 				}
 				else if (args.length > 1 && (args[0].equalsIgnoreCase("power") || (args[0].equalsIgnoreCase("p"))))
 				{
@@ -62,26 +63,25 @@ public class Commandfirework extends EssentialsCommand
 					}
 					catch (NumberFormatException e)
 					{
-						throw new Exception(_("§6The option §4{0} §6is not a valid value for §4{1}§6.", args[1], args[0]));
+						throw new Exception(tl("invalidFireworkFormat", args[1], args[0]));
 					}
 					stack.setItemMeta(fmeta);
 				}
 				else if ((args[0].equalsIgnoreCase("fire") || (args[0].equalsIgnoreCase("f")))
-						 && Permissions.FIREWORK_FIRE.isAuthorized(user))
+						 && user.isAuthorized("essentials.firework.fire"))
 				{
 					int amount = 1;
 					boolean direction = false;
 					if (args.length > 1)
 					{
-						if (Util.isInt(args[1]))
+						if (NumberUtil.isInt(args[1]))
 						{
-							ISettings settings = ess.getSettings();
-							int serverLimit = settings.getData().getCommands().getSpawnmob().getLimit();
+							final int serverLimit = ess.getSettings().getSpawnMobLimit();
 							amount = Integer.parseInt(args[1]);
 							if (amount > serverLimit)
 							{
 								amount = serverLimit;
-								user.sendMessage(_("Mob quantity limited to server limit."));
+								user.sendMessage(tl("mobSpawnLimit"));
 							}
 						}
 						else
@@ -91,11 +91,11 @@ public class Commandfirework extends EssentialsCommand
 					}
 					for (int i = 0; i < amount; i++)
 					{
-						Firework firework = (Firework)player.getWorld().spawnEntity(player.getLocation(), EntityType.FIREWORK);
+						Firework firework = (Firework)user.getWorld().spawnEntity(user.getLocation(), EntityType.FIREWORK);
 						FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta();
 						if (direction)
 						{
-							final Vector vector = player.getEyeLocation().getDirection().multiply(0.070);
+							final Vector vector = user.getBase().getEyeLocation().getDirection().multiply(0.070);
 							if (fmeta.getPower() > 1)
 							{
 								fmeta.setPower(1);
@@ -112,11 +112,11 @@ public class Commandfirework extends EssentialsCommand
 					{
 						try
 						{
-							mStack.addFireworkMeta(user, true, arg, ess);
+							mStack.addFireworkMeta(user.getSource(), true, arg, ess);
 						}
 						catch (Exception e)
 						{
-							user.sendMessage(_("§6Firework parameters:§c color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]n§6To use multiple colors/effects, separate values with commas: §cred,blue,pinkn§6Shapes:§c star, ball, large, creeper, burst §6Effects:§c trail, twinkle."));
+							user.sendMessage(tl("fireworkSyntax"));
 							throw e;
 						}
 					}
@@ -125,17 +125,17 @@ public class Commandfirework extends EssentialsCommand
 					{
 						FireworkMeta fmeta = (FireworkMeta)mStack.getItemStack().getItemMeta();
 						FireworkEffect effect = mStack.getFireworkBuilder().build();
-						if (fmeta.getEffects().size() > 0 && !Permissions.FIREWORK_MULTIPLE.isAuthorized(user))
+						if (fmeta.getEffects().size() > 0 && !user.isAuthorized("essentials.firework.multiple"))
 						{
-							throw new Exception(_("§4You cannot apply more than one charge to this firework."));
+							throw new Exception(tl("multipleCharges"));
 						}
 						fmeta.addEffect(effect);
 						stack.setItemMeta(fmeta);
 					}
 					else
 					{
-						user.sendMessage(_("§6Firework parameters:§c color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]n§6To use multiple colors/effects, separate values with commas: §cred,blue,pinkn§6Shapes:§c star, ball, large, creeper, burst §6Effects:§c trail, twinkle."));
-						throw new Exception(_("§4Invalid firework charge parameters inserted, must set a color first."));
+						user.sendMessage(tl("fireworkSyntax"));
+						throw new Exception(tl("fireworkColor"));
 					}
 				}
 			}
@@ -146,7 +146,7 @@ public class Commandfirework extends EssentialsCommand
 		}
 		else
 		{
-			throw new Exception(_("§4You must be holding a firework to add effects."));
+			throw new Exception(tl("holdFirework"));
 		}
 	}
 }

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

@@ -0,0 +1,69 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+
+
+public class Commandfly extends EssentialsToggleCommand
+{
+	public Commandfly()
+	{
+		super("fly", "essentials.fly.others");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		toggleOtherPlayers(server, sender, args);
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length == 1)
+		{
+			Boolean toggle = matchToggleArgument(args[0]);
+			if (toggle == null && user.isAuthorized(othersPermission))
+			{
+				toggleOtherPlayers(server, user.getSource(), args);
+			}
+			else
+			{
+				togglePlayer(user.getSource(), user, toggle);
+			}
+		}
+		else if (args.length == 2 && user.isAuthorized(othersPermission))
+		{
+			toggleOtherPlayers(server, user.getSource(), args);
+		}
+		else
+		{
+			togglePlayer(user.getSource(), user, null);
+		}
+	}
+
+	@Override
+	void togglePlayer(CommandSource sender, User user, Boolean enabled)
+	{
+		if (enabled == null)
+		{
+			enabled = !user.getBase().getAllowFlight();
+		}
+
+		user.getBase().setFallDistance(0f);
+		user.getBase().setAllowFlight(enabled);
+		
+		if (!user.getBase().getAllowFlight())
+		{
+			user.getBase().setFlying(false);
+		}
+
+		user.sendMessage(tl("flyMode", tl(enabled ? "enabled" : "disabled"), user.getDisplayName()));
+		if (!sender.isPlayer() || !sender.getPlayer().equals(user.getBase()))
+		{
+			sender.sendMessage(tl("flyMode", tl(enabled ? "enabled" : "disabled"), user.getDisplayName()));
+		}
+	}
+}

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

@@ -0,0 +1,136 @@
+package com.earth2me.essentials.commands;
+
+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;
+
+
+public class Commandgamemode extends EssentialsCommand
+{
+	public Commandgamemode()
+	{
+		super("gamemode");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		GameMode gameMode;
+		if (args.length == 0)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		else if (args.length == 1)
+		{
+			gameMode = matchGameMode(commandLabel);
+			gamemodeOtherPlayers(server, sender, gameMode, args[0]);
+		}
+		else if (args.length == 2)
+		{
+			gameMode = matchGameMode(args[0].toLowerCase(Locale.ENGLISH));
+			gamemodeOtherPlayers(server, sender, gameMode, args[1]);
+		}
+
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		GameMode gameMode;
+		if (args.length == 0)
+		{
+			gameMode = matchGameMode(commandLabel);
+		}
+		else if (args.length > 1 && args[1].trim().length() > 2 && user.isAuthorized("essentials.gamemode.others"))
+		{
+			gameMode = matchGameMode(args[0].toLowerCase(Locale.ENGLISH));
+			gamemodeOtherPlayers(server, user.getSource(), gameMode, args[1]);
+			return;
+		}
+		else
+		{
+			try
+			{
+				gameMode = matchGameMode(args[0].toLowerCase(Locale.ENGLISH));
+			}
+			catch (NotEnoughArgumentsException e)
+			{
+				if (user.isAuthorized("essentials.gamemode.others"))
+				{
+					gameMode = matchGameMode(commandLabel);
+					gamemodeOtherPlayers(server, user.getSource(), gameMode, args[0]);
+					return;
+				}
+				throw new NotEnoughArgumentsException();
+			}
+		}
+		if (gameMode == null)
+		{
+			gameMode = user.getBase().getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : user.getBase().getGameMode() == GameMode.CREATIVE ? GameMode.ADVENTURE : GameMode.SURVIVAL;
+		}
+		user.getBase().setGameMode(gameMode);
+		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(tl("gameModeInvalid"));
+		}
+
+		boolean skipHidden = sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.vanish.interact");
+		boolean foundUser = false;
+		final List<Player> matchedPlayers = server.matchPlayer(name);
+		for (Player matchPlayer : matchedPlayers)
+		{
+			final User player = ess.getUser(matchPlayer);
+			if (skipHidden && player.isHidden())
+			{
+				continue;
+			}
+			foundUser = true;
+			player.getBase().setGameMode(gameMode);
+			sender.sendMessage(tl("gameMode", tl(player.getBase().getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getDisplayName()));
+		}
+		if (!foundUser)
+		{
+			throw new PlayerNotFoundException();
+		}
+	}
+
+	private GameMode matchGameMode(String modeString) throws NotEnoughArgumentsException
+	{
+		GameMode mode = null;
+		if (modeString.equalsIgnoreCase("gmc") || modeString.equalsIgnoreCase("egmc")
+			|| modeString.contains("creat") || modeString.equalsIgnoreCase("1") || modeString.equalsIgnoreCase("c"))
+		{
+			mode = GameMode.CREATIVE;
+		}
+		else if (modeString.equalsIgnoreCase("gms") || modeString.equalsIgnoreCase("egms")
+				 || modeString.contains("survi") || modeString.equalsIgnoreCase("0") || modeString.equalsIgnoreCase("s"))
+		{
+			mode = GameMode.SURVIVAL;
+		}
+		else if (modeString.equalsIgnoreCase("gma") || modeString.equalsIgnoreCase("egma")
+				 || modeString.contains("advent") || modeString.equalsIgnoreCase("2") || modeString.equalsIgnoreCase("a"))
+		{
+			mode = GameMode.ADVENTURE;
+		}
+		else if (modeString.equalsIgnoreCase("gmt") || modeString.equalsIgnoreCase("egmt")
+				 || modeString.contains("toggle") || modeString.contains("cycle") || modeString.equalsIgnoreCase("t"))
+		{
+			mode = null;
+		}
+		else
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		return mode;
+	}
+}

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

@@ -0,0 +1,69 @@
+package com.earth2me.essentials.commands;
+
+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 org.bukkit.ChatColor;
+import org.bukkit.Chunk;
+import org.bukkit.Server;
+import org.bukkit.World;
+
+
+public class Commandgc extends EssentialsCommand
+{
+	public Commandgc()
+	{
+		super("gc");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		double tps = ess.getTimer().getAverageTPS();
+		ChatColor color;
+		if (tps >= 18.0)
+		{
+			color = ChatColor.GREEN;
+		}
+		else if (tps >= 15.0)
+		{
+			color = ChatColor.YELLOW;
+		}
+		else
+		{
+			color = ChatColor.RED;
+		}
+
+		sender.sendMessage(tl("uptime", DateUtil.formatDateDiff(ManagementFactory.getRuntimeMXBean().getStartTime())));
+		sender.sendMessage(tl("tps", "" + color + NumberUtil.formatDouble(tps)));
+		sender.sendMessage(tl("gcmax", (Runtime.getRuntime().maxMemory() / 1024 / 1024)));
+		sender.sendMessage(tl("gctotal", (Runtime.getRuntime().totalMemory() / 1024 / 1024)));
+		sender.sendMessage(tl("gcfree", (Runtime.getRuntime().freeMemory() / 1024 / 1024)));
+
+		List<World> worlds = server.getWorlds();
+		for (World w : worlds)
+		{
+			String worldType = "World";
+			switch (w.getEnvironment())
+			{
+			case NETHER:
+				worldType = "Nether";
+				break;
+			case THE_END:
+				worldType = "The End";
+				break;
+			}
+			
+			int tileEntities = 0;
+			
+			for (Chunk chunk : w.getLoadedChunks()) {
+				tileEntities += chunk.getTileEntities().length;
+			}
+
+			sender.sendMessage(tl("gcWorld", worldType, w.getName(), w.getLoadedChunks().length, w.getEntities().size(), tileEntities));
+		}
+	}
+}

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

@@ -0,0 +1,53 @@
+package com.earth2me.essentials.commands;
+
+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;
+
+
+public class Commandgetpos extends EssentialsCommand
+{
+	public Commandgetpos()
+	{
+		super("getpos");
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length > 0 && user.isAuthorized("essentials.getpos.others"))
+		{
+			final User otherUser = getPlayer(server, user, args, 0);
+			outputPosition(user.getSource(), otherUser.getLocation(), user.getLocation());
+			return;
+		}
+		outputPosition(user.getSource(), user.getLocation(), null);
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		final User user = getPlayer(server, args, 0, true, false);
+		outputPosition(sender, user.getLocation(), null);
+	}
+
+	private void outputPosition(final CommandSource sender, final Location coords, final Location distance)
+	{
+		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(tl("distance", coords.distance(distance)));
+		}
+	}
+}

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

@@ -0,0 +1,122 @@
+package com.earth2me.essentials.commands;
+
+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;
+
+
+public class Commandgive extends EssentialsCommand
+{
+	public Commandgive()
+	{
+		super("give");
+	}
+
+	@Override
+	public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 2)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		ItemStack stack = ess.getItemDb().get(args[1]);
+
+		final String itemname = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
+		if (sender.isPlayer()
+			&& (ess.getSettings().permissionBasedItemSpawn()
+				? (!ess.getUser(sender.getPlayer()).isAuthorized("essentials.itemspawn.item-all")
+				   && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.itemspawn.item-" + itemname)
+				   && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.itemspawn.item-" + stack.getTypeId()))
+				: (!ess.getUser(sender.getPlayer()).isAuthorized("essentials.itemspawn.exempt")
+				   && !ess.getUser(sender.getPlayer()).canSpawnItem(stack.getTypeId()))))
+		{
+			throw new Exception(tl("cantSpawnItem", itemname));
+		}
+
+		final User giveTo = getPlayer(server, sender, args, 0);
+
+		try
+		{
+			if (args.length > 3 && NumberUtil.isInt(args[2]) && NumberUtil.isInt(args[3]))
+			{
+				stack.setAmount(Integer.parseInt(args[2]));
+				stack.setDurability(Short.parseShort(args[3]));
+			}
+			else if (args.length > 2 && Integer.parseInt(args[2]) > 0)
+			{
+				stack.setAmount(Integer.parseInt(args[2]));
+			}
+			else if (ess.getSettings().getDefaultStackSize() > 0)
+			{
+				stack.setAmount(ess.getSettings().getDefaultStackSize());
+			}
+			else if (ess.getSettings().getOversizedStackSize() > 0 && giveTo.isAuthorized("essentials.oversizedstacks"))
+			{
+				stack.setAmount(ess.getSettings().getOversizedStackSize());
+			}
+		}
+		catch (NumberFormatException e)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		MetaItemStack metaStack = new MetaItemStack(stack);
+		if (!metaStack.canSpawn(ess))
+		{
+			throw new Exception(tl("unableToSpawnItem", itemname));
+		}
+
+		if (args.length > 3)
+		{
+			boolean allowUnsafe = ess.getSettings().allowUnsafeEnchantments();
+			if (allowUnsafe && sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.enchantments.allowunsafe"))
+			{
+				allowUnsafe = false;
+			}
+
+			int metaStart = NumberUtil.isInt(args[3]) ? 4 : 3;
+
+			if (args.length > metaStart)
+			{
+				metaStack.parseStringMeta(sender, allowUnsafe, args, metaStart, ess);
+			}
+
+			stack = metaStack.getItemStack();
+		}
+
+		if (stack.getType() == Material.AIR)
+		{
+			throw new Exception(tl("cantSpawnItem", "Air"));
+		}
+
+		final String itemName = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' ');
+		sender.sendMessage(tl("giveSpawn", stack.getAmount(), itemName, giveTo.getDisplayName()));
+
+		Map<Integer, ItemStack> leftovers;
+
+		if (giveTo.isAuthorized("essentials.oversizedstacks"))
+		{
+			leftovers = InventoryWorkaround.addOversizedItems(giveTo.getBase().getInventory(), ess.getSettings().getOversizedStackSize(), stack);
+		}
+		else
+		{
+			leftovers = InventoryWorkaround.addItems(giveTo.getBase().getInventory(), stack);
+		}
+
+		for (ItemStack item : leftovers.values())
+		{
+			sender.sendMessage(tl("giveSpawnFailure", item.getAmount(), itemName, giveTo.getDisplayName()));
+		}
+
+		giveTo.getBase().updateInventory();
+	}
+}