Only info not a warning if a file is missing

Conflicts:
	EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java

.gitignore

@@ -37,11 +37,4 @@
 /WebPush/apikey.php
 /WebPush/nbproject/private
 /.idea
-*.iml
-/EssentialsSigns/nbproject/private/
-/Essentials2Compat/nbproject/private/
-/Essentials2Compat/dist/
-/Essentials2Compat/build/
-/EssentialsGroupManager/bin
-/EssentialsGroupManager/.externalToolBuilders
-/EssentialsGeoIP/build
+*.iml

BuildAll/nbproject/build-impl.xml

@@ -922,14 +922,6 @@ is divided into following sections:
             -->
     <target depends="init" if="have.sources" name="-javadoc-build">
         <mkdir dir="${dist.javadoc.dir}"/>
-        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
-            <and>
-                <isset property="endorsed.classpath.cmd.line.arg"/>
-                <not>
-                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
-                </not>
-            </and>
-        </condition>
         <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
                 <path path="${javac.classpath}"/>
@@ -941,7 +933,6 @@ is divided into following sections:
                 <include name="**/*.java"/>
                 <exclude name="*.java"/>
             </fileset>
-            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
         </javadoc>
         <copy todir="${dist.javadoc.dir}">
             <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">

BuildAll/nbproject/genfiles.properties

@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=28e38971@1.44.1.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=51b33957
-nbproject/build-impl.xml.script.CRC32=c5170bed
-nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.1.46
+nbproject/build-impl.xml.script.CRC32=c8376938
+nbproject/build-impl.xml.stylesheet.CRC32=c12040a1@1.47.1.46

Essentials/nbproject/build-impl.xml

@@ -873,14 +873,6 @@ is divided into following sections:
             -->
     <target depends="init" if="have.sources" name="-javadoc-build">
         <mkdir dir="${dist.javadoc.dir}"/>
-        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
-            <and>
-                <isset property="endorsed.classpath.cmd.line.arg"/>
-                <not>
-                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
-                </not>
-            </and>
-        </condition>
         <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
                 <path path="${javac.classpath}"/>
@@ -892,7 +884,6 @@ is divided into following sections:
                 <include name="**/*.java"/>
                 <exclude name="*.java"/>
             </fileset>
-            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
         </javadoc>
         <copy todir="${dist.javadoc.dir}">
             <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">

Essentials/nbproject/genfiles.properties

@@ -4,8 +4,8 @@ build.xml.stylesheet.CRC32=28e38971@1.38.2.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=a830bc14
-nbproject/build-impl.xml.script.CRC32=a9f8842a
-nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.1.46
+nbproject/build-impl.xml.script.CRC32=40df7eaf
+nbproject/build-impl.xml.stylesheet.CRC32=c12040a1@1.47.1.46
 nbproject/profiler-build-impl.xml.data.CRC32=ab78ce15
 nbproject/profiler-build-impl.xml.script.CRC32=abda56ed
 nbproject/profiler-build-impl.xml.stylesheet.CRC32=f10cf54c@1.11.1

Essentials/nbproject/project.properties

@@ -66,19 +66,16 @@ endorsed.classpath=
 excludes=
 file.reference.BOSEconomy7.jar=../lib/BOSEconomy7.jar
 file.reference.bPermissions.jar=../lib/bPermissions.jar
-file.reference.bpermissions2.jar=../lib/bpermissions2.jar
 file.reference.bukkit.jar=../lib/bukkit.jar
 file.reference.craftbukkit.jar=../lib/craftbukkit.jar
 file.reference.iCo4.jar=../lib/iCo4.jar
 file.reference.iCo5.jar=../lib/iCo5.jar
 file.reference.iCo6.jar=../lib/iCo6.jar
-file.reference.lombok.jar=../lib/lombok-0.10.8.jar
+file.reference.lombok-0.10.1.jar=../lib/lombok-0.10.1.jar
 file.reference.MultiCurrency.jar=../lib/MultiCurrency.jar
 file.reference.Permissions3.jar=../lib/Permissions3.jar
 file.reference.PermissionsBukkit-1.2.jar=../lib/PermissionsBukkit-1.2.jar
 file.reference.PermissionsEx.jar=../lib/PermissionsEx.jar
-file.reference.Privileges.jar=..\\lib\\Privileges.jar
-file.reference.Vault.jar=../lib/Vault.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=true
@@ -93,13 +90,10 @@ javac.classpath=\
     ${file.reference.PermissionsEx.jar}:\
     ${file.reference.bPermissions.jar}:\
     ${file.reference.PermissionsBukkit-1.2.jar}:\
-    ${file.reference.lombok.jar}:\
+    ${file.reference.lombok-0.10.1.jar}:\
     ${reference.EssentialsGroupManager.jar}:\
     ${file.reference.bukkit.jar}:\
-    ${file.reference.craftbukkit.jar}:\
-    ${file.reference.Vault.jar}:\
-    ${file.reference.Privileges.jar}:\
-    ${file.reference.bpermissions2.jar}
+    ${file.reference.craftbukkit.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -124,7 +118,7 @@ javadoc.reference.PermissionsEx.jar=../lib/PermissionsEx-javadoc.jar
 javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=false
-javadoc.windowtitle=Essentials Docs.
+javadoc.windowtitle=
 jnlp.codebase.type=no.codebase
 jnlp.descriptor=application
 jnlp.enabled=false

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

@@ -0,0 +1,137 @@
+package com.earth2me.essentials;
+
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+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("Minecraft");
+	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 String otherLabel)
+	{
+		if (ess.getSettings().isDebug())
+		{
+			LOGGER.log(Level.INFO, "Essentials: Alternative command " + label + " found, using " + otherLabel);
+		}
+		disabledList.put(label, otherLabel);
+	}
+
+	public Map<String, String> disabledCommands()
+	{
+		return disabledList;
+	}
+}

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

@@ -1,29 +1,23 @@
 package com.earth2me.essentials;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IBackup;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.ISettings;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import lombok.Cleanup;
-import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
 
-public class Backup implements Runnable, IBackup
+public class Backup implements Runnable
 {
-	private static final Logger LOGGER = Bukkit.getLogger();
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private transient final Server server;
 	private transient final IEssentials ess;
-	private transient final AtomicBoolean running = new AtomicBoolean(false);
+	private transient boolean running = false;
 	private transient int taskId = -1;
-	private transient final AtomicBoolean active = new AtomicBoolean(false);
+	private transient boolean active = false;
 
 	public Backup(final IEssentials ess)
 	{
@@ -35,119 +29,106 @@ public class Backup implements Runnable, IBackup
 		}
 	}
 
-	@Override
-	public final void startTask()
+	void onPlayerJoin()
 	{
-		if (running.compareAndSet(false, true))
+		startTask();
+	}
+
+	private void startTask()
+	{
+		if (!running)
 		{
-			@Cleanup
-			final ISettings settings = ess.getSettings();
-			settings.acquireReadLock();
-			final long interval = settings.getData().getGeneral().getBackup().getInterval() * 1200; // minutes -> ticks
+			final long interval = ess.getSettings().getBackupInterval() * 1200; // minutes -> ticks
 			if (interval < 1200)
 			{
-				running.set(false);
 				return;
 			}
 			taskId = ess.scheduleSyncRepeatingTask(this, interval, interval);
+			running = true;
 		}
 	}
 
 	@Override
 	public void run()
 	{
-		if (!active.compareAndSet(false, true))
+		if (active)
 		{
 			return;
 		}
-		@Cleanup
-		final ISettings settings = ess.getSettings();
-		settings.acquireReadLock();
-		final String command = settings.getData().getGeneral().getBackup().getCommand();
-		if (command == null || command.isEmpty())
+		active = true;
+		final String command = ess.getSettings().getBackupCommand();
+		if (command == null || "".equals(command))
 		{
 			return;
 		}
 		LOGGER.log(Level.INFO, _("backupStarted"));
-		final CommandSender consoleSender = server.getConsoleSender();
-		server.dispatchCommand(consoleSender, "save-all");
-		server.dispatchCommand(consoleSender, "save-off");
+		final CommandSender cs = server.getConsoleSender();
+		server.dispatchCommand(cs, "save-all");
+		server.dispatchCommand(cs, "save-off");
 
-		ess.scheduleAsyncDelayedTask(new BackupRunner(command));
-	}
-
-
-	private class BackupRunner implements Runnable
-	{
-		private final transient String command;
-
-		public BackupRunner(final String command)
-		{
-			this.command = command;
-		}
-
-		@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();
-				final BufferedReader reader = new BufferedReader(new InputStreamReader(child.getInputStream()));
-				try
+		ess.scheduleAsyncDelayedTask(
+				new Runnable()
 				{
-					child.waitFor();
-					String line;
-					do
+					@Override
+					public void run()
 					{
-						line = reader.readLine();
-						if (line != null)
+						try
 						{
-							LOGGER.log(Level.INFO, line);
+							final ProcessBuilder childBuilder = new ProcessBuilder(command);
+							childBuilder.redirectErrorStream(true);
+							childBuilder.directory(ess.getDataFolder().getParentFile().getParentFile());
+							final Process child = childBuilder.start();
+							final BufferedReader reader = new BufferedReader(new InputStreamReader(child.getInputStream()));
+							try
+							{
+								child.waitFor();
+								String line;
+								do
+								{
+									line = reader.readLine();
+									if (line != null)
+									{
+										LOGGER.log(Level.INFO, line);
+									}
+								}
+								while (line != null);
+							}
+							finally
+							{
+								reader.close();
+							}
+						}
+						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)
+											{
+												running = false;
+												if (taskId != -1)
+												{
+													server.getScheduler().cancelTask(taskId);
+												}
+											}
+											active = false;
+											LOGGER.log(Level.INFO, _("backupFinished"));
+										}
+									});
 						}
 					}
-					while (line != null);
-				}
-				finally
-				{
-					reader.close();
-				}
-			}
-			catch (InterruptedException ex)
-			{
-				LOGGER.log(Level.SEVERE, null, ex);
-			}
-			catch (IOException ex)
-			{
-				LOGGER.log(Level.SEVERE, null, ex);
-			}
-			finally
-			{
-				ess.scheduleSyncDelayedTask(new EnableSavingRunner());
-			}
-		}
-	}
-
-
-	private class EnableSavingRunner implements Runnable
-	{
-		@Override
-		public void run()
-		{
-			server.dispatchCommand(server.getConsoleSender(), "save-on");
-			if (server.getOnlinePlayers().length == 0)
-			{
-				running.set(false);
-				if (taskId != -1)
-				{
-					server.getScheduler().cancelTask(taskId);
-				}
-			}
-
-			active.set(false);
-			LOGGER.log(Level.INFO, _("backupFinished"));
-		}
+				});
 	}
 }

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

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

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

@@ -1,6 +1,6 @@
 package com.earth2me.essentials;
 
-import com.earth2me.essentials.api.IReplyTo;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
 
@@ -14,8 +14,13 @@ public final class Console implements IReplyTo
 	{
 	}
 
+	public static CommandSender getCommandSender(Server server) throws Exception
+	{
+		return server.getConsoleSender();
+	}
+
 	@Override
-	public void setReplyTo(final CommandSender user)
+	public void setReplyTo(CommandSender user)
 	{
 		replyTo = user;
 	}

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

@@ -16,6 +16,9 @@ import java.util.*;
  */
 public final class DescParseTickFormat
 {
+	// ============================================
+	// First some information vars. TODO: Should this be in a config file?
+	// --------------------------------------------
 	public static final Map<String, Integer> nameToTicks = new LinkedHashMap<String, Integer>();
 	public static final Set<String> resetAliases = new HashSet<String>();
 	public static final int ticksAtMidnight = 18000;

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

@@ -1,207 +0,0 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.api.*;
-import com.earth2me.essentials.perm.Permissions;
-import com.earth2me.essentials.settings.MoneyHolder;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-
-public class Economy implements IEconomy
-{
-	private final IEssentials ess;
-	private final MoneyHolder npcs;
-
-	public Economy(IEssentials ess)
-	{
-		this.ess = ess;
-		this.npcs = new MoneyHolder(ess);
-	}
-
-	private double getNPCBalance(String name) throws UserDoesNotExistException
-	{
-		npcs.acquireReadLock();
-		try
-		{
-			Map<String, Double> balances = npcs.getData().getBalances();
-			if (balances == null)
-			{
-				throw new UserDoesNotExistException(name);
-			}
-			Double balance = npcs.getData().getBalances().get(name.toLowerCase(Locale.ENGLISH));
-			if (balance == null)
-			{
-				throw new UserDoesNotExistException(name);
-			}
-			return balance;
-		}
-		finally
-		{
-			npcs.unlock();
-		}
-	}
-
-	private void setNPCBalance(String name, double balance, boolean checkExistance) throws UserDoesNotExistException
-	{
-		npcs.acquireWriteLock();
-		try
-		{
-			Map<String, Double> balances = npcs.getData().getBalances();
-			if (balances == null)
-			{
-				balances = new HashMap<String, Double>();
-				npcs.getData().setBalances(balances);
-			}
-			if (checkExistance && !balances.containsKey(name.toLowerCase(Locale.ENGLISH)))
-			{
-				throw new UserDoesNotExistException(name);
-			}
-			balances.put(name.toLowerCase(Locale.ENGLISH), balance);
-		}
-		finally
-		{
-			npcs.unlock();
-		}
-	}
-
-	private double getStartingBalance()
-	{
-		double startingBalance = 0;
-		ISettings settings = ess.getSettings();
-		settings.acquireReadLock();
-		try
-		{
-			startingBalance = settings.getData().getEconomy().getStartingBalance();
-		}
-		finally
-		{
-			settings.unlock();
-		}
-		return startingBalance;
-	}
-
-	@Override
-	public void onReload()
-	{
-		this.npcs.onReload(false);
-	}
-
-	@Override
-	public double getMoney(String name) throws UserDoesNotExistException
-	{
-		IUser user = ess.getUser(name);
-		if (user == null)
-		{
-			return getNPCBalance(name);
-		}
-		return user.getMoney();
-	}
-
-	@Override
-	public void setMoney(String name, double balance) throws NoLoanPermittedException, UserDoesNotExistException
-	{
-		IUser user = ess.getUser(name);
-		if (user == null)
-		{
-			setNPCBalance(name, balance, true);
-			return;
-		}
-		if (balance < 0.0 && !Permissions.ECO_LOAN.isAuthorized(user))
-		{
-			throw new NoLoanPermittedException();
-		}
-		user.setMoney(balance);
-	}
-
-	@Override
-	public void resetBalance(String name) throws NoLoanPermittedException, UserDoesNotExistException
-	{
-		setMoney(name, getStartingBalance());
-	}
-
-	@Override
-	public String format(double amount)
-	{
-		return Util.formatCurrency(amount, ess);
-	}
-
-	@Override
-	public boolean playerExists(String name)
-	{
-		try
-		{
-			getMoney(name);
-			return true;
-		}
-		catch (UserDoesNotExistException ex)
-		{
-			return false;
-		}
-	}
-
-	@Override
-	public boolean isNPC(String name) throws UserDoesNotExistException
-	{
-		boolean result = ess.getUser(name) == null;
-		if (result)
-		{
-			getNPCBalance(name);
-		}
-		return result;
-	}
-
-	@Override
-	public boolean createNPC(String name)
-	{
-		try
-		{
-			if (isNPC(name))
-			{
-
-				setNPCBalance(name, getStartingBalance(), false);
-				return true;
-			}
-		}
-		catch (UserDoesNotExistException ex)
-		{
-			try
-			{
-				setNPCBalance(name, getStartingBalance(), false);
-				return true;
-			}
-			catch (UserDoesNotExistException ex1)
-			{
-				//This should never happen!
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public void removeNPC(String name) throws UserDoesNotExistException
-	{
-		npcs.acquireWriteLock();
-		try
-		{
-			Map<String, Double> balances = npcs.getData().getBalances();
-			if (balances == null)
-			{
-				balances = new HashMap<String, Double>();
-				npcs.getData().setBalances(balances);
-			}
-			if (balances.containsKey(name.toLowerCase(Locale.ENGLISH)))
-			{
-				balances.remove(name.toLowerCase(Locale.ENGLISH));
-			}
-			else
-			{
-				throw new UserDoesNotExistException(name);
-			}
-		}
-		finally
-		{
-			npcs.unlock();
-		}
-	}
-}

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

@@ -9,13 +9,8 @@ import java.util.regex.Pattern;
 import org.bukkit.enchantments.Enchantment;
 
 
-public final class Enchantments
+public class Enchantments
 {
-
-	private Enchantments()
-	{
-	}
-	
 	private static final transient Pattern NUMPATTERN = Pattern.compile("\\d+");
 	private static final Map<String, Enchantment> ENCHANTMENTS = new HashMap<String, Enchantment>();
 
@@ -59,15 +54,9 @@ public final class Enchantments
 		ENCHANTMENTS.put("silktouch", Enchantment.SILK_TOUCH);
 		ENCHANTMENTS.put("waterworker", Enchantment.WATER_WORKER);
 		ENCHANTMENTS.put("aquaaffinity", Enchantment.WATER_WORKER);
-		ENCHANTMENTS.put("firearrow", Enchantment.ARROW_FIRE);
-		ENCHANTMENTS.put("arrowdamage", Enchantment.ARROW_DAMAGE);
-		ENCHANTMENTS.put("arrowknockback", Enchantment.ARROW_KNOCKBACK);
-		ENCHANTMENTS.put("arrowkb", Enchantment.ARROW_KNOCKBACK);
-		ENCHANTMENTS.put("infinitearrows", Enchantment.ARROW_INFINITE);
-		ENCHANTMENTS.put("infarrows", Enchantment.ARROW_INFINITE);
 	}
 	
-	public static Enchantment getByName(final String name) {
+	public static Enchantment getByName(String name) {
 		Enchantment enchantment;
 		if (NUMPATTERN.matcher(name).matches()) {
 			enchantment = Enchantment.getById(Integer.parseInt(name));

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

@@ -18,18 +18,25 @@
 package com.earth2me.essentials;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.*;
-import com.earth2me.essentials.listener.*;
+import com.earth2me.essentials.api.Economy;
+import com.earth2me.essentials.api.IJails;
+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.craftbukkit.ItemDupeFix;
+import com.earth2me.essentials.perm.PermissionsHandler;
 import com.earth2me.essentials.register.payment.Methods;
-import com.earth2me.essentials.settings.GroupsHolder;
-import com.earth2me.essentials.settings.SettingsHolder;
-import com.earth2me.essentials.user.UserMap;
+import com.earth2me.essentials.signs.SignBlockListener;
+import com.earth2me.essentials.signs.SignEntityListener;
+import com.earth2me.essentials.signs.SignPlayerListener;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
+import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -37,41 +44,39 @@ import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
+import org.bukkit.event.Event.Priority;
+import org.bukkit.event.Event.Type;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerListener;
 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.scheduler.BukkitScheduler;
 import org.yaml.snakeyaml.error.YAMLException;
 
 
 public class Essentials extends JavaPlugin implements IEssentials
 {
-	public static final int BUKKIT_VERSION = 1952;
+	public static final int BUKKIT_VERSION = 1597;
 	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private transient ISettings settings;
-	private final transient TntExplodeListener tntListener = new TntExplodeListener(this);
-	private transient IJails jails;
-	private transient IKits kits;
-	private transient IWarps warps;
-	private transient IWorth worth;
-	private transient List<IReload> reloadList;
-	private transient IBackup backup;
-	private transient IItemDb itemDb;
-	private transient IGroups groups;
+	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 IUserMap userMap;
+	private transient PermissionsHandler permissionsHandler;
+	private transient AlternativeCommandsHandler alternativeCommandsHandler;
+	private transient UserMap userMap;
 	private transient ExecuteTimer execTimer;
 	private transient I18n i18n;
-	private transient ICommandHandler commandHandler;
-	private transient Economy economy;
-	public transient boolean testing;
 
 	@Override
 	public ISettings getSettings()
@@ -81,7 +86,6 @@ public class Essentials extends JavaPlugin implements IEssentials
 
 	public void setupForTesting(final Server server) throws IOException, InvalidDescriptionException
 	{
-		testing = true;
 		final File dataFolder = File.createTempFile("essentialstest", "");
 		if (!dataFolder.delete())
 		{
@@ -96,11 +100,11 @@ public class Essentials extends JavaPlugin implements IEssentials
 		LOGGER.log(Level.INFO, _("usingTempFolderForTesting"));
 		LOGGER.log(Level.INFO, dataFolder.toString());
 		this.initialize(null, server, new PluginDescriptionFile(new FileReader(new File("src" + File.separator + "plugin.yml"))), dataFolder, null, null);
-		settings = new SettingsHolder(this);
+		settings = new Settings(this);
 		i18n.updateLocale("en");
 		userMap = new UserMap(this);
-		//permissionsHandler = new PermissionsHandler(this);
-		economy = new Economy(this);
+		permissionsHandler = new PermissionsHandler(this, false);
+		Economy.setEss(this);
 	}
 
 	@Override
@@ -141,35 +145,27 @@ public class Essentials extends JavaPlugin implements IEssentials
 		execTimer.mark("BukkitCheck");
 		try
 		{
-			//final EssentialsUpgrade upgrade = new EssentialsUpgrade(this);
-			//upgrade.beforeSettings();
-			//execTimer.mark("Upgrade");
-			reloadList = new ArrayList<IReload>();
-			settings = new SettingsHolder(this);
-			reloadList.add(settings);
+			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");
-			//upgrade.afterSettings();
-			//execTimer.mark("Upgrade2");
+			upgrade.afterSettings();
+			execTimer.mark("Upgrade2");
 			i18n.updateLocale(settings.getLocale());
 			userMap = new UserMap(this);
-			reloadList.add(userMap);
+			confList.add(userMap);
 			execTimer.mark("Init(Usermap)");
-			groups = new GroupsHolder(this);
-			reloadList.add((GroupsHolder)groups);
-			warps = new Warps(this);
-			reloadList.add(warps);
+			warps = new Warps(getServer(), this.getDataFolder());
+			confList.add(warps);
 			execTimer.mark("Init(Spawn/Warp)");
-			worth = new Worth(this);
-			reloadList.add(worth);
+			worth = new Worth(this.getDataFolder());
+			confList.add(worth);
 			itemDb = new ItemDb(this);
-			reloadList.add(itemDb);
+			confList.add(itemDb);
 			execTimer.mark("Init(Worth/ItemDB)");
-			kits = new Kits(this);
-			reloadList.add(kits);
-			commandHandler = new EssentialsCommandHandler(Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.", this);
-			reloadList.add(commandHandler);
-			economy = new Economy(this);
-			reloadList.add(economy);
 			reload();
 		}
 		catch (YAMLException exception)
@@ -183,14 +179,14 @@ public class Essentials extends JavaPlugin implements IEssentials
 				LOGGER.log(Level.SEVERE, _("essentialsHelp1"));
 			}
 			LOGGER.log(Level.SEVERE, exception.toString());
-			pm.registerEvents(new Listener()
+			pm.registerEvent(Type.PLAYER_JOIN, new PlayerListener()
 			{
-				@EventHandler(priority = EventPriority.LOW)
-				public void onPlayerJoin(final PlayerJoinEvent event)
+				@Override
+				public void onPlayerJoin(PlayerJoinEvent event)
 				{
 					event.getPlayer().sendMessage("Essentials failed to load, read the log file.");
 				}
-			}, this);
+			}, Priority.Low, this);
 			for (Player player : getServer().getOnlinePlayers())
 			{
 				player.sendMessage("Essentials failed to load, read the log file.");
@@ -199,33 +195,70 @@ public class Essentials extends JavaPlugin implements IEssentials
 			return;
 		}
 		backup = new Backup(this);
-		//permissionsHandler = new PermissionsHandler(this);
+		permissionsHandler = new PermissionsHandler(this, settings.useBukkitPermissions());
+		alternativeCommandsHandler = new AlternativeCommandsHandler(this);
 		final EssentialsPluginListener serverListener = new EssentialsPluginListener(this);
-		pm.registerEvents(serverListener, this);
-		reloadList.add(serverListener);
+		pm.registerEvent(Type.PLUGIN_ENABLE, serverListener, Priority.Low, this);
+		pm.registerEvent(Type.PLUGIN_DISABLE, serverListener, Priority.Low, this);
+		confList.add(serverListener);
 
 		final EssentialsPlayerListener playerListener = new EssentialsPlayerListener(this);
-		pm.registerEvents(playerListener, this);
+		pm.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Monitor, this);
+		pm.registerEvent(Type.PLAYER_QUIT, playerListener, Priority.Monitor, this);
+		pm.registerEvent(Type.PLAYER_CHAT, playerListener, Priority.Lowest, this);
+		pm.registerEvent(Type.PLAYER_COMMAND_PREPROCESS, playerListener, Priority.Lowest, this);
+		pm.registerEvent(Type.PLAYER_MOVE, playerListener, Priority.High, this);
+		pm.registerEvent(Type.PLAYER_LOGIN, playerListener, Priority.High, this);
+		pm.registerEvent(Type.PLAYER_TELEPORT, playerListener, Priority.High, this);
+		pm.registerEvent(Type.PLAYER_EGG_THROW, playerListener, Priority.High, this);
+		pm.registerEvent(Type.PLAYER_BUCKET_EMPTY, playerListener, Priority.High, this);
+		pm.registerEvent(Type.PLAYER_ANIMATION, playerListener, Priority.High, this);
+		pm.registerEvent(Type.PLAYER_CHANGED_WORLD, playerListener, Priority.Normal, this);
+		pm.registerEvent(Type.PLAYER_INTERACT, playerListener, Priority.Monitor, this);
+		pm.registerEvent(Type.PLAYER_PICKUP_ITEM, playerListener, Priority.Low, this);
+		pm.registerEvent(Type.PLAYER_TELEPORT, new ItemDupeFix(), Priority.Monitor, this);
 
 		final EssentialsBlockListener blockListener = new EssentialsBlockListener(this);
-		pm.registerEvents(blockListener, this);
+		pm.registerEvent(Type.BLOCK_PLACE, blockListener, Priority.Lowest, this);
+
+		final SignBlockListener signBlockListener = new SignBlockListener(this);
+		pm.registerEvent(Type.SIGN_CHANGE, signBlockListener, Priority.Highest, this);
+		pm.registerEvent(Type.BLOCK_PLACE, signBlockListener, Priority.Low, this);
+		pm.registerEvent(Type.BLOCK_BREAK, signBlockListener, Priority.Highest, this);
+		pm.registerEvent(Type.BLOCK_IGNITE, signBlockListener, Priority.Low, this);
+		pm.registerEvent(Type.BLOCK_BURN, signBlockListener, Priority.Low, this);
+		pm.registerEvent(Type.BLOCK_PISTON_EXTEND, signBlockListener, Priority.Low, this);
+		pm.registerEvent(Type.BLOCK_PISTON_RETRACT, signBlockListener, Priority.Low, this);
+
+		final SignPlayerListener signPlayerListener = new SignPlayerListener(this);
+		pm.registerEvent(Type.PLAYER_INTERACT, signPlayerListener, Priority.Low, this);
+
+		final SignEntityListener signEntityListener = new SignEntityListener(this);
+		pm.registerEvent(Type.ENTITY_EXPLODE, signEntityListener, Priority.Low, this);
+		pm.registerEvent(Type.ENDERMAN_PICKUP, signEntityListener, Priority.Low, this);
 
 		final EssentialsEntityListener entityListener = new EssentialsEntityListener(this);
-		pm.registerEvents(entityListener, this);
+		pm.registerEvent(Type.ENTITY_DAMAGE, entityListener, Priority.Lowest, this);
+		pm.registerEvent(Type.ENTITY_COMBUST, entityListener, Priority.Lowest, this);
+		pm.registerEvent(Type.ENTITY_DEATH, entityListener, Priority.Lowest, this);
+		pm.registerEvent(Type.ENTITY_REGAIN_HEALTH, entityListener, Priority.Lowest, this);
+		pm.registerEvent(Type.FOOD_LEVEL_CHANGE, entityListener, Priority.Lowest, this);
 
+		//TODO: Check if this should be here, and not above before reload()
 		jails = new Jails(this);
-		reloadList.add(jails);
-
-		pm.registerEvents(tntListener, this);
+		confList.add(jails);
 
+		pm.registerEvent(Type.ENTITY_EXPLODE, tntListener, Priority.High, this);
 
 		final EssentialsTimer timer = new EssentialsTimer(this);
-		getServer().getScheduler().scheduleSyncRepeatingTask(this, timer, 1, 100);
+		getScheduler().scheduleSyncRepeatingTask(this, timer, 1, 100);
+		Economy.setEss(this);
 		execTimer.mark("RegListeners");
+		LOGGER.info(_("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), Util.joinList(this.getDescription().getAuthors())));
 		final String timeroutput = execTimer.end();
 		if (getSettings().isDebug())
 		{
-			LOGGER.log(Level.INFO, "Essentials load {0}", timeroutput);
+			LOGGER.log(Level.INFO, "Essentials load " + timeroutput);
 		}
 	}
 
@@ -233,6 +266,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 	public void onDisable()
 	{
 		i18n.onDisable();
+		Economy.setEss(null);
 		Trade.closeLog();
 	}
 
@@ -241,10 +275,10 @@ public class Essentials extends JavaPlugin implements IEssentials
 	{
 		Trade.closeLog();
 
-		for (IReload iReload : reloadList)
+		for (IConf iConf : confList)
 		{
-			iReload.onReload();
-			execTimer.mark("Reload(" + iReload.getClass().getSimpleName() + ")");
+			iConf.reloadConfig();
+			execTimer.mark("Reload(" + iConf.getClass().getSimpleName() + ")");
 		}
 
 		i18n.updateLocale(settings.getLocale());
@@ -253,8 +287,124 @@ public class Essentials extends JavaPlugin implements IEssentials
 	@Override
 	public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args)
 	{
-		return commandHandler.handleCommand(sender, command, commandLabel, args);
-		//return onCommandEssentials(sender, command, commandLabel, args, Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.", null);
+		return onCommandEssentials(sender, command, commandLabel, args, Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.", null);
+	}
+
+	@Override
+	public boolean onCommandEssentials(final CommandSender sender, 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.getLabel());
+				return pc.execute(sender, commandLabel, args);
+			}
+		}
+
+		try
+		{
+			User user = null;
+			if (sender instanceof Player)
+			{
+				user = getUser(sender);
+				LOGGER.log(Level.INFO, String.format("[PLAYER_COMMAND] %s: /%s %s ", ((Player)sender).getName(), commandLabel, EssentialsCommand.getFinalArg(args, 0)));
+			}
+
+			// New mail notification
+			if (user != null && !getSettings().isCommandDisabled("mail") && !commandLabel.equals("mail") && user.isAuthorized("essentials.mail"))
+			{
+				final List<String> mail = user.getMails();
+				if (mail != null && !mail.isEmpty())
+				{
+					user.sendMessage(_("youHaveNewMail", mail.size()));
+				}
+			}
+
+			// 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(_("commandNotLoaded", commandLabel));
+				LOGGER.log(Level.SEVERE, _("commandNotLoaded", commandLabel), ex);
+				return true;
+			}
+
+			// Check authorization
+			if (user != null && !user.isAuthorized(cmd, permissionPrefix))
+			{
+				LOGGER.log(Level.WARNING, _("deniedAccessCommand", user.getName()));
+				user.sendMessage(_("noAccessCommand"));
+				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 (NotEnoughArgumentsException ex)
+			{
+				sender.sendMessage(command.getDescription());
+				sender.sendMessage(command.getUsage().replaceAll("<command>", commandLabel));
+				if (!ex.getMessage().isEmpty())
+				{
+					sender.sendMessage(ex.getMessage());
+				}
+				return true;
+			}
+			catch (Throwable ex)
+			{
+				showError(sender, ex, commandLabel);
+				return true;
+			}
+		}
+		catch (Throwable ex)
+		{
+			LOGGER.log(Level.SEVERE, _("commandFailed", commandLabel), ex);
+			return true;
+		}
+	}
+
+	@Override
+	public void showError(final CommandSender sender, final Throwable exception, final String commandLabel)
+	{
+		sender.sendMessage(_("errorWithMessage", exception.getMessage()));
+		if (getSettings().isDebug())
+		{
+			LOGGER.log(Level.WARNING, _("errorCallingCommand", commandLabel), exception);
+		}
+	}
+
+	@Override
+	public BukkitScheduler getScheduler()
+	{
+		return this.getServer().getScheduler();
 	}
 
 	@Override
@@ -264,39 +414,65 @@ public class Essentials extends JavaPlugin implements IEssentials
 	}
 
 	@Override
-	public IKits getKits()
-	{
-		return kits;
-	}
-
-	@Override
-	public IWarps getWarps()
+	public Warps getWarps()
 	{
 		return warps;
 	}
 
 	@Override
-	public IWorth getWorth()
+	public Worth getWorth()
 	{
 		return worth;
 	}
 
 	@Override
-	public IBackup getBackup()
+	public Backup getBackup()
 	{
 		return backup;
 	}
 
 	@Override
-	public IUser getUser(final Player player)
+	public User getUser(final Object base)
 	{
-		return userMap.getUser(player);
+		if (base instanceof Player)
+		{
+			return getUser((Player)base);
+		}
+		if (base instanceof String)
+		{
+			return userMap.getUser((String)base);
+		}
+		return null;
+	}
+
+	private <T extends Player> User getUser(final T base)
+	{
+		if (base == null)
+		{
+			return null;
+		}
+
+		if (base instanceof User)
+		{
+			return (User)base;
+		}
+		User user = userMap.getUser(base.getName());
+
+		if (user == null)
+		{
+			user = new User(base, this);
+		}
+		else
+		{
+			user.update(base);
+		}
+		return user;
 	}
 
 	@Override
-	public IUser getUser(final String playerName)
+	public User getOfflineUser(final String name)
 	{
-		return userMap.getUser(playerName);
+		return userMap.getUser(name);
 	}
 
 	@Override
@@ -314,9 +490,9 @@ public class Essentials extends JavaPlugin implements IEssentials
 	}
 
 	@Override
-	public void addReloadListener(final IReload listener)
+	public void addReloadListener(final IConf listener)
 	{
-		reloadList.add(listener);
+		confList.add(listener);
 	}
 
 	@Override
@@ -340,8 +516,8 @@ public class Essentials extends JavaPlugin implements IEssentials
 
 		for (Player player : players)
 		{
-			final IUser user = getUser(player);
-			if (!user.isIgnoringPlayer(sender.getName()))
+			final User user = getUser(player);
+			if (!user.isIgnoredPlayer(sender.getName()))
 			{
 				player.sendMessage(message);
 			}
@@ -353,47 +529,53 @@ public class Essentials extends JavaPlugin implements IEssentials
 	@Override
 	public int scheduleAsyncDelayedTask(final Runnable run)
 	{
-		return this.getServer().getScheduler().scheduleAsyncDelayedTask(this, run);
+		return this.getScheduler().scheduleAsyncDelayedTask(this, run);
 	}
 
 	@Override
 	public int scheduleSyncDelayedTask(final Runnable run)
 	{
-		return this.getServer().getScheduler().scheduleSyncDelayedTask(this, run);
+		return this.getScheduler().scheduleSyncDelayedTask(this, run);
 	}
 
 	@Override
 	public int scheduleSyncDelayedTask(final Runnable run, final long delay)
 	{
-		return this.getServer().getScheduler().scheduleSyncDelayedTask(this, run, delay);
+		return this.getScheduler().scheduleSyncDelayedTask(this, run, delay);
 	}
 
 	@Override
 	public int scheduleSyncRepeatingTask(final Runnable run, final long delay, final long period)
 	{
-		return this.getServer().getScheduler().scheduleSyncRepeatingTask(this, run, delay, period);
+		return this.getScheduler().scheduleSyncRepeatingTask(this, run, delay, period);
 	}
 
 	@Override
-	public TntExplodeListener getTNTListener()
+	public TNTExplodeListener getTNTListener()
 	{
 		return tntListener;
 	}
 
-	/*@Override
+	@Override
 	public PermissionsHandler getPermissionsHandler()
 	{
 		return permissionsHandler;
-	}*/
+	}
 
 	@Override
-	public IItemDb getItemDb()
+	public AlternativeCommandsHandler getAlternativeCommandsHandler()
+	{
+		return alternativeCommandsHandler;
+	}
+
+	@Override
+	public ItemDb getItemDb()
 	{
 		return itemDb;
 	}
 
 	@Override
-	public IUserMap getUserMap()
+	public UserMap getUserMap()
 	{
 		return userMap;
 	}
@@ -403,34 +585,4 @@ public class Essentials extends JavaPlugin implements IEssentials
 	{
 		return i18n;
 	}
-
-	@Override
-	public IGroups getGroups()
-	{
-		return groups;
-	}
-
-	@Override
-	public ICommandHandler getCommandHandler()
-	{
-		return commandHandler;
-	}
-
-	@Override
-	public void setGroups(final IGroups groups)
-	{
-		this.groups = groups;
-	}
-
-	@Override
-	public void removeReloadListener(IReload groups)
-	{
-		this.reloadList.remove(groups);
-	}
-
-	@Override
-	public IEconomy getEconomy()
-	{
-		return economy;
-	}
 }

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

@@ -0,0 +1,51 @@
+package com.earth2me.essentials;
+
+import java.util.logging.Logger;
+import org.bukkit.GameMode;
+import org.bukkit.Material;
+import org.bukkit.event.block.BlockListener;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.inventory.ItemStack;
+
+
+public class EssentialsBlockListener extends BlockListener
+{
+	private final IEssentials ess;
+	private static final Logger logger = Logger.getLogger("Minecraft");
+
+	public EssentialsBlockListener(IEssentials ess)
+	{
+		this.ess = ess;
+	}
+
+	@Override
+	public void onBlockPlace(BlockPlaceEvent event)
+	{
+		if (event.isCancelled())
+		{
+			return;
+		}
+		final User user = ess.getUser(event.getPlayer());
+		// Do not rely on getItemInHand();
+		// http://leaky.bukkit.org/issues/663
+		final ItemStack is = Util.convertBlockToItem(event.getBlockPlaced());
+		if (is == null)
+		{
+			return;
+		}
+		boolean unlimitedForUser = user.hasUnlimited(is);
+		if (unlimitedForUser && user.getGameMode() == GameMode.SURVIVAL)
+		{
+			ess.scheduleSyncDelayedTask(
+					new Runnable()
+					{
+						@Override
+						public void run()
+						{
+							user.getInventory().addItem(is);
+							user.updateInventory();
+						}
+					});
+		}
+	}
+}

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

@@ -1,316 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.*;
-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 java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.command.PluginCommandYamlParser;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-
-public class EssentialsCommandHandler implements ICommandHandler
-{
-	private final transient ClassLoader classLoader;
-	private final transient String commandPath;
-	private final transient String permissionPrefix;
-	private final transient IEssentialsModule module;
-	private static final transient Logger LOGGER = Bukkit.getLogger();
-	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 Map<String, IEssentialsCommand> commands = new HashMap<String, IEssentialsCommand>();
-	private final transient IEssentials ess;
-
-	public EssentialsCommandHandler(ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentials ess)
-	{
-		this(classLoader, commandPath, permissionPrefix, null, ess);
-	}
-
-	public EssentialsCommandHandler(ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentialsModule module, IEssentials ess)
-	{
-		this.classLoader = classLoader;
-		this.commandPath = commandPath;
-		this.permissionPrefix = permissionPrefix;
-		this.module = module;
-		this.ess = ess;
-		for (Plugin plugin : ess.getServer().getPluginManager().getPlugins())
-		{
-			if (plugin.isEnabled())
-			{
-				addPlugin(plugin);
-			}
-		}
-	}
-
-	@Override
-	public boolean handleCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args)
-	{
-		boolean disabled = false;
-		boolean overridden = false;
-		ISettings settings = ess.getSettings();
-		settings.acquireReadLock();
-		try
-		{
-			disabled = settings.getData().getCommands().isDisabled(command.getName());
-			overridden = !disabled || settings.getData().getCommands().isOverridden(command.getName());
-		}
-		finally
-		{
-			settings.unlock();
-		}
-		// Allow plugins to override the command via onCommand
-		if (!overridden && (!commandLabel.startsWith("e") || commandLabel.equalsIgnoreCase(command.getName())))
-		{
-			final PluginCommand pc = getAlternative(commandLabel);
-			if (pc != null)
-			{
-				
-				executed(commandLabel, pc.getLabel());
-				try
-				{
-					return pc.execute(sender, commandLabel, args);
-				}
-				catch (final Exception ex)
-				{
-					final ArrayList<StackTraceElement> elements = new ArrayList<StackTraceElement>(Arrays.asList(ex.getStackTrace()));
-					elements.remove(0);
-					final ArrayList<StackTraceElement> toRemove = new ArrayList<StackTraceElement>();
-					for (final StackTraceElement e : elements)
-					{
-						if (e.getClassName().equals("com.earth2me.essentials.Essentials"))
-						{
-							toRemove.add(e);
-						}
-					}
-					elements.removeAll(toRemove);
-					final StackTraceElement[] trace = elements.toArray(new StackTraceElement[elements.size()]);
-					ex.setStackTrace(trace);
-					ex.printStackTrace();
-					sender.sendMessage(ChatColor.RED + "An internal error occurred while attempting to perform this command");
-					return true;
-				}
-			}
-		}
-
-		try
-		{
-			IUser user = null;
-			if (sender instanceof Player)
-			{
-				user = ess.getUser((Player)sender);
-				LOGGER.log(Level.INFO, String.format("[PLAYER_COMMAND] %s: /%s %s ", ((Player)sender).getName(), commandLabel, EssentialsCommand.getFinalArg(args, 0)));
-			}
-
-			// Check for disabled commands
-			if (disabled)
-			{
-				return true;
-			}
-
-			final String commandName = command.getName().toLowerCase(Locale.ENGLISH);
-			IEssentialsCommand cmd = commands.get(commandName);
-			if (cmd == null)
-			{
-				try
-				{
-					cmd = (IEssentialsCommand)classLoader.loadClass(commandPath + commandName).newInstance();
-					cmd.init(ess, commandName);
-					cmd.setEssentialsModule(module);
-					commands.put(commandName, cmd);
-				}
-				catch (Exception ex)
-				{
-					sender.sendMessage(_("commandNotLoaded", commandName));
-					LOGGER.log(Level.SEVERE, _("commandNotLoaded", commandName), ex);
-					return true;
-				}
-			}
-
-			// Check authorization
-			if (sender != null && cmd.isAuthorized(sender))
-			{
-				LOGGER.log(Level.WARNING, _("deniedAccessCommand", user.getName()));
-				user.sendMessage(_("noAccessCommand"));
-				return true;
-			}
-
-			// Run the command
-			try
-			{
-				if (user == null)
-				{
-					cmd.run(sender, command, commandLabel, args);
-				}
-				else
-				{
-					user.acquireReadLock();
-					try
-					{
-						cmd.run(user, command, commandLabel, args);
-					}
-					finally
-					{
-						user.unlock();
-					}
-				}
-				return true;
-			}
-			catch (NoChargeException 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 (Throwable ex)
-			{
-				showCommandError(sender, commandLabel, ex);
-				return true;
-			}
-		}
-		catch (Throwable ex)
-		{
-			LOGGER.log(Level.SEVERE, _("commandFailed", commandLabel), ex);
-			return true;
-		}
-	}
-
-	@Override
-	public void showCommandError(final CommandSender sender, final String commandLabel, final Throwable exception)
-	{
-		sender.sendMessage(_("errorWithMessage", exception.getMessage()));
-		if (ess.getSettings().isDebug())
-		{
-			LOGGER.log(Level.WARNING, _("errorCallingCommand", commandLabel), exception);
-		}
-	}
-
-	@Override
-	public void onReload()
-	{
-	}
-
-	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 String otherLabel)
-	{
-		if (ess.getSettings().isDebug())
-		{
-			LOGGER.log(Level.INFO, "Essentials: Alternative command " + label + " found, using " + otherLabel);
-		}
-		disabledList.put(label, otherLabel);
-	}
-
-	public Map<String, String> disabledCommands()
-	{
-		return disabledList;
-	}
-}

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

@@ -3,6 +3,7 @@ package com.earth2me.essentials;
 import static com.earth2me.essentials.I18n._;
 import java.io.*;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.logging.Level;
@@ -11,15 +12,12 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.World;
-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.config.Configuration;
 
 
-@Deprecated
-public class EssentialsConf extends YamlConfiguration
+public class EssentialsConf extends Configuration
 {
 	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private transient File configFile;
@@ -28,10 +26,15 @@ public class EssentialsConf extends YamlConfiguration
 
 	public EssentialsConf(final File configFile)
 	{
-		super();
+		super(configFile);
 		this.configFile = configFile;
+		if (this.root == null)
+		{
+			this.root = new HashMap<String, Object>();
+		}
 	}
 
+	@Override
 	public void load()
 	{
 		configFile = configFile.getAbsoluteFile();
@@ -102,24 +105,19 @@ public class EssentialsConf extends YamlConfiguration
 			}
 		}
 
-
 		try
 		{
-			super.load(configFile);
+			super.load();
 		}
-		catch (FileNotFoundException ex)
+		catch (RuntimeException e)
 		{
-			LOGGER.log(Level.SEVERE, null, ex);
+			LOGGER.log(Level.SEVERE, "File broken: " + configFile.toString());
+			throw e;
 		}
-		catch (IOException ex)
+
+		if (this.root == null)
 		{
-			LOGGER.log(Level.SEVERE, null, 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());
+			this.root = new HashMap<String, Object>();
 		}
 	}
 
@@ -194,7 +192,7 @@ public class EssentialsConf extends YamlConfiguration
 
 	public boolean hasProperty(final String path)
 	{
-		return isSet(path);
+		return getProperty(path) != null;
 	}
 
 	public Location getLocation(final String path, final Server server) throws Exception
@@ -219,25 +217,24 @@ public class EssentialsConf extends YamlConfiguration
 
 	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());
+		setProperty((path == null ? "" : path + ".") + "world", loc.getWorld().getName());
+		setProperty((path == null ? "" : path + ".") + "x", loc.getX());
+		setProperty((path == null ? "" : path + ".") + "y", loc.getY());
+		setProperty((path == null ? "" : path + ".") + "z", loc.getZ());
+		setProperty((path == null ? "" : path + ".") + "yaw", loc.getYaw());
+		setProperty((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");
+		final List<String> enchants = getKeys(path + ".enchant");
 		if (enchants != null)
 		{
-			for (String enchant : enchants.getKeys(false))
+			for (String enchant : enchants)
 			{
 				final Enchantment enchantment = Enchantment.getByName(enchant.toUpperCase(Locale.ENGLISH));
 				if (enchantment == null)
@@ -273,14 +270,14 @@ public class EssentialsConf extends YamlConfiguration
 		}
 		// getData().getData() is broken
 		//map.put("data", stack.getDurability());
-		set(path, map);
+		setProperty(path, map);
 	}
 
 	public long getLong(final String path, final long def)
 	{
 		try
 		{
-			final Number num = (Number)get(path);
+			final Number num = (Number)getProperty(path);
 			return num == null ? def : num.longValue();
 		}
 		catch (ClassCastException ex)
@@ -294,7 +291,7 @@ public class EssentialsConf extends YamlConfiguration
 	{
 		try
 		{
-			Number num = (Number)get(path);
+			Number num = (Number)getProperty(path);
 			return num == null ? def : num.doubleValue();
 		}
 		catch (ClassCastException ex)
@@ -302,27 +299,4 @@ public class EssentialsConf extends YamlConfiguration
 			return def;
 		}
 	}
-	
-	public void save() {
-		try
-		{
-			save(configFile);
-		}
-		catch (IOException ex)
-		{
-			LOGGER.log(Level.SEVERE, null, ex);
-		}
-	}
-	
-	public Object getProperty(String path) {
-		return get(path);
-	}
-	
-	public void setProperty(String path, Object object) {
-		set(path, object);
-	}
-	
-	public void removeProperty(String path) {
-		set(path, null);
-	}
 }

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

@@ -0,0 +1,122 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import java.util.List;
+import java.util.logging.Logger;
+import org.bukkit.Material;
+import org.bukkit.entity.Animals;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
+import org.bukkit.event.entity.*;
+import org.bukkit.inventory.ItemStack;
+
+
+public class EssentialsEntityListener extends EntityListener
+{
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+	private final IEssentials ess;
+
+	public EssentialsEntityListener(IEssentials ess)
+	{
+		this.ess = ess;
+	}
+
+	@Override
+	public void onEntityDamage(EntityDamageEvent event)
+	{
+		if (event instanceof EntityDamageByEntityEvent)
+		{
+			EntityDamageByEntityEvent edEvent = (EntityDamageByEntityEvent)event;
+			Entity eAttack = edEvent.getDamager();
+			Entity eDefend = edEvent.getEntity();
+			if (eDefend instanceof Player && eAttack instanceof Player)
+			{
+				User defender = ess.getUser(eDefend);
+				User attacker = ess.getUser(eAttack);
+				attacker.updateActivity(true);
+				ItemStack is = attacker.getItemInHand();
+				List<String> commandList = attacker.getPowertool(is);
+				if (commandList != null && !commandList.isEmpty())
+				{
+					for (String command : commandList)
+					{
+
+						if (command != null && !command.isEmpty())
+						{
+							attacker.getServer().dispatchCommand(attacker, command.replaceAll("\\{player\\}", defender.getName()));
+							event.setCancelled(true);
+							return;
+						}
+					}
+				}
+			}
+			if (eDefend instanceof Animals && eAttack instanceof Player)
+			{
+				User player = ess.getUser(eAttack);
+				ItemStack hand = player.getItemInHand();
+				if (hand != null && hand.getType() == Material.MILK_BUCKET) {
+					((Animals)eDefend).setAge(-24000);
+					hand.setType(Material.BUCKET);
+					player.setItemInHand(hand);
+					player.updateInventory();
+					event.setCancelled(true);
+				}
+			}
+		}
+		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
+		{
+			final Player player = (Player)event.getEntity();
+			player.setFireTicks(0);
+			player.setRemainingAir(player.getMaximumAir());
+			event.setCancelled(true);
+		}
+	}
+
+	@Override
+	public void onEntityCombust(EntityCombustEvent event)
+	{
+		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
+		{
+			event.setCancelled(true);
+		}
+	}
+
+	@Override
+	public void onEntityDeath(final EntityDeathEvent event)
+	{
+		if (event instanceof PlayerDeathEvent)
+		{
+			final PlayerDeathEvent pdevent = (PlayerDeathEvent)event;
+			final User user = ess.getUser(pdevent.getEntity());
+			if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back"))
+			{
+				user.setLastLocation();
+				user.sendMessage(_("backAfterDeath"));
+			}
+			if (!ess.getSettings().areDeathMessagesEnabled())
+			{
+				pdevent.setDeathMessage("");
+			}
+		}
+	}
+
+	@Override
+	public void onFoodLevelChange(FoodLevelChangeEvent event)
+	{
+		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
+		{
+			event.setCancelled(true);
+		}
+	}
+
+	@Override
+	public void onEntityRegainHealth(EntityRegainHealthEvent event)
+	{
+		if (event.getRegainReason() == RegainReason.SATIATED && event.getEntity() instanceof Player
+			&& ess.getUser(event.getEntity()).isAfk() && ess.getSettings().getFreezeAfkPlayers())
+		{
+			event.setCancelled(true);
+		}
+	}
+}

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

@@ -0,0 +1,396 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.craftbukkit.SetBed;
+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 java.io.IOException;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.entity.Player;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerLoginEvent.Result;
+import org.bukkit.event.player.*;
+import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import org.bukkit.inventory.ItemStack;
+
+
+public class EssentialsPlayerListener extends PlayerListener
+{
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+	private final transient Server server;
+	private final transient IEssentials ess;
+
+	public EssentialsPlayerListener(final IEssentials parent)
+	{
+		this.ess = parent;
+		this.server = parent.getServer();
+	}
+
+	@Override
+	public void onPlayerRespawn(final PlayerRespawnEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		updateCompass(user);
+		if (ess.getSettings().changeDisplayName())
+		{
+			user.setDisplayNick();
+		}
+	}
+
+	@Override
+	public void onPlayerChat(final PlayerChatEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		if (user.isMuted())
+		{
+			event.setCancelled(true);
+			user.sendMessage(_("playerMuted"));
+			LOGGER.info(_("mutedUserSpeaks", user.getName()));
+		}
+		final Iterator<Player> it = event.getRecipients().iterator();
+		while (it.hasNext())
+		{
+			final User u = ess.getUser(it.next());
+			if (u.isIgnoredPlayer(user.getName()))
+			{
+				it.remove();
+			}
+		}
+		user.updateActivity(true);
+		if (ess.getSettings().changeDisplayName())
+		{
+			user.setDisplayNick();
+		}
+	}
+
+	@Override
+	public void onPlayerMove(final PlayerMoveEvent event)
+	{
+		if (event.isCancelled())
+		{
+			return;
+		}
+		final User user = ess.getUser(event.getPlayer());
+
+		if (user.isAfk() && ess.getSettings().getFreezeAfkPlayers())
+		{
+			final Location from = event.getFrom();
+			final Location to = event.getTo().clone();
+			to.setX(from.getX());
+			to.setY(from.getY());
+			to.setZ(from.getZ());
+			try
+			{
+				event.setTo(Util.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);
+		}
+	}
+
+	@Override
+	public void onPlayerQuit(final PlayerQuitEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		if (ess.getSettings().removeGodOnDisconnect() && user.isGodModeEnabled())
+		{
+			user.toggleGodModeEnabled();
+		}
+		if (user.getSavedInventory() != null)
+		{
+			user.getInventory().setContents(user.getSavedInventory());
+			user.setSavedInventory(null);
+		}
+		user.updateActivity(false);
+		user.dispose();
+	}
+
+	@Override
+	public void onPlayerJoin(final PlayerJoinEvent event)
+	{
+		ess.getBackup().onPlayerJoin();
+		final User user = ess.getUser(event.getPlayer());
+
+		if (ess.getSettings().changeDisplayName())
+		{
+			user.setDisplayNick();
+		}
+		user.setLastLoginAddress(user.getAddress().getAddress().getHostAddress());
+		user.updateActivity(false);
+		if (user.isAuthorized("essentials.sleepingignored"))
+		{
+			user.setSleepingIgnored(true);
+		}
+
+		if (!ess.getSettings().isCommandDisabled("motd") && user.isAuthorized("essentials.motd"))
+		{
+			try
+			{
+				final IText input = new TextInput(user, "motd", true, ess);
+				final IText output = new KeywordReplacer(input, user, ess);
+				final TextPager pager = new TextPager(output, true);
+				pager.showPage("1", null, "motd", user);
+			}
+			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(_("noNewMail"));
+			}
+			else
+			{
+				user.sendMessage(_("youHaveNewMail", mail.size()));
+			}
+		}
+	}
+
+	@Override
+	public void onPlayerLogin(final PlayerLoginEvent event)
+	{
+		if (event.getResult() != Result.ALLOWED && event.getResult() != Result.KICK_FULL && event.getResult() != Result.KICK_BANNED)
+		{
+			LOGGER.log(Level.INFO, "Disconnecting user " + event.getPlayer().toString() + " due to " + event.getResult().toString());
+			return;
+		}
+		User user = ess.getUser(event.getPlayer());
+		user.setNPC(false);
+
+		final long currentTime = System.currentTimeMillis();
+		final boolean banExpired = user.checkBanTimeout(currentTime);
+		user.checkMuteTimeout(currentTime);
+		user.checkJailTimeout(currentTime);
+
+		if (banExpired == false && (user.isBanned() || event.getResult() == Result.KICK_BANNED))
+		{
+			final String banReason = user.getBanReason();
+			event.disallow(Result.KICK_BANNED, banReason != null && !banReason.isEmpty() && !banReason.equalsIgnoreCase("ban") ? banReason : _("defaultBanReason"));
+			return;
+		}
+
+		if (server.getOnlinePlayers().length >= server.getMaxPlayers() && !user.isAuthorized("essentials.joinfullserver"))
+		{
+			event.disallow(Result.KICK_FULL, _("serverFull"));
+			return;
+		}
+		event.allow();
+
+		user.setLastLogin(System.currentTimeMillis());
+		updateCompass(user);
+	}
+
+	private void updateCompass(final User user)
+	{
+		Location loc = user.getHome(user.getLocation());
+		if (loc == null)
+		{
+			loc = user.getBedSpawnLocation();
+		}
+		if (loc != null)
+		{
+			user.setCompassTarget(loc);
+		}
+	}
+
+	@Override
+	public void onPlayerTeleport(PlayerTeleportEvent event)
+	{
+		if (event.isCancelled())
+		{
+			return;
+		}
+
+		final User user = ess.getUser(event.getPlayer());
+		//There is TeleportCause.COMMMAND but plugins have to actively pass the cause in on their teleports.
+		if ((event.getCause() == TeleportCause.PLUGIN || event.getCause() == TeleportCause.COMMAND) && ess.getSettings().registerBackInListener())
+		{
+			user.setLastLocation();
+		}
+
+		if (ess.getSettings().changeDisplayName())
+		{
+			user.setDisplayNick();
+		}
+		updateCompass(user);
+	}
+
+	@Override
+	public void onPlayerEggThrow(final PlayerEggThrowEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		final ItemStack is = new ItemStack(Material.EGG, 1);
+		if (user.hasUnlimited(is))
+		{
+			user.getInventory().addItem(is);
+			user.updateInventory();
+		}
+	}
+
+	@Override
+	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.updateInventory();
+				}
+			});
+		}
+	}
+
+	@Override
+	public void onPlayerAnimation(final PlayerAnimationEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		user.updateActivity(true);
+		usePowertools(event);
+	}
+
+	private void usePowertools(final PlayerAnimationEvent event)
+	{
+		if (event.getAnimationType() != PlayerAnimationType.ARM_SWING)
+		{
+			return;
+		}
+		final User user = ess.getUser(event.getPlayer());
+		final ItemStack is = user.getItemInHand();
+		if (is == null || is.getType() == Material.AIR || !user.arePowerToolsEnabled())
+		{
+			return;
+		}
+		final List<String> commandList = user.getPowertool(is);
+		if (commandList == null || commandList.isEmpty())
+		{
+			return;
+		}
+
+		// We need to loop through each command and execute
+		for (String command : commandList)
+		{
+			if (command.matches(".*\\{player\\}.*"))
+			{
+				//user.sendMessage("Click a player to use this command");
+				continue;
+			}
+			else if (command.startsWith("c:"))
+			{
+				user.chat(command.substring(2));
+			}
+			else
+			{
+				user.getServer().dispatchCommand(event.getPlayer(), command);
+			}
+		}
+	}
+
+	@Override
+	public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event)
+	{
+		if (event.isCancelled())
+		{
+			return;
+		}
+		final User user = ess.getUser(event.getPlayer());
+		final String cmd = event.getMessage().toLowerCase(Locale.ENGLISH).split(" ")[0].replace("/", "").toLowerCase(Locale.ENGLISH);
+		final List<String> commands = Arrays.asList("msg", "r", "mail", "m", "t", "emsg", "tell", "er", "reply", "ereply", "email");
+		if (commands.contains(cmd))
+		{
+			for (Player player : ess.getServer().getOnlinePlayers())
+			{
+				User spyer = ess.getUser(player);
+				if (spyer.isSocialSpyEnabled() && !user.equals(spyer))
+				{
+					player.sendMessage(user.getDisplayName() + " : " + event.getMessage());
+				}
+			}
+		}
+		if (!cmd.equalsIgnoreCase("afk"))
+		{
+			user.updateActivity(true);
+		}
+	}
+
+	@Override
+	public void onPlayerChangedWorld(final PlayerChangedWorldEvent event)
+	{
+		if (ess.getSettings().getNoGodWorlds().contains(event.getPlayer().getLocation().getWorld().getName()))
+		{
+			User user = ess.getUser(event.getPlayer());
+			if (user.isGodModeEnabledRaw())
+			{
+				user.sendMessage(_("noGodWorldWarning"));
+			}
+		}
+	}
+
+	@Override
+	public void onPlayerInteract(final PlayerInteractEvent event)
+	{
+		if (event.isCancelled())
+		{
+			return;
+		}
+		if (event.getAction() != Action.RIGHT_CLICK_BLOCK)
+		{
+			return;
+		}
+
+		if (ess.getSettings().getUpdateBedAtDaytime() && event.getClickedBlock().getType() == Material.BED_BLOCK)
+		{
+			SetBed.setBed(event.getPlayer(), event.getClickedBlock());
+		}
+	}
+
+	@Override
+	public void onPlayerPickupItem(PlayerPickupItemEvent event)
+	{
+		if (event.isCancelled() || !ess.getSettings().getDisableItemPickupWhileAfk())
+		{
+			return;
+		}
+		final User user = ess.getUser(event.getPlayer());
+		if (user.isAfk())
+		{
+			event.setCancelled(true);
+		}
+	}
+}

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

@@ -0,0 +1,50 @@
+package com.earth2me.essentials;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.event.server.PluginDisableEvent;
+import org.bukkit.event.server.PluginEnableEvent;
+import org.bukkit.event.server.ServerListener;
+
+
+public class EssentialsPluginListener extends ServerListener implements IConf
+{
+	private final transient IEssentials ess;
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+
+	public EssentialsPluginListener(final IEssentials ess)
+	{
+		this.ess = ess;
+	}
+
+	@Override
+	public void onPluginEnable(final PluginEnableEvent event)
+	{
+		ess.getPermissionsHandler().checkPermissions();
+		ess.getAlternativeCommandsHandler().addPlugin(event.getPlugin());
+		if (!ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().setMethod(ess.getServer().getPluginManager()))
+		{
+			LOGGER.log(Level.INFO, "[Essentials] Payment method found (" + ess.getPaymentMethod().getMethod().getName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
+		}
+	}
+
+	@Override
+	public void onPluginDisable(final PluginDisableEvent event)
+	{
+		ess.getPermissionsHandler().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 && ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().checkDisabled(event.getPlugin()))
+		{
+			ess.getPaymentMethod().reset();
+			LOGGER.log(Level.INFO, "[Essentials] 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

@@ -1,23 +1,15 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import com.earth2me.essentials.user.UserData.TimestampType;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Set;
-import java.util.logging.Level;
 import org.bukkit.entity.Player;
 
 
 public class EssentialsTimer implements Runnable
 {
 	private final transient IEssentials ess;
-	private final transient Set<IUser> onlineUsers = new HashSet<IUser>();
+	private final transient Set<User> onlineUsers = new HashSet<User>();
 
 	EssentialsTimer(final IEssentials ess)
 	{
@@ -30,48 +22,19 @@ public class EssentialsTimer implements Runnable
 		final long currentTime = System.currentTimeMillis();
 		for (Player player : ess.getServer().getOnlinePlayers())
 		{
-
-			try
-			{
-				final IUser user = ess.getUser(player);
-				onlineUsers.add(user);
-				user.setLastOnlineActivity(currentTime);
-				user.checkActivity();
-
-				boolean mailDisabled = false;
-				ISettings settings = ess.getSettings();
-				settings.acquireReadLock();
-				try
-				{
-					mailDisabled = settings.getData().getCommands().isDisabled("mail");
-				}
-				finally
-				{
-					settings.unlock();
-				}
-				// New mail notification
-				if (user != null && !mailDisabled && Permissions.MAIL.isAuthorized(user) && !user.gotMailInfo())
-				{
-					final List<String> mail = user.getMails();
-					if (mail != null && !mail.isEmpty())
-					{
-						user.sendMessage(_("youHaveNewMail", mail.size()));
-					}
-				}
-			}
-			catch (Exception e)
-			{
-				ess.getLogger().log(Level.WARNING, "EssentialsTimer Error:", e);
-			}
+			final User user = ess.getUser(player);
+			onlineUsers.add(user);
+			user.setLastOnlineActivity(currentTime);
+			user.checkActivity();
 		}
 
-		final Iterator<IUser> iterator = onlineUsers.iterator();
+		final Iterator<User> iterator = onlineUsers.iterator();
 		while (iterator.hasNext())
 		{
-			final IUser user = iterator.next();
-			if (user.getLastOnlineActivity() < currentTime && user.getLastOnlineActivity() > user.getTimestamp(TimestampType.LOGOUT))
+			final User user = iterator.next();
+			if (user.getLastOnlineActivity() < currentTime && user.getLastOnlineActivity() > user.getLastLogout())
 			{
-				user.setTimestamp(TimestampType.LOGOUT, user.getLastOnlineActivity());
+				user.setLastLogout(user.getLastOnlineActivity());
 				iterator.remove();
 				continue;
 			}

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

@@ -1,11 +1,9 @@
 package com.earth2me.essentials;
 
-import com.earth2me.essentials.storage.ManagedFile;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
+import com.earth2me.essentials.craftbukkit.FakeWorld;
 import com.earth2me.essentials.settings.Spawns;
-import com.earth2me.essentials.storage.Location;
 import com.earth2me.essentials.storage.YamlStorageWriter;
+import static com.earth2me.essentials.I18n._;
 import java.io.*;
 import java.math.BigInteger;
 import java.security.DigestInputStream;
@@ -14,12 +12,12 @@ import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Bukkit;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.inventory.ItemStack;
 
 
-@Deprecated
 public class EssentialsUpgrade
 {
 	private final static Logger LOGGER = Logger.getLogger("Minecraft");
@@ -52,7 +50,7 @@ public class EssentialsUpgrade
 			}
 			final EssentialsConf conf = new EssentialsConf(configFile);
 			conf.load();
-			final Worth worth = new Worth(ess);
+			final Worth worth = new Worth(ess.getDataFolder());
 			boolean found = false;
 			for (Material mat : Material.values())
 			{
@@ -97,7 +95,7 @@ public class EssentialsUpgrade
 			}
 			final EssentialsConf conf = new EssentialsConf(configFile);
 			conf.load();
-			List<String> lines = conf.getStringList(name);
+			List<String> lines = conf.getStringList(name, null);
 			if (lines != null && !lines.isEmpty())
 			{
 				if (!file.createNewFile())
@@ -212,10 +210,14 @@ public class EssentialsUpgrade
 						continue;
 					}
 					World world = ess.getServer().getWorlds().get(0);
+					if (vals.size() > 5)
+					{
+						world = ess.getServer().getWorld((String)vals.get(5));
+					}
 					if (world != null)
 					{
 						final Location loc = new Location(
-								(String)vals.get(5),
+								world,
 								((Number)vals.get(0)).doubleValue(),
 								((Number)vals.get(1)).doubleValue(),
 								((Number)vals.get(2)).doubleValue(),
@@ -330,7 +332,7 @@ public class EssentialsUpgrade
 						config.setProperty("homes.home", defloc);
 					}
 
-					Set<String> worlds = config.getConfigurationSection("home.worlds").getKeys(false);
+					List<String> worlds = config.getKeys("home.worlds");
 					Location loc;
 					String worldName;
 
@@ -349,7 +351,7 @@ public class EssentialsUpgrade
 						{
 							continue;
 						}
-						worldName = loc.getWorldName().toLowerCase(Locale.ENGLISH);
+						worldName = loc.getWorld().getName().toLowerCase(Locale.ENGLISH);
 						if (worldName != null && !worldName.isEmpty())
 						{
 							config.setProperty("homes." + worldName, loc);
@@ -370,21 +372,53 @@ public class EssentialsUpgrade
 		doneFile.save();
 	}
 
-	/*
-	 * private void moveUsersDataToUserdataFolder() { final File usersFile = new File(ess.getDataFolder(), "users.yml");
-	 * if (!usersFile.exists()) { return; } final EssentialsConf usersConfig = new EssentialsConf(usersFile);
-	 * usersConfig.load(); for (String username : usersConfig.getKeys(null)) { final User user = new User(new
-	 * OfflinePlayer(username, ess), ess); final String nickname = usersConfig.getString(username + ".nickname"); if
-	 * (nickname != null && !nickname.isEmpty() && !nickname.equals(username)) { user.setNickname(nickname); } final
-	 * List<String> mails = usersConfig.getStringList(username + ".mail", null); if (mails != null && !mails.isEmpty())
-	 * { user.setMails(mails); } if (!user.hasHome()) { @SuppressWarnings("unchecked") final List<Object> vals =
-	 * (List<Object>)usersConfig.getProperty(username + ".home"); if (vals != null) { World world =
-	 * ess.getServer().getWorlds().get(0); if (vals.size() > 5) { world = getFakeWorld((String)vals.get(5)); } if (world
-	 * != null) { user.setHome("home", new Location(world, ((Number)vals.get(0)).doubleValue(),
-	 * ((Number)vals.get(1)).doubleValue(), ((Number)vals.get(2)).doubleValue(), ((Number)vals.get(3)).floatValue(),
-	 * ((Number)vals.get(4)).floatValue())); } } } } usersFile.renameTo(new File(usersFile.getAbsolutePath() + ".old"));
-	 * }
-	 */
+	private void moveUsersDataToUserdataFolder()
+	{
+		final File usersFile = new File(ess.getDataFolder(), "users.yml");
+		if (!usersFile.exists())
+		{
+			return;
+		}
+		final EssentialsConf usersConfig = new EssentialsConf(usersFile);
+		usersConfig.load();
+		for (String username : usersConfig.getKeys(null))
+		{
+			final User user = new User(new OfflinePlayer(username, ess), ess);
+			final String nickname = usersConfig.getString(username + ".nickname");
+			if (nickname != null && !nickname.isEmpty() && !nickname.equals(username))
+			{
+				user.setNickname(nickname);
+			}
+			final List<String> mails = usersConfig.getStringList(username + ".mail", null);
+			if (mails != null && !mails.isEmpty())
+			{
+				user.setMails(mails);
+			}
+			if (!user.hasHome())
+			{
+				@SuppressWarnings("unchecked")
+				final List<Object> vals = (List<Object>)usersConfig.getProperty(username + ".home");
+				if (vals != null)
+				{
+					World world = ess.getServer().getWorlds().get(0);
+					if (vals.size() > 5)
+					{
+						world = getFakeWorld((String)vals.get(5));
+					}
+					if (world != null)
+					{
+						user.setHome("home", new Location(world,
+														  ((Number)vals.get(0)).doubleValue(),
+														  ((Number)vals.get(1)).doubleValue(),
+														  ((Number)vals.get(2)).doubleValue(),
+														  ((Number)vals.get(3)).floatValue(),
+														  ((Number)vals.get(4)).floatValue()));
+					}
+				}
+			}
+		}
+		usersFile.renameTo(new File(usersFile.getAbsolutePath() + ".old"));
+	}
 
 	private void convertWarps()
 	{
@@ -440,16 +474,31 @@ public class EssentialsUpgrade
 						{
 							rx.close();
 						}
-						if (worldName != null)
+						World w = null;
+						for (World world : ess.getServer().getWorlds())
 						{
-							final Location loc = new Location(worldName, x, y, z, yaw, pitch);
-							((Warps)ess.getWarps()).setWarp(filename.substring(0, filename.length() - 4), loc);
-							if (!listOfFiles[i].renameTo(new File(warpsFolder, filename + ".old")))
+							if (world.getEnvironment() != World.Environment.NETHER)
 							{
-								throw new Exception(_("fileRenameError", filename));
+								w = world;
+								break;
 							}
 						}
-
+						if (worldName != null)
+						{
+							worldName = worldName.trim();
+							World w1 = null;
+							w1 = getFakeWorld(worldName);
+							if (w1 != null)
+							{
+								w = w1;
+							}
+						}
+						final Location loc = new Location(w, x, y, z, yaw, pitch);
+						ess.getWarps().setWarp(filename.substring(0, filename.length() - 4), loc);
+						if (!listOfFiles[i].renameTo(new File(warpsFolder, filename + ".old")))
+						{
+							throw new Exception(_("fileRenameError", filename));
+						}
 					}
 					catch (Exception ex)
 					{
@@ -459,7 +508,7 @@ public class EssentialsUpgrade
 			}
 
 		}
-		/*final File warpFile = new File(ess.getDataFolder(), "warps.txt");
+		final File warpFile = new File(ess.getDataFolder(), "warps.txt");
 		if (warpFile.exists())
 		{
 			try
@@ -492,7 +541,7 @@ public class EssentialsUpgrade
 								break;
 							}
 						}
-						final Location loc = new Location(name, x, y, z, yaw, pitch);
+						final Location loc = new Location(w, x, y, z, yaw, pitch);
 						ess.getWarps().setWarp(name, loc);
 						if (!warpFile.renameTo(new File(ess.getDataFolder(), "warps.txt.old")))
 						{
@@ -509,30 +558,65 @@ public class EssentialsUpgrade
 			{
 				LOGGER.log(Level.SEVERE, null, ex);
 			}
-		}*/
+		}
 	}
 
-	/*
-	 * 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 (int i = 0; i < listOfFiles.length; i++) { final String
-	 * filename = listOfFiles[i].getName(); if (!listOfFiles[i].isFile() || !filename.endsWith(".yml")) { continue; }
-	 * final String sanitizedFilename = Util.sanitizeFileName(filename.substring(0, filename.length() - 4)) + ".yml"; if
-	 * (sanitizedFilename.equals(filename)) { continue; } final File tmpFile = new File(listOfFiles[i].getParentFile(),
-	 * sanitizedFilename + ".tmp"); final File newFile = new File(listOfFiles[i].getParentFile(), sanitizedFilename); if
-	 * (!listOfFiles[i].renameTo(tmpFile)) { LOGGER.log(Level.WARNING, _("userdataMoveError", filename,
-	 * sanitizedFilename)); continue; } if (newFile.exists()) { LOGGER.log(Level.WARNING, _("duplicatedUserdata",
-	 * filename, sanitizedFilename)); continue; } if (!tmpFile.renameTo(newFile)) { LOGGER.log(Level.WARNING,
-	 * _("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;
+	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 (int i = 0; i < listOfFiles.length; i++)
+		{
+			final String filename = listOfFiles[i].getName();
+			if (!listOfFiles[i].isFile() || !filename.endsWith(".yml"))
+			{
+				continue;
+			}
+			final String sanitizedFilename = Util.sanitizeFileName(filename.substring(0, filename.length() - 4)) + ".yml";
+			if (sanitizedFilename.equals(filename))
+			{
+				continue;
+			}
+			final File tmpFile = new File(listOfFiles[i].getParentFile(), sanitizedFilename + ".tmp");
+			final File newFile = new File(listOfFiles[i].getParentFile(), sanitizedFilename);
+			if (!listOfFiles[i].renameTo(tmpFile))
+			{
+				LOGGER.log(Level.WARNING, _("userdataMoveError", filename, sanitizedFilename));
+				continue;
+			}
+			if (newFile.exists())
+			{
+				LOGGER.log(Level.WARNING, _("duplicatedUserdata", filename, sanitizedFilename));
+				continue;
+			}
+			if (!tmpFile.renameTo(newFile))
+			{
+				LOGGER.log(Level.WARNING, _("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");
@@ -540,7 +624,12 @@ public class EssentialsUpgrade
 		{
 			return null;
 		}
-		return new Location(worldName,
+		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),
@@ -612,7 +701,7 @@ public class EssentialsUpgrade
 				if (!config.hasProperty("spawns"))
 				{
 					final Spawns spawns = new Spawns();
-					Set<String> keys = config.getKeys(false);
+					List<String> keys = config.getKeys();
 					for (String group : keys)
 					{
 						Location loc = getFakeLocation(config, group);
@@ -641,7 +730,7 @@ public class EssentialsUpgrade
 		doneFile.setProperty("updateSpawnsToNewSpawnsConfig", true);
 		doneFile.save();
 	}
-
+	
 	private void updateJailsToNewJailsConfig()
 	{
 		if (doneFile.getBoolean("updateJailsToNewJailsConfig", false))
@@ -659,7 +748,7 @@ public class EssentialsUpgrade
 				if (!config.hasProperty("jails"))
 				{
 					final com.earth2me.essentials.settings.Jails jails = new com.earth2me.essentials.settings.Jails();
-					Set<String> keys = config.getKeys(false);
+					List<String> keys = config.getKeys();
 					for (String jailName : keys)
 					{
 						Location loc = getFakeLocation(config, jailName);
@@ -702,10 +791,9 @@ public class EssentialsUpgrade
 
 	public void afterSettings()
 	{
-		//TODO?
-		//sanitizeAllUserFilenames();
+		sanitizeAllUserFilenames();
 		updateUsersToNewDefaultHome();
-		//moveUsersDataToUserdataFolder();
+		moveUsersDataToUserdataFolder();
 		convertWarps();
 		updateUsersPowerToolsFormat();
 		updateUsersHomesFormat();

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

@@ -1,6 +1,5 @@
 package com.earth2me.essentials;
 
-import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.II18n;
 import java.io.File;
 import java.io.FileInputStream;
@@ -44,7 +43,6 @@ public class I18n implements II18n
 		instance = null;
 	}
 
-	@Override
 	public Locale getCurrentLocale()
 	{
 		return currentLocale;

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

@@ -0,0 +1,9 @@
+package com.earth2me.essentials;
+
+/**
+ * @deprecated New interface will be IReload in api package
+ */
+@Deprecated
+public interface IConf {
+	public void reloadConfig();
+}

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

@@ -0,0 +1,67 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.api.IJails;
+import com.earth2me.essentials.perm.PermissionsHandler;
+import com.earth2me.essentials.register.payment.Methods;
+import org.bukkit.World;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitScheduler;
+
+/**
+ * @deprecated This will be moved to the api package soon
+ */
+@Deprecated
+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);
+
+	User getUser(Object base);
+
+	I18n getI18n();
+
+	User getOfflineUser(String name);
+
+	World getWorld(String name);
+
+	int broadcastMessage(IUser sender, String message);
+
+	ISettings getSettings();
+
+	BukkitScheduler getScheduler();
+
+	IJails getJails();
+
+	Warps getWarps();
+
+	Worth getWorth();
+
+	Backup getBackup();
+
+	Methods getPaymentMethod();
+
+	int scheduleAsyncDelayedTask(Runnable run);
+
+	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 CommandSender sender, final Throwable exception, final String commandLabel);
+
+	ItemDb getItemDb();
+
+	UserMap getUserMap();
+}

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

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

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

@@ -0,0 +1,9 @@
+package com.earth2me.essentials;
+
+import org.bukkit.command.CommandSender;
+
+public interface IReplyTo {
+	public void setReplyTo(CommandSender user);
+
+	public CommandSender getReplyTo();
+}

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

@@ -0,0 +1,156 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.bukkit.ChatColor;
+import org.bukkit.event.Event.Priority;
+
+
+public interface ISettings extends IConf
+{
+	boolean areSignsDisabled();
+
+	String format(String format, IUser user);
+
+	String getAnnounceNewPlayerFormat(IUser user);
+
+	boolean getAnnounceNewPlayers();
+
+	String getBackupCommand();
+
+	long getBackupInterval();
+
+	String getChatFormat(String group);
+
+	int getChatRadius();
+
+	double getCommandCost(IEssentialsCommand cmd);
+
+	double getCommandCost(String label);
+
+	String getCurrencySymbol();
+
+	int getOversizedStackSize();
+	
+	int getDefaultStackSize();
+
+	double getHealCooldown();
+
+	Object getKit(String name);
+
+	Map<String, Object> getKits();
+
+	String getLocale();
+
+	String getNewbieSpawn();
+
+	String getNicknamePrefix();
+
+	ChatColor getOperatorColor() throws Exception;
+
+	boolean getPerWarpPermission();
+
+	boolean getProtectBoolean(final String configName, boolean def);
+
+	int getProtectCreeperMaxHeight();
+
+	List<Integer> getProtectList(final String configName);
+
+	boolean getProtectPreventSpawn(final String creatureName);
+
+	String getProtectString(final String configName);
+
+	boolean getRespawnAtHome();
+
+	List getMultipleHomes();
+
+	int getHomeLimit(String set);
+
+	int getHomeLimit(User user);
+
+	boolean getSortListByGroups();
+
+	int getSpawnMobLimit();
+
+	int getStartingBalance();
+
+	double getTeleportCooldown();
+
+	double getTeleportDelay();
+
+	boolean hidePermissionlessHelp();
+
+	boolean isCommandDisabled(final IEssentialsCommand cmd);
+
+	boolean isCommandDisabled(String label);
+
+	boolean isCommandOverridden(String name);
+
+	boolean isCommandRestricted(IEssentialsCommand cmd);
+
+	boolean isCommandRestricted(String label);
+
+	boolean isDebug();
+
+	boolean isEcoDisabled();
+
+	boolean isTradeInStacks(int id);
+
+	List<Integer> itemSpawnBlacklist();
+
+	boolean permissionBasedItemSpawn();
+
+	boolean showNonEssCommandsInHelp();
+
+	boolean spawnIfNoHome();
+
+	boolean warnOnBuildDisallow();
+
+	boolean warnOnSmite();
+
+	double getMaxMoney();
+
+	boolean isEcoLogEnabled();
+
+	boolean removeGodOnDisconnect();
+
+	boolean changeDisplayName();
+
+	boolean isPlayerCommand(String string);
+
+	boolean useBukkitPermissions();
+
+	boolean addPrefixSuffix();
+
+	boolean disablePrefix();
+
+	boolean disableSuffix();
+
+	long getAutoAfk();
+
+	long getAutoAfkKick();
+
+	boolean getFreezeAfkPlayers();
+
+	boolean areDeathMessagesEnabled();
+
+	public void setDebug(boolean debug);
+
+	Set<String> getNoGodWorlds();
+	
+	boolean getUpdateBedAtDaytime();
+	
+	boolean getRepairEnchanted();
+	
+	boolean getIsWorldTeleportPermissions();
+	
+	boolean registerBackInListener();
+
+	public boolean getDisableItemPickupWhileAfk();
+
+	public Priority getRespawnPriority();
+	
+	long getTpaAcceptCancellation();
+}

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

@@ -0,0 +1,49 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import java.net.InetSocketAddress;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.PlayerInventory;
+
+
+/**
+ * @deprecated This will be moved to the api package soon
+ */
+@Deprecated
+public interface IUser extends Player
+{
+	long getLastTeleportTimestamp();
+
+	boolean isAuthorized(String node);
+
+	boolean isAuthorized(IEssentialsCommand cmd);
+
+	boolean isAuthorized(IEssentialsCommand cmd, String permissionPrefix);
+
+	void setLastTeleportTimestamp(long time);
+
+	Location getLastLocation();
+
+	Player getBase();
+
+	double getMoney();
+
+	void takeMoney(double value);
+
+	void giveMoney(double value);
+
+	String getGroup();
+
+	void setLastLocation();
+
+	Location getHome(String name) throws Exception;
+
+	Location getHome(Location loc) throws Exception;
+
+	boolean isHidden();
+
+	Teleport getTeleport();
+
+	void setJail(String jail);
+}

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

@@ -1,22 +1,16 @@
 package com.earth2me.essentials;
 
-import com.earth2me.essentials.storage.ManagedFile;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IItemDb;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import static com.earth2me.essentials.I18n._;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.regex.Pattern;
-import lombok.Cleanup;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
 
-public class ItemDb implements IItemDb
+public class ItemDb implements IConf, IItemDb
 {
 	private final transient IEssentials ess;
 
@@ -25,12 +19,12 @@ public class ItemDb implements IItemDb
 		this.ess = ess;
 		file = new ManagedFile("items.csv", ess);
 	}
-	private final transient Map<String, Long> items = new HashMap<String, Long>();
+	private final transient Map<String, Integer> items = new HashMap<String, Integer>();
+	private final transient Map<String, Short> durabilities = new HashMap<String, Short>();
 	private final transient ManagedFile file;
-	private static final Pattern SPLIT = Pattern.compile("[^a-zA-Z0-9]");
 
 	@Override
-	public void onReload()
+	public void reloadConfig()
 	{
 		final List<String> lines = file.getLines();
 
@@ -39,54 +33,30 @@ public class ItemDb implements IItemDb
 			return;
 		}
 
+		durabilities.clear();
 		items.clear();
 
 		for (String line : lines)
 		{
-			line = line.trim();
+			line = line.trim().toLowerCase(Locale.ENGLISH);
 			if (line.length() > 0 && line.charAt(0) == '#')
 			{
 				continue;
 			}
 
-			final String[] parts = SPLIT.split(line);
+			final String[] parts = line.split("[^a-z0-9]");
 			if (parts.length < 2)
 			{
 				continue;
 			}
 
-			final long numeric = Integer.parseInt(parts[1]);
+			final int numeric = Integer.parseInt(parts[1]);
 
-			final long durability = parts.length > 2 && !(parts[2].length() == 1 && parts[2].charAt(0) == '0') ? Short.parseShort(parts[2]) : 0;
-			items.put(parts[0].toLowerCase(Locale.ENGLISH), numeric | (durability << 32));
+			durabilities.put(parts[0].toLowerCase(Locale.ENGLISH), parts.length > 2 && !parts[2].equals("0") ? Short.parseShort(parts[2]) : 0);
+			items.put(parts[0].toLowerCase(Locale.ENGLISH), numeric);
 		}
 	}
 
-	public ItemStack get(final String id, final IUser user) throws Exception
-	{
-		final ItemStack stack = get(id.toLowerCase(Locale.ENGLISH));
-
-		@Cleanup
-		com.earth2me.essentials.api.ISettings settings = ess.getSettings();
-		settings.acquireReadLock();
-
-		final int defaultStackSize = settings.getData().getGeneral().getDefaultStacksize();
-
-		if (defaultStackSize > 0)
-		{
-			stack.setAmount(defaultStackSize);
-		}
-		else
-		{
-			final int oversizedStackSize = settings.getData().getGeneral().getOversizedStacksize();
-			if (oversizedStackSize > 0 && Permissions.OVERSIZEDSTACKS.isAuthorized(user))
-			{
-				stack.setAmount(oversizedStackSize);
-			}
-		}
-		return stack;
-	}
-
 	public ItemStack get(final String id, final int quantity) throws Exception
 	{
 		final ItemStack retval = get(id.toLowerCase(Locale.ENGLISH));
@@ -122,11 +92,10 @@ public class ItemDb implements IItemDb
 		{
 			if (items.containsKey(itemname))
 			{
-				long item = items.get(itemname);
-				itemid = (int)(item & 0xffffffffL);
-				if (metaData == 0)
+				itemid = items.get(itemname);
+				if (durabilities.containsKey(itemname) && metaData == 0)
 				{
-					metaData = (short)((item >> 32) & 0xffffL);
+					metaData = durabilities.get(itemname);
 				}
 			}
 			else if (Material.getMaterial(itemname) != null)

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

@@ -1,27 +1,18 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IJails;
-import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
+import static com.earth2me.essentials.I18n._;
 import java.io.File;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import lombok.Cleanup;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-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.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerRespawnEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.Event.Priority;
+import org.bukkit.event.Event.Type;
+import org.bukkit.event.block.*;
+import org.bukkit.event.player.*;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.plugin.PluginManager;
 
@@ -33,7 +24,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 	public Jails(final IEssentials ess)
 	{
 		super(ess, com.earth2me.essentials.settings.Jails.class);
-		onReload();
+		reloadConfig();
 		registerListeners();
 	}
 
@@ -42,8 +33,13 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		final PluginManager pluginManager = ess.getServer().getPluginManager();
 		final JailBlockListener blockListener = new JailBlockListener();
 		final JailPlayerListener playerListener = new JailPlayerListener();
-		pluginManager.registerEvents(blockListener, ess);
-		pluginManager.registerEvents(playerListener, ess);
+		pluginManager.registerEvent(Type.BLOCK_BREAK, blockListener, Priority.Low, ess);
+		pluginManager.registerEvent(Type.BLOCK_DAMAGE, blockListener, Priority.Low, ess);
+		pluginManager.registerEvent(Type.BLOCK_PLACE, blockListener, Priority.Low, ess);
+		pluginManager.registerEvent(Type.PLAYER_INTERACT, playerListener, Priority.Low, ess);
+		pluginManager.registerEvent(Type.PLAYER_RESPAWN, playerListener, Priority.High, ess);
+		pluginManager.registerEvent(Type.PLAYER_TELEPORT, playerListener, Priority.High, ess);
+		pluginManager.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.High, ess);
 	}
 
 	@Override
@@ -63,7 +59,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 			{
 				throw new Exception(_("jailNotExist"));
 			}
-			Location loc = getData().getJails().get(jailName.toLowerCase(Locale.ENGLISH)).getBukkitLocation();
+			Location loc = getData().getJails().get(jailName.toLowerCase(Locale.ENGLISH));
 			if (loc == null || loc.getWorld() == null)
 			{
 				throw new Exception(_("jailNotExist"));
@@ -118,20 +114,12 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		acquireReadLock();
 		try
 		{
-			if (!(user.isOnline()))
+			if (!(user.getBase() instanceof OfflinePlayer))
 			{
 				Location loc = getJail(jail);
 				user.getTeleport().now(loc, false, TeleportCause.COMMAND);
 			}
-			user.acquireWriteLock();
-			try
-			{
-				user.getData().setJail(jail);
-			}
-			finally
-			{
-				unlock();
-			}
+			user.setJail(jail);
 		}
 		finally
 		{
@@ -147,9 +135,9 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		{
 			if (getData().getJails() == null)
 			{
-				getData().setJails(new HashMap<String, com.earth2me.essentials.storage.Location>());
+				getData().setJails(new HashMap<String, Location>());
 			}
-			getData().getJails().put(jailName.toLowerCase(Locale.ENGLISH), new com.earth2me.essentials.storage.Location(loc));
+			getData().getJails().put(jailName.toLowerCase(Locale.ENGLISH), loc);
 		}
 		finally
 		{
@@ -158,39 +146,33 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 	}
 
 
-	private class JailBlockListener implements Listener
+	private class JailBlockListener extends BlockListener
 	{
-		@EventHandler(priority = EventPriority.LOW)
+		@Override
 		public void onBlockBreak(final BlockBreakEvent event)
 		{
-			@Cleanup
-			final IUser user = ess.getUser(event.getPlayer());
-			user.acquireReadLock();
-			if (user.getData().isJailed())
+			final User user = ess.getUser(event.getPlayer());
+			if (user.isJailed())
 			{
 				event.setCancelled(true);
 			}
 		}
 
-		@EventHandler(priority = EventPriority.LOW)
+		@Override
 		public void onBlockPlace(final BlockPlaceEvent event)
 		{
-			@Cleanup
-			final IUser user = ess.getUser(event.getPlayer());
-			user.acquireReadLock();
-			if (user.getData().isJailed())
+			final User user = ess.getUser(event.getPlayer());
+			if (user.isJailed())
 			{
 				event.setCancelled(true);
 			}
 		}
 
-		@EventHandler(priority = EventPriority.LOW)
+		@Override
 		public void onBlockDamage(final BlockDamageEvent event)
 		{
-			@Cleanup
-			final IUser user = ess.getUser(event.getPlayer());
-			user.acquireReadLock();
-			if (user.getData().isJailed())
+			final User user = ess.getUser(event.getPlayer());
+			if (user.isJailed())
 			{
 				event.setCancelled(true);
 			}
@@ -198,102 +180,73 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 	}
 
 
-	private class JailPlayerListener implements Listener
+	private class JailPlayerListener extends PlayerListener
 	{
-		@EventHandler(priority = EventPriority.LOW)
+		@Override
 		public void onPlayerInteract(final PlayerInteractEvent event)
 		{
-			@Cleanup
-			final IUser user = ess.getUser(event.getPlayer());
-			user.acquireReadLock();
-			if (user.getData().isJailed())
+			final User user = ess.getUser(event.getPlayer());
+			if (user.isJailed())
 			{
 				event.setCancelled(true);
 			}
 		}
 
-		@EventHandler(priority = EventPriority.HIGH)
+		@Override
 		public void onPlayerRespawn(final PlayerRespawnEvent event)
 		{
-			@Cleanup
-			final IUser user = ess.getUser(event.getPlayer());
-			user.acquireReadLock();
-			if (!user.getData().isJailed() || user.getData().getJail() == null || user.getData().getJail().isEmpty())
+			final User user = ess.getUser(event.getPlayer());
+			if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
 			{
 				return;
 			}
 
 			try
 			{
-				event.setRespawnLocation(getJail(user.getData().getJail()));
+				event.setRespawnLocation(getJail(user.getJail()));
 			}
 			catch (Exception ex)
 			{
-				if (ess.getSettings().isDebug())
-				{
-					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
-				}
-				else
-				{
-					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
-				}
+				LOGGER.log(Level.WARNING, _("returnPlayerToJailError"), ex);
 			}
 		}
 
-		@EventHandler(priority = EventPriority.HIGH)
+		@Override
 		public void onPlayerTeleport(final PlayerTeleportEvent event)
 		{
-			@Cleanup
-			final IUser user = ess.getUser(event.getPlayer());
-			user.acquireReadLock();
-			if (!user.getData().isJailed() || user.getData().getJail() == null || user.getData().getJail().isEmpty())
+			final User user = ess.getUser(event.getPlayer());
+			if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
 			{
 				return;
 			}
 
 			try
 			{
-				event.setTo(getJail(user.getData().getJail()));
+				event.setTo(getJail(user.getJail()));
 			}
 			catch (Exception ex)
 			{
-				if (ess.getSettings().isDebug())
-				{
-					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
-				}
-				else
-				{
-					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
-				}
+				LOGGER.log(Level.WARNING, _("returnPlayerToJailError"), ex);
 			}
 			user.sendMessage(_("jailMessage"));
 		}
 
-		@EventHandler(priority = EventPriority.HIGH)
+		@Override
 		public void onPlayerJoin(final PlayerJoinEvent event)
 		{
-			@Cleanup
-			final IUser user = ess.getUser(event.getPlayer());
-			user.acquireReadLock();
-			if (!user.getData().isJailed() || user.getData().getJail() == null || user.getData().getJail().isEmpty())
+			final User user = ess.getUser(event.getPlayer());
+			if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
 			{
 				return;
 			}
 
 			try
 			{
-				sendToJail(user, user.getData().getJail());
+				sendToJail(user, user.getJail());
 			}
 			catch (Exception ex)
 			{
-				if (ess.getSettings().isDebug())
-				{
-					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
-				}
-				else
-				{
-					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
-				}
+				LOGGER.log(Level.WARNING, _("returnPlayerToJailError"), ex);
 			}
 			user.sendMessage(_("jailMessage"));
 		}

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

@@ -0,0 +1,113 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.commands.NoChargeException;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import java.util.*;
+import org.bukkit.Material;
+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 Map<String, Object> kits = ess.getSettings().getKits();
+			final StringBuilder list = new StringBuilder();
+			for (String kiteItem : kits.keySet())
+			{
+				if (user.isAuthorized("essentials.kit." + kiteItem.toLowerCase(Locale.ENGLISH)))
+				{
+					list.append(" ").append(kiteItem);
+				}
+			}
+			return list.toString();
+		}
+		catch (Exception ex)
+		{
+			throw new Exception(_("kitError"));
+		}
+
+	}
+
+	public static void checkTime(final User user, final String kitName, final Map<String, Object> els) throws NoChargeException
+	{
+		final double delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0L;
+		final Calendar c = new GregorianCalendar();
+		c.add(Calendar.SECOND, -(int)delay);
+		c.add(Calendar.MILLISECOND, -(int)((delay * 1000.0) % 1000.0));
+
+		final long mintime = c.getTimeInMillis();
+
+		final Long lastTime = user.getKitTimestamp(kitName);
+		if (lastTime == null || lastTime < mintime)
+		{
+			final Calendar now = new GregorianCalendar();
+			user.setKitTimestamp(kitName, now.getTimeInMillis());
+		}
+		else
+		{
+			final Calendar future = new GregorianCalendar();
+			future.setTimeInMillis(lastTime);
+			future.add(Calendar.SECOND, (int)delay);
+			future.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
+			user.sendMessage(_("kitTimed", Util.formatDateDiff(future.getTimeInMillis())));
+			throw new NoChargeException();
+		}
+	}
+
+	public static List<String> getItems(final User user, final Map<String, Object> els) throws Exception
+	{
+		try
+		{
+			return (List<String>)els.get("items");
+		}
+		catch (Exception e)
+		{
+			user.sendMessage(_("kitError2"));
+			throw new Exception(_("kitErrorHelp"));
+		}
+	}
+
+	public static void expandItems(final IEssentials ess, final User user, final List<String> items) throws Exception
+	{
+		try
+		{
+			boolean spew = false;
+			for (String d : items)
+			{
+				final String[] parts = d.split("[^0-9]+", 3);
+				final int id = Material.getMaterial(Integer.parseInt(parts[0])).getId();
+				final int amount = parts.length > 1 ? Integer.parseInt(parts[parts.length > 2 ? 2 : 1]) : 1;
+				final short data = parts.length > 2 ? Short.parseShort(parts[1]) : 0;
+				final Map<Integer, ItemStack> overfilled;
+				if (user.isAuthorized("essentials.oversizedstacks"))
+				{
+					overfilled = InventoryWorkaround.addItem(user.getInventory(), true, ess.getSettings().getOversizedStackSize(), new ItemStack(id, amount, data));
+				}
+				else
+				{
+					overfilled = InventoryWorkaround.addItem(user.getInventory(), true, new ItemStack(id, amount, data));
+				}
+				for (ItemStack itemStack : overfilled.values())
+				{
+					user.getWorld().dropItemNaturally(user.getLocation(), itemStack);
+					spew = true;
+				}
+			}
+			user.updateInventory();
+			if (spew)
+			{
+				user.sendMessage(_("kitInvFull"));
+			}
+		}
+		catch (Exception e)
+		{
+			user.updateInventory();
+			throw new Exception(_("kitError2"));
+		}
+	}
+}

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

@@ -1,90 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IKits;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.settings.Kit;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-import org.bukkit.inventory.ItemStack;
-
-
-public class Kits extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Kits> implements IKits
-{
-	public Kits(final IEssentials ess)
-	{
-		super(ess, com.earth2me.essentials.settings.Kits.class);
-		onReload();
-	}
-
-	@Override
-	public File getStorageFile() throws IOException
-	{
-		return new File(ess.getDataFolder(), "kits.yml");
-	}
-
-	@Override
-	public Kit getKit(String kitName) throws Exception
-	{
-		acquireReadLock();
-		try
-		{
-			if (getData().getKits() == null || kitName == null
-				|| !getData().getKits().containsKey(kitName.toLowerCase(Locale.ENGLISH)))
-			{
-				throw new Exception(_("kitError2"));
-			}
-			final Kit kit = getData().getKits().get(kitName.toLowerCase(Locale.ENGLISH));
-			if (kit == null)
-			{
-				throw new Exception(_("kitError2"));
-			}
-			return kit;
-		}
-		finally
-		{
-			unlock();
-		}
-	}
-
-	@Override
-	public void sendKit(IUser user, String kitName) throws Exception
-	{
-		final Kit kit = getKit(kitName);
-		sendKit(user, kit);
-	}
-
-	@Override
-	public void sendKit(IUser user, Kit kit) throws Exception
-	{
-		final List<ItemStack> itemList = kit.getItems();		
-		user.giveItems(itemList, true);					
-	}
-
-	@Override
-	public Collection<String> getList() throws Exception
-	{
-		acquireReadLock();
-		try
-		{
-			if (getData().getKits() == null)
-			{
-				return Collections.emptyList();
-			}
-			return new ArrayList<String>(getData().getKits().keySet());
-		}
-		finally
-		{
-			unlock();
-		}
-	}
-
-	@Override
-	public boolean isEmpty()
-	{
-		return getData().getKits().isEmpty();
-	}
-}

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

@@ -1,7 +1,6 @@
-package com.earth2me.essentials.storage;
+package com.earth2me.essentials;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
 import java.io.*;
 import java.math.BigInteger;
 import java.security.DigestInputStream;

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

@@ -0,0 +1,825 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.craftbukkit.OfflineBedLocation;
+import static com.earth2me.essentials.I18n._;
+import java.net.InetSocketAddress;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import lombok.Delegate;
+import org.bukkit.*;
+import org.bukkit.block.Block;
+import org.bukkit.entity.*;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+import org.bukkit.map.MapView;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionAttachment;
+import org.bukkit.permissions.PermissionAttachmentInfo;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.util.Vector;
+
+
+public class OfflinePlayer implements Player
+{
+	private final transient IEssentials ess;
+	private Location location = new Location(null, 0, 0, 0, 0, 0);
+	private World world;
+	private UUID uniqueId = UUID.randomUUID();
+	@Delegate(types = org.bukkit.OfflinePlayer.class)
+	private final org.bukkit.OfflinePlayer base;
+
+	public OfflinePlayer(final String name, final IEssentials ess)
+	{
+		this.ess = ess;
+		this.world = ess.getServer().getWorlds().get(0);
+		this.base = ess.getServer().getOfflinePlayer(name);
+	}
+
+	@Override
+	public void sendMessage(final String string)
+	{
+	}
+
+	@Override
+	public String getDisplayName()
+	{
+		return base.getName();
+	}
+
+	@Override
+	public void setDisplayName(String string)
+	{
+	}
+
+	@Override
+	public void setCompassTarget(Location lctn)
+	{
+	}
+
+	@Override
+	public InetSocketAddress getAddress()
+	{
+		return null;
+	}
+
+	@Override
+	public void kickPlayer(String string)
+	{
+	}
+
+	@Override
+	public PlayerInventory getInventory()
+	{
+		return null;
+	}
+
+	@Override
+	public ItemStack getItemInHand()
+	{
+		return null;
+	}
+
+	@Override
+	public void setItemInHand(ItemStack is)
+	{
+	}
+
+	@Override
+	public int getHealth()
+	{
+		return 0;
+	}
+
+	@Override
+	public void setHealth(int i)
+	{
+	}
+
+	@Override
+	public Egg throwEgg()
+	{
+		return null;
+	}
+
+	@Override
+	public Snowball throwSnowball()
+	{
+		return null;
+	}
+
+	@Override
+	public Arrow shootArrow()
+	{
+		return null;
+	}
+
+	@Override
+	public boolean isInsideVehicle()
+	{
+		return false;
+	}
+
+	@Override
+	public boolean leaveVehicle()
+	{
+		return false;
+	}
+
+	@Override
+	public Vehicle getVehicle()
+	{
+		return null;
+	}
+
+	@Override
+	public Location getLocation()
+	{
+		return location;
+	}
+
+	@Override
+	public World getWorld()
+	{
+		return world;
+	}
+
+	public void setLocation(Location loc)
+	{
+		location = loc;
+		world = loc.getWorld();
+	}
+
+	public void teleportTo(Location lctn)
+	{
+	}
+
+	public void teleportTo(Entity entity)
+	{
+	}
+
+	@Override
+	public int getEntityId()
+	{
+		return -1;
+	}
+
+	@Override
+	public boolean performCommand(String string)
+	{
+		return false;
+	}
+
+	public boolean isPlayer()
+	{
+		return false;
+	}
+
+	@Override
+	public int getRemainingAir()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void setRemainingAir(int i)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public int getMaximumAir()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void setMaximumAir(int i)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public boolean isSneaking()
+	{
+		return false;
+	}
+
+	@Override
+	public void setSneaking(boolean bln)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void updateInventory()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void chat(String string)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public double getEyeHeight()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public double getEyeHeight(boolean bln)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public List<Block> getLineOfSight(HashSet<Byte> hs, int i)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public Block getTargetBlock(HashSet<Byte> hs, int i)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public List<Block> getLastTwoTargetBlocks(HashSet<Byte> hs, int i)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public int getFireTicks()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public int getMaxFireTicks()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void setFireTicks(int i)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void remove()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public Server getServer()
+	{
+		return ess == null ? null : ess.getServer();
+	}
+
+	public Vector getMomentum()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	public void setMomentum(Vector vector)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void setVelocity(Vector vector)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public Vector getVelocity()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void damage(int i)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void damage(int i, Entity entity)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public Location getEyeLocation()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void sendRawMessage(String string)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public Location getCompassTarget()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public int getMaximumNoDamageTicks()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void setMaximumNoDamageTicks(int i)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public int getLastDamage()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void setLastDamage(int i)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public int getNoDamageTicks()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void setNoDamageTicks(int i)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public boolean teleport(Location lctn)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public boolean teleport(Entity entity)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public Entity getPassenger()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public boolean setPassenger(Entity entity)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public boolean isEmpty()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public boolean eject()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void saveData()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void loadData()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public boolean isSleeping()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public int getSleepTicks()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public List<Entity> getNearbyEntities(double d, double d1, double d2)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public boolean isDead()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public float getFallDistance()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void setFallDistance(float f)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void setSleepingIgnored(boolean bln)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public boolean isSleepingIgnored()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void awardAchievement(Achievement a)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void incrementStatistic(Statistic ststc)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void incrementStatistic(Statistic ststc, int i)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void incrementStatistic(Statistic ststc, Material mtrl)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void incrementStatistic(Statistic ststc, Material mtrl, int i)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void playNote(Location lctn, byte b, byte b1)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void sendBlockChange(Location lctn, Material mtrl, byte b)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void sendBlockChange(Location lctn, int i, byte b)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void setLastDamageCause(EntityDamageEvent ede)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public EntityDamageEvent getLastDamageCause()
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public void playEffect(Location lctn, Effect effect, int i)
+	{
+		throw new UnsupportedOperationException(_("notSupportedYet"));
+	}
+
+	@Override
+	public boolean sendChunkChange(Location lctn, int i, int i1, int i2, byte[] bytes)
+	{
+		return true;
+	}
+
+	@Override
+	public UUID getUniqueId()
+	{
+		return uniqueId;
+	}
+
+	@Override
+	public void playNote(Location lctn, Instrument i, Note note)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setPlayerTime(long l, boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public long getPlayerTime()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public long getPlayerTimeOffset()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean isPlayerTimeRelative()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void resetPlayerTime()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean isPermissionSet(String string)
+	{
+		return false;
+	}
+
+	@Override
+	public boolean isPermissionSet(Permission prmsn)
+	{
+		return false;
+	}
+
+	@Override
+	public boolean hasPermission(String string)
+	{
+		return false;
+	}
+
+	@Override
+	public boolean hasPermission(Permission prmsn)
+	{
+		return false;
+	}
+
+	@Override
+	public PermissionAttachment addAttachment(Plugin plugin, String string, boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public PermissionAttachment addAttachment(Plugin plugin)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public PermissionAttachment addAttachment(Plugin plugin, String string, boolean bln, int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public PermissionAttachment addAttachment(Plugin plugin, int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void removeAttachment(PermissionAttachment pa)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void recalculatePermissions()
+	{
+	}
+
+	@Override
+	public Set<PermissionAttachmentInfo> getEffectivePermissions()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void sendMap(MapView mv)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public GameMode getGameMode()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setGameMode(GameMode gm)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public int getExperience()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setExperience(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public int getLevel()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setLevel(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public int getTotalExperience()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setTotalExperience(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public float getExhaustion()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setExhaustion(float f)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public float getSaturation()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setSaturation(float f)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public int getFoodLevel()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setFoodLevel(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public Location getBedSpawnLocation()
+	{
+		return OfflineBedLocation.getBedLocation(base.getName(), ess);
+	}
+
+	@Override
+	public boolean isSprinting()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setSprinting(boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setPlayerListName(String name)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public String getPlayerListName()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public int getTicksLived()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setTicksLived(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public int getMaxHealth()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void giveExp(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public float getExp()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setExp(float f)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean teleport(Location lctn, TeleportCause tc)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean teleport(Entity entity, TeleportCause tc)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public Player getKiller()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+}

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

@@ -0,0 +1,38 @@
+package com.earth2me.essentials;
+
+import lombok.Delegate;
+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 implements Player
+{
+	@Delegate(types =
+	{
+		Player.class, Entity.class, CommandSender.class, ServerOperator.class,
+		HumanEntity.class, ConfigurationSerializable.class, LivingEntity.class,
+		Permissible.class
+	})
+	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;
+	}
+}

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

@@ -0,0 +1,615 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import java.io.File;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.ChatColor;
+import org.bukkit.event.Event.Priority;
+import org.bukkit.inventory.ItemStack;
+
+
+public class Settings implements ISettings
+{
+	private final transient EssentialsConf config;
+	private final static Logger logger = Logger.getLogger("Minecraft");
+	private final transient IEssentials ess;
+
+	public Settings(IEssentials ess)
+	{
+		this.ess = ess;
+		config = new EssentialsConf(new File(ess.getDataFolder(), "config.yml"));
+		config.setTemplateName("/config.yml");
+		reloadConfig();
+	}
+
+	@Override
+	public boolean getRespawnAtHome()
+	{
+		return config.getBoolean("respawn-at-home", false);
+	}
+
+	@Override
+	public boolean getUpdateBedAtDaytime()
+	{
+		return config.getBoolean("update-bed-at-daytime", true);
+	}
+
+	@Override
+	public List<String> getMultipleHomes()
+	{
+		return config.getKeys("sethome-multiple");
+	}
+
+	@Override
+	public int getHomeLimit(final User user)
+	{
+		final List<String> homeList = getMultipleHomes();
+		if (homeList == null)
+		{
+			//TODO: Replace this code to remove backwards compat, after settings are automatically updated
+			// return getHomeLimit("default");
+			return config.getInt("multiple-homes", 5);
+		}
+		int limit = getHomeLimit("default");
+		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)
+	{
+		return config.getInt("sethome-multiple." + set, config.getInt("sethome-multiple.default", 3));
+	}
+
+	@Override
+	public int getChatRadius()
+	{
+		return config.getInt("chat.radius", config.getInt("chat-radius", 0));
+	}
+
+	@Override
+	public double getTeleportDelay()
+	{
+		return config.getDouble("teleport-delay", 0);
+	}
+
+	@Override
+	public int getOversizedStackSize()
+	{
+		return config.getInt("oversized-stacksize", 64);
+	}
+
+	@Override
+	public int getDefaultStackSize()
+	{
+		return config.getInt("default-stack-size", -1);
+	}
+
+	@Override
+	public int getStartingBalance()
+	{
+		return config.getInt("starting-balance", 0);
+	}
+
+	@Override
+	public boolean isCommandDisabled(final IEssentialsCommand cmd)
+	{
+		return isCommandDisabled(cmd.getName());
+	}
+
+	@Override
+	public boolean isCommandDisabled(String label)
+	{
+		for (String c : config.getStringList("disabled-commands", new ArrayList<String>(0)))
+		{
+			if (!c.equalsIgnoreCase(label))
+			{
+				continue;
+			}
+			return true;
+		}
+		return config.getBoolean("disable-" + label.toLowerCase(Locale.ENGLISH), false);
+	}
+
+	@Override
+	public boolean isCommandRestricted(IEssentialsCommand cmd)
+	{
+		return isCommandRestricted(cmd.getName());
+	}
+
+	@Override
+	public boolean isCommandRestricted(String label)
+	{
+		for (String c : config.getStringList("restricted-commands", new ArrayList<String>(0)))
+		{
+			if (!c.equalsIgnoreCase(label))
+			{
+				continue;
+			}
+			return true;
+		}
+		return config.getBoolean("restrict-" + label.toLowerCase(Locale.ENGLISH), false);
+	}
+
+	@Override
+	public boolean isPlayerCommand(String label)
+	{
+		for (String c : config.getStringList("player-commands", new ArrayList<String>(0)))
+		{
+			if (!c.equalsIgnoreCase(label))
+			{
+				continue;
+			}
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean isCommandOverridden(String name)
+	{
+		List<String> defaultList = new ArrayList<String>(1);
+		defaultList.add("god");
+		for (String c : config.getStringList("overridden-commands", defaultList))
+		{
+			if (!c.equalsIgnoreCase(name))
+			{
+				continue;
+			}
+			return true;
+		}
+		return config.getBoolean("override-" + name.toLowerCase(Locale.ENGLISH), false);
+	}
+
+	@Override
+	public double getCommandCost(IEssentialsCommand cmd)
+	{
+		return getCommandCost(cmd.getName());
+	}
+
+	@Override
+	public double getCommandCost(String label)
+	{
+		double cost = config.getDouble("command-costs." + label, 0.0);
+		if (cost == 0.0)
+		{
+			cost = config.getDouble("cost-" + label, 0.0);
+		}
+		return cost;
+	}
+
+	@Override
+	public String getNicknamePrefix()
+	{
+		return config.getString("nickname-prefix", "~");
+	}
+
+	@Override
+	public double getTeleportCooldown()
+	{
+		return config.getDouble("teleport-cooldown", 0);
+	}
+
+	@Override
+	public double getHealCooldown()
+	{
+		return config.getDouble("heal-cooldown", 0);
+	}
+
+	@Override
+	public Object getKit(String name)
+	{
+		Map<String, Object> kits = (Map<String, Object>)config.getProperty("kits");
+		for (Map.Entry<String, Object> entry : kits.entrySet())
+		{
+			if (entry.getKey().equalsIgnoreCase(name.replace('.', '_').replace('/', '_')))
+			{
+				return entry.getValue();
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public Map<String, Object> getKits()
+	{
+		return (Map<String, Object>)config.getProperty("kits");
+	}
+
+	@Override
+	public ChatColor getOperatorColor() throws Exception
+	{
+		String colorName = config.getString("ops-name-color", null);
+
+		if (colorName == null)
+		{
+			return ChatColor.RED;
+		}
+		if ("none".equalsIgnoreCase(colorName) || colorName.isEmpty())
+		{
+			throw new Exception();
+		}
+
+		try
+		{
+			return ChatColor.valueOf(colorName.toUpperCase(Locale.ENGLISH));
+		}
+		catch (IllegalArgumentException ex)
+		{
+		}
+
+		return ChatColor.getByCode(Integer.parseInt(colorName, 16));
+	}
+
+	@Override
+	public int getSpawnMobLimit()
+	{
+		return config.getInt("spawnmob-limit", 10);
+	}
+
+	@Override
+	public boolean showNonEssCommandsInHelp()
+	{
+		return config.getBoolean("non-ess-in-help", true);
+	}
+
+	@Override
+	public boolean hidePermissionlessHelp()
+	{
+		return config.getBoolean("hide-permissionless-help", true);
+	}
+
+	@Override
+	public int getProtectCreeperMaxHeight()
+	{
+		return config.getInt("protect.creeper.max-height", -1);
+	}
+
+	@Override
+	public boolean areSignsDisabled()
+	{
+		return config.getBoolean("signs-disabled", false);
+	}
+
+	@Override
+	public long getBackupInterval()
+	{
+		return config.getInt("backup.interval", 1440); // 1440 = 24 * 60
+	}
+
+	@Override
+	public String getBackupCommand()
+	{
+		return config.getString("backup.command", null);
+	}
+
+	@Override
+	public String getChatFormat(String group)
+	{
+		return config.getString("chat.group-formats." + (group == null ? "Default" : group),
+								config.getString("chat.format", "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}"));
+	}
+
+	@Override
+	public boolean getAnnounceNewPlayers()
+	{
+		return !config.getString("newbies.announce-format", "-").isEmpty();
+	}
+
+	@Override
+	public String getAnnounceNewPlayerFormat(IUser user)
+	{
+		return format(config.getString("newbies.announce-format", "&dWelcome {DISPLAYNAME} to the server!"), user);
+	}
+
+	@Override
+	public String format(String format, IUser user)
+	{
+		return format.replace('&', '§').replace("§§", "&").replace("{PLAYER}", user.getDisplayName()).replace("{DISPLAYNAME}", user.getDisplayName()).replace("{GROUP}", user.getGroup()).replace("{USERNAME}", user.getName()).replace("{ADDRESS}", user.getAddress().toString());
+	}
+
+	@Override
+	public String getNewbieSpawn()
+	{
+		return config.getString("newbies.spawnpoint", "default");
+	}
+
+	@Override
+	public boolean getPerWarpPermission()
+	{
+		return config.getBoolean("per-warp-permission", false);
+	}
+
+	@Override
+	public boolean getSortListByGroups()
+	{
+		return config.getBoolean("sort-list-by-groups", true);
+	}
+
+	@Override
+	public void reloadConfig()
+	{
+		config.load();
+		noGodWorlds = new HashSet<String>(config.getStringList("no-god-in-worlds", Collections.<String>emptyList()));
+	}
+
+	@Override
+	public List<Integer> itemSpawnBlacklist()
+	{
+		final List<Integer> epItemSpwn = new ArrayList<Integer>();
+		for (String itemName : config.getString("item-spawn-blacklist", "").split(","))
+		{
+			itemName = itemName.trim();
+			if (itemName.isEmpty())
+			{
+				continue;
+			}
+			ItemStack is;
+			try
+			{
+				is = ess.getItemDb().get(itemName);
+				epItemSpwn.add(is.getTypeId());
+			}
+			catch (Exception ex)
+			{
+				logger.log(Level.SEVERE, _("unknownItemInList", itemName, "item-spawn-blacklist"));
+			}
+		}
+		return epItemSpwn;
+	}
+
+	@Override
+	public boolean spawnIfNoHome()
+	{
+		return config.getBoolean("spawn-if-no-home", false);
+	}
+
+	@Override
+	public boolean warnOnBuildDisallow()
+	{
+		return config.getBoolean("protect.disable.warn-on-build-disallow", false);
+	}
+	private boolean debug = false;
+
+	@Override
+	public boolean isDebug()
+	{
+		return debug || config.getBoolean("debug", false);
+	}
+
+	@Override
+	public boolean warnOnSmite()
+	{
+		return config.getBoolean("warn-on-smite", true);
+	}
+
+	@Override
+	public boolean permissionBasedItemSpawn()
+	{
+		return config.getBoolean("permission-based-item-spawn", false);
+	}
+
+	@Override
+	public String getLocale()
+	{
+		return config.getString("locale", "");
+	}
+
+	@Override
+	public String getCurrencySymbol()
+	{
+		return config.getString("currency-symbol", "$").substring(0, 1).replaceAll("[0-9]", "$");
+	}
+
+	@Override
+	public boolean isTradeInStacks(int id)
+	{
+		return config.getBoolean("trade-in-stacks-" + id, false);
+	}
+
+	@Override
+	public boolean isEcoDisabled()
+	{
+		return config.getBoolean("disable-eco", false);
+	}
+
+	@Override
+	public boolean getProtectPreventSpawn(final String creatureName)
+	{
+		return config.getBoolean("protect.prevent.spawn." + creatureName, false);
+	}
+
+	@Override
+	public List<Integer> getProtectList(final String configName)
+	{
+		final List<Integer> list = new ArrayList<Integer>();
+		for (String itemName : config.getString(configName, "").split(","))
+		{
+			itemName = itemName.trim();
+			if (itemName.isEmpty())
+			{
+				continue;
+			}
+			ItemStack itemStack;
+			try
+			{
+				itemStack = ess.getItemDb().get(itemName);
+				list.add(itemStack.getTypeId());
+			}
+			catch (Exception ex)
+			{
+				logger.log(Level.SEVERE, _("unknownItemInList", itemName, configName));
+			}
+		}
+		return list;
+	}
+
+	@Override
+	public String getProtectString(final String configName)
+	{
+		return config.getString(configName, null);
+	}
+
+	@Override
+	public boolean getProtectBoolean(final String configName, boolean def)
+	{
+		return config.getBoolean(configName, def);
+	}
+	private final static double MAXMONEY = 10000000000000.0;
+
+	@Override
+	public double getMaxMoney()
+	{
+		double max = config.getDouble("max-money", MAXMONEY);
+		if (Math.abs(max) > MAXMONEY)
+		{
+			max = max < 0 ? -MAXMONEY : MAXMONEY;
+		}
+		return max;
+	}
+
+	@Override
+	public boolean isEcoLogEnabled()
+	{
+		return config.getBoolean("economy-log-enabled", false);
+	}
+
+	@Override
+	public boolean removeGodOnDisconnect()
+	{
+		return config.getBoolean("remove-god-on-disconnect", false);
+	}
+
+	@Override
+	public boolean changeDisplayName()
+	{
+		return config.getBoolean("change-displayname", true);
+	}
+
+	@Override
+	public boolean useBukkitPermissions()
+	{
+		return config.getBoolean("use-bukkit-permissions", false);
+	}
+
+	@Override
+	public boolean addPrefixSuffix()
+	{
+		return config.getBoolean("add-prefix-suffix", ess.getServer().getPluginManager().isPluginEnabled("EssentialsChat"));
+	}
+
+	@Override
+	public boolean disablePrefix()
+	{
+		return config.getBoolean("disablePrefix", false);
+	}
+
+	@Override
+	public boolean disableSuffix()
+	{
+		return config.getBoolean("disableSuffix", false);
+	}
+
+	@Override
+	public long getAutoAfk()
+	{
+		return config.getLong("auto-afk", 300);
+	}
+
+	@Override
+	public long getAutoAfkKick()
+	{
+		return config.getLong("auto-afk-kick", -1);
+	}
+
+	@Override
+	public boolean getFreezeAfkPlayers()
+	{
+		return config.getBoolean("freeze-afk-players", false);
+	}
+
+	@Override
+	public boolean areDeathMessagesEnabled()
+	{
+		return config.getBoolean("death-messages", true);
+	}
+	Set<String> noGodWorlds = new HashSet<String>();
+
+	@Override
+	public Set<String> getNoGodWorlds()
+	{
+		return noGodWorlds;
+	}
+
+	@Override
+	public void setDebug(final boolean debug)
+	{
+		this.debug = debug;
+	}
+
+	@Override
+	public boolean getRepairEnchanted()
+	{
+		return config.getBoolean("repair-enchanted", true);
+	}
+
+	@Override
+	public boolean getIsWorldTeleportPermissions()
+	{
+		return config.getBoolean("world-teleport-permissions", false);
+	}
+
+	@Override
+	public boolean registerBackInListener()
+	{
+		return config.getBoolean("register-back-in-listener", false);
+	}
+
+	@Override
+	public boolean getDisableItemPickupWhileAfk()
+	{
+		return config.getBoolean("disable-item-pickup-while-afk", true);
+	}
+
+	@Override
+	public Priority getRespawnPriority()
+	{
+		String priority = config.getString("respawn-listener-priority", "normal").toLowerCase(Locale.ENGLISH);
+		if ("lowest".equals(priority))
+		{
+			return Priority.Lowest;
+		}
+		if ("low".equals(priority))
+		{
+			return Priority.Low;
+		}
+		if ("normal".equals(priority))
+		{
+			return Priority.Normal;
+		}
+		if ("high".equals(priority))
+		{
+			return Priority.High;
+		}
+		if ("highest".equals(priority))
+		{
+			return Priority.Highest;
+		}
+		return Priority.Normal;
+	}
+	
+	@Override
+	public long getTpaAcceptCancellation()
+	{
+		return config.getLong("tpa-accept-cancellation", 0);		
+	}
+}

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

@@ -1,22 +1,18 @@
-package com.earth2me.essentials.listener;
+package com.earth2me.essentials;
 
-import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.craftbukkit.FakeExplosion;
-import java.util.concurrent.atomic.AtomicBoolean;
 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;
+import org.bukkit.event.entity.EntityListener;
 
 
-public class TntExplodeListener implements Listener, Runnable
+public class TNTExplodeListener extends EntityListener implements Runnable
 {
 	private final transient IEssentials ess;
-	private transient AtomicBoolean enabled = new AtomicBoolean(false);
+	private transient boolean enabled = false;
 	private transient int timer = -1;
 
-	public TntExplodeListener(final IEssentials ess)
+	public TNTExplodeListener(final IEssentials ess)
 	{
 		super();
 		this.ess = ess;
@@ -24,22 +20,23 @@ public class TntExplodeListener implements Listener, Runnable
 
 	public void enable()
 	{
-		if (enabled.compareAndSet(false, true))
+		if (!enabled)
 		{
+			enabled = true;
 			timer = ess.scheduleSyncDelayedTask(this, 1000);
 			return;
 		}
 		if (timer != -1)
 		{
-			ess.getServer().getScheduler().cancelTask(timer);
+			ess.getScheduler().cancelTask(timer);
 			timer = ess.scheduleSyncDelayedTask(this, 1000);
 		}
 	}
 
-	@EventHandler(priority = EventPriority.LOW)
+	@Override
 	public void onEntityExplode(final EntityExplodeEvent event)
 	{
-		if (!enabled.get())
+		if (!enabled)
 		{
 			return;
 		}
@@ -54,6 +51,6 @@ public class TntExplodeListener implements Listener, Runnable
 	@Override
 	public void run()
 	{
-		enabled.set(false);
+		enabled = false;
 	}
 }

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

@@ -1,13 +1,8 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.ITeleport;
-import com.earth2me.essentials.api.IUser;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import com.earth2me.essentials.perm.Permissions;
-import com.earth2me.essentials.user.CooldownException;
-import com.earth2me.essentials.user.UserData.TimestampType;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.logging.Logger;
@@ -117,7 +112,7 @@ public class Teleport implements Runnable, ITeleport
 				}
 				catch (Throwable ex)
 				{
-					ess.getCommandHandler().showCommandError(user.getBase(), "teleport", ex);
+					ess.showError(user.getBase(), ex, "teleport");
 				}
 			}
 			catch (Exception ex)
@@ -144,21 +139,30 @@ public class Teleport implements Runnable, ITeleport
 
 	public void warp(String warp, Trade chargeFor, TeleportCause cause) throws Exception
 	{
-		final Location loc = ess.getWarps().getWarp(warp);
+		Location loc = ess.getWarps().getWarp(warp);
 		teleport(new Target(loc), chargeFor, cause);
 		user.sendMessage(_("warpingTo", warp));
 	}
 
 	public void cooldown(boolean check) throws Exception
 	{
-		try
+		Calendar now = new GregorianCalendar();
+		if (user.getLastTeleportTimestamp() > 0)
 		{
-			user.checkCooldown(TimestampType.LASTTELEPORT, ess.getGroups().getTeleportCooldown(user), !check, Permissions.TELEPORT_COOLDOWN_BYPASS);
+			double cooldown = ess.getSettings().getTeleportCooldown();
+			Calendar cooldownTime = new GregorianCalendar();
+			cooldownTime.setTimeInMillis(user.getLastTeleportTimestamp());
+			cooldownTime.add(Calendar.SECOND, (int)cooldown);
+			cooldownTime.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
+			if (cooldownTime.after(now) && !user.isAuthorized("essentials.teleport.cooldown.bypass"))
+			{
+				throw new Exception(_("timeBeforeTeleport", Util.formatDateDiff(cooldownTime.getTimeInMillis())));
+			}
 		}
-		catch (CooldownException ex)
+		// if justCheck is set, don't update lastTeleport; we're just checking
+		if (!check)
 		{
-			throw new Exception(_("timeBeforeTeleport", ex.getMessage()));
-
+			user.setLastTeleportTimestamp(now.getTimeInMillis());
 		}
 	}
 
@@ -186,7 +190,7 @@ public class Teleport implements Runnable, ITeleport
 	{
 		cancel(false);
 	}
-
+	
 	public void teleport(Location loc, Trade chargeFor) throws Exception
 	{
 		teleport(new Target(loc), chargeFor, TeleportCause.PLUGIN);
@@ -204,14 +208,14 @@ public class Teleport implements Runnable, ITeleport
 
 	private void teleport(Target target, Trade chargeFor, TeleportCause cause) throws Exception
 	{
-		double delay = ess.getGroups().getTeleportDelay(user);
+		double delay = ess.getSettings().getTeleportDelay();
 
 		if (chargeFor != null)
 		{
 			chargeFor.isAffordableFor(user);
 		}
 		cooldown(true);
-		if (delay <= 0 || Permissions.TELEPORT_TIMER_BYPASS.isAuthorized(user))
+		if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
 		{
 			cooldown(false);
 			now(target, cause);
@@ -266,28 +270,12 @@ public class Teleport implements Runnable, ITeleport
 
 	public void back(Trade chargeFor) throws Exception
 	{
-		user.acquireReadLock();
-		try
-		{
-			teleport(new Target(user.getData().getLastLocation().getBukkitLocation()), chargeFor, TeleportCause.COMMAND);
-		}
-		finally
-		{
-			user.unlock();
-		}
+		teleport(new Target(user.getLastLocation()), chargeFor, TeleportCause.COMMAND);
 	}
 
 	public void back() throws Exception
 	{
-		user.acquireReadLock();
-		try
-		{
-			now(new Target(user.getData().getLastLocation().getBukkitLocation()), TeleportCause.COMMAND);
-		}
-		finally
-		{
-			user.unlock();
-		}
+		now(new Target(user.getLastLocation()), TeleportCause.COMMAND);
 	}
 
 	public void home(IUser user, String home, Trade chargeFor) throws Exception

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

@@ -1,14 +1,8 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.ChargeException;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import com.earth2me.essentials.craftbukkit.SetExpFix;
-import com.earth2me.essentials.perm.NoCommandCostPermissions;
-import com.earth2me.essentials.perm.Permissions;
+import static com.earth2me.essentials.I18n._;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -18,9 +12,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import lombok.Cleanup;
 import org.bukkit.Location;
-import org.bukkit.entity.Item;
 import org.bukkit.inventory.ItemStack;
 
 
@@ -46,7 +38,7 @@ public class Trade
 	{
 		this(null, null, items, null, ess);
 	}
-
+	
 	public Trade(final int exp, final IEssentials ess)
 	{
 		this(null, null, null, exp, ess);
@@ -67,7 +59,7 @@ public class Trade
 		if (getMoney() != null
 			&& mon < getMoney()
 			&& getMoney() > 0
-			&& !Permissions.ECO_LOAN.isAuthorized(user))
+			&& !user.isAuthorized("essentials.eco.loan"))
 		{
 			throw new ChargeException(_("notEnoughMoney"));
 		}
@@ -78,22 +70,18 @@ public class Trade
 			throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
 		}
 
-		@Cleanup
-		final ISettings settings = ess.getSettings();
-		settings.acquireReadLock();
-
 		if (command != null && !command.isEmpty()
-			&& !NoCommandCostPermissions.getPermission(command).isAuthorized(user)
-			&& mon < settings.getData().getEconomy().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
-			&& 0 < settings.getData().getEconomy().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
-			&& !Permissions.ECO_LOAN.isAuthorized(user))
+			&& !user.isAuthorized("essentials.nocommandcost.all")
+			&& !user.isAuthorized("essentials.nocommandcost." + command)
+			&& mon < ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
+			&& 0 < ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
+			&& !user.isAuthorized("essentials.eco.loan"))
 		{
 			throw new ChargeException(_("notEnoughMoney"));
 		}
-
-		if (exp != null && exp > 0
-			&& SetExpFix.getTotalExperience(user) < exp)
-		{
+		
+		if (exp != null && exp > 0 
+			&& SetExpFix.getTotalExperience(user) < exp) {
 			throw new ChargeException(_("notEnoughExperience"));
 		}
 	}
@@ -115,25 +103,9 @@ public class Trade
 			if (dropItems)
 			{
 				final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItem(user.getInventory(), true, getItemStack());
-				final Location loc = user.getLocation();
-				for (ItemStack dropStack : leftOver.values())
+				for (ItemStack itemStack : leftOver.values())
 				{
-					final int maxStackSize = dropStack.getType().getMaxStackSize();
-					final int stacks = dropStack.getAmount() / maxStackSize;
-					final int leftover = dropStack.getAmount() % maxStackSize;
-					final Item[] itemStacks = new Item[stacks + (leftover > 0 ? 1 : 0)];
-					for (int i = 0; i < stacks; i++)
-					{
-						final ItemStack stack = dropStack.clone();
-						stack.setAmount(maxStackSize);
-						itemStacks[i] = loc.getWorld().dropItem(loc, stack);
-					}
-					if (leftover > 0)
-					{
-						final ItemStack stack = dropStack.clone();
-						stack.setAmount(leftover);
-						itemStacks[stacks] = loc.getWorld().dropItem(loc, stack);
-					}
+					InventoryWorkaround.dropItem(user.getLocation(), itemStack);
 				}
 			}
 			else
@@ -154,7 +126,7 @@ public class Trade
 		if (getMoney() != null)
 		{
 			final double mon = user.getMoney();
-			if (mon < getMoney() && getMoney() > 0 && !Permissions.ECO_LOAN.isAuthorized(user))
+			if (mon < getMoney() && getMoney() > 0 && !user.isAuthorized("essentials.eco.loan"))
 			{
 				throw new ChargeException(_("notEnoughMoney"));
 			}
@@ -170,14 +142,12 @@ public class Trade
 			user.updateInventory();
 		}
 		if (command != null && !command.isEmpty()
-			&& !NoCommandCostPermissions.getPermission(command).isAuthorized(user))
+			&& !user.isAuthorized("essentials.nocommandcost.all")
+			&& !user.isAuthorized("essentials.nocommandcost." + command))
 		{
-			@Cleanup
-			final ISettings settings = ess.getSettings();
-			settings.acquireReadLock();
 			final double mon = user.getMoney();
-			final double cost = settings.getData().getEconomy().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
-			if (mon < cost && cost > 0 && !Permissions.ECO_LOAN.isAuthorized(user))
+			final double cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
+			if (mon < cost && cost > 0 && !user.isAuthorized("essentials.eco.loan"))
 			{
 				throw new ChargeException(_("notEnoughMoney"));
 			}
@@ -203,7 +173,7 @@ public class Trade
 	{
 		return itemStack;
 	}
-
+	
 	public Integer getExperience()
 	{
 		return exp;
@@ -212,10 +182,7 @@ public class Trade
 
 	public static void log(String type, String subtype, String event, String sender, Trade charge, String receiver, Trade pay, Location loc, IEssentials ess)
 	{
-		@Cleanup
-		final ISettings settings = ess.getSettings();
-		settings.acquireReadLock();
-		if (!settings.getData().getEconomy().isLogEnabled())
+		if (!ess.getSettings().isEcoLogEnabled())
 		{
 			return;
 		}
@@ -255,7 +222,7 @@ public class Trade
 			{
 				sb.append(charge.getMoney()).append(",");
 				sb.append("money").append(",");
-				sb.append(settings.getData().getEconomy().getCurrencySymbol());
+				sb.append(ess.getSettings().getCurrencySymbol());
 			}
 			if (charge.getExperience() != null)
 			{
@@ -286,7 +253,7 @@ public class Trade
 			{
 				sb.append(pay.getMoney()).append(",");
 				sb.append("money").append(",");
-				sb.append(settings.getData().getEconomy().getCurrencySymbol());
+				sb.append(ess.getSettings().getCurrencySymbol());
 			}
 			if (pay.getExperience() != null)
 			{

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

@@ -0,0 +1,547 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import com.earth2me.essentials.register.payment.Method;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class User extends UserData implements Comparable<User>, IReplyTo, IUser
+{
+	private CommandSender replyTo = null;
+	private transient User teleportRequester;
+	private transient boolean teleportRequestHere;
+	private transient final Teleport teleport;
+	private transient long teleportRequestTime;
+	private transient long lastOnlineActivity;
+	private transient long lastActivity = System.currentTimeMillis();
+	private boolean hidden = false;
+	private transient Location afkPosition;
+	private static final Logger logger = Logger.getLogger("Minecraft");
+	
+	User(final Player base, final IEssentials ess)
+	{
+		super(base, ess);
+		teleport = new Teleport(this, ess);
+		afkPosition = getLocation();
+	}
+	
+	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)
+	{
+		if (base instanceof OfflinePlayer)
+		{
+			return false;
+		}
+		
+		if (isOp())
+		{
+			return true;
+		}
+		
+		if (isJailed())
+		{
+			return false;
+		}
+		
+		return ess.getPermissionsHandler().hasPermission(base, node);
+	}
+	
+	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(_("timeBeforeHeal", Util.formatDateDiff(cooldownTime.getTimeInMillis())));
+			}
+		}
+		setLastHealTimestamp(now.getTimeInMillis());
+	}
+	
+	@Override
+	public void giveMoney(final double value)
+	{
+		giveMoney(value, null);
+	}
+	
+	public void giveMoney(final double value, final CommandSender initiator)
+	{
+		if (value == 0)
+		{
+			return;
+		}
+		setMoney(getMoney() + value);
+		sendMessage(_("addedToAccount", Util.formatCurrency(value, ess)));
+		if (initiator != null)
+		{
+			initiator.sendMessage(_("addedToOthersAccount", Util.formatCurrency(value, ess), this.getDisplayName()));
+		}
+	}
+	
+	public void payUser(final User reciever, final double value) throws Exception
+	{
+		if (value == 0)
+		{
+			return;
+		}
+		if (canAfford(value))
+		{
+			setMoney(getMoney() - value);
+			reciever.setMoney(reciever.getMoney() + value);
+			sendMessage(_("moneySentTo", Util.formatCurrency(value, ess), reciever.getDisplayName()));
+			reciever.sendMessage(_("moneyRecievedFrom", Util.formatCurrency(value, ess), getDisplayName()));
+		}
+		else
+		{
+			throw new Exception(_("notEnoughMoney"));
+		}
+	}
+	
+	@Override
+	public void takeMoney(final double value)
+	{
+		takeMoney(value, null);
+	}
+	
+	public void takeMoney(final double value, final CommandSender initiator)
+	{
+		if (value == 0)
+		{
+			return;
+		}
+		setMoney(getMoney() - value);
+		sendMessage(_("takenFromAccount", Util.formatCurrency(value, ess)));
+		if (initiator != null)
+		{
+			initiator.sendMessage(_("takenFromOthersAccount", Util.formatCurrency(value, ess), this.getDisplayName()));
+		}
+	}
+	
+	public boolean canAfford(final double cost)
+	{
+		final double mon = getMoney();
+		return mon >= cost || isAuthorized("essentials.eco.loan");
+	}
+	
+	public void dispose()
+	{
+		this.base = new OfflinePlayer(getName(), ess);
+	}
+	
+	@Override
+	public void setReplyTo(final CommandSender user)
+	{
+		replyTo = user;
+	}
+	
+	@Override
+	public CommandSender getReplyTo()
+	{
+		return replyTo;
+	}
+	
+	@Override
+	public int compareTo(final User other)
+	{
+		return Util.stripColor(this.getDisplayName()).compareToIgnoreCase(Util.stripColor(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();
+	}
+	
+	public Boolean canSpawnItem(final int itemId)
+	{
+		return !ess.getSettings().itemSpawnBlacklist().contains(itemId);
+	}
+	
+	public Location getHome() throws Exception
+	{
+		return getHome(getHomes().get(0));
+	}
+	
+	public void setHome()
+	{
+		setHome("home", getLocation());
+	}
+	
+	public void setHome(final String name)
+	{
+		setHome(name, getLocation());
+	}
+	
+	@Override
+	public void setLastLocation()
+	{
+		setLastLocation(getLocation());
+	}
+	
+	public void requestTeleport(final User player, final boolean here)
+	{
+		teleportRequestTime = System.currentTimeMillis();
+		teleportRequester = player;
+		teleportRequestHere = here;
+	}
+	
+	public User getTeleportRequest()
+	{
+		return teleportRequester;
+	}
+	
+	public boolean isTeleportRequestHere()
+	{
+		return teleportRequestHere;
+	}
+	
+	public String getNick(boolean addprefixsuffix)
+	{
+		final StringBuilder nickname = new StringBuilder();
+		final String nick = getNickname();
+		if (ess.getSettings().isCommandDisabled("nick") || nick == null || nick.isEmpty() || nick.equals(getName()))
+		{
+			nickname.append(getName());
+		}
+		else
+		{
+			nickname.append(ess.getSettings().getNicknamePrefix()).append(nick);
+		}
+		if (isOp())
+		{
+			try
+			{
+				nickname.insert(0, ess.getSettings().getOperatorColor().toString());
+				nickname.append("§f");
+			}
+			catch (Exception e)
+			{
+			}
+		}
+		
+		if (addprefixsuffix && ess.getSettings().addPrefixSuffix())
+		{
+			if (!ess.getSettings().disablePrefix())
+			{
+				final String prefix = ess.getPermissionsHandler().getPrefix(base).replace('&', '§').replace("{WORLDNAME}", this.getWorld().getName());
+				nickname.insert(0, prefix);
+			}
+			if (!ess.getSettings().disableSuffix())
+			{
+				final String suffix = ess.getPermissionsHandler().getSuffix(base).replace('&', '§').replace("{WORLDNAME}", this.getWorld().getName());
+				nickname.append(suffix);
+				if (suffix.length() < 2 || !suffix.substring(suffix.length() - 2, suffix.length() - 1).equals("§"))
+				{
+					nickname.append("§f");
+				}
+			}
+			else
+			{
+				nickname.append("§f");
+			}
+		}
+		
+		return nickname.toString();
+	}
+	
+	public void setDisplayNick()
+	{
+		String name = getNick(true);
+		setDisplayName(name);
+		if (name.length() > 16)
+		{
+			name = getNick(false);
+		}
+		if (name.length() > 16)
+		{
+			name = name.substring(0, name.charAt(15) == '§' ? 15 : 16);
+		}
+		try
+		{
+			setPlayerListName(name);
+		}
+		catch (IllegalArgumentException e)
+		{
+			logger.log(Level.INFO, "Playerlist for " + name + " was not updated. Use a shorter displayname prefix.");
+		}
+	}
+	
+	@Override
+	public String getDisplayName()
+	{
+		if (!(base instanceof OfflinePlayer) && ess.getSettings().changeDisplayName())
+		{
+			setDisplayNick();
+		}
+		return super.getDisplayName() == null ? super.getName() : super.getDisplayName();
+	}
+	
+	public Teleport getTeleport()
+	{
+		return teleport;
+	}
+	
+	public long getLastOnlineActivity()
+	{
+		return lastOnlineActivity;
+	}
+	
+	public void setLastOnlineActivity(final long timestamp)
+	{
+		lastOnlineActivity = timestamp;
+	}
+	
+	@Override
+	public double getMoney()
+	{
+		if (ess.getPaymentMethod().hasMethod())
+		{
+			try
+			{
+				final Method method = ess.getPaymentMethod().getMethod();
+				if (!method.hasAccount(this.getName()))
+				{
+					throw new Exception();
+				}
+				final Method.MethodAccount account = ess.getPaymentMethod().getMethod().getAccount(this.getName());
+				return account.balance();
+			}
+			catch (Throwable ex)
+			{
+			}
+		}
+		return super.getMoney();
+	}
+	
+	@Override
+	public void setMoney(final double value)
+	{
+		if (ess.getPaymentMethod().hasMethod())
+		{
+			try
+			{
+				final Method method = ess.getPaymentMethod().getMethod();
+				if (!method.hasAccount(this.getName()))
+				{
+					throw new Exception();
+				}
+				final Method.MethodAccount account = ess.getPaymentMethod().getMethod().getAccount(this.getName());
+				account.set(value);
+			}
+			catch (Throwable ex)
+			{
+			}
+		}
+		super.setMoney(value);
+	}
+	
+	@Override
+	public void setAfk(final boolean set)
+	{
+		this.setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : set);
+		if (set && !isAfk())
+		{
+			afkPosition = getLocation();
+		}
+		super.setAfk(set);
+	}
+	
+	@Override
+	public boolean toggleAfk()
+	{
+		final boolean now = super.toggleAfk();
+		this.setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : now);
+		return now;
+	}
+	
+	@Override
+	public boolean isHidden()
+	{
+		return hidden;
+	}
+	
+	public void setHidden(final boolean hidden)
+	{
+		this.hidden = hidden;
+	}
+
+	//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(_("haveBeenReleased"));
+			setJail(null);
+			try
+			{
+				getTeleport().back();
+			}
+			catch (Exception ex)
+			{
+			}
+			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(_("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 && isBanned())
+		{
+			setBanTimeout(0);
+			setBanned(false);
+			return true;
+		}
+		return false;
+	}
+	
+	public void updateActivity(final boolean broadcast)
+	{
+		if (isAfk())
+		{
+			setAfk(false);
+			if (broadcast && !isHidden())
+			{
+				ess.broadcastMessage(this, _("userIsNotAway", getDisplayName()));
+			}
+		}
+		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 = _("autoAfkKickReason", autoafkkick / 60.0);
+			lastActivity = 0;
+			kickPlayer(kickReason);
+			
+			
+			for (Player player : ess.getServer().getOnlinePlayers())
+			{
+				final User user = ess.getUser(player);
+				if (user.isAuthorized("essentials.kick.notify"))
+				{
+					player.sendMessage(_("playerKicked", Console.NAME, getName(), kickReason));
+				}
+			}
+		}
+		final long autoafk = ess.getSettings().getAutoAfk();
+		if (!isAfk() && autoafk > 0 && lastActivity + autoafk * 1000 < System.currentTimeMillis() && isAuthorized("essentials.afk"))
+		{
+			setAfk(true);
+			if (!isHidden())
+			{
+				ess.broadcastMessage(this, _("userIsAway", getDisplayName()));
+			}
+		}
+	}
+	
+	public Location getAfkPosition()
+	{
+		return afkPosition;
+	}
+	
+	@Override
+	public boolean toggleGodModeEnabled()
+	{
+		if (!isGodModeEnabled())
+		{
+			setFoodLevel(20);
+		}
+		return super.toggleGodModeEnabled();
+	}
+	
+	@Override
+	public boolean isGodModeEnabled()
+	{
+		return (super.isGodModeEnabled() && !ess.getSettings().getNoGodWorlds().contains(getLocation().getWorld().getName()))
+			   || (isAfk() && ess.getSettings().getFreezeAfkPlayers());
+	}
+	
+	public boolean isGodModeEnabledRaw()
+	{
+		return super.isGodModeEnabled();
+	}
+	
+	public String getGroup()
+	{
+		return ess.getPermissionsHandler().getGroup(base);
+	}
+	
+	public boolean inGroup(final String group)
+	{
+		return ess.getPermissionsHandler().inGroup(base, group);
+	}
+	
+	public boolean canBuild()
+	{
+		return ess.getPermissionsHandler().canBuild(base, getGroup());
+	}
+	
+	public long getTeleportRequestTime()
+	{
+		return teleportRequestTime;
+	}	
+}

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

@@ -0,0 +1,875 @@
+package com.earth2me.essentials;
+
+import java.io.File;
+import java.util.*;
+import java.util.logging.Logger;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+
+public abstract class UserData extends PlayerExtension implements IConf
+{
+	protected final transient IEssentials ess;
+	private final EssentialsConf config;
+	private static final Logger logger = Logger.getLogger("Minecraft");
+
+	protected UserData(Player base, IEssentials ess)
+	{
+		super(base);
+		this.ess = ess;
+		File folder = new File(ess.getDataFolder(), "userdata");
+		if (!folder.exists())
+		{
+			folder.mkdirs();
+		}
+		config = new EssentialsConf(new File(folder, Util.sanitizeFileName(base.getName()) + ".yml"));
+		reloadConfig();
+	}
+
+	@Override
+	public final void reloadConfig()
+	{
+		config.load();
+		money = _getMoney();
+		unlimited = _getUnlimited();
+		powertools = _getPowertools();
+		homes = _getHomes();
+		lastLocation = _getLastLocation();
+		lastTeleportTimestamp = _getLastTeleportTimestamp();
+		lastHealTimestamp = _getLastHealTimestamp();
+		jail = _getJail();
+		mails = _getMails();
+		savedInventory = _getSavedInventory();
+		teleportEnabled = getTeleportEnabled();
+		ignoredPlayers = getIgnoredPlayers();
+		godmode = getGodModeEnabled();
+		muted = getMuted();
+		muteTimeout = _getMuteTimeout();
+		jailed = getJailed();
+		jailTimeout = _getJailTimeout();
+		lastLogin = _getLastLogin();
+		lastLogout = _getLastLogout();
+		lastLoginAddress = _getLastLoginAddress();
+		afk = getAfk();
+		newplayer = getNew();
+		geolocation = _getGeoLocation();
+		isSocialSpyEnabled = _isSocialSpyEnabled();
+		isNPC = _isNPC();
+		arePowerToolsEnabled = _arePowerToolsEnabled();
+		kitTimestamps = _getKitTimestamps();
+	}
+	private double money;
+
+	private double _getMoney()
+	{
+		double money = ess.getSettings().getStartingBalance();
+		if (config.hasProperty("money"))
+		{
+			money = config.getDouble("money", money);
+		}
+		if (Math.abs(money) > ess.getSettings().getMaxMoney())
+		{
+			money = money < 0 ? -ess.getSettings().getMaxMoney() : ess.getSettings().getMaxMoney();
+		}
+		return money;
+	}
+
+	public double getMoney()
+	{
+		return money;
+	}
+
+	public void setMoney(double value)
+	{
+		money = value;
+		if (Math.abs(money) > ess.getSettings().getMaxMoney())
+		{
+			money = money < 0 ? -ess.getSettings().getMaxMoney() : ess.getSettings().getMaxMoney();
+		}
+		config.setProperty("money", value);
+		config.save();
+	}
+	private Map<String, Object> homes;
+
+	private Map<String, Object> _getHomes()
+	{
+		Object o = config.getProperty("homes");
+
+		if (o instanceof Map)
+		{
+			return (Map<String, Object>)o;
+		}
+		else
+		{
+			return new HashMap<String, Object>();
+		}
+
+	}
+
+	public Location getHome(String name) throws Exception
+	{
+		Location loc = config.getLocation("homes." + name, getServer());
+		if (loc == null)
+		{
+			try
+			{
+				loc = config.getLocation("homes." + getHomes().get(Integer.parseInt(name) - 1), getServer());
+			}
+			catch (IndexOutOfBoundsException e)
+			{
+				return null;
+			}
+			catch (NumberFormatException e)
+			{
+				return null;
+			}
+		}
+
+		return loc;
+	}
+
+	public Location getHome(final Location world)
+	{
+		try
+		{
+			Location loc;
+			for (String home : getHomes())
+			{
+				loc = config.getLocation("homes." + home, getServer());
+				if (world.getWorld() == loc.getWorld())
+				{
+					return loc;
+				}
+
+			}
+			loc = config.getLocation("homes." + getHomes().get(0), getServer());
+			return loc;
+		}
+		catch (Exception ex)
+		{
+			return null;
+		}
+	}
+
+	public List<String> getHomes()
+	{
+		return new ArrayList(homes.keySet());
+	}
+
+	public void setHome(String name, Location loc)
+	{
+		//Invalid names will corrupt the yaml
+		name = Util.sanitizeFileName(name);
+		homes.put(name, loc);
+		config.setProperty("homes." + name, loc);
+		config.save();
+	}
+
+	public void delHome(String name) throws Exception
+	{
+		String search = name;
+		if (!homes.containsKey(search))
+		{
+			search = Util.sanitizeFileName(name);
+		}
+		if (homes.containsKey(search))
+		{
+			homes.remove(name);
+			config.removeProperty("homes." + name);
+			config.save();
+		}
+		else
+		{
+			//TODO: move this message to messages file
+			throw new Exception("Home " + name + " doesn't exist");
+		}
+	}
+
+	public boolean hasHome()
+	{
+		if (config.hasProperty("home"))
+		{
+			return true;
+		}
+		return false;
+	}
+
+	public String getNickname()
+	{
+		return config.getString("nickname");
+	}
+
+	public void setNickname(String nick)
+	{
+		config.setProperty("nickname", nick);
+		config.save();
+	}
+	private List<Integer> unlimited;
+
+	private List<Integer> _getUnlimited()
+	{
+		return config.getIntList("unlimited", new ArrayList<Integer>());
+	}
+
+	public List<Integer> getUnlimited()
+	{
+		return unlimited;
+	}
+
+	public boolean hasUnlimited(ItemStack stack)
+	{
+		return unlimited.contains(stack.getTypeId());
+	}
+
+	public void setUnlimited(ItemStack stack, boolean state)
+	{
+		if (unlimited.contains(stack.getTypeId()))
+		{
+			unlimited.remove(Integer.valueOf(stack.getTypeId()));
+		}
+		if (state)
+		{
+			unlimited.add(stack.getTypeId());
+		}
+		config.setProperty("unlimited", unlimited);
+		config.save();
+	}
+	private Map<Integer, Object> powertools;
+
+	@SuppressWarnings("unchecked")
+	private Map<Integer, Object> _getPowertools()
+	{
+		Object o = config.getProperty("powertools");
+
+		if (o instanceof Map)
+		{
+			return (Map<Integer, Object>)o;
+		}
+		else
+		{
+			return new HashMap<Integer, Object>();
+		}
+
+	}
+
+	public void clearAllPowertools()
+	{
+		powertools.clear();
+		config.setProperty("powertools", powertools);
+		config.save();
+	}
+
+	public List<String> getPowertool(ItemStack stack)
+	{
+		return (List<String>)powertools.get(stack.getTypeId());
+	}
+
+	public void setPowertool(ItemStack stack, List<String> commandList)
+	{
+		if (commandList == null || commandList.isEmpty())
+		{
+			powertools.remove(stack.getTypeId());
+		}
+		else
+		{
+			powertools.put(stack.getTypeId(), commandList);
+		}
+		config.setProperty("powertools", powertools);
+		config.save();
+	}
+
+	public boolean hasPowerTools()
+	{
+		return !powertools.isEmpty();
+	}
+	private Location lastLocation;
+
+	private Location _getLastLocation()
+	{
+		try
+		{
+			return config.getLocation("lastlocation", getServer());
+		}
+		catch (Exception e)
+		{
+			return null;
+		}
+	}
+
+	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 long lastTeleportTimestamp;
+
+	private long _getLastTeleportTimestamp()
+	{
+		return config.getLong("timestamps.lastteleport", 0);
+	}
+
+	public long getLastTeleportTimestamp()
+	{
+		return lastTeleportTimestamp;
+	}
+
+	public void setLastTeleportTimestamp(long time)
+	{
+		lastTeleportTimestamp = time;
+		config.setProperty("timestamps.lastteleport", time);
+		config.save();
+	}
+	private long lastHealTimestamp;
+
+	private long _getLastHealTimestamp()
+	{
+		return config.getLong("timestamps.lastheal", 0);
+	}
+
+	public long getLastHealTimestamp()
+	{
+		return lastHealTimestamp;
+	}
+
+	public void setLastHealTimestamp(long time)
+	{
+		lastHealTimestamp = time;
+		config.setProperty("timestamps.lastheal", time);
+		config.save();
+	}
+	private String jail;
+
+	private String _getJail()
+	{
+		return config.getString("jail");
+	}
+
+	public String getJail()
+	{
+		return jail;
+	}
+
+	public void setJail(String jail)
+	{
+		if (jail == null || jail.isEmpty())
+		{
+			this.jail = null;
+			config.removeProperty("jail");
+		}
+		else
+		{
+			this.jail = jail;
+			config.setProperty("jail", jail);
+		}
+		config.save();
+	}
+	private List<String> mails;
+
+	private List<String> _getMails()
+	{
+		return config.getStringList("mail", new ArrayList<String>());
+	}
+
+	public List<String> getMails()
+	{
+		return mails;
+	}
+
+	public void setMails(List<String> mails)
+	{
+		if (mails == null)
+		{
+			config.removeProperty("mail");
+			mails = _getMails();
+		}
+		else
+		{
+			config.setProperty("mail", mails);
+		}
+		this.mails = mails;
+		config.save();
+	}
+
+	public void addMail(String mail)
+	{
+		mails.add(mail);
+		setMails(mails);
+	}
+	private ItemStack[] savedInventory;
+
+	public ItemStack[] getSavedInventory()
+	{
+		return savedInventory;
+	}
+
+	private ItemStack[] _getSavedInventory()
+	{
+		int size = config.getInt("inventory.size", 0);
+		if (size < 1 || (getInventory() != null && size > getInventory().getSize()))
+		{
+			return null;
+		}
+		ItemStack[] is = new ItemStack[size];
+		for (int i = 0; i < size; i++)
+		{
+			is[i] = config.getItemStack("inventory." + i);
+		}
+		return is;
+	}
+
+	public void setSavedInventory(ItemStack[] is)
+	{
+		if (is == null || is.length == 0)
+		{
+			savedInventory = null;
+			config.removeProperty("inventory");
+		}
+		else
+		{
+			savedInventory = is;
+			config.setProperty("inventory.size", is.length);
+			for (int i = 0; i < is.length; i++)
+			{
+				if (is[i] == null || is[i].getType() == Material.AIR)
+				{
+					continue;
+				}
+				config.setProperty("inventory." + i, is[i]);
+			}
+		}
+		config.save();
+	}
+	private boolean teleportEnabled;
+
+	private boolean getTeleportEnabled()
+	{
+		return config.getBoolean("teleportenabled", true);
+	}
+
+	public boolean isTeleportEnabled()
+	{
+		return teleportEnabled;
+	}
+
+	public void setTeleportEnabled(boolean set)
+	{
+		teleportEnabled = set;
+		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()
+	{
+		return config.getStringList("ignore", new ArrayList<String>());
+	}
+
+	public void setIgnoredPlayers(List<String> players)
+	{
+		if (players == null || players.isEmpty())
+		{
+			ignoredPlayers = new ArrayList<String>();
+			config.removeProperty("ignore");
+		}
+		else
+		{
+			ignoredPlayers = players;
+			config.setProperty("ignore", players);
+		}
+		config.save();
+	}
+
+	public boolean isIgnoredPlayer(String name)
+	{
+		return ignoredPlayers.contains(name.toLowerCase(Locale.ENGLISH));
+	}
+
+	public void setIgnoredPlayer(String name, boolean set)
+	{
+		if (set)
+		{
+			ignoredPlayers.add(name.toLowerCase(Locale.ENGLISH));
+		}
+		else
+		{
+			ignoredPlayers.remove(name.toLowerCase(Locale.ENGLISH));
+		}
+		setIgnoredPlayers(ignoredPlayers);
+	}
+	private boolean godmode;
+
+	private boolean getGodModeEnabled()
+	{
+		return config.getBoolean("godmode", false);
+	}
+
+	public boolean isGodModeEnabled()
+	{
+		return godmode;
+	}
+
+	public void setGodModeEnabled(boolean set)
+	{
+		godmode = set;
+		config.setProperty("godmode", set);
+		config.save();
+	}
+
+	public boolean toggleGodModeEnabled()
+	{
+		boolean ret = !isGodModeEnabled();
+		setGodModeEnabled(ret);
+		return ret;
+	}
+	private boolean muted;
+
+	private boolean getMuted()
+	{
+		return config.getBoolean("muted", false);
+	}
+
+	public boolean isMuted()
+	{
+		return muted;
+	}
+
+	public void setMuted(boolean set)
+	{
+		muted = set;
+		config.setProperty("muted", set);
+		config.save();
+	}
+
+	public boolean toggleMuted()
+	{
+		boolean ret = !isMuted();
+		setMuted(ret);
+		return ret;
+	}
+	private long muteTimeout;
+
+	private long _getMuteTimeout()
+	{
+		return config.getLong("timestamps.mute", 0);
+	}
+
+	public long getMuteTimeout()
+	{
+		return muteTimeout;
+	}
+
+	public void setMuteTimeout(long time)
+	{
+		muteTimeout = time;
+		config.setProperty("timestamps.mute", time);
+		config.save();
+	}
+	private boolean jailed;
+
+	private boolean getJailed()
+	{
+		return config.getBoolean("jailed", false);
+	}
+
+	public boolean isJailed()
+	{
+		return jailed;
+	}
+
+	public void setJailed(boolean set)
+	{
+		jailed = set;
+		config.setProperty("jailed", set);
+		config.save();
+	}
+
+	public boolean toggleJailed()
+	{
+		boolean ret = !isJailed();
+		setJailed(ret);
+		return ret;
+	}
+	private long jailTimeout;
+
+	private long _getJailTimeout()
+	{
+		return config.getLong("timestamps.jail", 0);
+	}
+
+	public long getJailTimeout()
+	{
+		return jailTimeout;
+	}
+
+	public void setJailTimeout(long time)
+	{
+		jailTimeout = time;
+		config.setProperty("timestamps.jail", time);
+		config.save();
+	}
+
+	public String getBanReason()
+	{
+		return config.getString("ban.reason");
+	}
+
+	public void setBanReason(String reason)
+	{
+		config.setProperty("ban.reason", reason);
+		config.save();
+	}
+
+	public long getBanTimeout()
+	{
+		return config.getLong("ban.timeout", 0);
+	}
+
+	public void setBanTimeout(long time)
+	{
+		config.setProperty("ban.timeout", time);
+		config.save();
+	}
+	private long lastLogin;
+
+	private long _getLastLogin()
+	{
+		return config.getLong("timestamps.login", 0);
+	}
+
+	public long getLastLogin()
+	{
+		return lastLogin;
+	}
+
+	public void setLastLogin(long time)
+	{
+		lastLogin = time;
+		config.setProperty("timestamps.login", time);
+		config.save();
+	}
+	private long lastLogout;
+
+	private long _getLastLogout()
+	{
+		return config.getLong("timestamps.logout", 0);
+	}
+
+	public long getLastLogout()
+	{
+		return lastLogout;
+	}
+
+	public void setLastLogout(long time)
+	{
+		lastLogout = time;
+		config.setProperty("timestamps.logout", time);
+		config.save();
+	}
+	private String lastLoginAddress;
+
+	private String _getLastLoginAddress()
+	{
+		return config.getString("ipAddress", "");
+	}
+
+	public String getLastLoginAddress()
+	{
+		return lastLoginAddress;
+	}
+
+	public void setLastLoginAddress(String address)
+	{
+		lastLoginAddress = address;
+		config.setProperty("ipAddress", address);
+		config.save();
+	}
+	private boolean afk;
+
+	private boolean getAfk()
+	{
+		return config.getBoolean("afk", false);
+	}
+
+	public boolean isAfk()
+	{
+		return afk;
+	}
+
+	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;
+
+	private boolean getNew()
+	{
+		return config.getBoolean("newplayer", true);
+	}
+
+	public boolean isNew()
+	{
+		return newplayer;
+	}
+
+	public void setNew(boolean set)
+	{
+		newplayer = set;
+		config.setProperty("newplayer", set);
+		config.save();
+	}
+	private String geolocation;
+
+	private String _getGeoLocation()
+	{
+		return config.getString("geolocation");
+	}
+
+	public String getGeoLocation()
+	{
+		return geolocation;
+	}
+
+	public void setGeoLocation(String geolocation)
+	{
+		if (geolocation == null || geolocation.isEmpty())
+		{
+			this.geolocation = null;
+			config.removeProperty("geolocation");
+		}
+		else
+		{
+			this.geolocation = geolocation;
+			config.setProperty("geolocation", geolocation);
+		}
+		config.save();
+	}
+	private boolean isSocialSpyEnabled;
+
+	private boolean _isSocialSpyEnabled()
+	{
+		return config.getBoolean("socialspy", false);
+	}
+
+	public boolean isSocialSpyEnabled()
+	{
+		return isSocialSpyEnabled;
+	}
+
+	public void setSocialSpyEnabled(boolean status)
+	{
+		isSocialSpyEnabled = status;
+		config.setProperty("socialspy", status);
+		config.save();
+	}
+	private boolean isNPC;
+
+	private boolean _isNPC()
+	{
+		return config.getBoolean("npc", false);
+	}
+
+	public boolean isNPC()
+	{
+		return isNPC;
+	}
+
+	public void setNPC(boolean set)
+	{
+		isNPC = set;
+		config.setProperty("npc", set);
+		config.save();
+	}
+	private boolean arePowerToolsEnabled;
+
+	public boolean arePowerToolsEnabled()
+	{
+		return arePowerToolsEnabled;
+	}
+
+	public void setPowerToolsEnabled(boolean set)
+	{
+		arePowerToolsEnabled = set;
+		config.setProperty("powertoolsenabled", set);
+		config.save();
+	}
+
+	public boolean togglePowerToolsEnabled()
+	{
+		boolean ret = !arePowerToolsEnabled();
+		setPowerToolsEnabled(ret);
+		return ret;
+	}
+
+	private boolean _arePowerToolsEnabled()
+	{
+		return config.getBoolean("powertoolsenabled", true);
+	}
+	private Map<String, Object> kitTimestamps;
+
+	private Map<String, Object> _getKitTimestamps()
+	{
+		final Object map = config.getProperty("timestamps.kits");
+
+		if (map instanceof Map)
+		{
+			return (Map<String, Object>)map;
+		}
+		else
+		{
+			return new HashMap<String, Object>();
+		}
+	}
+
+	public Long getKitTimestamp(final String name)
+	{
+		final Number num = (Number)kitTimestamps.get(name.toLowerCase(Locale.ENGLISH));
+		return num == null ? null : num.longValue();
+	}
+
+	public void setKitTimestamp(final String name, final long time)
+	{
+		kitTimestamps.put(name.toLowerCase(Locale.ENGLISH), time);
+		config.setProperty("timestamps.kits", kitTimestamps);
+		config.save();
+	}
+
+	public void save()
+	{
+		config.save();
+	}
+}

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

@@ -0,0 +1,124 @@
+package com.earth2me.essentials;
+
+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.Collections;
+import java.util.Locale;
+import java.util.Set;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.ExecutionException;
+import org.bukkit.entity.Player;
+
+
+public class UserMap extends CacheLoader<String, User> implements IConf
+{
+	private final transient IEssentials ess;
+	private final transient Cache<String, User> users = CacheBuilder.newBuilder().softValues().build(this);
+	private final transient ConcurrentSkipListSet<String> keys = new ConcurrentSkipListSet<String>();
+
+	public UserMap(final IEssentials ess)
+	{
+		super();
+		this.ess = ess;
+		loadAllUsersAsync(ess);
+	}
+
+	private void loadAllUsersAsync(final IEssentials ess)
+	{
+		ess.scheduleAsyncDelayedTask(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				final File userdir = new File(ess.getDataFolder(), "userdata");
+				if (!userdir.exists())
+				{
+					return;
+				}
+				keys.clear();
+				users.invalidateAll();
+				for (String string : userdir.list())
+				{
+					if (!string.endsWith(".yml"))
+					{
+						continue;
+					}
+					final String name = string.substring(0, string.length() - 4);
+					keys.add(name.toLowerCase(Locale.ENGLISH));
+				}
+			}
+		});
+	}
+
+	public boolean userExists(final String name)
+	{
+		return keys.contains(name.toLowerCase(Locale.ENGLISH));
+	}
+
+	public User getUser(final String name)
+	{
+		try
+		{
+			return users.get(name.toLowerCase(Locale.ENGLISH));
+		}
+		catch (ExecutionException ex)
+		{
+			return null;
+		}
+		catch (UncheckedExecutionException ex)
+		{
+			return null;
+		}
+	}
+
+	@Override
+	public User load(final String name) throws Exception
+	{
+		for (Player player : ess.getServer().getOnlinePlayers())
+		{
+			if (player.getName().equalsIgnoreCase(name))
+			{
+				keys.add(name.toLowerCase(Locale.ENGLISH));
+				return new User(player, ess);
+			}
+		}
+		final File userFile = getUserFile(name);
+		if (userFile.exists())
+		{
+			keys.add(name.toLowerCase(Locale.ENGLISH));
+			return new User(new OfflinePlayer(name, ess), ess);
+		}
+		throw new Exception("User not found!");
+	}
+
+	@Override
+	public void reloadConfig()
+	{
+		loadAllUsersAsync(ess);
+	}
+
+	public void removeUser(final String name)
+	{
+		keys.remove(name.toLowerCase(Locale.ENGLISH));
+		users.invalidate(name.toLowerCase(Locale.ENGLISH));
+	}
+
+	public Set<String> getAllUniqueUsers()
+	{
+		return Collections.unmodifiableSet(keys);
+	}
+
+	public int getUniqueUsers()
+	{
+		return keys.size();
+	}
+	
+	public File getUserFile(final String name)
+	{
+		final File userFolder = new File(ess.getDataFolder(), "userdata");
+		return new File(userFolder, Util.sanitizeFileName(name) + ".yml");
+	}
+}

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

@@ -1,95 +1,30 @@
 package com.earth2me.essentials;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.InvalidNameException;
-import com.earth2me.essentials.external.gnu.inet.encoding.Punycode;
-import com.earth2me.essentials.external.gnu.inet.encoding.PunycodeException;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.*;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import lombok.Cleanup;
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionDefault;
-import org.bukkit.plugin.PluginManager;
 
 
-public final class Util
+public class Util
 {
 	private Util()
 	{
 	}
-	private final static Pattern INVALIDFILECHARS = Pattern.compile("[^\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]");
-	private final static Pattern INVALIDCHARS = Pattern.compile("[^\t\n\r\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]");
+	private final static Logger logger = Logger.getLogger("Minecraft");
 
-	public static String sanitizeFileName(String name) throws InvalidNameException
+	public static String sanitizeFileName(String name)
 	{
-		try
-		{
-			String r = name.toLowerCase(Locale.ENGLISH);
-			r = r.replace('.', (char)('\ue200' + '.'));
-			r = r.replace('\\', (char)('\ue200' + '\\'));
-			r = r.replace('/', (char)('\ue200' + '/'));
-			r = r.replace('"', (char)('\ue200' + '"'));
-			r = r.replace('<', (char)('\ue200' + '<'));
-			r = r.replace('>', (char)('\ue200' + '>'));
-			r = r.replace('|', (char)('\ue200' + '|'));
-			r = r.replace('?', (char)('\ue200' + '?'));
-			r = r.replace('*', (char)('\ue200' + '*'));
-			r = r.replace(':', (char)('\ue200' + ':'));
-			r = r.replace('-', (char)('\ue200' + '-'));
-			r = INVALIDFILECHARS.matcher(r).replaceAll("");
-			return Punycode.encode(r);
-		}
-		catch (PunycodeException ex)
-		{
-			throw new InvalidNameException(ex);
-		}
-	}
-
-	public static String decodeFileName(String name) throws InvalidNameException
-	{
-		try
-		{
-			String r = Punycode.decode(name);
-			r = r.replace((char)('\ue200' + '.'), '.');
-			r = r.replace((char)('\ue200' + '\\'), '\\');
-			r = r.replace((char)('\ue200' + '/'), '/');
-			r = r.replace((char)('\ue200' + '"'), '"');
-			r = r.replace((char)('\ue200' + '<'), '<');
-			r = r.replace((char)('\ue200' + '>'), '>');
-			r = r.replace((char)('\ue200' + '|'), '|');
-			r = r.replace((char)('\ue200' + '?'), '?');
-			r = r.replace((char)('\ue200' + '*'), '*');
-			r = r.replace((char)('\ue200' + ':'), ':');
-			r = r.replace((char)('\ue200' + '-'), '-');
-			return r;
-		}
-		catch (PunycodeException ex)
-		{
-			throw new InvalidNameException(ex);
-		}
-	}
-
-	public static String sanitizeKey(String name)
-	{
-		return INVALIDCHARS.matcher(name.toLowerCase(Locale.ENGLISH)).replaceAll("_");
-	}
-
-	public static String sanitizeString(final String string)
-	{
-		return INVALIDCHARS.matcher(string).replaceAll("");
+		return name.toLowerCase(Locale.ENGLISH).replaceAll("[^a-z0-9]", "_");
 	}
 
 	public static String formatDateDiff(long date)
@@ -483,10 +418,7 @@ public final class Util
 
 	public static String formatCurrency(final double value, final IEssentials ess)
 	{
-		@Cleanup
-		final ISettings settings = ess.getSettings();
-		settings.acquireReadLock();
-		String str = settings.getData().getEconomy().getCurrencySymbol() + df.format(value);
+		String str = ess.getSettings().getCurrencySymbol() + df.format(value);
 		if (str.endsWith(".00"))
 		{
 			str = str.substring(0, str.length() - 3);
@@ -545,87 +477,7 @@ public final class Util
 		}
 		return buf.toString();
 	}
-
-	public static void registerPermissions(String path, Collection<String> nodes, boolean hasDefault, IEssentials ess)
-	{
-		if (nodes == null || nodes.isEmpty())
-		{
-			return;
-		}
-		final PluginManager pluginManager = ess.getServer().getPluginManager();
-		Permission basePerm = pluginManager.getPermission(path + ".*");
-		if (basePerm != null && !basePerm.getChildren().isEmpty())
-		{
-			basePerm.getChildren().clear();
-		}
-		if (basePerm == null)
-		{
-			basePerm = new Permission(path + ".*", PermissionDefault.OP);
-			pluginManager.addPermission(basePerm);
-			Permission mainPerm = pluginManager.getPermission("essentials.*");
-			if (mainPerm == null)
-			{
-				mainPerm = new Permission("essentials.*", PermissionDefault.OP);
-				pluginManager.addPermission(mainPerm);
-			}
-			mainPerm.getChildren().put(basePerm.getName(), Boolean.TRUE);
-		}
-
-		for (String nodeName : nodes)
-		{
-			final String permissionName = path + "." + nodeName;
-			Permission perm = pluginManager.getPermission(permissionName);
-			if (perm == null)
-			{
-				final PermissionDefault defaultPerm = hasDefault && nodeName.equalsIgnoreCase("default") ? PermissionDefault.TRUE : PermissionDefault.OP;
-				perm = new Permission(permissionName, defaultPerm);
-				pluginManager.addPermission(perm);
-			}
-			basePerm.getChildren().put(permissionName, Boolean.TRUE);
-		}
-		basePerm.recalculatePermissibles();
-	}
-	private static transient final Pattern DOT_PATTERN = Pattern.compile("\\.");
-
-	public static Permission registerPermission(String permission, PermissionDefault defaultPerm)
-	{
-		final PluginManager pluginManager = Bukkit.getServer().getPluginManager();
-		final String[] parts = DOT_PATTERN.split(permission);
-		final StringBuilder builder = new StringBuilder(permission.length());
-		Permission parent = null;
-		for (int i = 0; i < parts.length - 1; i++)
-		{
-			builder.append(parts[i]).append(".*");
-			String permString = builder.toString();
-			Permission perm = pluginManager.getPermission(permString);
-			if (perm == null)
-			{
-				perm = new Permission(permString, PermissionDefault.FALSE);
-				pluginManager.addPermission(perm);
-				if (parent != null)
-				{
-					parent.getChildren().put(perm.getName(), Boolean.TRUE);
-				}
-				parent = perm;
-			}
-			builder.deleteCharAt(builder.length() - 1);
-		}
-		Permission perm = pluginManager.getPermission(permission);
-		if (perm == null)
-		{
-			perm = new Permission(permission, defaultPerm);
-			pluginManager.addPermission(perm);
-			if (parent != null)
-			{
-				parent.getChildren().put(perm.getName(), Boolean.TRUE);
-			}
-			parent = perm;
-		}
-		perm.recalculatePermissibles();
-		return perm;
-	}
-	private static transient final Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00A7+[0-9A-FKa-fk]");
-	private static transient final Pattern EASY_COLOR_PATTERN = Pattern.compile("&([0-9a-fk])");
+	private static transient final Pattern COLOR_PATTERN = Pattern.compile("(?i)\u00A7[0-9A-F]");
 
 	public static String stripColor(final String input)
 	{
@@ -634,16 +486,6 @@ public final class Util
 			return null;
 		}
 
-		return VANILLA_COLOR_PATTERN.matcher(input).replaceAll("");
-	}
-
-	public static String replaceColor(final String input)
-	{
-		if (input == null)
-		{
-			return null;
-		}
-
-		return EASY_COLOR_PATTERN.matcher(input).replaceAll("\u00a7$1");
+		return COLOR_PATTERN.matcher(input).replaceAll("");
 	}
 }

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

@@ -1,121 +1,120 @@
 package com.earth2me.essentials;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IWarp;
-import com.earth2me.essentials.api.IWarps;
-import com.earth2me.essentials.api.InvalidNameException;
-import com.earth2me.essentials.commands.WarpNotFoundException;
-import com.earth2me.essentials.settings.WarpHolder;
-import com.earth2me.essentials.storage.StorageObjectMap;
 import java.io.File;
 import java.util.*;
+import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.Server;
 
 
-public class Warps extends StorageObjectMap<IWarp> implements IWarps
+public class Warps implements IConf
 {
-	private static final Logger logger = Bukkit.getLogger();
+	private static final Logger logger = Logger.getLogger("Minecraft");
+	private final Map<StringIgnoreCase, EssentialsConf> warpPoints = new HashMap<StringIgnoreCase, EssentialsConf>();
+	private final File warpsFolder;
+	private final Server server;
 
-	public Warps(IEssentials ess)
+	public Warps(Server server, File dataFolder)
 	{
-		super(ess, "warps");
+		this.server = server;
+		warpsFolder = new File(dataFolder, "warps");
+		if (!warpsFolder.exists())
+		{
+			warpsFolder.mkdirs();
+		}
+		reloadConfig();
 	}
 
-	@Override
 	public boolean isEmpty()
 	{
-		return getKeySize() == 0;
+		return warpPoints.isEmpty();
+	}
+
+	public Collection<String> getWarpNames()
+	{
+		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;
+	}
+
+	public Location getWarp(String warp) throws Exception
+	{
+		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(warp));
+		if (conf == null)
+		{
+			throw new Exception(_("warpNotExist"));
+		}
+		return conf.getLocation(null, server);
+	}
+
+	public void setWarp(String name, Location loc) throws Exception
+	{
+		String filename = Util.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(_("similarWarpExist"));
+			}
+			conf = new EssentialsConf(confFile);
+			warpPoints.put(new StringIgnoreCase(name), conf);
+		}
+		conf.setProperty(null, loc);
+		conf.setProperty("name", name);
+		conf.save();
+	}
+
+	public void delWarp(String name) throws Exception
+	{
+		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
+		if (conf == null)
+		{
+			throw new Exception(_("warpNotExist"));
+		}
+		if (!conf.getFile().delete())
+		{
+			throw new Exception(_("warpDeleteError"));
+		}
+		warpPoints.remove(new StringIgnoreCase(name));
 	}
 
 	@Override
-	public Collection<String> getList()
+	public final void reloadConfig()
 	{
-		final List<String> names = new ArrayList<String>();
-		for (String key : getAllKeys())
+		warpPoints.clear();
+		File[] listOfFiles = warpsFolder.listFiles();
+		if (listOfFiles.length >= 1)
 		{
-			IWarp warp = getObject(key);
-			if (warp == null)
+			for (int i = 0; i < listOfFiles.length; i++)
 			{
-				continue;
-			}
-			warp.acquireReadLock();
-			try
-			{
-				names.add(warp.getData().getName());
-			}
-			finally
-			{
-				warp.unlock();
+				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, _("loadWarpError", filename), ex);
+					}
+				}
 			}
 		}
-		Collections.sort(names, String.CASE_INSENSITIVE_ORDER);
-		return names;
-	}
-
-	@Override
-	public Location getWarp(final String name) throws Exception
-	{
-		IWarp warp = getObject(name);
-		if (warp == null)
-		{
-			throw new WarpNotFoundException(_("warpNotExist"));
-		}
-		warp.acquireReadLock();
-		try
-		{
-			return warp.getData().getLocation().getBukkitLocation();
-		}
-		finally
-		{
-			warp.unlock();
-		}
-	}
-
-	@Override
-	public void setWarp(final String name, final Location loc) throws Exception
-	{
-		setWarp(name, new com.earth2me.essentials.storage.Location(loc));
-	}
-	
-	public void setWarp(final String name, final com.earth2me.essentials.storage.Location loc) throws Exception
-	{
-		IWarp warp = getObject(name);
-		if (warp == null)
-		{
-			warp = new WarpHolder(name, ess);
-		}
-		warp.acquireWriteLock();
-		try
-		{
-			warp.getData().setLocation(loc);
-		}
-		finally
-		{
-			warp.unlock();
-		}
-	}
-
-	@Override
-	public void removeWarp(final String name) throws Exception
-	{
-		removeObject(name);
-	}
-
-	@Override
-	public File getWarpFile(String name) throws InvalidNameException
-	{
-		return getStorageFile(name);
-	}
-
-	@Override
-	public IWarp load(String name) throws Exception
-	{
-		final IWarp warp = new WarpHolder(name, ess);
-		warp.onReload();
-		return warp;
 	}
 
 

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

@@ -1,86 +1,61 @@
 package com.earth2me.essentials;
 
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IWorth;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
-import com.earth2me.essentials.storage.EnchantmentLevel;
 import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import org.bukkit.enchantments.Enchantment;
+import java.util.Locale;
+import java.util.logging.Logger;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.material.MaterialData;
 
 
-public class Worth extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Worth> implements IWorth
+public class Worth implements IConf
 {
-	public Worth(final IEssentials ess)
+	private static final Logger logger = Logger.getLogger("Minecraft");
+	private final EssentialsConf config;
+
+	public Worth(File dataFolder)
 	{
-		super(ess, com.earth2me.essentials.settings.Worth.class);
-		onReload(false);
+		config = new EssentialsConf(new File(dataFolder, "worth.yml"));
+		config.setTemplateName("/worth.yml");
+		config.load();
 	}
 
-	@Override
-	public double getPrice(final ItemStack itemStack)
+	public double getPrice(ItemStack itemStack)
 	{
-		this.acquireReadLock();
-		try
+		String itemname = itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
+		double result;
+		result = config.getDouble("worth." + itemname + "." + itemStack.getDurability(), Double.NaN);
+		if (Double.isNaN(result))
 		{
-			final Map<MaterialData, Double> prices = this.getData().getSell();
-			if (prices == null || itemStack == null)
-			{
-				return Double.NaN;
-			}
-			final Double basePrice = prices.get(itemStack.getData());
-			if (basePrice == null || Double.isNaN(basePrice))
-			{
-				return Double.NaN;
-			}
-			double multiplier = 1.0;
-			if (itemStack.getType().getMaxDurability() > 0) {
-				multiplier *= (double)itemStack.getDurability() / (double)itemStack.getType().getMaxDurability();
-			}
-			if (itemStack.getEnchantments() != null && !itemStack.getEnchantments().isEmpty())
-			{
-				final Map<EnchantmentLevel, Double> enchantmentMultipliers = this.getData().getEnchantmentMultiplier();
-				if (enchantmentMultipliers != null)
-				{
-					for (Map.Entry<Enchantment, Integer> entry : itemStack.getEnchantments().entrySet())
-					{
-						final Double enchMult = enchantmentMultipliers.get(new EnchantmentLevel(entry.getKey(), entry.getValue()));
-						if (enchMult != null)
-						{
-							multiplier *= enchMult;
-						}
-					}
-				}
-			}
-			return basePrice * multiplier;
+			result = config.getDouble("worth." + itemname + ".0", Double.NaN);
 		}
-		finally
+		if (Double.isNaN(result))
 		{
-			this.unlock();
+			result = config.getDouble("worth." + itemname, Double.NaN);
 		}
+		if (Double.isNaN(result))
+		{
+			result = config.getDouble("worth-" + itemStack.getTypeId(), Double.NaN);
+		}
+		return result;
+	}
+
+	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 setPrice(final ItemStack itemStack, final double price)
+	public void reloadConfig()
 	{
-		acquireWriteLock();
-		try {
-			if (getData().getSell() == null) {
-				getData().setSell(new HashMap<MaterialData, Double>());
-			}
-			getData().getSell().put(itemStack.getData(), price);
-		} finally {
-			unlock();
-		}
-	}
-
-	@Override
-	public File getStorageFile() throws IOException
-	{
-		return new File(ess.getDataFolder(), "worth.yml");
+		config.load();
 	}
 }

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

@@ -1,6 +1,14 @@
 package com.earth2me.essentials.api;
 
+import com.earth2me.essentials.EssentialsConf;
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.IEssentials;
+import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
+import java.io.File;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.entity.Player;
 
 
 /**
@@ -12,9 +20,71 @@ public final class Economy
 	private Economy()
 	{
 	}
+	private static final Logger logger = Logger.getLogger("Minecraft");
 	private static IEssentials ess;
 	private static final String noCallBeforeLoad = "Essentials API is called before Essentials is loaded.";
 
+	/**
+	 * @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();
+		}
+		EssentialsConf npcConfig = new EssentialsConf(new File(folder, Util.sanitizeFileName(name) + ".yml"));
+		npcConfig.load();
+		npcConfig.setProperty("npc", true);
+		npcConfig.setProperty("money", ess.getSettings().getStartingBalance());
+		npcConfig.save();
+	}
+
+	private static void deleteNPC(String name)
+	{
+		File folder = new File(ess.getDataFolder(), "userdata");
+		if (!folder.exists())
+		{
+			folder.mkdirs();
+		}
+		File config = new File(folder, Util.sanitizeFileName(name) + ".yml");
+		EssentialsConf npcConfig = new EssentialsConf(config);
+		npcConfig.load();
+		if (npcConfig.hasProperty("npc") && npcConfig.getBoolean("npc", false))
+		{
+			if (!config.delete())
+			{
+				logger.log(Level.WARNING, _("deleteFileError", config));
+			}
+			ess.getUserMap().removeUser(name);
+		}
+	}
+
+	private static User getUserByName(String name)
+	{
+		if (ess == null)
+		{
+			throw new RuntimeException(noCallBeforeLoad);
+		}
+		User user;
+		Player player = ess.getServer().getPlayer(name);
+		if (player != null)
+		{
+			user = ess.getUser(player);
+		}
+		else
+		{
+			user = ess.getOfflineUser(name);
+		}
+		return user;
+	}
+
 	/**
 	 * Returns the balance of a user
 	 * @param name Name of the user
@@ -23,11 +93,12 @@ public final class Economy
 	 */
 	public static double getMoney(String name) throws UserDoesNotExistException
 	{
-		if (ess == null)
+		User user = getUserByName(name);
+		if (user == null)
 		{
-			throw new RuntimeException(noCallBeforeLoad);
+			throw new UserDoesNotExistException(name);
 		}
-		return ess.getEconomy().getMoney(name);
+		return user.getMoney();
 	}
 
 	/**
@@ -39,11 +110,16 @@ public final class Economy
 	 */
 	public static void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException
 	{
-		if (ess == null)
+		User user = getUserByName(name);
+		if (user == null)
 		{
-			throw new RuntimeException(noCallBeforeLoad);
+			throw new UserDoesNotExistException(name);
 		}
-		ess.getEconomy().setMoney(name, balance);
+		if (balance < 0.0 && !user.isAuthorized("essentials.eco.loan"))
+		{
+			throw new NoLoanPermittedException();
+		}
+		user.setMoney(balance);
 	}
 
 	/**
@@ -110,7 +186,7 @@ public final class Economy
 		{
 			throw new RuntimeException(noCallBeforeLoad);
 		}
-		ess.getEconomy().resetBalance(name);
+		setMoney(name, ess.getSettings().getStartingBalance());
 	}
 
 	/**
@@ -179,11 +255,7 @@ public final class Economy
 	 */
 	public static boolean playerExists(String name)
 	{
-		if (ess == null)
-		{
-			throw new RuntimeException(noCallBeforeLoad);
-		}
-		return ess.getEconomy().playerExists(name);
+		return getUserByName(name) != null;
 	}
 
 	/**
@@ -194,11 +266,12 @@ public final class Economy
 	 */
 	public static boolean isNPC(String name) throws UserDoesNotExistException
 	{
-		if (ess == null)
+		User user = getUserByName(name);
+		if (user == null)
 		{
-			throw new RuntimeException(noCallBeforeLoad);
+			throw new UserDoesNotExistException(name);
 		}
-		return ess.getEconomy().isNPC(name);
+		return user.isNPC();
 	}
 
 	/**
@@ -208,11 +281,13 @@ public final class Economy
 	 */
 	public static boolean createNPC(String name)
 	{
-		if (ess == null)
+		User user = getUserByName(name);
+		if (user == null)
 		{
-			throw new RuntimeException(noCallBeforeLoad);
+			createNPCFile(name);
+			return true;
 		}
-		return ess.getEconomy().createNPC(name);
+		return false;
 	}
 
 	/**
@@ -222,10 +297,11 @@ public final class Economy
 	 */
 	public static void removeNPC(String name) throws UserDoesNotExistException
 	{
-		if (ess == null)
+		User user = getUserByName(name);
+		if (user == null)
 		{
-			throw new RuntimeException(noCallBeforeLoad);
+			throw new UserDoesNotExistException(name);
 		}
-		ess.getEconomy().removeNPC(name);
+		deleteNPC(name);
 	}
 }

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

@@ -0,0 +1,10 @@
+package com.earth2me.essentials.api;
+
+import java.util.Map;
+import org.bukkit.command.PluginCommand;
+
+
+public interface IAlternativeCommandsHandler
+{	
+	Map<String, String> disabledCommands();
+}

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

@@ -1,7 +0,0 @@
-package com.earth2me.essentials.api;
-
-
-public interface IBackup extends Runnable
-{
-	public void startTask();
-}

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

@@ -1,20 +0,0 @@
-package com.earth2me.essentials.api;
-
-import java.util.Map;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
-
-
-public interface ICommandHandler extends IReload
-{
-	Map<String, String> disabledCommands();
-
-	public void removePlugin(Plugin plugin);
-
-	public void addPlugin(Plugin plugin);
-
-	boolean handleCommand(CommandSender sender, Command command, String commandLabel, String[] args);
-
-	void showCommandError(CommandSender sender, String commandLabel, Throwable exception);
-}

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

@@ -1,21 +0,0 @@
-package com.earth2me.essentials.api;
-
-
-public interface IEconomy extends IReload
-{
-	public double getMoney(String name) throws UserDoesNotExistException;
-
-	public void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException;
-
-	public void resetBalance(String name) throws UserDoesNotExistException, NoLoanPermittedException;
-
-	public String format(double amount);
-
-	public boolean playerExists(String name);
-
-	public boolean isNPC(String name) throws UserDoesNotExistException;
-
-	public boolean createNPC(String name);
-
-	public void removeNPC(String name) throws UserDoesNotExistException;
-}

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

@@ -1,19 +1,17 @@
 package com.earth2me.essentials.api;
 
-import com.earth2me.essentials.listener.TntExplodeListener;
+import com.earth2me.essentials.perm.IPermissionsHandler;
 import com.earth2me.essentials.register.payment.Methods;
 import org.bukkit.World;
-import org.bukkit.entity.Player;
+import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
 
 
-public interface IEssentials extends Plugin
+public interface IEssentials extends Plugin, IReload
 {
 	void addReloadListener(IReload listener);
 
-	IUser getUser(Player player);
-
-	IUser getUser(String playerName);
+	IUser getUser(Object base);
 
 	int broadcastMessage(IUser sender, String message);
 
@@ -21,11 +19,7 @@ public interface IEssentials extends Plugin
 
 	ISettings getSettings();
 
-	IGroups getGroups();
-
-	IJails getJails();
-
-	IKits getKits();
+	IJails getJail();
 
 	IWarps getWarps();
 
@@ -35,9 +29,7 @@ public interface IEssentials extends Plugin
 
 	IUserMap getUserMap();
 
-	IBackup getBackup();
-
-	ICommandHandler getCommandHandler();
+	IEssentialsEconomy getEconomy();
 
 	World getWorld(String name);
 
@@ -51,14 +43,9 @@ public interface IEssentials extends Plugin
 
 	int scheduleSyncRepeatingTask(Runnable run, long delay, long period);
 
-	//IPermissionsHandler getPermissionsHandler();
-	void reload();
+	IPermissionsHandler getPermissionsHandler();
 
-	TntExplodeListener getTNTListener();
+	IAlternativeCommandsHandler getAlternativeCommandsHandler();
 
-	void setGroups(IGroups groups);
-
-	void removeReloadListener(IReload groups);
-
-	IEconomy getEconomy();
+	void showCommandError(CommandSender sender, String commandLabel, Throwable exception);
 }

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

@@ -0,0 +1,37 @@
+package com.earth2me.essentials.api;
+
+
+public interface IEssentialsEconomy
+{
+	double getMoney(String name) throws UserDoesNotExistException;
+
+	void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException;
+
+	void add(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException;
+
+	void subtract(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException;
+
+	void divide(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException;
+
+	void multiply(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException;
+
+	void resetBalance(String name) throws UserDoesNotExistException, NoLoanPermittedException;
+
+	boolean hasEnough(String name, double amount) throws UserDoesNotExistException;
+
+	boolean hasMore(String name, double amount) throws UserDoesNotExistException;
+
+	boolean hasLess(String name, double amount) throws UserDoesNotExistException;
+
+	boolean isNegative(String name) throws UserDoesNotExistException;
+
+	String format(double amount);
+
+	boolean playerExists(String name);
+
+	boolean isNPC(String name) throws UserDoesNotExistException;
+
+	boolean createNPC(String name);
+
+	void removeNPC(String name) throws UserDoesNotExistException;
+}

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

@@ -1,25 +0,0 @@
-package com.earth2me.essentials.api;
-
-import java.text.MessageFormat;
-
-
-public interface IGroups
-{
-	String getMainGroup(IUser player);
-
-	boolean inGroup(IUser player, String groupname);
-
-	double getHealCooldown(IUser player);
-
-	double getTeleportCooldown(IUser player);
-
-	double getTeleportDelay(IUser player);
-
-	String getPrefix(IUser player);
-
-	String getSuffix(IUser player);
-
-	int getHomeLimit(IUser player);
-
-	MessageFormat getChatFormat(IUser player);
-}

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

@@ -3,11 +3,9 @@ package com.earth2me.essentials.api;
 import org.bukkit.inventory.ItemStack;
 
 
-public interface IItemDb extends IReload
+public interface IItemDb
 {
-	ItemStack get(final String name, final IUser user) throws Exception;
-
 	ItemStack get(final String name, final int quantity) throws Exception;
-
+	
 	ItemStack get(final String name) throws Exception;
 }

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

@@ -12,7 +12,7 @@ public interface IJails extends IReload
 
 	void removeJail(String jail) throws Exception;
 
-	void sendToJail(IUser user, String jail) throws Exception;
+	void sendToJail(com.earth2me.essentials.IUser user, String jail) throws Exception;
 
 	void setJail(String jailName, Location loc) throws Exception;
 }

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

@@ -1,18 +0,0 @@
-package com.earth2me.essentials.api;
-
-import com.earth2me.essentials.settings.Kit;
-import java.util.Collection;
-
-
-public interface IKits extends IReload
-{
-	Kit getKit(String kit) throws Exception;
-
-	void sendKit(IUser user, String kit) throws Exception;
-
-	void sendKit(IUser user, Kit kit) throws Exception;
-
-	Collection<String> getList() throws Exception;
-
-	boolean isEmpty();
-}

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

@@ -1,17 +0,0 @@
-package com.earth2me.essentials.api;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionDefault;
-
-
-public interface IPermission
-{
-	String getPermission();
-
-	boolean isAuthorized(CommandSender sender);
-
-	Permission getBukkitPermission();
-
-	PermissionDefault getPermissionDefault();
-}

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

@@ -1,11 +0,0 @@
-package com.earth2me.essentials.api;
-
-import org.bukkit.command.CommandSender;
-
-
-public interface IReplyTo
-{
-	void setReplyTo(CommandSender user);
-
-	CommandSender getReplyTo();
-}

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

@@ -6,9 +6,5 @@ import com.earth2me.essentials.storage.IStorageObjectHolder;
 
 public interface ISettings extends IStorageObjectHolder<Settings>
 {
-	public String getLocale();
-
-	public boolean isDebug();
-
-	public void setDebug(boolean b);
+	
 }

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

@@ -1,28 +1,10 @@
 package com.earth2me.essentials.api;
 
-import com.earth2me.essentials.Trade;
 import org.bukkit.Location;
-import org.bukkit.entity.Entity;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public interface ITeleport
 {
 	void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception;
-
-	void now(Entity entity, boolean cooldown, TeleportCause cause) throws Exception;
-
-	void back(Trade chargeFor) throws Exception;
-
-	void teleport(Location bed, Trade charge, TeleportCause teleportCause) throws Exception;
-
-	void teleport(Entity entity, Trade chargeFor, TeleportCause cause) throws Exception;
-
-	void home(IUser player, String toLowerCase, Trade charge) throws Exception;
-
-	void respawn(Trade charge, TeleportCause teleportCause) throws Exception;
-
-	void back() throws Exception;
-
-	public void warp(String name, Trade charge, TeleportCause teleportCause) throws Exception;
 }

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

@@ -1,104 +1,43 @@
 package com.earth2me.essentials.api;
 
-import com.earth2me.essentials.storage.IStorageObjectHolder;
-import com.earth2me.essentials.user.CooldownException;
-import com.earth2me.essentials.user.UserData;
-import java.util.List;
+import com.earth2me.essentials.commands.IEssentialsCommand;
 import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
 
 
-public interface IUser extends Player, IStorageObjectHolder<UserData>, IReload, IReplyTo, Comparable<IUser>
+public interface IUser extends Player, IReload
 {
+	long getLastTeleportTimestamp();
+
+	boolean isAuthorized(String node);
+
+	boolean isAuthorized(IEssentialsCommand cmd);
+
+	boolean isAuthorized(IEssentialsCommand cmd, String permissionPrefix);
+
+	void setLastTeleportTimestamp(long time);
+
+	Location getLastLocation();
+
 	Player getBase();
 
 	double getMoney();
 
 	void takeMoney(double value);
 
-	void takeMoney(double value, CommandSender initiator);
-
 	void giveMoney(double value);
 
-	void giveMoney(double value, CommandSender initiator);
-
-	void giveItems(ItemStack itemStack, Boolean canSpew) throws ChargeException;
-
-	void giveItems(List<ItemStack> itemStacks, Boolean canSpew) throws ChargeException;
-
-	void setMoney(double value);
-
-	void payUser(final IUser reciever, final double value) throws Exception;
+	String getGroup();
 
 	void setLastLocation();
 
 	Location getHome(String name) throws Exception;
 
-	Location getHome(Location loc);
+	Location getHome(Location loc) throws Exception;
 
 	boolean isHidden();
-
+	
 	ITeleport getTeleport();
-
-	void checkCooldown(UserData.TimestampType cooldownType, double cooldown, boolean set, IPermission bypassPermission) throws CooldownException;
-
-	boolean toggleAfk();
-
-	void updateActivity(boolean broadcast);
-
-	void updateDisplayName();
-
-	boolean checkJailTimeout(long currentTime);
-
-	boolean checkMuteTimeout(long currentTime);
-
-	boolean checkBanTimeout(long currentTime);
-
-	long getTimestamp(UserData.TimestampType name);
-
-	void setTimestamp(UserData.TimestampType name, long value);
-
-	void setLastOnlineActivity(long currentTime);
-
-	void checkActivity();
-
-	long getLastOnlineActivity();
-
-	boolean isGodModeEnabled();
-
-	boolean isIgnoringPlayer(String name);
-
-	void setIgnoredPlayer(String name, boolean set);
-
-	Location getAfkPosition();
-
-	boolean toggleGodModeEnabled();
-
-	void dispose();
-
-	void updateCompass();
-
-	List<String> getHomes();
-
-	void addMail(String string);
-
-	boolean toggleMuted();
-
-	boolean toggleSocialSpy();
-
-	void requestTeleport(IUser user, boolean b);
-
-	boolean isTeleportRequestHere();
-
-	IUser getTeleportRequester();
-
-	boolean toggleTeleportEnabled();
-
-	long getTeleportRequestTime();
-
-	boolean gotMailInfo();
-
-	List<String> getMails();
+	
+	void setJail(String jail);
 }

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

@@ -2,22 +2,19 @@ package com.earth2me.essentials.api;
 
 import java.io.File;
 import java.util.Set;
-import org.bukkit.entity.Player;
 
 
-public interface IUserMap extends IReload
+public interface IUserMap
 {
 	boolean userExists(final String name);
 
-	IUser getUser(final Player player);
+	IUser getUser(final String name);
 
-	IUser getUser(final String playerName);
-
-	void removeUser(final String name) throws InvalidNameException;
+	void removeUser(final String name);
 
 	Set<String> getAllUniqueUsers();
 
 	int getUniqueUsers();
 
-	File getUserFile(final String name) throws InvalidNameException;
+	File getUserFile(final String name);
 }

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

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

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

@@ -1,6 +1,5 @@
 package com.earth2me.essentials.api;
 
-import java.io.File;
 import java.util.Collection;
 import org.bukkit.Location;
 
@@ -9,13 +8,9 @@ public interface IWarps extends IReload
 {
 	Location getWarp(String warp) throws Exception;
 
-	Collection<String> getList();
+	Collection<String> getWarps();
 
 	void removeWarp(String name) throws Exception;
 
 	void setWarp(String name, Location loc) throws Exception;
-
-	public boolean isEmpty();
-
-	public File getWarpFile(String name) throws InvalidNameException;
 }

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

@@ -1,10 +0,0 @@
-package com.earth2me.essentials.api;
-
-
-public class InvalidNameException extends Exception
-{
-	public InvalidNameException(Throwable thrwbl)
-	{
-		super(thrwbl);
-	}
-}

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

@@ -1,20 +1,23 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
 
 
 public class Commandafk extends EssentialsCommand
 {
-	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
+	public Commandafk()
 	{
-		if (args.length > 0 && Permissions.AFK_OTHERS.isAuthorized(user))
+		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"))
 		{
-			IUser afkUser = ess.getUser((Player)ess.getServer().matchPlayer(args[0]));
+			User afkUser = ess.getUser(ess.getServer().matchPlayer(args[0]));
 			if (afkUser != null)
 			{
 				toggleAfk(afkUser);
@@ -26,7 +29,7 @@ public class Commandafk extends EssentialsCommand
 		}
 	}
 
-	private void toggleAfk(IUser user)
+	private void toggleAfk(User user)
 	{
 		if (!user.toggleAfk())
 		{
@@ -46,10 +49,4 @@ public class Commandafk extends EssentialsCommand
 			}
 		}
 	}
-	
-	@Override
-	public PermissionDefault getPermissionDefault()
-	{
-		return PermissionDefault.TRUE;
-	}
 }

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

@@ -1,15 +1,21 @@
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
 import org.bukkit.Location;
+import org.bukkit.Server;
 import org.bukkit.entity.TNTPrimed;
 
 
 public class Commandantioch extends EssentialsCommand
 {
+	public Commandantioch()
+	{
+		super("antioch");
+	}
+
 	@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
 	{
 		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.");

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

@@ -2,18 +2,23 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
 
 
 public class Commandback extends EssentialsCommand
 {
-	@Override
-	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
+	public Commandback()
 	{
-		final Trade charge = new Trade(commandName, ess);
+		super("back");
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		final Trade charge = new Trade(this.getName(), ess);
 		charge.isAffordableFor(user);
 		user.sendMessage(_("backUsageMsg"));
 		user.getTeleport().back(charge);
-		throw new NoChargeException();
 	}
 }

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

@@ -1,16 +1,26 @@
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.Backup;
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IBackup;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
 
 public class Commandbackup extends EssentialsCommand
 {
-	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public Commandbackup()
 	{
-		final IBackup backup = ess.getBackup();
+		super("backup");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		final Backup backup = ess.getBackup();
+		if (backup == null)
+		{
+			throw new Exception();
+		}
 		backup.run();
 		sender.sendMessage(_("backupStarted"));
 	}

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

@@ -1,31 +1,37 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
 
 public class Commandbalance extends EssentialsCommand
 {
+	public Commandbalance()
+	{
+		super("balance");
+	}
+
 	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		sender.sendMessage(_("balance", Util.formatCurrency(getPlayer(args, 0, true).getMoney(), ess)));
+		sender.sendMessage(_("balance", Util.formatCurrency(getPlayer(server, args, 0, true).getMoney(), ess)));
 	}
 
 	@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 double bal = (args.length < 1
-							|| !Permissions.BALANCE_OTHERS.isAuthorized(user)
+							|| !(user.isAuthorized("essentials.balance.others")
+								 || user.isAuthorized("essentials.balance.other"))
 							? user
-							: getPlayer(args, 0, true)).getMoney();
+							: getPlayer(server, args, 0, true)).getMoney();
 		user.sendMessage(_("balance", Util.formatCurrency(bal, ess)));
 	}
 }

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

@@ -1,19 +1,24 @@
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.User;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.textreader.ArrayListInput;
 import com.earth2me.essentials.textreader.TextPager;
 import java.text.DateFormat;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
 
 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 ArrayListInput cache = new ArrayListInput();
@@ -21,7 +26,7 @@ public class Commandbalancetop extends EssentialsCommand
 	private static ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
 
 	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		int page = 0;
 		boolean force = false;
@@ -104,10 +109,10 @@ public class Commandbalancetop extends EssentialsCommand
 					final Map<String, Double> balances = new HashMap<String, Double>();
 					for (String u : ess.getUserMap().getAllUniqueUsers())
 					{
-						final IUser user = ess.getUserMap().getUser(u);
+						final User user = ess.getUserMap().getUser(u);
 						if (user != null)
 						{
-							balances.put(user.getDisplayName(), user.getMoney());
+							balances.put(u, user.getMoney());
 						}
 					}
 

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

@@ -2,28 +2,32 @@ package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.Console;
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import com.earth2me.essentials.user.Ban;
-import lombok.Cleanup;
+import com.earth2me.essentials.OfflinePlayer;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
 public class Commandban extends EssentialsCommand
 {
+	public Commandban()
+	{
+		super("ban");
+	}
+
 	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		@Cleanup
-		final IUser user = getPlayer(args, 0, true);
-		if (user.isOnline())
+		final User user = getPlayer(server, args, 0, true);
+		if (user.getBase() instanceof OfflinePlayer)
 		{
-			if (Permissions.BAN_EXEMPT.isAuthorized(user))
+			if (sender instanceof Player
+				&& !ess.getUser(sender).isAuthorized("essentials.ban.offline"))
 			{
 				sender.sendMessage(_("banExempt"));
 				return;
@@ -31,20 +35,18 @@ public class Commandban extends EssentialsCommand
 		}
 		else
 		{
-			if (Permissions.BAN_OFFLINE.isAuthorized(sender))
+			if (user.isAuthorized("essentials.ban.exempt"))
 			{
 				sender.sendMessage(_("banExempt"));
 				return;
 			}
 		}
 
-		user.acquireWriteLock();
 		String banReason;
-		user.getData().setBan(new Ban());
 		if (args.length > 1)
 		{
 			banReason = getFinalArg(args, 1);
-			user.getData().getBan().setReason(banReason);
+			user.setBanReason(banReason);
 		}
 		else
 		{
@@ -56,8 +58,8 @@ public class Commandban extends EssentialsCommand
 
 		for (Player onlinePlayer : server.getOnlinePlayers())
 		{
-			final IUser player = ess.getUser(onlinePlayer);
-			if (Permissions.BAN_NOTIFY.isAuthorized(player))
+			final User player = ess.getUser(onlinePlayer);
+			if (player.isAuthorized("essentials.ban.notify"))
 			{
 				onlinePlayer.sendMessage(_("playerBanned", senderName, user.getName(), banReason));
 			}

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

@@ -1,24 +1,27 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import lombok.Cleanup;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
 
 public class Commandbanip extends EssentialsCommand
 {
+	public Commandbanip()
+	{
+		super("banip");
+	}
+
 	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
 
-		@Cleanup
-		final IUser player = ess.getUser(args[0]);
-		player.acquireReadLock();
+		final User player = ess.getUser(args[0]);
 
 		if (player == null)
 		{
@@ -27,12 +30,12 @@ public class Commandbanip extends EssentialsCommand
 		}
 		else
 		{
-			final String ipAddress = player.getData().getIpAddress();
+			final String ipAddress = player.getLastLoginAddress();
 			if (ipAddress.length() == 0)
 			{
 				throw new Exception(_("playerNotFound"));
 			}
-			ess.getServer().banIP(player.getData().getIpAddress());
+			ess.getServer().banIP(player.getLastLoginAddress());
 			sender.sendMessage(_("banIpAddress"));
 		}
 	}

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

@@ -1,16 +1,22 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
 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 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
 	{
 		TreeType tree;
 		if (args.length > 0 && args[0].equalsIgnoreCase("redwood"))

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

@@ -1,17 +1,22 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+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.getTargetBlock(null, 20);
 		if (block == null)
@@ -22,7 +27,7 @@ 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("You are not allowed to destroy bedrock."); //TODO: Translation
 		}

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

@@ -1,13 +1,19 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
 
 public class Commandbroadcast extends EssentialsCommand
 {
+	public Commandbroadcast()
+	{
+		super("broadcast");
+	}
+
 	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{

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

@@ -1,14 +1,20 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
 public class Commandburn extends EssentialsCommand
 {
+	public Commandburn()
+	{
+		super("burn");
+	}
+
 	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 2)
 		{

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

@@ -1,20 +1,25 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.User;
 import java.util.List;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
 public class Commandclearinventory extends EssentialsCommand
 {
+	public Commandclearinventory()
+	{
+		super("clearinventory");
+	}
+
 	//TODO: Cleanup
 	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
 	{
-		if (args.length > 0 && Permissions.CLEARINVENTORY_OTHERS.isAuthorized(user))
+		if (args.length > 0 && user.isAuthorized("essentials.clearinventory.others"))
 		{
 			//TODO: Fix fringe user match case.
 			if (args[0].length() >= 3)
@@ -54,7 +59,7 @@ public class Commandclearinventory extends EssentialsCommand
 	}
 
 	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{

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

@@ -1,13 +1,19 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
 
 
 public class Commandcompass extends EssentialsCommand
 {
+	public Commandcompass()
+	{
+		super("compass");
+	}
+
 	@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 int bearing = (int)(user.getLocation().getYaw() + 180 + 360) % 360;
 		String dir;

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

@@ -1,43 +1,34 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.User;
 import java.util.Locale;
-import lombok.Cleanup;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 
 public class Commanddelhome extends EssentialsCommand
 {
+	public Commanddelhome()
+	{
+		super("delhome");
+	}
+
 	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
 
-		@Cleanup
-		IUser user = sender instanceof Player ? ess.getUser((Player)sender) : null;
+		User user = ess.getUser(sender);
 		String name;
-		String[] expandedArg;
+		final String[] expandedArg = args[0].split(":");
 
-		//Allowing both formats /sethome khobbits house | /sethome khobbits:house
-		final String[] nameParts = args[0].split(":");
-		if (nameParts[0].length() != args[0].length())
+		if (expandedArg.length > 1 && (user == null || user.isAuthorized("essentials.delhome.others")))
 		{
-			expandedArg = nameParts;
-		}
-		else
-		{
-			expandedArg = args;
-		}
-
-		if (expandedArg.length > 1 && (user == null || Permissions.DELHOME_OTHERS.isAuthorized(user)))
-		{
-			user = getPlayer(expandedArg, 0, true);
+			user = getPlayer(server, expandedArg, 0, true);
 			name = expandedArg[1];
 		}
 		else if (user == null)
@@ -50,10 +41,11 @@ public class Commanddelhome extends EssentialsCommand
 		}
 		//TODO: Think up a nice error message
 		/*
-		 * if (name.equalsIgnoreCase("bed")) { throw new Exception("You cannot remove the vanilla home point"); }
+		 * if (name.equalsIgnoreCase("bed")) {
+		 *   throw new Exception("You cannot remove the vanilla home point");
+		 * }
 		 */
-		user.acquireWriteLock();
-		user.getData().removeHome(name.toLowerCase(Locale.ENGLISH));
+		user.delHome(name.toLowerCase(Locale.ENGLISH));
 		sender.sendMessage(_("deleteHome", name));
 	}
 }

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

@@ -1,13 +1,19 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
 
 public class Commanddeljail extends EssentialsCommand
 {
+	public Commanddeljail()
+	{
+		super("deljail");
+	}
+
 	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{

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

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

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

@@ -1,13 +1,19 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
 
 
 public class Commanddepth extends EssentialsCommand
 {
+	public Commanddepth()
+	{
+		super("depth");
+	}
+
 	@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 int depth = user.getLocation().getBlockY() - 63;
 		if (depth > 0)

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

@@ -1,17 +1,21 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.User;
 import java.util.Locale;
-import lombok.Cleanup;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
 public class Commandeco extends EssentialsCommand
 {
+	public Commandeco()
+	{
+		super("eco");
+	}
+
 	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 2)
 		{
@@ -33,7 +37,7 @@ public class Commandeco extends EssentialsCommand
 		{
 			for (Player onlinePlayer : server.getOnlinePlayers())
 			{
-				final IUser player = ess.getUser(onlinePlayer);
+				final User player = ess.getUser(onlinePlayer);
 				switch (cmd)
 				{
 				case GIVE:
@@ -45,17 +49,14 @@ public class Commandeco extends EssentialsCommand
 					break;
 
 				case RESET:
-					@Cleanup 
-					ISettings settings = ess.getSettings();
-					settings.acquireReadLock();
-					player.setMoney(amount == 0 ? settings.getData().getEconomy().getStartingBalance() : amount);
+					player.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
 					break;
 				}
 			}
 		}
 		else
 		{
-			final IUser player = getPlayer(args, 1, true);
+			final User player = getPlayer(server, args, 1, true);
 			switch (cmd)
 			{
 			case GIVE:
@@ -67,9 +68,7 @@ public class Commandeco extends EssentialsCommand
 				break;
 
 			case RESET:
-				@Cleanup ISettings settings = ess.getSettings();
-				settings.acquireReadLock();
-				player.setMoney(amount == 0 ? settings.getData().getEconomy().getStartingBalance() : amount);
+				player.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
 				break;
 			}
 		}

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

@@ -2,22 +2,24 @@ package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.Enchantments;
 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.EnchantPermissions;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
+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 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 ItemStack stack = user.getItemInHand();
 		if (stack == null)
@@ -30,7 +32,7 @@ public class Commandenchant extends EssentialsCommand
 			for (Map.Entry<String, Enchantment> entry : Enchantments.entrySet())
 			{
 				final String enchantmentName = entry.getValue().getName().toLowerCase(Locale.ENGLISH);
-				if (enchantmentslist.contains(enchantmentName) || EnchantPermissions.getPermission(enchantmentName).isAuthorized(user))
+				if (enchantmentslist.contains(enchantmentName) || user.isAuthorized("essentials.enchant." + enchantmentName))
 				{
 					enchantmentslist.add(entry.getKey());
 					//enchantmentslist.add(enchantmentName);
@@ -76,7 +78,7 @@ public class Commandenchant extends EssentialsCommand
 		}
 	}
 
-	public static Enchantment getEnchantment(final String name, final IUser user) throws Exception
+	public static Enchantment getEnchantment(final String name, final User user) throws Exception
 	{
 
 		final Enchantment enchantment = Enchantments.getByName(name);
@@ -85,7 +87,7 @@ public class Commandenchant extends EssentialsCommand
 			throw new Exception(_("enchantmentNotFound"));
 		}
 		final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
-		if (user != null && !EnchantPermissions.getPermission(enchantmentName).isAuthorized(user))
+		if (user != null && !user.isAuthorized("essentials.enchant." + enchantmentName))
 		{
 			throw new Exception(_("enchantmentPerm", enchantmentName));
 		}

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

@@ -1,10 +1,12 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.Util;
 import java.util.HashMap;
 import java.util.Map;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.Server;
 import org.bukkit.block.Block;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -12,60 +14,61 @@ import org.bukkit.entity.Player;
 
 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 CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
-		if (args.length == 0)
-		{
-			run_disabled(sender, args);
+		if (args.length == 0) {
+			run_disabled(server, sender, commandLabel, args);
 		}
 		else if (args[0].equalsIgnoreCase("debug"))
 		{
-			run_debug(sender, args);
+			run_debug(server, sender, commandLabel, args);
 		}
 		else if (args[0].equalsIgnoreCase("nya"))
 		{
-			run_nya(sender, args);
+			run_nya(server, sender, commandLabel, args);
 		}
-		else
-		{
-			run_reload(sender, args);
+		else {
+			run_reload(server, sender, commandLabel, args);
 		}
 	}
-
-	private void run_disabled(final CommandSender sender, final String[] args) throws Exception
+	
+	private void run_disabled(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		sender.sendMessage("Essentials " + ess.getDescription().getVersion());
 		sender.sendMessage("/<command> <reload/debug>");
 		sender.sendMessage(_("blockList"));
 		final StringBuilder disabledCommands = new StringBuilder();
-		for (Map.Entry<String, String> entry : ess.getCommandHandler().disabledCommands().entrySet())
+		for (Map.Entry<String, String> entry : ess.getAlternativeCommandsHandler().disabledCommands().entrySet())
 		{
-			if (disabledCommands.length() > 0)
-			{
+			if (disabledCommands.length() > 0) {
 				disabledCommands.append(", ");
 			}
 			disabledCommands.append(entry.getKey()).append(" => ").append(entry.getValue());
 		}
 		sender.sendMessage(disabledCommands.toString());
 	}
-
-	private void run_debug(final CommandSender sender, final String[] args) throws Exception
+	
+	private void run_debug(final Server server, final CommandSender 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 CommandSender sender, final String[] args) throws Exception
+	
+	private void run_reload(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		ess.reload();
 		sender.sendMessage(_("essentialsReload", ess.getDescription().getVersion()));
 	}
-
-	private void run_nya(final CommandSender sender, final String[] args) throws Exception
+	
+	private void run_nya(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		final Map<String, Byte> noteMap = new HashMap<String, Byte>();
 		noteMap.put("1F#", (byte)0x0);
@@ -92,61 +95,61 @@ public class Commandessentials extends EssentialsCommand
 		noteMap.put("2D#", (byte)(0x9 + 0xC));
 		noteMap.put("2E", (byte)(0xA + 0xC));
 		noteMap.put("2F", (byte)(0xB + 0xC));
-		if (!noteBlocks.isEmpty())
-		{
-			return;
-		}
-		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(",");
-		for (Player player : server.getOnlinePlayers())
-		{
-			final Location loc = player.getLocation();
-			loc.add(0, 3, 0);
-			while (loc.getBlockY() < player.getLocation().getBlockY() + 10 && loc.getBlock().getTypeId() != 0)
+			if (!noteBlocks.isEmpty())
 			{
-				loc.add(0, 1, 0);
+				return;
 			}
-			if (loc.getBlock().getTypeId() == 0)
+			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(",");
+			for (Player player : server.getOnlinePlayers())
 			{
-				noteBlocks.put(player, loc.getBlock());
-				loc.getBlock().setType(Material.NOTE_BLOCK);
+				final Location loc = player.getLocation();
+				loc.add(0, 3, 0);
+				while (loc.getBlockY() < player.getLocation().getBlockY() + 10 && loc.getBlock().getTypeId() != 0)
+				{
+					loc.add(0, 1, 0);
+				}
+				if (loc.getBlock().getTypeId() == 0)
+				{
+					noteBlocks.put(player, loc.getBlock());
+					loc.getBlock().setType(Material.NOTE_BLOCK);
+				}
 			}
-		}
-		taskid = ess.scheduleSyncRepeatingTask(new Runnable()
-		{
-			int i = 0;
+			taskid = ess.scheduleSyncRepeatingTask(new Runnable()
+			{
+				int i = 0;
 
-			@Override
-			public void run()
-			{
-				final String note = tune[i];
-				i++;
-				if (i >= tune.length)
+				@Override
+				public void run()
 				{
-					Commandessentials.this.stopTune();
-				}
-				if (note.isEmpty())
-				{
-					return;
-				}
-				Map<Player, Block> noteBlocks = Commandessentials.this.noteBlocks;
-				for (Player onlinePlayer : server.getOnlinePlayers())
-				{
-					final Block block = noteBlocks.get(onlinePlayer);
-					if (block == null || block.getType() != Material.NOTE_BLOCK)
+					final String note = tune[i];
+					i++;
+					if (i >= tune.length)
 					{
-						continue;
+						Commandessentials.this.stopTune();
+					}
+					if (note.isEmpty())
+					{
+						return;
+					}
+					Map<Player, Block> noteBlocks = Commandessentials.this.noteBlocks;
+					for (Player onlinePlayer : server.getOnlinePlayers())
+					{
+						final Block block = noteBlocks.get(onlinePlayer);
+						if (block == null || block.getType() != Material.NOTE_BLOCK)
+						{
+							continue;
+						}
+						onlinePlayer.playNote(block.getLocation(), (byte)0, noteMap.get(note));
 					}
-					onlinePlayer.playNote(block.getLocation(), (byte)0, noteMap.get(note));
 				}
-			}
-		}, 20, 2);
-		return;
+			}, 20, 2);
+			return;
 	}
 
 	private void stopTune()
 	{
-		ess.getServer().getScheduler().cancelTask(taskid);
+		ess.getScheduler().cancelTask(taskid);
 		for (Block block : noteBlocks.values())
 		{
 			if (block.getType() == Material.NOTE_BLOCK)

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

@@ -1,26 +1,32 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
 public class Commandext extends EssentialsCommand
 {
+	public Commandext()
+	{
+		super("ext");
+	}
+
 	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
 
-		extinguishPlayers(sender, args[0]);
+		extinguishPlayers(server, sender, args[0]);
 	}
 
 	@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
 	{
 		if (args.length < 1)
 		{
@@ -29,10 +35,10 @@ public class Commandext extends EssentialsCommand
 			return;
 		}
 
-		extinguishPlayers(user, args[0]);
+		extinguishPlayers(server, user, commandLabel);
 	}
 
-	private void extinguishPlayers(final CommandSender sender, final String name) throws Exception
+	private void extinguishPlayers(final Server server, final CommandSender sender, final String name) throws Exception
 	{
 		for (Player matchPlayer : server.matchPlayer(name))
 		{

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

@@ -1,21 +1,26 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.User;
 import java.util.List;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
 public class Commandfeed extends EssentialsCommand
 {
-	@Override
-	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
+	public Commandfeed()
 	{
-		if (args.length > 0 && Permissions.FEED_OTHERS.isAuthorized(user))
+		super("feed");
+	}
+
+	@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.feed.others"))
 		{
-			feedOtherPlayers(user, args[0]);
+			feedOtherPlayers(server,user,args[0]);
 		}
 		else
 		{
@@ -24,8 +29,8 @@ public class Commandfeed extends EssentialsCommand
 			user.sendMessage(_("feed"));
 		}
 	}
-
-	private void feedOtherPlayers(final CommandSender sender, final String name)
+	
+		private void feedOtherPlayers(final Server server, final CommandSender sender, final String name)
 	{
 		final List<Player> players = server.matchPlayer(name);
 		if (players.isEmpty())

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

@@ -1,6 +1,7 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.SmallFireball;
 import org.bukkit.util.Vector;
@@ -8,8 +9,13 @@ import org.bukkit.util.Vector;
 
 public class Commandfireball extends EssentialsCommand
 {
+	public Commandfireball()
+	{
+		super("fireball");
+	}
+
 	@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
 	{
 		boolean small = false;
 		if (args.length > 0 && args[0].equalsIgnoreCase("small"))
@@ -17,7 +23,7 @@ public class Commandfireball extends EssentialsCommand
 			small = true;
 		}
 		final Vector direction = user.getEyeLocation().getDirection().multiply(2);
-		final Fireball fireball = user.getWorld().spawn(user.getEyeLocation().add(direction.getX(), direction.getY(), direction.getZ()), small ? SmallFireball.class : Fireball.class);
+		Fireball fireball = user.getWorld().spawn(user.getEyeLocation().add(direction.getX(), direction.getY(), direction.getZ()), small ? SmallFireball.class : Fireball.class);
 		fireball.setShooter(user.getBase());
 	}
 }

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

@@ -1,33 +1,38 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.User;
 import java.util.Locale;
 import org.bukkit.GameMode;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
 public class Commandgamemode extends EssentialsCommand
 {
+	public Commandgamemode()
+	{
+		super("gamemode");
+	}
+
 	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
 
-		gamemodeOtherPlayers(sender, args[0]);
+		gamemodeOtherPlayers(server, sender, args[0]);
 	}
 
 	@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
 	{
-		if (args.length > 0 && !args[0].trim().isEmpty() && Permissions.GAMEMODE_OTHERS.isAuthorized(user))
+		if (args.length > 0 && !args[0].trim().isEmpty() && user.isAuthorized("essentials.gamemode.others"))
 		{
-			gamemodeOtherPlayers(user, args[0]);
+			gamemodeOtherPlayers(server, user, args[0]);
 			return;
 		}
 
@@ -35,11 +40,11 @@ public class Commandgamemode extends EssentialsCommand
 		user.sendMessage(_("gameMode", _(user.getGameMode().toString().toLowerCase(Locale.ENGLISH)), user.getDisplayName()));
 	}
 
-	private void gamemodeOtherPlayers(final CommandSender sender, final String name)
+	private void gamemodeOtherPlayers(final Server server, final CommandSender sender, final String name)
 	{
 		for (Player matchPlayer : server.matchPlayer(name))
 		{
-			final IUser player = ess.getUser(matchPlayer);
+			final User player = ess.getUser(matchPlayer);
 			if (player.isHidden())
 			{
 				continue;

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

@@ -1,14 +1,20 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
+import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 
 
 public class Commandgc extends EssentialsCommand
 {
+	public Commandgc()
+	{
+		super("gc");
+	}
+
 	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		sender.sendMessage(_("gcmax", (Runtime.getRuntime().maxMemory() / 1024 / 1024)));
 		sender.sendMessage(_("gctotal", (Runtime.getRuntime().totalMemory() / 1024 / 1024)));

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

@@ -1,19 +1,24 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.User;
 import org.bukkit.Location;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
 
 public class Commandgetpos extends EssentialsCommand
 {
-	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
+	public Commandgetpos()
 	{
-		if (args.length > 0 && Permissions.GETPOS_OTHERS.isAuthorized(user))
+		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 IUser otherUser = getPlayer(args, 0);
+			final User otherUser = getPlayer(server, args, 0);
 			outputPosition(user, otherUser.getLocation(), user.getLocation());
 		}
 		else
@@ -21,18 +26,18 @@ public class Commandgetpos extends EssentialsCommand
 			outputPosition(user, user.getLocation(), null);
 		}
 	}
-
+	
 	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		final IUser user = getPlayer(args, 0);
+		final User user = getPlayer(server, args, 0);
 		outputPosition(sender, user.getLocation(), null);
 	}
-
+	
 	//TODO: Translate
 	private void outputPosition(final CommandSender sender, final Location coords, final Location distance)
 	{

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

@@ -1,10 +1,11 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.GivePermissions;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import com.earth2me.essentials.User;
 import java.util.Locale;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
@@ -13,29 +14,48 @@ import org.bukkit.inventory.ItemStack;
 
 public class Commandgive extends EssentialsCommand
 {
+	public Commandgive()
+	{
+		super("give");
+	}
+
 	//TODO: move these messages to message file
 	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 2)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		
-		final IUser giveTo = getPlayer(args, 0);
 
-		final ItemStack stack = ess.getItemDb().get(args[1], giveTo);
+		final ItemStack stack = ess.getItemDb().get(args[1]);
 
 		final String itemname = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
-		if (!GivePermissions.getPermission(stack.getType()).isAuthorized(sender))
+		if (sender instanceof Player
+			&& (ess.getSettings().permissionBasedItemSpawn()
+				? (!ess.getUser(sender).isAuthorized("essentials.give.item-all")
+				   && !ess.getUser(sender).isAuthorized("essentials.give.item-" + itemname)
+				   && !ess.getUser(sender).isAuthorized("essentials.give.item-" + stack.getTypeId()))
+				: (!ess.getUser(sender).isAuthorized("essentials.itemspawn.exempt")
+				   && !ess.getUser(sender).canSpawnItem(stack.getTypeId()))))
 		{
 			throw new Exception(ChatColor.RED + "You are not allowed to spawn the item " + itemname);
-		}	
+		}
+
+		final User giveTo = getPlayer(server, args, 0);
 
 		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());
+		}
 
 		if (args.length > 3)
 		{
@@ -46,7 +66,7 @@ public class Commandgive extends EssentialsCommand
 				{
 					continue;
 				}
-				final Enchantment enchantment = Commandenchant.getEnchantment(split[0], sender instanceof Player ? ess.getUser((Player)sender) : null);
+				final Enchantment enchantment = Commandenchant.getEnchantment(split[0], sender instanceof Player ? ess.getUser(sender) : null);
 				int level;
 				if (split.length > 1)
 				{
@@ -64,11 +84,17 @@ public class Commandgive extends EssentialsCommand
 		{
 			throw new Exception(ChatColor.RED + "You can't give air.");
 		}
-		
-		giveTo.giveItems(stack, false);
 
 		final String itemName = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' ');
 		sender.sendMessage(ChatColor.BLUE + "Giving " + stack.getAmount() + " of " + itemName + " to " + giveTo.getDisplayName() + ".");
-		
+		if (giveTo.isAuthorized("essentials.oversizedstacks"))
+		{
+			InventoryWorkaround.addItem(giveTo.getInventory(), true, ess.getSettings().getOversizedStackSize(), stack);
+		}
+		else
+		{
+			InventoryWorkaround.addItem(giveTo.getInventory(), true, stack);
+		}
+		giveTo.updateInventory();
 	}
 }

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

@@ -1,42 +1,47 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
 public class Commandgod extends EssentialsCommand
 {
+	public Commandgod()
+	{
+		super("god");
+	}
+
 	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
 
-		godOtherPlayers(sender, args[0]);
+		godOtherPlayers(server, sender, args[0]);
 	}
 
 	@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
 	{
-		if (args.length > 0 && !args[0].trim().isEmpty() && Permissions.GOD_OTHERS.isAuthorized(user))
+		if (args.length > 0 && !args[0].trim().isEmpty() && user.isAuthorized("essentials.god.others"))
 		{
-			godOtherPlayers(user, args[0]);
+			godOtherPlayers(server, user, args[0]);
 			return;
 		}
 
 		user.sendMessage(_("godMode", (user.toggleGodModeEnabled() ? _("enabled") : _("disabled"))));
 	}
 
-	private void godOtherPlayers(final CommandSender sender, final String name)
+	private void godOtherPlayers(final Server server, final CommandSender sender, final String name)
 	{
 		for (Player matchPlayer : server.matchPlayer(name))
 		{
-			final IUser player = ess.getUser(matchPlayer);
+			final User player = ess.getUser(matchPlayer);
 			if (player.isHidden())
 			{
 				continue;

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

@@ -1,47 +1,55 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import com.earth2me.essentials.user.UserData.TimestampType;
+import com.earth2me.essentials.User;
 import java.util.List;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
 public class Commandheal extends EssentialsCommand
 {
+	public Commandheal()
+	{
+		super("heal");
+	}
+
 	@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
 	{
 
-		if (args.length > 0 && Permissions.HEAL_OTHERS.isAuthorized(user))
+		if (args.length > 0 && user.isAuthorized("essentials.heal.others"))
 		{
-			user.checkCooldown(TimestampType.LASTHEAL, ess.getGroups().getHealCooldown(user), true, Permissions.HEAL_COOLDOWN_BYPASS);
-
-			healOtherPlayers(user, args[0]);
+			if (!user.isAuthorized("essentials.heal.cooldown.bypass"))
+			{
+				user.healCooldown();
+			}
+			healOtherPlayers(server, user, args[0]);
 			return;
 		}
 
-		user.checkCooldown(TimestampType.LASTHEAL, ess.getGroups().getHealCooldown(user), true, Permissions.HEAL_COOLDOWN_BYPASS);
-
+		if (!user.isAuthorized("essentials.heal.cooldown.bypass"))
+		{
+			user.healCooldown();
+		}
 		user.setHealth(20);
 		user.setFoodLevel(20);
 		user.sendMessage(_("heal"));
 	}
 
 	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
 
-		healOtherPlayers(sender, args[0]);
+		healOtherPlayers(server, sender, args[0]);
 	}
 
-	private void healOtherPlayers(final CommandSender sender, final String name)
+	private void healOtherPlayers(final Server server, final CommandSender sender, final String name)
 	{
 		final List<Player> players = server.matchPlayer(name);
 		if (players.isEmpty())

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

@@ -1,16 +1,22 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.textreader.*;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
 
 public class Commandhelp extends EssentialsCommand
 {
+	public Commandhelp()
+	{
+		super("help");
+	}
+
 	@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
 	{
 		IText output;
 		String pageStr = args.length > 0 ? args[0] : null;
@@ -35,11 +41,11 @@ public class Commandhelp extends EssentialsCommand
 			output = new KeywordReplacer(input, user, ess);
 		}
 		final TextPager pager = new TextPager(output);
-		pager.showPage(pageStr, chapterPageStr, commandLabel, user);
+		pager.showPage(pageStr, chapterPageStr, "help", user);
 	}
 
 	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		sender.sendMessage(_("helpConsole"));
 	}

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

@@ -1,29 +1,33 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.User;
 import java.util.logging.Level;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
 
 public class Commandhelpop extends EssentialsCommand
 {
+	public Commandhelpop()
+	{
+		super("helpop");
+	}
+
 	@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
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
 
-		final String message = _("helpOp", user.getDisplayName(), Util.stripColor(getFinalArg(args, 0)));
+		final String message = _("helpOp", user.getDisplayName(), getFinalArg(args, 0));
 		logger.log(Level.INFO, message);
 		for (Player onlinePlayer : server.getOnlinePlayers())
 		{
-			final IUser player = ess.getUser(onlinePlayer);
-			if (!Permissions.HELPOP_RECEIVE.isAuthorized(player))
+			final User player = ess.getUser(onlinePlayer);
+			if (!player.isAuthorized("essentials.helpop.receive"))
 			{
 				continue;
 			}

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

@@ -2,36 +2,40 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
 import java.util.List;
 import java.util.Locale;
 import org.bukkit.Location;
-import org.bukkit.Material;
+import org.bukkit.Server;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class Commandhome extends EssentialsCommand
 {
-	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
+	public Commandhome()
 	{
-		final Trade charge = new Trade(commandName, ess);
+		super("home");
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		final Trade charge = new Trade(this.getName(), ess);
 		charge.isAffordableFor(user);
-		IUser player = user;
+		User player = user;
 		String homeName = "";
 		String[] nameParts;
 		if (args.length > 0)
 		{
 			nameParts = args[0].split(":");
-			if (nameParts[0].length() == args[0].length() || !Permissions.HOME_OTHERS.isAuthorized(user))
+			if (nameParts[0].length() == args[0].length() || !user.isAuthorized("essentials.home.others"))
 			{
 				homeName = nameParts[0];
 			}
 			else
 			{
-				player = getPlayer(nameParts, 0, true);
+				player = getPlayer(server, nameParts, 0, true);
 				if (nameParts.length > 1)
 				{
 					homeName = nameParts[1];
@@ -43,31 +47,27 @@ public class Commandhome extends EssentialsCommand
 			if ("bed".equalsIgnoreCase(homeName))
 			{
 				final Location bed = player.getBedSpawnLocation();
-				if (bed != null && bed.getBlock().getType() == Material.BED_BLOCK)
+				if (bed != null)
 				{
 					user.getTeleport().teleport(bed, charge, TeleportCause.COMMAND);
-					throw new NoChargeException();
+					return;
 				}
 			}
 			user.getTeleport().home(player, homeName.toLowerCase(Locale.ENGLISH), charge);
 		}
 		catch (NotEnoughArgumentsException e)
 		{
-			Location bed = player.getBedSpawnLocation();
-			if (bed != null && bed.getBlock().getType() != Material.BED_BLOCK)
-			{
-				bed = null;
-			}
 			final List<String> homes = player.getHomes();
 			if (homes.isEmpty() && player.equals(user))
 			{
+				final Location bed = player.getBedSpawnLocation();
 				if (bed != null)
 				{
 					user.getTeleport().teleport(bed, charge, TeleportCause.COMMAND);
-					throw new NoChargeException();
+					return;
 				}
 				user.getTeleport().respawn(charge, TeleportCause.COMMAND);
-
+				return;
 			}
 			else if (homes.isEmpty())
 			{
@@ -76,13 +76,11 @@ public class Commandhome extends EssentialsCommand
 			else if (homes.size() == 1 && player.equals(user))
 			{
 				user.getTeleport().home(player, homes.get(0), charge);
+				return;
 			}
 			else
 			{
-				if (bed != null)
-				{
-					homes.add("bed");
-				}
+				homes.add("bed");
 				user.sendMessage(_("homes", Util.joinList(homes)));
 			}
 		}

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

@@ -1,34 +1,39 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
 
 
 public class Commandignore extends EssentialsCommand
 {
+	public Commandignore()
+	{
+		super("ignore");
+	}
+
 	@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
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		IUser player;
+		User player;
 		try
 		{
-			player = getPlayer(args, 0);
+			player = getPlayer(server, args, 0);
 		}
 		catch (NoSuchFieldException ex)
 		{
-			player = ess.getUser(args[0]);
+			player = ess.getOfflineUser(args[0]);
 		}
 		if (player == null)
 		{
 			throw new Exception(_("playerNotFound"));
 		}
 		final String name = player.getName();
-		user.acquireWriteLock();
-		if (user.isIgnoringPlayer(name))
+		if (user.isIgnoredPlayer(name))
 		{
 			user.setIgnoredPlayer(name, false);
 			user.sendMessage(_("unignorePlayer", player.getName()));