Merge branch 'refs/heads/master' into release

NullPointerException.

.gitignore

@@ -35,6 +35,6 @@
 /EssentialsUpdate/dist/
 /EssentialsUpdate/build/
 /WebPush/apikey.php
-
-/WebPush/apikey.php
-/WebPush/apikey.php
+/WebPush/nbproject/private
+/.idea
+*.iml

BuildAll/nbproject/build-impl.xml

@@ -20,10 +20,10 @@ is divided into following sections:
 
         -->
 <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="BuildAll-impl">
-    <fail message="Please build using Ant 1.7.1 or higher.">
+    <fail message="Please build using Ant 1.8.0 or higher.">
         <condition>
             <not>
-                <antversion atleast="1.7.1"/>
+                <antversion atleast="1.8.0"/>
             </not>
         </condition>
     </fail>
@@ -223,6 +223,7 @@ is divided into following sections:
         <property name="javac.fork" value="${jdkBug6558476}"/>
         <property name="jar.index" value="false"/>
         <property name="jar.index.metainf" value="${jar.index}"/>
+        <property name="copylibs.rebase" value="true"/>
         <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
     </target>
     <target name="-post-init">
@@ -409,6 +410,7 @@ is divided into following sections:
                 <property environment="env"/>
                 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
                 <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="${profiler.info.jvmargs.agent}"/>
                     <jvmarg line="${profiler.info.jvmargs}"/>
                     <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
@@ -539,7 +541,7 @@ is divided into following sections:
                     </chainedmapper>
                 </pathconvert>
                 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
                     <fileset dir="${build.classes.dir}"/>
                     <manifest>
                         <attribute name="Class-Path" value="${jar.classpath}"/>

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=66b89647
-nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
+nbproject/build-impl.xml.script.CRC32=c8376938
+nbproject/build-impl.xml.stylesheet.CRC32=c12040a1@1.47.1.46

BuildAll/nbproject/project.properties

@@ -81,9 +81,7 @@ javac.source=1.6
 javac.target=1.6
 javac.test.classpath=\
     ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
+    ${build.classes.dir}
 javac.test.processorpath=\
     ${javac.test.classpath}
 javadoc.additionalparam=

Essentials/nbproject/build-impl.xml

@@ -20,10 +20,10 @@ is divided into following sections:
 
         -->
 <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="Essentials-impl">
-    <fail message="Please build using Ant 1.7.1 or higher.">
+    <fail message="Please build using Ant 1.8.0 or higher.">
         <condition>
             <not>
-                <antversion atleast="1.7.1"/>
+                <antversion atleast="1.8.0"/>
             </not>
         </condition>
     </fail>
@@ -223,6 +223,7 @@ is divided into following sections:
         <property name="javac.fork" value="${jdkBug6558476}"/>
         <property name="jar.index" value="false"/>
         <property name="jar.index.metainf" value="${jar.index}"/>
+        <property name="copylibs.rebase" value="true"/>
         <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
     </target>
     <target name="-post-init">
@@ -409,6 +410,7 @@ is divided into following sections:
                 <property environment="env"/>
                 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
                 <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="${profiler.info.jvmargs.agent}"/>
                     <jvmarg line="${profiler.info.jvmargs}"/>
                     <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
@@ -539,7 +541,7 @@ is divided into following sections:
                     </chainedmapper>
                 </pathconvert>
                 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
                     <fileset dir="${build.classes.dir}"/>
                     <manifest>
                         <attribute name="Class-Path" value="${jar.classpath}"/>

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=64a00ba6
-nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
+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/pmd.settings

@@ -1,2 +1,3 @@
 DoNotUseThreads
+LongVariable
 SignatureDeclareThrowsException

Essentials/nbproject/project.properties

@@ -29,6 +29,7 @@ auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blank
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder=*
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
@@ -37,6 +38,7 @@ auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.place
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateImportGroups=false
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
@@ -64,11 +66,11 @@ endorsed.classpath=
 excludes=
 file.reference.BOSEconomy7.jar=../lib/BOSEconomy7.jar
 file.reference.bPermissions.jar=../lib/bPermissions.jar
-file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.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.junit-4.5.jar=../lib/junit_4/junit-4.5.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
@@ -90,7 +92,8 @@ javac.classpath=\
     ${file.reference.PermissionsBukkit-1.2.jar}:\
     ${file.reference.lombok-0.10.1.jar}:\
     ${reference.EssentialsGroupManager.jar}:\
-    ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}
+    ${file.reference.bukkit.jar}:\
+    ${file.reference.craftbukkit.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -101,7 +104,7 @@ javac.target=1.6
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
-    ${file.reference.junit-4.5.jar}
+    ${libs.junit_4.10.classpath}
 javac.test.processorpath=\
     ${javac.test.classpath}
 javadoc.additionalparam=

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,5 +1,6 @@
 package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n._;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -7,7 +8,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.CraftServer;
 
 
 public class Backup implements Runnable
@@ -48,6 +48,7 @@ public class Backup implements Runnable
 		}
 	}
 
+	@Override
 	public void run()
 	{
 		if (active)
@@ -60,7 +61,7 @@ public class Backup implements Runnable
 		{
 			return;
 		}
-		LOGGER.log(Level.INFO, Util.i18n("backupStarted"));
+		LOGGER.log(Level.INFO, _("backupStarted"));
 		final CommandSender cs = server.getConsoleSender();
 		server.dispatchCommand(cs, "save-all");
 		server.dispatchCommand(cs, "save-off");
@@ -68,6 +69,7 @@ public class Backup implements Runnable
 		ess.scheduleAsyncDelayedTask(
 				new Runnable()
 				{
+					@Override
 					public void run()
 					{
 						try
@@ -109,6 +111,7 @@ public class Backup implements Runnable
 							ess.scheduleSyncDelayedTask(
 									new Runnable()
 									{
+										@Override
 										public void run()
 										{
 											server.dispatchCommand(cs, "save-on");
@@ -121,7 +124,7 @@ public class Backup implements Runnable
 												}
 											}
 											active = false;
-											LOGGER.log(Level.INFO, Util.i18n("backupFinished"));
+											LOGGER.log(Level.INFO, _("backupFinished"));
 										}
 									});
 						}

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

@@ -19,11 +19,13 @@ public final class Console implements IReplyTo
 		return server.getConsoleSender();
 	}
 
+	@Override
 	public void setReplyTo(CommandSender user)
 	{
 		replyTo = user;
 	}
 
+	@Override
 	public CommandSender getReplyTo()
 	{
 		return replyTo;

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

@@ -1,6 +1,6 @@
 package com.earth2me.essentials;
 
-import com.earth2me.essentials.commands.Commandtime;
+import static com.earth2me.essentials.I18n._;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -72,7 +72,7 @@ public final class DescParseTickFormat
 	public static long parse(String desc) throws NumberFormatException
 	{
 		// Only look at alphanumeric and lowercase and : for 24:00
-		desc = desc.toLowerCase().replaceAll("[^A-Za-z0-9:]", "");
+		desc = desc.toLowerCase(Locale.ENGLISH).replaceAll("[^A-Za-z0-9:]", "");
 
 		// Detect ticks format
 		try
@@ -133,7 +133,7 @@ public final class DescParseTickFormat
 			throw new NumberFormatException();
 		}
 
-		desc = desc.toLowerCase().replaceAll("[^0-9]", "");
+		desc = desc.toLowerCase(Locale.ENGLISH).replaceAll("[^0-9]", "");
 
 		if (desc.length() != 4)
 		{
@@ -156,7 +156,7 @@ public final class DescParseTickFormat
 		int hours = 0;
 		int minutes = 0;
 
-		desc = desc.toLowerCase().replaceAll("[^0-9]", "");
+		desc = desc.toLowerCase(Locale.ENGLISH).replaceAll("[^0-9]", "");
 
 		if (desc.length() > 4)
 		{
@@ -185,12 +185,12 @@ public final class DescParseTickFormat
 		{
 			throw new NumberFormatException();
 		}
-		
+
 		if (desc.endsWith("pm") && hours != 12)
 		{
 			hours += 12;
 		}
-		
+
 		if (desc.endsWith("am") && hours == 12)
 		{
 			hours -= 12;
@@ -231,7 +231,7 @@ public final class DescParseTickFormat
 	// --------------------------------------------
 	public static String format(final long ticks)
 	{
-		return Util.format("timeFormat", format24(ticks), format12(ticks), formatTicks(ticks));
+		return _("timeFormat", format24(ticks), format12(ticks), formatTicks(ticks));
 	}
 
 	public static String formatTicks(final long ticks)

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

@@ -0,0 +1,77 @@
+package com.earth2me.essentials;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.regex.Pattern;
+import org.bukkit.enchantments.Enchantment;
+
+
+public class Enchantments
+{
+	private static final transient Pattern NUMPATTERN = Pattern.compile("\\d+");
+	private static final Map<String, Enchantment> ENCHANTMENTS = new HashMap<String, Enchantment>();
+
+	static
+	{
+		ENCHANTMENTS.put("alldamage", Enchantment.DAMAGE_ALL);
+		ENCHANTMENTS.put("alldmg", Enchantment.DAMAGE_ALL);
+		ENCHANTMENTS.put("sharpness", Enchantment.DAMAGE_ALL);
+		ENCHANTMENTS.put("arthropodsdamage", Enchantment.DAMAGE_ARTHROPODS);
+		ENCHANTMENTS.put("ardmg", Enchantment.DAMAGE_ARTHROPODS);
+		ENCHANTMENTS.put("baneofarthropods", Enchantment.DAMAGE_ARTHROPODS);
+		ENCHANTMENTS.put("undeaddamage", Enchantment.DAMAGE_UNDEAD);
+		ENCHANTMENTS.put("smite", Enchantment.DAMAGE_UNDEAD);
+		ENCHANTMENTS.put("digspeed", Enchantment.DIG_SPEED);
+		ENCHANTMENTS.put("efficiency", Enchantment.DIG_SPEED);
+		ENCHANTMENTS.put("durability", Enchantment.DURABILITY);
+		ENCHANTMENTS.put("dura", Enchantment.DURABILITY);
+		ENCHANTMENTS.put("unbreaking", Enchantment.DURABILITY);
+		ENCHANTMENTS.put("fireaspect", Enchantment.FIRE_ASPECT);
+		ENCHANTMENTS.put("fire", Enchantment.FIRE_ASPECT);
+		ENCHANTMENTS.put("knockback", Enchantment.KNOCKBACK);
+		ENCHANTMENTS.put("blockslootbonus", Enchantment.LOOT_BONUS_BLOCKS);
+		ENCHANTMENTS.put("fortune", Enchantment.LOOT_BONUS_BLOCKS);
+		ENCHANTMENTS.put("mobslootbonus", Enchantment.LOOT_BONUS_MOBS);
+		ENCHANTMENTS.put("mobloot", Enchantment.LOOT_BONUS_MOBS);
+		ENCHANTMENTS.put("looting", Enchantment.LOOT_BONUS_MOBS);
+		ENCHANTMENTS.put("oxygen", Enchantment.OXYGEN);
+		ENCHANTMENTS.put("respiration", Enchantment.OXYGEN);
+		ENCHANTMENTS.put("protection", Enchantment.PROTECTION_ENVIRONMENTAL);
+		ENCHANTMENTS.put("prot", Enchantment.PROTECTION_ENVIRONMENTAL);
+		ENCHANTMENTS.put("explosionsprotection", Enchantment.PROTECTION_EXPLOSIONS);
+		ENCHANTMENTS.put("expprot", Enchantment.PROTECTION_EXPLOSIONS);
+		ENCHANTMENTS.put("blastprotection", Enchantment.PROTECTION_EXPLOSIONS);
+		ENCHANTMENTS.put("fallprotection", Enchantment.PROTECTION_FALL);
+		ENCHANTMENTS.put("fallprot", Enchantment.PROTECTION_FALL);
+		ENCHANTMENTS.put("featherfalling", Enchantment.PROTECTION_FALL);
+		ENCHANTMENTS.put("fireprotection", Enchantment.PROTECTION_FIRE);
+		ENCHANTMENTS.put("fireprot", Enchantment.PROTECTION_FIRE);
+		ENCHANTMENTS.put("projectileprotection", Enchantment.PROTECTION_PROJECTILE);
+		ENCHANTMENTS.put("projprot", Enchantment.PROTECTION_PROJECTILE);
+		ENCHANTMENTS.put("silktouch", Enchantment.SILK_TOUCH);
+		ENCHANTMENTS.put("waterworker", Enchantment.WATER_WORKER);
+		ENCHANTMENTS.put("aquaaffinity", Enchantment.WATER_WORKER);
+	}
+	
+	public static Enchantment getByName(String name) {
+		Enchantment enchantment;
+		if (NUMPATTERN.matcher(name).matches()) {
+			enchantment = Enchantment.getById(Integer.parseInt(name));
+		} else {
+			enchantment = Enchantment.getByName(name.toUpperCase(Locale.ENGLISH));
+		}
+		if (enchantment == null)
+		{
+			enchantment = ENCHANTMENTS.get(name.toLowerCase(Locale.ENGLISH));
+		}
+		return enchantment;
+	}
+
+	public static Set<Entry<String, Enchantment>> entrySet()
+	{
+		return ENCHANTMENTS.entrySet();
+	}
+}

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

@@ -1,57 +1,71 @@
 /*
  * Essentials - a bukkit plugin
  * Copyright (C) 2011  Essentials Team
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.Economy;
+import com.earth2me.essentials.api.IJails;
 import com.earth2me.essentials.commands.EssentialsCommand;
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
-import org.bukkit.*;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
 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.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;
+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.Event.Priority;
 import org.bukkit.event.Event.Type;
-import org.bukkit.plugin.*;
-import org.bukkit.plugin.java.*;
+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 = 1060;
+	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 Spawn spawn;
-	private transient Jail jail;
+	private transient Jails jails;
 	private transient Warps warps;
 	private transient Worth worth;
 	private transient List<IConf> confList;
@@ -59,8 +73,10 @@ public class Essentials extends JavaPlugin implements IEssentials
 	private transient ItemDb itemDb;
 	private transient final Methods paymentMethod = new Methods();
 	private transient PermissionsHandler permissionsHandler;
+	private transient AlternativeCommandsHandler alternativeCommandsHandler;
 	private transient UserMap userMap;
 	private transient ExecuteTimer execTimer;
+	private transient I18n i18n;
 
 	@Override
 	public ISettings getSettings()
@@ -79,10 +95,13 @@ public class Essentials extends JavaPlugin implements IEssentials
 		{
 			throw new IOException();
 		}
-		LOGGER.log(Level.INFO, Util.i18n("usingTempFolderForTesting"));
+		i18n = new I18n(this);
+		i18n.onEnable();
+		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 Settings(this);
+		i18n.updateLocale("en");
 		userMap = new UserMap(this);
 		permissionsHandler = new PermissionsHandler(this, false);
 		Economy.setEss(this);
@@ -93,61 +112,91 @@ public class Essentials extends JavaPlugin implements IEssentials
 	{
 		execTimer = new ExecuteTimer();
 		execTimer.start();
-		final String[] javaversion = System.getProperty("java.version").split("\\.", 3);
-		if (javaversion == null || javaversion.length < 2 || Integer.parseInt(javaversion[1]) < 6)
-		{
-			LOGGER.log(Level.SEVERE, "Java version not supported! Please install Java 1.6. You have " + System.getProperty("java.version"));
-		}
-		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");
-		Util.updateLocale(settings.getLocale(), this);
-		userMap = new UserMap(this);
-		confList.add(userMap);
-		execTimer.mark("Init(Usermap)");
-		spawn = new Spawn(getServer(), this.getDataFolder());
-		confList.add(spawn);
-		warps = new Warps(getServer(), this.getDataFolder());
-		confList.add(warps);
-		execTimer.mark("Init(Spawn/Warp)");
-		worth = new Worth(this.getDataFolder());
-		confList.add(worth);
-		itemDb = new ItemDb(this);
-		confList.add(itemDb);
-		execTimer.mark("Init(Worth/ItemDB)");
-		reload();
-		backup = new Backup(this);
-
+		i18n = new I18n(this);
+		i18n.onEnable();
+		execTimer.mark("I18n1");
 		final PluginManager pm = getServer().getPluginManager();
 		for (Plugin plugin : pm.getPlugins())
 		{
 			if (plugin.getDescription().getName().startsWith("Essentials")
 				&& !plugin.getDescription().getVersion().equals(this.getDescription().getVersion()))
 			{
-				LOGGER.log(Level.WARNING, Util.format("versionMismatch", plugin.getDescription().getName()));
+				LOGGER.log(Level.WARNING, _("versionMismatch", plugin.getDescription().getName()));
 			}
 		}
-		final Matcher versionMatch = Pattern.compile("git-Bukkit-([0-9]+).([0-9]+).([0-9]+)-[0-9]+-[0-9a-z]+-b([0-9]+)jnks.*").matcher(getServer().getVersion());
+		final Matcher versionMatch = Pattern.compile("git-Bukkit-([0-9]+).([0-9]+).([0-9]+)-R[0-9]+-[0-9]+-[0-9a-z]+-b([0-9]+)jnks.*").matcher(getServer().getVersion());
 		if (versionMatch.matches())
 		{
 			final int versionNumber = Integer.parseInt(versionMatch.group(4));
 			if (versionNumber < BUKKIT_VERSION)
 			{
-				LOGGER.log(Level.WARNING, Util.i18n("notRecommendedBukkit"));
+				LOGGER.log(Level.SEVERE, _("notRecommendedBukkit"));
+				LOGGER.log(Level.SEVERE, _("requiredBukkit", Integer.toString(BUKKIT_VERSION)));
+				this.setEnabled(false);
+				return;
 			}
 		}
 		else
 		{
-			LOGGER.log(Level.INFO, Util.i18n("bukkitFormatChanged"));
+			LOGGER.log(Level.INFO, _("bukkitFormatChanged"));
+			LOGGER.log(Level.INFO, getServer().getVersion());
+			LOGGER.log(Level.INFO, getServer().getBukkitVersion());
 		}
-
+		execTimer.mark("BukkitCheck");
+		try
+		{
+			final EssentialsUpgrade upgrade = new EssentialsUpgrade(this);
+			upgrade.beforeSettings();
+			execTimer.mark("Upgrade");
+			confList = new ArrayList<IConf>();
+			settings = new Settings(this);
+			confList.add(settings);
+			execTimer.mark("Settings");
+			upgrade.afterSettings();
+			execTimer.mark("Upgrade2");
+			i18n.updateLocale(settings.getLocale());
+			userMap = new UserMap(this);
+			confList.add(userMap);
+			execTimer.mark("Init(Usermap)");
+			warps = new Warps(getServer(), this.getDataFolder());
+			confList.add(warps);
+			execTimer.mark("Init(Spawn/Warp)");
+			worth = new Worth(this.getDataFolder());
+			confList.add(worth);
+			itemDb = new ItemDb(this);
+			confList.add(itemDb);
+			execTimer.mark("Init(Worth/ItemDB)");
+			reload();
+		}
+		catch (YAMLException exception)
+		{
+			if (pm.getPlugin("EssentialsUpdate") != null)
+			{
+				LOGGER.log(Level.SEVERE, _("essentialsHelp2"));
+			}
+			else
+			{
+				LOGGER.log(Level.SEVERE, _("essentialsHelp1"));
+			}
+			LOGGER.log(Level.SEVERE, exception.toString());
+			pm.registerEvent(Type.PLAYER_JOIN, new PlayerListener()
+			{
+				@Override
+				public void onPlayerJoin(PlayerJoinEvent event)
+				{
+					event.getPlayer().sendMessage("Essentials failed to load, read the log file.");
+				}
+			}, Priority.Low, this);
+			for (Player player : getServer().getOnlinePlayers())
+			{
+				player.sendMessage("Essentials failed to load, read the log file.");
+			}
+			this.setEnabled(false);
+			return;
+		}
+		backup = new Backup(this);
 		permissionsHandler = new PermissionsHandler(this, settings.useBukkitPermissions());
+		alternativeCommandsHandler = new AlternativeCommandsHandler(this);
 		final EssentialsPluginListener serverListener = new EssentialsPluginListener(this);
 		pm.registerEvent(Type.PLUGIN_ENABLE, serverListener, Priority.Low, this);
 		pm.registerEvent(Type.PLUGIN_DISABLE, serverListener, Priority.Low, this);
@@ -161,10 +210,13 @@ public class Essentials extends JavaPlugin implements IEssentials
 		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_INTERACT, 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.registerEvent(Type.BLOCK_PLACE, blockListener, Priority.Lowest, this);
@@ -193,16 +245,8 @@ public class Essentials extends JavaPlugin implements IEssentials
 		pm.registerEvent(Type.FOOD_LEVEL_CHANGE, entityListener, Priority.Lowest, this);
 
 		//TODO: Check if this should be here, and not above before reload()
-		jail = new Jail(this);
-		final JailPlayerListener jailPlayerListener = new JailPlayerListener(this);
-		confList.add(jail);
-		pm.registerEvent(Type.BLOCK_BREAK, jail, Priority.Low, this);
-		pm.registerEvent(Type.BLOCK_DAMAGE, jail, Priority.Low, this);
-		pm.registerEvent(Type.BLOCK_PLACE, jail, Priority.Low, this);
-		pm.registerEvent(Type.PLAYER_INTERACT, jailPlayerListener, Priority.Low, this);
-		pm.registerEvent(Type.PLAYER_RESPAWN, jailPlayerListener, Priority.High, this);
-		pm.registerEvent(Type.PLAYER_TELEPORT, jailPlayerListener, Priority.High, this);
-		pm.registerEvent(Type.PLAYER_JOIN, jailPlayerListener, Priority.High, this);
+		jails = new Jails(this);
+		confList.add(jails);
 
 		pm.registerEvent(Type.ENTITY_EXPLODE, tntListener, Priority.High, this);
 
@@ -210,7 +254,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 		getScheduler().scheduleSyncRepeatingTask(this, timer, 1, 100);
 		Economy.setEss(this);
 		execTimer.mark("RegListeners");
-		LOGGER.info(Util.format("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), Util.joinList(this.getDescription().getAuthors())));
+		LOGGER.info(_("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), Util.joinList(this.getDescription().getAuthors())));
 		final String timeroutput = execTimer.end();
 		if (getSettings().isDebug())
 		{
@@ -221,6 +265,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 	@Override
 	public void onDisable()
 	{
+		i18n.onDisable();
 		Economy.setEss(null);
 		Trade.closeLog();
 	}
@@ -236,158 +281,26 @@ public class Essentials extends JavaPlugin implements IEssentials
 			execTimer.mark("Reload(" + iConf.getClass().getSimpleName() + ")");
 		}
 
-		Util.updateLocale(settings.getLocale(), this);
-
-		// for motd
-		getConfiguration().load();
-	}
-
-	@Override
-	public String[] getMotd(final CommandSender sender, final String def)
-	{
-		return getLines(sender, "motd", def);
-	}
-
-	@Override
-	public String[] getLines(final CommandSender sender, final String node, final String def)
-	{
-		List<String> lines = (List<String>)getConfiguration().getProperty(node);
-		if (lines == null)
-		{
-			return new String[0];
-		}
-		String[] retval = new String[lines.size()];
-
-		if (lines.isEmpty() || lines.get(0) == null)
-		{
-			try
-			{
-				lines = new ArrayList<String>();
-				// "[]" in YaML indicates empty array, so respect that
-				if (!getConfiguration().getString(node, def).equals("[]"))
-				{
-					lines.add(getConfiguration().getString(node, def));
-					retval = new String[lines.size()];
-				}
-			}
-			catch (Throwable ex2)
-			{
-				LOGGER.log(Level.WARNING, Util.format("corruptNodeInConfig", node));
-				return new String[0];
-			}
-		}
-
-		// if still empty, call it a day
-		if (lines == null || lines.isEmpty() || lines.get(0) == null)
-		{
-			return new String[0];
-		}
-
-		for (int i = 0; i < lines.size(); i++)
-		{
-			String m = lines.get(i);
-			if (m == null)
-			{
-				continue;
-			}
-			m = m.replace('&', '§').replace("§§", "&");
-
-			if (sender instanceof User || sender instanceof Player)
-			{
-				User user = getUser(sender);
-				m = m.replace("{PLAYER}", user.getDisplayName());
-				m = m.replace("{IP}", user.getAddress().toString());
-				m = m.replace("{BALANCE}", Double.toString(user.getMoney()));
-				m = m.replace("{MAILS}", Integer.toString(user.getMails().size()));
-				m = m.replace("{WORLD}", user.getLocation().getWorld().getName());
-			}
-			int playerHidden = 0;
-			for (Player p : getServer().getOnlinePlayers())
-			{
-				if (getUser(p).isHidden())
-				{
-					playerHidden++;
-				}
-			}
-			m = m.replace("{ONLINE}", Integer.toString(getServer().getOnlinePlayers().length - playerHidden));
-			m = m.replace("{UNIQUE}", Integer.toString(userMap.getUniqueUsers()));
-
-			if (m.matches(".*\\{PLAYERLIST\\}.*"))
-			{
-				StringBuilder online = new StringBuilder();
-				for (Player p : getServer().getOnlinePlayers())
-				{
-					if (getUser(p).isHidden())
-					{
-						continue;
-					}
-					if (online.length() > 0)
-					{
-						online.append(", ");
-					}
-					online.append(p.getDisplayName());
-				}
-				m = m.replace("{PLAYERLIST}", online.toString());
-			}
-
-			if (sender instanceof Player)
-			{
-				try
-				{
-					Class User = getClassLoader().loadClass("bukkit.Vandolis.User");
-					Object vuser = User.getConstructor(User.class).newInstance((Player)sender);
-					m = m.replace("{RED:BALANCE}", User.getMethod("getMoney").invoke(vuser).toString());
-					m = m.replace("{RED:BUYS}", User.getMethod("getNumTransactionsBuy").invoke(vuser).toString());
-					m = m.replace("{RED:SELLS}", User.getMethod("getNumTransactionsSell").invoke(vuser).toString());
-				}
-				catch (Throwable ex)
-				{
-					m = m.replace("{RED:BALANCE}", "N/A");
-					m = m.replace("{RED:BUYS}", "N/A");
-					m = m.replace("{RED:SELLS}", "N/A");
-				}
-			}
-
-			retval[i] = m + " ";
-		}
-		return retval;
+		i18n.updateLocale(settings.getLocale());
 	}
 
 	@Override
 	public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args)
 	{
-		return onCommandEssentials(sender, command, commandLabel, args, Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.");
+		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)
+	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"))
 		{
-			for (Plugin p : getServer().getPluginManager().getPlugins())
+			final PluginCommand pc = alternativeCommandsHandler.getAlternative(commandLabel);
+			if (pc != null)
 			{
-				if (p.getDescription().getMain().contains("com.earth2me.essentials"))
-				{
-					continue;
-				}
-
-				final PluginDescriptionFile desc = p.getDescription();
-				if (desc == null)
-				{
-					continue;
-				}
-
-				if (desc.getName() == null)
-				{
-					continue;
-				}
-
-				final PluginCommand pc = getServer().getPluginCommand(desc.getName() + ":" + commandLabel);
-				if (pc != null)
-				{
-					return pc.execute(sender, commandLabel, args);
-				}
+				alternativeCommandsHandler.executed(commandLabel, pc.getLabel());
+				return pc.execute(sender, commandLabel, args);
 			}
 		}
 
@@ -406,7 +319,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 				final List<String> mail = user.getMails();
 				if (mail != null && !mail.isEmpty())
 				{
-					user.sendMessage(Util.format("youHaveNewMail", mail.size()));
+					user.sendMessage(_("youHaveNewMail", mail.size()));
 				}
 			}
 
@@ -421,19 +334,20 @@ public class Essentials extends JavaPlugin implements IEssentials
 			{
 				cmd = (IEssentialsCommand)classLoader.loadClass(commandPath + command.getName()).newInstance();
 				cmd.setEssentials(this);
+				cmd.setEssentialsModule(module);
 			}
 			catch (Exception ex)
 			{
-				sender.sendMessage(Util.format("commandNotLoaded", commandLabel));
-				LOGGER.log(Level.SEVERE, Util.format("commandNotLoaded", commandLabel), 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, Util.format("deniedAccessCommand", user.getName()));
-				user.sendMessage(Util.i18n("noAccessCommand"));
+				LOGGER.log(Level.WARNING, _("deniedAccessCommand", user.getName()));
+				user.sendMessage(_("noAccessCommand"));
 				return true;
 			}
 
@@ -458,6 +372,10 @@ public class Essentials extends JavaPlugin implements IEssentials
 			{
 				sender.sendMessage(command.getDescription());
 				sender.sendMessage(command.getUsage().replaceAll("<command>", commandLabel));
+				if (!ex.getMessage().isEmpty())
+				{
+					sender.sendMessage(ex.getMessage());
+				}
 				return true;
 			}
 			catch (Throwable ex)
@@ -468,7 +386,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 		}
 		catch (Throwable ex)
 		{
-			LOGGER.log(Level.SEVERE, Util.format("commandFailed", commandLabel), ex);
+			LOGGER.log(Level.SEVERE, _("commandFailed", commandLabel), ex);
 			return true;
 		}
 	}
@@ -476,12 +394,10 @@ public class Essentials extends JavaPlugin implements IEssentials
 	@Override
 	public void showError(final CommandSender sender, final Throwable exception, final String commandLabel)
 	{
-		sender.sendMessage(Util.format("errorWithMessage", exception.getMessage()));
-		final LogRecord logRecord = new LogRecord(Level.WARNING, Util.format("errorCallingCommand", commandLabel));
-		logRecord.setThrown(exception);
+		sender.sendMessage(_("errorWithMessage", exception.getMessage()));
 		if (getSettings().isDebug())
 		{
-			LOGGER.log(logRecord);
+			LOGGER.log(Level.WARNING, _("errorCallingCommand", commandLabel), exception);
 		}
 	}
 
@@ -492,9 +408,9 @@ public class Essentials extends JavaPlugin implements IEssentials
 	}
 
 	@Override
-	public Jail getJail()
+	public IJails getJails()
 	{
-		return jail;
+		return jails;
 	}
 
 	@Override
@@ -515,12 +431,6 @@ public class Essentials extends JavaPlugin implements IEssentials
 		return backup;
 	}
 
-	@Override
-	public Spawn getSpawn()
-	{
-		return spawn;
-	}
-
 	@Override
 	public User getUser(final Object base)
 	{
@@ -530,14 +440,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 		}
 		if (base instanceof String)
 		{
-			try
-			{
-				return userMap.getUser((String)base);
-			}
-			catch (NullPointerException ex)
-			{
-				return null;
-			}
+			return userMap.getUser((String)base);
 		}
 		return null;
 	}
@@ -553,27 +456,23 @@ public class Essentials extends JavaPlugin implements IEssentials
 		{
 			return (User)base;
 		}
-		try
+		User user = userMap.getUser(base.getName());
+
+		if (user == null)
 		{
-			return userMap.getUser(base.getName()).update(base);
+			user = new User(base, this);
 		}
-		catch (NullPointerException ex)
+		else
 		{
-			return new User(base, this);
+			user.update(base);
 		}
+		return user;
 	}
 
 	@Override
 	public User getOfflineUser(final String name)
 	{
-		try
-		{
-			return userMap.getUser(name);
-		}
-		catch (NullPointerException ex)
-		{
-			return null;
-		}
+		return userMap.getUser(name);
 	}
 
 	@Override
@@ -663,6 +562,12 @@ public class Essentials extends JavaPlugin implements IEssentials
 		return permissionsHandler;
 	}
 
+	@Override
+	public AlternativeCommandsHandler getAlternativeCommandsHandler()
+	{
+		return alternativeCommandsHandler;
+	}
+
 	@Override
 	public ItemDb getItemDb()
 	{
@@ -674,4 +579,10 @@ public class Essentials extends JavaPlugin implements IEssentials
 	{
 		return userMap;
 	}
+
+	@Override
+	public I18n getI18n()
+	{
+		return i18n;
+	}
 }

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

@@ -28,69 +28,9 @@ public class EssentialsBlockListener extends BlockListener
 		final User user = ess.getUser(event.getPlayer());
 		// Do not rely on getItemInHand();
 		// http://leaky.bukkit.org/issues/663
-		final ItemStack is = new ItemStack(event.getBlockPlaced().getType(), 1, (short)0, event.getBlockPlaced().getData());
-		switch (is.getType())
+		final ItemStack is = Util.convertBlockToItem(event.getBlockPlaced());
+		if (is == null)
 		{
-		case WOODEN_DOOR:
-			is.setType(Material.WOOD_DOOR);
-			is.setDurability((short)0);
-			break;
-		case IRON_DOOR_BLOCK:
-			is.setType(Material.IRON_DOOR);
-			is.setDurability((short)0);
-			break;
-		case SIGN_POST:
-		case WALL_SIGN:
-			is.setType(Material.SIGN);
-			is.setDurability((short)0);
-			break;
-		case CROPS:
-			is.setType(Material.SEEDS);
-			is.setDurability((short)0);
-			break;
-		case CAKE_BLOCK:
-			is.setType(Material.CAKE);
-			is.setDurability((short)0);
-			break;
-		case BED_BLOCK:
-			is.setType(Material.BED);
-			is.setDurability((short)0);
-			break;
-		case REDSTONE_WIRE:
-			is.setType(Material.REDSTONE);
-			is.setDurability((short)0);
-			break;
-		case REDSTONE_TORCH_OFF:
-		case REDSTONE_TORCH_ON:
-			is.setType(Material.REDSTONE_TORCH_ON);
-			is.setDurability((short)0);
-			break;
-		case DIODE_BLOCK_OFF:
-		case DIODE_BLOCK_ON:
-			is.setType(Material.DIODE);
-			is.setDurability((short)0);
-			break;
-		case DOUBLE_STEP:
-			is.setType(Material.STEP);
-			break;
-		case TORCH:
-		case RAILS:
-		case LADDER:
-		case WOOD_STAIRS:
-		case COBBLESTONE_STAIRS:
-		case LEVER:
-		case STONE_BUTTON:
-		case FURNACE:
-		case DISPENSER:
-		case PUMPKIN:
-		case JACK_O_LANTERN:
-		case WOOD_PLATE:
-		case STONE_PLATE:
-		case PISTON_STICKY_BASE:
-		case PISTON_BASE:
-			is.setDurability((short)0);
-			break;
-		case FIRE:
 			return;
 		}
 		boolean unlimitedForUser = user.hasUnlimited(is);
@@ -99,6 +39,7 @@ public class EssentialsBlockListener extends BlockListener
 			ess.scheduleSyncDelayedTask(
 					new Runnable()
 					{
+						@Override
 						public void run()
 						{
 							user.getInventory().addItem(is);

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

@@ -1,13 +1,10 @@
 package com.earth2me.essentials;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+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;
 import java.util.logging.Logger;
@@ -15,6 +12,7 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.World;
+import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.config.Configuration;
 
@@ -44,7 +42,7 @@ public class EssentialsConf extends Configuration
 		{
 			if (!configFile.getParentFile().mkdirs())
 			{
-				LOGGER.log(Level.SEVERE, Util.format("failedToCreateConfig", configFile.toString()));
+				LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()));
 			}
 		}
 		// This will delete files where the first character is 0. In most cases they are broken.
@@ -87,22 +85,22 @@ public class EssentialsConf extends Configuration
 		{
 			if (templateName != null)
 			{
-				LOGGER.log(Level.INFO, Util.format("creatingConfigFromTemplate", configFile.toString()));
+				LOGGER.log(Level.INFO, _("creatingConfigFromTemplate", configFile.toString()));
 				createFromTemplate();
 			}
 			else
 			{
 				try
 				{
-					LOGGER.log(Level.INFO, Util.format("creatingEmptyConfig", configFile.toString()));
+					LOGGER.log(Level.INFO, _("creatingEmptyConfig", configFile.toString()));
 					if (!configFile.createNewFile())
 					{
-						LOGGER.log(Level.SEVERE, Util.format("failedToCreateConfig", configFile.toString()));
+						LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()));
 					}
 				}
 				catch (IOException ex)
 				{
-					LOGGER.log(Level.SEVERE, Util.format("failedToCreateConfig", configFile.toString()), ex);
+					LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()), ex);
 				}
 			}
 		}
@@ -113,7 +111,7 @@ public class EssentialsConf extends Configuration
 		}
 		catch (RuntimeException e)
 		{
-			LOGGER.log(Level.INFO, "File: " + configFile.toString());
+			LOGGER.log(Level.SEVERE, "File broken: " + configFile.toString());
 			throw e;
 		}
 
@@ -132,7 +130,7 @@ public class EssentialsConf extends Configuration
 			istr = resourceClass.getResourceAsStream(templateName);
 			if (istr == null)
 			{
-				LOGGER.log(Level.SEVERE, Util.format("couldNotFindTemplate", templateName));
+				LOGGER.log(Level.SEVERE, _("couldNotFindTemplate", templateName));
 				return;
 			}
 			ostr = new FileOutputStream(configFile);
@@ -147,8 +145,7 @@ public class EssentialsConf extends Configuration
 		}
 		catch (IOException ex)
 		{
-			LOGGER.log(Level.SEVERE, Util.format("failedToWriteConfig", configFile.toString()), ex);
-			return;
+			LOGGER.log(Level.SEVERE, _("failedToWriteConfig", configFile.toString()), ex);
 		}
 		finally
 		{
@@ -172,7 +169,7 @@ public class EssentialsConf extends Configuration
 			}
 			catch (IOException ex)
 			{
-				LOGGER.log(Level.SEVERE, Util.format("failedToCloseConfig", configFile.toString()), ex);
+				LOGGER.log(Level.SEVERE, _("failedToCloseConfig", configFile.toString()), ex);
 			}
 		}
 	}
@@ -208,7 +205,7 @@ public class EssentialsConf extends Configuration
 		final World world = server.getWorld(worldName);
 		if (world == null)
 		{
-			throw new Exception(Util.i18n("invalidWorld"));
+			throw new Exception(_("invalidWorld"));
 		}
 		return new Location(world,
 							getDouble((path == null ? "" : path + ".") + "x", 0),
@@ -230,11 +227,29 @@ public class EssentialsConf extends Configuration
 
 	public ItemStack getItemStack(final String path)
 	{
-		return new ItemStack(
+		final ItemStack stack = new ItemStack(
 				Material.valueOf(getString(path + ".type", "AIR")),
 				getInt(path + ".amount", 1),
-				(short)getInt(path + ".damage", 0)/*,
-				(byte)getInt(path + ".data", 0)*/);
+				(short)getInt(path + ".damage", 0));
+		final List<String> enchants = getKeys(path + ".enchant");
+		if (enchants != null)
+		{
+			for (String enchant : enchants)
+			{
+				final Enchantment enchantment = Enchantment.getByName(enchant.toUpperCase(Locale.ENGLISH));
+				if (enchantment == null)
+				{
+					continue;
+				}
+				final int level = getInt(path + ".enchant." + enchant, enchantment.getStartLevel());
+				stack.addUnsafeEnchantment(enchantment, level);
+			}
+		}
+		return stack;
+		/*
+		 * ,
+		 * (byte)getInt(path + ".data", 0)
+		 */
 	}
 
 	public void setProperty(final String path, final ItemStack stack)
@@ -243,6 +258,16 @@ public class EssentialsConf extends Configuration
 		map.put("type", stack.getType().toString());
 		map.put("amount", stack.getAmount());
 		map.put("damage", stack.getDurability());
+		Map<Enchantment, Integer> enchantments = stack.getEnchantments();
+		if (!enchantments.isEmpty())
+		{
+			Map<String, Integer> enchant = new HashMap<String, Integer>();
+			for (Map.Entry<Enchantment, Integer> entry : enchantments.entrySet())
+			{
+				enchant.put(entry.getKey().getName().toLowerCase(Locale.ENGLISH), entry.getValue());
+			}
+			map.put("enchant", enchant);
+		}
 		// getData().getData() is broken
 		//map.put("data", stack.getDurability());
 		setProperty(path, map);

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

@@ -1,19 +1,14 @@
 package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n._;
 import java.util.List;
-import java.util.logging.Level;
 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.EntityCombustEvent;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityDeathEvent;
-import org.bukkit.event.entity.EntityListener;
-import org.bukkit.event.entity.EntityRegainHealthEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
-import org.bukkit.event.entity.FoodLevelChangeEvent;
-import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.entity.*;
 import org.bukkit.inventory.ItemStack;
 
 
@@ -56,6 +51,18 @@ public class EssentialsEntityListener extends EntityListener
 					}
 				}
 			}
+			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())
 		{
@@ -85,7 +92,7 @@ public class EssentialsEntityListener extends EntityListener
 			if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back"))
 			{
 				user.setLastLocation();
-				user.sendMessage(Util.i18n("backAfterDeath"));
+				user.sendMessage(_("backAfterDeath"));
 			}
 			if (!ess.getSettings().areDeathMessagesEnabled())
 			{

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

@@ -1,33 +1,27 @@
 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.World;
-import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.block.Action;
-import org.bukkit.event.player.PlayerAnimationEvent;
-import org.bukkit.event.player.PlayerAnimationType;
-import org.bukkit.event.player.PlayerBedEnterEvent;
-import org.bukkit.event.player.PlayerBucketEmptyEvent;
-import org.bukkit.event.player.PlayerChatEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerEggThrowEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerListener;
-import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerLoginEvent.Result;
-import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.event.player.*;
 import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.inventory.ItemStack;
 
 
@@ -50,7 +44,7 @@ public class EssentialsPlayerListener extends PlayerListener
 		updateCompass(user);
 		if (ess.getSettings().changeDisplayName())
 		{
-			user.setDisplayNick(user.getNick());
+			user.setDisplayNick();
 		}
 	}
 
@@ -61,8 +55,8 @@ public class EssentialsPlayerListener extends PlayerListener
 		if (user.isMuted())
 		{
 			event.setCancelled(true);
-			user.sendMessage(Util.i18n("playerMuted"));
-			LOGGER.info(Util.format("mutedUserSpeaks", user.getName()));
+			user.sendMessage(_("playerMuted"));
+			LOGGER.info(_("mutedUserSpeaks", user.getName()));
 		}
 		final Iterator<Player> it = event.getRecipients().iterator();
 		while (it.hasNext())
@@ -76,7 +70,7 @@ public class EssentialsPlayerListener extends PlayerListener
 		user.updateActivity(true);
 		if (ess.getSettings().changeDisplayName())
 		{
-			user.setDisplayNick(user.getNick());
+			user.setDisplayNick();
 		}
 	}
 
@@ -129,33 +123,6 @@ public class EssentialsPlayerListener extends PlayerListener
 		}
 		user.updateActivity(false);
 		user.dispose();
-		if (!ess.getSettings().getReclaimSetting())
-		{
-			return;
-		}
-		final Thread thread = new Thread(new Runnable()
-		{
-			public void run()
-			{
-				try
-				{
-					Thread.sleep(1000);
-					Runtime rt = Runtime.getRuntime();
-					double mem = rt.freeMemory();
-					rt.runFinalization();
-					rt.gc();
-					mem = rt.freeMemory() - mem;
-					mem /= 1024 * 1024;
-					LOGGER.log(Level.INFO, Util.format("freedMemory", mem));
-				}
-				catch (InterruptedException ex)
-				{
-					return;
-				}
-			}
-		});
-		thread.setPriority(Thread.MIN_PRIORITY);
-		thread.start();
 	}
 
 	@Override
@@ -166,7 +133,7 @@ public class EssentialsPlayerListener extends PlayerListener
 
 		if (ess.getSettings().changeDisplayName())
 		{
-			user.setDisplayNick(user.getNick());
+			user.setDisplayNick();
 		}
 		user.setLastLoginAddress(user.getAddress().getAddress().getHostAddress());
 		user.updateActivity(false);
@@ -177,13 +144,23 @@ public class EssentialsPlayerListener extends PlayerListener
 
 		if (!ess.getSettings().isCommandDisabled("motd") && user.isAuthorized("essentials.motd"))
 		{
-			for (String m : ess.getMotd(user, null))
+			try
 			{
-				if (m == null)
+				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())
 				{
-					continue;
+					LOGGER.log(Level.WARNING, ex.getMessage(), ex);
+				}
+				else
+				{
+					LOGGER.log(Level.WARNING, ex.getMessage());
 				}
-				user.sendMessage(m);
 			}
 		}
 
@@ -192,11 +169,11 @@ public class EssentialsPlayerListener extends PlayerListener
 			final List<String> mail = user.getMails();
 			if (mail.isEmpty())
 			{
-				user.sendMessage(Util.i18n("noNewMail"));
+				user.sendMessage(_("noNewMail"));
 			}
 			else
 			{
-				user.sendMessage(Util.format("youHaveNewMail", mail.size()));
+				user.sendMessage(_("youHaveNewMail", mail.size()));
 			}
 		}
 	}
@@ -220,13 +197,13 @@ public class EssentialsPlayerListener extends PlayerListener
 		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 : Util.i18n("defaultBanReason"));
+			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, Util.i18n("serverFull"));
+			event.disallow(Result.KICK_FULL, _("serverFull"));
 			return;
 		}
 		event.allow();
@@ -237,12 +214,14 @@ public class EssentialsPlayerListener extends PlayerListener
 
 	private void updateCompass(final User user)
 	{
-		try
+		Location loc = user.getHome(user.getLocation());
+		if (loc == null)
 		{
-			user.setCompassTarget(user.getHome(user.getLocation()));
+			loc = user.getBedSpawnLocation();
 		}
-		catch (Exception ex)
+		if (loc != null)
 		{
+			user.setCompassTarget(loc);
 		}
 	}
 
@@ -253,40 +232,21 @@ public class EssentialsPlayerListener extends PlayerListener
 		{
 			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(user.getNick());
+			user.setDisplayNick();
 		}
 		updateCompass(user);
 	}
 
-	@Override
-	public void onPlayerInteract(final PlayerInteractEvent event)
-	{
-		if (event.isCancelled())
-		{
-			return;
-		}
-		if (event.getAction() != Action.RIGHT_CLICK_BLOCK)
-		{
-			return;
-		}
-
-		if (ess.getSettings().getBedSetsHome() && event.getClickedBlock().getType() == Material.BED_BLOCK)
-		{
-			try
-			{
-				final User user = ess.getUser(event.getPlayer());
-				user.setHome();
-				user.sendMessage(Util.i18n("homeSetToBed"));
-			}
-			catch (Throwable ex)
-			{
-			}
-		}
-	}
-
 	@Override
 	public void onPlayerEggThrow(final PlayerEggThrowEvent event)
 	{
@@ -308,6 +268,7 @@ public class EssentialsPlayerListener extends PlayerListener
 			event.getItemStack().setType(event.getBucket());
 			ess.scheduleSyncDelayedTask(new Runnable()
 			{
+				@Override
 				public void run()
 				{
 					user.updateInventory();
@@ -372,7 +333,7 @@ public class EssentialsPlayerListener extends PlayerListener
 			return;
 		}
 		final User user = ess.getUser(event.getPlayer());
-		final String cmd = event.getMessage().toLowerCase().split(" ")[0].replace("/", "").toLowerCase();
+		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))
 		{
@@ -390,4 +351,49 @@ public class EssentialsPlayerListener extends PlayerListener
 			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

@@ -21,6 +21,7 @@ public class EssentialsPluginListener extends ServerListener implements IConf
 	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() + ")");
@@ -31,6 +32,7 @@ public class EssentialsPluginListener extends ServerListener implements IConf
 	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()))
 		{

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

@@ -1,21 +1,14 @@
 package com.earth2me.essentials;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
+import com.earth2me.essentials.craftbukkit.FakeWorld;
+import com.earth2me.essentials.settings.Spawns;
+import com.earth2me.essentials.storage.YamlStorageWriter;
+import static com.earth2me.essentials.I18n._;
+import java.io.*;
 import java.math.BigInteger;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Bukkit;
@@ -78,7 +71,51 @@ public class EssentialsUpgrade
 		}
 		catch (Throwable e)
 		{
-			LOGGER.log(Level.SEVERE, Util.i18n("upgradingFilesError"), e);
+			LOGGER.log(Level.SEVERE, _("upgradingFilesError"), e);
+		}
+	}
+
+	private void moveMotdRulesToFile(String name)
+	{
+		if (doneFile.getBoolean("move" + name + "ToFile", false))
+		{
+			return;
+		}
+		try
+		{
+			final File file = new File(ess.getDataFolder(), name + ".txt");
+			if (file.exists())
+			{
+				return;
+			}
+			final File configFile = new File(ess.getDataFolder(), "config.yml");
+			if (!configFile.exists())
+			{
+				return;
+			}
+			final EssentialsConf conf = new EssentialsConf(configFile);
+			conf.load();
+			List<String> lines = conf.getStringList(name, null);
+			if (lines != null && !lines.isEmpty())
+			{
+				if (!file.createNewFile())
+				{
+					throw new IOException("Failed to create file " + file);
+				}
+				PrintWriter writer = new PrintWriter(file);
+
+				for (String line : lines)
+				{
+					writer.println(line);
+				}
+				writer.close();
+			}
+			doneFile.setProperty("move" + name + "ToFile", true);
+			doneFile.save();
+		}
+		catch (Throwable e)
+		{
+			LOGGER.log(Level.SEVERE, _("upgradingFilesError"), e);
 		}
 	}
 
@@ -128,11 +165,11 @@ public class EssentialsUpgrade
 		{
 			if (!file.renameTo(new File(file.getParentFile(), file.getName().concat("." + System.currentTimeMillis() + ".upgradebackup"))))
 			{
-				throw new Exception(Util.i18n("configFileMoveError"));
+				throw new Exception(_("configFileMoveError"));
 			}
 			if (!tempFile.renameTo(file))
 			{
-				throw new Exception(Util.i18n("configFileRenameError"));
+				throw new Exception(_("configFileRenameError"));
 			}
 		}
 		else
@@ -187,7 +224,7 @@ public class EssentialsUpgrade
 								((Number)vals.get(3)).floatValue(),
 								((Number)vals.get(4)).floatValue());
 
-						final String worldName = world.getName().toLowerCase();
+						final String worldName = world.getName().toLowerCase(Locale.ENGLISH);
 						if (worldName != null && !worldName.isEmpty())
 						{
 							config.removeProperty("home");
@@ -314,7 +351,7 @@ public class EssentialsUpgrade
 						{
 							continue;
 						}
-						worldName = loc.getWorld().getName().toLowerCase();
+						worldName = loc.getWorld().getName().toLowerCase(Locale.ENGLISH);
 						if (worldName != null && !worldName.isEmpty())
 						{
 							config.setProperty("homes." + worldName, loc);
@@ -460,7 +497,7 @@ public class EssentialsUpgrade
 						ess.getWarps().setWarp(filename.substring(0, filename.length() - 4), loc);
 						if (!listOfFiles[i].renameTo(new File(warpsFolder, filename + ".old")))
 						{
-							throw new Exception(Util.format("fileRenameError", filename));
+							throw new Exception(_("fileRenameError", filename));
 						}
 					}
 					catch (Exception ex)
@@ -508,7 +545,7 @@ public class EssentialsUpgrade
 						ess.getWarps().setWarp(name, loc);
 						if (!warpFile.renameTo(new File(ess.getDataFolder(), "warps.txt.old")))
 						{
-							throw new Exception(Util.format("fileRenameError", "warps.txt"));
+							throw new Exception(_("fileRenameError", "warps.txt"));
 						}
 					}
 				}
@@ -552,17 +589,17 @@ public class EssentialsUpgrade
 			final File newFile = new File(listOfFiles[i].getParentFile(), sanitizedFilename);
 			if (!listOfFiles[i].renameTo(tmpFile))
 			{
-				LOGGER.log(Level.WARNING, Util.format("userdataMoveError", filename, sanitizedFilename));
+				LOGGER.log(Level.WARNING, _("userdataMoveError", filename, sanitizedFilename));
 				continue;
 			}
 			if (newFile.exists())
 			{
-				LOGGER.log(Level.WARNING, Util.format("duplicatedUserdata", filename, sanitizedFilename));
+				LOGGER.log(Level.WARNING, _("duplicatedUserdata", filename, sanitizedFilename));
 				continue;
 			}
 			if (!tmpFile.renameTo(newFile))
 			{
-				LOGGER.log(Level.WARNING, Util.format("userdataMoveBackError", sanitizedFilename, sanitizedFilename));
+				LOGGER.log(Level.WARNING, _("userdataMoveBackError", sanitizedFilename, sanitizedFilename));
 			}
 		}
 		doneFile.setProperty("sanitizeAllUserFilenames", true);
@@ -647,6 +684,100 @@ public class EssentialsUpgrade
 		}
 	}
 
+	private void updateSpawnsToNewSpawnsConfig()
+	{
+		if (doneFile.getBoolean("updateSpawnsToNewSpawnsConfig", false))
+		{
+			return;
+		}
+		final File configFile = new File(ess.getDataFolder(), "spawn.yml");
+		if (configFile.exists())
+		{
+
+			final EssentialsConf config = new EssentialsConf(configFile);
+			try
+			{
+				config.load();
+				if (!config.hasProperty("spawns"))
+				{
+					final Spawns spawns = new Spawns();
+					List<String> keys = config.getKeys();
+					for (String group : keys)
+					{
+						Location loc = getFakeLocation(config, group);
+						spawns.getSpawns().put(group.toLowerCase(Locale.ENGLISH), loc);
+					}
+					if (!configFile.renameTo(new File(ess.getDataFolder(), "spawn.yml.old")))
+					{
+						throw new Exception(_("fileRenameError", "spawn.yml"));
+					}
+					PrintWriter writer = new PrintWriter(configFile);
+					try
+					{
+						new YamlStorageWriter(writer).save(spawns);
+					}
+					finally
+					{
+						writer.close();
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+			}
+		}
+		doneFile.setProperty("updateSpawnsToNewSpawnsConfig", true);
+		doneFile.save();
+	}
+	
+	private void updateJailsToNewJailsConfig()
+	{
+		if (doneFile.getBoolean("updateJailsToNewJailsConfig", false))
+		{
+			return;
+		}
+		final File configFile = new File(ess.getDataFolder(), "jail.yml");
+		if (configFile.exists())
+		{
+
+			final EssentialsConf config = new EssentialsConf(configFile);
+			try
+			{
+				config.load();
+				if (!config.hasProperty("jails"))
+				{
+					final com.earth2me.essentials.settings.Jails jails = new com.earth2me.essentials.settings.Jails();
+					List<String> keys = config.getKeys();
+					for (String jailName : keys)
+					{
+						Location loc = getFakeLocation(config, jailName);
+						jails.getJails().put(jailName.toLowerCase(Locale.ENGLISH), loc);
+					}
+					if (!configFile.renameTo(new File(ess.getDataFolder(), "jail.yml.old")))
+					{
+						throw new Exception(_("fileRenameError", "jail.yml"));
+					}
+					PrintWriter writer = new PrintWriter(configFile);
+					try
+					{
+						new YamlStorageWriter(writer).save(jails);
+					}
+					finally
+					{
+						writer.close();
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+			}
+		}
+		doneFile.setProperty("updateJailsToNewJailsConfig", true);
+		doneFile.save();
+	}
+
 	public void beforeSettings()
 	{
 		if (!ess.getDataFolder().exists())
@@ -654,6 +785,8 @@ public class EssentialsUpgrade
 			ess.getDataFolder().mkdirs();
 		}
 		moveWorthValuesToWorthYml();
+		moveMotdRulesToFile("motd");
+		moveMotdRulesToFile("rules");
 	}
 
 	public void afterSettings()
@@ -665,5 +798,7 @@ public class EssentialsUpgrade
 		updateUsersPowerToolsFormat();
 		updateUsersHomesFormat();
 		deleteOldItemsCsv();
+		updateSpawnsToNewSpawnsConfig();
+		updateJailsToNewJailsConfig();
 	}
 }

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

@@ -1,12 +1,17 @@
 package com.earth2me.essentials;
 
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 
 public class ExecuteTimer
 {
-	private final List<ExecuteRecord> times;
+	private final transient List<ExecuteRecord> times;
+	private final transient DecimalFormat decimalFormat = new DecimalFormat("#0.000", DecimalFormatSymbols.getInstance(Locale.US));
+
 
 	public ExecuteTimer()
 	{
@@ -24,7 +29,7 @@ public class ExecuteTimer
 	{
 		if (!times.isEmpty() || "start".equals(label))
 		{
-			times.add(new ExecuteRecord(label, System.currentTimeMillis()));
+			times.add(new ExecuteRecord(label, System.nanoTime()));
 		}
 	}
 
@@ -36,7 +41,7 @@ public class ExecuteTimer
 		long time0 = 0;
 		long time1 = 0;
 		long time2 = 0;
-		long duration;
+		double duration;
 
 		for (ExecuteRecord pair : times)
 		{
@@ -44,8 +49,8 @@ public class ExecuteTimer
 			time2 = (Long)pair.getTime();
 			if (time1 > 0)
 			{
-				duration = time2 - time1;
-				output.append(mark).append(": ").append(duration).append("ms - ");
+				duration = (time2 - time1)/1000000.0;
+				output.append(mark).append(": ").append(decimalFormat.format(duration)).append("ms - ");
 			}
 			else
 			{
@@ -53,8 +58,8 @@ public class ExecuteTimer
 			}
 			time1 = time2;
 		}
-		duration = time1 - time0;
-		output.append("Total: ").append(duration).append("ms");
+		duration = (time1 - time0)/1000000.0;
+		output.append("Total: ").append(decimalFormat.format(duration)).append("ms");
 		times.clear();
 		return output.toString();
 	}

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

@@ -0,0 +1,175 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.api.II18n;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.MessageFormat;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+public class I18n implements II18n
+{
+	private static I18n instance;
+	private static final String MESSAGES = "messages";
+	private final transient Locale defaultLocale = Locale.getDefault();
+	private transient Locale currentLocale = defaultLocale;
+	private transient ResourceBundle customBundle;
+	private transient ResourceBundle localeBundle;
+	private final transient ResourceBundle defaultBundle;
+	private final transient Map<String, MessageFormat> messageFormatCache = new HashMap<String, MessageFormat>();
+	private final transient IEssentials ess;
+
+	public I18n(final IEssentials ess)
+	{
+		this.ess = ess;
+		customBundle = ResourceBundle.getBundle(MESSAGES, defaultLocale, new FileResClassLoader(I18n.class.getClassLoader(), ess));
+		localeBundle = ResourceBundle.getBundle(MESSAGES, defaultLocale);
+		defaultBundle = ResourceBundle.getBundle(MESSAGES, Locale.ENGLISH);
+	}
+
+	public void onEnable()
+	{
+		instance = this;
+	}
+
+	public void onDisable()
+	{
+		instance = null;
+	}
+
+	public Locale getCurrentLocale()
+	{
+		return currentLocale;
+	}
+
+	public String translate(final String string)
+	{
+		try
+		{
+			try
+			{
+				return customBundle.getString(string);
+			}
+			catch (MissingResourceException ex)
+			{
+				return localeBundle.getString(string);
+			}
+		}
+		catch (MissingResourceException ex)
+		{
+			Logger.getLogger("Minecraft").log(Level.WARNING, String.format("Missing translation key \"%s\" in translation file %s", ex.getKey(), localeBundle.getLocale().toString()), ex);
+			return defaultBundle.getString(string);
+		}
+	}
+
+	public static String _(final String string, final Object... objects)
+	{
+		if (instance == null) {
+			return "";
+		}
+		if (objects.length == 0)
+		{
+			return instance.translate(string);
+		}
+		else
+		{
+			return instance.format(string, objects);
+		}
+	}
+
+	public String format(final String string, final Object... objects)
+	{
+		final String format = translate(string);
+		MessageFormat messageFormat = messageFormatCache.get(format);
+		if (messageFormat == null)
+		{
+			messageFormat = new MessageFormat(format);
+			messageFormatCache.put(format, messageFormat);
+		}
+		return messageFormat.format(objects);
+	}
+
+	public void updateLocale(final String loc)
+	{
+		if (loc == null || loc.isEmpty())
+		{
+			return;
+		}
+		final String[] parts = loc.split("[_\\.]");
+		if (parts.length == 1)
+		{
+			currentLocale = new Locale(parts[0]);
+		}
+		if (parts.length == 2)
+		{
+			currentLocale = new Locale(parts[0], parts[1]);
+		}
+		if (parts.length == 3)
+		{
+			currentLocale = new Locale(parts[0], parts[1], parts[2]);
+		}
+		Logger.getLogger("Minecraft").log(Level.INFO, String.format("Using locale %s", currentLocale.toString()));
+		customBundle = ResourceBundle.getBundle(MESSAGES, currentLocale, new FileResClassLoader(I18n.class.getClassLoader(), ess));
+		localeBundle = ResourceBundle.getBundle(MESSAGES, currentLocale);
+	}
+
+	public static String capitalCase(final String input)
+	{
+		return input == null || input.length() == 0
+			   ? input
+			   : input.toUpperCase(Locale.ENGLISH).charAt(0)
+				 + input.toLowerCase(Locale.ENGLISH).substring(1);
+	}
+
+
+	private static class FileResClassLoader extends ClassLoader
+	{
+		private final transient File dataFolder;
+
+		public FileResClassLoader(final ClassLoader classLoader, final IEssentials ess)
+		{
+			super(classLoader);
+			this.dataFolder = ess.getDataFolder();
+		}
+
+		@Override
+		public URL getResource(final String string)
+		{
+			final File file = new File(dataFolder, string);
+			if (file.exists())
+			{
+				try
+				{
+					return file.toURI().toURL();
+				}
+				catch (MalformedURLException ex)
+				{
+				}
+			}
+			return super.getResource(string);
+		}
+
+		@Override
+		public InputStream getResourceAsStream(final String string)
+		{
+			final File file = new File(dataFolder, string);
+			if (file.exists())
+			{
+				try
+				{
+					return new FileInputStream(file);
+				}
+				catch (FileNotFoundException ex)
+				{
+				}
+			}
+			return super.getResourceAsStream(string);
+		}
+	}
+}

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

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

@@ -1,5 +1,6 @@
 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;
@@ -8,17 +9,22 @@ 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);
+	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);
@@ -29,11 +35,7 @@ public interface IEssentials extends Plugin
 
 	BukkitScheduler getScheduler();
 
-	String[] getMotd(CommandSender sender, String def);
-
-	String[] getLines(CommandSender sender, String node, String def);
-
-	Jail getJail();
+	IJails getJails();
 
 	Warps getWarps();
 
@@ -41,8 +43,6 @@ public interface IEssentials extends Plugin
 
 	Backup getBackup();
 
-	Spawn getSpawn();
-
 	Methods getPaymentMethod();
 
 	int scheduleAsyncDelayedTask(Runnable run);
@@ -57,6 +57,8 @@ public interface IEssentials extends Plugin
 
 	PermissionsHandler getPermissionsHandler();
 
+	AlternativeCommandsHandler getAlternativeCommandsHandler();
+
 	void showError(final CommandSender sender, final Throwable exception, final String commandLabel);
 
 	ItemDb getItemDb();

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

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

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

@@ -3,12 +3,13 @@ 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);
@@ -21,8 +22,6 @@ public interface ISettings extends IConf
 
 	long getBackupInterval();
 
-	boolean getBedSetsHome();
-
 	String getChatFormat(String group);
 
 	int getChatRadius();
@@ -33,6 +32,8 @@ public interface ISettings extends IConf
 
 	String getCurrencySymbol();
 
+	int getOversizedStackSize();
+	
 	int getDefaultStackSize();
 
 	double getHealCooldown();
@@ -61,14 +62,12 @@ public interface ISettings extends IConf
 
 	String getProtectString(final String configName);
 
-	boolean getReclaimSetting();
-
 	boolean getRespawnAtHome();
-	
+
 	List getMultipleHomes();
-	
+
 	int getHomeLimit(String set);
-	
+
 	int getHomeLimit(User user);
 
 	boolean getSortListByGroups();
@@ -110,11 +109,11 @@ public interface ISettings extends IConf
 	boolean warnOnBuildDisallow();
 
 	boolean warnOnSmite();
-	
+
 	double getMaxMoney();
 
 	boolean isEcoLogEnabled();
-	
+
 	boolean removeGodOnDisconnect();
 
 	boolean changeDisplayName();
@@ -124,9 +123,9 @@ public interface ISettings extends IConf
 	boolean useBukkitPermissions();
 
 	boolean addPrefixSuffix();
-	
+
 	boolean disablePrefix();
-	
+
 	boolean disableSuffix();
 
 	long getAutoAfk();
@@ -134,8 +133,24 @@ public interface ISettings extends IConf
 	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

@@ -7,16 +7,12 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.PlayerInventory;
 
 
-public interface IUser
+/**
+ * @deprecated This will be moved to the api package soon
+ */
+@Deprecated
+public interface IUser extends Player
 {
-	int getHealth();
-
-	Location getLocation();
-
-	boolean isOnline();
-
-	void sendMessage(String string);
-
 	long getLastTeleportTimestamp();
 
 	boolean isAuthorized(String node);
@@ -37,10 +33,6 @@ public interface IUser
 
 	void giveMoney(double value);
 
-	PlayerInventory getInventory();
-
-	void updateInventory();
-
 	String getGroup();
 
 	void setLastLocation();
@@ -49,11 +41,9 @@ public interface IUser
 
 	Location getHome(Location loc) throws Exception;
 
-	String getName();
-
-	InetSocketAddress getAddress();
-
-	String getDisplayName();
-
 	boolean isHidden();
+
+	Teleport getTeleport();
+
+	void setJail(String jail);
 }

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

@@ -1,13 +1,16 @@
 package com.earth2me.essentials;
 
+import com.earth2me.essentials.api.IItemDb;
+import static com.earth2me.essentials.I18n._;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
 
-public class ItemDb implements IConf
+public class ItemDb implements IConf, IItemDb
 {
 	private final transient IEssentials ess;
 
@@ -24,8 +27,9 @@ public class ItemDb implements IConf
 	public void reloadConfig()
 	{
 		final List<String> lines = file.getLines();
-		
-		if (lines.isEmpty()) {
+
+		if (lines.isEmpty())
+		{
 			return;
 		}
 
@@ -34,7 +38,7 @@ public class ItemDb implements IConf
 
 		for (String line : lines)
 		{
-			line = line.trim().toLowerCase();
+			line = line.trim().toLowerCase(Locale.ENGLISH);
 			if (line.length() > 0 && line.charAt(0) == '#')
 			{
 				continue;
@@ -48,14 +52,14 @@ public class ItemDb implements IConf
 
 			final int numeric = Integer.parseInt(parts[1]);
 
-			durabilities.put(parts[0].toLowerCase(), parts.length > 2 && !parts[2].equals("0") ? Short.parseShort(parts[2]) : 0);
-			items.put(parts[0].toLowerCase(), numeric);
+			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 int quantity) throws Exception
 	{
-		final ItemStack retval = get(id.toLowerCase());
+		final ItemStack retval = get(id.toLowerCase(Locale.ENGLISH));
 		retval.setAmount(quantity);
 		return retval;
 	}
@@ -76,12 +80,12 @@ public class ItemDb implements IConf
 		}
 		else if (id.matches("^[^:+',;.]+[:+',;.]\\d+$"))
 		{
-			itemname = id.split("[:+',;.]")[0].toLowerCase();
+			itemname = id.split("[:+',;.]")[0].toLowerCase(Locale.ENGLISH);
 			metaData = Short.parseShort(id.split("[:+',;.]")[1]);
 		}
 		else
 		{
-			itemname = id.toLowerCase();
+			itemname = id.toLowerCase(Locale.ENGLISH);
 		}
 
 		if (itemname != null)
@@ -101,17 +105,17 @@ public class ItemDb implements IConf
 			}
 			else
 			{
-				throw new Exception(Util.format("unknownItemName", id));
+				throw new Exception(_("unknownItemName", id));
 			}
 		}
 
 		final Material mat = Material.getMaterial(itemid);
 		if (mat == null)
 		{
-			throw new Exception(Util.format("unknownItemId", itemid));
+			throw new Exception(_("unknownItemId", itemid));
 		}
 		final ItemStack retval = new ItemStack(mat);
-		retval.setAmount(ess.getSettings().getDefaultStackSize());
+		retval.setAmount(mat.getMaxStackSize());
 		retval.setDurability(metaData);
 		return retval;
 	}

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

@@ -1,97 +0,0 @@
-package com.earth2me.essentials;
-
-import java.io.File;
-import java.util.List;
-import java.util.logging.Logger;
-import org.bukkit.Location;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockDamageEvent;
-import org.bukkit.event.block.BlockListener;
-import org.bukkit.event.block.BlockPlaceEvent;
-
-
-public class Jail extends BlockListener implements IConf
-{
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	private final EssentialsConf config;
-	private final IEssentials ess;
-
-	public Jail(IEssentials ess)
-	{
-		this.ess = ess;
-		config = new EssentialsConf(new File(ess.getDataFolder(), "jail.yml"));
-		config.load();
-	}
-
-	public void setJail(Location loc, String jailName) throws Exception
-	{
-		config.setProperty(jailName.toLowerCase(), loc);
-		config.save();
-	}
-
-	public Location getJail(String jailName) throws Exception
-	{
-		if (jailName == null || config.getProperty(jailName.toLowerCase()) == null)
-		{
-			throw new Exception(Util.i18n("jailNotExist"));
-		}
-
-		Location loc = config.getLocation(jailName.toLowerCase(), ess.getServer());
-		return loc;
-	}
-
-	public void sendToJail(User user, String jail) throws Exception
-	{
-		if (!(user.getBase() instanceof OfflinePlayer))
-		{
-			user.getTeleport().now(getJail(jail));
-		}
-		user.setJail(jail);
-	}
-
-	public void delJail(String jail) throws Exception
-	{
-		config.removeProperty(jail.toLowerCase());
-		config.save();
-	}
-
-	public List<String> getJails() throws Exception
-	{
-		return config.getKeys(null);
-	}
-
-	public void reloadConfig()
-	{
-		config.load();
-	}
-
-	@Override
-	public void onBlockBreak(BlockBreakEvent event)
-	{
-		User user = ess.getUser(event.getPlayer());
-		if (user.isJailed())
-		{
-			event.setCancelled(true);
-		}
-	}
-
-	@Override
-	public void onBlockPlace(BlockPlaceEvent event)
-	{
-		User user = ess.getUser(event.getPlayer());
-		if (user.isJailed())
-		{
-			event.setCancelled(true);
-		}
-	}
-
-	@Override
-	public void onBlockDamage(BlockDamageEvent event)
-	{
-		User user = ess.getUser(event.getPlayer());
-		if (user.isJailed())
-		{
-			event.setCancelled(true);
-		}
-	}
-}

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

@@ -1,84 +0,0 @@
-package com.earth2me.essentials;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerListener;
-import org.bukkit.event.player.PlayerRespawnEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
-
-
-public class JailPlayerListener extends PlayerListener
-{
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private final IEssentials ess;
-
-	public JailPlayerListener(IEssentials parent)
-	{
-		this.ess = parent;
-	}
-
-	@Override
-	public void onPlayerInteract(PlayerInteractEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		if (user.isJailed())
-		{
-			event.setCancelled(true);
-		}
-	}
-
-	@Override
-	public void onPlayerRespawn(PlayerRespawnEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		if (user.isJailed() && user.getJail() != null && !user.getJail().isEmpty())
-		{
-			try
-			{
-				event.setRespawnLocation(ess.getJail().getJail(user.getJail()));
-			}
-			catch (Exception ex)
-			{
-			}
-		}
-	}
-
-	@Override
-	public void onPlayerTeleport(PlayerTeleportEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
-		{
-			return;
-		}
-		try
-		{
-			event.setTo(ess.getJail().getJail(user.getJail()));
-		}
-		catch (Exception ex)
-		{
-			LOGGER.log(Level.WARNING, Util.i18n("returnPlayerToJailError"), ex);
-		}
-		user.sendMessage(Util.i18n("jailMessage"));
-	}
-
-	@Override
-	public void onPlayerJoin(final PlayerJoinEvent event)
-	{
-		User u = ess.getUser(event.getPlayer());
-		if (u.isJailed())
-		{
-			try
-			{
-				ess.getJail().sendToJail(u, u.getJail());
-			}
-			catch (Exception ex)
-			{
-				LOGGER.log(Level.WARNING, Util.i18n("returnPlayerToJailError"), ex);
-			}
-			u.sendMessage(Util.i18n("jailMessage"));
-		}
-	}
-}

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

@@ -0,0 +1,248 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.api.IJails;
+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 org.bukkit.Bukkit;
+import org.bukkit.Location;
+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;
+
+
+public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Jails> implements IJails
+{
+	private static final transient Logger LOGGER = Bukkit.getLogger();
+
+	public Jails(final IEssentials ess)
+	{
+		super(ess, com.earth2me.essentials.settings.Jails.class);
+		reloadConfig();
+		registerListeners();
+	}
+
+	private void registerListeners()
+	{
+		final PluginManager pluginManager = ess.getServer().getPluginManager();
+		final JailBlockListener blockListener = new JailBlockListener();
+		final JailPlayerListener playerListener = new JailPlayerListener();
+		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
+	public File getStorageFile()
+	{
+		return new File(ess.getDataFolder(), "jail.yml");
+	}
+
+	@Override
+	public Location getJail(final String jailName) throws Exception
+	{
+		acquireReadLock();
+		try
+		{
+			if (getData().getJails() == null || jailName == null
+				|| !getData().getJails().containsKey(jailName.toLowerCase(Locale.ENGLISH)))
+			{
+				throw new Exception(_("jailNotExist"));
+			}
+			return getData().getJails().get(jailName.toLowerCase(Locale.ENGLISH));
+		}
+		finally
+		{
+			unlock();
+		}
+	}
+
+	@Override
+	public Collection<String> getList() throws Exception
+	{
+		acquireReadLock();
+		try
+		{
+			if (getData().getJails() == null)
+			{
+				return Collections.emptyList();
+			}
+			return new ArrayList<String>(getData().getJails().keySet());
+		}
+		finally
+		{
+			unlock();
+		}
+	}
+
+	@Override
+	public void removeJail(final String jail) throws Exception
+	{
+		acquireWriteLock();
+		try
+		{
+			if (getData().getJails() == null)
+			{
+				return;
+			}
+			getData().getJails().remove(jail.toLowerCase(Locale.ENGLISH));
+		}
+		finally
+		{
+			unlock();
+		}
+	}
+
+	@Override
+	public void sendToJail(final IUser user, final String jail) throws Exception
+	{
+		acquireReadLock();
+		try
+		{
+			if (!(user.getBase() instanceof OfflinePlayer))
+			{
+				user.getTeleport().now(getJail(jail), false, TeleportCause.COMMAND);
+			}
+			user.setJail(jail);
+		}
+		finally
+		{
+			unlock();
+		}
+	}
+
+	@Override
+	public void setJail(final String jailName, final Location loc) throws Exception
+	{
+		acquireWriteLock();
+		try
+		{
+			if (getData().getJails() == null)
+			{
+				getData().setJails(new HashMap<String, Location>());
+			}
+			getData().getJails().put(jailName.toLowerCase(Locale.ENGLISH), loc);
+		}
+		finally
+		{
+			unlock();
+		}
+	}
+
+
+	private class JailBlockListener extends BlockListener
+	{
+		@Override
+		public void onBlockBreak(final BlockBreakEvent event)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			if (user.isJailed())
+			{
+				event.setCancelled(true);
+			}
+		}
+
+		@Override
+		public void onBlockPlace(final BlockPlaceEvent event)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			if (user.isJailed())
+			{
+				event.setCancelled(true);
+			}
+		}
+
+		@Override
+		public void onBlockDamage(final BlockDamageEvent event)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			if (user.isJailed())
+			{
+				event.setCancelled(true);
+			}
+		}
+	}
+
+
+	private class JailPlayerListener extends PlayerListener
+	{
+		@Override
+		public void onPlayerInteract(final PlayerInteractEvent event)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			if (user.isJailed())
+			{
+				event.setCancelled(true);
+			}
+		}
+
+		@Override
+		public void onPlayerRespawn(final PlayerRespawnEvent event)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
+			{
+				return;
+			}
+
+			try
+			{
+				event.setRespawnLocation(getJail(user.getJail()));
+			}
+			catch (Exception ex)
+			{
+				LOGGER.log(Level.WARNING, _("returnPlayerToJailError"), ex);
+			}
+		}
+
+		@Override
+		public void onPlayerTeleport(final PlayerTeleportEvent event)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
+			{
+				return;
+			}
+
+			try
+			{
+				event.setTo(getJail(user.getJail()));
+			}
+			catch (Exception ex)
+			{
+				LOGGER.log(Level.WARNING, _("returnPlayerToJailError"), ex);
+			}
+			user.sendMessage(_("jailMessage"));
+		}
+
+		@Override
+		public void onPlayerJoin(final PlayerJoinEvent event)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
+			{
+				return;
+			}
+
+			try
+			{
+				sendToJail(user, user.getJail());
+			}
+			catch (Exception ex)
+			{
+				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/ManagedFile.java

@@ -1,15 +1,7 @@
 package com.earth2me.essentials;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
+import static com.earth2me.essentials.I18n._;
+import java.io.*;
 import java.math.BigInteger;
 import java.security.DigestInputStream;
 import java.security.DigestOutputStream;
@@ -54,7 +46,7 @@ public class ManagedFile
 			}
 			catch (IOException ex)
 			{
-				Bukkit.getLogger().log(Level.SEVERE, Util.i18n("itemsCsvNotLoaded"), ex);
+				Bukkit.getLogger().log(Level.SEVERE, _("itemsCsvNotLoaded"), ex);
 			}
 		}
 	}
@@ -138,12 +130,12 @@ public class ManagedFile
 			try
 			{
 				String hash = reader.readLine();
-				if (hash.matches("#[a-f0-9]{32}"))
+				if (hash != null && hash.matches("#[a-f0-9]{32}"))
 				{
 					hash = hash.substring(1);
 					bais.reset();
 					final String versionline = reader.readLine();
-					if (versionline.matches("#version: .+"))
+					if (versionline != null && versionline.matches("#version: .+"))
 					{
 						final String versioncheck = versionline.substring(10);
 						if (!versioncheck.equalsIgnoreCase(version))

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

@@ -1,7 +1,10 @@
 package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n._;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Location;
@@ -29,8 +32,14 @@ public enum Mob
 	WOLF("Wolf", Enemies.NEUTRAL, CreatureType.WOLF),
 	CAVESPIDER("CaveSpider", Enemies.ENEMY, CreatureType.CAVE_SPIDER),
 	ENDERMAN("Enderman", Enemies.ENEMY, "", CreatureType.ENDERMAN),
-	SILVERFISH("Silverfish", Enemies.ENEMY, "", CreatureType.SILVERFISH);
-
+	SILVERFISH("Silverfish", Enemies.ENEMY, "", CreatureType.SILVERFISH),
+	ENDERDRAGON("EnderDragon", Enemies.ENEMY, CreatureType.ENDER_DRAGON),
+	VILLAGER("Villager", Enemies.FRIENDLY, CreatureType.VILLAGER),
+	BLAZE("Blaze", Enemies.ENEMY, CreatureType.BLAZE),
+	MUSHROOMCOW("MushroomCow", Enemies.FRIENDLY, CreatureType.MUSHROOM_COW),
+	MAGMACUBE("MagmaCube", Enemies.ENEMY, CreatureType.MAGMA_CUBE),
+	SNOWMAN("Snowman", Enemies.FRIENDLY, "", CreatureType.SNOWMAN);
+	
 	public static final Logger logger = Logger.getLogger("Minecraft");
 
 	private Mob(String n, Enemies en, String s, CreatureType type)
@@ -47,7 +56,6 @@ public enum Mob
 		this.type = en;
 		this.bukkitType = type;
 	}
-
 	public String suffix = "s";
 	final public String name;
 	final public Enemies type;
@@ -58,17 +66,20 @@ public enum Mob
 	{
 		for (Mob mob : Mob.values())
 		{
-			hashMap.put(mob.name, mob);
+			hashMap.put(mob.name.toLowerCase(Locale.ENGLISH), mob);
 		}
 	}
+	
+	public static Set<String> getMobList() {
+		return hashMap.keySet();
+	}
 
 	public LivingEntity spawn(final Player player, final Server server, final Location loc) throws MobException
 	{
-
-		final LivingEntity entity = player.getWorld().spawnCreature(loc, this.bukkitType);
+		final LivingEntity entity = player.getWorld().spawn(loc, (Class<? extends LivingEntity>)this.bukkitType.getEntityClass());
 		if (entity == null)
 		{
-			logger.log(Level.WARNING, Util.i18n("unableToSpawnMob"));
+			logger.log(Level.WARNING, _("unableToSpawnMob"));
 			throw new MobException();
 		}
 		return entity;
@@ -81,24 +92,26 @@ public enum Mob
 		NEUTRAL("neutral"),
 		ENEMY("enemy");
 
-		private Enemies(final String t)
+		private Enemies(final String type)
 		{
-			this.type = t;
+			this.type = type;
 		}
 		final protected String type;
 	}
 
-	public CreatureType getType () {	
+	public CreatureType getType()
+	{
 		return bukkitType;
 	}
 
+	public static Mob fromName(final String name)
+	{
+		return hashMap.get(name.toLowerCase(Locale.ENGLISH));
+	}
+
+
 	public static class MobException extends Exception
 	{
 		private static final long serialVersionUID = 1L;
 	}
-
-	public static Mob fromName(String n)
-	{
-		return hashMap.get(n);
-	}
 }

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

@@ -1,29 +1,18 @@
 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.Achievement;
-import org.bukkit.Effect;
-import org.bukkit.GameMode;
-import org.bukkit.Instrument;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.Note;
-import org.bukkit.Server;
-import org.bukkit.Statistic;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.block.Block;
-import org.bukkit.entity.Arrow;
-import org.bukkit.entity.Egg;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Snowball;
-import org.bukkit.entity.Vehicle;
+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;
@@ -40,7 +29,7 @@ public class OfflinePlayer implements Player
 	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)
+	@Delegate(types = org.bukkit.OfflinePlayer.class)
 	private final org.bukkit.OfflinePlayer base;
 
 	public OfflinePlayer(final String name, final IEssentials ess)
@@ -66,77 +55,93 @@ public class OfflinePlayer implements Player
 	{
 	}
 
+	@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;
@@ -156,11 +161,13 @@ public class OfflinePlayer implements Player
 	{
 	}
 
+	@Override
 	public int getEntityId()
 	{
 		return -1;
 	}
 
+	@Override
 	public boolean performCommand(String string)
 	{
 		return false;
@@ -171,91 +178,109 @@ public class OfflinePlayer implements Player
 		return false;
 	}
 
+	@Override
 	public int getRemainingAir()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void setRemainingAir(int i)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public int getMaximumAir()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void setMaximumAir(int i)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public boolean isSneaking()
 	{
 		return false;
 	}
 
+	@Override
 	public void setSneaking(boolean bln)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void updateInventory()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void chat(String string)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public double getEyeHeight()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public double getEyeHeight(boolean bln)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public List<Block> getLineOfSight(HashSet<Byte> hs, int i)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public Block getTargetBlock(HashSet<Byte> hs, int i)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public List<Block> getLastTwoTargetBlocks(HashSet<Byte> hs, int i)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public int getFireTicks()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public int getMaxFireTicks()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void setFireTicks(int i)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void remove()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public Server getServer()
 	{
 		return ess == null ? null : ess.getServer();
@@ -263,308 +288,367 @@ public class OfflinePlayer implements Player
 
 	public Vector getMomentum()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
 	public void setMomentum(Vector vector)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void setVelocity(Vector vector)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public Vector getVelocity()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void damage(int i)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void damage(int i, Entity entity)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public Location getEyeLocation()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void sendRawMessage(String string)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public Location getCompassTarget()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public int getMaximumNoDamageTicks()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void setMaximumNoDamageTicks(int i)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public int getLastDamage()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void setLastDamage(int i)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public int getNoDamageTicks()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void setNoDamageTicks(int i)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public boolean teleport(Location lctn)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public boolean teleport(Entity entity)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public Entity getPassenger()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public boolean setPassenger(Entity entity)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public boolean isEmpty()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public boolean eject()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void saveData()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void loadData()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public boolean isSleeping()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public int getSleepTicks()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public List<Entity> getNearbyEntities(double d, double d1, double d2)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public boolean isDead()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public float getFallDistance()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void setFallDistance(float f)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void setSleepingIgnored(boolean bln)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public boolean isSleepingIgnored()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void awardAchievement(Achievement a)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void incrementStatistic(Statistic ststc)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void incrementStatistic(Statistic ststc, int i)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void incrementStatistic(Statistic ststc, Material mtrl)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void incrementStatistic(Statistic ststc, Material mtrl, int i)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void playNote(Location lctn, byte b, byte b1)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void sendBlockChange(Location lctn, Material mtrl, byte b)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void sendBlockChange(Location lctn, int i, byte b)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void setLastDamageCause(EntityDamageEvent ede)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public EntityDamageEvent getLastDamageCause()
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		throw new UnsupportedOperationException(_("notSupportedYet"));
 	}
 
+	@Override
 	public void playEffect(Location lctn, Effect effect, int i)
 	{
-		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+		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)
 	{
@@ -658,7 +742,7 @@ public class OfflinePlayer implements Player
 	@Override
 	public Location getBedSpawnLocation()
 	{
-		throw new UnsupportedOperationException("Not supported yet.");
+		return OfflineBedLocation.getBedLocation(base.getName(), ess);
 	}
 
 	@Override
@@ -696,4 +780,46 @@ public class OfflinePlayer implements Player
 	{
 		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

@@ -1,12 +1,8 @@
 package com.earth2me.essentials;
 
 import lombok.Delegate;
-import org.bukkit.craftbukkit.entity.CraftPlayer;
-import net.minecraft.server.EntityPlayer;
-import net.minecraft.server.IInventory;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
-import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.LivingEntity;
@@ -17,21 +13,19 @@ import org.bukkit.permissions.ServerOperator;
 
 public class PlayerExtension implements Player
 {
-	protected final transient IEssentials ess;
 	@Delegate(types =
 	{
-		Player.class, Entity.class, CommandSender.class, ServerOperator.class, 
+		Player.class, Entity.class, CommandSender.class, ServerOperator.class,
 		HumanEntity.class, ConfigurationSerializable.class, LivingEntity.class,
 		Permissible.class
 	})
 	protected Player base;
-	
-	public PlayerExtension(final Player base, final IEssentials ess)
+
+	public PlayerExtension(final Player base)
 	{
 		this.base = base;
-		this.ess = ess;
 	}
-	
+
 	public final Player getBase()
 	{
 		return base;
@@ -41,44 +35,4 @@ public class PlayerExtension implements Player
 	{
 		return this.base = base;
 	}
-	
-	public void showInventory(final IInventory inventory)
-	{
-		getHandle().a(inventory);
-	}
-
-	public void showInventory(final CraftInventoryPlayer inventory)
-	{
-		showInventory((IInventory)inventory.getInventory());
-	}
-
-	public TargetBlock getTarget()
-	{
-		return new TargetBlock(getBase());
-	}
-
-	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 EntityPlayer getHandle()
-	{
-		return getCraftPlayer().getHandle();
-	}
-
-	public CraftPlayer getCraftPlayer()
-	{
-		return (CraftPlayer)base;
-	}
 }

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

@@ -1,13 +1,13 @@
 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 com.earth2me.essentials.commands.IEssentialsCommand;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import org.bukkit.event.Event.Priority;
 import org.bukkit.inventory.ItemStack;
 
 
@@ -32,9 +32,9 @@ public class Settings implements ISettings
 	}
 
 	@Override
-	public boolean getBedSetsHome()
+	public boolean getUpdateBedAtDaytime()
 	{
-		return config.getBoolean("bed-sethome", false);
+		return config.getBoolean("update-bed-at-daytime", true);
 	}
 
 	@Override
@@ -82,10 +82,16 @@ public class Settings implements ISettings
 		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", 64);
+		return config.getInt("default-stack-size", -1);
 	}
 
 	@Override
@@ -111,7 +117,7 @@ public class Settings implements ISettings
 			}
 			return true;
 		}
-		return config.getBoolean("disable-" + label.toLowerCase(), false);
+		return config.getBoolean("disable-" + label.toLowerCase(Locale.ENGLISH), false);
 	}
 
 	@Override
@@ -131,7 +137,7 @@ public class Settings implements ISettings
 			}
 			return true;
 		}
-		return config.getBoolean("restrict-" + label.toLowerCase(), false);
+		return config.getBoolean("restrict-" + label.toLowerCase(Locale.ENGLISH), false);
 	}
 
 	@Override
@@ -161,7 +167,7 @@ public class Settings implements ISettings
 			}
 			return true;
 		}
-		return config.getBoolean("override-" + name.toLowerCase(), false);
+		return config.getBoolean("override-" + name.toLowerCase(Locale.ENGLISH), false);
 	}
 
 	@Override
@@ -190,13 +196,13 @@ public class Settings implements ISettings
 	@Override
 	public double getTeleportCooldown()
 	{
-		return config.getDouble("teleport-cooldown", 60);
+		return config.getDouble("teleport-cooldown", 0);
 	}
 
 	@Override
 	public double getHealCooldown()
 	{
-		return config.getDouble("heal-cooldown", 60);
+		return config.getDouble("heal-cooldown", 0);
 	}
 
 	@Override
@@ -235,7 +241,7 @@ public class Settings implements ISettings
 
 		try
 		{
-			return ChatColor.valueOf(colorName.toUpperCase());
+			return ChatColor.valueOf(colorName.toUpperCase(Locale.ENGLISH));
 		}
 		catch (IllegalArgumentException ex)
 		{
@@ -244,12 +250,6 @@ public class Settings implements ISettings
 		return ChatColor.getByCode(Integer.parseInt(colorName, 16));
 	}
 
-	@Override
-	public boolean getReclaimSetting()
-	{
-		return config.getBoolean("reclaim-onlogout", true);
-	}
-
 	@Override
 	public int getSpawnMobLimit()
 	{
@@ -339,6 +339,7 @@ public class Settings implements ISettings
 	public void reloadConfig()
 	{
 		config.load();
+		noGodWorlds = new HashSet<String>(config.getStringList("no-god-in-worlds", Collections.<String>emptyList()));
 	}
 
 	@Override
@@ -360,7 +361,7 @@ public class Settings implements ISettings
 			}
 			catch (Exception ex)
 			{
-				logger.log(Level.SEVERE, Util.format("unknownItemInList", itemName, "item-spawn-blacklist"));
+				logger.log(Level.SEVERE, _("unknownItemInList", itemName, "item-spawn-blacklist"));
 			}
 		}
 		return epItemSpwn;
@@ -377,9 +378,8 @@ public class Settings implements ISettings
 	{
 		return config.getBoolean("protect.disable.warn-on-build-disallow", false);
 	}
-
 	private boolean debug = false;
-	
+
 	@Override
 	public boolean isDebug()
 	{
@@ -447,7 +447,7 @@ public class Settings implements ISettings
 			}
 			catch (Exception ex)
 			{
-				logger.log(Level.SEVERE, Util.format("unknownItemInList", itemName, configName));
+				logger.log(Level.SEVERE, _("unknownItemInList", itemName, configName));
 			}
 		}
 		return list;
@@ -466,6 +466,7 @@ public class Settings implements ISettings
 	}
 	private final static double MAXMONEY = 10000000000000.0;
 
+	@Override
 	public double getMaxMoney()
 	{
 		double max = config.getDouble("max-money", MAXMONEY);
@@ -476,36 +477,43 @@ public class Settings implements ISettings
 		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);
@@ -534,10 +542,74 @@ public class Settings implements ISettings
 	{
 		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/Spawn.java

@@ -1,102 +0,0 @@
-package com.earth2me.essentials;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Logger;
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.World.Environment;
-
-
-public class Spawn implements IConf
-{
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	private final EssentialsConf config;
-	private final Server server;
-
-	public Spawn(Server server, File dataFolder)
-	{
-		File configFile = new File(dataFolder, "spawn.yml");
-		this.server = server;
-		config = new EssentialsConf(configFile);
-		config.load();
-	}
-
-	public void setSpawn(Location loc, String group)
-	{
-		Map<String, Object> map = new HashMap<String, Object>();
-		map.put("world", loc.getWorld().getName());
-		map.put("x", loc.getX());
-		map.put("y", loc.getY());
-		map.put("z", loc.getZ());
-		map.put("yaw", loc.getYaw());
-		map.put("pitch", loc.getPitch());
-		config.setProperty(group, map);
-		config.save();
-
-		if ("default".equals(group))
-		{
-			loc.getWorld().setSpawnLocation(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
-		}
-	}
-
-	public Location getSpawn(String group)
-	{
-		if (config.getProperty(group) == null)
-		{
-			group = "default";
-		}
-		if (config.getProperty(group) == null)
-		{
-			for (World w : server.getWorlds())
-			{
-				if (w.getEnvironment() != Environment.NORMAL)
-				{
-					continue;
-				}
-				return w.getSpawnLocation();
-			}
-		}
-		String worldId = config.getString(group + ".world", "");
-		World world = server.getWorlds().get(server.getWorlds().size() > 1 ? 1 : 0);
-		for (World w : server.getWorlds())
-		{
-			if (w.getEnvironment() != Environment.NORMAL)
-			{
-				continue;
-			}
-			world = w;
-			break;
-		}
-		for (World w : server.getWorlds())
-		{
-			if (!w.getName().equals(worldId))
-			{
-				continue;
-			}
-			world = w;
-			break;
-		}
-
-		double x = config.getDouble(group + ".x", config.getDouble("default.x", 0));
-		double y = config.getDouble(group + ".y", config.getDouble("default.y", 0));
-		double z = config.getDouble(group + ".z", config.getDouble("default.z", 0));
-		float yaw = (float)config.getDouble(group + ".yaw", config.getDouble("default.yaw", 0));
-		float pitch = (float)config.getDouble(group + ".pitch", config.getDouble("default.pitch", 0));
-		Location retval = new Location(world, x, y, z, yaw, pitch);
-
-		if (y < 1)
-		{
-			retval.setY(world.getHighestBlockYAt(retval));
-		}
-
-		return retval;
-	}
-
-	public void reloadConfig()
-	{
-		config.load();
-	}
-}

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

@@ -1,31 +1,20 @@
 package com.earth2me.essentials;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import net.minecraft.server.ChunkPosition;
-import net.minecraft.server.Packet60Explosion;
-import org.bukkit.Location;
-import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.craftbukkit.CraftWorld;
+import com.earth2me.essentials.craftbukkit.FakeExplosion;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.EntityListener;
 
 
 public class TNTExplodeListener extends EntityListener implements Runnable
 {
-	private final IEssentials ess;
-	private boolean enabled = false;
-	private int timer = -1;
+	private final transient IEssentials ess;
+	private transient boolean enabled = false;
+	private transient int timer = -1;
 
-	public TNTExplodeListener(IEssentials ess)
+	public TNTExplodeListener(final IEssentials ess)
 	{
+		super();
 		this.ess = ess;
 	}
 
@@ -55,36 +44,11 @@ public class TNTExplodeListener extends EntityListener implements Runnable
 		{
 			return;
 		}
-		try
-		{
-			final Set<ChunkPosition> set = new HashSet<ChunkPosition>(event.blockList().size());
-			final Player[] players = ess.getServer().getOnlinePlayers();
-			final List<ChunkPosition> blocksUnderPlayers = new ArrayList<ChunkPosition>(players.length);
-			final Location loc = event.getLocation();
-			for (Player player : players)
-			{
-				if (player.getWorld().equals(loc.getWorld()))
-				{
-					blocksUnderPlayers.add(new ChunkPosition(player.getLocation().getBlockX(), player.getLocation().getBlockY() - 1, player.getLocation().getBlockZ()));
-				}
-			}
-			for (Block block : event.blockList())
-			{
-				final ChunkPosition cp = new ChunkPosition(block.getX(), block.getY(), block.getZ());
-				if (!blocksUnderPlayers.contains(cp))
-				{
-					set.add(cp);
-				}
-			}
-			((CraftServer)ess.getServer()).getHandle().sendPacketNearby(loc.getX(), loc.getY(), loc.getZ(), 64.0, ((CraftWorld)loc.getWorld()).getHandle().worldProvider.dimension, new Packet60Explosion(loc.getX(), loc.getY(), loc.getZ(), 3.0F, set));
-		}
-		catch (Throwable ex)
-		{
-			Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
-		}
+		FakeExplosion.createExplosion(event, ess.getServer(), ess.getServer().getOnlinePlayers());
 		event.setCancelled(true);
 	}
 
+	@Override
 	public void run()
 	{
 		enabled = false;

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

@@ -1,527 +0,0 @@
-package com.earth2me.essentials;
-
-import java.util.List;
-import org.bukkit.block.Block;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
-
-/**
- * Original authors: toi & Raphfrk
- */
-@Deprecated
-public class TargetBlock
-{
-	private transient final Location location;
-	private transient final double viewHeight;
-	private transient final int maxDistance;
-	private transient final int[] blockToIgnore;
-	private transient final double checkDistance;
-	private transient double curDistance;
-	private transient double targetPositionX;
-	private transient double targetPositionY;
-	private transient double targetPositionZ;
-	private transient int itargetPositionX;
-	private transient int itargetPositionY;
-	private transient int itargetPositionZ;
-	private transient int prevPositionX;
-	private transient int prevPositionY;
-	private transient int prevPositionZ;
-	private transient final double offsetX;
-	private transient final double offsetY;
-	private transient final double offsetZ;
-
-	/**
-	 * Constructor requiring a player, uses default values
-	 * 
-	 * @param player Player to work with
-	 */
-	public TargetBlock(final Player player)
-	{
-		this(player.getLocation(), 300, 1.65, 0.2, null);
-	}
-
-	/**
-	 * Constructor requiring a location, uses default values
-	 * 
-	 * @param loc Location to work with
-	 */
-	public TargetBlock(final Location loc)
-	{
-		this(loc, 300, 0, 0.2, null);
-	}
-
-	/**
-	 * Constructor requiring a player, max distance and a checking distance
-	 * 
-	 * @param player Player to work with
-	 * @param maxDistance How far it checks for blocks
-	 * @param checkDistance How often to check for blocks, the smaller the more precise
-	 */
-	public TargetBlock(final Player player, final int maxDistance, final double checkDistance)
-	{
-		this(player.getLocation(), maxDistance, 1.65, checkDistance, null);
-	}
-
-	/**
-	 * Constructor requiring a location, max distance and a checking distance
-	 * 
-	 * @param loc What location to work with
-	 * @param maxDistance How far it checks for blocks
-	 * @param checkDistance How often to check for blocks, the smaller the more precise
-	 */
-	public TargetBlock(final Location loc, final int maxDistance, final double checkDistance)
-	{
-		this(loc, maxDistance, 0, checkDistance, null);
-	}
-
-	/**
-	 * Constructor requiring a player, max distance, checking distance and an array of blocks to ignore
-	 * 
-	 * @param player What player to work with
-	 * @param maxDistance How far it checks for blocks
-	 * @param checkDistance How often to check for blocks, the smaller the more precise
-	 * @param blocksToIgnore Integer array of what block ids to ignore while checking for viable targets
-	 */
-	public TargetBlock(final Player player, final int maxDistance, final double checkDistance, final int[] blocksToIgnore)
-	{
-		this(player.getLocation(), maxDistance, 1.65, checkDistance, blocksToIgnore);
-	}
-
-	/**
-	 * Constructor requiring a location, max distance, checking distance and an array of blocks to ignore
-	 * 
-	 * @param loc What location to work with
-	 * @param maxDistance How far it checks for blocks
-	 * @param checkDistance How often to check for blocks, the smaller the more precise
-	 * @param blocksToIgnore Array of what block ids to ignore while checking for viable targets
-	 */
-	public TargetBlock(final Location loc, final int maxDistance, final double checkDistance, final int[] blocksToIgnore)
-	{
-		this(loc, maxDistance, 0, checkDistance, blocksToIgnore);
-	}
-
-	/**
-	 * Constructor requiring a player, max distance, checking distance and an array of blocks to ignore
-	 * 
-	 * @param player What player to work with
-	 * @param maxDistance How far it checks for blocks
-	 * @param checkDistance How often to check for blocks, the smaller the more precise
-	 * @param blocksToIgnore String ArrayList of what block ids to ignore while checking for viable targets
-	 */
-	public TargetBlock(final Player player, final int maxDistance, final double checkDistance, final List<String> blocksToIgnore)
-	{
-		this(player.getLocation(), maxDistance, 1.65, checkDistance, TargetBlock.convertStringArraytoIntArray(blocksToIgnore));
-	}
-
-	/**
-	 * Constructor requiring a location, max distance, checking distance and an array of blocks to ignore
-	 * 
-	 * @param loc What location to work with
-	 * @param maxDistance How far it checks for blocks
-	 * @param checkDistance How often to check for blocks, the smaller the more precise
-	 * @param blocksToIgnore String ArrayList of what block ids to ignore while checking for viable targets
-	 */
-	public TargetBlock(final Location loc, final int maxDistance, final double checkDistance, final List<String> blocksToIgnore)
-	{
-		this(loc, maxDistance, 0, checkDistance, TargetBlock.convertStringArraytoIntArray(blocksToIgnore));
-	}
-
-	/**
-	 * Set the values, all constructors uses this function
-	 * 
-	 * @param loc Location of the view
-	 * @param maxDistance How far it checks for blocks
-	 * @param viewPos Where the view is positioned in y-axis
-	 * @param checkDistance How often to check for blocks, the smaller the more precise
-	 * @param blocksToIgnore Ids of blocks to ignore while checking for viable targets
-	 */
-	private TargetBlock(final Location loc, final int maxDistance, final double viewHeight, final double checkDistance, final int[] blocksToIgnore)
-	{
-		this.location = loc;
-		this.maxDistance = maxDistance;
-		this.viewHeight = viewHeight;
-		this.checkDistance = checkDistance;
-		if (blocksToIgnore == null || blocksToIgnore.length == 0)
-		{
-			this.blockToIgnore = new int[0];
-		}
-		else
-		{
-			this.blockToIgnore = new int[blocksToIgnore.length];
-			System.arraycopy(blocksToIgnore, 0, this.blockToIgnore, 0, this.blockToIgnore.length);
-		}
-
-		final double xRotation = (loc.getYaw() + 90) % 360;
-		final double yRotation = loc.getPitch() * -1;
-
-		final double hypotenuse = (checkDistance * Math.cos(Math.toRadians(yRotation)));
-		offsetX = hypotenuse * Math.cos(Math.toRadians(xRotation));
-		offsetY = checkDistance * Math.sin(Math.toRadians(yRotation));
-		offsetZ = hypotenuse * Math.sin(Math.toRadians(xRotation));
-
-		reset();
-	}
-
-	/**
-	 * Call this to reset checking position to allow you to check for a new target with the same TargetBlock instance.
-	 */
-	public final void reset()
-	{
-		targetPositionX = location.getX();
-		targetPositionY = location.getY() + viewHeight;
-		targetPositionZ = location.getZ();
-		itargetPositionX = (int)Math.floor(targetPositionX);
-		itargetPositionY = (int)Math.floor(targetPositionY);
-		itargetPositionZ = (int)Math.floor(targetPositionZ);
-		prevPositionX = itargetPositionX;
-		prevPositionY = itargetPositionY;
-		prevPositionZ = itargetPositionZ;
-		this.curDistance = 0;
-	}
-
-	/**
-	 * Gets the distance to a block. Measures from the block underneath the player to the targetblock
-	 * Should only be used when passing player as an constructor parameter
-	 * 
-	 * @return double
-	 */
-	public double getDistanceToBlock()
-	{
-		final double blockUnderPlayerX = Math.floor(location.getX() + 0.5);
-		final double blockUnderPlayerY = Math.floor(location.getY() - 0.5);
-		final double blockUnderPlayerZ = Math.floor(location.getZ() + 0.5);
-
-		final Block block = getTargetBlock();
-		final double distX = block.getX() - blockUnderPlayerX;
-		final double distY = block.getY() - blockUnderPlayerY;
-		final double distZ = block.getZ() - blockUnderPlayerZ;
-
-		return Math.sqrt(distX*distX + distY*distY + distZ*distZ);
-	}
-
-	/**
-	 * Gets the rounded distance to a block. Measures from the block underneath the player to the targetblock
-	 * Should only be used when passing player as an constructor parameter
-	 * 
-	 * @return int
-	 */
-	public int getDistanceToBlockRounded()
-	{
-		return (int)Math.round(getDistanceToBlock());
-	}
-
-	/**
-	 * Gets the floored x distance to a block.
-	 * 
-	 * @return int
-	 */
-	public int getXDistanceToBlock()
-	{
-		return (int)Math.floor(getTargetBlock().getX() - location.getBlockX() + 0.5);
-	}
-
-	/**
-	 * Gets the floored y distance to a block
-	 * 
-	 * @return int
-	 */
-	public int getYDistanceToBlock()
-	{
-		return (int)Math.floor(getTargetBlock().getY() - location.getBlockY() + viewHeight);
-	}
-
-	/**
-	 * Gets the floored z distance to a block
-	 * 
-	 * @return int
-	 */
-	public int getZDistanceToBlock()
-	{
-		return (int)Math.floor(getTargetBlock().getZ() - location.getBlockZ() + 0.5);
-	}
-
-	/**
-	 * Returns the block at the sight. Returns null if out of range or if no viable target was found
-	 * 
-	 * @return Block
-	 */
-	public Block getTargetBlock()
-	{
-		this.reset();
-		Block block;
-		do
-		{
-			block = getNextBlock();
-		}
-		while (block != null && ((block.getTypeId() == 0) || this.blockIsIgnored(block.getTypeId())));
-
-		return block;
-	}
-
-	/**
-	 * Sets the type of the block at the sight. Returns false if the block wasn't set.
-	 * 
-	 * @param typeID ID of type to set the block to
-	 * @return boolean
-	 */
-	public boolean setTargetBlock(final int typeID)
-	{
-		return setTargetBlock(Material.getMaterial(typeID));
-	}
-
-	/**
-	 * Sets the type of the block at the sight. Returns false if the block wasn't set.
-	 * 
-	 * @param type Material to set the block to
-	 * @return boolean
-	 */
-	@SuppressWarnings("empty-statement")
-	public boolean setTargetBlock(final Material type)
-	{
-		if (type == null)
-		{
-			return false;
-		}
-		final Block block = getTargetBlock();
-		if (block != null)
-		{
-			block.setType(type);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Sets the type of the block at the sight. Returns false if the block wasn't set.
-	 * Observe! At the moment this function is using the built-in enumerator function .valueOf(String) but would preferably be changed to smarter function, when implemented
-	 * 
-	 * @param type Name of type to set the block to
-	 * @return boolean
-	 */
-	public boolean setTargetBlock(final String type)
-	{
-		return setTargetBlock(Material.valueOf(type));
-	}
-
-	/**
-	 * Returns the block attached to the face at the sight. Returns null if out of range or if no viable target was found
-	 * 
-	 * @return Block
-	 */
-	public Block getFaceBlock()
-	{
-		final Block block = getTargetBlock();
-		if (block == null)
-		{
-			return null;
-		}
-		return getPreviousBlock();
-	}
-
-	/**
-	 * Sets the type of the block attached to the face at the sight. Returns false if the block wasn't set.
-	 * 
-	 * @param typeID
-	 * @return boolean
-	 */
-	public boolean setFaceBlock(final int typeID)
-	{
-		return setFaceBlock(Material.getMaterial(typeID));
-	}
-
-	/**
-	 * Sets the type of the block attached to the face at the sight. Returns false if the block wasn't set.
-	 * 
-	 * @param type
-	 * @return boolean
-	 */
-	public boolean setFaceBlock(final Material type)
-	{
-		if (type == null)
-		{
-			return false;
-		}
-		if (getCurrentBlock() != null)
-		{
-			final Block blk = location.getWorld().getBlockAt(prevPositionX, prevPositionY, prevPositionZ);
-			blk.setType(type);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Sets the type of the block attached to the face at the sight. Returns false if the block wasn't set.
-	 * Observe! At the moment this function is using the built-in enumerator function .valueOf(String) but would preferably be changed to smarter function, when implemented
-	 * 
-	 * @param type
-	 * @return boolean
-	 */
-	public boolean setFaceBlock(final String type)
-	{
-		return setFaceBlock(Material.valueOf(type));
-	}
-
-	/**
-	 * Get next block
-	 * 
-	 * @return Block
-	 */
-	public Block getNextBlock()
-	{
-		prevPositionX = itargetPositionX;
-		prevPositionY = itargetPositionY;
-		prevPositionZ = itargetPositionZ;
-		do
-		{
-			curDistance += checkDistance;
-
-			targetPositionX += offsetX;
-			targetPositionY += offsetY;
-			targetPositionZ += offsetZ;
-			itargetPositionX = (int)Math.floor(targetPositionX);
-			itargetPositionY = (int)Math.floor(targetPositionY);
-			itargetPositionZ = (int)Math.floor(targetPositionZ);
-		}
-		while (curDistance <= maxDistance && itargetPositionX == prevPositionX && itargetPositionY == prevPositionY && itargetPositionZ == prevPositionZ);
-		if (curDistance > maxDistance)
-		{
-			return null;
-		}
-
-		return this.location.getWorld().getBlockAt(itargetPositionX, itargetPositionY, itargetPositionZ);
-	}
-
-	/**
-	 * Returns the current block along the line of vision
-	 * 
-	 * @return Block
-	 */
-	public Block getCurrentBlock()
-	{
-		Block block;
-		if (curDistance <= maxDistance)
-		{
-			block = this.location.getWorld().getBlockAt(itargetPositionX, itargetPositionY, itargetPositionZ);
-		}
-		else
-		{
-			block = null;
-		}
-		return block;
-	}
-
-	/**
-	 * Sets current block type. Returns false if the block wasn't set.
-	 * 
-	 * @param typeID
-	 */
-	public boolean setCurrentBlock(final int typeID)
-	{
-		return setCurrentBlock(Material.getMaterial(typeID));
-	}
-
-	/**
-	 * Sets current block type. Returns false if the block wasn't set.
-	 * 
-	 * @param type
-	 */
-	public boolean setCurrentBlock(final Material type)
-	{
-		final Block blk = getCurrentBlock();
-		if (blk != null && type != null)
-		{
-			blk.setType(type);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Sets current block type. Returns false if the block wasn't set.
-	 * Observe! At the moment this function is using the built-in enumerator function .valueOf(String) but would preferably be changed to smarter function, when implemented
-	 * 
-	 * @param type
-	 */
-	public boolean setCurrentBlock(final String type)
-	{
-		return setCurrentBlock(Material.valueOf(type));
-	}
-
-	/**
-	 * Returns the previous block in the aimed path
-	 * 
-	 * @return Block
-	 */
-	public Block getPreviousBlock()
-	{
-		return this.location.getWorld().getBlockAt(prevPositionX, prevPositionY, prevPositionZ);
-	}
-
-	/**
-	 * Sets previous block type id. Returns false if the block wasn't set.
-	 * 
-	 * @param typeID
-	 */
-	public boolean setPreviousBlock(final int typeID)
-	{
-		return setPreviousBlock(Material.getMaterial(typeID));
-	}
-
-	/**
-	 * Sets previous block type id. Returns false if the block wasn't set.
-	 * 
-	 * @param type
-	 */
-	public boolean setPreviousBlock(final Material type)
-	{
-		final Block blk = getPreviousBlock();
-		if (blk != null && type != null)
-		{
-			blk.setType(type);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Sets previous block type id. Returns false if the block wasn't set.
-	 * Observe! At the moment this function is using the built-in enumerator function .valueOf(String) but would preferably be changed to smarter function, when implemented
-	 * 
-	 * @param type
-	 */
-	public boolean setPreviousBlock(final String type)
-	{
-		return setPreviousBlock(Material.valueOf(type));
-	}
-
-	private static int[] convertStringArraytoIntArray(final List<String> array)
-	{
-		final int intarray[] = new int[array == null ? 0 : array.size()];
-		for (int i = 0; i < intarray.length; i++)
-		{
-			try
-			{
-				intarray[i] = Integer.parseInt(array.get(i));
-			}
-			catch (NumberFormatException nfe)
-			{
-			}
-		}
-		return intarray;
-	}
-
-	private boolean blockIsIgnored(final int value)
-	{
-		for (int i : this.blockToIgnore)
-		{
-			if (i == value)
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-}

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

@@ -1,14 +1,19 @@
 package com.earth2me.essentials;
 
+import com.earth2me.essentials.api.ITeleport;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.commands.NotEnoughArgumentsException;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.logging.Logger;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
-public class Teleport implements Runnable
+public class Teleport implements Runnable, ITeleport
 {
 	private static final double MOVE_CONSTANT = 0.3;
 
@@ -54,8 +59,9 @@ public class Teleport implements Runnable
 	private Trade chargeFor;
 	private final IEssentials ess;
 	private static final Logger logger = Logger.getLogger("Minecraft");
+	private TeleportCause cause;
 
-	private void initTimer(long delay, Target target, Trade chargeFor)
+	private void initTimer(long delay, Target target, Trade chargeFor, TeleportCause cause)
 	{
 		this.started = System.currentTimeMillis();
 		this.delay = delay;
@@ -65,8 +71,10 @@ public class Teleport implements Runnable
 		this.initZ = Math.round(user.getLocation().getZ() * MOVE_CONSTANT);
 		this.teleportTarget = target;
 		this.chargeFor = chargeFor;
+		this.cause = cause;
 	}
 
+	@Override
 	public void run()
 	{
 
@@ -92,11 +100,11 @@ public class Teleport implements Runnable
 			try
 			{
 				cooldown(false);
-				user.sendMessage(Util.i18n("teleportationCommencing"));
+				user.sendMessage(_("teleportationCommencing"));
 				try
 				{
 
-					now(teleportTarget);
+					now(teleportTarget, cause);
 					if (chargeFor != null)
 					{
 						chargeFor.charge(user);
@@ -106,11 +114,10 @@ public class Teleport implements Runnable
 				{
 					ess.showError(user.getBase(), ex, "teleport");
 				}
-				return;
 			}
 			catch (Exception ex)
 			{
-				user.sendMessage(Util.format("cooldownWithMessage", ex.getMessage()));
+				user.sendMessage(_("cooldownWithMessage", ex.getMessage()));
 			}
 		}
 	}
@@ -121,16 +128,20 @@ public class Teleport implements Runnable
 		this.ess = ess;
 	}
 
-	public void respawn(Spawn spawn, Trade chargeFor) throws Exception
+	public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception
 	{
-		teleport(new Target(spawn.getSpawn(user.getGroup())), chargeFor);
+		final Player player = user.getBase();
+		final Location bed = player.getBedSpawnLocation();
+		final PlayerRespawnEvent pre = new PlayerRespawnEvent(player, bed == null ? player.getWorld().getSpawnLocation() : bed, bed != null);
+		ess.getServer().getPluginManager().callEvent(pre);
+		teleport(new Target(pre.getRespawnLocation()), chargeFor, cause);
 	}
 
-	public void warp(String warp, Trade chargeFor) throws Exception
+	public void warp(String warp, Trade chargeFor, TeleportCause cause) throws Exception
 	{
 		Location loc = ess.getWarps().getWarp(warp);
-		teleport(new Target(loc), chargeFor);
-		user.sendMessage(Util.format("warpingTo", warp));
+		teleport(new Target(loc), chargeFor, cause);
+		user.sendMessage(_("warpingTo", warp));
 	}
 
 	public void cooldown(boolean check) throws Exception
@@ -145,7 +156,7 @@ public class Teleport implements Runnable
 			cooldownTime.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
 			if (cooldownTime.after(now) && !user.isAuthorized("essentials.teleport.cooldown.bypass"))
 			{
-				throw new Exception(Util.format("timeBeforeTeleport", Util.formatDateDiff(cooldownTime.getTimeInMillis())));
+				throw new Exception(_("timeBeforeTeleport", Util.formatDateDiff(cooldownTime.getTimeInMillis())));
 			}
 		}
 		// if justCheck is set, don't update lastTeleport; we're just checking
@@ -166,7 +177,7 @@ public class Teleport implements Runnable
 			ess.getServer().getScheduler().cancelTask(teleTimer);
 			if (notifyUser)
 			{
-				user.sendMessage(Util.i18n("pendingTeleportCancelled"));
+				user.sendMessage(_("pendingTeleportCancelled"));
 			}
 		}
 		finally
@@ -179,18 +190,23 @@ public class Teleport implements Runnable
 	{
 		cancel(false);
 	}
-
+	
 	public void teleport(Location loc, Trade chargeFor) throws Exception
 	{
-		teleport(new Target(loc), chargeFor);
+		teleport(new Target(loc), chargeFor, TeleportCause.PLUGIN);
 	}
 
-	public void teleport(Entity entity, Trade chargeFor) throws Exception
+	public void teleport(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
 	{
-		teleport(new Target(entity), chargeFor);
+		teleport(new Target(loc), chargeFor, cause);
 	}
 
-	private void teleport(Target target, Trade chargeFor) throws Exception
+	public void teleport(Entity entity, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		teleport(new Target(entity), chargeFor, cause);
+	}
+
+	private void teleport(Target target, Trade chargeFor, TeleportCause cause) throws Exception
 	{
 		double delay = ess.getSettings().getTeleportDelay();
 
@@ -202,7 +218,7 @@ public class Teleport implements Runnable
 		if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
 		{
 			cooldown(false);
-			now(target);
+			now(target, cause);
 			if (chargeFor != null)
 			{
 				chargeFor.charge(user);
@@ -214,49 +230,52 @@ public class Teleport implements Runnable
 		Calendar c = new GregorianCalendar();
 		c.add(Calendar.SECOND, (int)delay);
 		c.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
-		user.sendMessage(Util.format("dontMoveMessage", Util.formatDateDiff(c.getTimeInMillis())));
-		initTimer((long)(delay * 1000.0), target, chargeFor);
+		user.sendMessage(_("dontMoveMessage", Util.formatDateDiff(c.getTimeInMillis())));
+		initTimer((long)(delay * 1000.0), target, chargeFor, cause);
 
 		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
 	}
 
-	private void now(Target target) throws Exception
+	private void now(Target target, TeleportCause cause) throws Exception
 	{
 		cancel();
 		user.setLastLocation();
-		user.getBase().teleport(Util.getSafeDestination(target.getLocation()));
+		user.getBase().teleport(Util.getSafeDestination(target.getLocation()), cause);
 	}
 
-	public void now(Location loc) throws Exception
-	{
-		cooldown(false);
-		now(new Target(loc));
-	}
-
-	public void now(Location loc, Trade chargeFor) throws Exception
-	{
-		cooldown(false);
-		chargeFor.charge(user);
-		now(new Target(loc));
-	}
-
-	public void now(Entity entity, boolean cooldown) throws Exception
+	public void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception
 	{
 		if (cooldown)
 		{
 			cooldown(false);
 		}
-		now(new Target(entity));
+		now(new Target(loc), cause);
+	}
+
+	public void now(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		cooldown(false);
+		chargeFor.charge(user);
+		now(new Target(loc), cause);
+	}
+
+	public void now(Entity entity, boolean cooldown, TeleportCause cause) throws Exception
+	{
+		if (cooldown)
+		{
+			cooldown(false);
+		}
+		now(new Target(entity), cause);
 	}
 
 	public void back(Trade chargeFor) throws Exception
 	{
-		teleport(new Target(user.getLastLocation()), chargeFor);
+		teleport(new Target(user.getLastLocation()), chargeFor, TeleportCause.COMMAND);
 	}
 
 	public void back() throws Exception
 	{
-		now(new Target(user.getLastLocation()));
+		now(new Target(user.getLastLocation()), TeleportCause.COMMAND);
 	}
 
 	public void home(IUser user, String home, Trade chargeFor) throws Exception
@@ -266,6 +285,6 @@ public class Teleport implements Runnable
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		teleport(new Target(loc), chargeFor);
+		teleport(new Target(loc), chargeFor, TeleportCause.COMMAND);
 	}
 }

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

@@ -1,10 +1,14 @@
 package com.earth2me.essentials;
 
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import com.earth2me.essentials.craftbukkit.SetExpFix;
+import static com.earth2me.essentials.I18n._;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.text.DateFormat;
 import java.util.Date;
+import java.util.Locale;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -17,28 +21,35 @@ public class Trade
 	private final transient String command;
 	private final transient Double money;
 	private final transient ItemStack itemStack;
+	private final transient Integer exp;
 	private final transient IEssentials ess;
 
 	public Trade(final String command, final IEssentials ess)
 	{
-		this(command, null, null, ess);
+		this(command, null, null, null, ess);
 	}
 
 	public Trade(final double money, final IEssentials ess)
 	{
-		this(null, money, null, ess);
+		this(null, money, null, null, ess);
 	}
 
 	public Trade(final ItemStack items, final IEssentials ess)
 	{
-		this(null, null, items, ess);
+		this(null, null, items, null, ess);
+	}
+	
+	public Trade(final int exp, final IEssentials ess)
+	{
+		this(null, null, null, exp, ess);
 	}
 
-	private Trade(final String command, final Double money, final ItemStack item, final IEssentials ess)
+	private Trade(final String command, final Double money, final ItemStack item, final Integer exp, final IEssentials ess)
 	{
 		this.command = command;
 		this.money = money;
 		this.itemStack = item;
+		this.exp = exp;
 		this.ess = ess;
 	}
 
@@ -50,13 +61,13 @@ public class Trade
 			&& getMoney() > 0
 			&& !user.isAuthorized("essentials.eco.loan"))
 		{
-			throw new ChargeException(Util.i18n("notEnoughMoney"));
+			throw new ChargeException(_("notEnoughMoney"));
 		}
 
 		if (getItemStack() != null
-			&& !InventoryWorkaround.containsItem(user.getInventory(), true, itemStack))
+			&& !InventoryWorkaround.containsItem(user.getInventory(), true, true, itemStack))
 		{
-			throw new ChargeException(Util.format("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase().replace("_", " ")));
+			throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
 		}
 
 		if (command != null && !command.isEmpty()
@@ -66,7 +77,12 @@ public class Trade
 			&& 0 < ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
 			&& !user.isAuthorized("essentials.eco.loan"))
 		{
-			throw new ChargeException(Util.i18n("notEnoughMoney"));
+			throw new ChargeException(_("notEnoughMoney"));
+		}
+		
+		if (exp != null && exp > 0 
+			&& SetExpFix.getTotalExperience(user) < exp) {
+			throw new ChargeException(_("notEnoughExperience"));
 		}
 	}
 
@@ -98,6 +114,10 @@ public class Trade
 			}
 			user.updateInventory();
 		}
+		if (getExperience() != null)
+		{
+			SetExpFix.setTotalExperience(user, SetExpFix.getTotalExperience(user) + getExperience());
+		}
 		return success;
 	}
 
@@ -108,17 +128,17 @@ public class Trade
 			final double mon = user.getMoney();
 			if (mon < getMoney() && getMoney() > 0 && !user.isAuthorized("essentials.eco.loan"))
 			{
-				throw new ChargeException(Util.i18n("notEnoughMoney"));
+				throw new ChargeException(_("notEnoughMoney"));
 			}
 			user.takeMoney(getMoney());
 		}
 		if (getItemStack() != null)
 		{
-			if (!InventoryWorkaround.containsItem(user.getInventory(), true, itemStack))
+			if (!InventoryWorkaround.containsItem(user.getInventory(), true, true, itemStack))
 			{
-				throw new ChargeException(Util.format("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase().replace("_", " ")));
+				throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
 			}
-			InventoryWorkaround.removeItem(user.getInventory(), true, getItemStack());
+			InventoryWorkaround.removeItem(user.getInventory(), true, true, getItemStack());
 			user.updateInventory();
 		}
 		if (command != null && !command.isEmpty()
@@ -129,10 +149,19 @@ public class Trade
 			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(Util.i18n("notEnoughMoney"));
+				throw new ChargeException(_("notEnoughMoney"));
 			}
 			user.takeMoney(cost);
 		}
+		if (getExperience() != null)
+		{
+			final int experience = SetExpFix.getTotalExperience(user);
+			if (experience < getExperience() && getExperience() > 0)
+			{
+				throw new ChargeException(_("notEnoughExperience"));
+			}
+			SetExpFix.setTotalExperience(user, experience - getExperience());
+		}
 	}
 
 	public Double getMoney()
@@ -144,6 +173,11 @@ public class Trade
 	{
 		return itemStack;
 	}
+	
+	public Integer getExperience()
+	{
+		return exp;
+	}
 	private static FileWriter fw = null;
 
 	public static void log(String type, String subtype, String event, String sender, Trade charge, String receiver, Trade pay, Location loc, IEssentials ess)
@@ -190,6 +224,12 @@ public class Trade
 				sb.append("money").append(",");
 				sb.append(ess.getSettings().getCurrencySymbol());
 			}
+			if (charge.getExperience() != null)
+			{
+				sb.append(charge.getExperience()).append(",");
+				sb.append("exp").append(",");
+				sb.append("\"\"");
+			}
 		}
 		sb.append(",\"");
 		if (receiver != null)
@@ -215,6 +255,12 @@ public class Trade
 				sb.append("money").append(",");
 				sb.append(ess.getSettings().getCurrencySymbol());
 			}
+			if (pay.getExperience() != null)
+			{
+				sb.append(pay.getExperience()).append(",");
+				sb.append("exp").append(",");
+				sb.append("\"\"");
+			}
 		}
 		if (loc == null)
 		{

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

@@ -1,9 +1,12 @@
 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;
@@ -16,36 +19,38 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 	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)
 	{
@@ -53,20 +58,20 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		{
 			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();
@@ -79,18 +84,18 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 			cooldownTime.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
 			if (cooldownTime.after(now) && !isAuthorized("essentials.heal.cooldown.bypass"))
 			{
-				throw new Exception(Util.format("timeBeforeHeal", Util.formatDateDiff(cooldownTime.getTimeInMillis())));
+				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)
@@ -98,13 +103,13 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 			return;
 		}
 		setMoney(getMoney() + value);
-		sendMessage(Util.format("addedToAccount", Util.formatCurrency(value, ess)));
+		sendMessage(_("addedToAccount", Util.formatCurrency(value, ess)));
 		if (initiator != null)
 		{
-			initiator.sendMessage(Util.format("addedToOthersAccount", Util.formatCurrency(value, ess), this.getDisplayName()));
+			initiator.sendMessage(_("addedToOthersAccount", Util.formatCurrency(value, ess), this.getDisplayName()));
 		}
 	}
-
+	
 	public void payUser(final User reciever, final double value) throws Exception
 	{
 		if (value == 0)
@@ -115,21 +120,21 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		{
 			setMoney(getMoney() - value);
 			reciever.setMoney(reciever.getMoney() + value);
-			sendMessage(Util.format("moneySentTo", Util.formatCurrency(value, ess), reciever.getDisplayName()));
-			reciever.sendMessage(Util.format("moneyRecievedFrom", Util.formatCurrency(value, ess), getDisplayName()));
+			sendMessage(_("moneySentTo", Util.formatCurrency(value, ess), reciever.getDisplayName()));
+			reciever.sendMessage(_("moneyRecievedFrom", Util.formatCurrency(value, ess), getDisplayName()));
 		}
 		else
 		{
-			throw new Exception(Util.i18n("notEnoughMoney"));
+			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)
@@ -137,42 +142,42 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 			return;
 		}
 		setMoney(getMoney() - value);
-		sendMessage(Util.format("takenFromAccount", Util.formatCurrency(value, ess)));
+		sendMessage(_("takenFromAccount", Util.formatCurrency(value, ess)));
 		if (initiator != null)
 		{
-			initiator.sendMessage(Util.format("takenFromOthersAccount", Util.formatCurrency(value, ess), this.getDisplayName()));
+			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 ChatColor.stripColor(this.getDisplayName()).compareToIgnoreCase(ChatColor.stripColor(other.getDisplayName()));
+		return Util.stripColor(this.getDisplayName()).compareToIgnoreCase(Util.stripColor(other.getDisplayName()));
 	}
-
+	
 	@Override
 	public boolean equals(final Object object)
 	{
@@ -180,59 +185,60 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		{
 			return false;
 		}
-		return ChatColor.stripColor(this.getDisplayName()).equalsIgnoreCase(ChatColor.stripColor(((User)object).getDisplayName()));
-
+		return this.getName().equalsIgnoreCase(((User)object).getName());
+		
 	}
-
+	
 	@Override
 	public int hashCode()
 	{
-		return ChatColor.stripColor(this.getDisplayName()).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()
+	
+	public String getNick(boolean addprefixsuffix)
 	{
 		final StringBuilder nickname = new StringBuilder();
 		final String nick = getNickname();
@@ -255,8 +261,8 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 			{
 			}
 		}
-
-		if (ess.getSettings().addPrefixSuffix())
+		
+		if (addprefixsuffix && ess.getSettings().addPrefixSuffix())
 		{
 			if (!ess.getSettings().disablePrefix())
 			{
@@ -277,41 +283,57 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 				nickname.append("§f");
 			}
 		}
-
+		
 		return nickname.toString();
 	}
-
-	public void setDisplayNick(String name)
+	
+	public void setDisplayNick()
 	{
+		String name = getNick(true);
 		setDisplayName(name);
-		setPlayerListName(name.length() > 16 ? name.substring(0, 16) : 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(getNick());
+			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()
 	{
@@ -333,7 +355,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		}
 		return super.getMoney();
 	}
-
+	
 	@Override
 	public void setMoney(final double value)
 	{
@@ -355,7 +377,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		}
 		super.setMoney(value);
 	}
-
+	
 	@Override
 	public void setAfk(final boolean set)
 	{
@@ -366,7 +388,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		}
 		super.setAfk(set);
 	}
-
+	
 	@Override
 	public boolean toggleAfk()
 	{
@@ -374,12 +396,13 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		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;
@@ -392,7 +415,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		{
 			setJailTimeout(0);
 			setJailed(false);
-			sendMessage(Util.i18n("haveBeenReleased"));
+			sendMessage(_("haveBeenReleased"));
 			setJail(null);
 			try
 			{
@@ -412,7 +435,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		if (getMuteTimeout() > 0 && getMuteTimeout() < currentTime && isMuted())
 		{
 			setMuteTimeout(0);
-			sendMessage(Util.i18n("canTalkAgain"));
+			sendMessage(_("canTalkAgain"));
 			setMuted(false);
 			return true;
 		}
@@ -430,7 +453,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		}
 		return false;
 	}
-
+	
 	public void updateActivity(final boolean broadcast)
 	{
 		if (isAfk())
@@ -438,28 +461,29 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 			setAfk(false);
 			if (broadcast && !isHidden())
 			{
-				ess.broadcastMessage(this, Util.format("userIsNotAway", getDisplayName()));
+				ess.broadcastMessage(this, _("userIsNotAway", getDisplayName()));
 			}
 		}
 		lastActivity = System.currentTimeMillis();
 	}
-
+	
 	public void checkActivity()
 	{
 		final long autoafkkick = ess.getSettings().getAutoAfkKick();
-		if (autoafkkick > 0 && lastActivity + autoafkkick * 1000 < System.currentTimeMillis()
+		if (autoafkkick > 0 && lastActivity > 0 && (lastActivity + (autoafkkick * 1000)) < System.currentTimeMillis()
 			&& !isHidden() && !isAuthorized("essentials.kick.exempt") && !isAuthorized("essentials.afk.kickexempt"))
 		{
-			final String kickReason = Util.format("autoAfkKickReason", autoafkkick / 60.0);
+			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(Util.format("playerKicked", Console.NAME, getName(), kickReason));
+					player.sendMessage(_("playerKicked", Console.NAME, getName(), kickReason));
 				}
 			}
 		}
@@ -469,16 +493,16 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 			setAfk(true);
 			if (!isHidden())
 			{
-				ess.broadcastMessage(this, Util.format("userIsAway", getDisplayName()));
+				ess.broadcastMessage(this, _("userIsAway", getDisplayName()));
 			}
 		}
 	}
-
+	
 	public Location getAfkPosition()
 	{
 		return afkPosition;
 	}
-
+	
 	@Override
 	public boolean toggleGodModeEnabled()
 	{
@@ -488,10 +512,36 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		}
 		return super.toggleGodModeEnabled();
 	}
-
+	
 	@Override
 	public boolean isGodModeEnabled()
 	{
-		return super.isGodModeEnabled() || (isAfk() && ess.getSettings().getFreezeAfkPlayers());
+		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

@@ -1,11 +1,7 @@
 package com.earth2me.essentials;
 
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.logging.Logger;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -15,12 +11,14 @@ 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, ess);
+		super(base);
+		this.ess = ess;
 		File folder = new File(ess.getDataFolder(), "userdata");
 		if (!folder.exists())
 		{
@@ -30,6 +28,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 		reloadConfig();
 	}
 
+	@Override
 	public final void reloadConfig()
 	{
 		config.load();
@@ -131,27 +130,32 @@ public abstract class UserData extends PlayerExtension implements IConf
 		return loc;
 	}
 
-	public Location getHome(Location world) throws Exception
+	public Location getHome(final Location world)
 	{
-		Location loc;
-		for (String home : getHomes())
+		try
 		{
-			loc = config.getLocation("homes." + home, getServer());
-			if (world.getWorld() == loc.getWorld())
+			Location loc;
+			for (String home : getHomes())
 			{
-				return loc;
-			}
+				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;
 		}
-		loc = config.getLocation("homes." + getHomes().get(0), getServer());
-		return loc;
 	}
 
 	public List<String> getHomes()
 	{
-		List<String> list = new ArrayList(homes.keySet());
-		return list;
-
+		return new ArrayList(homes.keySet());
 	}
 
 	public void setHome(String name, Location loc)
@@ -278,7 +282,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 
 	public boolean hasPowerTools()
 	{
-		return powertools.size() > 0;
+		return !powertools.isEmpty();
 	}
 	private Location lastLocation;
 
@@ -503,18 +507,18 @@ public abstract class UserData extends PlayerExtension implements IConf
 
 	public boolean isIgnoredPlayer(String name)
 	{
-		return ignoredPlayers.contains(name.toLowerCase());
+		return ignoredPlayers.contains(name.toLowerCase(Locale.ENGLISH));
 	}
 
 	public void setIgnoredPlayer(String name, boolean set)
 	{
 		if (set)
 		{
-			ignoredPlayers.add(name.toLowerCase());
+			ignoredPlayers.add(name.toLowerCase(Locale.ENGLISH));
 		}
 		else
 		{
-			ignoredPlayers.remove(name.toLowerCase());
+			ignoredPlayers.remove(name.toLowerCase(Locale.ENGLISH));
 		}
 		setIgnoredPlayers(ignoredPlayers);
 	}
@@ -669,7 +673,6 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("timestamps.login", time);
 		config.save();
 	}
-
 	private long lastLogout;
 
 	private long _getLastLogout()
@@ -688,7 +691,6 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("timestamps.logout", time);
 		config.save();
 	}
-
 	private String lastLoginAddress;
 
 	private String _getLastLoginAddress()
@@ -707,7 +709,6 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("ipAddress", address);
 		config.save();
 	}
-
 	private boolean afk;
 
 	private boolean getAfk()
@@ -856,14 +857,19 @@ public abstract class UserData extends PlayerExtension implements IConf
 
 	public Long getKitTimestamp(final String name)
 	{
-		final Number num = (Number)kitTimestamps.get(name.toLowerCase());
+		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(), 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

@@ -1,24 +1,27 @@
 package com.earth2me.essentials;
 
-import com.google.common.base.Function;
-import com.google.common.collect.ComputationException;
-import com.google.common.collect.MapMaker;
+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.HashSet;
+import java.util.Collections;
+import java.util.Locale;
 import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
-import java.util.logging.Level;
-import org.bukkit.Bukkit;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.ExecutionException;
 import org.bukkit.entity.Player;
 
 
-public class UserMap implements Function<String, User>, IConf
+public class UserMap extends CacheLoader<String, User> implements IConf
 {
 	private final transient IEssentials ess;
-	private final transient ConcurrentMap<String, User> users = new MapMaker().softValues().makeComputingMap(this);
+	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);
 	}
@@ -35,6 +38,8 @@ public class UserMap implements Function<String, User>, IConf
 				{
 					return;
 				}
+				keys.clear();
+				users.invalidateAll();
 				for (String string : userdir.list())
 				{
 					if (!string.endsWith(".yml"))
@@ -42,18 +47,7 @@ public class UserMap implements Function<String, User>, IConf
 						continue;
 					}
 					final String name = string.substring(0, string.length() - 4);
-					try
-					{
-						users.get(name.toLowerCase());
-					}
-					catch (NullPointerException ex)
-					{
-						// Ignore these
-					}
-					catch (ComputationException ex)
-					{
-						Bukkit.getLogger().log(Level.INFO, "Failed to preload user " + name, ex);
-					}
+					keys.add(name.toLowerCase(Locale.ENGLISH));
 				}
 			}
 		});
@@ -61,59 +55,70 @@ public class UserMap implements Function<String, User>, IConf
 
 	public boolean userExists(final String name)
 	{
-		return users.containsKey(name.toLowerCase());
+		return keys.contains(name.toLowerCase(Locale.ENGLISH));
 	}
 
-	public User getUser(final String name) throws NullPointerException
+	public User getUser(final String name)
 	{
-		return users.get(name.toLowerCase());
+		try
+		{
+			return users.get(name.toLowerCase(Locale.ENGLISH));
+		}
+		catch (ExecutionException ex)
+		{
+			return null;
+		}
+		catch (UncheckedExecutionException ex)
+		{
+			return null;
+		}
 	}
 
 	@Override
-	public User apply(final String name)
+	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 userFolder = new File(ess.getDataFolder(), "userdata");
-		final File userFile = new File(userFolder, Util.sanitizeFileName(name) + ".yml");
+		final File userFile = getUserFile(name);
 		if (userFile.exists())
 		{
+			keys.add(name.toLowerCase(Locale.ENGLISH));
 			return new User(new OfflinePlayer(name, ess), ess);
 		}
-		return null;
+		throw new Exception("User not found!");
 	}
 
 	@Override
 	public void reloadConfig()
 	{
-		for (User user : users.values())
-		{
-			user.reloadConfig();
-		}
+		loadAllUsersAsync(ess);
 	}
 
 	public void removeUser(final String name)
 	{
-		users.remove(name.toLowerCase());
+		keys.remove(name.toLowerCase(Locale.ENGLISH));
+		users.invalidate(name.toLowerCase(Locale.ENGLISH));
 	}
 
-	public Set<User> getAllUsers()
+	public Set<String> getAllUniqueUsers()
 	{
-		final Set<User> userSet = new HashSet<User>();
-		for (String name : users.keySet())
-		{
-			userSet.add(users.get(name));
-		}
-		return userSet;
+		return Collections.unmodifiableSet(keys);
 	}
 
 	public int getUniqueUsers()
 	{
-		return users.size();
+		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,26 +1,9 @@
 package com.earth2me.essentials;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
+import static com.earth2me.essentials.I18n._;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
-import java.text.MessageFormat;
-import java.util.Calendar;
-import java.util.Enumeration;
-import java.util.GregorianCalendar;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.Set;
-import java.util.logging.Level;
+import java.util.*;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -29,7 +12,7 @@ import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 
 
 public class Util
@@ -41,7 +24,7 @@ public class Util
 
 	public static String sanitizeFileName(String name)
 	{
-		return name.toLowerCase().replaceAll("[^a-z0-9]", "_");
+		return name.toLowerCase(Locale.ENGLISH).replaceAll("[^a-z0-9]", "_");
 	}
 
 	public static String formatDateDiff(long date)
@@ -57,7 +40,7 @@ public class Util
 		boolean future = false;
 		if (toDate.equals(fromDate))
 		{
-			return Util.i18n("now");
+			return _("now");
 		}
 		if (toDate.after(fromDate))
 		{
@@ -76,18 +59,18 @@ public class Util
 		};
 		String[] names = new String[]
 		{
-			Util.i18n("year"),
-			Util.i18n("years"),
-			Util.i18n("month"),
-			Util.i18n("months"),
-			Util.i18n("day"),
-			Util.i18n("days"),
-			Util.i18n("hour"),
-			Util.i18n("hours"),
-			Util.i18n("minute"),
-			Util.i18n("minutes"),
-			Util.i18n("second"),
-			Util.i18n("seconds")
+			_("year"),
+			_("years"),
+			_("month"),
+			_("months"),
+			_("day"),
+			_("days"),
+			_("hour"),
+			_("hours"),
+			_("minute"),
+			_("minutes"),
+			_("second"),
+			_("seconds")
 		};
 		for (int i = 0; i < types.length; i++)
 		{
@@ -187,7 +170,7 @@ public class Util
 		}
 		if (!found)
 		{
-			throw new Exception(Util.i18n("illegalDate"));
+			throw new Exception(_("illegalDate"));
 		}
 		Calendar c = new GregorianCalendar();
 		if (years > 0)
@@ -220,12 +203,12 @@ public class Util
 		}
 		return c.getTimeInMillis();
 	}
-
 	// The player can stand inside these materials 
 	private static final Set<Integer> AIR_MATERIALS = new HashSet<Integer>();
 	private static final HashSet<Byte> AIR_MATERIALS_TARGET = new HashSet<Byte>();
-	
-	static {
+
+	static
+	{
 		AIR_MATERIALS.add(Material.AIR.getId());
 		AIR_MATERIALS.add(Material.SAPLING.getId());
 		AIR_MATERIALS.add(Material.POWERED_RAIL.getId());
@@ -235,7 +218,7 @@ public class Util
 		AIR_MATERIALS.add(Material.YELLOW_FLOWER.getId());
 		AIR_MATERIALS.add(Material.RED_ROSE.getId());
 		AIR_MATERIALS.add(Material.BROWN_MUSHROOM.getId());
-		AIR_MATERIALS.add(Material.RED_MUSHROOM.getId());	
+		AIR_MATERIALS.add(Material.RED_MUSHROOM.getId());
 		AIR_MATERIALS.add(Material.TORCH.getId());
 		AIR_MATERIALS.add(Material.REDSTONE_WIRE.getId());
 		AIR_MATERIALS.add(Material.SEEDS.getId());
@@ -247,19 +230,20 @@ public class Util
 		AIR_MATERIALS.add(Material.LEVER.getId());
 		AIR_MATERIALS.add(Material.STONE_PLATE.getId());
 		AIR_MATERIALS.add(Material.IRON_DOOR_BLOCK.getId());
-		AIR_MATERIALS.add(Material.WOOD_PLATE.getId());	
+		AIR_MATERIALS.add(Material.WOOD_PLATE.getId());
 		AIR_MATERIALS.add(Material.REDSTONE_TORCH_OFF.getId());
 		AIR_MATERIALS.add(Material.REDSTONE_TORCH_ON.getId());
 		AIR_MATERIALS.add(Material.STONE_BUTTON.getId());
-		AIR_MATERIALS.add(Material.SUGAR_CANE_BLOCK.getId());		
+		AIR_MATERIALS.add(Material.SUGAR_CANE_BLOCK.getId());
 		AIR_MATERIALS.add(Material.DIODE_BLOCK_OFF.getId());
-		AIR_MATERIALS.add(Material.DIODE_BLOCK_ON.getId());		
+		AIR_MATERIALS.add(Material.DIODE_BLOCK_ON.getId());
 		AIR_MATERIALS.add(Material.TRAP_DOOR.getId());
 		AIR_MATERIALS.add(Material.PUMPKIN_STEM.getId());
 		AIR_MATERIALS.add(Material.MELON_STEM.getId());
 		AIR_MATERIALS.add(Material.VINE.getId());
-		//TODO: Add 1.9 materials
-		
+		AIR_MATERIALS.add(Material.NETHER_WARTS.getId());
+		AIR_MATERIALS.add(Material.WATER_LILY.getId());
+
 		for (Integer integer : AIR_MATERIALS)
 		{
 			AIR_MATERIALS_TARGET.add(integer.byteValue());
@@ -267,26 +251,28 @@ public class Util
 		AIR_MATERIALS_TARGET.add((byte)Material.WATER.getId());
 		AIR_MATERIALS_TARGET.add((byte)Material.STATIONARY_WATER.getId());
 	}
-	
-	public static Location getTarget(final LivingEntity entity) throws Exception {
+
+	public static Location getTarget(final LivingEntity entity) throws Exception
+	{
 		final Block block = entity.getTargetBlock(AIR_MATERIALS_TARGET, 300);
-		if (block == null) {
+		if (block == null)
+		{
 			throw new Exception("Not targeting a block");
 		}
 		return block.getLocation();
 	}
-	
+
 	public static Location getSafeDestination(final Location loc) throws Exception
 	{
 		if (loc == null || loc.getWorld() == null)
 		{
-			throw new Exception(Util.i18n("destinationNotSet"));
+			throw new Exception(_("destinationNotSet"));
 		}
 		final World world = loc.getWorld();
 		int x = loc.getBlockX();
 		int y = (int)Math.round(loc.getY());
 		int z = loc.getBlockZ();
-	
+
 		while (isBlockAboveAir(world, x, y, z))
 		{
 			y -= 1;
@@ -314,7 +300,7 @@ public class Util
 				x += 1;
 				if (x - 32 > loc.getBlockX())
 				{
-					throw new Exception(Util.i18n("holeInFloor"));
+					throw new Exception(_("holeInFloor"));
 				}
 			}
 		}
@@ -346,6 +332,88 @@ public class Util
 		}
 		return isBlockAboveAir(world, x, y, z);
 	}
+
+	public static ItemStack convertBlockToItem(final Block block)
+	{
+		final ItemStack is = new ItemStack(block.getType(), 1, (short)0, block.getData());
+		switch (is.getType())
+		{
+		case WOODEN_DOOR:
+			is.setType(Material.WOOD_DOOR);
+			is.setDurability((short)0);
+			break;
+		case IRON_DOOR_BLOCK:
+			is.setType(Material.IRON_DOOR);
+			is.setDurability((short)0);
+			break;
+		case SIGN_POST:
+		case WALL_SIGN:
+			is.setType(Material.SIGN);
+			is.setDurability((short)0);
+			break;
+		case CROPS:
+			is.setType(Material.SEEDS);
+			is.setDurability((short)0);
+			break;
+		case CAKE_BLOCK:
+			is.setType(Material.CAKE);
+			is.setDurability((short)0);
+			break;
+		case BED_BLOCK:
+			is.setType(Material.BED);
+			is.setDurability((short)0);
+			break;
+		case REDSTONE_WIRE:
+			is.setType(Material.REDSTONE);
+			is.setDurability((short)0);
+			break;
+		case REDSTONE_TORCH_OFF:
+		case REDSTONE_TORCH_ON:
+			is.setType(Material.REDSTONE_TORCH_ON);
+			is.setDurability((short)0);
+			break;
+		case DIODE_BLOCK_OFF:
+		case DIODE_BLOCK_ON:
+			is.setType(Material.DIODE);
+			is.setDurability((short)0);
+			break;
+		case DOUBLE_STEP:
+			is.setType(Material.STEP);
+			break;
+		case TORCH:
+		case RAILS:
+		case LADDER:
+		case WOOD_STAIRS:
+		case COBBLESTONE_STAIRS:
+		case LEVER:
+		case STONE_BUTTON:
+		case FURNACE:
+		case DISPENSER:
+		case PUMPKIN:
+		case JACK_O_LANTERN:
+		case WOOD_PLATE:
+		case STONE_PLATE:
+		case PISTON_STICKY_BASE:
+		case PISTON_BASE:
+		case IRON_FENCE:
+		case THIN_GLASS:
+		case TRAP_DOOR:
+		case FENCE:
+		case FENCE_GATE:
+		case NETHER_FENCE:
+			is.setDurability((short)0);
+			break;
+		case FIRE:
+			return null;
+		case PUMPKIN_STEM:
+			is.setType(Material.PUMPKIN_SEEDS);
+			break;
+		case MELON_STEM:
+			is.setType(Material.MELON_SEEDS);
+			break;
+		}
+		return is;
+	}
 	private static DecimalFormat df = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US));
 
 	public static String formatCurrency(final double value, final IEssentials ess)
@@ -363,175 +431,24 @@ public class Util
 		return Math.round(d * 100.0) / 100.0;
 	}
 
-	public static Locale getCurrentLocale()
-	{
-		return currentLocale;
-	}
-
-
-	private static class ConfigClassLoader extends ClassLoader
-	{
-		private final transient File dataFolder;
-		private final transient ClassLoader cl;
-		private final transient IEssentials ess;
-
-		public ConfigClassLoader(final ClassLoader cl, final IEssentials ess)
-		{
-			this.ess = ess;
-			this.dataFolder = ess.getDataFolder();
-			this.cl = cl;
-		}
-
-		@Override
-		public URL getResource(final String string)
-		{
-			final File file = new File(dataFolder, string);
-			if (file.exists())
-			{
-				try
-				{
-					return file.toURI().toURL();
-				}
-				catch (MalformedURLException ex)
-				{
-					return cl.getResource(string);
-				}
-			}
-			return cl.getResource(string);
-		}
-
-		@Override
-		public synchronized void clearAssertionStatus()
-		{
-			cl.clearAssertionStatus();
-		}
-
-		@Override
-		public InputStream getResourceAsStream(final String string)
-		{
-			final File file = new File(dataFolder, string);
-			if (file.exists())
-			{
-				BufferedReader br = null;
-				try
-				{
-					br = new BufferedReader(new FileReader(file));
-					final String version = br.readLine();
-
-					if (version == null || !version.equals("#version: " + ess.getDescription().getVersion()))
-					{
-						logger.log(Level.WARNING, String.format("Translation file %s is not updated for Essentials version. Will use default.", file));
-						return cl.getResourceAsStream(string);
-					}
-					return new FileInputStream(file);
-				}
-				catch (IOException ex)
-				{
-					return cl.getResourceAsStream(string);
-				}
-				finally
-				{
-					if (br != null)
-					{
-						try
-						{
-							br.close();
-						}
-						catch (IOException ex)
-						{
-						}
-					}
-				}
-			}
-			return cl.getResourceAsStream(string);
-		}
-
-		@Override
-		public Enumeration<URL> getResources(final String string) throws IOException
-		{
-			return cl.getResources(string);
-		}
-
-		@Override
-		public Class<?> loadClass(final String string) throws ClassNotFoundException
-		{
-			return cl.loadClass(string);
-		}
-
-		@Override
-		public synchronized void setClassAssertionStatus(final String string, final boolean bln)
-		{
-			cl.setClassAssertionStatus(string, bln);
-		}
-
-		@Override
-		public synchronized void setDefaultAssertionStatus(final boolean bln)
-		{
-			cl.setDefaultAssertionStatus(bln);
-		}
-
-		@Override
-		public synchronized void setPackageAssertionStatus(final String string, final boolean bln)
-		{
-			cl.setPackageAssertionStatus(string, bln);
-		}
-	}
-	private static final Locale defaultLocale = Locale.getDefault();
-	private static Locale currentLocale = defaultLocale;
-	private static ResourceBundle bundle = ResourceBundle.getBundle("messages", defaultLocale);
-	private static ResourceBundle defaultBundle = ResourceBundle.getBundle("messages", Locale.US);
-
-	public static String i18n(String string)
+	public static boolean isInt(final String sInt)
 	{
 		try
 		{
-			return bundle.getString(string);
+			Integer.parseInt(sInt);
 		}
-		catch (MissingResourceException ex)
+		catch (NumberFormatException e)
 		{
-			logger.log(Level.WARNING, String.format("Missing translation key \"%s\" in translation file %s", ex.getKey(), bundle.getLocale().toString()), ex);
-			return defaultBundle.getString(string);
-		}
-	}
-
-	public static String format(String string, Object... objects)
-	{
-		MessageFormat mf = new MessageFormat(i18n(string));
-		return mf.format(objects);
-	}
-
-	public static void updateLocale(String loc, IEssentials ess)
-	{
-		if (loc == null || loc.isEmpty())
-		{
-			return;
-		}
-		String[] parts = loc.split("[_\\.]");
-		if (parts.length == 1)
-		{
-			currentLocale = new Locale(parts[0]);
-		}
-		if (parts.length == 2)
-		{
-			currentLocale = new Locale(parts[0], parts[1]);
-		}
-		if (parts.length == 3)
-		{
-			currentLocale = new Locale(parts[0], parts[1], parts[2]);
-		}
-		logger.log(Level.INFO, String.format("Using locale %s", currentLocale.toString()));
-		bundle = ResourceBundle.getBundle("messages", currentLocale, new ConfigClassLoader(Util.class.getClassLoader(), ess));
-		if (!bundle.keySet().containsAll(defaultBundle.keySet()))
-		{
-			logger.log(Level.WARNING, String.format("Translation file %s does not contain all translation keys.", currentLocale.toString()));
+			return false;
 		}
+		return true;
 	}
 
 	public static String joinList(Object... list)
 	{
 		return joinList(", ", list);
 	}
-	
+
 	public static String joinList(String seperator, Object... list)
 	{
 		StringBuilder buf = new StringBuilder();
@@ -541,14 +458,14 @@ public class Util
 			{
 				buf.append(seperator);
 			}
-			
-			if(each instanceof List)
+
+			if (each instanceof Collection)
 			{
-				buf.append(joinList(seperator, ((List)each).toArray()));
+				buf.append(joinList(seperator, ((Collection)each).toArray()));
 			}
 			else
 			{
-				try 
+				try
 				{
 					buf.append(each.toString());
 				}
@@ -560,9 +477,15 @@ public class Util
 		}
 		return buf.toString();
 	}
-	
-	public static String capitalCase(String s)
+	private static transient final Pattern COLOR_PATTERN = Pattern.compile("(?i)\u00A7[0-9A-F]");
+
+	public static String stripColor(final String input)
 	{
-		return s.toUpperCase().charAt(0) + s.toLowerCase().substring(1);
-	}	
+		if (input == null)
+		{
+			return null;
+		}
+
+		return COLOR_PATTERN.matcher(input).replaceAll("");
+	}
 }

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

@@ -1,12 +1,8 @@
 package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n._;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Location;
@@ -52,7 +48,7 @@ public class Warps implements IConf
 		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(warp));
 		if (conf == null)
 		{
-			throw new Exception(Util.i18n("warpNotExist"));
+			throw new Exception(_("warpNotExist"));
 		}
 		return conf.getLocation(null, server);
 	}
@@ -66,7 +62,7 @@ public class Warps implements IConf
 			File confFile = new File(warpsFolder, filename + ".yml");
 			if (confFile.exists())
 			{
-				throw new Exception(Util.i18n("similarWarpExist"));
+				throw new Exception(_("similarWarpExist"));
 			}
 			conf = new EssentialsConf(confFile);
 			warpPoints.put(new StringIgnoreCase(name), conf);
@@ -81,15 +77,16 @@ public class Warps implements IConf
 		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
 		if (conf == null)
 		{
-			throw new Exception(Util.i18n("warpNotExist"));
+			throw new Exception(_("warpNotExist"));
 		}
 		if (!conf.getFile().delete())
 		{
-			throw new Exception(Util.i18n("warpDeleteError"));
+			throw new Exception(_("warpDeleteError"));
 		}
 		warpPoints.remove(new StringIgnoreCase(name));
 	}
 
+	@Override
 	public final void reloadConfig()
 	{
 		warpPoints.clear();
@@ -113,7 +110,7 @@ public class Warps implements IConf
 					}
 					catch (Exception ex)
 					{
-						logger.log(Level.WARNING, Util.format("loadWarpError", filename), ex);
+						logger.log(Level.WARNING, _("loadWarpError", filename), ex);
 					}
 				}
 			}
@@ -133,7 +130,7 @@ public class Warps implements IConf
 		@Override
 		public int hashCode()
 		{
-			return getString().toLowerCase().hashCode();
+			return getString().toLowerCase(Locale.ENGLISH).hashCode();
 		}
 
 		@Override

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

@@ -1,6 +1,7 @@
 package com.earth2me.essentials;
 
 import java.io.File;
+import java.util.Locale;
 import java.util.logging.Logger;
 import org.bukkit.inventory.ItemStack;
 
@@ -19,7 +20,7 @@ public class Worth implements IConf
 
 	public double getPrice(ItemStack itemStack)
 	{
-		String itemname = itemStack.getType().toString().toLowerCase().replace("_", "");
+		String itemname = itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
 		double result;
 		result = config.getDouble("worth." + itemname + "." + itemStack.getDurability(), Double.NaN);
 		if (Double.isNaN(result))
@@ -41,17 +42,18 @@ public class Worth implements IConf
 	{
 		if (itemStack.getType().getData() == null)
 		{
-			config.setProperty("worth." + itemStack.getType().toString().toLowerCase().replace("_", ""), price);
+			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().replace("_", "") + "." + itemStack.getDurability(), price);
+			config.setProperty("worth." + itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "") + "." + itemStack.getDurability(), price);
 		}
 		config.removeProperty("worth-" + itemStack.getTypeId());
 		config.save();
 	}
 
+	@Override
 	public void reloadConfig()
 	{
 		config.load();

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

@@ -1,6 +1,7 @@
 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;
@@ -59,7 +60,7 @@ public final class Economy
 		{
 			if (!config.delete())
 			{
-				logger.log(Level.WARNING, Util.format("deleteFileError", config));
+				logger.log(Level.WARNING, _("deleteFileError", config));
 			}
 			ess.getUserMap().removeUser(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/IEssentials.java

@@ -0,0 +1,51 @@
+package com.earth2me.essentials.api;
+
+import com.earth2me.essentials.perm.IPermissionsHandler;
+import com.earth2me.essentials.register.payment.Methods;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.Plugin;
+
+
+public interface IEssentials extends Plugin, IReload
+{
+	void addReloadListener(IReload listener);
+
+	IUser getUser(Object base);
+
+	int broadcastMessage(IUser sender, String message);
+
+	II18n getI18n();
+
+	ISettings getSettings();
+
+	IJails getJail();
+
+	IWarps getWarps();
+
+	IWorth getWorth();
+
+	IItemDb getItemDb();
+
+	IUserMap getUserMap();
+
+	IEssentialsEconomy getEconomy();
+
+	World getWorld(String name);
+
+	Methods getPaymentMethod();
+
+	int scheduleAsyncDelayedTask(Runnable run);
+
+	int scheduleSyncDelayedTask(Runnable run);
+
+	int scheduleSyncDelayedTask(Runnable run, long delay);
+
+	int scheduleSyncRepeatingTask(Runnable run, long delay, long period);
+
+	IPermissionsHandler getPermissionsHandler();
+
+	IAlternativeCommandsHandler getAlternativeCommandsHandler();
+
+	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/II18n.java

@@ -0,0 +1,9 @@
+package com.earth2me.essentials.api;
+
+import java.util.Locale;
+
+
+public interface II18n
+{
+	Locale getCurrentLocale();
+}

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

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

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

@@ -0,0 +1,18 @@
+package com.earth2me.essentials.api;
+
+import java.util.Collection;
+import org.bukkit.Location;
+
+
+public interface IJails extends IReload
+{
+	Location getJail(String jailName) throws Exception;
+
+	Collection<String> getList() throws Exception;
+
+	void removeJail(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/IReload.java

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

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

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

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

@@ -0,0 +1,10 @@
+package com.earth2me.essentials.api;
+
+import org.bukkit.Location;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+
+
+public interface ITeleport
+{
+	void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception;
+}

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

@@ -0,0 +1,43 @@
+package com.earth2me.essentials.api;
+
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+
+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 giveMoney(double value);
+
+	String getGroup();
+
+	void setLastLocation();
+
+	Location getHome(String name) throws Exception;
+
+	Location getHome(Location loc) throws Exception;
+
+	boolean isHidden();
+	
+	ITeleport getTeleport();
+	
+	void setJail(String jail);
+}

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

@@ -0,0 +1,20 @@
+package com.earth2me.essentials.api;
+
+import java.io.File;
+import java.util.Set;
+
+
+public interface IUserMap
+{
+	boolean userExists(final String name);
+
+	IUser getUser(final String name);
+
+	void removeUser(final String name);
+
+	Set<String> getAllUniqueUsers();
+
+	int getUniqueUsers();
+
+	File getUserFile(final String name);
+}

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

@@ -0,0 +1,16 @@
+package com.earth2me.essentials.api;
+
+import java.util.Collection;
+import org.bukkit.Location;
+
+
+public interface IWarps extends IReload
+{
+	Location getWarp(String warp) throws Exception;
+
+	Collection<String> getWarps();
+
+	void removeWarp(String name) throws Exception;
+
+	void setWarp(String name, Location loc) throws Exception;
+}

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

@@ -0,0 +1,11 @@
+package com.earth2me.essentials.api;
+
+import org.bukkit.inventory.ItemStack;
+
+
+public interface IWorth extends IReload
+{
+	double getPrice(ItemStack itemStack);
+
+	void setPrice(ItemStack itemStack, double price);
+}

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

@@ -1,13 +1,12 @@
 package com.earth2me.essentials.api;
 
-import com.earth2me.essentials.Util;
+import static com.earth2me.essentials.I18n._;
+
 
 public class NoLoanPermittedException extends Exception
 {
-
 	public NoLoanPermittedException()
 	{
-		super(Util.i18n("negativeBalanceError"));
+		super(_("negativeBalanceError"));
 	}
-	
 }

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

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

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

@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;
 
-import org.bukkit.Server;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
+import org.bukkit.Server;
 
 
 public class Commandafk extends EssentialsCommand
@@ -29,23 +29,23 @@ public class Commandafk extends EssentialsCommand
 		}
 	}
 
-	private final void toggleAfk(User user)
+	private void toggleAfk(User user)
 	{
 		if (!user.toggleAfk())
 		{
-			//user.sendMessage(Util.i18n("markedAsNotAway"));
+			//user.sendMessage(_("markedAsNotAway"));
 			if (!user.isHidden())
 			{
-				ess.broadcastMessage(user, Util.format("userIsNotAway", user.getDisplayName()));
+				ess.broadcastMessage(user, _("userIsNotAway", user.getDisplayName()));
 			}
 			user.updateActivity(false);
 		}
 		else
 		{
-			//user.sendMessage(Util.i18n("markedAsAway"));
+			//user.sendMessage(_("markedAsAway"));
 			if (!user.isHidden())
 			{
-				ess.broadcastMessage(user, Util.format("userIsAway", user.getDisplayName()));
+				ess.broadcastMessage(user, _("userIsAway", user.getDisplayName()));
 			}
 		}
 	}

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

@@ -1,9 +1,9 @@
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
 import org.bukkit.Location;
 import org.bukkit.Server;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.TargetBlock;
 import org.bukkit.entity.TNTPrimed;
 
 
@@ -20,7 +20,7 @@ public class Commandantioch extends EssentialsCommand
 		ess.broadcastMessage(user, "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,");
 		ess.broadcastMessage(user, "who being naughty in My sight, shall snuff it.");
 
-		final Location loc = new TargetBlock(user).getTargetBlock().getLocation();
+		final Location loc = Util.getTarget(user);
 		loc.getWorld().spawn(loc, TNTPrimed.class);
 	}
 }

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

@@ -1,8 +1,8 @@
 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 org.bukkit.Server;
 
 
@@ -14,11 +14,11 @@ public class Commandback extends EssentialsCommand
 	}
 
 	@Override
-	protected void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		Trade charge = new Trade(this.getName(), ess);
+		final Trade charge = new Trade(this.getName(), ess);
 		charge.isAffordableFor(user);
-		user.sendMessage(Util.i18n("backUsageMsg"));
+		user.sendMessage(_("backUsageMsg"));
 		user.getTeleport().back(charge);
 	}
 }

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

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

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

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

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

@@ -1,15 +1,15 @@
 package com.earth2me.essentials.commands;
 
-import java.util.Map.Entry;
-import org.bukkit.Server;
 import com.earth2me.essentials.User;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+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;
 
 
@@ -19,49 +19,160 @@ public class Commandbalancetop extends EssentialsCommand
 	{
 		super("balancetop");
 	}
+	private static final int CACHETIME = 2 * 60 * 1000;
+	public static final int MINUSERS = 50;
+	private static ArrayListInput cache = new ArrayListInput();
+	private static long cacheage = 0;
+	private static ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
 
 	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
-		int max = 10;
+		int page = 0;
+		boolean force = false;
 		if (args.length > 0)
 		{
 			try
 			{
-				if (Integer.parseInt(args[0]) < 10)
-				{
-					max = Integer.parseInt(args[0]);
-				}
+				page = Integer.parseInt(args[0]);
 			}
 			catch (NumberFormatException ex)
 			{
-				//catch it because they tried to enter a string not number.
+				if (args[0].equalsIgnoreCase("force") && sender.isOp())
+				{
+					force = true;
+				}
 			}
 		}
-		final Map<User, Double> balances = new HashMap<User, Double>();
-		for (User u : ess.getUserMap().getAllUsers())
-		{
-			balances.put(u, u.getMoney());
-		}
 
-		final List<Map.Entry<User, Double>> sortedEntries = new ArrayList<Map.Entry<User, Double>>(balances.entrySet());
-		Collections.sort(sortedEntries, new Comparator<Map.Entry<User, Double>>()
+		if (!force && lock.readLock().tryLock())
 		{
-			public int compare(final Entry<User, Double> entry1, final Entry<User, Double> entry2)
+			try
 			{
-				return -entry1.getValue().compareTo(entry2.getValue());
+				if (cacheage > System.currentTimeMillis() - CACHETIME)
+				{
+					outputCache(sender, page);
+					return;
+				}
+				if (ess.getUserMap().getUniqueUsers() > MINUSERS)
+				{
+					sender.sendMessage(_("orderBalances", ess.getUserMap().getUniqueUsers()));
+				}
 			}
-		});
-		int count = 0;
-		sender.sendMessage(Util.format("balanceTop", max));
-		for (Map.Entry<User, Double> entry : sortedEntries)
+			finally
+			{
+				lock.readLock().unlock();
+			}
+			ess.scheduleAsyncDelayedTask(new Viewer(sender, page, force));
+		}
+		else
 		{
-			if (count == max)
+			if (ess.getUserMap().getUniqueUsers() > MINUSERS)
 			{
-				break;
+				sender.sendMessage(_("orderBalances", ess.getUserMap().getUniqueUsers()));
 			}
-			sender.sendMessage(entry.getKey().getDisplayName() + ", " + Util.formatCurrency(entry.getValue(), ess));
-			count++;
+			ess.scheduleAsyncDelayedTask(new Viewer(sender, page, force));
+		}
+
+	}
+
+	private static void outputCache(final CommandSender sender, int page)
+	{
+		final Calendar cal = Calendar.getInstance();
+		cal.setTimeInMillis(cacheage);
+		final DateFormat format = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
+		sender.sendMessage(_("balanceTop", format.format(cal.getTime())));
+		new TextPager(cache).showPage(Integer.toString(page), "", "balancetop", sender);
+	}
+
+
+	private class Calculator implements Runnable
+	{
+		private final transient Viewer viewer;
+		private final boolean force;
+
+		public Calculator(final Viewer viewer, final boolean force)
+		{
+			this.viewer = viewer;
+			this.force = force;
+		}
+
+		@Override
+		public void run()
+		{
+			lock.writeLock().lock();
+			try
+			{
+				if (force || cacheage <= System.currentTimeMillis() - CACHETIME)
+				{
+					cache.getLines().clear();
+					final Map<String, Double> balances = new HashMap<String, Double>();
+					for (String u : ess.getUserMap().getAllUniqueUsers())
+					{
+						final User user = ess.getUserMap().getUser(u);
+						if (user != null)
+						{
+							balances.put(u, user.getMoney());
+						}
+					}
+
+					final List<Map.Entry<String, Double>> sortedEntries = new ArrayList<Map.Entry<String, Double>>(balances.entrySet());
+					Collections.sort(sortedEntries, new Comparator<Map.Entry<String, Double>>()
+					{
+						@Override
+						public int compare(final Entry<String, Double> entry1, final Entry<String, Double> entry2)
+						{
+							return -entry1.getValue().compareTo(entry2.getValue());
+						}
+					});
+					int pos = 1;
+					for (Map.Entry<String, Double> entry : sortedEntries)
+					{
+						cache.getLines().add(pos + ". " + entry.getKey() + ", " + Util.formatCurrency(entry.getValue(), ess));
+						pos++;
+					}
+					cacheage = System.currentTimeMillis();
+				}
+			}
+			finally
+			{
+				lock.writeLock().unlock();
+			}
+			ess.scheduleAsyncDelayedTask(viewer);
+		}
+	}
+
+
+	private class Viewer implements Runnable
+	{
+		private final transient CommandSender sender;
+		private final transient int page;
+		private final transient boolean force;
+
+		public Viewer(final CommandSender sender, final int page, final boolean force)
+		{
+			this.sender = sender;
+			this.page = page;
+			this.force = force;
+		}
+
+		@Override
+		public void run()
+		{
+			lock.readLock().lock();
+			try
+			{
+				if (!force && cacheage > System.currentTimeMillis() - CACHETIME)
+				{
+					outputCache(sender, page);
+					return;
+				}
+			}
+			finally
+			{
+				lock.readLock().unlock();
+			}
+			ess.scheduleAsyncDelayedTask(new Calculator(new Viewer(sender, page, force), force));
 		}
 	}
 }

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

@@ -1,11 +1,11 @@
 package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.Console;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.OfflinePlayer;
+import com.earth2me.essentials.User;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
 import org.bukkit.entity.Player;
 
 
@@ -23,21 +23,21 @@ public class Commandban extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		final User player = getPlayer(server, args, 0, true);
-		if (player.getBase() instanceof OfflinePlayer)
+		final User user = getPlayer(server, args, 0, true);
+		if (user.getBase() instanceof OfflinePlayer)
 		{
 			if (sender instanceof Player
 				&& !ess.getUser(sender).isAuthorized("essentials.ban.offline"))
 			{
-				sender.sendMessage(Util.i18n("banExempt"));
+				sender.sendMessage(_("banExempt"));
 				return;
 			}
 		}
 		else
 		{
-			if (player.isAuthorized("essentials.ban.exempt"))
+			if (user.isAuthorized("essentials.ban.exempt"))
 			{
-				sender.sendMessage(Util.i18n("banExempt"));
+				sender.sendMessage(_("banExempt"));
 				return;
 			}
 		}
@@ -46,22 +46,22 @@ public class Commandban extends EssentialsCommand
 		if (args.length > 1)
 		{
 			banReason = getFinalArg(args, 1);
-			player.setBanReason(banReason);
+			user.setBanReason(banReason);
 		}
 		else
 		{
-			banReason = Util.i18n("defaultBanReason");
+			banReason = _("defaultBanReason");
 		}
-		player.setBanned(true);
-		player.kickPlayer(banReason);
-		String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
-		
-		for(Player p : server.getOnlinePlayers())
+		user.setBanned(true);
+		user.kickPlayer(banReason);
+		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
+
+		for (Player onlinePlayer : server.getOnlinePlayers())
 		{
-			User u = ess.getUser(p);
-			if(u.isAuthorized("essentials.ban.notify"))
+			final User player = ess.getUser(onlinePlayer);
+			if (player.isAuthorized("essentials.ban.notify"))
 			{
-			p.sendMessage(Util.format("playerBanned", senderName, player.getName(), banReason));
+				onlinePlayer.sendMessage(_("playerBanned", senderName, user.getName(), banReason));
 			}
 		}
 	}

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

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
@@ -21,22 +21,22 @@ public class Commandbanip extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 
-		final User u = ess.getUser(args[0]);
+		final User player = ess.getUser(args[0]);
 
-		if (u == null)
+		if (player == null)
 		{
 			ess.getServer().banIP(args[0]);
-			sender.sendMessage(Util.i18n("banIpAddress"));
+			sender.sendMessage(_("banIpAddress"));
 		}
 		else
 		{
-			final String ipAddress = u.getLastLoginAddress();
+			final String ipAddress = player.getLastLoginAddress();
 			if (ipAddress.length() == 0)
 			{
-				throw new Exception(Util.i18n("playerNotFound"));
+				throw new Exception(_("playerNotFound"));
 			}
-			ess.getServer().banIP(u.getLastLoginAddress());
-			sender.sendMessage(Util.i18n("banIpAddress"));
+			ess.getServer().banIP(player.getLastLoginAddress());
+			sender.sendMessage(_("banIpAddress"));
 		}
 	}
 }

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

@@ -1,10 +1,11 @@
 package com.earth2me.essentials.commands;
 
-import org.bukkit.Server;
-import org.bukkit.TreeType;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
 import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.TreeType;
 
 
 public class Commandbigtree extends EssentialsCommand
@@ -15,7 +16,7 @@ public class Commandbigtree extends EssentialsCommand
 	}
 
 	@Override
-	public void run(Server server, User user, String commandLabel, 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"))
@@ -30,17 +31,17 @@ public class Commandbigtree extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		
+
 		final Location loc = Util.getTarget(user);
 		final Location safeLocation = Util.getSafeDestination(loc);
 		final boolean success = user.getWorld().generateTree(safeLocation, tree);
 		if (success)
 		{
-			user.sendMessage(Util.i18n("bigTreeSuccess"));
+			user.sendMessage(_("bigTreeSuccess"));
 		}
 		else
 		{
-			throw new Exception(Util.i18n("bigTreeFailure"));
+			throw new Exception(_("bigTreeFailure"));
 		}
 	}
 }

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

@@ -0,0 +1,45 @@
+package com.earth2me.essentials.commands;
+
+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 Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		final Block block = user.getTargetBlock(null, 20);
+		if (block == null)
+		{
+			throw new NoChargeException();
+		}
+		if (block.getType() == Material.AIR)
+		{
+			throw new NoChargeException();
+		}
+		if (block.getType() == Material.BEDROCK && !user.isAuthorized("essentials.break.bedrock"))
+		{
+			throw new Exception("You are not allowed to destroy bedrock."); //TODO: Translation
+		}
+		final BlockBreakEvent event = new BlockBreakEvent(block, user);
+		server.getPluginManager().callEvent(event);
+		if (event.isCancelled())
+		{
+			throw new NoChargeException();
+		}
+		else
+		{
+			block.setType(Material.AIR);
+		}
+	}
+}

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

@@ -1,9 +1,8 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.Util;
+import static com.earth2me.essentials.I18n._;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 
 public class Commandbroadcast extends EssentialsCommand
@@ -21,7 +20,6 @@ public class Commandbroadcast extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 
-		ess.broadcastMessage(null,
-							 Util.format("broadcast", getFinalArg(args, 0)));
+		ess.broadcastMessage(null, _("broadcast", getFinalArg(args, 0)));
 	}
 }

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

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.Util;
+import static com.earth2me.essentials.I18n._;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -14,7 +14,7 @@ public class Commandburn extends EssentialsCommand
 	}
 
 	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, 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)
 		{
@@ -24,7 +24,7 @@ public class Commandburn extends EssentialsCommand
 		for (Player p : server.matchPlayer(args[0]))
 		{
 			p.setFireTicks(Integer.parseInt(args[1]) * 20);
-			sender.sendMessage(Util.format("burnMsg", p.getDisplayName(), Integer.parseInt(args[1])));
+			sender.sendMessage(_("burnMsg", p.getDisplayName(), Integer.parseInt(args[1])));
 		}
 	}
 }

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

@@ -1,11 +1,11 @@
 package com.earth2me.essentials.commands;
 
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import java.util.List;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
-import java.util.List;
 
 
 public class Commandclearinventory extends EssentialsCommand
@@ -15,6 +15,7 @@ public class Commandclearinventory extends EssentialsCommand
 		super("clearinventory");
 	}
 
+	//TODO: Cleanup
 	@Override
 	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
 	{
@@ -30,11 +31,11 @@ public class Commandclearinventory extends EssentialsCommand
 					for (Player p : online)
 					{
 						p.getInventory().clear();
-						user.sendMessage(Util.format("inventoryClearedOthers", p.getDisplayName()));
+						user.sendMessage(_("inventoryClearedOthers", p.getDisplayName()));
 					}
 					return;
 				}
-				throw new Exception(Util.i18n("playerNotFound"));
+				throw new Exception(_("playerNotFound"));
 			}
 			else
 			{
@@ -42,18 +43,18 @@ public class Commandclearinventory extends EssentialsCommand
 				if (p != null)
 				{
 					p.getInventory().clear();
-					user.sendMessage(Util.format("inventoryClearedOthers", p.getDisplayName()));
+					user.sendMessage(_("inventoryClearedOthers", p.getDisplayName()));
 				}
 				else
 				{
-					throw new Exception(Util.i18n("playerNotFound"));
+					throw new Exception(_("playerNotFound"));
 				}
 			}
 		}
 		else
 		{
 			user.getInventory().clear();
-			user.sendMessage(Util.i18n("inventoryCleared"));
+			user.sendMessage(_("inventoryCleared"));
 		}
 	}
 
@@ -74,11 +75,11 @@ public class Commandclearinventory extends EssentialsCommand
 				for (Player p : online)
 				{
 					p.getInventory().clear();
-					sender.sendMessage(Util.format("inventoryClearedOthers", p.getDisplayName()));
+					sender.sendMessage(_("inventoryClearedOthers", p.getDisplayName()));
 				}
 				return;
 			}
-			throw new Exception(Util.i18n("playerNotFound"));
+			throw new Exception(_("playerNotFound"));
 		}
 		else
 		{
@@ -86,11 +87,11 @@ public class Commandclearinventory extends EssentialsCommand
 			if (u != null)
 			{
 				u.getInventory().clear();
-				sender.sendMessage(Util.format("inventoryClearedOthers", u.getDisplayName()));
+				sender.sendMessage(_("inventoryClearedOthers", u.getDisplayName()));
 			}
 			else
 			{
-				throw new Exception(Util.i18n("playerNotFound"));
+				throw new Exception(_("playerNotFound"));
 			}
 		}
 	}

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

@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;
 
-import org.bukkit.Server;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
+import org.bukkit.Server;
 
 
 public class Commandcompass extends EssentialsCommand
@@ -13,39 +13,39 @@ public class Commandcompass extends EssentialsCommand
 	}
 
 	@Override
-	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		int r = (int)(user.getLocation().getYaw() + 180 + 360) % 360;
+		final int bearing = (int)(user.getLocation().getYaw() + 180 + 360) % 360;
 		String dir;
-		if (r < 23)
+		if (bearing < 23)
 		{
 			dir = "N";
 		}
-		else if (r < 68)
+		else if (bearing < 68)
 		{
 			dir = "NE";
 		}
-		else if (r < 113)
+		else if (bearing < 113)
 		{
 			dir = "E";
 		}
-		else if (r < 158)
+		else if (bearing < 158)
 		{
 			dir = "SE";
 		}
-		else if (r < 203)
+		else if (bearing < 203)
 		{
 			dir = "S";
 		}
-		else if (r < 248)
+		else if (bearing < 248)
 		{
 			dir = "SW";
 		}
-		else if (r < 293)
+		else if (bearing < 293)
 		{
 			dir = "W";
 		}
-		else if (r < 338)
+		else if (bearing < 338)
 		{
 			dir = "NW";
 		}
@@ -53,6 +53,6 @@ public class Commandcompass extends EssentialsCommand
 		{
 			dir = "N";
 		}
-		user.sendMessage(Util.format("compassBearing", dir, r));
+		user.sendMessage(_("compassBearing", dir, bearing));
 	}
 }

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

@@ -1,9 +1,10 @@
 package com.earth2me.essentials.commands;
 
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
+import java.util.Locale;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
-import com.earth2me.essentials.Util;
 
 
 public class Commanddelhome extends EssentialsCommand
@@ -14,35 +15,37 @@ public class Commanddelhome extends EssentialsCommand
 	}
 
 	@Override
-	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
-		//Allowing both formats /delhome khobbits house | /delhome khobbits:house
-		final String[] nameParts = args[0].split(":");
-		if (nameParts[0].length() != args[0].length())
-		{
-			args = nameParts;
-		}
-
-		User user = ess.getUser(sender);
-		String name;
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		else if (args.length > 1 && (user == null || user.isAuthorized("essentials.delhome.others")))
+
+		User user = ess.getUser(sender);
+		String name;
+		final String[] expandedArg = args[0].split(":");
+
+		if (expandedArg.length > 1 && (user == null || user.isAuthorized("essentials.delhome.others")))
 		{
-			user = getPlayer(server, args, 0, true);
-			name = args[1];
+			user = getPlayer(server, expandedArg, 0, true);
+			name = expandedArg[1];
+		}
+		else if (user == null)
+		{
+			throw new NotEnoughArgumentsException();
 		}
 		else
 		{
-			if (user == null)
-			{
-				throw new NotEnoughArgumentsException();
-			}
-			name = args[0];
+			name = expandedArg[0];
 		}
-		user.delHome(name.toLowerCase());
-		sender.sendMessage(Util.format("deleteHome", name));
+		//TODO: Think up a nice error message
+		/*
+		 * if (name.equalsIgnoreCase("bed")) {
+		 *   throw new Exception("You cannot remove the vanilla home point");
+		 * }
+		 */
+		user.delHome(name.toLowerCase(Locale.ENGLISH));
+		sender.sendMessage(_("deleteHome", name));
 	}
 }

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

@@ -1,22 +1,25 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.Util;
+import static com.earth2me.essentials.I18n._;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
-public class Commanddeljail extends EssentialsCommand {
 
-	public Commanddeljail() {
+public class Commanddeljail extends EssentialsCommand
+{
+	public Commanddeljail()
+	{
 		super("deljail");
 	}
 
 	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, 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();
 		}
-		ess.getJail().delJail(args[0]);
-		sender.sendMessage(Util.format("deleteJail", args[0]));
+		ess.getJails().removeJail(args[0]);
+		sender.sendMessage(_("deleteJail", args[0]));
 	}
 }

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

@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;
 
+import static com.earth2me.essentials.I18n._;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
-import com.earth2me.essentials.Util;
 
 
 public class Commanddelwarp extends EssentialsCommand
@@ -13,13 +13,13 @@ public class Commanddelwarp extends EssentialsCommand
 	}
 
 	@Override
-	public void run(Server server, CommandSender sender, String commandLabel, 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().delWarp(args[0]);
-		sender.sendMessage(Util.format("deleteWarp", args[0]));
+		sender.sendMessage(_("deleteWarp", args[0]));
 	}
 }

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

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

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

@@ -1,9 +1,10 @@
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.User;
+import java.util.Locale;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import com.earth2me.essentials.User;
 
 
 public class Commandeco extends EssentialsCommand
@@ -14,7 +15,7 @@ public class Commandeco extends EssentialsCommand
 	}
 
 	@Override
-	public void run(Server server, CommandSender sender, String commandLabel, 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)
 		{
@@ -24,7 +25,7 @@ public class Commandeco extends EssentialsCommand
 		double amount;
 		try
 		{
-			cmd = EcoCommands.valueOf(args[0].toUpperCase());
+			cmd = EcoCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH));
 			amount = Double.parseDouble(args[2].replaceAll("[^0-9\\.]", ""));
 		}
 		catch (Exception ex)
@@ -34,45 +35,46 @@ public class Commandeco extends EssentialsCommand
 
 		if (args[1].contentEquals("*"))
 		{
-			for (Player p : server.getOnlinePlayers())
+			for (Player onlinePlayer : server.getOnlinePlayers())
 			{
-				User u = ess.getUser(p);
+				final User player = ess.getUser(onlinePlayer);
 				switch (cmd)
 				{
 				case GIVE:
-					u.giveMoney(amount);
+					player.giveMoney(amount);
 					break;
 
 				case TAKE:
-					u.takeMoney(amount);
+					player.takeMoney(amount);
 					break;
 
 				case RESET:
-					u.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
+					player.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
 					break;
 				}
 			}
 		}
 		else
 		{
-			User u = getPlayer(server, args, 1, true);
+			final User player = getPlayer(server, args, 1, true);
 			switch (cmd)
 			{
 			case GIVE:
-				u.giveMoney(amount, sender);
+				player.giveMoney(amount, sender);
 				break;
 
 			case TAKE:
-				u.takeMoney(amount, sender);
+				player.takeMoney(amount, sender);
 				break;
 
 			case RESET:
-				u.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
+				player.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
 				break;
 			}
 		}
 	}
 
+
 	private enum EcoCommands
 	{
 		GIVE, TAKE, RESET

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

@@ -0,0 +1,96 @@
+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 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 Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		final ItemStack stack = user.getItemInHand();
+		if (stack == null)
+		{
+			throw new Exception(_("nothingInHand"));
+		}
+		if (args.length == 0)
+		{
+			final Set<String> enchantmentslist = new TreeSet<String>();
+			for (Map.Entry<String, Enchantment> entry : Enchantments.entrySet())
+			{
+				final String enchantmentName = entry.getValue().getName().toLowerCase(Locale.ENGLISH);
+				if (enchantmentslist.contains(enchantmentName) || user.isAuthorized("essentials.enchant." + enchantmentName))
+				{
+					enchantmentslist.add(entry.getKey());
+					//enchantmentslist.add(enchantmentName);
+				}
+			}
+			throw new NotEnoughArgumentsException(_("enchantments", Util.joinList(enchantmentslist.toArray())));
+		}
+		int level = -1;
+		if (args.length > 1)
+		{
+			try
+			{
+				level = Integer.parseInt(args[1]);
+			}
+			catch (NumberFormatException ex)
+			{
+				level = -1;
+			}
+		}
+		final Enchantment enchantment = getEnchantment(args[0], user);
+		if (level < 0 || level > enchantment.getMaxLevel())
+		{
+			level = enchantment.getMaxLevel();
+		}
+		if (level == 0)
+		{
+			stack.removeEnchantment(enchantment);
+		}
+		else
+		{
+			stack.addEnchantment(enchantment, level);
+		}
+		user.getInventory().setItemInHand(stack);
+		user.updateInventory();
+		final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
+		if (level == 0)
+		{
+			user.sendMessage(_("enchantmentRemoved", enchantmentName.replace('_', ' ')));
+		}
+		else
+		{
+			user.sendMessage(_("enchantmentApplied", enchantmentName.replace('_', ' ')));
+		}
+	}
+
+	public static Enchantment getEnchantment(final String name, final User user) throws Exception
+	{
+
+		final Enchantment enchantment = Enchantments.getByName(name);
+		if (enchantment == null)
+		{
+			throw new Exception(_("enchantmentNotFound"));
+		}
+		final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
+		if (user != null && !user.isAuthorized("essentials.enchant." + enchantmentName))
+		{
+			throw new Exception(_("enchantmentPerm", enchantmentName));
+		}
+		return enchantment;
+	}
+}

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

@@ -1,5 +1,6 @@
 package com.earth2me.essentials.commands;
 
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Util;
 import java.util.HashMap;
 import java.util.Map;
@@ -23,12 +24,52 @@ public class Commandessentials extends EssentialsCommand
 	@Override
 	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
-		if (args.length > 0 && args[0].equalsIgnoreCase("debug"))
-		{
-			ess.getSettings().setDebug(!ess.getSettings().isDebug());
-			sender.sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
-			return;
+		if (args.length == 0) {
+			run_disabled(server, sender, commandLabel, args);
 		}
+		else if (args[0].equalsIgnoreCase("debug"))
+		{
+			run_debug(server, sender, commandLabel, args);
+		}
+		else if (args[0].equalsIgnoreCase("nya"))
+		{
+			run_nya(server, sender, commandLabel, args);
+		}
+		else {
+			run_reload(server, sender, commandLabel, args);
+		}
+	}
+	
+	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.getAlternativeCommandsHandler().disabledCommands().entrySet())
+		{
+			if (disabledCommands.length() > 0) {
+				disabledCommands.append(", ");
+			}
+			disabledCommands.append(entry.getKey()).append(" => ").append(entry.getValue());
+		}
+		sender.sendMessage(disabledCommands.toString());
+	}
+	
+	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 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 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);
 		noteMap.put("1G", (byte)0x1);
@@ -54,8 +95,6 @@ public class Commandessentials extends EssentialsCommand
 		noteMap.put("2D#", (byte)(0x9 + 0xC));
 		noteMap.put("2E", (byte)(0xA + 0xC));
 		noteMap.put("2F", (byte)(0xB + 0xC));
-		if (args.length > 0 && args[0].equalsIgnoreCase("nya"))
-		{
 			if (!noteBlocks.isEmpty())
 			{
 				return;
@@ -80,6 +119,7 @@ public class Commandessentials extends EssentialsCommand
 			{
 				int i = 0;
 
+				@Override
 				public void run()
 				{
 					final String note = tune[i];
@@ -93,21 +133,18 @@ public class Commandessentials extends EssentialsCommand
 						return;
 					}
 					Map<Player, Block> noteBlocks = Commandessentials.this.noteBlocks;
-					for (Player player : server.getOnlinePlayers())
+					for (Player onlinePlayer : server.getOnlinePlayers())
 					{
-						Block block = noteBlocks.get(player);
+						final Block block = noteBlocks.get(onlinePlayer);
 						if (block == null || block.getType() != Material.NOTE_BLOCK)
 						{
 							continue;
 						}
-						player.playNote(block.getLocation(), (byte)0, noteMap.get(note));
+						onlinePlayer.playNote(block.getLocation(), (byte)0, noteMap.get(note));
 					}
 				}
 			}, 20, 2);
 			return;
-		}
-		ess.reload();
-		sender.sendMessage(Util.format("essentialsReload", ess.getDescription().getVersion()));
 	}
 
 	private void stopTune()

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

@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;
 
-import org.bukkit.Server;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -15,7 +15,7 @@ public class Commandext extends EssentialsCommand
 	}
 
 	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, 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)
 		{
@@ -26,24 +26,24 @@ public class Commandext extends EssentialsCommand
 	}
 
 	@Override
-	public void run(Server server, User user, String commandLabel, 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)
 		{
 			user.setFireTicks(0);
-			user.sendMessage(Util.i18n("extinguish"));
+			user.sendMessage(_("extinguish"));
 			return;
 		}
 
 		extinguishPlayers(server, user, commandLabel);
 	}
 
-	private void extinguishPlayers(Server server, CommandSender sender, String name) throws Exception
+	private void extinguishPlayers(final Server server, final CommandSender sender, final String name) throws Exception
 	{
-		for (Player p : server.matchPlayer(name))
+		for (Player matchPlayer : server.matchPlayer(name))
 		{
-			p.setFireTicks(0);
-			sender.sendMessage(Util.format("extinguishOthers", p.getDisplayName()));
+			matchPlayer.setFireTicks(0);
+			sender.sendMessage(_("extinguishOthers", matchPlayer.getDisplayName()));
 		}
 	}
 }

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

@@ -0,0 +1,52 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+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
+{
+	public Commandfeed()
+	{
+		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(server,user,args[0]);
+		}
+		else
+		{
+			user.setFoodLevel(20);
+			user.setSaturation(10);
+			user.sendMessage(_("feed"));
+		}
+	}
+	
+		private void feedOtherPlayers(final Server server, final CommandSender sender, final String name)
+	{
+		final List<Player> players = server.matchPlayer(name);
+		if (players.isEmpty())
+		{
+			sender.sendMessage(_("playerNotFound"));
+			return;
+		}
+		for (Player player : players)
+		{
+			if (ess.getUser(player).isHidden())
+			{
+				continue;
+			}
+			player.setFoodLevel(20);
+			player.setSaturation(10);
+			sender.sendMessage(_("feedOther", player.getDisplayName()));
+		}
+	}
+}

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

@@ -3,12 +3,12 @@ package com.earth2me.essentials.commands;
 import com.earth2me.essentials.User;
 import org.bukkit.Server;
 import org.bukkit.entity.Fireball;
+import org.bukkit.entity.SmallFireball;
 import org.bukkit.util.Vector;
 
 
 public class Commandfireball extends EssentialsCommand
 {
-
 	public Commandfireball()
 	{
 		super("fireball");
@@ -17,7 +17,13 @@ public class Commandfireball extends EssentialsCommand
 	@Override
 	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-        final Vector direction = user.getEyeLocation().getDirection().multiply(2);
-		user.getWorld().spawn(user.getEyeLocation().add(direction.getX(), direction.getY(), direction.getZ()), Fireball.class);
+		boolean small = false;
+		if (args.length > 0 && args[0].equalsIgnoreCase("small"))
+		{
+			small = true;
+		}
+		final Vector direction = user.getEyeLocation().getDirection().multiply(2);
+		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,7 +1,8 @@
 package com.earth2me.essentials.commands;
 
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
+import java.util.Locale;
 import org.bukkit.GameMode;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
@@ -16,28 +17,41 @@ public class Commandgamemode extends EssentialsCommand
 	}
 
 	@Override
-	public void run(final Server server, 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
 	{
-		Player player;
-		if (args.length == 0)
+		if (args.length < 1)
 		{
-			if (sender instanceof Player)
-			{
-				player = ess.getUser(sender);			}
-			else
-			{
-				throw new NotEnoughArgumentsException();
-			}
+			throw new NotEnoughArgumentsException();
 		}
-		else
+
+		gamemodeOtherPlayers(server, sender, args[0]);
+	}
+
+	@Override
+	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() && user.isAuthorized("essentials.gamemode.others"))
 		{
-			player = server.getPlayer(args[0]);
-			if (player == null)
-			{
-				throw new Exception(Util.i18n("playerNotFound"));
-			}
+			gamemodeOtherPlayers(server, user, args[0]);
+			return;
+		}
+
+		user.setGameMode(user.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : GameMode.SURVIVAL);
+		user.sendMessage(_("gameMode", _(user.getGameMode().toString().toLowerCase(Locale.ENGLISH)), user.getDisplayName()));
+	}
+
+	private void gamemodeOtherPlayers(final Server server, final CommandSender sender, final String name)
+	{
+		for (Player matchPlayer : server.matchPlayer(name))
+		{
+			final User player = ess.getUser(matchPlayer);
+			if (player.isHidden())
+			{
+				continue;
+			}
+
+			player.setGameMode(player.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : GameMode.SURVIVAL);
+			sender.sendMessage(_("gameMode", _(player.getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getDisplayName()));
 		}
-		player.setGameMode(player.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : GameMode.SURVIVAL);
-		sender.sendMessage(Util.format("gameMode", Util.i18n(player.getGameMode().toString().toLowerCase()), player.getDisplayName()));
 	}
 }

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

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.Util;
+import static com.earth2me.essentials.I18n._;
 import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
@@ -14,17 +14,18 @@ public class Commandgc extends EssentialsCommand
 	}
 
 	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
-		sender.sendMessage(Util.format("gcmax", (Runtime.getRuntime().maxMemory() / 1024 / 1024)));
-		sender.sendMessage(Util.format("gcfree", (Runtime.getRuntime().freeMemory() / 1024 / 1024)));
-		sender.sendMessage(Util.format("gctotal", (Runtime.getRuntime().totalMemory() / 1024 / 1024)));
+		sender.sendMessage(_("gcmax", (Runtime.getRuntime().maxMemory() / 1024 / 1024)));
+		sender.sendMessage(_("gctotal", (Runtime.getRuntime().totalMemory() / 1024 / 1024)));
+		sender.sendMessage(_("gcfree", (Runtime.getRuntime().freeMemory() / 1024 / 1024)));
+
 		for (World w : server.getWorlds())
 		{
 			sender.sendMessage(
 					(w.getEnvironment() == World.Environment.NETHER ? "Nether" : "World") + " \"" + w.getName() + "\": "
-					+ w.getLoadedChunks().length + Util.i18n("gcchunks")
-					+ w.getEntities().size() + Util.i18n("gcentities"));
+					+ w.getLoadedChunks().length + _("gcchunks")
+					+ w.getEntities().size() + _("gcentities"));
 		}
 	}
 }

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

@@ -1,8 +1,9 @@
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.User;
 import org.bukkit.Location;
 import org.bukkit.Server;
-import com.earth2me.essentials.User;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandgetpos extends EssentialsCommand
@@ -11,15 +12,44 @@ public class Commandgetpos extends EssentialsCommand
 	{
 		super("getpos");
 	}
-
+	
 	@Override
-	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		Location coords = user.getLocation();
-		user.sendMessage("§7X: " + coords.getBlockX() + " (+East <-> -West)");
-		user.sendMessage("§7Y: " + coords.getBlockY() + " (+Up <-> -Down)");
-		user.sendMessage("§7Z: " + coords.getBlockZ() + " (+South <-> -North)");
-		user.sendMessage("§7Yaw: " + (coords.getYaw() + 180 + 360) % 360 + " (Rotation)");
-		user.sendMessage("§7Pitch: " + coords.getPitch() + " (Head angle)");
+		if (args.length > 0 && user.isAuthorized("essentials.getpos.others"))
+		{
+			final User otherUser = getPlayer(server, args, 0);
+			outputPosition(user, otherUser.getLocation(), user.getLocation());
+		}
+		else
+		{
+			outputPosition(user, user.getLocation(), null);
+		}
+	}
+	
+	@Override
+	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 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)
+	{
+		sender.sendMessage("§7World: " + coords.getWorld().getName());
+		sender.sendMessage("§7X: " + coords.getBlockX() + " (+East <-> -West)");
+		sender.sendMessage("§7Y: " + coords.getBlockY() + " (+Up <-> -Down)");
+		sender.sendMessage("§7Z: " + coords.getBlockZ() + " (+South <-> -North)");
+		sender.sendMessage("§7Yaw: " + (coords.getYaw() + 180 + 360) % 360 + " (Rotation)");
+		sender.sendMessage("§7Pitch: " + coords.getPitch() + " (Head angle)");
+		if (distance != null && coords.getWorld().equals(distance.getWorld()))
+		{
+			sender.sendMessage("§7Distance: " + coords.distance(distance));
+		}
 	}
 }

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

@@ -1,10 +1,13 @@
 package com.earth2me.essentials.commands;
 
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
+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;
 import org.bukkit.inventory.ItemStack;
 
@@ -18,16 +21,16 @@ public class Commandgive extends EssentialsCommand
 
 	//TODO: move these messages to message file
 	@Override
-	public void run(Server server, CommandSender sender, String commandLabel, 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();
 		}
 
-		ItemStack stack = ess.getItemDb().get(args[1]);
+		final ItemStack stack = ess.getItemDb().get(args[1]);
 
-		String itemname = stack.getType().toString().toLowerCase().replace("_", "");
+		final String itemname = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
 		if (sender instanceof Player
 			&& (ess.getSettings().permissionBasedItemSpawn()
 				? (!ess.getUser(sender).isAuthorized("essentials.give.item-all")
@@ -38,20 +41,60 @@ public class Commandgive extends EssentialsCommand
 		{
 			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)
+		{
+			for (int i = 3; i < args.length; i++)
+			{
+				final String[] split = args[i].split("[:+',;.]", 2);
+				if (split.length < 1)
+				{
+					continue;
+				}
+				final Enchantment enchantment = Commandenchant.getEnchantment(split[0], sender instanceof Player ? ess.getUser(sender) : null);
+				int level;
+				if (split.length > 1)
+				{
+					level = Integer.parseInt(split[1]);
+				}
+				else
+				{
+					level = enchantment.getMaxLevel();
+				}
+				stack.addEnchantment(enchantment, level);
+			}
+		}
 
 		if (stack.getType() == Material.AIR)
 		{
 			throw new Exception(ChatColor.RED + "You can't give air.");
 		}
 
-		User giveTo = getPlayer(server, args, 0);
-		String itemName = stack.getType().toString().toLowerCase().replace('_', ' ');
+		final String itemName = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' ');
 		sender.sendMessage(ChatColor.BLUE + "Giving " + stack.getAmount() + " of " + itemName + " to " + giveTo.getDisplayName() + ".");
-		giveTo.getInventory().addItem(stack);
+		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,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -15,7 +15,7 @@ public class Commandgod extends EssentialsCommand
 	}
 
 	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, 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)
 		{
@@ -26,29 +26,29 @@ public class Commandgod extends EssentialsCommand
 	}
 
 	@Override
-	protected void run(Server server, User user, String commandLabel, 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 && user.isAuthorized("essentials.god.others"))
+		if (args.length > 0 && !args[0].trim().isEmpty() && user.isAuthorized("essentials.god.others"))
 		{
 			godOtherPlayers(server, user, args[0]);
 			return;
 		}
 
-		user.sendMessage(Util.format("godMode", (user.toggleGodModeEnabled()?  Util.i18n("enabled") : Util.i18n("disabled"))));
+		user.sendMessage(_("godMode", (user.toggleGodModeEnabled() ? _("enabled") : _("disabled"))));
 	}
 
-	private void godOtherPlayers(Server server, CommandSender sender, String name)
+	private void godOtherPlayers(final Server server, final CommandSender sender, final String name)
 	{
-		for (Player p : server.matchPlayer(name))
+		for (Player matchPlayer : server.matchPlayer(name))
 		{
-			User u = ess.getUser(p);
-			if (u.isHidden()) 
+			final User player = ess.getUser(matchPlayer);
+			if (player.isHidden())
 			{
 				continue;
 			}
-			boolean enabled = u.toggleGodModeEnabled();
-			u.sendMessage(Util.format("godMode", (enabled ? Util.i18n("enabled") : Util.i18n("disabled"))));
-			sender.sendMessage(Util.format("godMode",Util.format(enabled ? "godEnabledFor": "godDisabledFor", p.getDisplayName())));
+			final boolean enabled = player.toggleGodModeEnabled();
+			player.sendMessage(_("godMode", (enabled ? _("enabled") : _("disabled"))));
+			sender.sendMessage(_("godMode", _(enabled ? "godEnabledFor" : "godDisabledFor", matchPlayer.getDisplayName())));
 		}
 	}
 }

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

@@ -1,11 +1,11 @@
 package com.earth2me.essentials.commands;
 
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import java.util.List;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
-import java.util.List;
 
 
 public class Commandheal extends EssentialsCommand
@@ -16,7 +16,7 @@ public class Commandheal extends EssentialsCommand
 	}
 
 	@Override
-	public void run(Server server, User user, String commandLabel, 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 && user.isAuthorized("essentials.heal.others"))
@@ -35,11 +35,11 @@ public class Commandheal extends EssentialsCommand
 		}
 		user.setHealth(20);
 		user.setFoodLevel(20);
-		user.sendMessage(Util.i18n("heal"));
+		user.sendMessage(_("heal"));
 	}
 
 	@Override
-	public void run(Server server, CommandSender sender, String commandLabel, 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)
 		{
@@ -49,12 +49,12 @@ public class Commandheal extends EssentialsCommand
 		healOtherPlayers(server, sender, args[0]);
 	}
 
-	private void healOtherPlayers(Server server, CommandSender sender, String name)
+	private void healOtherPlayers(final Server server, final CommandSender sender, final String name)
 	{
-		List<Player> players = server.matchPlayer(name);
+		final List<Player> players = server.matchPlayer(name);
 		if (players.isEmpty())
 		{
-			sender.sendMessage(Util.i18n("playerNotFound"));
+			sender.sendMessage(_("playerNotFound"));
 			return;
 		}
 		for (Player p : players)
@@ -64,7 +64,9 @@ public class Commandheal extends EssentialsCommand
 				continue;
 			}
 			p.setHealth(20);
-			sender.sendMessage(Util.format("healOther", p.getDisplayName()));
+			p.setFoodLevel(20);
+			p.sendMessage(_("heal"));
+			sender.sendMessage(_("healOther", p.getDisplayName()));
 		}
 	}
 }

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

@@ -1,30 +1,15 @@
 package com.earth2me.essentials.commands;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.constructor.SafeConstructor;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
-import java.util.Map.Entry;
-import java.util.logging.Level;
+import com.earth2me.essentials.textreader.*;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandhelp extends EssentialsCommand
 {
-	private static final String DESCRIPTION = "description";
-	private static final String PERMISSION = "permission";
-	private static final String PERMISSIONS = "permissions";
-	public final Yaml yaml = new Yaml(new SafeConstructor());
-
 	public Commandhelp()
 	{
 		super("help");
@@ -33,198 +18,35 @@ public class Commandhelp extends EssentialsCommand
 	@Override
 	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		int page = 1;
-		String match = "";
-		try
+		IText output;
+		String pageStr = args.length > 0 ? args[0] : null;
+		String chapterPageStr = args.length > 1 ? args[1] : null;
+		final IText input = new TextInput(user, "help", false, ess);
+
+		if (input.getLines().isEmpty())
 		{
-			if (args.length > 0)
+			if (Util.isInt(pageStr) || pageStr == null)
 			{
-				match = args[0].toLowerCase();
-				page = Integer.parseInt(args[args.length - 1]);
-				if (args.length == 1)
-				{
-					match = "";
-				}
+				output = new HelpInput(user, "", ess);
 			}
-
-		}
-		catch (Exception ex)
-		{
-			if (args.length == 1)
+			else
 			{
-				match = args[0].toLowerCase();
+				output = new HelpInput(user, pageStr, ess);
+				pageStr = chapterPageStr;
 			}
+			chapterPageStr = null;
 		}
-
-		final List<String> lines = getHelpLines(user, match);
-		if (lines.isEmpty())
+		else
 		{
-			throw new Exception(Util.i18n("noHelpFound"));
-		}
-
-		final int start = (page - 1) * 9;
-		final int pages = lines.size() / 9 + (lines.size() % 9 > 0 ? 1 : 0);
-
-		user.sendMessage(Util.format("helpPages", page, pages));
-		for (int i = start; i < lines.size() && i < start + 9; i++)
-		{
-			user.sendMessage(lines.get(i));
+			output = new KeywordReplacer(input, user, ess);
 		}
+		final TextPager pager = new TextPager(output);
+		pager.showPage(pageStr, chapterPageStr, "help", user);
 	}
 
 	@Override
 	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
-		sender.sendMessage(Util.i18n("helpConsole"));
-	}
-
-	@SuppressWarnings("CallToThreadDumpStack")
-	private List<String> getHelpLines(final User user, final String match) throws Exception
-	{
-		final List<String> retval = new ArrayList<String>();
-		File helpFile = new File(ess.getDataFolder(), "help_" + Util.sanitizeFileName(user.getName()) + ".txt");
-		if (!helpFile.exists())
-		{
-			helpFile = new File(ess.getDataFolder(), "help_" + Util.sanitizeFileName(user.getGroup()) + ".txt");
-		}
-		if (!helpFile.exists())
-		{
-			helpFile = new File(ess.getDataFolder(), "help.txt");
-		}
-		if (helpFile.exists())
-		{
-			final BufferedReader bufferedReader = new BufferedReader(new FileReader(helpFile));
-			try
-			{
-
-				while (bufferedReader.ready())
-				{
-					final String line = bufferedReader.readLine();
-					retval.add(line.replace('&', '§'));
-				}
-			}
-			finally
-			{
-				bufferedReader.close();
-			}
-			return retval;
-		}
-
-		boolean reported = false;
-		String pluginName = "";
-		for (Plugin p : ess.getServer().getPluginManager().getPlugins())
-		{
-			try
-			{
-				final PluginDescriptionFile desc = p.getDescription();
-				final HashMap<String, HashMap<String, Object>> cmds = (HashMap<String, HashMap<String, Object>>)desc.getCommands();
-				pluginName = p.getDescription().getName().toLowerCase();
-				for (Entry<String, HashMap<String, Object>> k : cmds.entrySet())
-				{
-					try
-					{
-						if ((!match.equalsIgnoreCase(""))
-							&& (!k.getKey().toLowerCase().contains(match))
-							&& (!(k.getValue().get(DESCRIPTION) instanceof String
-								  && ((String)k.getValue().get(DESCRIPTION)).toLowerCase().contains(match)))
-							&& (!pluginName.contains(match)))
-						{
-							continue;
-						}
-
-						if (pluginName.contains("essentials"))
-						{
-							final String node = "essentials." + k.getKey();
-							if (!ess.getSettings().isCommandDisabled(k.getKey()) && user.isAuthorized(node))
-							{
-								retval.add("§c" + k.getKey() + "§7: " + k.getValue().get(DESCRIPTION));
-							}
-						}
-						else
-						{
-							if (ess.getSettings().showNonEssCommandsInHelp())
-							{
-								final HashMap<String, Object> value = k.getValue();
-								if (value.containsKey(PERMISSION) && value.get(PERMISSION) instanceof String && !(value.get(PERMISSION).equals("")))
-								{
-									if (user.isAuthorized((String)value.get(PERMISSION)))
-									{
-										retval.add("§c" + k.getKey() + "§7: " + value.get(DESCRIPTION));
-									}
-								}
-								else if (value.containsKey(PERMISSION) && value.get(PERMISSION) instanceof List && !((List<Object>)value.get(PERMISSION)).isEmpty())
-								{
-									boolean enabled = false;
-									for (Object o : (List<Object>)value.get(PERMISSION))
-									{
-										if (o instanceof String && user.isAuthorized((String)o))
-										{
-											enabled = true;
-											break;
-										}
-									}
-									if (enabled)
-									{
-										retval.add("§c" + k.getKey() + "§7: " + value.get(DESCRIPTION));
-									}
-								}
-								else if (value.containsKey(PERMISSIONS) && value.get(PERMISSIONS) instanceof String && !(value.get(PERMISSIONS).equals("")))
-								{
-									if (user.isAuthorized((String)value.get(PERMISSIONS)))
-									{
-										retval.add("§c" + k.getKey() + "§7: " + value.get(DESCRIPTION));
-									}
-								}
-								else if (value.containsKey(PERMISSIONS) && value.get(PERMISSIONS) instanceof List && !((List<Object>)value.get(PERMISSIONS)).isEmpty())
-								{
-									boolean enabled = false;
-									for (Object o : (List<Object>)value.get(PERMISSIONS))
-									{
-										if (o instanceof String && user.isAuthorized((String)o))
-										{
-											enabled = true;
-											break;
-										}
-									}
-									if (enabled)
-									{
-										retval.add("§c" + k.getKey() + "§7: " + value.get(DESCRIPTION));
-									}
-								}
-								else if (user.isAuthorized("essentials.help." + pluginName))
-								{
-									retval.add("§c" + k.getKey() + "§7: " + value.get(DESCRIPTION));
-								}
-								else
-								{
-									if (!ess.getSettings().hidePermissionlessHelp())
-									{
-										retval.add("§c" + k.getKey() + "§7: " + value.get(DESCRIPTION));
-									}
-								}
-							}
-						}
-					}
-					catch (NullPointerException ex)
-					{
-						continue;
-					}
-				}
-			}
-			catch (NullPointerException ex)
-			{
-				continue;
-			}
-			catch (Exception ex)
-			{
-				if (!reported)
-				{
-					logger.log(Level.WARNING, Util.format("commandHelpFailedForPlugin", pluginName), ex);
-				}
-				reported = true;
-				continue;
-			}
-		}
-		return retval;
+		sender.sendMessage(_("helpConsole"));
 	}
 }

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

@@ -1,10 +1,10 @@
 package com.earth2me.essentials.commands;
 
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import java.util.logging.Level;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
-import java.util.logging.Level;
 
 
 public class Commandhelpop extends EssentialsCommand
@@ -15,23 +15,23 @@ public class Commandhelpop extends EssentialsCommand
 	}
 
 	@Override
-	public void run(Server server, User user, String commandLabel, 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 = Util.format("helpOp", user.getDisplayName(), getFinalArg(args, 0));
+		final String message = _("helpOp", user.getDisplayName(), getFinalArg(args, 0));
 		logger.log(Level.INFO, message);
-		for (Player p : server.getOnlinePlayers())
+		for (Player onlinePlayer : server.getOnlinePlayers())
 		{
-			User u = ess.getUser(p);
-			if (!u.isAuthorized("essentials.helpop.receive"))
+			final User player = ess.getUser(onlinePlayer);
+			if (!player.isAuthorized("essentials.helpop.receive"))
 			{
 				continue;
 			}
-			u.sendMessage(message);
+			player.sendMessage(message);
 		}
 	}
 }

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

@@ -1,10 +1,14 @@
 package com.earth2me.essentials.commands;
 
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
-import org.bukkit.Server;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
 import java.util.List;
+import java.util.Locale;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class Commandhome extends EssentialsCommand
@@ -15,11 +19,11 @@ public class Commandhome extends EssentialsCommand
 	}
 
 	@Override
-	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		Trade charge = new Trade(this.getName(), ess);
+		final Trade charge = new Trade(this.getName(), ess);
 		charge.isAffordableFor(user);
-		User u = user;
+		User player = user;
 		String homeName = "";
 		String[] nameParts;
 		if (args.length > 0)
@@ -31,7 +35,7 @@ public class Commandhome extends EssentialsCommand
 			}
 			else
 			{
-				u = getPlayer(server, nameParts[0].split(" "), 0, true);
+				player = getPlayer(server, nameParts, 0, true);
 				if (nameParts.length > 1)
 				{
 					homeName = nameParts[1];
@@ -40,26 +44,44 @@ public class Commandhome extends EssentialsCommand
 		}
 		try
 		{
-			user.getTeleport().home(u, homeName.toLowerCase(), charge);
+			if ("bed".equalsIgnoreCase(homeName))
+			{
+				final Location bed = player.getBedSpawnLocation();
+				if (bed != null)
+				{
+					user.getTeleport().teleport(bed, charge, TeleportCause.COMMAND);
+					return;
+				}
+			}
+			user.getTeleport().home(player, homeName.toLowerCase(Locale.ENGLISH), charge);
 		}
 		catch (NotEnoughArgumentsException e)
 		{
-			List<String> homes = u.getHomes();
-			if (homes.isEmpty() && u.equals(user) && ess.getSettings().spawnIfNoHome())
+			final List<String> homes = player.getHomes();
+			if (homes.isEmpty() && player.equals(user))
 			{
-				user.getTeleport().respawn(ess.getSpawn(), charge);				
+				final Location bed = player.getBedSpawnLocation();
+				if (bed != null)
+				{
+					user.getTeleport().teleport(bed, charge, TeleportCause.COMMAND);
+					return;
+				}
+				user.getTeleport().respawn(charge, TeleportCause.COMMAND);
+				return;
 			}
 			else if (homes.isEmpty())
 			{
-				throw new Exception(u == user ? Util.i18n("noHomeSet") : Util.i18n("noHomeSetPlayer"));
+				throw new Exception(player == user ? _("noHomeSet") : _("noHomeSetPlayer"));
 			}
-			else if (homes.size() == 1 && u.equals(user))
+			else if (homes.size() == 1 && player.equals(user))
 			{
-				user.getTeleport().home(u, homes.get(0), charge);
+				user.getTeleport().home(player, homes.get(0), charge);
+				return;
 			}
 			else
 			{
-				user.sendMessage(Util.format("homes", Util.joinList(homes)));
+				homes.add("bed");
+				user.sendMessage(_("homes", Util.joinList(homes)));
 			}
 		}
 		throw new NoChargeException();

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

@@ -1,49 +1,47 @@
 package com.earth2me.essentials.commands;
 
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
 import org.bukkit.Server;
 
 
 public class Commandignore extends EssentialsCommand
 {
-
 	public Commandignore()
 	{
 		super("ignore");
 	}
 
 	@Override
-	protected void run(Server server, User user, String commandLabel, 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();
 		}
-		User u;
+		User player;
 		try
 		{
-			u = getPlayer(server, args, 0);
+			player = getPlayer(server, args, 0);
 		}
-		catch(NoSuchFieldException ex)
+		catch (NoSuchFieldException ex)
 		{
-			u = ess.getOfflineUser(args[0]);
+			player = ess.getOfflineUser(args[0]);
 		}
-		if (u == null)
+		if (player == null)
 		{
-			throw new Exception(Util.i18n("playerNotFound"));
+			throw new Exception(_("playerNotFound"));
 		}
-		String name = u.getName();
-		if (user.isIgnoredPlayer(name)) {
+		final String name = player.getName();
+		if (user.isIgnoredPlayer(name))
+		{
 			user.setIgnoredPlayer(name, false);
-			user.sendMessage(Util.format("unignorePlayer", u.getName()));
+			user.sendMessage(_("unignorePlayer", player.getName()));
 		}
 		else
 		{
 			user.setIgnoredPlayer(name, true);
-			user.sendMessage(Util.format("ignorePlayer", u.getName()));
+			user.sendMessage(_("ignorePlayer", player.getName()));
 		}
 	}
-	
-	
 }

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

@@ -1,17 +1,11 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+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 org.bukkit.Server;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 
 public class Commandinfo extends EssentialsCommand
@@ -22,167 +16,11 @@ public class Commandinfo extends EssentialsCommand
 	}
 
 	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
-		String pageStr = args.length > 0 ? args[0].trim() : null;
-
-		List<String> lines = new ArrayList<String>();
-		List<String> chapters = new ArrayList<String>();
-		Map<String, Integer> bookmarks = new HashMap<String, Integer>();
-		File file = null;
-		if (sender instanceof Player)
-		{
-			User user = ess.getUser(sender);
-			file = new File(ess.getDataFolder(), "info_"+Util.sanitizeFileName(user.getName()) +".txt");
-			if (!file.exists())
-			{
-				file = new File(ess.getDataFolder(), "info_"+Util.sanitizeFileName(user.getGroup()) +".txt");
-			}
-		}
-		if (file == null || !file.exists())
-		{
-			file = new File(ess.getDataFolder(), "info.txt");
-		}
-		if (file.exists())
-		{
-			final BufferedReader bufferedReader = new BufferedReader(new FileReader(file));
-			try
-			{
-				int lineNumber = 0;
-				while (bufferedReader.ready())
-				{
-					final String line = bufferedReader.readLine();
-					if (line.length() > 0 && line.charAt(0) == '#')
-					{
-						bookmarks.put(line.substring(1).toLowerCase().replaceAll("&[0-9a-f]", ""), lineNumber);
-						chapters.add(line.substring(1).replace('&', '§'));
-					}
-					lines.add(line.replace('&', '§'));
-					lineNumber++;
-				}
-			}
-			finally
-			{
-				bufferedReader.close();
-			}
-		}
-		else
-		{
-			file.createNewFile();
-			throw new Exception(Util.i18n("infoFileDoesNotExist"));
-		}
-
-		if (bookmarks.isEmpty())
-		{
-			int page = 1;
-			try
-			{
-				page = Integer.parseInt(pageStr);
-			}
-			catch (Exception ex)
-			{
-				page = 1;
-			}
-
-			int start = (page - 1) * 9;
-			int pages = lines.size() / 9 + (lines.size() % 9 > 0 ? 1 : 0);
-
-			sender.sendMessage(Util.format("infoPages", page, pages ));
-			for (int i = start; i < lines.size() && i < start + 9; i++)
-			{
-				sender.sendMessage(lines.get(i));
-			}
-			return;
-		}
-
-		if (pageStr == null || pageStr.isEmpty() || pageStr.matches("[0-9]+"))
-		{
-			if (lines.get(0).startsWith("#"))
-			{
-				sender.sendMessage(Util.i18n("infoChapter"));
-				StringBuilder sb = new StringBuilder();
-				boolean first = true;
-				for (String string : chapters)
-				{
-					if (!first)
-					{
-						sb.append(", ");
-					}
-					first = false;
-					sb.append(string);
-				}
-				sender.sendMessage(sb.toString());
-				return;
-			}
-			else
-			{
-				int page = 1;
-				try
-				{
-					page = Integer.parseInt(pageStr);
-				}
-				catch (Exception ex)
-				{
-					page = 1;
-				}
-
-				int start = (page - 1) * 9;
-				int end;
-				for (end = 0; end < lines.size(); end++)
-				{
-					String line = lines.get(end);
-					if (line.startsWith("#"))
-					{
-						break;
-					}
-				}
-				int pages = end / 9 + (end % 9 > 0 ? 1 : 0);
-
-				sender.sendMessage(Util.format("infoPages", page, pages ));
-				for (int i = start; i < end && i < start + 9; i++)
-				{
-					sender.sendMessage(lines.get(i));
-				}
-				return;
-			}
-		}
-
-		int chapterpage = 0;
-		if (args.length >= 2)
-		{
-			try
-			{
-				chapterpage = Integer.parseInt(args[1]) - 1;
-			}
-			catch (Exception ex)
-			{
-				chapterpage = 0;
-			}
-		}
-
-		if (!bookmarks.containsKey(pageStr.toLowerCase()))
-		{
-			sender.sendMessage(Util.i18n("infoUnknownChapter"));
-			return;
-		}
-		int chapterstart = bookmarks.get(pageStr.toLowerCase()) + 1;
-		int chapterend;
-		for (chapterend = chapterstart; chapterend < lines.size(); chapterend++)
-		{
-			String line = lines.get(chapterend);
-			if (line.startsWith("#"))
-			{
-				break;
-			}
-		}
-		int start = chapterstart + chapterpage * 9;
-		int page = chapterpage + 1;
-		int pages = (chapterend - chapterstart) / 9 + ((chapterend - chapterstart) % 9 > 0 ? 1 : 0);
-
-		sender.sendMessage(Util.format("infoChapterPages", pageStr, page , pages));
-		for (int i = start; i < chapterend && i < start + 9; i++)
-		{
-			sender.sendMessage(lines.get(i));
-		}
+		final IText input = new TextInput(sender, "info", true, ess);
+		final IText output = new KeywordReplacer(input, sender, ess);
+		final TextPager pager = new TextPager(output);
+		pager.showPage(args.length > 0 ? args[0] : null, args.length > 1 ? args[1] : null, "info", sender);
 	}
 }

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

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;
 
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
 import java.util.Arrays;
 import org.bukkit.Server;
 import org.bukkit.inventory.ItemStack;
@@ -15,7 +15,7 @@ public class Commandinvsee extends EssentialsCommand
 	}
 
 	@Override
-	protected void run(Server server, User user, String commandLabel, 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 && user.getSavedInventory() == null)
@@ -31,7 +31,7 @@ public class Commandinvsee extends EssentialsCommand
 		{
 			invUser.getInventory().setContents(user.getSavedInventory());
 			user.setSavedInventory(null);
-			user.sendMessage(Util.i18n("invRestored"));
+			user.sendMessage(_("invRestored"));
 			throw new NoChargeException();
 		}
 
@@ -40,16 +40,18 @@ public class Commandinvsee extends EssentialsCommand
 			user.setSavedInventory(user.getInventory().getContents());
 		}
 		ItemStack[] invUserStack = invUser.getInventory().getContents();
-		int userStackLength = user.getInventory().getContents().length;
-		if (invUserStack.length < userStackLength) {
+		final int userStackLength = user.getInventory().getContents().length;
+		if (invUserStack.length < userStackLength)
+		{
 			invUserStack = Arrays.copyOf(invUserStack, userStackLength);
 		}
-		if (invUserStack.length > userStackLength) {
-			throw new Exception(Util.i18n("invBigger"));
+		if (invUserStack.length > userStackLength)
+		{
+			throw new Exception(_("invBigger"));
 		}
 		user.getInventory().setContents(invUserStack);
-		user.sendMessage(Util.format("invSee", invUser.getDisplayName()));
-		user.sendMessage(Util.i18n("invSeeHelp"));
+		user.sendMessage(_("invSee", invUser.getDisplayName()));
+		user.sendMessage(_("invSeeHelp"));
 		throw new NoChargeException();
 	}
 }