Merge branch 'master' into release

Removed warning for an older bukkit version.

.gitignore

@@ -0,0 +1,28 @@
+.DS_Store
+/BuildAll/nbproject/private/
+/EssentialsProtect/nbproject/private/
+/EssentialsChat/nbproject/private/
+/EssentialsGroupBridge/nbproject/private/
+/EssentialsGeoIP/nbproject/private/
+/EssentialsSpawn/nbproject/private/
+/EssentialsXMPP/nbproject/private/
+/EssentialsGroupManager/nbproject/private/
+/BuildAll/build/
+/EssentialsGroupBridge/dist/
+/EssentialsGroupBridge/build/
+/EssentialsGeoIP/dist/
+/EssentialsGeoIP/build/
+/EssentialsGroupManager/build/
+/EssentialsGroupManager/dist/
+/BuildAll/dist/
+/EssentialsChat/build/
+/EssentialsChat/dist/
+/EssentialsSpawn/build/
+/EssentialsSpawn/dist/
+/EssentialsXMPP/dist/
+/EssentialsXMPP/build/
+/EssentialsProtect/dist/
+/EssentialsProtect/build/
+/EssentialsPermissionsCommands/nbproject/private/
+/EssentialsPermissionsCommands/build/
+/EssentialsPermissionsCommands/dist/

BuildAll/build.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="BuildAll" default="default" basedir=".">
+    <description>Builds, tests, and runs the project BuildAll.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="BuildAll-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>

BuildAll/nbproject/genfiles.properties

@@ -0,0 +1,8 @@
+build.xml.data.CRC32=2bd2dd75
+build.xml.script.CRC32=7a797370
+build.xml.stylesheet.CRC32=28e38971@1.43.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=2bd2dd75
+nbproject/build-impl.xml.script.CRC32=769e541b
+nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45

BuildAll/nbproject/project.properties

@@ -0,0 +1,99 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=BuildAll
+application.vendor=Paul
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/BuildAll.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+includes=**
+jar.compress=false
+javac.classpath=\
+    ${reference.Essentials.jar}:\
+    ${reference.EssentialsChat.jar}:\
+    ${reference.EssentialsProtect.jar}:\
+    ${reference.EssentialsPermissionsCommands.jar}:\
+    ${reference.EssentialsSpawn.jar}:\
+    ${reference.EssentialsGeoIP.jar}:\
+    ${reference.EssentialsXMPP.jar}:\
+    ${reference.EssentialsGroupBridge.jar}:\
+    ${reference.EssentialsGroupManager.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${libs.junit.classpath}:\
+    ${libs.junit_4.classpath}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+project.Essentials=../Essentials
+project.EssentialsChat=../EssentialsChat
+project.EssentialsGeoIP=../EssentialsGeoIP
+project.EssentialsGroupBridge=../EssentialsGroupBridge
+project.EssentialsGroupManager=../EssentialsGroupManager
+project.EssentialsPermissionsCommands=../EssentialsPermissionsCommands
+project.EssentialsProtect=../EssentialsProtect
+project.EssentialsSpawn=../EssentialsSpawn
+project.EssentialsXMPP=../EssentialsXMPP
+reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
+reference.EssentialsChat.jar=${project.EssentialsChat}/dist/EssentialsChat.jar
+reference.EssentialsGeoIP.jar=${project.EssentialsGeoIP}/dist/EssentialsGeoIP.jar
+reference.EssentialsGroupBridge.jar=${project.EssentialsGroupBridge}/dist/EssentialsGroupBridge.jar
+reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar
+reference.EssentialsPermissionsCommands.jar=${project.EssentialsPermissionsCommands}/dist/EssentialsPermissionsCommands.jar
+reference.EssentialsProtect.jar=${project.EssentialsProtect}/dist/EssentialsProtect.jar
+reference.EssentialsSpawn.jar=${project.EssentialsSpawn}/dist/EssentialsSpawn.jar
+reference.EssentialsXMPP.jar=${project.EssentialsXMPP}/dist/EssentialsXMPP.jar
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test

BuildAll/nbproject/project.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>BuildAll</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
+            <definitions>..\lib\nblibraries.properties</definitions>
+        </libraries>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>Essentials</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+            <reference>
+                <foreign-project>EssentialsChat</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+            <reference>
+                <foreign-project>EssentialsGeoIP</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+            <reference>
+                <foreign-project>EssentialsGroupBridge</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+            <reference>
+                <foreign-project>EssentialsGroupManager</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+            <reference>
+                <foreign-project>EssentialsPermissionsCommands</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+            <reference>
+                <foreign-project>EssentialsProtect</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+            <reference>
+                <foreign-project>EssentialsSpawn</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+            <reference>
+                <foreign-project>EssentialsXMPP</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+        </references>
+    </configuration>
+</project>

Essentials/.gitignore

@@ -0,0 +1,7 @@
+# NetBeans cruft
+/build
+/dist
+/nbproject/private
+
+# Mac cruft
+.DS_Store

Essentials/build.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="Essentials" default="default" basedir=".">
+
+    <description>Builds, tests, and runs the project Essentials.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="Essentials-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+	<!--target name="-post-jar">
+	    <jar jarfile="${dist.dir}/Essentials.jar">
+	      <zipfileset src="${dist.jar}" excludes="META-INF/*" />
+	      <zipfileset src="${dist.dir}/lib/Register.jar" excludes="META-INF/*" />
+	      <manifest>
+	        <attribute name="Classpath" value="Essentials.jar"/>
+	      </manifest>
+	    </jar>
+	  </target-->
+</project>

Essentials/nbproject/genfiles.properties

@@ -0,0 +1,11 @@
+build.xml.data.CRC32=7d758acf
+build.xml.script.CRC32=3233ee78
+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=4b596d89
+nbproject/build-impl.xml.script.CRC32=4926001b
+nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
+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

@@ -0,0 +1 @@
+DoNotUseThreads

Essentials/nbproject/project.properties

@@ -0,0 +1,84 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=Essentials
+application.vendor=Paul
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/Essentials.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+file.reference.BOSEconomy7.jar=../lib/BOSEconomy7.jar
+file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
+file.reference.iCo4.jar=../lib/iCo4.jar
+file.reference.iCo5.jar=../lib/iCo5.jar
+file.reference.junit-4.5.jar=..\\lib\\junit_4\\junit-4.5.jar
+file.reference.Permissions3.jar=../lib/Permissions3.jar
+file.reference.PermissionsEx.jar=../lib/PermissionsEx.jar
+includes=**
+jar.compress=false
+javac.classpath=\
+    ${file.reference.Permissions3.jar}:\
+    ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\
+    ${file.reference.iCo4.jar}:\
+    ${file.reference.iCo5.jar}:\
+    ${file.reference.BOSEconomy7.jar}:\
+    ${file.reference.PermissionsEx.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${file.reference.junit-4.5.jar}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=-Djline.terminal=jline.UnsupportedTerminal
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test

Essentials/nbproject/project.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>Essentials</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
+            <definitions>../lib/nblibraries.properties</definitions>
+        </libraries>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"/>
+    </configuration>
+</project>

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

@@ -0,0 +1,84 @@
+package com.earth2me.essentials;
+
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.command.CommandSender;
+import org.bukkit.craftbukkit.CraftServer;
+
+public class Backup implements Runnable {
+	private static final Logger logger = Logger.getLogger("Minecraft");
+	private final CraftServer server;
+	private final IEssentials ess;
+	private boolean running = false;
+	private int taskId = -1;
+	private boolean active = false;
+
+	public Backup(IEssentials ess) {
+		this.ess = ess;
+		server = (CraftServer)ess.getServer();
+		if (server.getOnlinePlayers().length > 0) {
+			startTask();
+		}
+	}	
+
+	void onPlayerJoin() {
+		startTask();
+	}
+	
+	private void startTask() {
+		if (!running) {
+			long interval = ess.getSettings().getBackupInterval()*1200; // minutes -> ticks
+			if (interval < 1200) {
+				return;
+			}
+			taskId = ess.scheduleSyncRepeatingTask(this, interval, interval);
+			running = true;
+		}
+	}
+
+	public void run() {
+		if (active) return;
+		active = true;
+		final String command = ess.getSettings().getBackupCommand();
+		if (command == null || "".equals(command)) {
+			return;
+		}
+		logger.log(Level.INFO, Util.i18n("backupStarted"));
+		final CommandSender cs = server.getServer().console;
+		server.dispatchCommand(cs, "save-all");
+		server.dispatchCommand(cs, "save-off");
+		
+		ess.scheduleAsyncDelayedTask(
+			new Runnable() {
+
+			public void run() {
+				try {
+					Process child = Runtime.getRuntime().exec(command);
+					child.waitFor();
+				} catch (InterruptedException ex) {
+					logger.log(Level.SEVERE, null, ex);
+				} catch (IOException ex) {
+					logger.log(Level.SEVERE, null, ex);
+				} finally {
+					ess.scheduleSyncDelayedTask(
+						new Runnable() {
+
+						public void run() {
+							server.dispatchCommand(cs, "save-on");
+							if (server.getOnlinePlayers().length == 0) {
+								running = false;
+								if (taskId != -1) {
+									server.getScheduler().cancelTask(taskId);
+								}
+							}
+							active = false;
+							logger.log(Level.INFO, Util.i18n("backupFinished"));
+						}
+					});
+				}
+			}
+		});
+	}
+
+}

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

@@ -0,0 +1,157 @@
+package com.earth2me.essentials;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import net.minecraft.server.ServerConfigurationManager;
+import org.bukkit.craftbukkit.CraftServer;
+
+
+public class BanWorkaround implements IConf
+{
+	private transient final IEssentials ess;
+	private transient final ServerConfigurationManager scm;
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+	private transient final Set<String> bans = new HashSet<String>();
+	private transient final Set<String> bannedIps = new HashSet<String>();
+
+	public BanWorkaround(final IEssentials ess)
+	{
+		this.ess = ess;
+		this.scm = ((CraftServer)ess.getServer()).getHandle();
+	}
+	
+	public void banByName(final String name)
+	{
+		scm.a(name);
+		reloadConfig();
+	}
+	
+	public void unbanByName(String name)
+	{
+		scm.b(name);
+		reloadConfig();
+	}
+	
+	public void banByIp(final String ip)
+	{
+		scm.c(ip);
+		reloadConfig();
+	}
+	
+	public void unbanByIp(final String ip)
+	{
+		scm.d(ip);
+		reloadConfig();
+	}
+	
+	public boolean isNameBanned(final String name)
+	{
+		return bans.contains(name.toLowerCase());
+	}
+	
+	public boolean isIpBanned(final String ip)
+	{
+		return bannedIps.contains(ip.toLowerCase());
+	}
+	
+	public void reloadConfig()
+	{
+		//I don't like this but it needs to be done until CB fixors
+		final File file = new File(ess.getDataFolder().getParentFile().getParentFile(), "banned-players.txt");
+		try
+		{
+			if (!file.exists())
+			{
+				throw new FileNotFoundException(Util.i18n("bannedPlayersFileNotFound"));
+			}
+
+			final BufferedReader bufferedReader = new BufferedReader(new FileReader(file));
+			try
+			{
+				bans.clear();
+				while (bufferedReader.ready())
+				{
+
+					final String line = bufferedReader.readLine().trim().toLowerCase();
+					if (line.length() > 0 && line.charAt(0) == '#')
+					{
+						continue;
+					}
+					bans.add(line);
+
+				}
+			}
+			catch (IOException io)
+			{
+				LOGGER.log(Level.SEVERE, Util.i18n("bannedPlayersFileError"), io);
+			}
+			finally
+			{
+				try
+				{
+					bufferedReader.close();
+				}
+				catch (IOException ex)
+				{
+					LOGGER.log(Level.SEVERE, Util.i18n("bannedPlayersFileError"), ex);
+				}
+			}
+		}
+		catch (FileNotFoundException ex)
+		{
+			LOGGER.log(Level.SEVERE, Util.i18n("bannedPlayersFileError"), ex);
+		}
+
+		final File ipFile = new File(ess.getDataFolder().getParentFile().getParentFile(), "banned-ips.txt");
+		try
+		{
+			if (!ipFile.exists())
+			{
+				throw new FileNotFoundException(Util.i18n("bannedIpsFileNotFound"));
+			}
+
+			final BufferedReader bufferedReader = new BufferedReader(new FileReader(ipFile));
+			try
+			{
+				bannedIps.clear();
+				while (bufferedReader.ready())
+				{
+
+					final String line = bufferedReader.readLine().trim().toLowerCase();
+					if (line.length() > 0 && line.charAt(0) == '#')
+					{
+						continue;
+					}
+					bannedIps.add(line);
+
+				}
+			}
+			catch (IOException io)
+			{
+				LOGGER.log(Level.SEVERE, Util.i18n("bannedIpsFileError"), io);
+			}
+			finally
+			{
+				try
+				{
+					bufferedReader.close();
+				}
+				catch (IOException ex)
+				{
+					LOGGER.log(Level.SEVERE, Util.i18n("bannedIpsFileError"), ex);
+				}
+			}
+		}
+		catch (FileNotFoundException ex)
+		{
+			LOGGER.log(Level.SEVERE, Util.i18n("bannedIpsFileError"), ex);
+		}
+	}
+}

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

@@ -0,0 +1,51 @@
+package com.earth2me.essentials;
+
+import org.bukkit.entity.Player;
+
+
+public class BukkitPermissionsHandler implements IPermissionsHandler
+{
+	public String getGroup(Player base)
+	{
+		return "default";
+	}
+
+	public boolean canBuild(Player base, String group)
+	{
+		return true;
+	}
+
+	public boolean inGroup(Player base, String group)
+	{
+		return false;
+	}
+
+	public boolean hasPermission(Player base, String node)
+	{
+		if (base.hasPermission("-" + node))
+		{
+			return false;
+		}
+		final String[] parts = node.split("\\.");
+		final StringBuilder sb = new StringBuilder();
+		for (String part : parts)
+		{
+			if (base.hasPermission(sb.toString() + "*"))
+			{
+				return true;
+			}
+			sb.append(part).append(".");
+		}
+		return base.hasPermission(node);
+	}
+
+	public String getPrefix(Player base)
+	{
+		return "";
+	}
+
+	public String getSuffix(Player base)
+	{
+		return "";
+	}
+}

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

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

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

@@ -0,0 +1,46 @@
+package com.earth2me.essentials;
+
+import org.bukkit.entity.Player;
+
+
+public class ConfigPermissionsHandler implements IPermissionsHandler
+{
+	private final transient IEssentials ess;
+
+	public ConfigPermissionsHandler(final IEssentials ess)
+	{
+		this.ess = ess;
+	}
+
+	public String getGroup(final Player base)
+	{
+		return "default";
+	}
+
+	public boolean canBuild(final Player base, final String group)
+	{
+		return true;
+	}
+
+	public boolean inGroup(final Player base, final String group)
+	{
+		return false;
+	}
+
+	public boolean hasPermission(final Player base, final String node)
+	{
+		final String[] cmds = node.split("\\.", 2);
+		return !ess.getSettings().isCommandRestricted(cmds[cmds.length - 1]) 
+				&& ess.getSettings().isPlayerCommand(cmds[cmds.length - 1]);
+	}
+
+	public String getPrefix(final Player base)
+	{
+		return "";
+	}
+
+	public String getSuffix(final Player base)
+	{
+		return "";
+	}
+}

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

@@ -0,0 +1,34 @@
+package com.earth2me.essentials;
+
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.craftbukkit.CraftServer;
+
+public final class Console implements IReplyTo {
+	private static Console instance = new Console();
+	private CommandSender replyTo;
+	public final static String NAME = "Console";
+	
+	private Console() {
+		
+	}
+	
+	public static CommandSender getCommandSender(Server server) throws Exception {
+		if (! (server instanceof CraftServer)) {
+			throw new Exception(Util.i18n("invalidServer"));
+		}
+		return ((CraftServer)server).getServer().console;
+	}
+
+	public void setReplyTo(CommandSender user) {
+		replyTo = user;
+	}
+
+	public CommandSender getReplyTo() {
+		return replyTo;
+	}
+	
+	public static Console getConsoleReplyTo() {
+		return instance;
+	}
+}

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

@@ -0,0 +1,656 @@
+/*
+ * 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 com.earth2me.essentials.api.Economy;
+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.NotEnoughArgumentsException;
+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.math.BigInteger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.bukkit.command.PluginCommand;
+import org.bukkit.craftbukkit.scheduler.CraftScheduler;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event.Priority;
+import org.bukkit.event.Event.Type;
+import org.bukkit.event.server.ServerListener;
+import org.bukkit.plugin.*;
+import org.bukkit.plugin.java.*;
+
+
+public class Essentials extends JavaPlugin implements IEssentials
+{
+	public static final int BUKKIT_VERSION = 1000;
+	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 Warps warps;
+	private transient Worth worth;
+	private transient List<IConf> confList;
+	private transient Backup backup;
+	private transient BanWorkaround bans;
+	private transient ItemDb itemDb;
+	private transient final Map<String, User> users = new HashMap<String, User>();
+	private transient EssentialsUpdateTimer updateTimer;
+	private transient final Methods paymentMethod = new Methods();
+	private transient final static boolean enableErrorLogging = false;
+	private transient final EssentialsErrorHandler errorHandler = new EssentialsErrorHandler();
+	private transient IPermissionsHandler permissionsHandler;
+
+	public ISettings getSettings()
+	{
+		return settings;
+	}
+
+	public void setupForTesting(final Server server) throws IOException, InvalidDescriptionException
+	{
+		final File dataFolder = File.createTempFile("essentialstest", "");
+		if (!dataFolder.delete())
+		{
+			throw new IOException();
+		}
+		if (!dataFolder.mkdir())
+		{
+			throw new IOException();
+		}
+		LOGGER.log(Level.INFO, Util.i18n("usingTempFolderForTesting"));
+		LOGGER.log(Level.INFO, dataFolder.toString());
+		this.initialize(null, server, new PluginDescriptionFile(new FileReader(new File("src" + File.separator + "plugin.yml"))), dataFolder, null, null);
+		settings = new Settings(this);
+		permissionsHandler = new ConfigPermissionsHandler(this);
+		Economy.setEss(this);
+	}
+
+	public void onEnable()
+	{
+		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"));
+		}
+		if (enableErrorLogging)
+		{
+			LOGGER.addHandler(errorHandler);
+		}
+		EssentialsUpgrade upgrade = new EssentialsUpgrade(this.getDescription().getVersion(), this);
+		upgrade.beforeSettings();
+		confList = new ArrayList<IConf>();
+		settings = new Settings(this);
+		confList.add(settings);
+		upgrade.afterSettings();
+		Util.updateLocale(settings.getLocale(), this);
+		spawn = new Spawn(getServer(), this.getDataFolder());
+		confList.add(spawn);
+		warps = new Warps(getServer(), this.getDataFolder());
+		confList.add(warps);
+		worth = new Worth(this.getDataFolder());
+		confList.add(worth);
+		bans = new BanWorkaround(this);
+		confList.add(bans);
+		itemDb = new ItemDb(this);
+		confList.add(itemDb);
+		reload();
+		backup = new Backup(this);
+
+		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()));
+			}
+		}
+		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());
+		if (versionMatch.matches())
+		{
+			final int versionNumber = Integer.parseInt(versionMatch.group(4));
+			if (versionNumber < BUKKIT_VERSION)
+			{
+				LOGGER.log(Level.WARNING, Util.i18n("notRecommendedBukkit"));
+			}
+		}
+		else
+		{
+			LOGGER.log(Level.INFO, Util.i18n("bukkitFormatChanged"));
+		}
+
+		final ServerListener serverListener = new EssentialsPluginListener(this);
+		pm.registerEvent(Type.PLUGIN_ENABLE, serverListener, Priority.Low, this);
+		pm.registerEvent(Type.PLUGIN_DISABLE, serverListener, Priority.Low, this);
+
+		final EssentialsPlayerListener playerListener = new EssentialsPlayerListener(this);
+		pm.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Monitor, this);
+		pm.registerEvent(Type.PLAYER_QUIT, playerListener, Priority.Monitor, this);
+		pm.registerEvent(Type.PLAYER_CHAT, playerListener, Priority.Lowest, this);
+		pm.registerEvent(Type.PLAYER_COMMAND_PREPROCESS, playerListener, Priority.Lowest, this);
+		pm.registerEvent(Type.PLAYER_MOVE, playerListener, Priority.High, this);
+		pm.registerEvent(Type.PLAYER_LOGIN, playerListener, Priority.High, this);
+		pm.registerEvent(Type.PLAYER_TELEPORT, playerListener, Priority.High, this);
+		pm.registerEvent(Type.PLAYER_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);
+
+		final EssentialsBlockListener blockListener = new EssentialsBlockListener(this);
+		pm.registerEvent(Type.BLOCK_PLACE, blockListener, Priority.Lowest, this);
+
+		final SignBlockListener signBlockListener = new SignBlockListener(this);
+		pm.registerEvent(Type.SIGN_CHANGE, signBlockListener, Priority.Highest, this);
+		pm.registerEvent(Type.BLOCK_PLACE, signBlockListener, Priority.Low, this);
+		pm.registerEvent(Type.BLOCK_BREAK, signBlockListener, Priority.Highest, this);
+		pm.registerEvent(Type.BLOCK_IGNITE, signBlockListener, Priority.Low, this);
+		pm.registerEvent(Type.BLOCK_BURN, signBlockListener, Priority.Low, this);
+		pm.registerEvent(Type.BLOCK_PISTON_EXTEND, signBlockListener, Priority.Low, this);
+		pm.registerEvent(Type.BLOCK_PISTON_RETRACT, signBlockListener, Priority.Low, this);
+
+		final SignPlayerListener signPlayerListener = new SignPlayerListener(this);
+		pm.registerEvent(Type.PLAYER_INTERACT, signPlayerListener, Priority.Low, this);
+
+		final SignEntityListener signEntityListener = new SignEntityListener(this);
+		pm.registerEvent(Type.ENTITY_EXPLODE, signEntityListener, Priority.Low, this);
+
+		final EssentialsEntityListener entityListener = new EssentialsEntityListener(this);
+		pm.registerEvent(Type.ENTITY_DAMAGE, entityListener, Priority.Lowest, this);
+		pm.registerEvent(Type.ENTITY_COMBUST, entityListener, Priority.Lowest, this);
+		pm.registerEvent(Type.ENTITY_DEATH, entityListener, Priority.Lowest, this);
+
+		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);
+
+		if (settings.isNetherEnabled() && getServer().getWorlds().size() < 2)
+		{
+			getServer().createWorld(settings.getNetherName(), World.Environment.NETHER);
+		}
+
+		pm.registerEvent(Type.ENTITY_EXPLODE, tntListener, Priority.High, this);
+
+		final EssentialsTimer timer = new EssentialsTimer(this);
+		getScheduler().scheduleSyncRepeatingTask(this, timer, 1, 50);
+		Economy.setEss(this);
+		if (enableErrorLogging)
+		{
+			updateTimer = new EssentialsUpdateTimer(this);
+			getScheduler().scheduleAsyncRepeatingTask(this, updateTimer, 50, 50 * 60 * (this.getDescription().getVersion().startsWith("Dev") ? 60 : 360));
+		}
+		LOGGER.info(Util.format("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), Util.joinList(this.getDescription().getAuthors())));
+	}
+
+	public void onDisable()
+	{
+		Trade.closeLog();
+		LOGGER.removeHandler(errorHandler);
+	}
+
+	public void reload()
+	{
+		Trade.closeLog();
+
+		for (IConf iConf : confList)
+		{
+			iConf.reloadConfig();
+		}
+
+		Util.updateLocale(settings.getLocale(), this);
+
+		for (User user : users.values())
+		{
+			user.reloadConfig();
+		}
+
+		// for motd
+		getConfiguration().load();
+	}
+
+	public String[] getMotd(CommandSender sender, String def)
+	{
+		return getLines(sender, "motd", def);
+	}
+
+	public String[] getLines(CommandSender sender, String node, 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(users.size()));
+
+			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;
+	}
+
+	@Override
+	public boolean onCommand(CommandSender sender, Command command, String commandLabel, String[] args)
+	{
+		return onCommandEssentials(sender, command, commandLabel, args, Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.");
+	}
+
+	public boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath, String permissionPrefix)
+	{
+		// Allow plugins to override the command via onCommand
+		if (!getSettings().isCommandOverridden(command.getName()) && !commandLabel.startsWith("e"))
+		{
+			for (Plugin p : getServer().getPluginManager().getPlugins())
+			{
+				if (p.getDescription().getMain().contains("com.earth2me.essentials"))
+				{
+					continue;
+				}
+
+				PluginDescriptionFile desc = p.getDescription();
+				if (desc == null)
+				{
+					continue;
+				}
+
+				if (desc.getName() == null)
+				{
+					continue;
+				}
+
+				PluginCommand pc = getServer().getPluginCommand(desc.getName() + ":" + commandLabel);
+				if (pc != null)
+				{
+					return pc.execute(sender, commandLabel, args);
+				}
+			}
+		}
+
+		try
+		{
+			User user = null;
+			if (sender instanceof Player)
+			{
+				user = getUser(sender);
+				LOGGER.log(Level.INFO, String.format("[PLAYER_COMMAND] %s: /%s %s ", ((Player)sender).getName(), commandLabel, EssentialsCommand.getFinalArg(args, 0)));
+			}
+
+			// New mail notification
+			if (user != null && !getSettings().isCommandDisabled("mail") && !commandLabel.equals("mail") && user.isAuthorized("essentials.mail"))
+			{
+				final List<String> mail = user.getMails();
+				if (mail != null && !mail.isEmpty())
+				{
+					user.sendMessage(Util.format("youHaveNewMail", mail.size()));
+				}
+			}
+
+			// Check for disabled commands
+			if (getSettings().isCommandDisabled(commandLabel))
+			{
+				return true;
+			}
+
+			IEssentialsCommand cmd;
+			try
+			{
+				cmd = (IEssentialsCommand)classLoader.loadClass(commandPath + command.getName()).newInstance();
+				cmd.setEssentials(this);
+			}
+			catch (Exception ex)
+			{
+				sender.sendMessage(Util.format("commandNotLoaded", commandLabel));
+				LOGGER.log(Level.SEVERE, Util.format("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"));
+				return true;
+			}
+
+			// Run the command
+			try
+			{
+				if (user == null)
+				{
+					cmd.run(getServer(), sender, commandLabel, command, args);
+				}
+				else
+				{
+					cmd.run(getServer(), user, commandLabel, command, args);
+				}
+				return true;
+			}
+			catch (NotEnoughArgumentsException ex)
+			{
+				sender.sendMessage(command.getDescription());
+				sender.sendMessage(command.getUsage().replaceAll("<command>", commandLabel));
+				return true;
+			}
+			catch (Throwable ex)
+			{
+				showError(sender, ex, commandLabel);
+				return true;
+			}
+		}
+		catch (Throwable ex)
+		{
+			LOGGER.log(Level.SEVERE, Util.format("commandFailed", commandLabel), ex);
+			return true;
+		}
+	}
+
+	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);
+		if (getSettings().isDebug())
+		{
+			LOGGER.log(logRecord);
+		}
+		else
+		{
+			if (enableErrorLogging)
+			{
+				errorHandler.publish(logRecord);
+				errorHandler.flush();
+			}
+		}
+	}
+
+	public CraftScheduler getScheduler()
+	{
+		return (CraftScheduler)this.getServer().getScheduler();
+	}
+
+	public Jail getJail()
+	{
+		return jail;
+	}
+
+	public Warps getWarps()
+	{
+		return warps;
+	}
+
+	public Worth getWorth()
+	{
+		return worth;
+	}
+
+	public Backup getBackup()
+	{
+		return backup;
+	}
+
+	public Spawn getSpawn()
+	{
+		return spawn;
+	}
+
+	public User getUser(Object base)
+	{
+		if (base instanceof Player)
+		{
+			return getUser((Player)base);
+		}
+		return null;
+	}
+
+	private <T extends Player> User getUser(T base)
+	{
+		if (base == null)
+		{
+			return null;
+		}
+
+		if (base instanceof User)
+		{
+			return (User)base;
+		}
+
+		if (users.containsKey(base.getName().toLowerCase()))
+		{
+			return users.get(base.getName().toLowerCase()).update(base);
+		}
+
+		User u = new User(base, this);
+		users.put(u.getName().toLowerCase(), u);
+		return u;
+	}
+
+	public Map<String, User> getAllUsers()
+	{
+		return users;
+	}
+
+	public User getOfflineUser(String name)
+	{
+		// Don't create a new offline user, if we already have that user loaded.
+		User u = users.get(name.toLowerCase());
+		if (u != null)
+		{
+			return u;
+		}
+		File userFolder = new File(getDataFolder(), "userdata");
+		File userFile = new File(userFolder, Util.sanitizeFileName(name) + ".yml");
+		if (userFile.exists())
+		{	//Users do not get offline changes saved without being reproccessed as Users! ~ Xeology :)
+			return getUser((Player)new OfflinePlayer(name, this));
+
+		}
+		return null;
+	}
+
+	public World getWorld(final String name)
+	{
+		if (name.matches("[0-9]+"))
+		{
+			final int id = Integer.parseInt(name);
+			if (id < getServer().getWorlds().size())
+			{
+				return getServer().getWorlds().get(id);
+			}
+		}
+		return getServer().getWorld(name);
+	}
+
+	public void addReloadListener(final IConf listener)
+	{
+		confList.add(listener);
+	}
+
+	public Methods getPaymentMethod()
+	{
+		return paymentMethod;
+	}
+
+	public int broadcastMessage(final String name, final String message)
+	{
+		Player[] players = getServer().getOnlinePlayers();
+
+		for (Player player : players)
+		{
+			User u = getUser(player);
+			if (!u.isIgnoredPlayer(name))
+			{
+				player.sendMessage(message);
+			}
+		}
+
+		return players.length;
+	}
+
+	public Map<BigInteger, String> getErrors()
+	{
+		return errorHandler.getErrors();
+	}
+
+	public int scheduleAsyncDelayedTask(final Runnable run)
+	{
+		return this.getScheduler().scheduleAsyncDelayedTask(this, run);
+	}
+
+	public int scheduleSyncDelayedTask(final Runnable run)
+	{
+		return this.getScheduler().scheduleSyncDelayedTask(this, run);
+	}
+
+	public int scheduleSyncDelayedTask(final Runnable run, final long delay)
+	{
+		return this.getScheduler().scheduleSyncDelayedTask(this, run, delay);
+	}
+
+	public int scheduleSyncRepeatingTask(final Runnable run, final long delay, final long period)
+	{
+		return this.getScheduler().scheduleSyncRepeatingTask(this, run, delay, period);
+	}
+
+	public TNTExplodeListener getTNTListener()
+	{
+		return tntListener;
+	}
+
+	public IPermissionsHandler getPermissionsHandler()
+	{
+		return permissionsHandler;
+	}
+	
+	public void setPermissionsHandler(IPermissionsHandler handler)
+	{
+		this.permissionsHandler = handler;
+	}
+
+	public BanWorkaround getBans()
+	{
+		return bans;
+	}
+
+	public ItemDb getItemDb()
+	{
+		return itemDb;
+	}
+}

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

@@ -0,0 +1,109 @@
+package com.earth2me.essentials;
+
+import java.util.logging.Logger;
+import org.bukkit.Material;
+import org.bukkit.event.block.BlockListener;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.inventory.ItemStack;
+
+
+public class EssentialsBlockListener extends BlockListener
+{
+	private final IEssentials ess;
+	private static final Logger logger = Logger.getLogger("Minecraft");
+
+	public EssentialsBlockListener(IEssentials ess)
+	{
+		this.ess = ess;
+	}
+
+	@Override
+	public void onBlockPlace(BlockPlaceEvent event)
+	{
+		if (event.isCancelled())
+		{
+			return;
+		}
+		final User user = ess.getUser(event.getPlayer());
+		// Do not rely on getItemInHand();
+		// http://leaky.bukkit.org/issues/663
+		final ItemStack is = new ItemStack(event.getBlockPlaced().getType(), 1, (short)0, event.getBlockPlaced().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:
+			is.setDurability((short)0);
+			break;
+		case FIRE:
+			return;
+		}
+		boolean unlimitedForUser = user.hasUnlimited(is);
+		if (unlimitedForUser)
+		{
+			ess.scheduleSyncDelayedTask(
+					new Runnable()
+					{
+						public void run()
+						{
+							user.getInventory().addItem(is);
+							user.updateInventory();
+						}
+					});
+		}
+	}
+}

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

@@ -0,0 +1,239 @@
+package com.earth2me.essentials;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.util.config.Configuration;
+
+
+public class EssentialsConf extends Configuration
+{
+	private static final Logger logger = Logger.getLogger("Minecraft");
+	private File configFile;
+	private String templateName = null;
+	private Class<?> resourceClass = EssentialsConf.class;
+
+	public EssentialsConf(File configFile)
+	{
+		super(configFile);
+		this.configFile = configFile;
+		if (this.root == null)
+		{
+			this.root = new HashMap<String, Object>();
+		}
+	}
+
+	@Override
+	public void load()
+	{
+		configFile = configFile.getAbsoluteFile();
+		if (!configFile.getParentFile().exists())
+		{
+			if (!configFile.getParentFile().mkdirs())
+			{
+				logger.log(Level.SEVERE, Util.format("failedToCreateConfig", configFile.toString()));
+			}
+		}
+		if (!configFile.exists())
+		{
+			if (templateName != null)
+			{
+				logger.log(Level.INFO, Util.format("creatingConfigFromTemplate", configFile.toString()));
+				createFromTemplate();
+			}
+			else
+			{
+				try
+				{
+					logger.log(Level.INFO, Util.format("creatingEmptyConfig", configFile.toString()));
+					if (!configFile.createNewFile())
+					{
+						logger.log(Level.SEVERE, Util.format("failedToCreateConfig", configFile.toString()));
+					}
+				}
+				catch (IOException ex)
+				{
+					logger.log(Level.SEVERE, Util.format("failedToCreateConfig", configFile.toString()), ex);
+				}
+			}
+		}
+		super.load();
+		if (this.root == null)
+		{
+			this.root = new HashMap<String, Object>();
+		}
+	}
+
+	private void createFromTemplate()
+	{
+		InputStream istr = null;
+		OutputStream ostr = null;
+		try
+		{
+			istr = resourceClass.getResourceAsStream(templateName);
+			if (istr == null)
+			{
+				logger.log(Level.SEVERE, Util.format("couldNotFindTemplate", templateName));
+				return;
+			}
+			ostr = new FileOutputStream(configFile);
+			byte[] buffer = new byte[1024];
+			int length = 0;
+			length = istr.read(buffer);
+			while (length > 0)
+			{
+				ostr.write(buffer, 0, length);
+				length = istr.read(buffer);
+			}
+		}
+		catch (IOException ex)
+		{
+			logger.log(Level.SEVERE, Util.format("failedToWriteConfig", configFile.toString()), ex);
+			return;
+		}
+		finally
+		{
+			try
+			{
+				if (istr != null)
+				{
+					istr.close();
+				}
+			}
+			catch (IOException ex)
+			{
+				Logger.getLogger(EssentialsConf.class.getName()).log(Level.SEVERE, null, ex);
+			}
+			try
+			{
+				if (ostr != null)
+				{
+					ostr.close();
+				}
+			}
+			catch (IOException ex)
+			{
+				logger.log(Level.SEVERE, Util.format("failedToCloseConfig", configFile.toString()), ex);
+			}
+		}
+	}
+
+	public void setTemplateName(String templateName)
+	{
+		this.templateName = templateName;
+	}
+
+	public File getFile()
+	{
+		return configFile;
+	}
+
+	public void setTemplateName(String templateName, Class<?> resClass)
+	{
+		this.templateName = templateName;
+		this.resourceClass = resClass;
+	}
+
+	public boolean hasProperty(String path)
+	{
+		return getProperty(path) != null;
+	}
+
+	public Location getLocation(String path, Server server)
+	{
+		String worldName = getString((path != null ? path + "." : "") + "world");
+		if (worldName == null || worldName.isEmpty())
+		{
+			return null;
+		}
+		World world = server.getWorld(worldName);
+		if (world == null)
+		{
+			return null;
+		}
+		return new Location(world,
+							getDouble((path != null ? path + "." : "") + "x", 0),
+							getDouble((path != null ? path + "." : "") + "y", 0),
+							getDouble((path != null ? path + "." : "") + "z", 0),
+							(float)getDouble((path != null ? path + "." : "") + "yaw", 0),
+							(float)getDouble((path != null ? path + "." : "") + "pitch", 0));
+	}
+
+	public void setProperty(String path, Location loc)
+	{
+		setProperty((path != null ? path + "." : "") + "world", loc.getWorld().getName());
+		setProperty((path != null ? path + "." : "") + "x", loc.getX());
+		setProperty((path != null ? path + "." : "") + "y", loc.getY());
+		setProperty((path != null ? path + "." : "") + "z", loc.getZ());
+		setProperty((path != null ? path + "." : "") + "yaw", loc.getYaw());
+		setProperty((path != null ? path + "." : "") + "pitch", loc.getPitch());
+	}
+
+	public ItemStack getItemStack(String path)
+	{
+		return new ItemStack(
+				Material.valueOf(getString(path + ".type", "AIR")),
+				getInt(path + ".amount", 1),
+				(short)getInt(path + ".damage", 0)/*,
+				(byte)getInt(path + ".data", 0)*/);
+	}
+
+	public void setProperty(String path, ItemStack stack)
+	{
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("type", stack.getType().toString());
+		map.put("amount", stack.getAmount());
+		map.put("damage", stack.getDurability());
+		// getData().getData() is broken
+		//map.put("data", stack.getDurability());
+		setProperty(path, map);
+	}
+
+	public long getLong(String path, long def)
+	{
+		Number num;
+		try
+		{
+			num = (Number)getProperty(path);
+		}
+		catch(ClassCastException ex)
+		{
+			return def;
+		}
+		if (num == null)
+		{
+			return def;
+		}
+		return num.longValue();
+	}
+
+	@Override
+	public double getDouble(String path, double def)
+	{
+		Number num;
+		try
+		{
+			num = (Number)getProperty(path);
+		}
+		catch(ClassCastException ex)
+		{
+			return def;
+		}
+		if (num == null)
+		{
+			return def;
+		}
+		return num.doubleValue();
+	}
+}

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

@@ -0,0 +1,82 @@
+package com.earth2me.essentials;
+
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityCombustEvent;
+import org.bukkit.event.entity.EntityDamageByBlockEvent;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageByProjectileEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityDeathEvent;
+import org.bukkit.event.entity.EntityListener;
+import org.bukkit.inventory.ItemStack;
+
+
+public class EssentialsEntityListener extends EntityListener
+{
+	private final IEssentials ess;
+
+	public EssentialsEntityListener(IEssentials ess)
+	{
+		this.ess = ess;
+	}
+
+	@Override
+	public void onEntityDamage(EntityDamageEvent event)
+	{
+		if (event instanceof EntityDamageByEntityEvent)
+		{
+			EntityDamageByEntityEvent edEvent = (EntityDamageByEntityEvent)event;
+			Entity eAttack = edEvent.getDamager();
+			Entity eDefend = edEvent.getEntity();
+			if (eDefend instanceof Player && eAttack instanceof Player)
+			{
+				User defender = ess.getUser(eDefend);
+				User attacker = ess.getUser(eAttack);
+				ItemStack is = attacker.getItemInHand();
+				String command = attacker.getPowertool(is);
+				if (command != null && !command.isEmpty())
+				{
+					attacker.getServer().dispatchCommand(attacker, command.replaceAll("\\{player\\}", defender.getName()));
+					event.setCancelled(true);
+					return;
+				}
+			}
+		}
+		if (event instanceof EntityDamageEvent || event instanceof EntityDamageByBlockEvent || event instanceof EntityDamageByProjectileEvent)
+		{
+
+			if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
+			{
+				CraftPlayer player = (CraftPlayer)event.getEntity();
+				player.getHandle().fireTicks = 0;
+				player.setRemainingAir(player.getMaximumAir());
+				event.setCancelled(true);
+			}
+		}
+	}
+
+	@Override
+	public void onEntityCombust(EntityCombustEvent event)
+	{
+		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
+		{
+			event.setCancelled(true);
+		}
+	}
+
+	@Override
+	public void onEntityDeath(EntityDeathEvent event)
+	{
+		if (event.getEntity() instanceof Player)
+		{
+			User user = ess.getUser(event.getEntity());
+			if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back"))
+			{
+				user.setLastLocation();
+				user.sendMessage(Util.i18n("backAfterDeath"));
+			}
+		}
+	}
+}

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

@@ -0,0 +1,128 @@
+package com.earth2me.essentials;
+
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+
+class EssentialsErrorHandler extends Handler
+{
+	private final Map<BigInteger, String> errors = new HashMap<BigInteger, String>();
+	private final List<LogRecord> records = new LinkedList<LogRecord>();
+
+	public EssentialsErrorHandler()
+	{
+	}
+
+	@Override
+	public void publish(LogRecord lr)
+	{
+		if (lr.getThrown() == null || lr.getLevel().intValue() < Level.WARNING.intValue())
+		{
+			return;
+		}
+		synchronized (records)
+		{
+			records.add(lr);
+		}
+	}
+
+	@Override
+	public void flush()
+	{
+		synchronized (records)
+		{
+			sortRecords();
+		}
+	}
+
+	@Override
+	public void close() throws SecurityException
+	{
+		synchronized (records)
+		{
+			sortRecords();
+		}
+	}
+
+	private void sortRecords()
+	{
+		for (LogRecord lr : records)
+		{
+			try
+			{
+				if (lr.getThrown() == null)
+				{
+					return;
+				}
+				Throwable tr = lr.getThrown();
+				StackTraceElement[] elements = tr.getStackTrace();
+				if (elements == null || elements.length <= 0)
+				{
+					return;
+				}
+				boolean essentialsFound = false;
+				for (StackTraceElement stackTraceElement : elements)
+				{
+					if (stackTraceElement.getClassName().contains("com.earth2me.essentials"))
+					{
+						essentialsFound = true;
+						break;
+					}
+				}
+				if (!essentialsFound && tr.getCause() != null)
+				{
+					Throwable cause = tr.getCause();
+					StackTraceElement[] elements2 = cause.getStackTrace();
+					if (elements2 != null)
+					{
+						for (StackTraceElement stackTraceElement : elements2)
+						{
+							if (stackTraceElement.getClassName().contains("com.earth2me.essentials"))
+							{
+								essentialsFound = true;
+								break;
+							}
+						}
+					}
+				}
+				StringBuilder sb = new StringBuilder();
+				sb.append("[").append(lr.getLevel().getName()).append("] ").append(lr.getMessage()).append("\n");
+				sb.append(tr.getMessage()).append("\n");
+				for (StackTraceElement stackTraceElement : tr.getStackTrace())
+				{
+					sb.append(stackTraceElement.toString()).append("\n");
+				}
+				if (tr.getCause() != null && tr.getCause().getStackTrace() != null)
+				{
+					sb.append(tr.getCause().getMessage()).append("\n");
+					for (StackTraceElement stackTraceElement : tr.getCause().getStackTrace())
+					{
+						sb.append(stackTraceElement.toString()).append("\n");
+					}
+				}
+				String errorReport = sb.toString();
+				byte[] bytesOfMessage = errorReport.getBytes("UTF-8");
+				MessageDigest md = MessageDigest.getInstance("MD5");
+				BigInteger bi = new BigInteger(md.digest(bytesOfMessage));
+				errors.put(bi, errorReport);
+			}
+			catch (Throwable t)
+			{
+				//Ignore all exceptions inside the exception handler
+			}
+		}
+		records.clear();
+	}
+
+	Map<BigInteger, String> getErrors()
+	{
+		return errors;
+	}
+}

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

@@ -0,0 +1,476 @@
+package com.earth2me.essentials;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+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.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.PlayerTeleportEvent;
+import org.bukkit.inventory.ItemStack;
+
+
+public class EssentialsPlayerListener extends PlayerListener
+{
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+	private final transient Server server;
+	private final transient IEssentials ess;
+
+	public EssentialsPlayerListener(final IEssentials parent)
+	{
+		this.ess = parent;
+		this.server = parent.getServer();
+	}
+
+	@Override
+	public void onPlayerRespawn(final PlayerRespawnEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		user.setDisplayName(user.getNick());
+		updateCompass(user);
+		if (ess.getSettings().changeDisplayName())
+		{
+			user.setDisplayName(user.getNick());
+		}
+	}
+
+	@Override
+	public void onPlayerChat(final PlayerChatEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		if (user.isMuted())
+		{
+			event.setCancelled(true);
+			user.sendMessage(Util.i18n("playerMuted"));
+			LOGGER.info(Util.format("mutedUserSpeaks", user.getName()));
+		}
+		final Iterator<Player> it = event.getRecipients().iterator();
+		while (it.hasNext())
+		{
+			final User u = ess.getUser(it.next());
+			if (u.isIgnoredPlayer(user.getName()))
+			{
+				it.remove();
+			}
+		}
+		if (user.isAfk())
+		{
+			user.setAfk(false);
+			ess.broadcastMessage(user.getName(), Util.format("userIsNotAway", user.getDisplayName()));
+		}
+		if (ess.getSettings().changeDisplayName())
+		{
+			user.setDisplayName(user.getNick());
+		}
+	}
+
+	@Override
+	public void onPlayerMove(final PlayerMoveEvent event)
+	{
+		if (event.isCancelled())
+		{
+			return;
+		}
+		final User user = ess.getUser(event.getPlayer());
+
+		if (user.isAfk())
+		{
+			user.setAfk(false);
+			ess.broadcastMessage(user.getName(), Util.format("userIsNotAway", user.getDisplayName()));
+		}
+
+		if (!ess.getSettings().getNetherPortalsEnabled())
+		{
+			return;
+		}
+
+		final Block block = event.getPlayer().getWorld().getBlockAt(event.getTo().getBlockX(), event.getTo().getBlockY(), event.getTo().getBlockZ());
+		final List<World> worlds = server.getWorlds();
+
+		if (block.getType() == Material.PORTAL && worlds.size() > 1 && user.isAuthorized("essentials.portal"))
+		{
+			if (user.getJustPortaled())
+			{
+				return;
+			}
+
+			World nether = server.getWorld(ess.getSettings().getNetherName());
+			if (nether == null)
+			{
+				for (World world : worlds)
+				{
+					if (world.getEnvironment() == World.Environment.NETHER)
+					{
+						nether = world;
+						break;
+					}
+				}
+				if (nether == null)
+				{
+					return;
+				}
+			}
+			final World world = user.getWorld() == nether ? worlds.get(0) : nether;
+
+			double factor;
+			if (user.getWorld().getEnvironment() == World.Environment.NETHER && world.getEnvironment() == World.Environment.NORMAL)
+			{
+				factor = ess.getSettings().getNetherRatio();
+			}
+			else if (user.getWorld().getEnvironment() == World.Environment.NORMAL && world.getEnvironment() == World.Environment.NETHER)
+			{
+				factor = 1.0 / ess.getSettings().getNetherRatio();
+			}
+			else
+			{
+				factor = 1.0;
+			}
+
+			Location loc = event.getTo();
+			int x = loc.getBlockX();
+			int y = loc.getBlockY();
+			int z = loc.getBlockZ();
+
+			if (user.getWorld().getBlockAt(x, y, z - 1).getType() == Material.PORTAL)
+			{
+				z--;
+			}
+			if (user.getWorld().getBlockAt(x - 1, y, z).getType() == Material.PORTAL)
+			{
+				x--;
+			}
+
+			x = (int)(x * factor);
+			z = (int)(z * factor);
+			loc = new Location(world, x + .5, y, z + .5);
+
+			Block dest = world.getBlockAt(x, y, z);
+			NetherPortal portal = NetherPortal.findPortal(dest);
+			if (portal == null)
+			{
+				if (world.getEnvironment() == World.Environment.NETHER || ess.getSettings().getGenerateExitPortals())
+				{
+					portal = NetherPortal.createPortal(dest);
+					LOGGER.info(Util.format("userCreatedPortal", event.getPlayer().getName()));
+					user.sendMessage(Util.i18n("generatingPortal"));
+					loc = portal.getSpawn();
+				}
+			}
+			else
+			{
+				LOGGER.info(Util.format("userUsedPortal", event.getPlayer().getName()));
+				user.sendMessage(Util.i18n("usingPortal"));
+				loc = portal.getSpawn();
+			}
+
+			event.setFrom(loc);
+			event.setTo(loc);
+			try
+			{
+				user.getTeleport().now(loc, new Trade("portal", ess));
+			}
+			catch (Exception ex)
+			{
+				user.sendMessage(ex.getMessage());
+			}
+			user.setJustPortaled(true);
+			user.sendMessage(Util.i18n("teleportingPortal"));
+
+			event.setCancelled(true);
+			return;
+		}
+
+		user.setJustPortaled(false);
+	}
+
+	@Override
+	public void onPlayerQuit(final PlayerQuitEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		if (ess.getSettings().removeGodOnDisconnect() && user.isGodModeEnabled())
+		{
+			user.toggleGodModeEnabled();
+		}
+		if (user.getSavedInventory() != null)
+		{
+			user.getInventory().setContents(user.getSavedInventory());
+			user.setSavedInventory(null);
+		}
+		user.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
+	public void onPlayerJoin(final PlayerJoinEvent event)
+	{
+		ess.getBackup().onPlayerJoin();
+		final User user = ess.getUser(event.getPlayer());
+
+		//we do not know the ip address on playerlogin so we need to do this here.
+		if (user.isIpBanned())
+		{
+			final String banReason = user.getBanReason();
+			user.kickPlayer(banReason != null && !banReason.isEmpty() ? banReason : Util.i18n("defaultBanReason"));
+			return;
+		}
+
+		if (ess.getSettings().changeDisplayName())
+		{
+			user.setDisplayName(user.getNick());
+		}
+		user.setAfk(false);
+		if (user.isAuthorized("essentials.sleepingignored"))
+		{
+			user.setSleepingIgnored(true);
+		}
+
+		if (!ess.getSettings().isCommandDisabled("motd") && user.isAuthorized("essentials.motd"))
+		{
+			for (String m : ess.getMotd(user, null))
+			{
+				if (m == null)
+				{
+					continue;
+				}
+				user.sendMessage(m);
+			}
+		}
+
+		if (!ess.getSettings().isCommandDisabled("mail") && user.isAuthorized("essentials.mail"))
+		{
+			final List<String> mail = user.getMails();
+			if (mail.isEmpty())
+			{
+				user.sendMessage(Util.i18n("noNewMail"));
+			}
+			else
+			{
+				user.sendMessage(Util.format("youHaveNewMail", mail.size()));
+			}
+		}
+	}
+
+	@Override
+	public void onPlayerLogin(final PlayerLoginEvent event)
+	{
+		if (event.getResult() != Result.ALLOWED)
+		{
+			return;
+		}
+		final User user = ess.getUser(event.getPlayer());
+		user.setNPC(false);
+
+		if (user.isBanned())
+		{
+			final String banReason = user.getBanReason();
+			event.disallow(Result.KICK_BANNED, banReason != null && !banReason.isEmpty() ? banReason : Util.i18n("defaultBanReason"));
+			return;
+		}
+
+		if (server.getOnlinePlayers().length >= server.getMaxPlayers() && !user.isAuthorized("essentials.joinfullserver"))
+		{
+			event.disallow(Result.KICK_FULL, Util.i18n("serverFull"));
+			return;
+		}
+
+		user.setLastLogin(System.currentTimeMillis());
+		updateCompass(user);
+	}
+
+	private void updateCompass(final User user)
+	{
+		try
+		{
+			user.setCompassTarget(user.getHome(user.getLocation()));
+		}
+		catch (Exception ex)
+		{
+		}
+	}
+
+	@Override
+	public void onPlayerTeleport(PlayerTeleportEvent event)
+	{
+		if (event.isCancelled())
+		{
+			return;
+		}
+		final User user = ess.getUser(event.getPlayer());
+		if (ess.getSettings().changeDisplayName())
+		{
+			user.setDisplayName(user.getNick());
+		}
+		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)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		final ItemStack is = new ItemStack(Material.EGG, 1);
+		if (user.hasUnlimited(is))
+		{
+			user.getInventory().addItem(is);
+			user.updateInventory();
+		}
+	}
+
+	@Override
+	public void onPlayerBucketEmpty(final PlayerBucketEmptyEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		if (user.hasUnlimited(new ItemStack(event.getBucket())))
+		{
+			event.getItemStack().setType(event.getBucket());
+			ess.scheduleSyncDelayedTask(new Runnable()
+			{
+				public void run()
+				{
+					user.updateInventory();
+				}
+			});
+		}
+	}
+
+	@Override
+	public void onPlayerAnimation(final PlayerAnimationEvent event)
+	{
+		usePowertools(event);
+	}
+
+	private void usePowertools(final PlayerAnimationEvent event)
+	{
+		if (event.getAnimationType() != PlayerAnimationType.ARM_SWING)
+		{
+			return;
+		}
+		final User user = ess.getUser(event.getPlayer());
+		final ItemStack is = user.getItemInHand();
+		if (is == null || is.getType() == Material.AIR)
+		{
+			return;
+		}
+		final String command = user.getPowertool(is);
+		if (command == null || command.isEmpty())
+		{
+			return;
+		}
+		if (command.matches(".*\\{player\\}.*"))
+		{
+			//user.sendMessage("Click a player to use this command");
+			return;
+		}
+		if (command.startsWith("c:"))
+		{
+			for (Player p : server.getOnlinePlayers())
+			{
+				p.sendMessage(user.getDisplayName() + ":" + command.substring(2));
+			}
+		}
+		else
+		{
+			user.getServer().dispatchCommand(user, command);
+		}
+	}
+
+	@Override
+	public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event)
+	{
+		if (event.isCancelled())
+		{
+			return;
+		}
+		final User user = ess.getUser(event.getPlayer());
+		final String cmd = event.getMessage().toLowerCase().split(" ")[0].replace("/", "").toLowerCase();
+		final List<String> commands = Arrays.asList("msg", "r", "mail", "m", "t", "emsg", "tell", "er", "reply", "ereply", "email");
+		if (commands.contains(cmd))
+		{
+			for (Player player : ess.getServer().getOnlinePlayers())
+			{
+				if (ess.getUser(player).isSocialSpyEnabled())
+				{
+					player.sendMessage(user.getDisplayName() + " : " + event.getMessage());
+				}
+			}
+		}
+		if (user.isAfk())
+		{
+			user.setAfk(false);
+			ess.broadcastMessage(user.getName(), Util.format("userIsNotAway", user.getDisplayName()));
+		}
+	}
+}

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

@@ -0,0 +1,81 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.register.payment.Methods;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.event.server.PluginDisableEvent;
+import org.bukkit.event.server.PluginEnableEvent;
+import org.bukkit.event.server.ServerListener;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginManager;
+
+
+public class EssentialsPluginListener extends ServerListener
+{
+	private final transient IEssentials ess;
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+
+	public EssentialsPluginListener(final IEssentials ess)
+	{
+		this.ess = ess;
+	}
+
+	@Override
+	public void onPluginEnable(final PluginEnableEvent event)
+	{
+		checkPermissions();
+		if (!ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().setMethod(event.getPlugin()))
+		{
+			LOGGER.log(Level.INFO, "[Essentials] Payment method found (" + ess.getPaymentMethod().getMethod().getName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
+
+		}
+	}
+
+	@Override
+	public void onPluginDisable(PluginDisableEvent event)
+	{
+		checkPermissions();
+		// 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()))
+		{
+			LOGGER.log(Level.INFO, "[Essentials] Payment method was disabled. No longer accepting payments.");
+		}
+	}
+	
+	private void checkPermissions()
+	{
+		final PluginManager pm = ess.getServer().getPluginManager();
+		final Plugin permissionsExPlugin = pm.getPlugin("PermissionsEx");
+
+		if (permissionsExPlugin == null || !permissionsExPlugin.isEnabled())
+		{
+			final Plugin permissionsPlugin = pm.getPlugin("Permissions");
+			if (permissionsPlugin == null || !permissionsPlugin.isEnabled())
+			{
+				if (ess.getSettings().useBukkitPermissions())
+				{
+					ess.setPermissionsHandler(new BukkitPermissionsHandler());
+				}
+				else
+				{
+					ess.setPermissionsHandler(new ConfigPermissionsHandler(ess));
+				}
+			}
+			else
+			{
+				if (permissionsPlugin.getDescription().getVersion().charAt(0) == '3')
+				{
+					ess.setPermissionsHandler(new Permissions3Handler(permissionsPlugin));
+				}
+				else
+				{
+					ess.setPermissionsHandler(new Permissions2Handler(permissionsPlugin));
+				}
+			}
+		}
+		else
+		{
+			ess.setPermissionsHandler(new PermissionsExHandler());
+		}
+	}
+}

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

@@ -0,0 +1,79 @@
+package com.earth2me.essentials;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+import org.bukkit.entity.Player;
+
+
+public class EssentialsTimer implements Runnable, IConf
+{
+	private final IEssentials ess;
+	private final Set<User> allUsers = new HashSet<User>(); 
+	
+	EssentialsTimer(IEssentials ess)
+	{
+		this.ess = ess;
+		File userdir = new File(ess.getDataFolder(), "userdata");
+		if (!userdir.exists()) {
+			return;
+		}
+		for (String string : userdir.list())
+		{
+			if (!string.endsWith(".yml")) {
+				continue;
+			}
+			String name = string.substring(0, string.length()-4);
+			User u = ess.getUser(new OfflinePlayer(name, ess));
+			allUsers.add(u);
+		}
+	}
+
+	public void run()
+	{
+		long currentTime = System.currentTimeMillis();
+		for (Player player : ess.getServer().getOnlinePlayers())
+		{
+			User u = ess.getUser(player);
+			allUsers.add(u);
+			u.setLastActivity(currentTime);
+		}
+		
+		for (User user: allUsers) {
+			if (user.getBanTimeout() > 0 && user.getBanTimeout() < currentTime) {
+				user.setBanTimeout(0);
+				ess.getBans().unbanByName(user.getName());
+			}
+			if (user.getMuteTimeout() > 0 && user.getMuteTimeout() < currentTime && user.isMuted()) {
+				user.setMuteTimeout(0);
+				user.sendMessage(Util.i18n("canTalkAgain"));
+				user.setMuted(false);
+			}
+			if (user.getJailTimeout() > 0 && user.getJailTimeout() < currentTime && user.isJailed()) {
+				user.setJailTimeout(0);
+				user.setJailed(false);
+				user.sendMessage(Util.i18n("haveBeenReleased"));
+				user.setJail(null);
+				try
+				{
+					user.getTeleport().back();
+				}
+				catch (Exception ex)
+				{
+				}
+			}
+			
+			if (user.getLastActivity() < currentTime && user.getLastActivity() > user.getLastLogout()) {
+				user.setLastLogout(user.getLastActivity());
+			}
+		}
+	}
+
+	public void reloadConfig()
+	{
+		for (User user : allUsers)
+		{
+			user.reloadConfig();
+		}
+	}
+}

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

@@ -0,0 +1,68 @@
+package com.earth2me.essentials;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.math.BigInteger;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+class EssentialsUpdateTimer implements Runnable
+{
+	private URL url;
+	private final Essentials ess;
+	private static final Logger logger = Logger.getLogger("Minecraft");
+	
+	public EssentialsUpdateTimer(Essentials ess)
+	{
+		this.ess = ess;
+		try
+		{
+			url = new URL("http://127.0.0.1:8080/check");
+		}
+		catch (MalformedURLException ex)
+		{
+			logger.log(Level.SEVERE, "Invalid url!", ex);
+		}
+	}
+
+	public void run()
+	{
+		try
+		{
+			StringBuilder sb = new StringBuilder();
+			sb.append("v=").append(URLEncoder.encode(ess.getDescription().getVersion(),"UTF-8"));
+			sb.append("&b=").append(URLEncoder.encode(ess.getServer().getVersion(),"UTF-8"));
+			sb.append("&jv=").append(URLEncoder.encode(System.getProperty("java.version"),"UTF-8"));
+			sb.append("&l=").append(URLEncoder.encode(Util.getCurrentLocale().toString(),"UTF-8"));
+			sb.append("&on=").append(URLEncoder.encode(System.getProperty("os.name"),"UTF-8"));
+			sb.append("&ov=").append(URLEncoder.encode(System.getProperty("os.version"),"UTF-8"));
+			for (BigInteger bigInteger : ess.getErrors().keySet())
+			{
+				sb.append("&e[]=").append(bigInteger.toString(36));
+			}
+			URLConnection conn = url.openConnection();
+			conn.setConnectTimeout(10000);
+			conn.setDoOutput(true);
+			conn.connect();
+			OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
+			wr.write(sb.toString());
+			wr.flush();
+			BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+			String ret = br.readLine();
+			wr.close();
+			br.close();
+			logger.log(Level.INFO, ret);
+		}
+		catch (IOException ex)
+		{
+			logger.log(Level.SEVERE, "Failed to open connection", ex);
+		}
+	}	
+}

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

@@ -0,0 +1,420 @@
+package com.earth2me.essentials;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.inventory.ItemStack;
+
+
+public class EssentialsUpgrade
+{
+	private static boolean alreadyRun = false;
+	private final static Logger logger = Logger.getLogger("Minecraft");
+	private final IEssentials ess;
+
+	EssentialsUpgrade(String version, IEssentials essentials)
+	{
+		ess = essentials;
+		if (alreadyRun)
+		{
+			return;
+		}
+		alreadyRun = true;
+	}
+
+	private void moveWorthValuesToWorthYml()
+	{
+		try
+		{
+			File configFile = new File(ess.getDataFolder(), "config.yml");
+			if (!configFile.exists())
+			{
+				return;
+			}
+			EssentialsConf conf = new EssentialsConf(configFile);
+			conf.load();
+			Worth w = new Worth(ess.getDataFolder());
+			boolean found = false;
+			for (Material mat : Material.values())
+			{
+				int id = mat.getId();
+				double value = conf.getDouble("worth-" + id, Double.NaN);
+				if (!Double.isNaN(value))
+				{
+					found = true;
+					w.setPrice(new ItemStack(mat, 1, (short)0, (byte)0), value);
+				}
+			}
+			if (found)
+			{
+				removeLinesFromConfig(configFile, "\\s*#?\\s*worth-[0-9]+.*", "# Worth values have been moved to worth.yml");
+			}
+		}
+		catch (Throwable e)
+		{
+			logger.log(Level.SEVERE, Util.i18n("upgradingFilesError"), e);
+		}
+	}
+
+	private void removeLinesFromConfig(File file, String regex, String info) throws Exception
+	{
+		boolean needUpdate = false;
+		BufferedReader br = new BufferedReader(new FileReader(file));
+		File tempFile = File.createTempFile("essentialsupgrade", ".tmp.yml", ess.getDataFolder());
+		BufferedWriter bw = new BufferedWriter(new FileWriter(tempFile));
+		do
+		{
+			String line = br.readLine();
+			if (line == null)
+			{
+				break;
+			}
+			if (line.matches(regex))
+			{
+				if (!needUpdate && info != null)
+				{
+					bw.write(info, 0, info.length());
+					bw.newLine();
+				}
+				needUpdate = true;
+			}
+			else
+			{
+				if (line.endsWith("\r\n"))
+				{
+					bw.write(line, 0, line.length() - 2);
+				}
+				else if (line.endsWith("\r") || line.endsWith("\n"))
+				{
+					bw.write(line, 0, line.length() - 1);
+				}
+				else
+				{
+					bw.write(line, 0, line.length());
+				}
+				bw.newLine();
+			}
+		}
+		while (true);
+		br.close();
+		bw.close();
+		if (needUpdate)
+		{
+			if (!file.renameTo(new File(file.getParentFile(), file.getName().concat("." + System.currentTimeMillis() + ".upgradebackup"))))
+			{
+				throw new Exception(Util.i18n("configFileMoveError"));
+			}
+			if (!tempFile.renameTo(file))
+			{
+				throw new Exception(Util.i18n("configFileRenameError"));
+			}
+		} else {
+			tempFile.delete();
+		}
+	}
+
+	private void updateUsersToNewDefaultHome()
+	{
+		File userdataFolder = new File(ess.getDataFolder(), "userdata");
+		if (!userdataFolder.exists() || !userdataFolder.isDirectory())
+		{
+			return;
+		}
+		File[] userFiles = userdataFolder.listFiles();
+
+		for (File file : userFiles)
+		{
+			if (!file.isFile() || !file.getName().endsWith(".yml"))
+			{
+				continue;
+			}
+			EssentialsConf config = new EssentialsConf(file);
+			try
+			{
+				config.load();
+				if (config.hasProperty("home") && !config.hasProperty("home.default"))
+				{
+					@SuppressWarnings("unchecked")
+					List<Object> vals = (List<Object>)config.getProperty("home");
+					if (vals == null) {
+						continue;
+					}
+					World world = ess.getServer().getWorlds().get(0);
+					if (vals.size() > 5)
+					{
+						world = ess.getServer().getWorld((String)vals.get(5));
+					}
+					if (world != null)
+					{
+						Location loc = new Location(
+								world,
+								((Number)vals.get(0)).doubleValue(),
+								((Number)vals.get(1)).doubleValue(),
+								((Number)vals.get(2)).doubleValue(),
+								((Number)vals.get(3)).floatValue(),
+								((Number)vals.get(4)).floatValue());
+
+						String worldName = world.getName().toLowerCase();
+						if (worldName != null && !worldName.isEmpty())
+						{
+							config.removeProperty("home");
+							config.setProperty("home.default", worldName);
+							config.setProperty("home.worlds." + worldName, loc);
+							config.save();
+						}
+					}
+				}
+			}
+			catch (RuntimeException ex)
+			{
+				logger.log(Level.INFO, "File: "+file.toString());
+				throw ex;
+			}
+		}
+	}
+
+	private void moveUsersDataToUserdataFolder()
+	{
+		File usersFile = new File(ess.getDataFolder(), "users.yml");
+		if (!usersFile.exists())
+		{
+			return;
+		}
+		EssentialsConf usersConfig = new EssentialsConf(usersFile);
+		usersConfig.load();
+		for (String username : usersConfig.getKeys(null))
+		{
+			User user = new User(new OfflinePlayer(username, ess), ess);
+			String nickname = usersConfig.getString(username + ".nickname");
+			if (nickname != null && !nickname.isEmpty() && !nickname.equals(username))
+			{
+				user.setNickname(nickname);
+			}
+			List<String> mails = usersConfig.getStringList(username + ".mail", null);
+			if (mails != null && !mails.isEmpty())
+			{
+				user.setMails(mails);
+			}
+			if (!user.hasHome())
+			{
+				@SuppressWarnings("unchecked")
+				List<Object> vals = (List<Object>)usersConfig.getProperty(username + ".home");
+				if (vals != null) {
+					World world = ess.getServer().getWorlds().get(0);
+					if (vals.size() > 5)
+					{
+						world = getFakeWorld((String)vals.get(5));
+					}
+					if (world != null)
+					{
+						user.setHome(new Location(world,
+												  ((Number)vals.get(0)).doubleValue(),
+												  ((Number)vals.get(1)).doubleValue(),
+												  ((Number)vals.get(2)).doubleValue(),
+												  ((Number)vals.get(3)).floatValue(),
+												  ((Number)vals.get(4)).floatValue()), true);
+					}
+				}
+			}
+		}
+		usersFile.renameTo(new File(usersFile.getAbsolutePath() + ".old"));
+	}
+
+	private void convertWarps()
+	{
+		File warpsFolder = new File(ess.getDataFolder(), "warps");
+		if (!warpsFolder.exists())
+		{
+			warpsFolder.mkdirs();
+		}
+		File[] listOfFiles = warpsFolder.listFiles();
+		if (listOfFiles.length >= 1)
+		{
+			for (int i = 0; i < listOfFiles.length; i++)
+			{
+				String filename = listOfFiles[i].getName();
+				if (listOfFiles[i].isFile() && filename.endsWith(".dat"))
+				{
+					try
+					{
+						BufferedReader rx = new BufferedReader(new FileReader(listOfFiles[i]));
+						double x, y, z;
+						float yaw, pitch;
+						String worldName;
+						try
+						{
+							if (!rx.ready()) continue;
+							x = Double.parseDouble(rx.readLine().trim());
+							if (!rx.ready()) continue;
+							y = Double.parseDouble(rx.readLine().trim());
+							if (!rx.ready()) continue;
+							z = Double.parseDouble(rx.readLine().trim());
+							if (!rx.ready()) continue;
+							yaw = Float.parseFloat(rx.readLine().trim());
+							if (!rx.ready()) continue;
+							pitch = Float.parseFloat(rx.readLine().trim());
+							worldName = rx.readLine();
+						}
+						finally {
+							rx.close();
+						}
+						World w = null;
+						for (World world : ess.getServer().getWorlds())
+						{
+							if (world.getEnvironment() != World.Environment.NETHER)
+							{
+								w = world;
+								break;
+							}
+						}
+						if (worldName != null)
+						{
+							worldName = worldName.trim();
+							World w1 = null;
+							w1 = getFakeWorld(worldName);
+							if (w1 != null)
+							{
+								w = w1;
+							}
+						}
+						Location loc = new Location(w, x, y, z, yaw, pitch);
+						ess.getWarps().setWarp(filename.substring(0, filename.length() - 4), loc);
+						if (!listOfFiles[i].renameTo(new File(warpsFolder, filename + ".old")))
+						{
+							throw new Exception(Util.format("fileRenameError", filename));
+						}
+					}
+					catch (Exception ex)
+					{
+						logger.log(Level.SEVERE, null, ex);
+					}
+				}
+			}
+
+		}
+		File warpFile = new File(ess.getDataFolder(), "warps.txt");
+		if (warpFile.exists())
+		{
+			try
+			{
+				BufferedReader rx = new BufferedReader(new FileReader(warpFile));
+				try 
+				{
+				for (String[] parts = new String[0]; rx.ready(); parts = rx.readLine().split(":"))
+				{
+					if (parts.length < 6)
+					{
+						continue;
+					}
+					String name = parts[0];
+					double x = Double.parseDouble(parts[1].trim());
+					double y = Double.parseDouble(parts[2].trim());
+					double z = Double.parseDouble(parts[3].trim());
+					float yaw = Float.parseFloat(parts[4].trim());
+					float pitch = Float.parseFloat(parts[5].trim());
+					if (name.isEmpty())
+					{
+						continue;
+					}
+					World w = null;
+					for (World world : ess.getServer().getWorlds())
+					{
+						if (world.getEnvironment() != World.Environment.NETHER)
+						{
+							w = world;
+							break;
+						}
+					}
+					Location loc = new Location(w, x, y, z, yaw, pitch);
+					ess.getWarps().setWarp(name, loc);
+					if (!warpFile.renameTo(new File(ess.getDataFolder(), "warps.txt.old")))
+					{
+						throw new Exception(Util.format("fileRenameError", "warps.txt"));
+					}
+				}
+				}
+				finally
+				{
+					rx.close();
+				}
+			}
+			catch (Exception ex)
+			{
+				logger.log(Level.SEVERE, null, ex);
+			}
+		}
+	}
+
+	private void sanitizeAllUserFilenames()
+	{
+		File usersFolder = new File(ess.getDataFolder(), "userdata");
+		if (!usersFolder.exists())
+		{
+			return;
+		}
+		File[] listOfFiles = usersFolder.listFiles();
+		for (int i = 0; i < listOfFiles.length; i++)
+		{
+			String filename = listOfFiles[i].getName();
+			if (!listOfFiles[i].isFile() || !filename.endsWith(".yml"))
+			{
+				continue;
+			}
+			String sanitizedFilename = Util.sanitizeFileName(filename.substring(0, filename.length() - 4)) + ".yml";
+			if (sanitizedFilename.equals(filename))
+			{
+				continue;
+			}
+			File tmpFile = new File(listOfFiles[i].getParentFile(), sanitizedFilename + ".tmp");
+			File newFile = new File(listOfFiles[i].getParentFile(), sanitizedFilename);
+			if (!listOfFiles[i].renameTo(tmpFile)) {
+				logger.log(Level.WARNING, Util.format("userdataMoveError", filename, sanitizedFilename));
+				continue;
+			}
+			if (newFile.exists())
+			{
+				logger.log(Level.WARNING, Util.format("duplicatedUserdata", filename, sanitizedFilename));
+				continue;
+			}
+			if (!tmpFile.renameTo(newFile)) {
+				logger.log(Level.WARNING, Util.format("userdataMoveBackError", sanitizedFilename, sanitizedFilename));
+			}
+		}
+	}
+	
+	private World getFakeWorld(String name)
+	{
+		File bukkitDirectory = ess.getDataFolder().getParentFile().getParentFile();
+		File worldDirectory = new File(bukkitDirectory, name);
+		if (worldDirectory.exists() && worldDirectory.isDirectory())
+		{
+			return new FakeWorld(worldDirectory.getName(), World.Environment.NORMAL);
+		}
+		return null;
+	}
+
+	public void beforeSettings()
+	{
+		if (!ess.getDataFolder().exists())
+		{
+			ess.getDataFolder().mkdirs();
+		}
+		moveWorthValuesToWorthYml();
+	}
+
+	public void afterSettings()
+	{
+		sanitizeAllUserFilenames();
+		updateUsersToNewDefaultHome();
+		moveUsersDataToUserdataFolder();
+		convertWarps();
+	}
+}

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

@@ -0,0 +1,408 @@
+package com.earth2me.essentials;
+
+import java.util.List;
+import java.util.UUID;
+import org.bukkit.BlockChangeDelegate;
+import org.bukkit.Chunk;
+import org.bukkit.ChunkSnapshot;
+import org.bukkit.Effect;
+import org.bukkit.Location;
+import org.bukkit.TreeType;
+import org.bukkit.World;
+import org.bukkit.block.Biome;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Arrow;
+import org.bukkit.entity.Boat;
+import org.bukkit.entity.CreatureType;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.LightningStrike;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Minecart;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.PoweredMinecart;
+import org.bukkit.entity.StorageMinecart;
+import org.bukkit.generator.BlockPopulator;
+import org.bukkit.generator.ChunkGenerator;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.util.Vector;
+
+
+public class FakeWorld implements World
+{
+
+	private final String name;
+	private final Environment env;
+	FakeWorld(String string, Environment environment)
+	{
+		this.name = string;
+		this.env = environment;
+	}
+
+	public Block getBlockAt(int i, int i1, int i2)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public Block getBlockAt(Location lctn)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public int getBlockTypeIdAt(int i, int i1, int i2)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public int getBlockTypeIdAt(Location lctn)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public int getHighestBlockYAt(int i, int i1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public int getHighestBlockYAt(Location lctn)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public Chunk getChunkAt(int i, int i1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public Chunk getChunkAt(Location lctn)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public Chunk getChunkAt(Block block)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean isChunkLoaded(Chunk chunk)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public Chunk[] getLoadedChunks()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void loadChunk(Chunk chunk)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean isChunkLoaded(int i, int i1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void loadChunk(int i, int i1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean loadChunk(int i, int i1, boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean unloadChunk(int i, int i1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean unloadChunk(int i, int i1, boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean unloadChunk(int i, int i1, boolean bln, boolean bln1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean unloadChunkRequest(int i, int i1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean unloadChunkRequest(int i, int i1, boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean regenerateChunk(int i, int i1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean refreshChunk(int i, int i1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public Item dropItem(Location lctn, ItemStack is)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public Item dropItemNaturally(Location lctn, ItemStack is)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public Arrow spawnArrow(Location lctn, Vector vector, float f, float f1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean generateTree(Location lctn, TreeType tt)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean generateTree(Location lctn, TreeType tt, BlockChangeDelegate bcd)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public LivingEntity spawnCreature(Location lctn, CreatureType ct)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public LightningStrike strikeLightning(Location lctn)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public LightningStrike strikeLightningEffect(Location lctn)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public List<Entity> getEntities()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public List<LivingEntity> getLivingEntities()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public List<Player> getPlayers()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public String getName()
+	{
+		return name;
+	}
+
+	public long getId()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public Location getSpawnLocation()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean setSpawnLocation(int i, int i1, int i2)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public long getTime()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void setTime(long l)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public long getFullTime()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void setFullTime(long l)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean hasStorm()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void setStorm(boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public int getWeatherDuration()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void setWeatherDuration(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean isThundering()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void setThundering(boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public int getThunderDuration()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void setThunderDuration(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public Environment getEnvironment()
+	{
+		return env;
+	}
+
+	public long getSeed()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean getPVP()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void setPVP(boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void save()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean createExplosion(double d, double d1, double d2, float f)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean createExplosion(Location lctn, float f)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public ChunkGenerator getGenerator()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public List<BlockPopulator> getPopulators()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void playEffect(Location lctn, Effect effect, int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void playEffect(Location lctn, Effect effect, int i, int i1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean createExplosion(double d, double d1, double d2, float f, boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean createExplosion(Location lctn, float f, boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public <T extends Entity> T spawn(Location lctn, Class<T> type) throws IllegalArgumentException
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public ChunkSnapshot getEmptyChunkSnapshot(int i, int i1, boolean bln, boolean bln1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void setSpawnFlags(boolean bln, boolean bln1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean getAllowAnimals()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean getAllowMonsters()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public UUID getUID()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public Block getHighestBlockAt(int i, int i1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public Block getHighestBlockAt(Location lctn)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+
+	public Biome getBiome(int i, int i1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public double getTemperature(int i, int i1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public double getHumidity(int i, int i1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+	
+}

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

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

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

@@ -0,0 +1,69 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.register.payment.Methods;
+import java.util.Map;
+import org.bukkit.World;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.craftbukkit.scheduler.CraftScheduler;
+import org.bukkit.plugin.Plugin;
+
+
+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);
+
+	User getUser(Object base);
+
+	User getOfflineUser(String name);
+
+	World getWorld(String name);
+
+	int broadcastMessage(String name, String message);
+
+	ISettings getSettings();
+
+	CraftScheduler getScheduler();
+
+	String[] getMotd(CommandSender sender, String def);
+
+	String[] getLines(CommandSender sender, String node, String def);
+
+	Jail getJail();
+
+	Warps getWarps();
+
+	Worth getWorth();
+
+	Backup getBackup();
+
+	Spawn getSpawn();
+
+	Methods getPaymentMethod();
+
+	int scheduleAsyncDelayedTask(Runnable run);
+
+	int scheduleSyncDelayedTask(Runnable run);
+
+	int scheduleSyncDelayedTask(Runnable run, long delay);
+
+	int scheduleSyncRepeatingTask(final Runnable run, long delay, long period);
+
+	BanWorkaround getBans();
+
+	TNTExplodeListener getTNTListener();
+
+	IPermissionsHandler getPermissionsHandler();
+
+	void setPermissionsHandler(IPermissionsHandler handler);
+
+	void showError(final CommandSender sender, final Throwable exception, final String commandLabel);
+
+	Map<String, User> getAllUsers();
+
+	ItemDb getItemDb();
+}

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

@@ -0,0 +1,21 @@
+package com.earth2me.essentials;
+
+import org.bukkit.entity.Player;
+
+
+public interface IPermissionsHandler
+{
+
+	String getGroup(Player base);
+
+	boolean canBuild(Player base, String group);
+
+	boolean inGroup(Player base, String group);
+
+	boolean hasPermission(Player base, String node);
+
+	String getPrefix(Player base);
+
+	String getSuffix(Player base);
+	
+}

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

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

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

@@ -0,0 +1,135 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import java.util.List;
+import java.util.Map;
+import org.bukkit.ChatColor;
+
+
+public interface ISettings extends IConf
+{
+
+	boolean areSignsDisabled();
+
+	String format(String format, IUser user);
+
+	String getAnnounceNewPlayerFormat(IUser user);
+
+	boolean getAnnounceNewPlayers();
+
+	String getBackupCommand();
+
+	long getBackupInterval();
+
+	boolean getBedSetsHome();
+
+	String getChatFormat(String group);
+
+	int getChatRadius();
+
+	double getCommandCost(IEssentialsCommand cmd);
+
+	double getCommandCost(String label);
+
+	String getCurrencySymbol();
+
+	int getDefaultStackSize();
+
+	boolean getGenerateExitPortals();
+
+	double getHealCooldown();
+
+	Object getKit(String name);
+
+	Map<String, Object> getKits();
+
+	String getLocale();
+
+	String getNetherName();
+
+	boolean getNetherPortalsEnabled();
+
+	double getNetherRatio();
+
+	String getNewbieSpawn();
+
+	String getNicknamePrefix();
+
+	ChatColor getOperatorColor() throws Exception;
+
+	boolean getPerWarpPermission();
+
+	boolean getProtectBoolean(final String configName, boolean def);
+
+	int getProtectCreeperMaxHeight();
+
+	List<Integer> getProtectList(final String configName);
+
+	boolean getProtectPreventSpawn(final String creatureName);
+
+	String getProtectString(final String configName);
+
+	boolean getReclaimSetting();
+
+	boolean getRespawnAtHome();
+
+	boolean getSortListByGroups();
+
+	int getSpawnMobLimit();
+
+	int getStartingBalance();
+
+	double getTeleportCooldown();
+
+	double getTeleportDelay();
+
+	boolean hidePermissionlessHelp();
+
+	boolean isCommandDisabled(final IEssentialsCommand cmd);
+
+	boolean isCommandDisabled(String label);
+
+	boolean isCommandOverridden(String name);
+
+	boolean isCommandRestricted(IEssentialsCommand cmd);
+
+	boolean isCommandRestricted(String label);
+
+	boolean isDebug();
+
+	boolean isEcoDisabled();
+
+	boolean isNetherEnabled();
+
+	boolean isTradeInStacks(int id);
+
+	List<Integer> itemSpawnBlacklist();
+
+	boolean permissionBasedItemSpawn();
+
+	void reloadConfig();
+
+	boolean showNonEssCommandsInHelp();
+
+	boolean spawnIfNoHome();
+
+	boolean use1to1RatioInNether();
+
+	boolean warnOnBuildDisallow();
+
+	boolean warnOnSmite();
+	
+	double getMaxMoney();
+
+	boolean isEcoLogEnabled();
+	
+	boolean removeGodOnDisconnect();
+
+	boolean changeDisplayName();
+
+	boolean isPlayerCommand(String string);
+
+	public boolean useBukkitPermissions();
+
+	public boolean addPrefixSuffix();
+}

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

@@ -0,0 +1,55 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import java.net.InetSocketAddress;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.PlayerInventory;
+
+
+public interface IUser
+{
+	int getHealth();
+
+	Location getLocation();
+
+	boolean isOnline();
+
+	void sendMessage(String string);
+
+	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);
+
+	PlayerInventory getInventory();
+
+	void updateInventory();
+
+	String getGroup();
+
+	void setLastLocation();
+
+	Location getHome(Location location);
+
+	String getName();
+
+	InetSocketAddress getAddress();
+
+	String getDisplayName();
+}

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

@@ -0,0 +1,319 @@
+package com.earth2me.essentials;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.entity.Item;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+
+/*
+ * This class can be removed when 
+ * https://github.com/Bukkit/CraftBukkit/pull/193
+ * is accepted to CraftBukkit
+ */
+
+public final class InventoryWorkaround
+{
+	private InventoryWorkaround()
+	{
+	}
+
+	public static int first(final Inventory inventory, final ItemStack item, final boolean forceDurability, final boolean forceAmount)
+	{
+		return next(inventory, item, 0, forceDurability, forceAmount);
+	}
+
+	public static int next(final Inventory cinventory, final ItemStack item, final int start, final boolean forceDurability, final boolean forceAmount)
+	{
+		final ItemStack[] inventory = cinventory.getContents();
+		for (int i = start; i < inventory.length; i++)
+		{
+			final ItemStack cItem = inventory[i];
+			if (cItem == null)
+			{
+				continue;
+			}
+			if (item.getTypeId() == cItem.getTypeId() && (!forceAmount || item.getAmount() == cItem.getAmount()) && (!forceDurability || cItem.getDurability() == item.getDurability()))
+			{
+				return i;
+			}
+		}
+		return -1;
+	}
+
+	public static int firstPartial(final Inventory cinventory, final ItemStack item, final boolean forceDurability)
+	{
+		if (item == null)
+		{
+			return -1;
+		}
+		final ItemStack[] inventory = cinventory.getContents();
+		for (int i = 0; i < inventory.length; i++)
+		{
+			final ItemStack cItem = inventory[i];
+			if (cItem == null)
+			{
+				continue;
+			}
+			if (item.getTypeId() == cItem.getTypeId() && cItem.getAmount() < cItem.getType().getMaxStackSize() && (!forceDurability || cItem.getDurability() == item.getDurability()))
+			{
+				return i;
+			}
+		}
+		return -1;
+	}
+
+	public static Map<Integer, ItemStack> addItem(final Inventory cinventory, final boolean forceDurability, final ItemStack... items)
+	{
+		final Map<Integer, ItemStack> leftover = new HashMap<Integer, ItemStack>();
+
+		/* TODO: some optimization
+		 *  - Create a 'firstPartial' with a 'fromIndex'
+		 *  - Record the lastPartial per Material
+		 *  - Cache firstEmpty result
+		 */
+
+		// combine items
+
+		ItemStack[] combined = new ItemStack[items.length];
+		for (int i = 0; i < items.length; i++)
+		{
+			if (items[i] == null || items[i].getAmount() < 1)
+			{
+				continue;
+			}
+			for (int j = 0; j < combined.length; j++)
+			{
+				if (combined[j] == null)
+				{
+					combined[j] = new ItemStack(items[i].getType(), items[i].getAmount(), items[i].getDurability());
+					break;
+				}
+				if (combined[j].getTypeId() == items[i].getTypeId() && (!forceDurability || combined[j].getDurability() == items[i].getDurability()))
+				{
+					combined[j].setAmount(combined[j].getAmount() + items[i].getAmount());
+					break;
+				}
+			}
+		}
+
+
+		for (int i = 0; i < combined.length; i++)
+		{
+			final ItemStack item = combined[i];
+			if (item == null)
+			{
+				continue;
+			}
+			
+			while (true)
+			{
+				// Do we already have a stack of it?
+				final int firstPartial = firstPartial(cinventory, item, forceDurability);
+
+				// Drat! no partial stack
+				if (firstPartial == -1)
+				{
+					// Find a free spot!
+					final int firstFree = cinventory.firstEmpty();
+
+					if (firstFree == -1)
+					{
+						// No space at all!
+						leftover.put(i, item);
+						break;
+					}
+					else
+					{
+						// More than a single stack!
+						if (item.getAmount() > item.getType().getMaxStackSize())
+						{
+							cinventory.setItem(firstFree, new CraftItemStack(item.getTypeId(), item.getType().getMaxStackSize(), item.getDurability()));
+							item.setAmount(item.getAmount() - item.getType().getMaxStackSize());
+						}
+						else
+						{
+							// Just store it
+							cinventory.setItem(firstFree, item);
+							break;
+						}
+					}
+				}
+				else
+				{
+					// So, apparently it might only partially fit, well lets do just that
+					final ItemStack partialItem = cinventory.getItem(firstPartial);
+
+					final int amount = item.getAmount();
+					final int partialAmount = partialItem.getAmount();
+					final int maxAmount = partialItem.getType().getMaxStackSize();
+
+					// Check if it fully fits
+					if (amount + partialAmount <= maxAmount)
+					{
+						partialItem.setAmount(amount + partialAmount);
+						break;
+					}
+
+					// It fits partially
+					partialItem.setAmount(maxAmount);
+					item.setAmount(amount + partialAmount - maxAmount);
+				}
+			}
+		}
+		return leftover;
+	}
+
+	public static Map<Integer, ItemStack> removeItem(final Inventory cinventory, final boolean forceDurability, final ItemStack... items)
+	{
+		final Map<Integer, ItemStack> leftover = new HashMap<Integer, ItemStack>();
+
+		// TODO: optimization
+
+		for (int i = 0; i < items.length; i++)
+		{
+			final ItemStack item = items[i];
+			if (item == null)
+			{
+				continue;
+			}
+			int toDelete = item.getAmount();
+
+			while (true)
+			{
+
+				// Bail when done
+				if (toDelete <= 0)
+				{
+					break;
+				}
+
+				// get first Item, ignore the amount
+				final int first = first(cinventory, item, forceDurability, false);
+
+				// Drat! we don't have this type in the inventory
+				if (first == -1)
+				{
+					item.setAmount(toDelete);
+					leftover.put(i, item);
+					break;
+				}
+				else
+				{
+					final ItemStack itemStack = cinventory.getItem(first);
+					final int amount = itemStack.getAmount();
+
+					if (amount <= toDelete)
+					{
+						toDelete -= amount;
+						// clear the slot, all used up
+						cinventory.clear(first);
+					}
+					else
+					{
+						// split the stack and store
+						itemStack.setAmount(amount - toDelete);
+						cinventory.setItem(first, itemStack);
+						toDelete = 0;
+					}
+				}
+			}
+		}
+		return leftover;
+	}
+
+	public static boolean containsItem(final Inventory cinventory, final boolean forceDurability, final ItemStack... items)
+	{
+		final Map<Integer, ItemStack> leftover = new HashMap<Integer, ItemStack>();
+
+		// TODO: optimization
+
+		// combine items
+
+		ItemStack[] combined = new ItemStack[items.length];
+		for (int i = 0; i < items.length; i++)
+		{
+			if (items[i] == null)
+			{
+				continue;
+			}
+			for (int j = 0; j < combined.length; j++)
+			{
+				if (combined[j] == null)
+				{
+					combined[j] = new ItemStack(items[i].getType(), items[i].getAmount(), items[i].getDurability());
+					break;
+				}
+				if (combined[j].getTypeId() == items[i].getTypeId() && (!forceDurability || combined[j].getDurability() == items[i].getDurability()))
+				{
+					combined[j].setAmount(combined[j].getAmount() + items[i].getAmount());
+					break;
+				}
+			}
+		}
+
+		for (int i = 0; i < combined.length; i++)
+		{
+			final ItemStack item = combined[i];
+			if (item == null)
+			{
+				continue;
+			}
+			int mustHave = item.getAmount();
+			int position = 0;
+
+			while (true)
+			{
+				// Bail when done
+				if (mustHave <= 0)
+				{
+					break;
+				}
+
+				final int slot = next(cinventory, item, position, forceDurability, false);
+
+				// Drat! we don't have this type in the inventory
+				if (slot == -1)
+				{
+					leftover.put(i, item);
+					break;
+				}
+				else
+				{
+					final ItemStack itemStack = cinventory.getItem(slot);
+					final int amount = itemStack.getAmount();
+
+					if (amount <= mustHave)
+					{
+						mustHave -= amount;
+					}
+					else
+					{
+						mustHave = 0;
+					}
+					position = slot + 1;
+				}
+			}
+		}
+		return leftover.isEmpty();
+	}
+
+	public static Item[] dropItem(final Location loc, final ItemStack itm)
+	{
+		final int maxStackSize = itm.getType().getMaxStackSize();
+		final int stacks = itm.getAmount() / maxStackSize;
+		final int leftover = itm.getAmount() % maxStackSize;
+		Item[] itemStacks = new Item[stacks + (leftover > 0 ? 1 : 0)];
+		for (int i = 0; i < stacks; i++)
+		{
+			itemStacks[i] = loc.getWorld().dropItem(loc, new ItemStack(itm.getType(), maxStackSize, itm.getDurability()));
+		}
+		if (leftover > 0)
+		{
+			itemStacks[stacks] = loc.getWorld().dropItem(loc, new ItemStack(itm.getType(), leftover, itm.getDurability()));
+		}
+		return itemStacks;
+	}
+}

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

@@ -0,0 +1,182 @@
+package com.earth2me.essentials;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+
+public class ItemDb implements IConf
+{
+	private final transient IEssentials ess;
+
+	public ItemDb(IEssentials ess)
+	{
+		this.ess = ess;
+	}
+	private final static Logger LOGGER = Logger.getLogger("Minecraft");
+	private final transient Map<String, Integer> items = new HashMap<String, Integer>();
+	private final transient Map<String, Short> durabilities = new HashMap<String, Short>();
+
+	public void reloadConfig()
+	{
+		final File file = new File(ess.getDataFolder(), "items.csv");
+
+		if (!file.exists())
+		{
+			final InputStream res = ItemDb.class.getResourceAsStream("/items.csv");
+			FileWriter tx = null;
+			try
+			{
+				tx = new FileWriter(file);
+				for (int i = 0; (i = res.read()) > 0;)
+				{
+					tx.write(i);
+				}
+				tx.flush();
+			}
+			catch (IOException ex)
+			{
+				LOGGER.log(Level.SEVERE, Util.i18n("itemsCsvNotLoaded"), ex);
+				return;
+			}
+			finally
+			{
+				try
+				{
+					res.close();
+				}
+				catch (Exception ex)
+				{
+				}
+				try
+				{
+					if (tx != null)
+					{
+						tx.close();
+					}
+				}
+				catch (Exception ex)
+				{
+				}
+			}
+		}
+
+		BufferedReader rx = null;
+		try
+		{
+			rx = new BufferedReader(new FileReader(file));
+			durabilities.clear();
+			items.clear();
+
+			for (int i = 0; rx.ready(); i++)
+			{
+				try
+				{
+					final String line = rx.readLine().trim().toLowerCase();
+					if (line.startsWith("#"))
+					{
+						continue;
+					}
+
+					final String[] parts = line.split("[^a-z0-9]");
+					if (parts.length < 2)
+					{
+						continue;
+					}
+
+					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);
+				}
+				catch (Exception ex)
+				{
+					LOGGER.warning(Util.format("parseError", "items.csv", i));
+				}
+			}
+		}
+		catch (IOException ex)
+		{
+			LOGGER.log(Level.SEVERE, Util.i18n("itemsCsvNotLoaded"), ex);
+		}
+		finally
+		{
+			if (rx != null) {
+				try
+				{
+					rx.close();
+				}
+				catch (IOException ex)
+				{
+					LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
+				}
+			}
+		}
+	}
+
+	public ItemStack get(final String id, final int quantity) throws Exception
+	{
+		final ItemStack retval = get(id.toLowerCase());
+		retval.setAmount(quantity);
+		return retval;
+	}
+
+	public ItemStack get(final String id) throws Exception
+	{
+		int itemid = 0;
+		String itemname = null;
+		short metaData = 0;
+		if (id.matches("^\\d+[:+',;.]\\d+$"))
+		{
+			itemid = Integer.parseInt(id.split("[:+',;.]")[0]);
+			metaData = Short.parseShort(id.split("[:+',;.]")[1]);
+		}
+		else if (id.matches("^\\d+$"))
+		{
+			itemid = Integer.parseInt(id);
+		}
+		else if (id.matches("^[^:+',;.]+[:+',;.]\\d+$"))
+		{
+			itemname = id.split("[:+',;.]")[0].toLowerCase();
+			metaData = Short.parseShort(id.split("[:+',;.]")[1]);
+		}
+		else
+		{
+			itemname = id.toLowerCase();
+		}
+
+		if (itemname != null)
+		{
+			if (items.containsKey(itemname))
+			{
+				itemid = items.get(itemname);
+				if (durabilities.containsKey(itemname) && metaData == 0)
+				{
+					metaData = durabilities.get(itemname);
+				}
+			}
+			else
+			{
+				throw new Exception(Util.format("unknownItemName", id));
+			}
+		}
+
+		final Material mat = Material.getMaterial(itemid);
+		if (mat == null)
+		{
+			throw new Exception(Util.format("unknownItemId", itemid));
+		}
+		final ItemStack retval = new ItemStack(mat);
+		retval.setAmount(ess.getSettings().getDefaultStackSize());
+		retval.setDurability(metaData);
+		return retval;
+	}
+}

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

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

@@ -0,0 +1,84 @@
+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/Mob.java

@@ -0,0 +1,99 @@
+package com.earth2me.essentials;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.entity.CreatureType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+
+
+public enum Mob
+{
+	CHICKEN("Chicken", Enemies.FRIENDLY, CreatureType.CHICKEN),
+	COW("Cow", Enemies.FRIENDLY, CreatureType.COW),
+	CREEPER("Creeper", Enemies.ENEMY, CreatureType.CREEPER),
+	GHAST("Ghast", Enemies.ENEMY, CreatureType.GHAST),
+	GIANT("Giant", Enemies.ENEMY, CreatureType.GIANT),
+	PIG("Pig", Enemies.FRIENDLY, CreatureType.PIG),
+	PIGZOMB("PigZombie", Enemies.NEUTRAL, CreatureType.PIG_ZOMBIE),
+	SHEEP("Sheep", Enemies.FRIENDLY, "", CreatureType.SHEEP),
+	SKELETON("Skeleton", Enemies.ENEMY, CreatureType.SKELETON),
+	SLIME("Slime", Enemies.ENEMY, CreatureType.SLIME),
+	SPIDER("Spider", Enemies.ENEMY, CreatureType.SPIDER),
+	SQUID("Squid", Enemies.FRIENDLY, CreatureType.SQUID),
+	ZOMBIE("Zombie", Enemies.ENEMY, CreatureType.ZOMBIE),
+	MONSTER("Monster", Enemies.ENEMY, CreatureType.MONSTER),
+	WOLF("Wolf", Enemies.NEUTRAL, CreatureType.WOLF);
+
+	public static final Logger logger = Logger.getLogger("Minecraft");
+
+	private Mob(String n, Enemies en, String s, CreatureType type)
+	{
+		this.suffix = s;
+		this.name = n;
+		this.type = en;
+		this.bukkitType = type;
+	}
+
+	private Mob(String n, Enemies en, CreatureType type)
+	{
+		this.name = n;
+		this.type = en;
+		this.bukkitType = type;
+	}
+
+	public String suffix = "s";
+	final public String name;
+	final public Enemies type;
+	final private CreatureType bukkitType;
+	private static final Map<String, Mob> hashMap = new HashMap<String, Mob>();
+
+	static
+	{
+		for (Mob mob : Mob.values())
+		{
+			hashMap.put(mob.name, mob);
+		}
+	}
+
+	public LivingEntity spawn(final Player player, final Server server, final Location loc) throws MobException
+	{
+
+		final LivingEntity entity = player.getWorld().spawnCreature(loc, this.bukkitType);
+		if (entity == null)
+		{
+			logger.log(Level.WARNING, Util.i18n("unableToSpawnMob"));
+			throw new MobException();
+		}
+		return entity;
+	}
+
+
+	public enum Enemies
+	{
+		FRIENDLY("friendly"),
+		NEUTRAL("neutral"),
+		ENEMY("enemy");
+
+		private Enemies(final String t)
+		{
+			this.type = t;
+		}
+		final protected String type;
+	}
+
+
+	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/NetherPortal.java

@@ -0,0 +1,167 @@
+/**
+ * @author SpaceManiac
+ * @licent MIT
+ * @origin https://github.com/SpaceManiac/Nether/blob/master/org/innectis/Nether/NetherPortal.java
+ */
+package com.earth2me.essentials;
+
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import java.util.ArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+public class NetherPortal
+{
+	private Block block;
+
+	public NetherPortal(Block b)
+	{
+		block = b;
+	}
+
+	public Block getBlock()
+	{
+		return block;
+	}
+
+	public void setBlock(Block b)
+	{
+		block = b;
+	}
+
+	// Return a random spawnable location
+	public Location getSpawn()
+	{
+		if (block.getWorld().getBlockAt(block.getX() + 1, block.getY(), block.getZ()).getType().equals(Material.PORTAL)
+			|| block.getWorld().getBlockAt(block.getX() - 1, block.getY(), block.getZ()).getType().equals(Material.PORTAL))
+		{
+		// portal is in X direction
+			return new Location(block.getWorld(), block.getX() + 1,
+								block.getY(), block.getZ() + 1 - 2 * Math.round(Math.random()));
+		}
+		else
+		{
+		// portal is in Z direction
+			return new Location(block.getWorld(), block.getX() + 1 - 2 * Math.round(Math.random()),
+								block.getY(), block.getZ() + 1);
+		}
+	}
+
+	// ==============================
+	// Find a nearby portal within 16 blocks of the given block
+	// Not guaranteed to be the nearest
+	public static NetherPortal findPortal(Block dest)
+	{
+		World world = dest.getWorld();
+
+		// Get list of columns in a circle around the block
+		ArrayList<Block> columns = new ArrayList<Block>();
+		for (int x = dest.getX() - 16; x <= dest.getX() + 16; ++x)
+		{
+			for (int z = dest.getZ() - 16; z <= dest.getZ() + 16; ++z)
+			{
+				int dx = dest.getX() - x, dz = dest.getZ() - z;
+				if (dx * dx + dz * dz <= 256)
+				{
+					columns.add(world.getBlockAt(x, 0, z));
+				}
+			}
+		}
+
+		// For each column try to find a portal block
+		for (Block col : columns)
+		{
+			for (int y = 127; y >= 0; --y)
+			{
+				Block b = world.getBlockAt(col.getX(), y, col.getZ());
+				if (b.getType().equals(Material.PORTAL) && Math.abs(dest.getY() - y) <= 16)
+				{
+					// Huzzah!
+					return new NetherPortal(b);
+				}
+			}
+		}
+
+		// Nope!
+		return null;
+	}
+
+	// Create a new portal at the specified block, fudging position if needed
+	// Will occasionally end up making portals in bad places, but let's hope not
+	public static NetherPortal createPortal(Block dest)
+	{
+		World world = dest.getWorld();
+
+		// Try not to spawn within water or lava
+		Material m = dest.getType();
+		while (((m.equals(Material.LAVA) || m.equals(Material.WATER) || m.equals(Material.STATIONARY_LAVA) 
+			|| m.equals(Material.STATIONARY_WATER) || m.equals(Material.SAND) || m.equals(Material.GRAVEL))) &&
+			dest.getY() < 120)
+		{
+			dest = world.getBlockAt(dest.getX(), dest.getY() + 4, dest.getZ());
+			m = dest.getType();
+		}
+
+		// Not too high or too low overall
+		if (dest.getY() > 120)
+		{
+			dest = world.getBlockAt(dest.getX(), 120, dest.getZ());
+		}
+		else if (dest.getY() < 8)
+		{
+			dest = world.getBlockAt(dest.getX(), 8, dest.getZ());
+		}
+
+		// Create the physical portal
+		// For now, don't worry about direction
+
+		int x = dest.getX(), y = dest.getY(), z = dest.getZ();
+		Logger.getLogger("Minecraft").log(Level.INFO, Util.format("creatingPortal", x, y, z)); 
+
+		// Clear area around portal
+		ArrayList<Block> columns = new ArrayList<Block>();
+		for (int x2 = x - 4; x2 <= x + 4; ++x2)
+		{
+			for (int z2 = z - 4; z2 <= z + 4; ++z2)
+			{
+				double dx = x + 0.5f - x2, dz = z - z2;
+				if (dx * dx + dz * dz <= 13)
+				{
+					columns.add(world.getBlockAt(x2, 0, z2));
+				}
+			}
+		}
+
+		// Clear area around portal
+		for (Block col : columns)
+		{
+			// Stone platform
+			world.getBlockAt(col.getX(), y - 1, col.getZ()).setType(Material.STONE);
+			for (int yd = 0; yd < 4; ++yd)
+			{
+				world.getBlockAt(col.getX(), y + yd, col.getZ()).setType(Material.AIR);
+			}
+		}
+
+		// Build obsidian frame
+		for (int xd = -1; xd < 3; ++xd)
+		{
+			for (int yd = -1; yd < 4; ++yd)
+			{
+				if (xd == -1 || yd == -1 || xd == 2 || yd == 3)
+				{
+					world.getBlockAt(x + xd, y + yd, z).setType(Material.OBSIDIAN);
+				}
+			}
+		}
+
+		// Set it alight!
+		dest.setType(Material.FIRE);
+
+		return new NetherPortal(dest);
+	}
+}

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

@@ -0,0 +1,579 @@
+package com.earth2me.essentials;
+
+import java.net.InetSocketAddress;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import org.bukkit.Achievement;
+import org.bukkit.Effect;
+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.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.event.entity.EntityDamageEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionAttachment;
+import org.bukkit.permissions.PermissionAttachmentInfo;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.util.Vector;
+
+
+public class OfflinePlayer implements Player
+{
+	private final String name;
+	final transient IEssentials ess;
+	private Location location = new Location(null, 0, 0, 0, 0, 0);
+	private World world;
+	private UUID uniqueId = UUID.randomUUID();
+
+	public OfflinePlayer(String name, IEssentials ess)
+	{
+		this.name = name;
+		this.ess = ess;
+		this.world = ess.getServer().getWorlds().get(0);
+	}
+
+	public boolean isOnline()
+	{
+		return false;
+	}
+
+	public boolean isOp()
+	{
+		return false;
+	}
+
+	public void sendMessage(String string)
+	{
+	}
+
+	public String getDisplayName()
+	{
+		return name;
+	}
+
+	public void setDisplayName(String string)
+	{
+	}
+
+	public void setCompassTarget(Location lctn)
+	{
+	}
+
+	public InetSocketAddress getAddress()
+	{
+		return null;
+	}
+
+	public void kickPlayer(String string)
+	{
+	}
+
+	public String getName()
+	{
+		return name;
+	}
+
+	public PlayerInventory getInventory()
+	{
+		return null;
+	}
+
+	public ItemStack getItemInHand()
+	{
+		return null;
+	}
+
+	public void setItemInHand(ItemStack is)
+	{
+	}
+
+	public int getHealth()
+	{
+		return 0;
+	}
+
+	public void setHealth(int i)
+	{
+	}
+
+	public Egg throwEgg()
+	{
+		return null;
+	}
+
+	public Snowball throwSnowball()
+	{
+		return null;
+	}
+
+	public Arrow shootArrow()
+	{
+		return null;
+	}
+
+	public boolean isInsideVehicle()
+	{
+		return false;
+	}
+
+	public boolean leaveVehicle()
+	{
+		return false;
+	}
+
+	public Vehicle getVehicle()
+	{
+		return null;
+	}
+
+	public Location getLocation()
+	{
+		return location;
+	}
+
+	public World getWorld()
+	{
+		return world;
+	}
+
+	public void setLocation(Location loc)
+	{
+		location = loc;
+		world = loc.getWorld();
+	}
+
+	public void teleportTo(Location lctn)
+	{
+	}
+
+	public void teleportTo(Entity entity)
+	{
+	}
+
+	public int getEntityId()
+	{
+		return -1;
+	}
+
+	public boolean performCommand(String string)
+	{
+		return false;
+	}
+
+	public boolean isPlayer()
+	{
+		return false;
+	}
+
+	public int getRemainingAir()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void setRemainingAir(int i)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public int getMaximumAir()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void setMaximumAir(int i)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public boolean isSneaking()
+	{
+		return false;
+	}
+
+	public void setSneaking(boolean bln)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void updateInventory()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void chat(String string)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public double getEyeHeight()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public double getEyeHeight(boolean bln)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public List<Block> getLineOfSight(HashSet<Byte> hs, int i)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public Block getTargetBlock(HashSet<Byte> hs, int i)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public List<Block> getLastTwoTargetBlocks(HashSet<Byte> hs, int i)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public int getFireTicks()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public int getMaxFireTicks()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void setFireTicks(int i)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void remove()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public Server getServer()
+	{
+		return ess == null ? null : ess.getServer();
+	}
+
+	public Vector getMomentum()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void setMomentum(Vector vector)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void setVelocity(Vector vector)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public Vector getVelocity()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void damage(int i)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void damage(int i, Entity entity)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public Location getEyeLocation()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void sendRawMessage(String string)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public Location getCompassTarget()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public int getMaximumNoDamageTicks()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void setMaximumNoDamageTicks(int i)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public int getLastDamage()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void setLastDamage(int i)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public int getNoDamageTicks()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void setNoDamageTicks(int i)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public boolean teleport(Location lctn)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public boolean teleport(Entity entity)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public Entity getPassenger()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public boolean setPassenger(Entity entity)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public boolean isEmpty()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public boolean eject()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void saveData()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void loadData()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public boolean isSleeping()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public int getSleepTicks()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public List<Entity> getNearbyEntities(double d, double d1, double d2)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public boolean isDead()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public float getFallDistance()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void setFallDistance(float f)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void setSleepingIgnored(boolean bln)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public boolean isSleepingIgnored()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void awardAchievement(Achievement a)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void incrementStatistic(Statistic ststc)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void incrementStatistic(Statistic ststc, int i)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void incrementStatistic(Statistic ststc, Material mtrl)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void incrementStatistic(Statistic ststc, Material mtrl, int i)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void playNote(Location lctn, byte b, byte b1)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void sendBlockChange(Location lctn, Material mtrl, byte b)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void sendBlockChange(Location lctn, int i, byte b)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void setLastDamageCause(EntityDamageEvent ede)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public EntityDamageEvent getLastDamageCause()
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public void playEffect(Location lctn, Effect effect, int i)
+	{
+		throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+	}
+
+	public boolean sendChunkChange(Location lctn, int i, int i1, int i2, byte[] bytes)
+	{
+		return true;
+	}
+
+	public UUID getUniqueId()
+	{
+		return uniqueId;
+	}
+
+	public void playNote(Location lctn, Instrument i, Note note)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void setPlayerTime(long l, boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public long getPlayerTime()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public long getPlayerTimeOffset()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean isPlayerTimeRelative()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void resetPlayerTime()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean isPermissionSet(String string)
+	{
+		return false;
+	}
+
+	public boolean isPermissionSet(Permission prmsn)
+	{
+		return false;
+	}
+
+	public boolean hasPermission(String string)
+	{
+		return false;
+	}
+
+	public boolean hasPermission(Permission prmsn)
+	{
+		return false;
+	}
+
+	public PermissionAttachment addAttachment(Plugin plugin, String string, boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public PermissionAttachment addAttachment(Plugin plugin)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public PermissionAttachment addAttachment(Plugin plugin, String string, boolean bln, int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public PermissionAttachment addAttachment(Plugin plugin, int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void removeAttachment(PermissionAttachment pa)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void recalculatePermissions()
+	{
+	}
+
+	public Set<PermissionAttachmentInfo> getEffectivePermissions()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void setOp(boolean bln)
+	{
+	}
+}

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

@@ -0,0 +1,50 @@
+package com.earth2me.essentials;
+
+import com.nijiko.permissions.PermissionHandler;
+import com.nijikokun.bukkit.Permissions.Permissions;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+
+public class Permissions2Handler implements IPermissionsHandler
+{
+	private final transient PermissionHandler permissionHandler;
+
+	Permissions2Handler(final Plugin permissionsPlugin)
+	{
+		permissionHandler = ((Permissions)permissionsPlugin).getHandler();
+	}
+
+	public String getGroup(final Player base)
+	{
+		final String group = permissionHandler.getGroup(base.getWorld().getName(), base.getName());
+		return group == null ? "default" : group;
+	}
+
+	public boolean canBuild(final Player base, final String group)
+	{
+		return permissionHandler.canGroupBuild(base.getWorld().getName(), getGroup(base));
+	}
+
+	public boolean inGroup(final Player base, final String group)
+	{
+		return permissionHandler.inGroup(base.getWorld().getName(), base.getName(), group);
+	}
+
+	public boolean hasPermission(final Player base, final String node)
+	{
+		return permissionHandler.permission(base, node);
+	}
+
+	public String getPrefix(final Player base)
+	{
+		final String prefix = permissionHandler.getGroupPrefix(base.getWorld().getName(), getGroup(base));
+		return prefix == null ? "" : prefix;
+	}
+
+	public String getSuffix(final Player base)
+	{
+		final String suffix = permissionHandler.getGroupSuffix(base.getWorld().getName(), getGroup(base));
+		return suffix == null ? "" : suffix;
+	}
+}

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

@@ -0,0 +1,48 @@
+package com.earth2me.essentials;
+
+import com.nijiko.permissions.PermissionHandler;
+import com.nijikokun.bukkit.Permissions.Permissions;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+
+public class Permissions3Handler implements IPermissionsHandler
+{
+	private final transient PermissionHandler permissionHandler;
+	
+	Permissions3Handler(final Plugin permissionsPlugin)
+	{
+		permissionHandler = ((Permissions)permissionsPlugin).getHandler();
+	}
+
+	public String getGroup(final Player base)
+	{
+		return permissionHandler.getPrimaryGroup(base.getWorld().getName(), base.getName());
+	}
+
+	public boolean canBuild(final Player base, final String group)
+	{
+		return permissionHandler.canUserBuild(base.getWorld().getName(), base.getName());
+	}
+
+	public boolean inGroup(final Player base, final String group)
+	{
+		return permissionHandler.inGroup(base.getWorld().getName(), base.getName(), group);
+	}
+
+	public boolean hasPermission(final Player base, final String node)
+	{
+		return permissionHandler.has(base, node);
+	}
+
+	public String getPrefix(final Player base)
+	{
+		return permissionHandler.getUserPrefix(base.getWorld().getName(), base.getName());
+	}
+
+	public String getSuffix(final Player base)
+	{
+		return permissionHandler.getUserSuffix(base.getWorld().getName(), base.getName());
+	}
+	
+}

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

@@ -0,0 +1,74 @@
+package com.earth2me.essentials;
+
+import org.bukkit.entity.Player;
+import ru.tehkode.permissions.PermissionManager;
+import ru.tehkode.permissions.PermissionUser;
+import ru.tehkode.permissions.bukkit.PermissionsEx;
+
+
+class PermissionsExHandler implements IPermissionsHandler
+{
+	private final transient PermissionManager manager;
+
+	public PermissionsExHandler()
+	{
+		manager = PermissionsEx.getPermissionManager();
+	}
+
+	public String getGroup(Player base)
+	{
+		final PermissionUser user = manager.getUser(base.getName());
+		if (user == null)
+		{
+			return "default";
+		}
+		return user.getGroupsNames()[0];
+	}
+
+	public boolean canBuild(Player base, String group)
+	{
+		final PermissionUser user = manager.getUser(base.getName());
+		if (user == null)
+		{
+			return true;
+		}
+
+		return user.getOptionBoolean("build", base.getWorld().getName(), true);
+	}
+
+	public boolean inGroup(Player base, String group)
+	{
+		final PermissionUser user = manager.getUser(base.getName());
+		if (user == null)
+		{
+			return false;
+		}
+
+		return user.inGroup(group);
+	}
+
+	public boolean hasPermission(Player base, String node)
+	{
+		return manager.has(base.getName(), node, base.getWorld().getName());
+	}
+
+	public String getPrefix(Player base)
+	{
+		final PermissionUser user = manager.getUser(base.getName());
+		if (user == null)
+		{
+			return "";
+		}
+		return user.getPrefix();
+	}
+
+	public String getSuffix(Player base)
+	{
+		final PermissionUser user = manager.getUser(base.getName());
+		if (user == null)
+		{
+			return "";
+		}
+		return user.getSuffix();
+	}
+}

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

@@ -0,0 +1,78 @@
+package com.earth2me.essentials;
+
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import net.minecraft.server.EntityPlayer;
+import net.minecraft.server.IInventory;
+import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer;
+import org.bukkit.entity.Player;
+
+
+public class PlayerExtension extends PlayerWrapper
+{
+	protected final IEssentials ess;
+	
+	public PlayerExtension(Player base, IEssentials ess)
+	{
+		super(base);
+		this.ess = ess;
+	}
+
+	public boolean isBanned()
+	{
+		return ess.getBans().isNameBanned(this.getName());
+	}
+
+	public boolean isIpBanned()
+	{
+		return ess.getBans().isIpBanned(getAddress().getAddress().getHostAddress());
+	}
+
+	public float getCorrectedYaw()
+	{
+		float angle = (getLocation().getYaw() - 90.0f) % 360.0f;
+		if (angle < 0) {
+			angle += 360.0f;
+		}
+		return angle;
+	}
+	
+	public void showInventory(IInventory inventory)
+	{
+		getHandle().a(inventory);
+	}
+
+	public void showInventory(CraftInventoryPlayer inventory)
+	{
+		showInventory((IInventory)inventory.getInventory());
+	}
+
+	public TargetBlock getTarget()
+	{
+		return new TargetBlock(getBase());
+	}
+
+	public String getGroup()
+	{
+		return ess.getPermissionsHandler().getGroup(base);
+	}
+	
+	public boolean inGroup(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/PlayerWrapper.java

@@ -0,0 +1,627 @@
+package com.earth2me.essentials;
+
+import java.net.InetSocketAddress;
+import java.util.*;
+import org.bukkit.*;
+import org.bukkit.block.Block;
+import org.bukkit.entity.*;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.inventory.*;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionAttachment;
+import org.bukkit.permissions.PermissionAttachmentInfo;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.util.Vector;
+
+public class PlayerWrapper implements Player
+{
+	protected Player base;
+	
+	public PlayerWrapper(Player base)
+	{
+		this.base = base;
+	}
+	
+	public final Player getBase()
+	{
+		return base;
+	}
+	
+	public final Player setBase(Player base)
+	{
+		return this.base = base;
+	}
+
+	@Override
+	public void setDisplayName(String string)
+	{
+		base.setDisplayName(string);
+	}
+
+	@Override
+	public void setCompassTarget(Location lctn)
+	{
+		base.setCompassTarget(lctn);
+	}
+
+	@Override
+	public InetSocketAddress getAddress()
+	{
+		return base.getAddress();
+	}
+
+	@Override
+	public void kickPlayer(String string)
+	{
+		base.kickPlayer(string);
+	}
+
+	@Override
+	public String getName()
+	{
+		return base.getName();
+	}
+
+	@Override
+	public PlayerInventory getInventory()
+	{
+		return base.getInventory();
+	}
+
+	@Override
+	public ItemStack getItemInHand()
+	{
+		return base.getItemInHand();
+	}
+
+	@Override
+	public void setItemInHand(ItemStack is)
+	{
+		base.setItemInHand(is);
+	}
+
+	@Override
+	public int getHealth()
+	{
+		return base.getHealth();
+	}
+
+	@Override
+	public void setHealth(int i)
+	{
+		base.setHealth(i);
+	}
+
+	@Override
+	public Egg throwEgg()
+	{
+		return base.throwEgg();
+	}
+
+	@Override
+	public Snowball throwSnowball()
+	{
+		return base.throwSnowball();
+	}
+
+	@Override
+	public Arrow shootArrow()
+	{
+		return base.shootArrow();
+	}
+
+	@Override
+	public boolean isInsideVehicle()
+	{
+		return base.isInsideVehicle();
+	}
+
+	@Override
+	public boolean leaveVehicle()
+	{
+		return base.leaveVehicle();
+	}
+
+	@Override
+	public Vehicle getVehicle()
+	{
+		return base.getVehicle();
+	}
+
+	@Override
+	public Location getLocation()
+	{
+		return base.getLocation();
+	}
+
+	@Override
+	public World getWorld()
+	{
+		return base.getWorld();
+	}
+
+	@Override
+	public Server getServer()
+	{
+		return base.getServer();
+	}
+
+	@Override
+	public boolean isOnline()
+	{
+		return base.isOnline();
+	}
+
+	@Override
+	public boolean isOp()
+	{
+		return base.isOp();
+	}
+	
+	@Override
+	public boolean teleport(Location lctn)
+	{
+		return base.teleport(lctn);
+	}
+	
+	@Override
+	public boolean teleport(Entity entity)
+	{
+		return base.teleport(entity);
+	}
+
+	@Override
+	public void sendMessage(String string)
+	{
+		base.sendMessage(string);
+	}
+
+	@Override
+	public void setVelocity(Vector vector)
+	{
+		base.setVelocity(vector);
+	}
+
+	@Override
+	public Vector getVelocity()
+	{
+		return base.getVelocity();
+	}
+
+	@Override
+	public double getEyeHeight()
+	{
+		return base.getEyeHeight();
+	}
+
+	@Override
+	public double getEyeHeight(boolean bln)
+	{
+		return base.getEyeHeight(bln);
+	}
+
+	@Override
+	public List<Block> getLineOfSight(HashSet<Byte> hs, int i)
+	{
+		return base.getLineOfSight(hs, i);
+	}
+
+	@Override
+	public Block getTargetBlock(HashSet<Byte> hs, int i)
+	{
+		return base.getTargetBlock(hs, i);
+	}
+
+	@Override
+	public List<Block> getLastTwoTargetBlocks(HashSet<Byte> hs, int i)
+	{
+		return base.getLastTwoTargetBlocks(hs, i);
+	}
+
+	@Override
+	public int getFireTicks()
+	{
+		return base.getFireTicks();
+	}
+
+	@Override
+	public int getMaxFireTicks()
+	{
+		return base.getMaxFireTicks();
+	}
+
+	@Override
+	public void setFireTicks(int i)
+	{
+		base.setFireTicks(i);
+	}
+
+	@Override
+	public void remove()
+	{
+		base.remove();
+	}
+	
+	/**
+	 * This is not deprecated because the underlying method isn't really deprecated; rather, it's just "imperfect".  By
+	 * We will continue to use this method even after the underlying CraftBukkit method is changed, so do not deprecate
+	 * it.  Chances are Bukkit will also choose to un-deprecate this method at some point.
+	 */
+	@Override
+	public void updateInventory()
+	{
+		base.updateInventory();
+	}
+
+	@Override
+	public void chat(String string)
+	{
+		base.chat(string);
+	}
+
+	@Override
+	public boolean isSneaking()
+	{
+		return base.isSneaking();
+	}
+
+	@Override
+	public void setSneaking(boolean bln)
+	{
+		base.setSneaking(bln);
+	}
+
+	@Override
+	public int getEntityId()
+	{
+		return base.getEntityId();
+	}
+
+	@Override
+	public boolean performCommand(String string)
+	{
+		return base.performCommand(string);
+	}
+
+	@Override
+	public int getRemainingAir()
+	{
+		return base.getRemainingAir();
+	}
+
+	@Override
+	public void setRemainingAir(int i)
+	{
+		base.setRemainingAir(i);
+	}
+
+	@Override
+	public int getMaximumAir()
+	{
+		return base.getMaximumAir();
+	}
+
+	@Override
+	public void setMaximumAir(int i)
+	{
+		base.setMaximumAir(i);
+	}
+
+	@Override
+	public String getDisplayName()
+	{
+		if (base.getDisplayName() != null)
+			return base.getDisplayName();
+		else
+			return base.getName();
+	}
+
+	@Override
+	public void damage(int i)
+	{
+		base.damage(i);
+	}
+
+	@Override
+	public void damage(int i, Entity entity)
+	{
+		base.damage(i, entity);
+	}
+
+	@Override
+	public Location getEyeLocation()
+	{
+		return base.getEyeLocation();
+	}
+
+	@Override
+	public void sendRawMessage(String string) {
+		base.sendRawMessage(string);
+	}
+
+	@Override
+	public Location getCompassTarget()
+	{
+		return base.getCompassTarget();
+	}
+
+	@Override
+	public int getMaximumNoDamageTicks()
+	{
+		return base.getMaximumNoDamageTicks();
+	}
+
+	@Override
+	public void setMaximumNoDamageTicks(int i)
+	{
+		base.setMaximumNoDamageTicks(i);
+	}
+
+	@Override
+	public int getLastDamage()
+	{
+		return base.getLastDamage();
+	}
+
+	@Override
+	public void setLastDamage(int i)
+	{
+		base.setLastDamage(i);
+	}
+
+	@Override
+	public int getNoDamageTicks()
+	{
+		return base.getNoDamageTicks();
+	}
+
+	@Override
+	public void setNoDamageTicks(int i)
+	{
+		base.setNoDamageTicks(i);
+	}
+
+	@Override
+	public Entity getPassenger()
+	{
+		return base.getPassenger();
+	}
+
+	@Override
+	public boolean setPassenger(Entity entity)
+	{
+		return base.setPassenger(entity);
+	}
+
+	@Override
+	public boolean isEmpty()
+	{
+		return base.isEmpty();
+	}
+
+	@Override
+	public boolean eject()
+	{
+		return base.eject();
+	}
+
+	@Override
+	@Deprecated
+	public void teleportTo(Location lctn)
+	{
+		base.teleportTo(lctn);
+	}
+
+	@Override
+	@Deprecated
+	public void teleportTo(Entity entity)
+	{
+		base.teleportTo(entity);
+	}
+
+	public void saveData()
+	{
+		base.saveData();
+	}
+
+	public void loadData()
+	{
+		base.loadData();
+	}
+
+	public boolean isSleeping()
+	{
+		return base.isSleeping();
+	}
+
+	public int getSleepTicks()
+	{
+		return base.getSleepTicks();
+	}
+
+	public List<Entity> getNearbyEntities(double d, double d1, double d2)
+	{
+		return base.getNearbyEntities(d, d1, d2);
+	}
+
+	public boolean isDead()
+	{
+		return base.isDead();
+	}
+
+	public float getFallDistance()
+	{
+		return base.getFallDistance();
+	}
+
+	public void setFallDistance(float f)
+	{
+		base.setFallDistance(f);
+	}
+
+	public void setSleepingIgnored(boolean bln)
+	{
+		base.setSleepingIgnored(bln);
+	}
+
+	public boolean isSleepingIgnored()
+	{
+		return base.isSleepingIgnored();
+	}
+
+	public void awardAchievement(Achievement a)
+	{
+		base.awardAchievement(a);
+	}
+
+	public void incrementStatistic(Statistic ststc)
+	{
+		base.incrementStatistic(ststc);
+	}
+
+	public void incrementStatistic(Statistic ststc, int i)
+	{
+		base.incrementStatistic(ststc, i);
+	}
+
+	public void incrementStatistic(Statistic ststc, Material mtrl)
+	{
+		base.incrementStatistic(ststc, mtrl);
+	}
+
+	public void incrementStatistic(Statistic ststc, Material mtrl, int i)
+	{
+		base.incrementStatistic(ststc, mtrl, i);
+	}
+
+	public void playNote(Location lctn, byte b, byte b1)
+	{
+		base.playNote(lctn, b, b1);
+	}
+
+	public void sendBlockChange(Location lctn, Material mtrl, byte b)
+	{
+		base.sendBlockChange(lctn, mtrl, b);
+	}
+
+	public void sendBlockChange(Location lctn, int i, byte b)
+	{
+		base.sendBlockChange(lctn, i, b);
+	}
+
+	public void setLastDamageCause(EntityDamageEvent ede)
+	{
+		base.setLastDamageCause(ede);
+		
+	}
+
+	public EntityDamageEvent getLastDamageCause()
+	{
+		return base.getLastDamageCause();
+	}
+
+	public void playEffect(Location lctn, Effect effect, int i)
+	{
+		base.playEffect(lctn, effect, i);
+	}
+
+	public boolean sendChunkChange(Location lctn, int i, int i1, int i2, byte[] bytes)
+	{
+		return base.sendChunkChange(lctn, i, i1, i2, bytes);
+	}
+
+	public UUID getUniqueId()
+	{
+		return base.getUniqueId();
+	}
+
+	public void playNote(Location lctn, Instrument i, Note note)
+	{
+		base.playNote(lctn, i, note);
+	}
+
+	public void setPlayerTime(long l, boolean bln)
+	{
+		base.setPlayerTime(l, bln);
+	}
+
+	public long getPlayerTime()
+	{
+		return base.getPlayerTime();
+	}
+
+	public long getPlayerTimeOffset()
+	{
+		return base.getPlayerTimeOffset();
+	}
+
+	public boolean isPlayerTimeRelative()
+	{
+		return base.isPlayerTimeRelative();
+	}
+
+	public void resetPlayerTime()
+	{
+		base.resetPlayerTime();
+	}
+
+	public boolean isPermissionSet(String string)
+	{
+		return base.isPermissionSet(string);
+	}
+
+	public boolean isPermissionSet(Permission prmsn)
+	{
+		return base.isPermissionSet(prmsn);
+	}
+
+	public boolean hasPermission(String string)
+	{
+		return base.hasPermission(string);
+	}
+
+	public boolean hasPermission(Permission prmsn)
+	{
+		return base.hasPermission(prmsn);
+	}
+
+	public PermissionAttachment addAttachment(Plugin plugin, String string, boolean bln)
+	{
+		return base.addAttachment(plugin, string, bln);
+	}
+
+	public PermissionAttachment addAttachment(Plugin plugin)
+	{
+		return base.addAttachment(plugin);
+	}
+	
+	public PermissionAttachment addAttachment(Plugin plugin, String string, boolean bln, int i)
+	{
+		return base.addAttachment(plugin, string, bln, i);
+	}
+
+	public PermissionAttachment addAttachment(Plugin plugin, int i)
+	{
+		return base.addAttachment(plugin, i);
+	}
+
+	public void removeAttachment(PermissionAttachment pa)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void recalculatePermissions()
+	{
+		base.recalculatePermissions();
+	}
+
+	public Set<PermissionAttachmentInfo> getEffectivePermissions()
+	{
+		return base.getEffectivePermissions();
+	}
+
+	public void setOp(boolean bln)
+	{
+		base.setOp(bln);
+	}
+}

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

@@ -0,0 +1,476 @@
+package com.earth2me.essentials;
+
+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.inventory.ItemStack;
+
+
+public class Settings implements ISettings
+{
+	private final transient EssentialsConf config;
+	private final static Logger logger = Logger.getLogger("Minecraft");
+	private final transient IEssentials ess;
+
+	public Settings(IEssentials ess)
+	{
+		this.ess = ess;
+		config = new EssentialsConf(new File(ess.getDataFolder(), "config.yml"));
+		config.setTemplateName("/config.yml");
+		reloadConfig();
+	}
+
+	@Override
+	public boolean getRespawnAtHome()
+	{
+		return config.getBoolean("respawn-at-home", false);
+	}
+
+	@Override
+	public boolean getBedSetsHome()
+	{
+		return config.getBoolean("bed-sethome", false);
+	}
+
+	@Override
+	public int getChatRadius()
+	{
+		return config.getInt("chat.radius", config.getInt("chat-radius", 0));
+	}
+
+	@Override
+	public double getTeleportDelay()
+	{
+		return config.getDouble("teleport-delay", 0);
+	}
+
+	@Override
+	public int getDefaultStackSize()
+	{
+		return config.getInt("default-stack-size", 64);
+	}
+	
+	@Override
+	public int getStartingBalance()
+	{
+		return config.getInt("starting-balance", 0);
+	}
+
+	@Override
+	public boolean getNetherPortalsEnabled()
+	{
+		return isNetherEnabled() && config.getBoolean("nether.portals-enabled", false);
+	}
+
+	@Override
+	public boolean isCommandDisabled(final IEssentialsCommand cmd)
+	{
+		return isCommandDisabled(cmd.getName());
+	}
+
+	@Override
+	public boolean isCommandDisabled(String label)
+	{
+		for (String c : config.getStringList("disabled-commands", new ArrayList<String>(0)))
+		{
+			if (!c.equalsIgnoreCase(label)) continue;
+			return true;
+		}
+		return config.getBoolean("disable-" + label.toLowerCase(), false);
+	}
+
+	@Override
+	public boolean isCommandRestricted(IEssentialsCommand cmd)
+	{
+		return isCommandRestricted(cmd.getName());
+	}
+
+	@Override
+	public boolean isCommandRestricted(String label)
+	{
+		for (String c : config.getStringList("restricted-commands", new ArrayList<String>(0)))
+		{
+			if (!c.equalsIgnoreCase(label)) continue;
+			return true;
+		}
+		return config.getBoolean("restrict-" + label.toLowerCase(), false);
+	}
+	
+	@Override
+	public boolean isPlayerCommand(String label)
+	{
+		for (String c : config.getStringList("player-commands", new ArrayList<String>(0)))
+		{
+			if (!c.equalsIgnoreCase(label)) continue;
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean isCommandOverridden(String name)
+	{
+		List<String> defaultList = new ArrayList<String>(1);
+		defaultList.add("god");
+		for (String c : config.getStringList("overridden-commands", defaultList))
+		{
+			if (!c.equalsIgnoreCase(name))
+				continue;
+			return true;
+		}
+		return config.getBoolean("override-" + name.toLowerCase(), false);
+	}
+
+	@Override
+	public double getCommandCost(IEssentialsCommand cmd)
+	{
+		return getCommandCost(cmd.getName());
+	}
+
+	@Override
+	public double getCommandCost(String label)
+	{
+		double cost = config.getDouble("command-costs." + label, 0.0);
+		if (cost == 0.0)
+			cost = config.getDouble("cost-" + label, 0.0);
+		return cost;
+	}
+
+	@Override
+	public String getNicknamePrefix()
+	{
+		return config.getString("nickname-prefix", "~");
+	}
+
+	@Override
+	public double getTeleportCooldown()
+	{
+		return config.getDouble("teleport-cooldown", 60);
+	}
+
+	@Override
+	public double getHealCooldown()
+	{
+		return config.getDouble("heal-cooldown", 60);
+	}
+
+	@Override
+	public Object getKit(String name)
+	{
+		Map<String, Object> kits = (Map<String, Object>)config.getProperty("kits");
+		for (Map.Entry<String, Object> entry : kits.entrySet())
+		{
+			if (entry.getKey().equalsIgnoreCase(name.replace('.', '_').replace('/', '_'))) {
+				return entry.getValue();
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public Map<String, Object> getKits()
+	{
+		return (Map<String, Object>)config.getProperty("kits");
+	}
+
+	@Override
+	public ChatColor getOperatorColor() throws Exception
+	{
+		String colorName = config.getString("ops-name-color", null);
+
+		if (colorName == null)
+			return ChatColor.RED;
+		if("none".equalsIgnoreCase(colorName) || colorName.isEmpty())
+			throw new Exception();
+
+		try
+		{
+			return ChatColor.valueOf(colorName.toUpperCase());
+		}
+		catch (IllegalArgumentException ex)
+		{
+		}
+
+		return ChatColor.getByCode(Integer.parseInt(colorName, 16));
+	}
+
+	@Override
+	public boolean getReclaimSetting()
+	{
+		return config.getBoolean("reclaim-onlogout", true);
+	}
+
+	@Override
+	public String getNetherName()
+	{
+		return config.getString("nether.folder", "nether");
+	}
+
+	@Override
+	public boolean isNetherEnabled()
+	{
+		return config.getBoolean("nether.enabled", true);
+	}
+
+	@Override
+	public int getSpawnMobLimit()
+	{
+		return config.getInt("spawnmob-limit", 10);
+	}
+        
+	@Override
+	public boolean showNonEssCommandsInHelp()
+	{
+		return config.getBoolean("non-ess-in-help", true);
+	}
+        
+	@Override
+        public boolean hidePermissionlessHelp()
+	{
+		return config.getBoolean("hide-permissionless-help", true);
+	}          
+
+	@Override
+	public int getProtectCreeperMaxHeight()
+	{
+		return config.getInt("protect.creeper.max-height", -1);
+	}
+
+	@Override
+	public boolean areSignsDisabled()
+	{
+		return config.getBoolean("signs-disabled", false);
+	}
+
+	@Override
+	public long getBackupInterval()
+	{
+		return config.getInt("backup.interval", 1440); // 1440 = 24 * 60
+	}
+
+	@Override
+	public String getBackupCommand()
+	{
+		return config.getString("backup.command", null);
+	}
+
+	@Override
+	public String getChatFormat(String group)
+	{
+		return config.getString("chat.group-formats." + (group == null ? "Default" : group),
+								config.getString("chat.format", "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}"));
+	}
+
+	@Override
+	public boolean getGenerateExitPortals()
+	{
+		return config.getBoolean("nether.generate-exit-portals", true);
+	}
+
+	@Override
+	public boolean getAnnounceNewPlayers()
+	{
+		return !config.getString("newbies.announce-format", "-").isEmpty();
+	}
+
+	@Override
+	public String getAnnounceNewPlayerFormat(IUser user)
+	{
+		return format(config.getString("newbies.announce-format", "&dWelcome {DISPLAYNAME} to the server!"), user);
+	}
+
+	@Override
+	public String format(String format, IUser user)
+	{
+		return format.replace('&', '§').replace("§§", "&").replace("{PLAYER}", user.getDisplayName()).replace("{DISPLAYNAME}", user.getDisplayName()).replace("{GROUP}", user.getGroup()).replace("{USERNAME}", user.getName()).replace("{ADDRESS}", user.getAddress().toString());
+	}
+
+	@Override
+	public String getNewbieSpawn()
+	{
+		return config.getString("newbies.spawnpoint", "default");
+	}
+	@Override
+        public boolean getPerWarpPermission()
+	{
+		return config.getBoolean("per-warp-permission", false);
+	}
+	
+	@Override
+	public boolean getSortListByGroups()
+	{
+		return config.getBoolean("sort-list-by-groups", true);
+	}
+
+	@Override
+	public void reloadConfig() {
+		config.load();
+	}
+
+	@Override
+	public List<Integer> itemSpawnBlacklist()
+	{
+		final List<Integer> epItemSpwn = new ArrayList<Integer>();
+		for (String itemName : config.getString("item-spawn-blacklist", "").split(",")) {
+			itemName = itemName.trim();
+			if (itemName.isEmpty()) {
+				continue;
+			}
+			ItemStack is;
+			try {
+				is = ess.getItemDb().get(itemName);
+				epItemSpwn.add(is.getTypeId());
+			} catch (Exception ex) {
+				logger.log(Level.SEVERE, Util.format("unknownItemInList", itemName, "item-spawn-blacklist"));
+			}
+		}
+		return epItemSpwn;
+	}
+
+	@Override
+	public boolean spawnIfNoHome()
+	{
+		return config.getBoolean("spawn-if-no-home", false);
+	}
+
+	@Override
+	public boolean warnOnBuildDisallow()
+	{
+		return config.getBoolean("protect.disable.warn-on-build-disallow", false);
+	}
+
+	@Override
+	public boolean use1to1RatioInNether()
+	{
+		return config.getBoolean("nether.use-1to1-ratio", false);
+	}
+	
+	@Override
+	public double getNetherRatio()
+	{
+		if (config.getBoolean("nether.use-1to1-ratio", false)) {
+			return 1.0;
+		}
+		return config.getDouble("nether.ratio", 16.0);
+	}
+	
+	@Override
+	public boolean isDebug()
+	{
+		return config.getBoolean("debug", false);
+	}
+
+	@Override
+	public boolean warnOnSmite()
+	{
+		return config.getBoolean("warn-on-smite" ,true);
+	}
+	
+	@Override
+	public boolean permissionBasedItemSpawn()
+	{
+		return config.getBoolean("permission-based-item-spawn", false);
+	}
+
+	@Override
+	public String getLocale()
+	{
+		return config.getString("locale", "");
+	}
+
+	@Override
+	public String getCurrencySymbol()
+	{
+		return config.getString("currency-symbol", "$").substring(0, 1).replaceAll("[0-9]", "$");
+	}
+
+	@Override
+	public boolean isTradeInStacks(int id)
+	{
+		return config.getBoolean("trade-in-stacks-" + id, false);
+	}
+
+	@Override
+	public boolean isEcoDisabled()
+	{
+		return config.getBoolean("disable-eco", false);
+	}
+
+	@Override
+	public boolean getProtectPreventSpawn(final String creatureName)
+	{
+		return config.getBoolean("protect.prevent.spawn."+creatureName, false);
+	}
+
+	@Override
+	public List<Integer> getProtectList(final String configName)
+	{
+		final List<Integer> list = new ArrayList<Integer>();
+		for (String itemName : config.getString(configName, "").split(",")) {
+			itemName = itemName.trim();
+			if (itemName.isEmpty()) {
+				continue;
+			}
+			ItemStack itemStack;
+			try {
+				itemStack = ess.getItemDb().get(itemName);
+				list.add(itemStack.getTypeId());
+			} catch (Exception ex) {
+				logger.log(Level.SEVERE, Util.format("unknownItemInList", itemName, configName));
+			}
+		}
+		return list;
+	}
+
+	@Override
+	public String getProtectString(final String configName)
+	{
+		return config.getString(configName, null);
+	}
+
+	@Override
+	public boolean getProtectBoolean(final String configName, boolean def)
+	{
+		return config.getBoolean(configName, def);
+	}
+
+	private final static double MAXMONEY = 10000000000000.0;
+	public double getMaxMoney()
+	{
+		double max = config.getDouble("max-money", MAXMONEY);
+		if (Math.abs(max) > MAXMONEY) {
+			max = max < 0 ? -MAXMONEY : MAXMONEY;
+		}
+		return max;
+	}
+
+	public boolean isEcoLogEnabled()
+	{
+		return config.getBoolean("economy-log-enabled", false);
+	}
+	
+	public boolean removeGodOnDisconnect()
+	{
+		return config.getBoolean("remove-god-on-disconnect", false);
+	}
+
+	public boolean changeDisplayName()
+	{
+		return config.getBoolean("change-displayname", true);
+	}
+
+	public boolean useBukkitPermissions()
+	{
+		return config.getBoolean("use-bukkit-permissions", false);
+	}
+
+	public boolean addPrefixSuffix()
+	{
+		return config.getBoolean("add-prefix-suffix", false);
+	}
+}

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

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

@@ -0,0 +1,82 @@
+package com.earth2me.essentials;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+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 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;
+
+	public TNTExplodeListener(IEssentials ess)
+	{
+		this.ess = ess;
+	}
+
+	public void enable()
+	{
+		if (!enabled)
+		{
+			enabled = true;
+			timer = ess.scheduleSyncDelayedTask(this, 1000);
+			return;
+		}
+		if (timer != -1) {
+			ess.getScheduler().cancelTask(timer);
+			timer = ess.scheduleSyncDelayedTask(this, 1000);
+		}
+	}
+
+	@Override
+	public void onEntityExplode(final EntityExplodeEvent event)
+	{
+		if (!enabled)
+		{
+			return;
+		}
+		if (event.getEntity() instanceof LivingEntity)
+		{
+			return;
+		}
+		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));
+		event.setCancelled(true);
+	}
+
+	public void run()
+	{
+		enabled = false;
+	}
+}

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

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

@@ -0,0 +1,280 @@
+package com.earth2me.essentials;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.logging.Logger;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+
+
+public class Teleport implements Runnable
+{
+	private static final double MOVE_CONSTANT = 0.3;
+	private static class Target
+	{
+		private final Location location;
+		private final Entity entity;
+
+		public Target(Location location)
+		{
+			this.location = location;
+			this.entity = null;
+		}
+
+		public Target(Entity entity)
+		{
+			this.entity = entity;
+			this.location = null;
+		}
+
+		public Location getLocation()
+		{
+			if (this.entity != null)
+			{
+				return this.entity.getLocation();
+			}
+			return location;
+		}
+	}
+	private IUser user;
+	private int teleTimer = -1;
+	private long started;	// time this task was initiated
+	private long delay;		// how long to delay the teleport
+	private int health;
+	// note that I initially stored a clone of the location for reference, but...
+	// when comparing locations, I got incorrect mismatches (rounding errors, looked like)
+	// so, the X/Y/Z values are stored instead and rounded off
+	private long initX;
+	private long initY;
+	private long initZ;
+	private Target teleportTarget;
+	private Trade chargeFor;
+	private final IEssentials ess;
+	private static final Logger logger = Logger.getLogger("Minecraft");
+
+	private void initTimer(long delay, Target target, Trade chargeFor)
+	{
+		this.started = System.currentTimeMillis();
+		this.delay = delay;
+		this.health = user.getHealth();
+		this.initX = Math.round(user.getLocation().getX()*MOVE_CONSTANT);
+		this.initY = Math.round(user.getLocation().getY()*MOVE_CONSTANT);
+		this.initZ = Math.round(user.getLocation().getZ()*MOVE_CONSTANT);
+		this.teleportTarget = target;
+		this.chargeFor = chargeFor;
+	}
+
+	public void run()
+	{
+
+		if (user == null || !user.isOnline() || user.getLocation() == null)
+		{
+			cancel();
+			return;
+		}
+		if (Math.round(user.getLocation().getX()*MOVE_CONSTANT) != initX
+			|| Math.round(user.getLocation().getY()*MOVE_CONSTANT) != initY
+			|| Math.round(user.getLocation().getZ()*MOVE_CONSTANT) != initZ
+			|| user.getHealth() < health)
+		{	// user moved, cancel teleport
+			cancel(true);
+			return;
+		}
+
+		health = user.getHealth();  // in case user healed, then later gets injured
+
+		long now = System.currentTimeMillis();
+		if (now > started + delay)
+		{
+			try
+			{
+				cooldown(false);
+				user.sendMessage(Util.i18n("teleportationCommencing"));
+				try
+				{
+					
+					now(teleportTarget);
+					if (chargeFor != null)
+					{
+						chargeFor.charge(user);
+					}
+				}
+				catch (Throwable ex)
+				{
+					ess.showError(user.getBase(), ex, "teleport");
+				}
+				return;
+			}
+			catch (Exception ex)
+			{
+				user.sendMessage(Util.format("cooldownWithMessage", ex.getMessage()));
+			}
+		}
+	}
+
+	public Teleport(IUser user, IEssentials ess)
+	{
+		this.user = user;
+		this.ess = ess;
+	}
+
+	public void respawn(Spawn spawn, Trade chargeFor) throws Exception
+	{
+		teleport(new Target(spawn.getSpawn(user.getGroup())), chargeFor);
+	}
+
+	public void warp(String warp, Trade chargeFor) throws Exception
+	{
+		Location loc = ess.getWarps().getWarp(warp);
+		teleport(new Target(loc), chargeFor);
+		user.sendMessage(Util.format("warpingTo", warp));
+	}
+
+	public void cooldown(boolean check) throws Exception
+	{
+		Calendar now = new GregorianCalendar();
+		if (user.getLastTeleportTimestamp() > 0)
+		{
+			double cooldown = ess.getSettings().getTeleportCooldown();
+			Calendar cooldownTime = new GregorianCalendar();
+			cooldownTime.setTimeInMillis(user.getLastTeleportTimestamp());
+			cooldownTime.add(Calendar.SECOND, (int)cooldown);
+			cooldownTime.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
+			if (cooldownTime.after(now) && !user.isAuthorized("essentials.teleport.cooldown.bypass"))
+			{
+				throw new Exception(Util.format("timeBeforeTeleport", Util.formatDateDiff(cooldownTime.getTimeInMillis())));
+			}
+		}
+		// if justCheck is set, don't update lastTeleport; we're just checking
+		if (!check)
+		{
+			user.setLastTeleportTimestamp(now.getTimeInMillis());
+		}
+	}
+
+	public void cancel(boolean notifyUser)
+	{
+		if (teleTimer == -1)
+		{
+			return;
+		}
+		try
+		{
+			ess.getServer().getScheduler().cancelTask(teleTimer);
+			if (notifyUser)
+			{
+				user.sendMessage(Util.i18n("pendingTeleportCancelled"));
+			}
+		}
+		finally
+		{
+			teleTimer = -1;
+		}
+	}
+
+	public void cancel()
+	{
+		cancel(false);
+	}
+
+	public void teleport(Location loc, Trade chargeFor) throws Exception
+	{
+		teleport(new Target(loc), chargeFor);
+	}
+
+	public void teleport(Entity entity, Trade chargeFor) throws Exception
+	{
+		teleport(new Target(entity), chargeFor);
+	}
+
+	private void teleport(Target target, Trade chargeFor) throws Exception
+	{
+		double delay = ess.getSettings().getTeleportDelay();
+
+		if (chargeFor != null)
+		{
+			chargeFor.isAffordableFor(user);
+		}
+		cooldown(true);
+		if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
+		{
+			cooldown(false);
+			now(target);
+			if (chargeFor != null)
+			{
+				chargeFor.charge(user);
+			}
+			return;
+		}
+
+		cancel();
+		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);
+
+		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
+	}
+
+	private void now(Target target) throws Exception
+	{
+		cancel();
+		user.setLastLocation();
+		user.getBase().teleport(Util.getSafeDestination(target.getLocation()));
+	}
+
+	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
+	{
+		if (cooldown)
+		{
+			cooldown(false);
+		}
+		now(new Target(entity));
+	}
+
+	public void back(Trade chargeFor) throws Exception
+	{
+		teleport(new Target(user.getLastLocation()), chargeFor);
+	}
+
+	public void back() throws Exception
+	{
+		back(null);
+	}
+
+	public void home(Trade chargeFor) throws Exception
+	{
+		home(user, chargeFor);
+	}
+
+	public void home(IUser user, Trade chargeFor) throws Exception
+	{
+		Location loc = user.getHome(this.user.getLocation());
+		if (loc == null)
+		{
+			if (ess.getSettings().spawnIfNoHome())
+			{
+				respawn(ess.getSpawn(), chargeFor);
+			}
+			else
+			{
+				throw new Exception(user == this.user ? Util.i18n("noHomeSet") : Util.i18n("noHomeSetPlayer"));
+			}
+		}
+		teleport(new Target(loc), chargeFor);
+	}
+}

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

@@ -0,0 +1,243 @@
+package com.earth2me.essentials;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Location;
+import org.bukkit.inventory.ItemStack;
+
+
+public class Trade
+{
+	private final transient String command;
+	private final transient Double money;
+	private final transient ItemStack itemStack;
+	private final transient IEssentials ess;
+
+	public Trade(final String command, final IEssentials ess)
+	{
+		this(command, null, null, ess);
+	}
+
+	public Trade(final double money, final IEssentials ess)
+	{
+		this(null, money, null, ess);
+	}
+
+	public Trade(final ItemStack items, final IEssentials ess)
+	{
+		this(null, null, items, ess);
+	}
+
+	private Trade(final String command, final Double money, final ItemStack item, final IEssentials ess)
+	{
+		this.command = command;
+		this.money = money;
+		this.itemStack = item;
+		this.ess = ess;
+	}
+
+	public void isAffordableFor(final IUser user) throws ChargeException
+	{
+		final double mon = user.getMoney();
+		if (getMoney() != null
+			&& mon < getMoney()
+			&& getMoney() > 0
+			&& !user.isAuthorized("essentials.eco.loan"))
+		{
+			throw new ChargeException(Util.i18n("notEnoughMoney"));
+		}
+
+		if (getItemStack() != null
+			&& !InventoryWorkaround.containsItem(user.getInventory(), true, itemStack))
+		{
+			throw new ChargeException(Util.format("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase().replace("_", " ")));
+		}
+
+		if (command != null && !command.isEmpty()
+			&& !user.isAuthorized("essentials.nocommandcost.all")
+			&& !user.isAuthorized("essentials.nocommandcost." + command)
+			&& mon < ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
+			&& 0 < ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
+			&& !user.isAuthorized("essentials.eco.loan"))
+		{
+			throw new ChargeException(Util.i18n("notEnoughMoney"));
+		}
+	}
+
+	public void pay(final IUser user)
+	{
+		if (getMoney() != null && getMoney() > 0)
+		{
+			user.giveMoney(getMoney());
+		}
+		if (getItemStack() != null)
+		{
+			final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItem(user.getInventory(), true, getItemStack());
+			for (ItemStack itemStack : leftOver.values())
+			{
+				InventoryWorkaround.dropItem(user.getLocation(), itemStack);
+			}
+			user.updateInventory();
+		}
+	}
+
+	public void charge(final IUser user) throws ChargeException
+	{
+		if (getMoney() != null)
+		{
+			final double mon = user.getMoney();
+			if (mon < getMoney() && getMoney() > 0 && !user.isAuthorized("essentials.eco.loan"))
+			{
+				throw new ChargeException(Util.i18n("notEnoughMoney"));
+			}
+			user.takeMoney(getMoney());
+		}
+		if (getItemStack() != null)
+		{
+			if (!InventoryWorkaround.containsItem(user.getInventory(), true, itemStack))
+			{
+				throw new ChargeException(Util.format("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase().replace("_", " ")));
+			}
+			InventoryWorkaround.removeItem(user.getInventory(), true, getItemStack());
+			user.updateInventory();
+		}
+		if (command != null && !command.isEmpty()
+			&& !user.isAuthorized("essentials.nocommandcost.all")
+			&& !user.isAuthorized("essentials.nocommandcost." + command))
+		{
+			final double mon = user.getMoney();
+			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"));
+			}
+			user.takeMoney(cost);
+		}
+	}
+
+	public Double getMoney()
+	{
+		return money;
+	}
+
+	public ItemStack getItemStack()
+	{
+		return itemStack;
+	}
+	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)
+	{
+		if (!ess.getSettings().isEcoLogEnabled())
+		{
+			return;
+		}
+		if (fw == null)
+		{
+			try
+			{
+				fw = new FileWriter(new File(ess.getDataFolder(), "trade.log"), true);
+			}
+			catch (IOException ex)
+			{
+				Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
+			}
+		}
+		StringBuilder sb = new StringBuilder();
+		sb.append(type).append(",").append(subtype).append(",").append(event).append(",\"");
+		sb.append(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).format(new Date()));
+		sb.append("\",\"");
+		if (sender != null)
+		{
+			sb.append(sender);
+		}
+		sb.append("\",");
+		if (charge == null)
+		{
+			sb.append("\"\",\"\",\"\"");
+		}
+		else
+		{
+			if (charge.getItemStack() != null)
+			{
+				sb.append(charge.getItemStack().getAmount()).append(",");
+				sb.append(charge.getItemStack().getType().toString()).append(",");
+				sb.append(charge.getItemStack().getDurability());
+			}
+			if (charge.getMoney() != null)
+			{
+				sb.append(charge.getMoney()).append(",");
+				sb.append("money").append(",");
+				sb.append(ess.getSettings().getCurrencySymbol());
+			}
+		}
+		sb.append(",\"");
+		if (receiver != null)
+		{
+			sb.append(receiver);
+		}
+		sb.append("\",");
+		if (pay == null)
+		{
+			sb.append("\"\",\"\",\"\"");
+		}
+		else
+		{
+			if (pay.getItemStack() != null)
+			{
+				sb.append(pay.getItemStack().getAmount()).append(",");
+				sb.append(pay.getItemStack().getType().toString()).append(",");
+				sb.append(pay.getItemStack().getDurability());
+			}
+			if (pay.getMoney() != null)
+			{
+				sb.append(pay.getMoney()).append(",");
+				sb.append("money").append(",");
+				sb.append(ess.getSettings().getCurrencySymbol());
+			}
+		}
+		if (loc == null)
+		{
+			sb.append(",\"\",\"\",\"\",\"\"");
+		}
+		else
+		{
+			sb.append(",\"");
+			sb.append(loc.getWorld().getName()).append("\",");
+			sb.append(loc.getBlockX()).append(",");
+			sb.append(loc.getBlockY()).append(",");
+			sb.append(loc.getBlockZ()).append(",");
+		}
+		sb.append("\n");
+		try
+		{
+			fw.write(sb.toString());
+			fw.flush();
+		}
+		catch (IOException ex)
+		{
+			Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
+		}
+	}
+
+	public static void closeLog()
+	{
+		if (fw != null) {
+			try
+			{
+				fw.close();
+			}
+			catch (IOException ex)
+			{
+				Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
+			}
+			fw = null;
+		}
+	}
+}

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

@@ -0,0 +1,348 @@
+package com.earth2me.essentials;
+
+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.Logger;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class User extends UserData implements Comparable<User>, IReplyTo, IUser
+{
+	private static final Logger logger = Logger.getLogger("Minecraft");
+	private boolean justPortaled = false;
+	private CommandSender replyTo = null;
+	private User teleportRequester;
+	private boolean teleportRequestHere;
+	private final Teleport teleport;
+	private long lastActivity;
+	private boolean hidden = false;
+
+	User(Player base, IEssentials ess)
+	{
+		super(base, ess);
+		teleport = new Teleport(this, ess);
+	}
+
+	User update(Player base)
+	{
+		setBase(base);
+		return this;
+	}
+
+	public boolean isAuthorized(IEssentialsCommand cmd)
+	{
+		return isAuthorized(cmd, "essentials.");
+	}
+
+	public boolean isAuthorized(IEssentialsCommand cmd, String permissionPrefix)
+	{
+		return isAuthorized(permissionPrefix + (cmd.getName().equals("r") ? "msg" : cmd.getName()));
+	}
+
+	public boolean isAuthorized(String node)
+	{
+		if (isOp())
+		{
+			return true;
+		}
+
+		if (isJailed())
+		{
+			return false;
+		}
+
+		return ess.getPermissionsHandler().hasPermission(this, node);
+	}
+
+	public void healCooldown() throws Exception
+	{
+		Calendar now = new GregorianCalendar();
+		if (getLastHealTimestamp() > 0)
+		{
+			double cooldown = ess.getSettings().getHealCooldown();
+			Calendar cooldownTime = new GregorianCalendar();
+			cooldownTime.setTimeInMillis(getLastHealTimestamp());
+			cooldownTime.add(Calendar.SECOND, (int)cooldown);
+			cooldownTime.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
+			if (cooldownTime.after(now) && !isAuthorized("essentials.heal.cooldown.bypass"))
+			{
+				throw new Exception(Util.format("timeBeforeHeal", Util.formatDateDiff(cooldownTime.getTimeInMillis())));
+			}
+		}
+		setLastHealTimestamp(now.getTimeInMillis());
+	}
+
+	public void giveMoney(double value)
+	{
+		giveMoney(value, null);
+	}
+
+	public void giveMoney(double value, CommandSender initiator)
+	{
+		if (value == 0)
+		{
+			return;
+		}
+		setMoney(getMoney() + value);
+		sendMessage(Util.format("addedToAccount", Util.formatCurrency(value, ess)));
+		if (initiator != null)
+		{
+			initiator.sendMessage((Util.format("addedToOthersAccount", Util.formatCurrency(value, ess), this.getDisplayName())));
+		}
+	}
+
+	public void payUser(User reciever, double value) throws Exception
+	{
+		if (value == 0)
+		{
+			return;
+		}
+		if (!canAfford(value))
+		{
+			throw new Exception(Util.i18n("notEnoughMoney"));
+		}
+		else
+		{
+			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()));
+		}
+	}
+
+	public void takeMoney(double value)
+	{
+		takeMoney(value, null);
+	}
+
+	public void takeMoney(double value, CommandSender initiator)
+	{
+		if (value == 0)
+		{
+			return;
+		}
+		setMoney(getMoney() - value);
+		sendMessage(Util.format("takenFromAccount", Util.formatCurrency(value, ess)));
+		if (initiator != null)
+		{
+			initiator.sendMessage((Util.format("takenFromOthersAccount", Util.formatCurrency(value, ess), this.getDisplayName())));
+		}
+	}
+
+	public boolean canAfford(double cost)
+	{
+		double mon = getMoney();
+		return mon >= cost || isAuthorized("essentials.eco.loan");
+	}
+
+	public void dispose()
+	{
+		this.base = new OfflinePlayer(getName(), ess);
+	}
+
+	public boolean getJustPortaled()
+	{
+		return justPortaled;
+	}
+
+	public void setJustPortaled(boolean value)
+	{
+		justPortaled = value;
+	}
+
+	public void setReplyTo(CommandSender user)
+	{
+		replyTo = user;
+	}
+
+	public CommandSender getReplyTo()
+	{
+		return replyTo;
+	}
+
+	public int compareTo(User t)
+	{
+		return ChatColor.stripColor(this.getDisplayName()).compareToIgnoreCase(ChatColor.stripColor(t.getDisplayName()));
+	}
+
+	@Override
+	public boolean equals(Object o)
+	{
+		if (!(o instanceof User))
+		{
+			return false;
+		}
+		return ChatColor.stripColor(this.getDisplayName()).equalsIgnoreCase(ChatColor.stripColor(((User)o).getDisplayName()));
+
+	}
+
+	@Override
+	public int hashCode()
+	{
+		return ChatColor.stripColor(this.getDisplayName()).hashCode();
+	}
+
+	public Boolean canSpawnItem(int itemId)
+	{
+		return !ess.getSettings().itemSpawnBlacklist().contains(itemId);
+	}
+
+	public void setHome()
+	{
+		setHome(getLocation(), true);
+	}
+
+	public void setHome(boolean defaultHome)
+	{
+		setHome(getLocation(), defaultHome);
+	}
+
+	public void setLastLocation()
+	{
+		setLastLocation(getLocation());
+	}
+
+	public void requestTeleport(User player, boolean here)
+	{
+		teleportRequester = player;
+		teleportRequestHere = here;
+	}
+
+	public User getTeleportRequest()
+	{
+		return teleportRequester;
+	}
+
+	public boolean isTeleportRequestHere()
+	{
+		return teleportRequestHere;
+	}
+
+	public String getNick()
+	{
+		final StringBuilder nickname = new StringBuilder();
+		final String nick = getNickname();
+		if (ess.getSettings().isCommandDisabled("nick") || nick == null || nick.isEmpty() || nick.equals(getName()))
+		{
+			nickname.append(getName());
+		}
+		else
+		{
+			nickname.append(ess.getSettings().getNicknamePrefix()).append(nick);
+		}
+		if (isOp())
+		{
+			try
+			{
+				nickname.insert(0, ess.getSettings().getOperatorColor().toString());
+				nickname.append("§f");
+			}
+			catch (Exception e)
+			{
+			}
+		}
+
+		if (ess.getSettings().addPrefixSuffix())
+		{
+			final String prefix = ess.getPermissionsHandler().getPrefix(this).replace('&', '§').replace("{WORLDNAME}", this.getWorld().getName());
+			final String suffix = ess.getPermissionsHandler().getSuffix(this).replace('&', '§').replace("{WORLDNAME}", this.getWorld().getName());
+
+			nickname.insert(0, prefix);
+			nickname.append(suffix);
+			if (suffix.length() < 2 || !suffix.substring(suffix.length() - 2, suffix.length() - 1).equals("§"))
+			{
+				nickname.append("§f");
+			}
+		}
+
+		return nickname.toString();
+	}
+
+	public Teleport getTeleport()
+	{
+		return teleport;
+	}
+
+	public long getLastActivity()
+	{
+		return lastActivity;
+	}
+
+	public void setLastActivity(long timestamp)
+	{
+		lastActivity = timestamp;
+	}
+
+	@Override
+	public double getMoney()
+	{
+		if (ess.getPaymentMethod().hasMethod())
+		{
+			try
+			{
+				Method method = ess.getPaymentMethod().getMethod();
+				if (!method.hasAccount(this.getName()))
+				{
+					throw new Exception();
+				}
+				Method.MethodAccount account = ess.getPaymentMethod().getMethod().getAccount(this.getName());
+				return account.balance();
+			}
+			catch (Throwable ex)
+			{
+			}
+		}
+		return super.getMoney();
+	}
+
+	@Override
+	public void setMoney(double value)
+	{
+		if (ess.getPaymentMethod().hasMethod())
+		{
+			try
+			{
+				Method method = ess.getPaymentMethod().getMethod();
+				if (!method.hasAccount(this.getName()))
+				{
+					throw new Exception();
+				}
+				Method.MethodAccount account = ess.getPaymentMethod().getMethod().getAccount(this.getName());
+				account.set(value);
+			}
+			catch (Throwable ex)
+			{
+			}
+		}
+		super.setMoney(value);
+	}
+
+	@Override
+	public void setAfk(boolean set)
+	{
+		this.setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : set);
+		super.setAfk(set);
+	}
+
+	@Override
+	public boolean toggleAfk()
+	{
+		boolean now = super.toggleAfk();
+		this.setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : now);
+		return now;
+	}
+
+	public boolean isHidden()
+	{
+		return hidden;
+	}
+
+	public void setHidden(boolean hidden)
+	{
+		this.hidden = hidden;
+	}
+}

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

@@ -0,0 +1,712 @@
+package com.earth2me.essentials;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+
+public abstract class UserData extends PlayerExtension implements IConf
+{
+	private final EssentialsConf config;
+	private static final Logger logger = Logger.getLogger("Minecraft");
+
+	protected UserData(Player base, IEssentials ess)
+	{
+		super(base, ess);
+		File folder = new File(ess.getDataFolder(), "userdata");
+		if (!folder.exists())
+		{
+			folder.mkdirs();
+		}
+		config = new EssentialsConf(new File(folder, Util.sanitizeFileName(base.getName()) + ".yml"));
+		reloadConfig();
+	}
+
+	public final void reloadConfig()
+	{
+		config.load();
+		money = _getMoney();
+		unlimited = _getUnlimited();
+		powertools = getPowertools();
+		lastLocation = _getLastLocation();
+		lastTeleportTimestamp = _getLastTeleportTimestamp();
+		lastHealTimestamp = _getLastHealTimestamp();
+		jail = _getJail();
+		mails = _getMails();
+		savedInventory = _getSavedInventory();
+		teleportEnabled = getTeleportEnabled();
+		ignoredPlayers = getIgnoredPlayers();
+		godmode = getGodModeEnabled();
+		muted = getMuted();
+		muteTimeout = _getMuteTimeout();
+		jailed = getJailed();
+		jailTimeout = _getJailTimeout();
+		lastLogin = _getLastLogin();
+		lastLogout = _getLastLogout();
+		afk = getAfk();
+		newplayer = getNew();
+		geolocation = _getGeoLocation();
+		isSocialSpyEnabled = _isSocialSpyEnabled();
+		isNPC = _isNPC();
+	}
+	private double money;
+
+	private double _getMoney()
+	{
+		double money = ess.getSettings().getStartingBalance();
+		if (config.hasProperty("money"))
+		{
+			money = config.getDouble("money", money);
+		}
+		if (Math.abs(money) > ess.getSettings().getMaxMoney())
+		{
+			money = money < 0 ? -ess.getSettings().getMaxMoney() : ess.getSettings().getMaxMoney();
+		}
+		return money;
+	}
+
+	public double getMoney()
+	{
+		return money;
+	}
+
+	public void setMoney(double value)
+	{
+		money = value;
+		if (Math.abs(money) > ess.getSettings().getMaxMoney())
+		{
+			money = money < 0 ? -ess.getSettings().getMaxMoney() : ess.getSettings().getMaxMoney();
+		}
+		config.setProperty("money", value);
+		config.save();
+	}
+
+	public boolean hasHome()
+	{
+		if (config.hasProperty("home"))
+		{
+			return true;
+		}
+		return false;
+	}
+
+	public Location getHome(Location location)
+	{
+		if (!hasHome())
+		{
+			return null;
+		}
+		World world = location.getWorld();
+		String worldHome = "home.worlds." + world.getName().toLowerCase();
+		if (!config.hasProperty(worldHome))
+		{
+			String defaultWorld = config.getString("home.default");
+			worldHome = "home.worlds." + defaultWorld;
+		}
+		Location loc = config.getLocation(worldHome, getServer());
+		return loc;
+	}
+
+	public void setHome(Location loc, boolean b)
+	{
+		String worldName = loc.getWorld().getName().toLowerCase();
+		if (worldName == null || worldName.isEmpty())
+		{
+			logger.log(Level.WARNING, Util.i18n("emptyWorldName"));
+			return;
+		}
+		if (b || !config.hasProperty("home.default"))
+		{
+			config.setProperty("home.default", worldName);
+		}
+
+		config.setProperty("home.worlds." + worldName, loc);
+		config.save();
+	}
+
+	public String getNickname()
+	{
+		return config.getString("nickname");
+	}
+
+	public void setNickname(String nick)
+	{
+		config.setProperty("nickname", nick);
+		config.save();
+	}
+	private List<Integer> unlimited;
+
+	private List<Integer> _getUnlimited()
+	{
+		return config.getIntList("unlimited", new ArrayList<Integer>());
+	}
+
+	public List<Integer> getUnlimited()
+	{
+		return unlimited;
+	}
+
+	public boolean hasUnlimited(ItemStack stack)
+	{
+		return unlimited.contains(stack.getTypeId());
+	}
+
+	public void setUnlimited(ItemStack stack, boolean state)
+	{
+		if (unlimited.contains(stack.getTypeId()))
+		{
+			unlimited.remove(Integer.valueOf(stack.getTypeId()));
+		}
+		if (state)
+		{
+			unlimited.add(stack.getTypeId());
+		}
+		config.setProperty("unlimited", unlimited);
+		config.save();
+	}
+	private Map<Integer, String> powertools;
+
+	@SuppressWarnings("unchecked")
+	private Map<Integer, String> getPowertools()
+	{
+		Object o = config.getProperty("powertools");
+		if (o instanceof Map)
+		{
+			return (Map<Integer, String>)o;
+		}
+		else
+		{
+			return new HashMap<Integer, String>();
+		}
+
+	}
+
+	public String getPowertool(ItemStack stack)
+	{
+		return powertools.get(stack.getTypeId());
+	}
+
+	public void setPowertool(ItemStack stack, String command)
+	{
+		if (command == null || command.isEmpty())
+		{
+			powertools.remove(stack.getTypeId());
+		}
+		else
+		{
+			powertools.put(stack.getTypeId(), command);
+		}
+		config.setProperty("powertools", powertools);
+		config.save();
+	}
+	private Location lastLocation;
+
+	private Location _getLastLocation()
+	{
+		return config.getLocation("lastlocation", getServer());
+	}
+
+	public Location getLastLocation()
+	{
+		return lastLocation;
+	}
+
+	public void setLastLocation(Location loc)
+	{
+		lastLocation = loc;
+		config.setProperty("lastlocation", loc);
+		config.save();
+	}
+	private long lastTeleportTimestamp;
+
+	private long _getLastTeleportTimestamp()
+	{
+		return config.getLong("timestamps.lastteleport", 0);
+	}
+
+	public long getLastTeleportTimestamp()
+	{
+		return lastTeleportTimestamp;
+	}
+
+	public void setLastTeleportTimestamp(long time)
+	{
+		lastTeleportTimestamp = time;
+		config.setProperty("timestamps.lastteleport", time);
+		config.save();
+	}
+	private long lastHealTimestamp;
+
+	private long _getLastHealTimestamp()
+	{
+		return config.getLong("timestamps.lastheal", 0);
+	}
+
+	public long getLastHealTimestamp()
+	{
+		return lastHealTimestamp;
+	}
+
+	public void setLastHealTimestamp(long time)
+	{
+		lastHealTimestamp = time;
+		config.setProperty("timestamps.lastheal", time);
+		config.save();
+	}
+	private String jail;
+
+	private String _getJail()
+	{
+		return config.getString("jail");
+	}
+
+	public String getJail()
+	{
+		return jail;
+	}
+
+	public void setJail(String jail)
+	{
+		if (jail == null || jail.isEmpty())
+		{
+			this.jail = null;
+			config.removeProperty("jail");
+		}
+		else
+		{
+			this.jail = jail;
+			config.setProperty("jail", jail);
+		}
+		config.save();
+	}
+	private List<String> mails;
+
+	private List<String> _getMails()
+	{
+		return config.getStringList("mail", new ArrayList<String>());
+	}
+
+	public List<String> getMails()
+	{
+		return mails;
+	}
+
+	public void setMails(List<String> mails)
+	{
+		if (mails == null)
+		{
+			config.removeProperty("mail");
+			mails = _getMails();
+		}
+		else
+		{
+			config.setProperty("mail", mails);
+		}
+		this.mails = mails;
+		config.save();
+	}
+
+	public void addMail(String mail)
+	{
+		mails.add(mail);
+		setMails(mails);
+	}
+	private ItemStack[] savedInventory;
+
+	public ItemStack[] getSavedInventory()
+	{
+		return savedInventory;
+	}
+
+	private ItemStack[] _getSavedInventory()
+	{
+		int size = config.getInt("inventory.size", 0);
+		if (size < 1 || (getInventory() != null && size > getInventory().getSize()))
+		{
+			return null;
+		}
+		ItemStack[] is = new ItemStack[size];
+		for (int i = 0; i < size; i++)
+		{
+			is[i] = config.getItemStack("inventory." + i);
+		}
+		return is;
+	}
+
+	public void setSavedInventory(ItemStack[] is)
+	{
+		if (is == null || is.length == 0)
+		{
+			savedInventory = null;
+			config.removeProperty("inventory");
+		}
+		else
+		{
+			savedInventory = is;
+			config.setProperty("inventory.size", is.length);
+			for (int i = 0; i < is.length; i++)
+			{
+				if (is[i] == null || is[i].getType() == Material.AIR)
+				{
+					continue;
+				}
+				config.setProperty("inventory." + i, is[i]);
+			}
+		}
+		config.save();
+	}
+	private boolean teleportEnabled;
+
+	private boolean getTeleportEnabled()
+	{
+		return config.getBoolean("teleportenabled", true);
+	}
+
+	public boolean isTeleportEnabled()
+	{
+		return teleportEnabled;
+	}
+
+	public void setTeleportEnabled(boolean set)
+	{
+		teleportEnabled = set;
+		config.setProperty("teleportenabled", set);
+		config.save();
+	}
+
+	public boolean toggleTeleportEnabled()
+	{
+		boolean ret = !isTeleportEnabled();
+		setTeleportEnabled(ret);
+		return ret;
+	}
+
+	public boolean toggleSocialSpy()
+	{
+		boolean ret = !isSocialSpyEnabled();
+		setSocialSpyEnabled(ret);
+		return ret;
+	}
+	private List<String> ignoredPlayers;
+
+	public List<String> getIgnoredPlayers()
+	{
+		return config.getStringList("ignore", new ArrayList<String>());
+	}
+
+	public void setIgnoredPlayers(List<String> players)
+	{
+		if (players == null || players.isEmpty())
+		{
+			ignoredPlayers = new ArrayList<String>();
+			config.removeProperty("ignore");
+		}
+		else
+		{
+			ignoredPlayers = players;
+			config.setProperty("ignore", players);
+		}
+		config.save();
+	}
+
+	public boolean isIgnoredPlayer(String name)
+	{
+		return ignoredPlayers.contains(name.toLowerCase());
+	}
+
+	public void setIgnoredPlayer(String name, boolean set)
+	{
+		if (set)
+		{
+			ignoredPlayers.add(name.toLowerCase());
+		}
+		else
+		{
+			ignoredPlayers.remove(name.toLowerCase());
+		}
+		setIgnoredPlayers(ignoredPlayers);
+	}
+	private boolean godmode;
+
+	private boolean getGodModeEnabled()
+	{
+		return config.getBoolean("godmode", false);
+	}
+
+	public boolean isGodModeEnabled()
+	{
+		return godmode;
+	}
+
+	public void setGodModeEnabled(boolean set)
+	{
+		godmode = set;
+		config.setProperty("godmode", set);
+		config.save();
+	}
+
+	public boolean toggleGodModeEnabled()
+	{
+		boolean ret = !isGodModeEnabled();
+		setGodModeEnabled(ret);
+		return ret;
+	}
+	private boolean muted;
+
+	private boolean getMuted()
+	{
+		return config.getBoolean("muted", false);
+	}
+
+	public boolean isMuted()
+	{
+		return muted;
+	}
+
+	public void setMuted(boolean set)
+	{
+		muted = set;
+		config.setProperty("muted", set);
+		config.save();
+	}
+
+	public boolean toggleMuted()
+	{
+		boolean ret = !isMuted();
+		setMuted(ret);
+		return ret;
+	}
+	private long muteTimeout;
+
+	private long _getMuteTimeout()
+	{
+		return config.getLong("timestamps.mute", 0);
+	}
+
+	public long getMuteTimeout()
+	{
+		return muteTimeout;
+	}
+
+	public void setMuteTimeout(long time)
+	{
+		muteTimeout = time;
+		config.setProperty("timestamps.mute", time);
+		config.save();
+	}
+	private boolean jailed;
+
+	private boolean getJailed()
+	{
+		return config.getBoolean("jailed", false);
+	}
+
+	public boolean isJailed()
+	{
+		return jailed;
+	}
+
+	public void setJailed(boolean set)
+	{
+		jailed = set;
+		config.setProperty("jailed", set);
+		config.save();
+	}
+
+	public boolean toggleJailed()
+	{
+		boolean ret = !isJailed();
+		setJailed(ret);
+		return ret;
+	}
+	private long jailTimeout;
+
+	private long _getJailTimeout()
+	{
+		return config.getLong("timestamps.jail", 0);
+	}
+
+	public long getJailTimeout()
+	{
+		return jailTimeout;
+	}
+
+	public void setJailTimeout(long time)
+	{
+		jailTimeout = time;
+		config.setProperty("timestamps.jail", time);
+		config.save();
+	}
+
+	public String getBanReason()
+	{
+		return config.getString("ban.reason");
+	}
+
+	public void setBanReason(String reason)
+	{
+		config.setProperty("ban.reason", reason);
+		config.save();
+	}
+
+	public long getBanTimeout()
+	{
+		return config.getLong("ban.timeout", 0);
+	}
+
+	public void setBanTimeout(long time)
+	{
+		config.setProperty("ban.timeout", time);
+		config.save();
+	}
+	private long lastLogin;
+
+	private long _getLastLogin()
+	{
+		return config.getLong("timestamps.login", 0);
+	}
+
+	public long getLastLogin()
+	{
+		return lastLogin;
+	}
+
+	public void setLastLogin(long time)
+	{
+		lastLogin = time;
+		config.setProperty("timestamps.login", time);
+		config.save();
+	}
+	private long lastLogout;
+
+	private long _getLastLogout()
+	{
+		return config.getLong("timestamps.logout", 0);
+	}
+
+	public long getLastLogout()
+	{
+		return lastLogout;
+	}
+
+	public void setLastLogout(long time)
+	{
+		lastLogout = time;
+		config.setProperty("timestamps.logout", time);
+		config.save();
+	}
+	private boolean afk;
+
+	private boolean getAfk()
+	{
+		return config.getBoolean("afk", false);
+	}
+
+	public boolean isAfk()
+	{
+		return afk;
+	}
+
+	public void setAfk(boolean set)
+	{
+		afk = set;
+		config.setProperty("afk", set);
+		config.save();
+	}
+
+	public boolean toggleAfk()
+	{
+		boolean ret = !isAfk();
+		setAfk(ret);
+		return ret;
+	}
+	private boolean newplayer;
+
+	private boolean getNew()
+	{
+		return config.getBoolean("newplayer", true);
+	}
+
+	public boolean isNew()
+	{
+		return newplayer;
+	}
+
+	public void setNew(boolean set)
+	{
+		newplayer = set;
+		config.setProperty("newplayer", set);
+		config.save();
+	}
+	private String geolocation;
+
+	private String _getGeoLocation()
+	{
+		return config.getString("geolocation");
+	}
+
+	public String getGeoLocation()
+	{
+		return geolocation;
+	}
+
+	public void setGeoLocation(String geolocation)
+	{
+		if (geolocation == null || geolocation.isEmpty())
+		{
+			this.geolocation = null;
+			config.removeProperty("geolocation");
+		}
+		else
+		{
+			this.geolocation = geolocation;
+			config.setProperty("geolocation", geolocation);
+		}
+		config.save();
+	}
+	private boolean isSocialSpyEnabled;
+
+	private boolean _isSocialSpyEnabled()
+	{
+		return config.getBoolean("socialspy", false);
+	}
+
+	public boolean isSocialSpyEnabled()
+	{
+		return isSocialSpyEnabled;
+	}
+
+	public void setSocialSpyEnabled(boolean status)
+	{
+		isSocialSpyEnabled = status;
+		config.setProperty("socialspy", status);
+		config.save();
+	}
+	private boolean isNPC;
+
+	private boolean _isNPC()
+	{
+		return config.getBoolean("npc", false);
+	}
+
+	public boolean isNPC()
+	{
+		return isNPC;
+	}
+
+	public void setNPC(boolean set)
+	{
+		isNPC = set;
+		config.setProperty("npc", set);
+		config.save();
+	}
+}

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

@@ -0,0 +1,482 @@
+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 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.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+
+
+public class Util
+{
+	private Util()
+	{
+	}
+	private final static Logger logger = Logger.getLogger("Minecraft");
+
+	public static String sanitizeFileName(String name)
+	{
+		return name.toLowerCase().replaceAll("[^a-z0-9]", "_");
+	}
+
+	public static String formatDateDiff(long date)
+	{
+		Calendar c = new GregorianCalendar();
+		c.setTimeInMillis(date);
+		Calendar now = new GregorianCalendar();
+		return Util.formatDateDiff(now, c);
+	}
+
+	public static String formatDateDiff(Calendar fromDate, Calendar toDate)
+	{
+		boolean future = false;
+		if (toDate.equals(fromDate))
+		{
+			return Util.i18n("now");
+		}
+		if (toDate.after(fromDate))
+		{
+			future = true;
+		}
+
+		StringBuilder sb = new StringBuilder();
+		int[] types = new int[]
+		{
+			Calendar.YEAR,
+			Calendar.MONTH,
+			Calendar.DAY_OF_MONTH,
+			Calendar.HOUR_OF_DAY,
+			Calendar.MINUTE,
+			Calendar.SECOND
+		};
+		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")
+		};
+		for (int i = 0; i < types.length; i++)
+		{
+			int diff = dateDiff(types[i], fromDate, toDate, future);
+			if (diff > 0)
+			{
+				sb.append(" ").append(diff).append(" ").append(names[i * 2 + (diff > 1 ? 1 : 0)]);
+			}
+		}
+		if (sb.length() == 0)
+		{
+			return "now";
+		}
+		return sb.toString();
+	}
+
+	private static int dateDiff(int type, Calendar fromDate, Calendar toDate, boolean future)
+	{
+		int diff = 0;
+		long savedDate = fromDate.getTimeInMillis();
+		while ((future && !fromDate.after(toDate)) || (!future && !fromDate.before(toDate)))
+		{
+			savedDate = fromDate.getTimeInMillis();
+			fromDate.add(type, future ? 1 : -1);
+			diff++;
+		}
+		diff--;
+		fromDate.setTimeInMillis(savedDate);
+		return diff;
+	}
+
+	public static long parseDateDiff(String time, boolean future) throws Exception
+	{
+		Pattern timePattern = Pattern.compile(
+				"(?:([0-9]+)\\s*y[a-z]*[,\\s]*)?"
+				+ "(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?"
+				+ "(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?"
+				+ "(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?"
+				+ "(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?"
+				+ "(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?"
+				+ "(?:([0-9]+)\\s*(?:s[a-z]*)?)?", Pattern.CASE_INSENSITIVE);
+		Matcher m = timePattern.matcher(time);
+		int years = 0;
+		int months = 0;
+		int weeks = 0;
+		int days = 0;
+		int hours = 0;
+		int minutes = 0;
+		int seconds = 0;
+		boolean found = false;
+		while (m.find())
+		{
+			if (m.group() == null || m.group().isEmpty())
+			{
+				continue;
+			}
+			for (int i = 0; i < m.groupCount(); i++)
+			{
+				if (m.group(i) != null && !m.group(i).isEmpty())
+				{
+					found = true;
+					break;
+				}
+			}
+			if (found)
+			{
+				if (m.group(1) != null && !m.group(1).isEmpty())
+				{
+					years = Integer.parseInt(m.group(1));
+				}
+				if (m.group(2) != null && !m.group(2).isEmpty())
+				{
+					months = Integer.parseInt(m.group(2));
+				}
+				if (m.group(3) != null && !m.group(3).isEmpty())
+				{
+					weeks = Integer.parseInt(m.group(3));
+				}
+				if (m.group(4) != null && !m.group(4).isEmpty())
+				{
+					days = Integer.parseInt(m.group(4));
+				}
+				if (m.group(5) != null && !m.group(5).isEmpty())
+				{
+					hours = Integer.parseInt(m.group(5));
+				}
+				if (m.group(6) != null && !m.group(6).isEmpty())
+				{
+					minutes = Integer.parseInt(m.group(6));
+				}
+				if (m.group(7) != null && !m.group(7).isEmpty())
+				{
+					seconds = Integer.parseInt(m.group(7));
+				}
+				break;
+			}
+		}
+		if (!found)
+		{
+			throw new Exception(Util.i18n("illegalDate"));
+		}
+		Calendar c = new GregorianCalendar();
+		if (years > 0)
+		{
+			c.add(Calendar.YEAR, years * (future ? 1 : -1));
+		}
+		if (months > 0)
+		{
+			c.add(Calendar.MONTH, months * (future ? 1 : -1));
+		}
+		if (weeks > 0)
+		{
+			c.add(Calendar.WEEK_OF_YEAR, weeks * (future ? 1 : -1));
+		}
+		if (days > 0)
+		{
+			c.add(Calendar.DAY_OF_MONTH, days * (future ? 1 : -1));
+		}
+		if (hours > 0)
+		{
+			c.add(Calendar.HOUR_OF_DAY, hours * (future ? 1 : -1));
+		}
+		if (minutes > 0)
+		{
+			c.add(Calendar.MINUTE, minutes * (future ? 1 : -1));
+		}
+		if (seconds > 0)
+		{
+			c.add(Calendar.SECOND, seconds * (future ? 1 : -1));
+		}
+		return c.getTimeInMillis();
+	}
+
+	public static Location getSafeDestination(final Location loc) throws Exception
+	{
+		if (loc == null || loc.getWorld() == null)
+		{
+			throw new Exception(Util.i18n("destinationNotSet"));
+		}
+		final World world = loc.getWorld();
+		int x = loc.getBlockX();
+		int y = loc.getBlockY();
+		int z = loc.getBlockZ();
+
+		while (isBlockAboveAir(world, x, y, z))
+		{
+			y -= 1;
+			if (y < 0)
+			{
+				throw new Exception(Util.i18n("holeInFloor"));
+			}
+		}
+
+		while (isBlockUnsafe(world, x, y, z))
+		{
+			y += 1;
+			if (y >= 127)
+			{
+				x += 1;
+				break;
+			}
+		}
+		while (isBlockUnsafe(world, x, y, z))
+		{
+			y -= 1;
+			if (y <= 1)
+			{
+				y = 127;
+				x += 1;
+			}
+		}
+		return new Location(world, x + 0.5D, y, z + 0.5D, loc.getYaw(), loc.getPitch());
+	}
+
+	private static boolean isBlockAboveAir(final World world, final int x, final int y, final int z)
+	{
+		return world.getBlockAt(x, y - 1, z).getType() == Material.AIR;
+	}
+
+	public static boolean isBlockUnsafe(final World world, final int x, final int y, final int z)
+	{
+		final Block below = world.getBlockAt(x, y - 1, z);
+		if (below.getType() == Material.LAVA || below.getType() == Material.STATIONARY_LAVA)
+		{
+			return true;
+		}
+
+		if (below.getType() == Material.FIRE)
+		{
+			return true;
+		}
+
+		if ((world.getBlockAt(x, y, z).getType() != Material.AIR)
+			|| (world.getBlockAt(x, y + 1, z).getType() != Material.AIR))
+		{
+			return true;
+		}
+		return isBlockAboveAir(world, x, y, z);
+	}
+	private static DecimalFormat df = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US));
+
+	public static String formatCurrency(final double value, final IEssentials ess)
+	{
+		String str = ess.getSettings().getCurrencySymbol() + df.format(value);
+		if (str.endsWith(".00"))
+		{
+			str = str.substring(0, str.length() - 3);
+		}
+		return str;
+	}
+
+	public static double roundDouble(final double d)
+	{
+		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)
+	{
+		try
+		{
+			return bundle.getString(string);
+		}
+		catch (MissingResourceException ex)
+		{
+			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()));
+		}
+	}
+
+	public static String joinList(Object... list)
+	{
+		final StringBuilder buf = new StringBuilder();
+		boolean first = true;
+		for (Object each : list)
+		{
+			if (!first)
+			{
+				buf.append(", ");
+
+			}
+			first = false;
+			buf.append(each);
+		}
+		return buf.toString();
+	}
+}

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

@@ -0,0 +1,153 @@
+package com.earth2me.essentials;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Location;
+import org.bukkit.Server;
+
+
+public class Warps implements IConf
+{
+	private static final Logger logger = Logger.getLogger("Minecraft");
+	private final Map<StringIgnoreCase, EssentialsConf> warpPoints = new HashMap<StringIgnoreCase, EssentialsConf>();
+	private final File warpsFolder;
+	private final Server server;
+
+	public Warps(Server server, File dataFolder)
+	{
+		this.server = server;
+		warpsFolder = new File(dataFolder, "warps");
+		if (!warpsFolder.exists())
+		{
+			warpsFolder.mkdirs();
+		}
+		reloadConfig();
+	}
+
+	public boolean isEmpty()
+	{
+		return warpPoints.isEmpty();
+	}
+
+	public Iterable<String> getWarpNames()
+	{
+		List<String> keys = new ArrayList<String>();
+		for (StringIgnoreCase stringIgnoreCase : warpPoints.keySet())
+		{
+			keys.add(stringIgnoreCase.getString());
+		}
+		Collections.sort(keys, String.CASE_INSENSITIVE_ORDER);
+		return keys;
+	}
+
+	public Location getWarp(String warp) throws Exception
+	{
+		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(warp));
+		if (conf == null)
+		{
+			throw new Exception(Util.i18n("warpNotExist"));
+		}
+		return conf.getLocation(null, server);
+	}
+
+	public void setWarp(String name, Location loc) throws Exception
+	{
+		String filename = Util.sanitizeFileName(name);
+		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
+		if (conf == null)
+		{
+			File confFile = new File(warpsFolder, filename + ".yml");
+			if (confFile.exists())
+			{
+				throw new Exception(Util.i18n("similarWarpExist"));
+			}
+			conf = new EssentialsConf(confFile);
+			warpPoints.put(new StringIgnoreCase(name), conf);
+		}
+		conf.setProperty(null, loc);
+		conf.setProperty("name", name);
+		conf.save();
+	}
+
+	public void delWarp(String name) throws Exception
+	{
+		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
+		if (conf == null)
+		{
+			throw new Exception(Util.i18n("warpNotExist"));
+		}
+		if (!conf.getFile().delete())
+		{
+			throw new Exception(Util.i18n("warpDeleteError"));
+		}
+		warpPoints.remove(new StringIgnoreCase(name));
+	}
+
+	public final void reloadConfig()
+	{
+		warpPoints.clear();
+		File[] listOfFiles = warpsFolder.listFiles();
+		if (listOfFiles.length >= 1)
+		{
+			for (int i = 0; i < listOfFiles.length; i++)
+			{
+				String filename = listOfFiles[i].getName();
+				if (listOfFiles[i].isFile() && filename.endsWith(".yml"))
+				{
+					try
+					{
+						EssentialsConf conf = new EssentialsConf(listOfFiles[i]);
+						conf.load();
+						String name = conf.getString("name");
+						if (name != null)
+						{
+							warpPoints.put(new StringIgnoreCase(name), conf);
+						}
+					}
+					catch (Exception ex)
+					{
+						logger.log(Level.WARNING, Util.format("loadWarpError", filename), ex);
+					}
+				}
+			}
+		}
+	}
+
+
+	private static class StringIgnoreCase
+	{
+		private final String string;
+
+		public StringIgnoreCase(String string)
+		{
+			this.string = string;
+		}
+
+		@Override
+		public int hashCode()
+		{
+			return getString().toLowerCase().hashCode();
+		}
+
+		@Override
+		public boolean equals(Object o)
+		{
+			if (o instanceof StringIgnoreCase)
+			{
+				return getString().equalsIgnoreCase(((StringIgnoreCase)o).getString());
+			}
+			return false;
+		}
+
+		public String getString()
+		{
+			return string;
+		}
+	}
+}

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

@@ -0,0 +1,54 @@
+package com.earth2me.essentials;
+
+import java.io.File;
+import java.util.logging.Logger;
+import org.bukkit.inventory.ItemStack;
+
+
+public class Worth implements IConf
+{
+	private static final Logger logger = Logger.getLogger("Minecraft");
+	private final EssentialsConf config;
+
+	public Worth(File dataFolder)
+	{
+		config = new EssentialsConf(new File(dataFolder, "worth.yml"));
+		config.setTemplateName("/worth.yml");
+		config.load();
+	}
+
+	public double getPrice(ItemStack itemStack)
+	{
+		String itemname = itemStack.getType().toString().toLowerCase().replace("_", "");
+		double result;
+		result = config.getDouble("worth."+itemname+"."+itemStack.getDurability(), Double.NaN);
+		if (Double.isNaN(result)) {
+			result = config.getDouble("worth."+itemname+".0", Double.NaN);
+		}
+		if (Double.isNaN(result)) {
+			result = config.getDouble("worth."+itemname, Double.NaN);
+		}
+		if (Double.isNaN(result)) {
+			result = config.getDouble("worth-"+itemStack.getTypeId(), Double.NaN);
+		}
+		return result;
+	}
+
+	public void setPrice(ItemStack itemStack, double price)
+	{
+		if (itemStack.getType().getData() == null) {
+			config.setProperty("worth." + itemStack.getType().toString().toLowerCase().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.removeProperty("worth-"+itemStack.getTypeId());
+		config.save();
+	}
+
+	public void reloadConfig()
+	{
+		config.load();
+	}
+
+}

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

@@ -0,0 +1,293 @@
+package com.earth2me.essentials.api;
+
+import com.earth2me.essentials.EssentialsConf;
+import com.earth2me.essentials.IEssentials;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import java.io.File;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.entity.Player;
+
+
+/**
+ * Instead of using this api directly, we recommend to use the register plugin:
+ * http://bit.ly/RegisterMethod
+ */
+public final class Economy
+{
+	private Economy()
+	{
+	}
+	private static final Logger logger = Logger.getLogger("Minecraft");
+	private static IEssentials ess;
+
+	/**
+	 * @param aEss the ess to set
+	 */
+	public static void setEss(IEssentials aEss)
+	{
+		ess = aEss;
+	}
+
+	private static void createNPCFile(String name)
+	{
+		File folder = new File(ess.getDataFolder(), "userdata");
+		if (!folder.exists())
+		{
+			folder.mkdirs();
+		}
+		EssentialsConf npcConfig = new EssentialsConf(new File(folder, Util.sanitizeFileName(name) + ".yml"));
+		npcConfig.load();
+		npcConfig.setProperty("npc", true);
+		npcConfig.setProperty("money", ess.getSettings().getStartingBalance());
+		npcConfig.save();
+	}
+
+	private static void deleteNPC(String name)
+	{
+		File folder = new File(ess.getDataFolder(), "userdata");
+		if (!folder.exists())
+		{
+			folder.mkdirs();
+		}
+		File config = new File(folder, Util.sanitizeFileName(name) + ".yml");
+		EssentialsConf npcConfig = new EssentialsConf(config);
+		npcConfig.load();
+		if (npcConfig.hasProperty("npc") && npcConfig.getBoolean("npc", false))
+		{
+			if (!config.delete())
+			{
+				logger.log(Level.WARNING, Util.format("deleteFileError", config));
+			}
+			ess.getAllUsers().remove(name.toLowerCase());
+		}
+	}
+
+	private static User getUserByName(String name)
+	{
+		User user;
+		Player player = ess.getServer().getPlayer(name);
+		if (player != null)
+		{
+			user = ess.getUser(player);
+		}
+		else
+		{
+			user = ess.getOfflineUser(name);
+		}
+		return user;
+	}
+
+	/**
+	 * Returns the balance of a user
+	 * @param name Name of the user
+	 * @return balance
+	 * @throws UserDoesNotExistException 
+	 */
+	public static double getMoney(String name) throws UserDoesNotExistException
+	{
+		User user = getUserByName(name);
+		if (user == null)
+		{
+			throw new UserDoesNotExistException(name);
+		}
+		return user.getMoney();
+	}
+
+	/**
+	 * Sets the balance of a user
+	 * @param name Name of the user
+	 * @param balance The balance you want to set
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
+	 */
+	public static void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException
+	{
+		User user = getUserByName(name);
+		if (user == null)
+		{
+			throw new UserDoesNotExistException(name);
+		}
+		if (balance < 0.0 && !user.isAuthorized("essentials.eco.loan"))
+		{
+			throw new NoLoanPermittedException();
+		}
+		user.setMoney(balance);
+	}
+
+	/**
+	 * Adds money to the balance of a user
+	 * @param name Name of the user
+	 * @param amount The money you want to add
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
+	 */
+	public static void add(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
+	{
+		double result = getMoney(name) + amount;
+		setMoney(name, result);
+	}
+
+	/**
+	 * Substracts money from the balance of a user
+	 * @param name Name of the user
+	 * @param amount The money you want to substract
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
+	 */
+	public static void subtract(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
+	{
+		double result = getMoney(name) - amount;
+		setMoney(name, result);
+	}
+
+	/**
+	 * Divides the balance of a user by a value
+	 * @param name Name of the user
+	 * @param value The balance is divided by this value
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
+	 */
+	public static void divide(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException
+	{
+		double result = getMoney(name) / value;
+		setMoney(name, result);
+	}
+
+	/**
+	 * Multiplies the balance of a user by a value
+	 * @param name Name of the user
+	 * @param value The balance is multiplied by this value
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
+	 */
+	public static void multiply(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException
+	{
+		double result = getMoney(name) * value;
+		setMoney(name, result);
+	}
+
+	/**
+	 * Resets the balance of a user to the starting balance
+	 * @param name Name of the user
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
+	 */
+	public static void resetBalance(String name) throws UserDoesNotExistException, NoLoanPermittedException
+	{
+		setMoney(name, ess.getSettings().getStartingBalance());
+	}
+
+	/**
+	 * @param name Name of the user
+	 * @param amount The amount of money the user should have
+	 * @return true, if the user has more or an equal amount of money
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 */
+	public static boolean hasEnough(String name, double amount) throws UserDoesNotExistException
+	{
+		return amount <= getMoney(name);
+	}
+
+	/**
+	 * @param name Name of the user
+	 * @param amount The amount of money the user should have
+	 * @return true, if the user has more money
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 */
+	public static boolean hasMore(String name, double amount) throws UserDoesNotExistException
+	{
+		return amount < getMoney(name);
+	}
+
+	/**
+	 * @param name Name of the user
+	 * @param amount The amount of money the user should not have
+	 * @return true, if the user has less money
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 */
+	public static boolean hasLess(String name, double amount) throws UserDoesNotExistException
+	{
+		return amount > getMoney(name);
+	}
+
+	/**
+	 * Test if the user has a negative balance
+	 * @param name Name of the user
+	 * @return true, if the user has a negative balance
+	 * @throws UserDoesNotExistException If a user by that name does not exists
+	 */
+	public static boolean isNegative(String name) throws UserDoesNotExistException
+	{
+		return getMoney(name) < 0.0;
+	}
+
+	/**
+	 * Formats the amount of money like all other Essentials functions.
+	 * Example: $100000 or $12345.67
+	 * @param amount The amount of money
+	 * @return Formatted money
+	 */
+	public static String format(double amount)
+	{
+		return Util.formatCurrency(amount, ess);
+	}
+
+	/**
+	 * Test if a player exists to avoid the UserDoesNotExistException
+	 * @param name Name of the user
+	 * @return true, if the user exists
+	 */
+	public static boolean playerExists(String name)
+	{
+		return getUserByName(name) != null;
+	}
+
+	/**
+	 * Test if a player is a npc
+	 * @param name Name of the player
+	 * @return true, if it's a npc
+	 * @throws UserDoesNotExistException 
+	 */
+	public static boolean isNPC(String name) throws UserDoesNotExistException
+	{
+		User user = getUserByName(name);
+		if (user == null)
+		{
+			throw new UserDoesNotExistException(name);
+		}
+		return user.isNPC();
+	}
+
+	/**
+	 * Creates dummy files for a npc, if there is no player yet with that name.
+	 * @param name Name of the player
+	 * @return true, if a new npc was created
+	 */
+	public static boolean createNPC(String name)
+	{
+		User user = getUserByName(name);
+		if (user == null)
+		{
+			createNPCFile(name);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Deletes a user, if it is marked as npc. 
+	 * @param name Name of the player
+	 * @throws UserDoesNotExistException 
+	 */
+	public static void removeNPC(String name) throws UserDoesNotExistException
+	{
+		User user = getUserByName(name);
+		if (user == null)
+		{
+			throw new UserDoesNotExistException(name);
+		}
+		deleteNPC(name);
+	}
+}

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

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

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

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

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

@@ -0,0 +1,47 @@
+package com.earth2me.essentials.commands;
+
+import org.bukkit.Server;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+
+
+public class Commandafk extends EssentialsCommand
+{
+	public Commandafk()
+	{
+		super("afk");
+	}
+
+	@Override
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		charge(user);
+
+		if (args.length > 0 && user.isAuthorized("essentials.afk.others"))
+		{
+			User afkUser = ess.getUser(ess.getServer().matchPlayer(args[0]));
+			if (afkUser != null)
+			{
+				toggleAfk(afkUser);
+			}
+		}
+		else
+		{
+			toggleAfk(user);
+		}
+	}
+
+	private final void toggleAfk(User user)
+	{
+		if (!user.toggleAfk())
+		{
+			user.sendMessage(Util.i18n("markedAsNotAway"));
+			ess.broadcastMessage(user.getName(), Util.format("userIsNotAway", user.getDisplayName()));
+		}
+		else
+		{
+			user.sendMessage(Util.i18n("markedAsAway"));
+			ess.broadcastMessage(user.getName(), Util.format("userIsAway", user.getDisplayName()));
+		}
+	}
+}

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

@@ -0,0 +1,27 @@
+package com.earth2me.essentials.commands;
+
+import org.bukkit.Location;
+import org.bukkit.Server;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.TargetBlock;
+import org.bukkit.entity.TNTPrimed;
+
+
+public class Commandantioch extends EssentialsCommand
+{
+	public Commandantioch()
+	{
+		super("antioch");
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		charge(user);
+		ess.broadcastMessage(user.getName(), "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,");
+		ess.broadcastMessage(user.getName(), "who being naughty in My sight, shall snuff it.");
+
+		final Location loc = new TargetBlock(user).getTargetBlock().getLocation();
+		loc.getWorld().spawn(loc, TNTPrimed.class);
+	}
+}

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

@@ -0,0 +1,24 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import org.bukkit.Server;
+
+
+public class Commandback extends EssentialsCommand
+{
+	public Commandback()
+	{
+		super("back");
+	}
+
+	@Override
+	protected void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		Trade charge = new Trade(this.getName(), ess);
+		charge.isAffordableFor(user);
+		user.sendMessage(Util.i18n("backUsageMsg"));
+		user.getTeleport().back(charge);
+	}
+}

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

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

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

@@ -0,0 +1,37 @@
+package com.earth2me.essentials.commands;
+
+import org.bukkit.Server;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import org.bukkit.command.CommandSender;
+
+
+public class Commandbalance extends EssentialsCommand
+{
+	public Commandbalance()
+	{
+		super("balance");
+	}
+
+	@Override
+	protected void run(Server server, CommandSender sender, String commandLabel, 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)));
+	}
+
+	@Override
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		charge(user);
+		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)));
+	}
+}

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

@@ -0,0 +1,67 @@
+package com.earth2me.essentials.commands;
+
+import java.util.Map.Entry;
+import org.bukkit.Server;
+import com.earth2me.essentials.User;
+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 org.bukkit.command.CommandSender;
+
+
+public class Commandbalancetop extends EssentialsCommand
+{
+	public Commandbalancetop()
+	{
+		super("balancetop");
+	}
+
+	@Override
+	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		int max = 10;
+		if (args.length > 0)
+		{
+			try
+			{
+				if (Integer.parseInt(args[0]) < 10)
+				{
+					max = Integer.parseInt(args[0]);
+				}
+			}
+			catch (NumberFormatException ex)
+			{
+				//catch it because they tried to enter a string not number.
+			}
+		}
+		final Map<User, Double> balances = new HashMap<User, Double>();
+		for (User u : ess.getAllUsers().values())
+		{
+			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>>()
+		{
+			public int compare(final Entry<User, Double> entry1, final Entry<User, Double> entry2)
+			{
+				return -entry1.getValue().compareTo(entry2.getValue());
+			}
+		});
+		int count = 0;
+		sender.sendMessage(Util.format("balanceTop", max));
+		for (Map.Entry<User, Double> entry : sortedEntries)
+		{
+			if (count == max)
+			{
+				break;
+			}
+			sender.sendMessage(entry.getKey().getDisplayName() + ", " + Util.formatCurrency(entry.getValue(), ess));
+			count++;
+		}
+	}
+}

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

@@ -0,0 +1,65 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.OfflinePlayer;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import org.bukkit.entity.Player;
+
+
+public class Commandban extends EssentialsCommand
+{
+	public Commandban()
+	{
+		super("ban");
+	}
+
+	@Override
+	public 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 player = getPlayer(server, args, 0, true);
+		if (player.getBase() instanceof OfflinePlayer)
+		{
+			if (sender instanceof Player
+				&& !ess.getUser(sender).isAuthorized("essentials.ban.offline"))
+			{
+				sender.sendMessage(Util.i18n("banExempt"));
+				return;
+			}
+		}
+		else
+		{
+			if (player.isAuthorized("essentials.ban.exempt"))
+			{
+				sender.sendMessage(Util.i18n("banExempt"));
+				return;
+			}
+		}
+
+		String banReason;
+		if (args.length > 1)
+		{
+			banReason = getFinalArg(args, 1);
+			player.setBanReason(commandLabel);
+		}
+		else
+		{
+			banReason = Util.i18n("defaultBanReason");
+		}
+		player.kickPlayer(banReason);
+		ess.getBans().banByName(player.getName());
+		for(Player p : server.getOnlinePlayers())
+		{
+			User u = ess.getUser(p);
+			if(u.isAuthorized("essentials.ban.notify"))
+			{
+			p.sendMessage(Util.format("playerBanned", player.getName(), banReason));
+			}
+		}
+	}
+}

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

@@ -0,0 +1,26 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.Util;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+
+
+public class Commandbanip extends EssentialsCommand
+{
+	public Commandbanip()
+	{
+		super("banip");
+	}
+
+	@Override
+	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		ess.getBans().banByIp(args[0]);
+		sender.sendMessage(Util.i18n("banIpAddress"));
+	}
+}

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

@@ -0,0 +1,69 @@
+package com.earth2me.essentials.commands;
+
+import org.bukkit.Server;
+import org.bukkit.TreeType;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import org.bukkit.Location;
+
+
+public class Commandbigtree extends EssentialsCommand
+{
+	public Commandbigtree()
+	{
+		super("bigtree");
+	}
+
+	@Override
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		TreeType tree;
+		if (args.length > 0 && args[0].equalsIgnoreCase("redwood"))
+		{
+			tree = TreeType.TALL_REDWOOD;
+		}
+		else if (args.length > 0 && args[0].equalsIgnoreCase("tree"))
+		{
+			tree = TreeType.BIG_TREE;
+		}
+		else
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		double x = user.getLocation().getX();
+		double y = user.getLocation().getY();
+		double z = user.getLocation().getZ();
+
+		// offset tree in direction player is facing
+		final int r = (int)user.getCorrectedYaw();
+		if (r < 68 || r > 292)			// north
+		{
+			x -= 3.0D;
+		}			
+		else if (r > 112 && r < 248)	// south
+		{
+			x += 3.0D;
+		}		
+		if (r > 22 && r < 158)			// east
+		{
+			z -= 3.0D;
+		}			
+		else if (r > 202 && r < 338)	// west
+		{
+			z += 3.0D;
+		}		
+
+		final Location safeLocation = Util.getSafeDestination(new Location(user.getWorld(), x, y, z));
+		final boolean success = user.getWorld().generateTree(safeLocation, (TreeType)tree);
+		if (success)
+		{
+			charge(user);
+			user.sendMessage(Util.i18n("bigTreeSuccess"));
+		}
+		else
+		{
+			user.sendMessage(Util.i18n("bigTreeFailure"));
+		}
+	}
+}

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

@@ -0,0 +1,29 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.Console;
+import com.earth2me.essentials.Util;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandbroadcast extends EssentialsCommand
+{
+	public Commandbroadcast()
+	{
+		super("broadcast");
+	}
+
+	@Override
+	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		charge(sender);
+		ess.broadcastMessage(sender instanceof Player ? ((Player)sender).getName() : Console.NAME,
+							 Util.format("broadcast", getFinalArg(args, 0)));
+	}
+}

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

@@ -0,0 +1,31 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.Util;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandburn extends EssentialsCommand
+{
+	public Commandburn()
+	{
+		super("burn");
+	}
+
+	@Override
+	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length < 2)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		charge(sender);
+		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])));
+		}
+	}
+}

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

@@ -0,0 +1,99 @@
+package com.earth2me.essentials.commands;
+
+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
+{
+	public Commandclearinventory()
+	{
+		super("clearinventory");
+	}
+
+	@Override
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length > 0 && user.isAuthorized("essentials.clearinventory.others"))
+		{
+			if (args[0].length() >= 3)
+			{
+				List<Player> online = server.matchPlayer(args[0]);
+
+				if (!online.isEmpty())
+				{
+					charge(user);
+					for (Player p : online)
+					{
+						p.getInventory().clear();
+						user.sendMessage(Util.format("inventoryClearedOthers", p.getDisplayName()));
+					}
+					return;
+				}
+				throw new Exception(Util.i18n("playerNotFound"));
+			}
+			else
+			{
+				Player p = server.getPlayer(args[0]);
+				if (p != null)
+				{
+					charge(user);
+					p.getInventory().clear();
+					user.sendMessage(Util.format("inventoryClearedOthers", p.getDisplayName()));
+				}
+				else
+				{
+					throw new Exception(Util.i18n("playerNotFound"));
+				}
+			}
+		}
+		else
+		{
+			charge(user);
+			user.getInventory().clear();
+			user.sendMessage(Util.i18n("inventoryCleared"));
+		}
+	}
+
+	@Override
+	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		if (args[0].length() >= 3)
+		{
+			List<Player> online = server.matchPlayer(args[0]);
+
+			if (!online.isEmpty())
+			{
+				for (Player p : online)
+				{
+					p.getInventory().clear();
+					sender.sendMessage(Util.format("inventoryClearedOthers", p.getDisplayName()));
+				}
+				return;
+			}
+			throw new Exception(Util.i18n("playerNotFound"));
+		}
+		else
+		{
+			Player u = server.getPlayer(args[0]);
+			if (u != null)
+			{
+				u.getInventory().clear();
+				sender.sendMessage(Util.format("inventoryClearedOthers", u.getDisplayName()));
+			}
+			else
+			{
+				throw new Exception(Util.i18n("playerNotFound"));
+			}
+		}
+	}
+}

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

@@ -0,0 +1,32 @@
+package com.earth2me.essentials.commands;
+
+import org.bukkit.Server;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+
+
+public class Commandcompass extends EssentialsCommand
+{
+	public Commandcompass()
+	{
+		super("compass");
+	}
+
+	@Override
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		charge(user);
+		int r = (int)user.getCorrectedYaw();
+		String dir;
+		if (r < 23) dir = "N";
+		else if (r < 68) dir = "NE";
+		else if (r < 113) dir = "E";
+		else if (r < 158) dir = "SE";
+		else if (r < 203) dir = "S";
+		else if (r < 248) dir = "SW";
+		else if (r < 293) dir = "W";
+		else if (r < 338) dir = "NW";
+		else dir = "N";
+		user.sendMessage(Util.format("compassBearing", dir, r));
+	}
+}

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

@@ -0,0 +1,23 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.Util;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+
+public class Commanddeljail extends EssentialsCommand {
+
+	public Commanddeljail() {
+		super("deljail");
+	}
+
+	@Override
+	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception {
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		charge(sender);
+		ess.getJail().delJail(args[0]);
+		sender.sendMessage(Util.format("deleteJail", args[0]));
+	}
+}

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

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

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

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

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

@@ -0,0 +1,80 @@
+package com.earth2me.essentials.commands;
+
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import com.earth2me.essentials.User;
+
+
+public class Commandeco extends EssentialsCommand
+{
+	public Commandeco()
+	{
+		super("eco");
+	}
+
+	@Override
+	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length < 2)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		EcoCommands cmd;
+		double amount;
+		try
+		{
+			cmd = EcoCommands.valueOf(args[0].toUpperCase());
+			amount = Double.parseDouble(args[2].replaceAll("[^0-9\\.]", ""));
+		}
+		catch (Exception ex)
+		{
+			throw new NotEnoughArgumentsException(ex);
+		}
+
+		if (args[1].contentEquals("*"))
+		{
+			for (Player p : server.getOnlinePlayers())
+			{
+				User u = ess.getUser(p);
+				switch (cmd)
+				{
+				case GIVE:
+					u.giveMoney(amount);
+					break;
+
+				case TAKE:
+					u.takeMoney(amount);
+					break;
+
+				case RESET:
+					u.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
+					break;
+				}
+			}
+		}
+		else
+		{
+			User u = getPlayer(server, args, 1, true);
+			switch (cmd)
+			{
+			case GIVE:
+				u.giveMoney(amount, sender);
+				break;
+
+			case TAKE:
+				u.takeMoney(amount, sender);
+				break;
+
+			case RESET:
+				u.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
+				break;
+			}
+		}
+	}
+
+	private enum EcoCommands
+	{
+		GIVE, TAKE, RESET
+	}
+}

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

@@ -0,0 +1,118 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.Util;
+import java.util.HashMap;
+import java.util.Map;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.block.Block;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandessentials extends EssentialsCommand
+{
+	public Commandessentials()
+	{
+		super("essentials");
+	}
+	private transient int taskid;
+	private final transient Map<Player, Block> noteBlocks = new HashMap<Player, Block>();
+
+	@Override
+	public void run(final Server server, final 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);
+		noteMap.put("1G#", (byte)0x2);
+		noteMap.put("1A", (byte)0x3);
+		noteMap.put("1A#", (byte)0x4);
+		noteMap.put("1B", (byte)0x5);
+		noteMap.put("1C", (byte)0x6);
+		noteMap.put("1C#", (byte)0x7);
+		noteMap.put("1D", (byte)0x8);
+		noteMap.put("1D#", (byte)0x9);
+		noteMap.put("1E", (byte)0xA);
+		noteMap.put("1F", (byte)0xB);
+		noteMap.put("2F#", (byte)(0x0 + 0xC));
+		noteMap.put("2G", (byte)(0x1 + 0xC));
+		noteMap.put("2G#", (byte)(0x2 + 0xC));
+		noteMap.put("2A", (byte)(0x3 + 0xC));
+		noteMap.put("2A#", (byte)(0x4 + 0xC));
+		noteMap.put("2B", (byte)(0x5 + 0xC));
+		noteMap.put("2C", (byte)(0x6 + 0xC));
+		noteMap.put("2C#", (byte)(0x7 + 0xC));
+		noteMap.put("2D", (byte)(0x8 + 0xC));
+		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;
+			}
+			final String tuneStr = "1D#,1E,2F#,,2A#,1E,1D#,1E,2F#,2B,2D#,2E,2D#,2A#,2B,,2F#,,1D#,1E,2F#,2B,2C#,2A#,2B,2C#,2E,2D#,2E,2C#,,2F#,,2G#,,1D,1D#,,1C#,1D,1C#,1B,,1B,,1C#,,1D,,1D,1C#,1B,1C#,1D#,2F#,2G#,1D#,2F#,1C#,1D#,1B,1C#,1B,1D#,,2F#,,2G#,1D#,2F#,1C#,1D#,1B,1D,1D#,1D,1C#,1B,1C#,1D,,1B,1C#,1D#,2F#,1C#,1D,1C#,1B,1C#,,1B,,1C#,,2F#,,2G#,,1D,1D#,,1C#,1D,1C#,1B,,1B,,1C#,,1D,,1D,1C#,1B,1C#,1D#,2F#,2G#,1D#,2F#,1C#,1D#,1B,1C#,1B,1D#,,2F#,,2G#,1D#,2F#,1C#,1D#,1B,1D,1D#,1D,1C#,1B,1C#,1D,,1B,1C#,1D#,2F#,1C#,1D,1C#,1B,1C#,,1B,,1B,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1B,,";
+			final String[] tune = tuneStr.split(",");
+
+			for (Player player : server.getOnlinePlayers())
+			{
+				final Location loc = player.getLocation();
+				loc.add(0, 3, 0);
+				while (loc.getBlockY() < player.getLocation().getBlockY() + 10 && loc.getBlock().getTypeId() != 0)
+				{
+					loc.add(0, 1, 0);
+				}
+				if (loc.getBlock().getTypeId() == 0)
+				{
+					noteBlocks.put(player, loc.getBlock());
+					loc.getBlock().setType(Material.NOTE_BLOCK);
+				}
+			}
+			taskid = ess.scheduleSyncRepeatingTask(new Runnable()
+			{
+				int i = 0;
+
+				public void run()
+				{
+					final String note = tune[i];
+					i++;
+					if (i >= tune.length)
+					{
+						Commandessentials.this.stopTune();
+					}
+					if (note.isEmpty())
+					{
+						return;
+					}
+					Map<Player, Block> noteBlocks = Commandessentials.this.noteBlocks;
+					for (Player player : server.getOnlinePlayers())
+					{
+						Block block = noteBlocks.get(player);
+						if (block == null)
+						{
+							continue;
+						}
+						player.playNote(block.getLocation(), (byte)0, noteMap.get(note));
+					}
+				}
+			}, 20, 2);
+			return;
+		}
+		ess.reload();
+		charge(sender);
+		sender.sendMessage(Util.format("essentialsReload", ess.getDescription().getVersion()));
+	}
+
+	private void stopTune()
+	{
+		ess.getScheduler().cancelTask(taskid);
+		for (Block block : noteBlocks.values())
+		{
+			block.setType(Material.AIR);
+		}
+		noteBlocks.clear();
+	}
+}

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

@@ -0,0 +1,51 @@
+package com.earth2me.essentials.commands;
+
+import org.bukkit.Server;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandext extends EssentialsCommand
+{
+	public Commandext()
+	{
+		super("ext");
+	}
+
+	@Override
+	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		extinguishPlayers(server, sender, args[0]);
+	}
+
+	@Override
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			charge(user);
+			user.setFireTicks(0);
+			user.sendMessage(Util.i18n("extinguish"));
+			return;
+		}
+
+		extinguishPlayers(server, user, commandLabel);
+	}
+
+	private void extinguishPlayers(Server server, CommandSender sender, String name) throws Exception
+	{
+		for (Player p : server.matchPlayer(name))
+		{
+			charge(sender);
+			p.setFireTicks(0);
+			sender.sendMessage(Util.format("extinguishOthers", p.getDisplayName()));
+		}
+	}
+}

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

@@ -0,0 +1,24 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+import org.bukkit.entity.Fireball;
+import org.bukkit.util.Vector;
+
+
+public class Commandfireball extends EssentialsCommand
+{
+
+	public Commandfireball()
+	{
+		super("fireball");
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		charge(user);
+        final Vector direction = user.getEyeLocation().getDirection().multiply(2);
+		user.getWorld().spawn(user.getEyeLocation().add(direction.getX(), direction.getY(), direction.getZ()), Fireball.class);
+	}
+}

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

@@ -0,0 +1,31 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.Util;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+
+
+public class Commandgc extends EssentialsCommand
+{
+	public Commandgc()
+	{
+		super("gc");
+	}
+
+	@Override
+	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		charge(sender);
+		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)));
+		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"));
+		}
+	}
+}

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

@@ -0,0 +1,26 @@
+package com.earth2me.essentials.commands;
+
+import org.bukkit.Location;
+import org.bukkit.Server;
+import com.earth2me.essentials.User;
+
+
+public class Commandgetpos extends EssentialsCommand
+{
+	public Commandgetpos()
+	{
+		super("getpos");
+	}
+
+	@Override
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		charge(user);
+		Location coords = user.getLocation();
+		user.sendMessage("§7X: " + coords.getBlockX() + " (-North <-> +South)");
+		user.sendMessage("§7Y: " + coords.getBlockY() + " (+Up <-> -Down)");
+		user.sendMessage("§7Z: " + coords.getBlockZ() + " (+East <-> -West)");
+		user.sendMessage("§7Yaw: " + user.getCorrectedYaw() + " (Rotation)");
+		user.sendMessage("§7Pitch: " + coords.getPitch() + " (Head angle)");
+	}
+}

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

@@ -0,0 +1,59 @@
+package com.earth2me.essentials.commands;
+
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import com.earth2me.essentials.User;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+
+public class Commandgive extends EssentialsCommand
+{
+	public Commandgive()
+	{
+		super("give");
+	}
+
+	@Override
+	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length < 2)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		ItemStack stack = ess.getItemDb().get(args[1]);
+
+		String itemname = stack.getType().toString().toLowerCase().replace("_", "");
+		if (sender instanceof Player
+			&& (ess.getSettings().permissionBasedItemSpawn()
+				? (!ess.getUser(sender).isAuthorized("essentials.give.item-all")
+				   && !ess.getUser(sender).isAuthorized("essentials.give.item-" + itemname)
+				   && !ess.getUser(sender).isAuthorized("essentials.give.item-" + stack.getTypeId()))
+				: (!ess.getUser(sender).isAuthorized("essentials.itemspawn.exempt")
+				   && !ess.getUser(sender).canSpawnItem(stack.getTypeId()))))
+		{
+			sender.sendMessage(ChatColor.RED + "You are not allowed to spawn the item " + itemname);
+			return;
+		}
+		if (args.length > 2 && Integer.parseInt(args[2]) > 0)
+		{
+			stack.setAmount(Integer.parseInt(args[2]));
+		}
+
+		if (stack.getType() == Material.AIR)
+		{
+			sender.sendMessage(ChatColor.RED + "You can't give air.");
+			return;
+		}
+
+		User giveTo = getPlayer(server, args, 0);
+		String itemName = stack.getType().name().toLowerCase().replace('_', ' ');
+		charge(sender);
+		sender.sendMessage(ChatColor.BLUE + "Giving " + stack.getAmount() + " of " + itemName + " to " + giveTo.getDisplayName() + ".");
+		giveTo.getInventory().addItem(stack);
+		giveTo.updateInventory();
+	}
+}

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

@@ -0,0 +1,55 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandgod extends EssentialsCommand
+{
+	public Commandgod()
+	{
+		super("god");
+	}
+
+	@Override
+	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		godOtherPlayers(server, sender, args[0]);
+	}
+
+	@Override
+	protected void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		charge(user);
+		if (args.length > 0 && user.isAuthorized("essentials.god.others"))
+		{
+			godOtherPlayers(server, user, args[0]);
+			return;
+		}
+
+		user.sendMessage(Util.format("godMode", (user.toggleGodModeEnabled()?  Util.i18n("enabled") : Util.i18n("disabled"))));
+	}
+
+	private void godOtherPlayers(Server server, CommandSender sender, String name)
+	{
+		for (Player p : server.matchPlayer(name))
+		{
+			User u = ess.getUser(p);
+			if (u.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())));
+		}
+	}
+}

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

@@ -0,0 +1,71 @@
+package com.earth2me.essentials.commands;
+
+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
+{
+	public Commandheal()
+	{
+		super("heal");
+	}
+
+	@Override
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+
+		if (args.length > 0 && user.isAuthorized("essentials.heal.others"))
+		{
+			if (!user.isAuthorized("essentials.heal.cooldown.bypass"))
+			{
+				user.healCooldown();
+			}
+			charge(user);
+			healOtherPlayers(server, user, args[0]);
+			return;
+		}
+
+		if (!user.isAuthorized("essentials.heal.cooldown.bypass"))
+		{
+			user.healCooldown();
+		}
+		charge(user);
+		user.setHealth(20);
+		user.sendMessage(Util.i18n("heal"));
+	}
+
+	@Override
+	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		healOtherPlayers(server, sender, args[0]);
+	}
+
+	private void healOtherPlayers(Server server, CommandSender sender, String name)
+	{
+		List<Player> players = server.matchPlayer(name);
+		if (players.isEmpty())
+		{
+			sender.sendMessage(Util.i18n("playerNotFound"));
+			return;
+		}
+		for (Player p : players)
+		{
+			if (ess.getUser(p).isHidden())
+			{
+				continue;
+			}
+			p.setHealth(20);
+			sender.sendMessage(Util.format("healOther", p.getDisplayName()));
+		}
+	}
+}

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

@@ -0,0 +1,184 @@
+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 com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import java.util.Map.Entry;
+import java.util.logging.Level;
+
+
+public class Commandhelp extends EssentialsCommand
+{
+	public final Yaml yaml = new Yaml(new SafeConstructor());
+
+	public Commandhelp()
+	{
+		super("help");
+	}
+
+	@Override
+	protected void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		int page = 1;
+		String match = "";
+		try
+		{
+			if (args.length > 0)
+			{
+				match = args[0].toLowerCase();
+				page = Integer.parseInt(args[args.length - 1]);
+				if (args.length == 1)
+				{
+					match = "";
+				}
+			}
+
+		}
+		catch (Exception ex)
+		{
+			if (args.length == 1)
+			{
+				match = args[0].toLowerCase();
+			}
+		}
+
+		List<String> lines = getHelpLines(user, match);
+		if (lines.size() > 0)
+		{
+			int start = (page - 1) * 9;
+			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));
+			}
+		}
+		else
+		{
+			user.sendMessage(Util.i18n("noHelpFound"));
+		}
+	}
+
+	@Override
+	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		sender.sendMessage(Util.i18n("helpConsole"));
+	}
+
+	@SuppressWarnings("CallToThreadDumpStack")
+	private List<String> getHelpLines(User user, String match) throws Exception
+	{
+		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, String>> cmds = (HashMap<String, HashMap<String, String>>)desc.getCommands();
+				for (Entry<String, HashMap<String, String>> k : cmds.entrySet())
+				{
+					if ((!match.equalsIgnoreCase("")) && (!k.getKey().toLowerCase().contains(match))
+						&& (!k.getValue().get("description").toLowerCase().contains(match)))
+					{
+						continue;
+					}
+
+					if (p.getDescription().getName().toLowerCase().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())
+						{
+							pluginName = p.getDescription().getName();
+							final HashMap<String, String> value = k.getValue();
+							if (value.containsKey("permission") && value.get("permission") != null && !(value.get("permission").equals("")))
+							{
+								if (user.isAuthorized(value.get("permission")))
+								{
+									retval.add("§c" + k.getKey() + "§7: " + value.get("description"));
+								}
+							}
+							else if (value.containsKey("permissions") && value.get("permissions") != null && !(value.get("permissions").equals("")))
+							{
+								if (user.isAuthorized(value.get("permissions")))
+								{
+									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 (Exception ex)
+			{
+				if (!reported)
+				{
+					logger.log(Level.WARNING, Util.format("commandHelpFailedForPlugin", pluginName), ex);
+				}
+				reported = true;
+				continue;
+			}
+		}
+		return retval;
+	}
+}

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

@@ -0,0 +1,38 @@
+package com.earth2me.essentials.commands;
+
+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
+{
+	public Commandhelpop()
+	{
+		super("helpop");
+	}
+
+	@Override
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		charge(user);
+		final String message = Util.format("helpOp", user.getDisplayName(), getFinalArg(args, 0));
+		logger.log(Level.INFO, message);
+		for (Player p : server.getOnlinePlayers())
+		{
+			User u = ess.getUser(p);
+			if (!u.isAuthorized("essentials.helpop.receive"))
+			{
+				continue;
+			}
+			u.sendMessage(message);
+		}
+	}
+}

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

@@ -0,0 +1,41 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.Trade;
+import org.bukkit.Server;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+
+
+public class Commandhome extends EssentialsCommand
+{
+	public Commandhome()
+	{
+		super("home");
+	}
+
+	@Override
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		Trade charge = new Trade(this.getName(), ess);
+		charge.isAffordableFor(user);
+		if(args.length > 0 && user.isAuthorized("essentials.home.others"))
+		{
+			User u;
+			try
+			{
+				u = getPlayer(server, args, 0);
+			}
+			catch(NoSuchFieldException ex)
+			{
+				u = ess.getOfflineUser(args[0]);
+			}
+			if (u == null)
+			{
+				throw new Exception(Util.i18n("playerNotFound"));
+			}
+			user.getTeleport().home(u, charge);
+			return;
+		}
+		user.getTeleport().home(charge);
+	}
+}

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

@@ -0,0 +1,49 @@
+package com.earth2me.essentials.commands;
+
+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
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		User u;
+		try
+		{
+			u = getPlayer(server, args, 0);
+		}
+		catch(NoSuchFieldException ex)
+		{
+			u = ess.getOfflineUser(args[0]);
+		}
+		if (u == null)
+		{
+			throw new Exception(Util.i18n("playerNotFound"));
+		}
+		String name = u.getName();
+		if (user.isIgnoredPlayer(name)) {
+			user.setIgnoredPlayer(name, false);
+			user.sendMessage(Util.format("unignorePlayer", u.getName()));
+		}
+		else
+		{
+			user.setIgnoredPlayer(name, true);
+			user.sendMessage(Util.format("ignorePlayer", u.getName()));
+		}
+	}
+	
+	
+}

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

@@ -0,0 +1,192 @@
+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 org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandinfo extends EssentialsCommand
+{
+	public Commandinfo()
+	{
+		super("info");
+	}
+
+	@Override
+	protected void run(Server server, CommandSender sender, String commandLabel, 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
+		{
+			sender.sendMessage(Util.i18n("infoFileDoesNotExist"));
+			file.createNewFile();
+			return;
+		}
+
+		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);
+
+			charge(sender);
+			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);
+
+				charge(sender);
+				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);
+
+		charge(sender);
+		sender.sendMessage(Util.format("infoChapterPages", pageStr, page , pages));
+		for (int i = start; i < chapterend && i < start + 9; i++)
+		{
+			sender.sendMessage(lines.get(i));
+		}
+	}
+}

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

@@ -0,0 +1,55 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import java.util.Arrays;
+import org.bukkit.Server;
+import org.bukkit.inventory.ItemStack;
+
+
+public class Commandinvsee extends EssentialsCommand
+{
+	public Commandinvsee()
+	{
+		super("invsee");
+	}
+
+	@Override
+	protected void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+
+		if (args.length < 1 && user.getSavedInventory() == null)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		User invUser = user;
+		if (args.length == 1)
+		{
+			invUser = getPlayer(server, args, 0);
+		}
+		if (invUser == user && user.getSavedInventory() != null)
+		{
+			invUser.getInventory().setContents(user.getSavedInventory());
+			user.setSavedInventory(null);
+			user.sendMessage(Util.i18n("invRestored"));
+			return;
+		}
+
+		charge(user);
+		if (user.getSavedInventory() == null)
+		{
+			user.setSavedInventory(user.getInventory().getContents());
+		}
+		ItemStack[] invUserStack = invUser.getInventory().getContents();
+		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"));
+		}
+		user.getInventory().setContents(invUserStack);
+		user.sendMessage(Util.format("invSee", invUser.getDisplayName()));
+		user.sendMessage(Util.i18n("invSeeHelp"));
+	}
+}

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

@@ -0,0 +1,55 @@
+package com.earth2me.essentials.commands;
+
+import org.bukkit.Server;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+
+public class Commanditem extends EssentialsCommand
+{
+	public Commanditem()
+	{
+		super("item");
+	}
+
+	@Override
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		ItemStack stack = ess.getItemDb().get(args[0]);
+
+		String itemname = stack.getType().toString().toLowerCase().replace("_", "");
+		if (ess.getSettings().permissionBasedItemSpawn()
+			? (!user.isAuthorized("essentials.itemspawn.item-all")
+			   && !user.isAuthorized("essentials.itemspawn.item-" + itemname)
+			   && !user.isAuthorized("essentials.itemspawn.item-" + stack.getTypeId()))
+			: (!user.isAuthorized("essentials.itemspawn.exempt")
+			   && !user.canSpawnItem(stack.getTypeId())))
+		{
+			user.sendMessage(Util.format("cantSpawnItem", itemname));
+			return;
+		}
+
+		if (args.length > 1 && Integer.parseInt(args[1]) > 0)
+		{
+			stack.setAmount(Integer.parseInt(args[1]));
+		}
+
+		if (stack.getType() == Material.AIR)
+		{
+			user.sendMessage(Util.format("cantSpawnItem", "Air"));
+			return;
+		}
+
+		String itemName = stack.getType().name().toLowerCase().replace('_', ' ');
+		charge(user);
+		user.sendMessage(Util.format("itemSpawn", stack.getAmount(), itemName));
+		user.getInventory().addItem(stack);
+		user.updateInventory();
+	}
+}

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

@@ -0,0 +1,25 @@
+package com.earth2me.essentials.commands;
+
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+
+
+public class Commandjails extends EssentialsCommand
+{
+	public Commandjails()
+	{
+		super("jails");
+	}
+
+	@Override
+	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		StringBuilder jailList = new StringBuilder();
+		for (String j : ess.getJail().getJails())
+		{
+			jailList.append(j);
+			jailList.append(' ');
+		}
+		sender.sendMessage("§7" + jailList);
+	}
+}

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

@@ -0,0 +1,43 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.Trade;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import com.earth2me.essentials.TargetBlock;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+
+
+public class Commandjump extends EssentialsCommand
+{
+	public Commandjump()
+	{
+		super("jump");
+	}
+
+	@Override
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		Location loc;
+		Location cloc = user.getLocation();
+
+		try
+		{
+			loc = new TargetBlock(user, 100, 2.65).getTargetBlock().getLocation();
+			loc.setYaw(cloc.getYaw());
+			loc.setPitch(cloc.getPitch());
+			loc = new TargetBlock(loc).getPreviousBlock().getLocation();
+			loc.setYaw(cloc.getYaw());
+			loc.setPitch(cloc.getPitch());
+			loc.setY(loc.getY() + 1);
+		}
+		catch (NullPointerException ex)
+		{
+			throw new Exception(Util.i18n("jumpError"), ex);
+		}
+
+		Trade charge = new Trade(this.getName(), ess);
+		charge.isAffordableFor(user);
+		user.getTeleport().teleport(loc, charge);
+	}
+}

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

@@ -0,0 +1,35 @@
+package com.earth2me.essentials.commands;
+
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+
+
+public class Commandkick extends EssentialsCommand
+{
+	public Commandkick()
+	{
+		super("kick");
+	}
+	
+	@Override
+	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		
+		User u = getPlayer(server, args, 0);
+		if (u.isAuthorized("essentials.kick.exempt"))
+		{
+			sender.sendMessage(Util.i18n("kickExempt"));
+			return;
+		}
+		charge(sender);
+		final String kickReason = args.length > 1 ? getFinalArg(args, 1) : Util.i18n("kickDefault");
+		u.kickPlayer(kickReason);
+		server.broadcastMessage(Util.format("playerKicked", u.getName(), kickReason));
+	}
+}

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

@@ -0,0 +1,33 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.Util;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandkickall extends EssentialsCommand
+{
+	public Commandkickall()
+	{
+		super("kickall");
+	}
+
+	@Override
+	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		charge(sender);
+
+		for (Player p : server.getOnlinePlayers())
+		{
+			if (sender instanceof Player && p.getName().equalsIgnoreCase(((Player)sender).getName()))
+			{
+				continue;
+			}
+			else
+			{
+				p.kickPlayer(args.length > 0 ? getFinalArg(args, 0) : Util.i18n("kickDefault"));
+			}
+		}
+	}
+}

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

@@ -0,0 +1,31 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.Util;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandkill extends EssentialsCommand
+{
+	public Commandkill()
+	{
+		super("kill");
+	}
+
+	@Override
+	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		charge(sender);
+		for (Player p : server.matchPlayer(args[0]))
+		{
+			p.setHealth(0);
+			sender.sendMessage(Util.format("kill", p.getDisplayName()));
+		}
+	}
+}

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

@@ -0,0 +1,159 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.Trade;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.bukkit.Server;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import java.util.GregorianCalendar;
+import org.bukkit.inventory.ItemStack;
+
+
+public class Commandkit extends EssentialsCommand
+{
+	static private final Map<User, Map<String, Long>> kitPlayers = new HashMap<User, Map<String, Long>>();
+
+	public Commandkit()
+	{
+		super("kit");
+	}
+
+	@Override
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			try
+			{
+				Map<String, Object> kits = ess.getSettings().getKits();
+				StringBuilder list = new StringBuilder();
+				for (String k : kits.keySet())
+				{
+					if (user.isAuthorized("essentials.kit." + k.toLowerCase()))
+					{
+						list.append(" ").append(k);
+					}
+				}
+				if (list.length() > 0)
+				{
+					user.sendMessage(Util.format("kits", list.toString()));
+				}
+				else
+				{
+					user.sendMessage(Util.i18n("noKits"));
+				}
+			}
+			catch (Exception ex)
+			{
+				user.sendMessage(Util.i18n("kitError"));
+			}
+		}
+		else
+		{
+			try
+			{
+				String kitName = args[0].toLowerCase();
+				Object kit = ess.getSettings().getKit(kitName);
+				List<String> items;
+
+				if (!user.isAuthorized("essentials.kit." + kitName))
+				{
+					user.sendMessage(Util.format("noKitPermission", "essentials.kit." + kitName));
+					return;
+				}
+
+				try
+				{
+
+					//System.out.println("Kit is timed");
+					Map<String, Object> els = (Map<String, Object>)kit;
+					items = (List<String>)els.get("items");
+					double delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0L;
+					Calendar c = new GregorianCalendar();
+					c.add(Calendar.SECOND, (int)delay);
+					c.add(Calendar.MILLISECOND, (int)((delay*1000.0)%1000.0));
+			
+					long time = c.getTimeInMillis();
+					Calendar now = new GregorianCalendar();
+
+					Map<String, Long> kitTimes;
+					if (!kitPlayers.containsKey(user))
+					{
+						kitTimes = new HashMap<String, Long>();
+						kitTimes.put(kitName, time);
+						kitPlayers.put(user, kitTimes);
+					}
+					else
+					{
+						kitTimes = kitPlayers.get(user);
+						if (!kitTimes.containsKey(kitName))
+						{
+							kitTimes.put(kitName, time);
+						}
+						else if (kitTimes.get(kitName) < now.getTimeInMillis())
+						{
+							kitTimes.put(kitName, time);
+						}
+						else
+						{
+							user.sendMessage(Util.format("kitTimed", Util.formatDateDiff(kitTimes.get(kitName))));
+							return;
+						}
+					}
+				}
+				catch (Exception ex)
+				{
+					items = (List<String>)kit;
+				}
+
+				Trade charge = new Trade("kit-" + kitName, ess);
+				try
+				{
+					charge.isAffordableFor(user);
+				}
+				catch (Exception ex)
+				{
+					user.sendMessage(ex.getMessage());
+					return;
+				}
+
+				boolean spew = false;
+				for (String d : items)
+				{
+					String[] parts = d.split("[^0-9]+", 3);
+					int id = Integer.parseInt(parts[0]);
+					int amount = parts.length > 1 ? Integer.parseInt(parts[parts.length > 2 ? 2 : 1]) : 1;
+					short data = parts.length > 2 ? Short.parseShort(parts[1]) : 0;
+					HashMap<Integer,ItemStack> overfilled = user.getInventory().addItem(new ItemStack(id, amount, data));
+					for (ItemStack itemStack : overfilled.values())
+					{
+						user.getWorld().dropItemNaturally(user.getLocation(), itemStack);
+						spew = true;
+					}
+				}
+				if (spew)
+				{
+					user.sendMessage(Util.i18n("kitInvFull"));
+				}
+				try
+				{
+					charge(user);
+					charge.charge(user);
+				}
+				catch (Exception ex)
+				{
+					user.sendMessage(ex.getMessage());
+				}
+				user.sendMessage(Util.format("kitGive", kitName));
+			}
+			catch (Exception ex)
+			{
+				user.sendMessage(Util.i18n("kitError2"));
+				user.sendMessage(Util.i18n("kitErrorHelp"));
+			}
+		}
+	}
+}