Changed s to dropStack for verbosity, and organized imports.

Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>
ManagedFile was in the correct folder, but had the wrong package header.
2026-11-05 01:00:13 -05:00 · 2012-02-23 12:46:57 -05:00 · 2012-02-23 12:29:49 -05:00 · 2012-02-23 12:27:23 -05:00 · 2012-02-23 12:26:55 -05:00 · 2012-02-23 12:26:10 -05:00
555 changed files with 28554 additions and 33459 deletions
@@ -3,5 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/bukkit-0.0.1-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/craftbukkit-0.0.1-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/Permissions3.jar"/>
 </classpath>
@@ -1,47 +1,47 @@
-.DS_Store
-/BuildAll/nbproject/private/
-/EssentialsProtect/nbproject/private/
-/EssentialsChat/nbproject/private/
-/EssentialsGroupBridge/nbproject/private/
-/EssentialsGeoIP/nbproject/private/
-/EssentialsSpawn/nbproject/private/
-/EssentialsXMPP/nbproject/private/
-/EssentialsGroupManager/nbproject/private/
-/BuildAll/build/
-/EssentialsGroupBridge/dist/
-/EssentialsGroupBridge/build/
-/EssentialsGeoIP/dist/
-/EssentialsGeoIP/build/
-/EssentialsGroupManager/build/
-/EssentialsGroupManager/dist/
-/BuildAll/dist/
-/EssentialsChat/build/
-/EssentialsChat/dist/
-/EssentialsSpawn/build/
-/EssentialsSpawn/dist/
-/EssentialsXMPP/dist/
-/EssentialsXMPP/build/
-/EssentialsProtect/dist/
-/EssentialsProtect/build/
-/EssentialsPermissionsCommands/nbproject/private/
-/EssentialsPermissionsCommands/build/
-/EssentialsPermissionsCommands/dist/
-/Essentials/nbproject/private/
-/Essentials/dist/
-/Essentials/build/
-/YamlAnnotations/
-/EssentialsUpdate/nbproject/private/
-/EssentialsRelease/
-/EssentialsUpdate/dist/
-/EssentialsUpdate/build/
-/WebPush/apikey.php
-/WebPush/nbproject/private
-/.idea
-*.iml
-/EssentialsGroupManager/bin
-/EssentialsGroupManager/.externalToolBuilders
-/EssentialsAntiBuild/nbproject/private/
-/EssentialsAntiBuild/dist/
-/EssentialsAntiBuild/build/
-/jars
-/out
+.DS_Store
+/BuildAll/nbproject/private/
+/EssentialsProtect/nbproject/private/
+/EssentialsChat/nbproject/private/
+/EssentialsGroupBridge/nbproject/private/
+/EssentialsGeoIP/nbproject/private/
+/EssentialsSpawn/nbproject/private/
+/EssentialsXMPP/nbproject/private/
+/EssentialsGroupManager/nbproject/private/
+/BuildAll/build/
+/EssentialsGroupBridge/dist/
+/EssentialsGroupBridge/build/
+/EssentialsGeoIP/dist/
+/EssentialsGeoIP/build/
+/EssentialsGroupManager/build/
+/EssentialsGroupManager/dist/
+/BuildAll/dist/
+/EssentialsChat/build/
+/EssentialsChat/dist/
+/EssentialsSpawn/build/
+/EssentialsSpawn/dist/
+/EssentialsXMPP/dist/
+/EssentialsXMPP/build/
+/EssentialsProtect/dist/
+/EssentialsProtect/build/
+/EssentialsPermissionsCommands/nbproject/private/
+/EssentialsPermissionsCommands/build/
+/EssentialsPermissionsCommands/dist/
+/Essentials/nbproject/private/
+/Essentials/dist/
+/Essentials/build/
+/YamlAnnotations/
+/EssentialsUpdate/nbproject/private/
+/EssentialsRelease/
+/EssentialsUpdate/dist/
+/EssentialsUpdate/build/
+/WebPush/apikey.php
+/WebPush/nbproject/private
+/.idea
+*.iml
+/EssentialsSigns/nbproject/private/
+/Essentials2Compat/nbproject/private/
+/Essentials2Compat/dist/
+/Essentials2Compat/build/
+/EssentialsGroupManager/bin
+/EssentialsGroupManager/.externalToolBuilders
+/EssentialsGeoIP/build
@@ -12,9 +12,9 @@ is divided into following sections:
  - execution
  - debugging
  - javadoc
-  - test compilation
-  - test execution
-  - test debugging
+  - junit compilation
+  - junit execution
+  - junit debugging
  - applet
  - cleanup

@@ -181,7 +181,6 @@ is divided into following sections:
            </and>
        </condition>
        <property name="run.jvmargs" value=""/>
-        <property name="run.jvmargs.ide" value=""/>
        <property name="javac.compilerargs" value=""/>
        <property name="work.dir" value="${basedir}"/>
        <condition property="no.deps">
@@ -226,27 +225,6 @@ is divided into following sections:
        <property name="jar.index.metainf" value="${jar.index}"/>
        <property name="copylibs.rebase" value="true"/>
        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
-        <condition property="junit.available">
-            <or>
-                <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
-                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
-            </or>
-        </condition>
-        <condition property="testng.available">
-            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
-        </condition>
-        <condition property="junit+testng.available">
-            <and>
-                <istrue value="${junit.available}"/>
-                <istrue value="${testng.available}"/>
-            </and>
-        </condition>
-        <condition else="testng" property="testng.mode" value="mixed">
-            <istrue value="${junit+testng.available}"/>
-        </condition>
-        <condition else="" property="testng.debug.mode" value="-mixed">
-            <istrue value="${junit+testng.available}"/>
-        </condition>
    </target>
    <target name="-post-init">
        <!-- Empty placeholder for easier customization. -->
@@ -379,52 +357,11 @@ is divided into following sections:
            </sequential>
        </macrodef>
    </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-init">
-        <condition else="false" property="nb.junit.batch" value="true">
-            <and>
-                <istrue value="${junit.available}"/>
-                <not>
-                    <isset property="test.method"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="false" property="nb.junit.single" value="true">
-            <and>
-                <istrue value="${junit.available}"/>
-                <isset property="test.method"/>
-            </and>
-        </condition>
-    </target>
-    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
+    <target name="-init-macrodef-junit">
        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
            <attribute default="${includes}" name="includes"/>
            <attribute default="${excludes}" name="excludes"/>
            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
            <sequential>
                <property name="junit.forkmode" value="perTest"/>
                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
@@ -433,270 +370,32 @@ is divided into following sections:
                            <filename name="@{testincludes}"/>
                        </fileset>
                    </batchtest>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
                    <syspropertyset>
                        <propertyref prefix="test-sys-prop."/>
                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
                    </syspropertyset>
                    <formatter type="brief" usefile="false"/>
                    <formatter type="xml"/>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                    <jvmarg value="-ea"/>
-                    <customize/>
+                    <jvmarg line="${run.jvmargs}"/>
                </junit>
            </sequential>
        </macrodef>
    </target>
-    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
-    <target if="${testng.available}" name="-init-macrodef-testng">
-        <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
-                    <isset property="test.method"/>
-                </condition>
-                <union id="test.set">
-                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
-                        <filename name="@{testincludes}"/>
-                    </fileset>
-                </union>
-                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="BuildAll" testname="TestNG tests" workingDir="${work.dir}">
-                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
-                    <propertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </propertyset>
-                    <customize/>
-                </testng>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-test-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <echo>No tests executed.</echo>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:testng>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
-        <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <sequential>
-                <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                        <jvmarg line="${run.jvmargs}"/>
-                        <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
-                </j2seproject3:test-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
-        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit-debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${testng.available}" name="-init-macrodef-testng-debug">
-        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <element name="customize2" optional="true"/>
-            <sequential>
-                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
-                    <isset property="test.method"/>
-                </condition>
-                <condition else="-suitename BuildAll -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
-                    <matches pattern=".*\.xml" string="@{testClass}"/>
-                </condition>
-                <delete dir="${build.test.results.dir}" quiet="true"/>
-                <mkdir dir="${build.test.results.dir}"/>
-                <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
-                    <customize>
-                        <customize2/>
-                        <jvmarg value="-ea"/>
-                        <arg line="${testng.debug.mode}"/>
-                        <arg line="-d ${build.test.results.dir}"/>
-                        <arg line="-listener org.testng.reporters.VerboseReporter"/>
-                        <arg line="${testng.cmd.args}"/>
-                    </customize>
-                </j2seproject3:debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
-        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <element implicit="true" name="customize2" optional="true"/>
-            <sequential>
-                <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
-                    <customize2/>
-                </j2seproject3:testng-debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
-        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <sequential>
-                <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                        <jvmarg line="${run.jvmargs}"/>
-                        <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
-                </j2seproject3:test-debug-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
-        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <sequential>
-                <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
-                    <customize2>
-                        <syspropertyset>
-                            <propertyref prefix="test-sys-prop."/>
-                            <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                        </syspropertyset>
-                    </customize2>
-                </j2seproject3:testng-debug-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
-    <!--
-                pre NB7.2 profiling section; consider it deprecated
-            -->
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
-    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
+    <target name="-profile-pre-init">
        <!-- Empty placeholder for easier customization. -->
        <!-- You can override this target in the ../build.xml file. -->
    </target>
-    <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
+    <target name="-profile-post-init">
        <!-- Empty placeholder for easier customization. -->
        <!-- You can override this target in the ../build.xml file. -->
    </target>
-    <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
+    <target name="-profile-init-macrodef-profile">
        <macrodef name="resolve">
            <attribute name="name"/>
            <attribute name="value"/>
@@ -728,13 +427,10 @@ is divided into following sections:
            </sequential>
        </macrodef>
    </target>
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
    </target>
-    <!--
-                end of pre NB7.2 profiling section
-            -->
    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
            <attribute default="${main.class}" name="name"/>
@@ -792,7 +488,6 @@ is divided into following sections:
                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
                    <classpath>
                        <path path="@{classpath}"/>
                    </classpath>
@@ -809,7 +504,6 @@ is divided into following sections:
        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
            <attribute default="${main.class}" name="classname"/>
            <attribute default="${run.classpath}" name="classpath"/>
-            <attribute default="jvm" name="jvm"/>
            <element name="customize" optional="true"/>
            <sequential>
                <java classname="@{classname}" dir="${work.dir}" fork="true">
@@ -817,7 +511,6 @@ is divided into following sections:
                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
                    <classpath>
                        <path path="@{classpath}"/>
                    </classpath>
@@ -844,9 +537,6 @@ is divided into following sections:
                    <path path="${run.classpath.without.build.classes.dir}"/>
                    <chainedmapper>
                        <flattenmapper/>
-                        <filtermapper>
-                            <replacestring from=" " to="%20"/>
-                        </filtermapper>
                        <globmapper from="*" to="lib/*"/>
                    </chainedmapper>
                </pathconvert>
@@ -892,7 +582,7 @@ is divided into following sections:
    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
        <property name="ap.cmd.line.internal" value=""/>
    </target>
-    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
    <!--
                ===================
                COMPILATION SECTION
@@ -948,13 +638,6 @@ is divided into following sections:
            <param name="call.target" value="jar"/>
            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
        </antcall>
-        <antcall target="-maybe-call-dep">
-            <param name="call.built.properties" value="${built-jar.properties}"/>
-            <param location="${project.EssentialsAntiBuild}" name="call.subproject"/>
-            <param location="${project.EssentialsAntiBuild}/build.xml" name="call.script"/>
-            <param name="call.target" value="jar"/>
-            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
-        </antcall>
        <antcall target="-maybe-call-dep">
            <param name="call.built.properties" value="${built-jar.properties}"/>
            <param location="${project.EssentialsProtect}" name="call.subproject"/>
@@ -1171,11 +854,7 @@ is divided into following sections:
                PROFILING SECTION
                =================
            -->
-    <!--
-                pre NB7.2 profiler integration
-            -->
-    <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+    <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
        <nbprofiledirect>
            <classpath>
                <path path="${run.classpath}"/>
@@ -1183,9 +862,8 @@ is divided into following sections:
        </nbprofiledirect>
        <profile/>
    </target>
-    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
+    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
        <nbprofiledirect>
            <classpath>
                <path path="${run.classpath}"/>
@@ -1193,8 +871,12 @@ is divided into following sections:
        </nbprofiledirect>
        <profile classname="${profile.class}"/>
    </target>
-    <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+    <!--
+                =========================
+                APPLET PROFILING  SECTION
+                =========================
+            -->
+    <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
        <nbprofiledirect>
            <classpath>
                <path path="${run.classpath}"/>
@@ -1206,8 +888,12 @@ is divided into following sections:
            </customize>
        </profile>
    </target>
-    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+    <!--
+                =========================
+                TESTS PROFILING  SECTION
+                =========================
+            -->
+    <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
        <nbprofiledirect>
            <classpath>
                <path path="${run.test.classpath}"/>
@@ -1229,42 +915,6 @@ is divided into following sections:
            <formatter type="xml"/>
        </junit>
    </target>
-    <!--
-                end of pre NB72 profiling section
-            -->
-    <target if="netbeans.home" name="-profile-check">
-        <condition property="profiler.configured">
-            <or>
-                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
-                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
-            </or>
-        </condition>
-    </target>
-    <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
-        <startprofiler/>
-        <antcall target="run"/>
-    </target>
-    <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <startprofiler/>
-        <antcall target="run-single"/>
-    </target>
-    <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
-    <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <startprofiler/>
-        <antcall target="test-single"/>
-    </target>
-    <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <startprofiler/>
-        <antcal target="run-test-with-main"/>
-    </target>
-    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <startprofiler/>
-        <antcall target="run-applet"/>
-    </target>
    <!--
                ===============
                JAVADOC SECTION
@@ -1308,7 +958,7 @@ is divided into following sections:
    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
    <!--
                =========================
-                TEST COMPILATION SECTION
+                JUNIT COMPILATION SECTION
                =========================
            -->
    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -1351,14 +1001,14 @@ is divided into following sections:
    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
    <!--
                =======================
-                TEST EXECUTION SECTION
+                JUNIT EXECUTION SECTION
                =======================
            -->
    <target depends="init" if="have.tests" name="-pre-test-run">
        <mkdir dir="${build.test.results.dir}"/>
    </target>
    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:test testincludes="**/*Test.java"/>
+        <j2seproject3:junit testincludes="**/*Test.java"/>
    </target>
    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
@@ -1371,40 +1021,39 @@ is divided into following sections:
    </target>
    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
+        <j2seproject3:junit excludes="" includes="${test.includes}"/>
    </target>
    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
    </target>
    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
-        <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
-        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-        <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
    <!--
                =======================
-                TEST DEBUGGING SECTION
+                JUNIT DEBUGGING SECTION
                =======================
            -->
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
+    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
+        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
+        <delete file="${test.report.file}"/>
+        <mkdir dir="${build.test.results.dir}"/>
+        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
+            <customize>
+                <syspropertyset>
+                    <propertyref prefix="test-sys-prop."/>
+                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                </syspropertyset>
+                <arg value="${test.class}"/>
+                <arg value="showoutput=true"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
+            </customize>
+        </j2seproject3:debug>
    </target>
    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
    </target>
    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
    </target>
@@ -1491,13 +1140,6 @@ is divided into following sections:
            <param name="call.target" value="clean"/>
            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
        </antcall>
-        <antcall target="-maybe-call-dep">
-            <param name="call.built.properties" value="${built-clean.properties}"/>
-            <param location="${project.EssentialsAntiBuild}" name="call.subproject"/>
-            <param location="${project.EssentialsAntiBuild}/build.xml" name="call.script"/>
-            <param name="call.target" value="clean"/>
-            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
-        </antcall>
        <antcall target="-maybe-call-dep">
            <param name="call.built.properties" value="${built-clean.properties}"/>
            <param location="${project.EssentialsProtect}" name="call.subproject"/>
@@ -1532,12 +1174,9 @@ is divided into following sections:
    <target name="-check-call-dep">
        <property file="${call.built.properties}" prefix="already.built."/>
        <condition property="should.call.dep">
-            <and>
-                <not>
-                    <isset property="already.built.${call.subproject}"/>
-                </not>
-                <available file="${call.script}"/>
-            </and>
+            <not>
+                <isset property="already.built.${call.subproject}"/>
+            </not>
        </condition>
    </target>
    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=b4df970c
+build.xml.data.CRC32=51b33957
 build.xml.script.CRC32=7a797370
-build.xml.stylesheet.CRC32=28e38971@1.50.3.46
+build.xml.stylesheet.CRC32=28e38971@1.44.1.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=b4df970c
-nbproject/build-impl.xml.script.CRC32=8905537e
-nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46
+nbproject/build-impl.xml.data.CRC32=51b33957
+nbproject/build-impl.xml.script.CRC32=c5170bed
+nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.1.46
@@ -66,7 +66,6 @@ jar.compress=true
 javac.classpath=\
    ${reference.Essentials.jar}:\
    ${reference.EssentialsChat.jar}:\
-    ${reference.EssentialsAntiBuild.jar}:\
    ${reference.EssentialsProtect.jar}:\
    ${reference.EssentialsSpawn.jar}:\
    ${reference.EssentialsGeoIP.jar}:\
@@ -104,7 +103,6 @@ project.EssentialsChat=../EssentialsChat
 project.EssentialsGeoIP=../EssentialsGeoIP
 project.EssentialsGroupBridge=../EssentialsGroupBridge
 project.EssentialsGroupManager=../EssentialsGroupManager
-project.EssentialsAntiBuild=../EssentialsAntiBuild
 project.EssentialsProtect=../EssentialsProtect
 project.EssentialsSpawn=../EssentialsSpawn
 project.EssentialsXMPP=../EssentialsXMPP
@@ -113,7 +111,6 @@ 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.EssentialsAntiBuild.jar=${project.EssentialsAntiBuild}/dist/EssentialsAntiBuild.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
@@ -55,14 +55,6 @@
                <clean-target>clean</clean-target>
                <id>jar</id>
            </reference>
-            <reference>
-                <foreign-project>EssentialsAntiBuild</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>
@@ -12,9 +12,9 @@ is divided into following sections:
  - execution
  - debugging
  - javadoc
-  - test compilation
-  - test execution
-  - test debugging
+  - junit compilation
+  - junit execution
+  - junit debugging
  - applet
  - cleanup

@@ -181,7 +181,6 @@ is divided into following sections:
            </and>
        </condition>
        <property name="run.jvmargs" value=""/>
-        <property name="run.jvmargs.ide" value=""/>
        <property name="javac.compilerargs" value=""/>
        <property name="work.dir" value="${basedir}"/>
        <condition property="no.deps">
@@ -226,27 +225,6 @@ is divided into following sections:
        <property name="jar.index.metainf" value="${jar.index}"/>
        <property name="copylibs.rebase" value="true"/>
        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
-        <condition property="junit.available">
-            <or>
-                <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
-                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
-            </or>
-        </condition>
-        <condition property="testng.available">
-            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
-        </condition>
-        <condition property="junit+testng.available">
-            <and>
-                <istrue value="${junit.available}"/>
-                <istrue value="${testng.available}"/>
-            </and>
-        </condition>
-        <condition else="testng" property="testng.mode" value="mixed">
-            <istrue value="${junit+testng.available}"/>
-        </condition>
-        <condition else="" property="testng.debug.mode" value="-mixed">
-            <istrue value="${junit+testng.available}"/>
-        </condition>
    </target>
    <target name="-post-init">
        <!-- Empty placeholder for easier customization. -->
@@ -379,52 +357,11 @@ is divided into following sections:
            </sequential>
        </macrodef>
    </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-init">
-        <condition else="false" property="nb.junit.batch" value="true">
-            <and>
-                <istrue value="${junit.available}"/>
-                <not>
-                    <isset property="test.method"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="false" property="nb.junit.single" value="true">
-            <and>
-                <istrue value="${junit.available}"/>
-                <isset property="test.method"/>
-            </and>
-        </condition>
-    </target>
-    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
+    <target name="-init-macrodef-junit">
        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
            <attribute default="${includes}" name="includes"/>
            <attribute default="${excludes}" name="excludes"/>
            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
            <sequential>
                <property name="junit.forkmode" value="perTest"/>
                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
@@ -433,270 +370,32 @@ is divided into following sections:
                            <filename name="@{testincludes}"/>
                        </fileset>
                    </batchtest>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
                    <syspropertyset>
                        <propertyref prefix="test-sys-prop."/>
                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
                    </syspropertyset>
                    <formatter type="brief" usefile="false"/>
                    <formatter type="xml"/>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                    <jvmarg value="-ea"/>
-                    <customize/>
+                    <jvmarg line="${run.jvmargs}"/>
                </junit>
            </sequential>
        </macrodef>
    </target>
-    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
-    <target if="${testng.available}" name="-init-macrodef-testng">
-        <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
-                    <isset property="test.method"/>
-                </condition>
-                <union id="test.set">
-                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
-                        <filename name="@{testincludes}"/>
-                    </fileset>
-                </union>
-                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Essentials" testname="TestNG tests" workingDir="${work.dir}">
-                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
-                    <propertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </propertyset>
-                    <customize/>
-                </testng>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-test-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <echo>No tests executed.</echo>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:testng>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
-        <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <sequential>
-                <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                        <jvmarg line="${run.jvmargs}"/>
-                        <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
-                </j2seproject3:test-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
-        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit-debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${testng.available}" name="-init-macrodef-testng-debug">
-        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <element name="customize2" optional="true"/>
-            <sequential>
-                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
-                    <isset property="test.method"/>
-                </condition>
-                <condition else="-suitename Essentials -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
-                    <matches pattern=".*\.xml" string="@{testClass}"/>
-                </condition>
-                <delete dir="${build.test.results.dir}" quiet="true"/>
-                <mkdir dir="${build.test.results.dir}"/>
-                <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
-                    <customize>
-                        <customize2/>
-                        <jvmarg value="-ea"/>
-                        <arg line="${testng.debug.mode}"/>
-                        <arg line="-d ${build.test.results.dir}"/>
-                        <arg line="-listener org.testng.reporters.VerboseReporter"/>
-                        <arg line="${testng.cmd.args}"/>
-                    </customize>
-                </j2seproject3:debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
-        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <element implicit="true" name="customize2" optional="true"/>
-            <sequential>
-                <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
-                    <customize2/>
-                </j2seproject3:testng-debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
-        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <sequential>
-                <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                        <jvmarg line="${run.jvmargs}"/>
-                        <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
-                </j2seproject3:test-debug-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
-        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <sequential>
-                <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
-                    <customize2>
-                        <syspropertyset>
-                            <propertyref prefix="test-sys-prop."/>
-                            <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                        </syspropertyset>
-                    </customize2>
-                </j2seproject3:testng-debug-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
-    <!--
-                pre NB7.2 profiling section; consider it deprecated
-            -->
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
-    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
+    <target name="-profile-pre-init">
        <!-- Empty placeholder for easier customization. -->
        <!-- You can override this target in the ../build.xml file. -->
    </target>
-    <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
+    <target name="-profile-post-init">
        <!-- Empty placeholder for easier customization. -->
        <!-- You can override this target in the ../build.xml file. -->
    </target>
-    <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
+    <target name="-profile-init-macrodef-profile">
        <macrodef name="resolve">
            <attribute name="name"/>
            <attribute name="value"/>
@@ -728,13 +427,10 @@ is divided into following sections:
            </sequential>
        </macrodef>
    </target>
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
    </target>
-    <!--
-                end of pre NB7.2 profiling section
-            -->
    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
            <attribute default="${main.class}" name="name"/>
@@ -792,7 +488,6 @@ is divided into following sections:
                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
                    <classpath>
                        <path path="@{classpath}"/>
                    </classpath>
@@ -809,7 +504,6 @@ is divided into following sections:
        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
            <attribute default="${main.class}" name="classname"/>
            <attribute default="${run.classpath}" name="classpath"/>
-            <attribute default="jvm" name="jvm"/>
            <element name="customize" optional="true"/>
            <sequential>
                <java classname="@{classname}" dir="${work.dir}" fork="true">
@@ -817,7 +511,6 @@ is divided into following sections:
                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
                    <classpath>
                        <path path="@{classpath}"/>
                    </classpath>
@@ -844,9 +537,6 @@ is divided into following sections:
                    <path path="${run.classpath.without.build.classes.dir}"/>
                    <chainedmapper>
                        <flattenmapper/>
-                        <filtermapper>
-                            <replacestring from=" " to="%20"/>
-                        </filtermapper>
                        <globmapper from="*" to="lib/*"/>
                    </chainedmapper>
                </pathconvert>
@@ -892,7 +582,7 @@ is divided into following sections:
    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
        <property name="ap.cmd.line.internal" value=""/>
    </target>
-    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
    <!--
                ===================
                COMPILATION SECTION
@@ -1115,11 +805,7 @@ is divided into following sections:
                PROFILING SECTION
                =================
            -->
-    <!--
-                pre NB7.2 profiler integration
-            -->
-    <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+    <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
        <nbprofiledirect>
            <classpath>
                <path path="${run.classpath}"/>
@@ -1127,9 +813,8 @@ is divided into following sections:
        </nbprofiledirect>
        <profile/>
    </target>
-    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
+    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
        <nbprofiledirect>
            <classpath>
                <path path="${run.classpath}"/>
@@ -1137,8 +822,12 @@ is divided into following sections:
        </nbprofiledirect>
        <profile classname="${profile.class}"/>
    </target>
-    <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+    <!--
+                =========================
+                APPLET PROFILING  SECTION
+                =========================
+            -->
+    <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
        <nbprofiledirect>
            <classpath>
                <path path="${run.classpath}"/>
@@ -1150,8 +839,12 @@ is divided into following sections:
            </customize>
        </profile>
    </target>
-    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+    <!--
+                =========================
+                TESTS PROFILING  SECTION
+                =========================
+            -->
+    <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
        <nbprofiledirect>
            <classpath>
                <path path="${run.test.classpath}"/>
@@ -1173,42 +866,6 @@ is divided into following sections:
            <formatter type="xml"/>
        </junit>
    </target>
-    <!--
-                end of pre NB72 profiling section
-            -->
-    <target if="netbeans.home" name="-profile-check">
-        <condition property="profiler.configured">
-            <or>
-                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
-                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
-            </or>
-        </condition>
-    </target>
-    <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
-        <startprofiler/>
-        <antcall target="run"/>
-    </target>
-    <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <startprofiler/>
-        <antcall target="run-single"/>
-    </target>
-    <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
-    <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <startprofiler/>
-        <antcall target="test-single"/>
-    </target>
-    <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <startprofiler/>
-        <antcal target="run-test-with-main"/>
-    </target>
-    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <startprofiler/>
-        <antcall target="run-applet"/>
-    </target>
    <!--
                ===============
                JAVADOC SECTION
@@ -1252,7 +909,7 @@ is divided into following sections:
    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
    <!--
                =========================
-                TEST COMPILATION SECTION
+                JUNIT COMPILATION SECTION
                =========================
            -->
    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -1295,14 +952,14 @@ is divided into following sections:
    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
    <!--
                =======================
-                TEST EXECUTION SECTION
+                JUNIT EXECUTION SECTION
                =======================
            -->
    <target depends="init" if="have.tests" name="-pre-test-run">
        <mkdir dir="${build.test.results.dir}"/>
    </target>
    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:test testincludes="**/*Test.java"/>
+        <j2seproject3:junit testincludes="**/*Test.java"/>
    </target>
    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
@@ -1315,40 +972,39 @@ is divided into following sections:
    </target>
    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
+        <j2seproject3:junit excludes="" includes="${test.includes}"/>
    </target>
    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
    </target>
    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
-        <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
-        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-        <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
    <!--
                =======================
-                TEST DEBUGGING SECTION
+                JUNIT DEBUGGING SECTION
                =======================
            -->
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
+    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
+        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
+        <delete file="${test.report.file}"/>
+        <mkdir dir="${build.test.results.dir}"/>
+        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
+            <customize>
+                <syspropertyset>
+                    <propertyref prefix="test-sys-prop."/>
+                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                </syspropertyset>
+                <arg value="${test.class}"/>
+                <arg value="showoutput=true"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
+            </customize>
+        </j2seproject3:debug>
    </target>
    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
    </target>
    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
    </target>
@@ -1420,12 +1076,9 @@ is divided into following sections:
    <target name="-check-call-dep">
        <property file="${call.built.properties}" prefix="already.built."/>
        <condition property="should.call.dep">
-            <and>
-                <not>
-                    <isset property="already.built.${call.subproject}"/>
-                </not>
-                <available file="${call.script}"/>
-            </and>
+            <not>
+                <isset property="already.built.${call.subproject}"/>
+            </not>
        </condition>
    </target>
    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
@@ -4,8 +4,8 @@ build.xml.stylesheet.CRC32=28e38971@1.38.2.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=a830bc14
-nbproject/build-impl.xml.script.CRC32=7c507372
-nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46
+nbproject/build-impl.xml.script.CRC32=a9f8842a
+nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.1.46
 nbproject/profiler-build-impl.xml.data.CRC32=ab78ce15
 nbproject/profiler-build-impl.xml.script.CRC32=abda56ed
 nbproject/profiler-build-impl.xml.stylesheet.CRC32=f10cf54c@1.11.1
@@ -1,5 +1,5 @@
 annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=true
+annotation.processing.enabled.in.editor=false
 annotation.processing.processors.list=lombok.core.AnnotationProcessor
 annotation.processing.run.all.processors=false
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
@@ -68,6 +68,7 @@ file.reference.BOSEconomy7.jar=../lib/BOSEconomy7.jar
 file.reference.bPermissions.jar=../lib/bPermissions.jar
 file.reference.bpermissions2.jar=../lib/bpermissions2.jar
 file.reference.bukkit.jar=../lib/bukkit.jar
+file.reference.craftbukkit.jar=../lib/craftbukkit.jar
 file.reference.iCo4.jar=../lib/iCo4.jar
 file.reference.iCo5.jar=../lib/iCo5.jar
 file.reference.iCo6.jar=../lib/iCo6.jar
@@ -95,11 +96,12 @@ javac.classpath=\
    ${file.reference.lombok.jar}:\
    ${reference.EssentialsGroupManager.jar}:\
    ${file.reference.bukkit.jar}:\
+    ${file.reference.craftbukkit.jar}:\
    ${file.reference.Vault.jar}:\
    ${file.reference.Privileges.jar}:\
    ${file.reference.bpermissions2.jar}
 # Space-separated list of extra javac options
-javac.compilerargs=-Xlint:unchecked
+javac.compilerargs=
 javac.deprecation=false
 javac.processorpath=\
    ${javac.classpath}
@@ -122,7 +124,7 @@ javadoc.reference.PermissionsEx.jar=../lib/PermissionsEx-javadoc.jar
 javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=false
-javadoc.windowtitle=
+javadoc.windowtitle=Essentials Docs.
 jnlp.codebase.type=no.codebase
 jnlp.descriptor=application
 jnlp.enabled=false
@@ -1,137 +0,0 @@
-package com.earth2me.essentials;
-
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.command.Command;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.command.PluginCommandYamlParser;
-import org.bukkit.plugin.Plugin;
-
-
-public class AlternativeCommandsHandler
-{
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private final transient Map<String, List<PluginCommand>> altcommands = new HashMap<String, List<PluginCommand>>();
-	private final transient Map<String, String> disabledList = new HashMap<String, String>();
-	private final transient IEssentials ess;
-
-	public AlternativeCommandsHandler(final IEssentials ess)
-	{
-		this.ess = ess;
-		for (Plugin plugin : ess.getServer().getPluginManager().getPlugins())
-		{
-			if (plugin.isEnabled())
-			{
-				addPlugin(plugin);
-			}
-		}
-	}
-
-	public final void addPlugin(final Plugin plugin)
-	{
-		if (plugin.getDescription().getMain().contains("com.earth2me.essentials"))
-		{
-			return;
-		}
-		final List<Command> commands = PluginCommandYamlParser.parse(plugin);
-		final String pluginName = plugin.getDescription().getName().toLowerCase(Locale.ENGLISH);
-
-		for (Command command : commands)
-		{
-			final PluginCommand pc = (PluginCommand)command;
-			final List<String> labels = new ArrayList<String>(pc.getAliases());
-			labels.add(pc.getName());
-
-			PluginCommand reg = ess.getServer().getPluginCommand(pluginName + ":" + pc.getName().toLowerCase(Locale.ENGLISH));
-			if (reg == null)
-			{
-				reg = ess.getServer().getPluginCommand(pc.getName().toLowerCase(Locale.ENGLISH));
-			}
-			if (reg == null || !reg.getPlugin().equals(plugin))
-			{
-				continue;
-			}
-			for (String label : labels)
-			{
-				List<PluginCommand> plugincommands = altcommands.get(label.toLowerCase(Locale.ENGLISH));
-				if (plugincommands == null)
-				{
-					plugincommands = new ArrayList<PluginCommand>();
-					altcommands.put(label.toLowerCase(Locale.ENGLISH), plugincommands);
-				}
-				boolean found = false;
-				for (PluginCommand pc2 : plugincommands)
-				{
-					if (pc2.getPlugin().equals(plugin))
-					{
-						found = true;
-					}
-				}
-				if (!found)
-				{
-					plugincommands.add(reg);
-				}
-			}
-		}
-	}
-
-	public void removePlugin(final Plugin plugin)
-	{
-		final Iterator<Map.Entry<String, List<PluginCommand>>> iterator = altcommands.entrySet().iterator();
-		while (iterator.hasNext())
-		{
-			final Map.Entry<String, List<PluginCommand>> entry = iterator.next();
-			final Iterator<PluginCommand> pcIterator = entry.getValue().iterator();
-			while (pcIterator.hasNext())
-			{
-				final PluginCommand pc = pcIterator.next();
-				if (pc.getPlugin() == null || pc.getPlugin().equals(plugin))
-				{
-					pcIterator.remove();
-				}
-			}
-			if (entry.getValue().isEmpty())
-			{
-				iterator.remove();
-			}
-		}
-	}
-
-	public PluginCommand getAlternative(final String label)
-	{
-		final List<PluginCommand> commands = altcommands.get(label);
-		if (commands == null || commands.isEmpty())
-		{
-			return null;
-		}
-		if (commands.size() == 1)
-		{
-			return commands.get(0);
-		}
-		// return the first command that is not an alias
-		for (PluginCommand command : commands)
-		{
-			if (command.getName().equalsIgnoreCase(label))
-			{
-				return command;
-			}
-		}
-		// return the first alias
-		return commands.get(0);
-	}
-
-	public void executed(final String label, final String otherLabel)
-	{
-		if (ess.getSettings().isDebug())
-		{
-			LOGGER.log(Level.INFO, "Essentials: Alternative command " + label + " found, using " + otherLabel);
-		}
-		disabledList.put(label, otherLabel);
-	}
-
-	public Map<String, String> disabledCommands()
-	{
-		return disabledList;
-	}
-}
@@ -1,23 +1,29 @@
 package com.earth2me.essentials;

 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.IBackup;
+import com.earth2me.essentials.api.IEssentials;
+import com.earth2me.essentials.api.ISettings;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import lombok.Cleanup;
+import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;


-public class Backup implements Runnable
+public class Backup implements Runnable, IBackup
 {
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+	private static final Logger LOGGER = Bukkit.getLogger();
 	private transient final Server server;
 	private transient final IEssentials ess;
-	private transient boolean running = false;
+	private transient final AtomicBoolean running = new AtomicBoolean(false);
 	private transient int taskId = -1;
-	private transient boolean active = false;
+	private transient final AtomicBoolean active = new AtomicBoolean(false);

 	public Backup(final IEssentials ess)
 	{
@@ -29,112 +35,119 @@ public class Backup implements Runnable
 		}
 	}

-	void onPlayerJoin()
+	@Override
+	public final void startTask()
 	{
-		startTask();
-	}
-
-	private void startTask()
-	{
-		if (!running)
+		if (running.compareAndSet(false, true))
 		{
-			final long interval = ess.getSettings().getBackupInterval() * 1200; // minutes -> ticks
+			@Cleanup
+			final ISettings settings = ess.getSettings();
+			settings.acquireReadLock();
+			final long interval = settings.getData().getGeneral().getBackup().getInterval() * 1200; // minutes -> ticks
 			if (interval < 1200)
 			{
+				running.set(false);
 				return;
 			}
 			taskId = ess.scheduleSyncRepeatingTask(this, interval, interval);
-			running = true;
 		}
 	}

 	@Override
 	public void run()
 	{
-		if (active)
+		if (!active.compareAndSet(false, true))
 		{
 			return;
 		}
-		active = true;
-		final String command = ess.getSettings().getBackupCommand();
-		if (command == null || "".equals(command))
+		@Cleanup
+		final ISettings settings = ess.getSettings();
+		settings.acquireReadLock();
+		final String command = settings.getData().getGeneral().getBackup().getCommand();
+		if (command == null || command.isEmpty())
 		{
 			return;
 		}
-		if ("save-all".equalsIgnoreCase(command)) {
-			final CommandSender cs = server.getConsoleSender();
-			server.dispatchCommand(cs, "save-all");
-			active = false;
-			return;
-		}
 		LOGGER.log(Level.INFO, _("backupStarted"));
-		final CommandSender cs = server.getConsoleSender();
-		server.dispatchCommand(cs, "save-all");
-		server.dispatchCommand(cs, "save-off");
+		final CommandSender consoleSender = server.getConsoleSender();
+		server.dispatchCommand(consoleSender, "save-all");
+		server.dispatchCommand(consoleSender, "save-off");

-		ess.scheduleAsyncDelayedTask(
-				new Runnable()
+		ess.scheduleAsyncDelayedTask(new BackupRunner(command));
+	}
+
+
+	private class BackupRunner implements Runnable
+	{
+		private final transient String command;
+
+		public BackupRunner(final String command)
+		{
+			this.command = command;
+		}
+
+		@Override
+		public void run()
+		{
+			try
+			{
+				final ProcessBuilder childBuilder = new ProcessBuilder(command);
+				childBuilder.redirectErrorStream(true);
+				childBuilder.directory(ess.getDataFolder().getParentFile().getParentFile());
+				final Process child = childBuilder.start();
+				final BufferedReader reader = new BufferedReader(new InputStreamReader(child.getInputStream()));
+				try
 				{
-					@Override
-					public void run()
+					child.waitFor();
+					String line;
+					do
 					{
-						try
+						line = reader.readLine();
+						if (line != null)
 						{
-							final ProcessBuilder childBuilder = new ProcessBuilder(command);
-							childBuilder.redirectErrorStream(true);
-							childBuilder.directory(ess.getDataFolder().getParentFile().getParentFile());
-							final Process child = childBuilder.start();
-							final BufferedReader reader = new BufferedReader(new InputStreamReader(child.getInputStream()));
-							try
-							{
-								child.waitFor();
-								String line;
-								do
-								{
-									line = reader.readLine();
-									if (line != null)
-									{
-										LOGGER.log(Level.INFO, line);
-									}
-								}
-								while (line != null);
-							}
-							finally
-							{
-								reader.close();
-							}
-						}
-						catch (InterruptedException ex)
-						{
-							LOGGER.log(Level.SEVERE, null, ex);
-						}
-						catch (IOException ex)
-						{
-							LOGGER.log(Level.SEVERE, null, ex);
-						}
-						finally
-						{
-							ess.scheduleSyncDelayedTask(
-									new Runnable()
-									{
-										@Override
-										public void run()
-										{
-											server.dispatchCommand(cs, "save-on");
-											if (server.getOnlinePlayers().length == 0)
-											{
-												running = false;
-												if (taskId != -1)
-												{
-													server.getScheduler().cancelTask(taskId);
-												}
-											}
-											active = false;
-											LOGGER.log(Level.INFO, _("backupFinished"));
-										}
-									});
+							LOGGER.log(Level.INFO, line);
 						}
 					}
-				});
+					while (line != null);
+				}
+				finally
+				{
+					reader.close();
+				}
+			}
+			catch (InterruptedException ex)
+			{
+				LOGGER.log(Level.SEVERE, null, ex);
+			}
+			catch (IOException ex)
+			{
+				LOGGER.log(Level.SEVERE, null, ex);
+			}
+			finally
+			{
+				ess.scheduleSyncDelayedTask(new EnableSavingRunner());
+			}
+		}
+	}
+
+
+	private class EnableSavingRunner implements Runnable
+	{
+		@Override
+		public void run()
+		{
+			server.dispatchCommand(server.getConsoleSender(), "save-on");
+			if (server.getOnlinePlayers().length == 0)
+			{
+				running.set(false);
+				if (taskId != -1)
+				{
+					server.getScheduler().cancelTask(taskId);
+				}
+			}
+
+			active.set(false);
+			LOGGER.log(Level.INFO, _("backupFinished"));
+		}
 	}
 }
@@ -1,6 +1,6 @@
 package com.earth2me.essentials;

-import org.bukkit.Server;
+import com.earth2me.essentials.api.IReplyTo;
 import org.bukkit.command.CommandSender;


@@ -14,13 +14,8 @@ public final class Console implements IReplyTo
 	{
 	}

-	public static CommandSender getCommandSender(Server server) throws Exception
-	{
-		return server.getConsoleSender();
-	}
-
 	@Override
-	public void setReplyTo(CommandSender user)
+	public void setReplyTo(final CommandSender user)
 	{
 		replyTo = user;
 	}
@@ -6,18 +6,16 @@ import java.util.*;


 /**
- * This utility class is used for converting between the ingame time in ticks to ingame time as a friendly string. Note
- * that the time is INGAME.
- *
+ * This utility class is used for converting between the ingame
+ * time in ticks to ingame time as a friendly string.
+ * Note that the time is INGAME.
+ * 
 * http://www.minecraftwiki.net/wiki/Day/night_cycle
- *
+ * 
 * @author Olof Larsson
 */
 public final class DescParseTickFormat
 {
-	// ============================================
-	// First some information vars. TODO: Should this be in a config file?
-	// --------------------------------------------
 	public static final Map<String, Integer> nameToTicks = new LinkedHashMap<String, Integer>();
 	public static final Set<String> resetAliases = new HashSet<String>();
 	public static final int ticksAtMidnight = 18000;
@@ -155,31 +153,30 @@ public final class DescParseTickFormat
 		int hours = 0;
 		int minutes = 0;

-		desc = desc.toLowerCase(Locale.ENGLISH);
-		String parsetime = desc.replaceAll("[^0-9]", "");
+		desc = desc.toLowerCase(Locale.ENGLISH).replaceAll("[^0-9]", "");

-		if (parsetime.length() > 4)
+		if (desc.length() > 4)
 		{
 			throw new NumberFormatException();
 		}

-		if (parsetime.length() == 4)
+		if (desc.length() == 4)
 		{
-			hours += Integer.parseInt(parsetime.substring(0, 2));
-			minutes += Integer.parseInt(parsetime.substring(2, 4));
+			hours += Integer.parseInt(desc.substring(0, 2));
+			minutes += Integer.parseInt(desc.substring(2, 4));
 		}
-		else if (parsetime.length() == 3)
+		else if (desc.length() == 3)
 		{
-			hours += Integer.parseInt(parsetime.substring(0, 1));
-			minutes += Integer.parseInt(parsetime.substring(1, 3));
+			hours += Integer.parseInt(desc.substring(0, 1));
+			minutes += Integer.parseInt(desc.substring(1, 3));
 		}
-		else if (parsetime.length() == 2)
+		else if (desc.length() == 2)
 		{
-			hours += Integer.parseInt(parsetime.substring(0, 2));
+			hours += Integer.parseInt(desc.substring(0, 2));
 		}
-		else if (parsetime.length() == 1)
+		else if (desc.length() == 1)
 		{
-			hours += Integer.parseInt(parsetime.substring(0, 1));
+			hours += Integer.parseInt(desc.substring(0, 1));
 		}
 		else
 		{
@@ -269,11 +266,11 @@ public final class DescParseTickFormat

 		// How many ingame days have passed since the server start?
 		final long days = ticks / ticksPerDay;
-		ticks -= days * ticksPerDay;
+		ticks = ticks - days * ticksPerDay;

 		// How many hours on the last day?
 		final long hours = ticks / ticksPerHour;
-		ticks -= hours * ticksPerHour;
+		ticks = ticks - hours * ticksPerHour;

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


-public class Enchantments
+public final class Enchantments
 {
+
+	private Enchantments()
+	{
+	}
+	
 	private static final transient Pattern NUMPATTERN = Pattern.compile("\\d+");
 	private static final Map<String, Enchantment> ENCHANTMENTS = new HashMap<String, Enchantment>();
-	private static final Map<String, Enchantment> ALIASENCHANTMENTS = new HashMap<String, Enchantment>();

 	static
 	{
 		ENCHANTMENTS.put("alldamage", Enchantment.DAMAGE_ALL);
-		ALIASENCHANTMENTS.put("alldmg", Enchantment.DAMAGE_ALL);
+		ENCHANTMENTS.put("alldmg", Enchantment.DAMAGE_ALL);
 		ENCHANTMENTS.put("sharpness", Enchantment.DAMAGE_ALL);
-		ENCHANTMENTS.put("sharp", Enchantment.DAMAGE_ALL);
-		ALIASENCHANTMENTS.put("dal", Enchantment.DAMAGE_ALL);
-				
+		ENCHANTMENTS.put("arthropodsdamage", Enchantment.DAMAGE_ARTHROPODS);
 		ENCHANTMENTS.put("ardmg", Enchantment.DAMAGE_ARTHROPODS);
 		ENCHANTMENTS.put("baneofarthropods", Enchantment.DAMAGE_ARTHROPODS);
-		ALIASENCHANTMENTS.put("baneofarthropod", Enchantment.DAMAGE_ARTHROPODS);
-		ALIASENCHANTMENTS.put("arthropod", Enchantment.DAMAGE_ARTHROPODS);
-		ALIASENCHANTMENTS.put("dar", Enchantment.DAMAGE_ARTHROPODS);
-		
 		ENCHANTMENTS.put("undeaddamage", Enchantment.DAMAGE_UNDEAD);
 		ENCHANTMENTS.put("smite", Enchantment.DAMAGE_UNDEAD);
-		ALIASENCHANTMENTS.put("du", Enchantment.DAMAGE_UNDEAD);
-		
 		ENCHANTMENTS.put("digspeed", Enchantment.DIG_SPEED);
 		ENCHANTMENTS.put("efficiency", Enchantment.DIG_SPEED);
-		ALIASENCHANTMENTS.put("minespeed", Enchantment.DIG_SPEED);
-		ALIASENCHANTMENTS.put("cutspeed", Enchantment.DIG_SPEED);
-		ALIASENCHANTMENTS.put("ds", Enchantment.DIG_SPEED);
-		
 		ENCHANTMENTS.put("durability", Enchantment.DURABILITY);
 		ENCHANTMENTS.put("dura", Enchantment.DURABILITY);
 		ENCHANTMENTS.put("unbreaking", Enchantment.DURABILITY);
-		ALIASENCHANTMENTS.put("d", Enchantment.DURABILITY);
-		
 		ENCHANTMENTS.put("fireaspect", Enchantment.FIRE_ASPECT);
 		ENCHANTMENTS.put("fire", Enchantment.FIRE_ASPECT);
-		ALIASENCHANTMENTS.put("meleefire", Enchantment.FIRE_ASPECT);
-		ALIASENCHANTMENTS.put("meleeflame", Enchantment.FIRE_ASPECT);
-		ALIASENCHANTMENTS.put("fa", Enchantment.FIRE_ASPECT);
-		
 		ENCHANTMENTS.put("knockback", Enchantment.KNOCKBACK);
-		ALIASENCHANTMENTS.put("k", Enchantment.KNOCKBACK);
-		
-		ALIASENCHANTMENTS.put("blockslootbonus", Enchantment.LOOT_BONUS_BLOCKS);
+		ENCHANTMENTS.put("blockslootbonus", Enchantment.LOOT_BONUS_BLOCKS);
 		ENCHANTMENTS.put("fortune", Enchantment.LOOT_BONUS_BLOCKS);
-		ALIASENCHANTMENTS.put("lbb", Enchantment.LOOT_BONUS_BLOCKS);
-		
-		ALIASENCHANTMENTS.put("mobslootbonus", Enchantment.LOOT_BONUS_MOBS);
+		ENCHANTMENTS.put("mobslootbonus", Enchantment.LOOT_BONUS_MOBS);
 		ENCHANTMENTS.put("mobloot", Enchantment.LOOT_BONUS_MOBS);
 		ENCHANTMENTS.put("looting", Enchantment.LOOT_BONUS_MOBS);
-		ALIASENCHANTMENTS.put("lbm", Enchantment.LOOT_BONUS_MOBS);
-		
-		ALIASENCHANTMENTS.put("oxygen", Enchantment.OXYGEN);
+		ENCHANTMENTS.put("oxygen", Enchantment.OXYGEN);
 		ENCHANTMENTS.put("respiration", Enchantment.OXYGEN);
-		ALIASENCHANTMENTS.put("breathing", Enchantment.OXYGEN);
-		ENCHANTMENTS.put("breath", Enchantment.OXYGEN);
-		ALIASENCHANTMENTS.put("o", Enchantment.OXYGEN);
-		
 		ENCHANTMENTS.put("protection", Enchantment.PROTECTION_ENVIRONMENTAL);
-		ALIASENCHANTMENTS.put("prot", Enchantment.PROTECTION_ENVIRONMENTAL);
-		ENCHANTMENTS.put("protect", Enchantment.PROTECTION_ENVIRONMENTAL);
-		ALIASENCHANTMENTS.put("p", Enchantment.PROTECTION_ENVIRONMENTAL);
-		
-		ALIASENCHANTMENTS.put("explosionsprotection", Enchantment.PROTECTION_EXPLOSIONS);
-		ALIASENCHANTMENTS.put("explosionprotection", Enchantment.PROTECTION_EXPLOSIONS);
-		ALIASENCHANTMENTS.put("expprot", Enchantment.PROTECTION_EXPLOSIONS);
-		ALIASENCHANTMENTS.put("blastprotection", Enchantment.PROTECTION_EXPLOSIONS);
-		ENCHANTMENTS.put("blastprotect", Enchantment.PROTECTION_EXPLOSIONS);
-		ALIASENCHANTMENTS.put("pe", Enchantment.PROTECTION_EXPLOSIONS);
-		
-		ALIASENCHANTMENTS.put("fallprotection", Enchantment.PROTECTION_FALL);
+		ENCHANTMENTS.put("prot", Enchantment.PROTECTION_ENVIRONMENTAL);
+		ENCHANTMENTS.put("explosionsprotection", Enchantment.PROTECTION_EXPLOSIONS);
+		ENCHANTMENTS.put("expprot", Enchantment.PROTECTION_EXPLOSIONS);
+		ENCHANTMENTS.put("blastprotection", Enchantment.PROTECTION_EXPLOSIONS);
+		ENCHANTMENTS.put("fallprotection", Enchantment.PROTECTION_FALL);
 		ENCHANTMENTS.put("fallprot", Enchantment.PROTECTION_FALL);
-		ENCHANTMENTS.put("featherfall", Enchantment.PROTECTION_FALL);
 		ENCHANTMENTS.put("featherfalling", Enchantment.PROTECTION_FALL);
-		ALIASENCHANTMENTS.put("pfa", Enchantment.PROTECTION_FALL);
-		
-		ALIASENCHANTMENTS.put("fireprotection", Enchantment.PROTECTION_FIRE);
-		ALIASENCHANTMENTS.put("flameprotection", Enchantment.PROTECTION_FIRE);
-		ENCHANTMENTS.put("fireprotect", Enchantment.PROTECTION_FIRE);
-		ALIASENCHANTMENTS.put("flameprotect", Enchantment.PROTECTION_FIRE);
+		ENCHANTMENTS.put("fireprotection", Enchantment.PROTECTION_FIRE);
 		ENCHANTMENTS.put("fireprot", Enchantment.PROTECTION_FIRE);
-		ALIASENCHANTMENTS.put("flameprot", Enchantment.PROTECTION_FIRE);
-		ALIASENCHANTMENTS.put("pf", Enchantment.PROTECTION_FIRE);
-		
 		ENCHANTMENTS.put("projectileprotection", Enchantment.PROTECTION_PROJECTILE);
 		ENCHANTMENTS.put("projprot", Enchantment.PROTECTION_PROJECTILE);
-		ALIASENCHANTMENTS.put("pp", Enchantment.PROTECTION_PROJECTILE);
-		
 		ENCHANTMENTS.put("silktouch", Enchantment.SILK_TOUCH);
-		ALIASENCHANTMENTS.put("softtouch", Enchantment.SILK_TOUCH);
-		ALIASENCHANTMENTS.put("st", Enchantment.SILK_TOUCH);
-		
 		ENCHANTMENTS.put("waterworker", Enchantment.WATER_WORKER);
 		ENCHANTMENTS.put("aquaaffinity", Enchantment.WATER_WORKER);
-		ALIASENCHANTMENTS.put("watermine", Enchantment.WATER_WORKER);
-		ALIASENCHANTMENTS.put("ww", Enchantment.WATER_WORKER);
-		
-		ALIASENCHANTMENTS.put("firearrow", Enchantment.ARROW_FIRE);
-		ENCHANTMENTS.put("flame", Enchantment.ARROW_FIRE);
-		ENCHANTMENTS.put("flamearrow", Enchantment.ARROW_FIRE);
-		ALIASENCHANTMENTS.put("af", Enchantment.ARROW_FIRE);
-		
+		ENCHANTMENTS.put("firearrow", Enchantment.ARROW_FIRE);
 		ENCHANTMENTS.put("arrowdamage", Enchantment.ARROW_DAMAGE);
-		ENCHANTMENTS.put("power", Enchantment.ARROW_DAMAGE);
-		ALIASENCHANTMENTS.put("arrowpower", Enchantment.ARROW_DAMAGE);
-		ALIASENCHANTMENTS.put("ad", Enchantment.ARROW_DAMAGE);
-		
 		ENCHANTMENTS.put("arrowknockback", Enchantment.ARROW_KNOCKBACK);
-		ALIASENCHANTMENTS.put("arrowkb", Enchantment.ARROW_KNOCKBACK);
-		ENCHANTMENTS.put("punch", Enchantment.ARROW_KNOCKBACK);
-		ALIASENCHANTMENTS.put("arrowpunch", Enchantment.ARROW_KNOCKBACK);
-		ALIASENCHANTMENTS.put("ak", Enchantment.ARROW_KNOCKBACK);
-		
-		ALIASENCHANTMENTS.put("infinitearrows", Enchantment.ARROW_INFINITE);
+		ENCHANTMENTS.put("arrowkb", Enchantment.ARROW_KNOCKBACK);
+		ENCHANTMENTS.put("infinitearrows", Enchantment.ARROW_INFINITE);
 		ENCHANTMENTS.put("infarrows", Enchantment.ARROW_INFINITE);
-		ENCHANTMENTS.put("infinity", Enchantment.ARROW_INFINITE);
-		ALIASENCHANTMENTS.put("infinite", Enchantment.ARROW_INFINITE);
-		ALIASENCHANTMENTS.put("unlimited", Enchantment.ARROW_INFINITE);
-		ALIASENCHANTMENTS.put("unlimitedarrows", Enchantment.ARROW_INFINITE);
-		ALIASENCHANTMENTS.put("ai", Enchantment.ARROW_INFINITE);
 	}
 	
-	public static Enchantment getByName(String name) {
+	public static Enchantment getByName(final String name) {
 		Enchantment enchantment;
 		if (NUMPATTERN.matcher(name).matches()) {
 			enchantment = Enchantment.getById(Integer.parseInt(name));
@@ -143,10 +78,6 @@ public class Enchantments
 		{
 			enchantment = ENCHANTMENTS.get(name.toLowerCase(Locale.ENGLISH));
 		}
-		if (enchantment == null)
-		{
-			enchantment = ALIASENCHANTMENTS.get(name.toLowerCase(Locale.ENGLISH));
-		}
 		return enchantment;
 	}

@@ -18,19 +18,12 @@
 package com.earth2me.essentials;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.Economy;
-import com.earth2me.essentials.api.IJails;
-import com.earth2me.essentials.commands.IEssentialsCommand;
-import com.earth2me.essentials.commands.NoChargeException;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import com.earth2me.essentials.metrics.Metrics;
-import com.earth2me.essentials.metrics.MetricsListener;
-import com.earth2me.essentials.metrics.MetricsStarter;
-import com.earth2me.essentials.perm.PermissionsHandler;
+import com.earth2me.essentials.api.*;
+import com.earth2me.essentials.listener.*;
 import com.earth2me.essentials.register.payment.Methods;
-import com.earth2me.essentials.signs.SignBlockListener;
-import com.earth2me.essentials.signs.SignEntityListener;
-import com.earth2me.essentials.signs.SignPlayerListener;
+import com.earth2me.essentials.settings.GroupsHolder;
+import com.earth2me.essentials.settings.SettingsHolder;
+import com.earth2me.essentials.user.UserMap;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
@@ -40,50 +33,45 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.world.WorldLoadEvent;
-import org.bukkit.event.world.WorldUnloadEvent;
 import org.bukkit.plugin.InvalidDescriptionException;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.scheduler.BukkitScheduler;
 import org.yaml.snakeyaml.error.YAMLException;


 public class Essentials extends JavaPlugin implements IEssentials
 {
-	public static final int BUKKIT_VERSION = 2543;
+	public static final int BUKKIT_VERSION = 1952;
 	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private transient ISettings settings;
-	private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this);
-	private transient Jails jails;
-	private transient Warps warps;
-	private transient Worth worth;
-	private transient List<IConf> confList;
-	private transient Backup backup;
-	private transient ItemDb itemDb;
+	private final transient TntExplodeListener tntListener = new TntExplodeListener(this);
+	private transient IJails jails;
+	private transient IKits kits;
+	private transient IWarps warps;
+	private transient IWorth worth;
+	private transient List<IReload> reloadList;
+	private transient IBackup backup;
+	private transient IItemDb itemDb;
+	private transient IGroups groups;
 	private transient final Methods paymentMethod = new Methods();
-	private transient PermissionsHandler permissionsHandler;
-	private transient AlternativeCommandsHandler alternativeCommandsHandler;
-	private transient UserMap userMap;
+	//private transient PermissionsHandler permissionsHandler;
+	private transient IUserMap userMap;
 	private transient ExecuteTimer execTimer;
 	private transient I18n i18n;
-	private transient Metrics metrics;
-	private transient EssentialsTimer timer;
-	private transient List<String> vanishedPlayers = new ArrayList<String>();
+	private transient ICommandHandler commandHandler;
+	private transient Economy economy;
+	public transient boolean testing;

 	@Override
 	public ISettings getSettings()
@@ -93,6 +81,7 @@ public class Essentials extends JavaPlugin implements IEssentials

 	public void setupForTesting(final Server server) throws IOException, InvalidDescriptionException
 	{
+		testing = true;
 		final File dataFolder = File.createTempFile("essentialstest", "");
 		if (!dataFolder.delete())
 		{
@@ -107,11 +96,11 @@ public class Essentials extends JavaPlugin implements IEssentials
 		LOGGER.log(Level.INFO, _("usingTempFolderForTesting"));
 		LOGGER.log(Level.INFO, dataFolder.toString());
 		this.initialize(null, server, new PluginDescriptionFile(new FileReader(new File("src" + File.separator + "plugin.yml"))), dataFolder, null, null);
-		settings = new Settings(this);
+		settings = new SettingsHolder(this);
 		i18n.updateLocale("en");
 		userMap = new UserMap(this);
-		permissionsHandler = new PermissionsHandler(this, false);
-		Economy.setEss(this);
+		//permissionsHandler = new PermissionsHandler(this);
+		economy = new Economy(this);
 	}

 	@Override
@@ -126,22 +115,19 @@ public class Essentials extends JavaPlugin implements IEssentials
 		for (Plugin plugin : pm.getPlugins())
 		{
 			if (plugin.getDescription().getName().startsWith("Essentials")
-				&& !plugin.getDescription().getVersion().equals(this.getDescription().getVersion())
-				&& !plugin.getDescription().getName().equals("EssentialsAntiCheat"))
+				&& !plugin.getDescription().getVersion().equals(this.getDescription().getVersion()))
 			{
 				LOGGER.log(Level.WARNING, _("versionMismatch", plugin.getDescription().getName()));
 			}
 		}
-		final Matcher versionMatch = Pattern.compile("git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*").matcher(getServer().getVersion());
+		final Matcher versionMatch = Pattern.compile("git-Bukkit-([0-9]+).([0-9]+).([0-9]+)-R[0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*").matcher(getServer().getVersion());
 		if (versionMatch.matches())
 		{
-			final int versionNumber = Integer.parseInt(versionMatch.group(1));
-			if (versionNumber < BUKKIT_VERSION && versionNumber > 100)
+			final int versionNumber = Integer.parseInt(versionMatch.group(4));
+			if (versionNumber < BUKKIT_VERSION)
 			{
-				LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
 				LOGGER.log(Level.SEVERE, _("notRecommendedBukkit"));
 				LOGGER.log(Level.SEVERE, _("requiredBukkit", Integer.toString(BUKKIT_VERSION)));
-				LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
 				this.setEnabled(false);
 				return;
 			}
@@ -155,27 +141,35 @@ public class Essentials extends JavaPlugin implements IEssentials
 		execTimer.mark("BukkitCheck");
 		try
 		{
-			final EssentialsUpgrade upgrade = new EssentialsUpgrade(this);
-			upgrade.beforeSettings();
-			execTimer.mark("Upgrade");
-			confList = new ArrayList<IConf>();
-			settings = new Settings(this);
-			confList.add(settings);
+			//final EssentialsUpgrade upgrade = new EssentialsUpgrade(this);
+			//upgrade.beforeSettings();
+			//execTimer.mark("Upgrade");
+			reloadList = new ArrayList<IReload>();
+			settings = new SettingsHolder(this);
+			reloadList.add(settings);
 			execTimer.mark("Settings");
-			upgrade.afterSettings();
-			execTimer.mark("Upgrade2");
+			//upgrade.afterSettings();
+			//execTimer.mark("Upgrade2");
 			i18n.updateLocale(settings.getLocale());
 			userMap = new UserMap(this);
-			confList.add(userMap);
+			reloadList.add(userMap);
 			execTimer.mark("Init(Usermap)");
-			warps = new Warps(getServer(), this.getDataFolder());
-			confList.add(warps);
+			groups = new GroupsHolder(this);
+			reloadList.add((GroupsHolder)groups);
+			warps = new Warps(this);
+			reloadList.add(warps);
 			execTimer.mark("Init(Spawn/Warp)");
-			worth = new Worth(this.getDataFolder());
-			confList.add(worth);
+			worth = new Worth(this);
+			reloadList.add(worth);
 			itemDb = new ItemDb(this);
-			confList.add(itemDb);
+			reloadList.add(itemDb);
 			execTimer.mark("Init(Worth/ItemDB)");
+			kits = new Kits(this);
+			reloadList.add(kits);
+			commandHandler = new EssentialsCommandHandler(Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.", this);
+			reloadList.add(commandHandler);
+			economy = new Economy(this);
+			reloadList.add(economy);
 			reload();
 		}
 		catch (YAMLException exception)
@@ -205,11 +199,10 @@ public class Essentials extends JavaPlugin implements IEssentials
 			return;
 		}
 		backup = new Backup(this);
-		permissionsHandler = new PermissionsHandler(this, settings.useBukkitPermissions());
-		alternativeCommandsHandler = new AlternativeCommandsHandler(this);
+		//permissionsHandler = new PermissionsHandler(this);
 		final EssentialsPluginListener serverListener = new EssentialsPluginListener(this);
 		pm.registerEvents(serverListener, this);
-		confList.add(serverListener);
+		reloadList.add(serverListener);

 		final EssentialsPlayerListener playerListener = new EssentialsPlayerListener(this);
 		pm.registerEvents(playerListener, this);
@@ -217,65 +210,29 @@ public class Essentials extends JavaPlugin implements IEssentials
 		final EssentialsBlockListener blockListener = new EssentialsBlockListener(this);
 		pm.registerEvents(blockListener, this);

-		final SignBlockListener signBlockListener = new SignBlockListener(this);
-		pm.registerEvents(signBlockListener, this);
-
-		final SignPlayerListener signPlayerListener = new SignPlayerListener(this);
-		pm.registerEvents(signPlayerListener, this);
-
-		final SignEntityListener signEntityListener = new SignEntityListener(this);
-		pm.registerEvents(signEntityListener, this);
-
 		final EssentialsEntityListener entityListener = new EssentialsEntityListener(this);
 		pm.registerEvents(entityListener, this);

-		final EssentialsWorldListener worldListener = new EssentialsWorldListener(this);
-		pm.registerEvents(worldListener, this);
-
-		//TODO: Check if this should be here, and not above before reload()
 		jails = new Jails(this);
-		confList.add(jails);
+		reloadList.add(jails);

 		pm.registerEvents(tntListener, this);

-		timer = new EssentialsTimer(this);
-		getScheduler().scheduleSyncRepeatingTask(this, timer, 100, 100);

-		Economy.setEss(this);
+		final EssentialsTimer timer = new EssentialsTimer(this);
+		getServer().getScheduler().scheduleSyncRepeatingTask(this, timer, 1, 100);
 		execTimer.mark("RegListeners");
-
-		final MetricsStarter metricsStarter = new MetricsStarter(this);
-		if (metricsStarter.getStart() != null && metricsStarter.getStart() == true)
-		{
-			getScheduler().scheduleAsyncDelayedTask(this, metricsStarter, 1);
-		}
-		else if (metricsStarter.getStart() != null && metricsStarter.getStart() == false)
-		{
-			final MetricsListener metricsListener = new MetricsListener(this, metricsStarter);
-			pm.registerEvents(metricsListener, this);
-		}
-
 		final String timeroutput = execTimer.end();
 		if (getSettings().isDebug())
 		{
-			LOGGER.log(Level.INFO, "Essentials load " + timeroutput);
+			LOGGER.log(Level.INFO, "Essentials load {0}", timeroutput);
 		}
 	}

 	@Override
 	public void onDisable()
 	{
-		for (Player p : getServer().getOnlinePlayers())
-		{
-			User user = getUser(p);
-			if (user.isVanished())
-			{
-				user.toggleVanished();
-				p.sendMessage(_("unvanishedReload"));
-			}
-		}
 		i18n.onDisable();
-		Economy.setEss(null);
 		Trade.closeLog();
 	}

@@ -284,10 +241,10 @@ public class Essentials extends JavaPlugin implements IEssentials
 	{
 		Trade.closeLog();

-		for (IConf iConf : confList)
+		for (IReload iReload : reloadList)
 		{
-			iConf.reloadConfig();
-			execTimer.mark("Reload(" + iConf.getClass().getSimpleName() + ")");
+			iReload.onReload();
+			execTimer.mark("Reload(" + iReload.getClass().getSimpleName() + ")");
 		}

 		i18n.updateLocale(settings.getLocale());
@@ -296,132 +253,8 @@ public class Essentials extends JavaPlugin implements IEssentials
 	@Override
 	public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args)
 	{
-		return onCommandEssentials(sender, command, commandLabel, args, Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.", null);
-	}
-
-	@Override
-	public boolean onCommandEssentials(final CommandSender sender, final Command command, final String commandLabel, final String[] args, final ClassLoader classLoader, final String commandPath, final String permissionPrefix, final IEssentialsModule module)
-	{
-		// Allow plugins to override the command via onCommand
-		if (!getSettings().isCommandOverridden(command.getName()) && (!commandLabel.startsWith("e") || commandLabel.equalsIgnoreCase(command.getName())))
-		{
-			final PluginCommand pc = alternativeCommandsHandler.getAlternative(commandLabel);
-			if (pc != null)
-			{
-				alternativeCommandsHandler.executed(commandLabel, pc.getLabel());
-				try
-				{
-					return pc.execute(sender, commandLabel, args);
-				}
-				catch (final Exception ex)
-				{
-					Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
-					sender.sendMessage(ChatColor.RED + "An internal error occurred while attempting to perform this command");
-					return true;
-				}
-			}
-		}
-
-		try
-		{
-			User user = null;
-			if (sender instanceof Player)
-			{
-				user = getUser(sender);
-			}
-
-			// New mail notification
-			if (user != null && !getSettings().isCommandDisabled("mail") && !commandLabel.equals("mail") && user.isAuthorized("essentials.mail"))
-			{
-				final List<String> mail = user.getMails();
-				if (mail != null && !mail.isEmpty())
-				{
-					user.sendMessage(_("youHaveNewMail", mail.size()));
-				}
-			}
-
-			// Check for disabled commands
-			if (getSettings().isCommandDisabled(commandLabel))
-			{
-				return true;
-			}
-
-			IEssentialsCommand cmd;
-			try
-			{
-				cmd = (IEssentialsCommand)classLoader.loadClass(commandPath + command.getName()).newInstance();
-				cmd.setEssentials(this);
-				cmd.setEssentialsModule(module);
-			}
-			catch (Exception ex)
-			{
-				sender.sendMessage(_("commandNotLoaded", commandLabel));
-				LOGGER.log(Level.SEVERE, _("commandNotLoaded", commandLabel), ex);
-				return true;
-			}
-
-			// Check authorization
-			if (user != null && !user.isAuthorized(cmd, permissionPrefix))
-			{
-				LOGGER.log(Level.WARNING, _("deniedAccessCommand", user.getName()));
-				user.sendMessage(_("noAccessCommand"));
-				return true;
-			}
-
-			// Run the command
-			try
-			{
-				if (user == null)
-				{
-					cmd.run(getServer(), sender, commandLabel, command, args);
-				}
-				else
-				{
-					cmd.run(getServer(), user, commandLabel, command, args);
-				}
-				return true;
-			}
-			catch (NoChargeException ex)
-			{
-				return true;
-			}
-			catch (NotEnoughArgumentsException ex)
-			{
-				sender.sendMessage(command.getDescription());
-				sender.sendMessage(command.getUsage().replaceAll("<command>", commandLabel));
-				if (!ex.getMessage().isEmpty())
-				{
-					sender.sendMessage(ex.getMessage());
-				}
-				return true;
-			}
-			catch (Throwable ex)
-			{
-				showError(sender, ex, commandLabel);
-				return true;
-			}
-		}
-		catch (Throwable ex)
-		{
-			LOGGER.log(Level.SEVERE, _("commandFailed", commandLabel), ex);
-			return true;
-		}
-	}
-
-	@Override
-	public void showError(final CommandSender sender, final Throwable exception, final String commandLabel)
-	{
-		sender.sendMessage(_("errorWithMessage", exception.getMessage()));
-		if (getSettings().isDebug())
-		{
-			LOGGER.log(Level.WARNING, _("errorCallingCommand", commandLabel), exception);
-		}
-	}
-
-	@Override
-	public BukkitScheduler getScheduler()
-	{
-		return this.getServer().getScheduler();
+		return commandHandler.handleCommand(sender, command, commandLabel, args);
+		//return onCommandEssentials(sender, command, commandLabel, args, Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.", null);
 	}

 	@Override
@@ -431,87 +264,39 @@ public class Essentials extends JavaPlugin implements IEssentials
 	}

 	@Override
-	public Warps getWarps()
+	public IKits getKits()
+	{
+		return kits;
+	}
+
+	@Override
+	public IWarps getWarps()
 	{
 		return warps;
 	}

 	@Override
-	public Worth getWorth()
+	public IWorth getWorth()
 	{
 		return worth;
 	}

 	@Override
-	public Backup getBackup()
+	public IBackup getBackup()
 	{
 		return backup;
 	}

-	public Metrics getMetrics()
+	@Override
+	public IUser getUser(final Player player)
 	{
-		return metrics;
-	}
-
-	public void setMetrics(Metrics metrics)
-	{
-		this.metrics = metrics;
+		return userMap.getUser(player);
 	}

 	@Override
-	public User getUser(final Object base)
+	public IUser getUser(final String playerName)
 	{
-		if (base instanceof Player)
-		{
-			return getUser((Player)base);
-		}
-		if (base instanceof String)
-		{
-			return getOfflineUser((String)base);
-		}
-		return null;
-	}
-	
-	@Override
-	public User getOfflineUser(final String name)
-	{
-		final User user = userMap.getUser(name);
-		if (user != null && user.getBase() instanceof OfflinePlayer)
-		{
-			((OfflinePlayer)user.getBase()).setName(name);
-		}
-		return user;
-	}
-
-	private <T extends Player> User getUser(final T base)
-	{
-		if (base == null)
-		{
-			return null;
-		}
-
-		if (base instanceof User)
-		{
-			return (User)base;
-		}
-
-		if (userMap == null)
-		{
-			LOGGER.log(Level.WARNING, "Essentials userMap not initialized");
-			return null;
-		}
-
-		User user = userMap.getUser(base.getName());
-
-		if (user == null)
-		{
-			user = new User(base, this);
-		}
-		else
-		{
-			user.update(base);
-		}
-		return user;
+		return userMap.getUser(playerName);
 	}

 	@Override
@@ -529,9 +314,9 @@ public class Essentials extends JavaPlugin implements IEssentials
 	}

 	@Override
-	public void addReloadListener(final IConf listener)
+	public void addReloadListener(final IReload listener)
 	{
-		confList.add(listener);
+		reloadList.add(listener);
 	}

 	@Override
@@ -555,8 +340,8 @@ public class Essentials extends JavaPlugin implements IEssentials

 		for (Player player : players)
 		{
-			final User user = getUser(player);
-			if (!user.isIgnoredPlayer(sender))
+			final IUser user = getUser(player);
+			if (!user.isIgnoringPlayer(sender.getName()))
 			{
 				player.sendMessage(message);
 			}
@@ -568,53 +353,47 @@ public class Essentials extends JavaPlugin implements IEssentials
 	@Override
 	public int scheduleAsyncDelayedTask(final Runnable run)
 	{
-		return this.getScheduler().scheduleAsyncDelayedTask(this, run);
+		return this.getServer().getScheduler().scheduleAsyncDelayedTask(this, run);
 	}

 	@Override
 	public int scheduleSyncDelayedTask(final Runnable run)
 	{
-		return this.getScheduler().scheduleSyncDelayedTask(this, run);
+		return this.getServer().getScheduler().scheduleSyncDelayedTask(this, run);
 	}

 	@Override
 	public int scheduleSyncDelayedTask(final Runnable run, final long delay)
 	{
-		return this.getScheduler().scheduleSyncDelayedTask(this, run, delay);
+		return this.getServer().getScheduler().scheduleSyncDelayedTask(this, run, delay);
 	}

 	@Override
 	public int scheduleSyncRepeatingTask(final Runnable run, final long delay, final long period)
 	{
-		return this.getScheduler().scheduleSyncRepeatingTask(this, run, delay, period);
+		return this.getServer().getScheduler().scheduleSyncRepeatingTask(this, run, delay, period);
 	}

 	@Override
-	public TNTExplodeListener getTNTListener()
+	public TntExplodeListener getTNTListener()
 	{
 		return tntListener;
 	}

-	@Override
+	/*@Override
 	public PermissionsHandler getPermissionsHandler()
 	{
 		return permissionsHandler;
-	}
+	}*/

 	@Override
-	public AlternativeCommandsHandler getAlternativeCommandsHandler()
-	{
-		return alternativeCommandsHandler;
-	}
-
-	@Override
-	public ItemDb getItemDb()
+	public IItemDb getItemDb()
 	{
 		return itemDb;
 	}

 	@Override
-	public UserMap getUserMap()
+	public IUserMap getUserMap()
 	{
 		return userMap;
 	}
@@ -626,59 +405,32 @@ public class Essentials extends JavaPlugin implements IEssentials
 	}

 	@Override
-	public EssentialsTimer getTimer()
+	public IGroups getGroups()
 	{
-		return timer;
+		return groups;
 	}

 	@Override
-	public List<String> getVanishedPlayers()
+	public ICommandHandler getCommandHandler()
 	{
-		return vanishedPlayers;
+		return commandHandler;
 	}

-
-	private static class EssentialsWorldListener implements Listener, Runnable
+	@Override
+	public void setGroups(final IGroups groups)
 	{
-		private transient final IEssentials ess;
+		this.groups = groups;
+	}

-		public EssentialsWorldListener(final IEssentials ess)
-		{
-			this.ess = ess;
-		}
+	@Override
+	public void removeReloadListener(IReload groups)
+	{
+		this.reloadList.remove(groups);
+	}

-		@EventHandler(priority = EventPriority.LOW)
-		public void onWorldLoad(final WorldLoadEvent event)
-		{
-			ess.getJails().onReload();
-			ess.getWarps().reloadConfig();
-			for (IConf iConf : ((Essentials)ess).confList)
-			{
-				if (iConf instanceof IEssentialsModule)
-				{
-					iConf.reloadConfig();
-				}
-			}
-		}
-
-		@EventHandler(priority = EventPriority.LOW)
-		public void onWorldUnload(final WorldUnloadEvent event)
-		{
-			ess.getJails().onReload();
-			ess.getWarps().reloadConfig();
-			for (IConf iConf : ((Essentials)ess).confList)
-			{
-				if (iConf instanceof IEssentialsModule)
-				{
-					iConf.reloadConfig();
-				}
-			}
-		}
-
-		@Override
-		public void run()
-		{
-			ess.reload();
-		}
+	@Override
+	public IEconomy getEconomy()
+	{
+		return economy;
 	}
 }
@@ -0,0 +1,316 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.*;
+import com.earth2me.essentials.commands.EssentialsCommand;
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import com.earth2me.essentials.commands.NoChargeException;
+import com.earth2me.essentials.commands.NotEnoughArgumentsException;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.PluginCommand;
+import org.bukkit.command.PluginCommandYamlParser;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+
+public class EssentialsCommandHandler implements ICommandHandler
+{
+	private final transient ClassLoader classLoader;
+	private final transient String commandPath;
+	private final transient String permissionPrefix;
+	private final transient IEssentialsModule module;
+	private static final transient Logger LOGGER = Bukkit.getLogger();
+	private final transient Map<String, List<PluginCommand>> altcommands = new HashMap<String, List<PluginCommand>>();
+	private final transient Map<String, String> disabledList = new HashMap<String, String>();
+	private final transient Map<String, IEssentialsCommand> commands = new HashMap<String, IEssentialsCommand>();
+	private final transient IEssentials ess;
+
+	public EssentialsCommandHandler(ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentials ess)
+	{
+		this(classLoader, commandPath, permissionPrefix, null, ess);
+	}
+
+	public EssentialsCommandHandler(ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentialsModule module, IEssentials ess)
+	{
+		this.classLoader = classLoader;
+		this.commandPath = commandPath;
+		this.permissionPrefix = permissionPrefix;
+		this.module = module;
+		this.ess = ess;
+		for (Plugin plugin : ess.getServer().getPluginManager().getPlugins())
+		{
+			if (plugin.isEnabled())
+			{
+				addPlugin(plugin);
+			}
+		}
+	}
+
+	@Override
+	public boolean handleCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args)
+	{
+		boolean disabled = false;
+		boolean overridden = false;
+		ISettings settings = ess.getSettings();
+		settings.acquireReadLock();
+		try
+		{
+			disabled = settings.getData().getCommands().isDisabled(command.getName());
+			overridden = !disabled || settings.getData().getCommands().isOverridden(command.getName());
+		}
+		finally
+		{
+			settings.unlock();
+		}
+		// Allow plugins to override the command via onCommand
+		if (!overridden && (!commandLabel.startsWith("e") || commandLabel.equalsIgnoreCase(command.getName())))
+		{
+			final PluginCommand pc = getAlternative(commandLabel);
+			if (pc != null)
+			{
+				
+				executed(commandLabel, pc.getLabel());
+				try
+				{
+					return pc.execute(sender, commandLabel, args);
+				}
+				catch (final Exception ex)
+				{
+					final ArrayList<StackTraceElement> elements = new ArrayList<StackTraceElement>(Arrays.asList(ex.getStackTrace()));
+					elements.remove(0);
+					final ArrayList<StackTraceElement> toRemove = new ArrayList<StackTraceElement>();
+					for (final StackTraceElement e : elements)
+					{
+						if (e.getClassName().equals("com.earth2me.essentials.Essentials"))
+						{
+							toRemove.add(e);
+						}
+					}
+					elements.removeAll(toRemove);
+					final StackTraceElement[] trace = elements.toArray(new StackTraceElement[elements.size()]);
+					ex.setStackTrace(trace);
+					ex.printStackTrace();
+					sender.sendMessage(ChatColor.RED + "An internal error occurred while attempting to perform this command");
+					return true;
+				}
+			}
+		}
+
+		try
+		{
+			IUser user = null;
+			if (sender instanceof Player)
+			{
+				user = ess.getUser((Player)sender);
+				LOGGER.log(Level.INFO, String.format("[PLAYER_COMMAND] %s: /%s %s ", ((Player)sender).getName(), commandLabel, EssentialsCommand.getFinalArg(args, 0)));
+			}
+
+			// Check for disabled commands
+			if (disabled)
+			{
+				return true;
+			}
+
+			final String commandName = command.getName().toLowerCase(Locale.ENGLISH);
+			IEssentialsCommand cmd = commands.get(commandName);
+			if (cmd == null)
+			{
+				try
+				{
+					cmd = (IEssentialsCommand)classLoader.loadClass(commandPath + commandName).newInstance();
+					cmd.init(ess, commandName);
+					cmd.setEssentialsModule(module);
+					commands.put(commandName, cmd);
+				}
+				catch (Exception ex)
+				{
+					sender.sendMessage(_("commandNotLoaded", commandName));
+					LOGGER.log(Level.SEVERE, _("commandNotLoaded", commandName), ex);
+					return true;
+				}
+			}
+
+			// Check authorization
+			if (sender != null && cmd.isAuthorized(sender))
+			{
+				LOGGER.log(Level.WARNING, _("deniedAccessCommand", user.getName()));
+				user.sendMessage(_("noAccessCommand"));
+				return true;
+			}
+
+			// Run the command
+			try
+			{
+				if (user == null)
+				{
+					cmd.run(sender, command, commandLabel, args);
+				}
+				else
+				{
+					user.acquireReadLock();
+					try
+					{
+						cmd.run(user, command, commandLabel, args);
+					}
+					finally
+					{
+						user.unlock();
+					}
+				}
+				return true;
+			}
+			catch (NoChargeException ex)
+			{
+				return true;
+			}
+			catch (NotEnoughArgumentsException ex)
+			{
+				sender.sendMessage(command.getDescription());
+				sender.sendMessage(command.getUsage().replaceAll("<command>", commandLabel));
+				if (!ex.getMessage().isEmpty())
+				{
+					sender.sendMessage(ex.getMessage());
+				}
+				return true;
+			}
+			catch (Throwable ex)
+			{
+				showCommandError(sender, commandLabel, ex);
+				return true;
+			}
+		}
+		catch (Throwable ex)
+		{
+			LOGGER.log(Level.SEVERE, _("commandFailed", commandLabel), ex);
+			return true;
+		}
+	}
+
+	@Override
+	public void showCommandError(final CommandSender sender, final String commandLabel, final Throwable exception)
+	{
+		sender.sendMessage(_("errorWithMessage", exception.getMessage()));
+		if (ess.getSettings().isDebug())
+		{
+			LOGGER.log(Level.WARNING, _("errorCallingCommand", commandLabel), exception);
+		}
+	}
+
+	@Override
+	public void onReload()
+	{
+	}
+
+	public final void addPlugin(final Plugin plugin)
+	{
+		if (plugin.getDescription().getMain().contains("com.earth2me.essentials"))
+		{
+			return;
+		}
+		final List<Command> commands = PluginCommandYamlParser.parse(plugin);
+		final String pluginName = plugin.getDescription().getName().toLowerCase(Locale.ENGLISH);
+
+		for (Command command : commands)
+		{
+			final PluginCommand pc = (PluginCommand)command;
+			final List<String> labels = new ArrayList<String>(pc.getAliases());
+			labels.add(pc.getName());
+
+			PluginCommand reg = ess.getServer().getPluginCommand(pluginName + ":" + pc.getName().toLowerCase(Locale.ENGLISH));
+			if (reg == null)
+			{
+				reg = ess.getServer().getPluginCommand(pc.getName().toLowerCase(Locale.ENGLISH));
+			}
+			if (reg == null || !reg.getPlugin().equals(plugin))
+			{
+				continue;
+			}
+			for (String label : labels)
+			{
+				List<PluginCommand> plugincommands = altcommands.get(label.toLowerCase(Locale.ENGLISH));
+				if (plugincommands == null)
+				{
+					plugincommands = new ArrayList<PluginCommand>();
+					altcommands.put(label.toLowerCase(Locale.ENGLISH), plugincommands);
+				}
+				boolean found = false;
+				for (PluginCommand pc2 : plugincommands)
+				{
+					if (pc2.getPlugin().equals(plugin))
+					{
+						found = true;
+					}
+				}
+				if (!found)
+				{
+					plugincommands.add(reg);
+				}
+			}
+		}
+	}
+
+	public void removePlugin(final Plugin plugin)
+	{
+		final Iterator<Map.Entry<String, List<PluginCommand>>> iterator = altcommands.entrySet().iterator();
+		while (iterator.hasNext())
+		{
+			final Map.Entry<String, List<PluginCommand>> entry = iterator.next();
+			final Iterator<PluginCommand> pcIterator = entry.getValue().iterator();
+			while (pcIterator.hasNext())
+			{
+				final PluginCommand pc = pcIterator.next();
+				if (pc.getPlugin() == null || pc.getPlugin().equals(plugin))
+				{
+					pcIterator.remove();
+				}
+			}
+			if (entry.getValue().isEmpty())
+			{
+				iterator.remove();
+			}
+		}
+	}
+
+	public PluginCommand getAlternative(final String label)
+	{
+		final List<PluginCommand> commands = altcommands.get(label);
+		if (commands == null || commands.isEmpty())
+		{
+			return null;
+		}
+		if (commands.size() == 1)
+		{
+			return commands.get(0);
+		}
+		// return the first command that is not an alias
+		for (PluginCommand command : commands)
+		{
+			if (command.getName().equalsIgnoreCase(label))
+			{
+				return command;
+			}
+		}
+		// return the first alias
+		return commands.get(0);
+	}
+
+	public void executed(final String label, final String otherLabel)
+	{
+		if (ess.getSettings().isDebug())
+		{
+			LOGGER.log(Level.INFO, "Essentials: Alternative command " + label + " found, using " + otherLabel);
+		}
+		disabledList.put(label, otherLabel);
+	}
+
+	public Map<String, String> disabledCommands()
+	{
+		return disabledList;
+	}
+}
@@ -1,669 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.google.common.io.Files;
-import java.io.*;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CoderResult;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.*;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.InvalidConfigurationException;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.util.Vector;
-
-
-public class EssentialsConf extends YamlConfiguration
-{
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private transient File configFile;
-	private transient String templateName = null;
-	private transient Class<?> resourceClass = EssentialsConf.class;
-	private static final Charset UTF8 = Charset.forName("UTF-8");
-
-	public EssentialsConf(final File configFile)
-	{
-		super();
-		this.configFile = configFile;
-	}
-	private final byte[] bytebuffer = new byte[1024];
-
-	public synchronized void load()
-	{
-		configFile = configFile.getAbsoluteFile();
-		if (!configFile.getParentFile().exists())
-		{
-			if (!configFile.getParentFile().mkdirs())
-			{
-				LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()));
-			}
-		}
-		// This will delete files where the first character is 0. In most cases they are broken.
-		if (configFile.exists() && configFile.length() != 0)
-		{
-			try
-			{
-				final InputStream input = new FileInputStream(configFile);
-				try
-				{
-					if (input.read() == 0)
-					{
-						input.close();
-						configFile.delete();
-					}
-				}
-				catch (IOException ex)
-				{
-					LOGGER.log(Level.SEVERE, null, ex);
-				}
-				finally
-				{
-					try
-					{
-						input.close();
-					}
-					catch (IOException ex)
-					{
-						LOGGER.log(Level.SEVERE, null, ex);
-					}
-				}
-			}
-			catch (FileNotFoundException ex)
-			{
-				LOGGER.log(Level.SEVERE, null, ex);
-			}
-		}
-
-		if (!configFile.exists())
-		{
-			if (templateName != null)
-			{
-				LOGGER.log(Level.INFO, _("creatingConfigFromTemplate", configFile.toString()));
-				createFromTemplate();
-			}
-			else
-			{
-				return;
-			}
-		}
-
-
-		try
-		{
-			final FileInputStream inputStream = new FileInputStream(configFile);
-			try
-			{
-				final ByteBuffer buffer = ByteBuffer.allocate((int)configFile.length());
-				int length;
-				while ((length = inputStream.read(bytebuffer)) != -1)
-				{
-					buffer.put(bytebuffer, 0, length);
-				}
-				buffer.rewind();
-				final CharBuffer data = CharBuffer.allocate((int)configFile.length());
-				CharsetDecoder decoder = UTF8.newDecoder();
-				CoderResult result = decoder.decode(buffer, data, true);
-				if (result.isError())
-				{
-					buffer.rewind();
-					data.clear();
-					LOGGER.log(Level.INFO, "File " + configFile.getAbsolutePath().toString() + " is not utf-8 encoded, trying " + Charset.defaultCharset().displayName());
-					decoder = Charset.defaultCharset().newDecoder();
-					result = decoder.decode(buffer, data, true);
-					if (result.isError())
-					{
-						throw new InvalidConfigurationException("Invalid Characters in file " + configFile.getAbsolutePath().toString());
-					}
-					else
-					{
-						decoder.flush(data);
-					}
-				}
-				else
-				{
-					decoder.flush(data);
-				}
-				final int end = data.position();
-				data.rewind();
-				super.loadFromString(data.subSequence(0, end).toString());
-			}
-			finally
-			{
-				inputStream.close();
-			}
-		}
-		catch (IOException ex)
-		{
-			LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
-		}
-		catch (InvalidConfigurationException ex)
-		{
-			File broken = new File(configFile.getAbsolutePath() + ".broken." + System.currentTimeMillis());
-			configFile.renameTo(broken);
-			LOGGER.log(Level.SEVERE, "The file " + configFile.toString() + " is broken, it has been renamed to " + broken.toString(), ex.getCause());
-		}
-	}
-
-	private void createFromTemplate()
-	{
-		InputStream istr = null;
-		OutputStream ostr = null;
-		try
-		{
-			istr = resourceClass.getResourceAsStream(templateName);
-			if (istr == null)
-			{
-				LOGGER.log(Level.SEVERE, _("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, _("failedToWriteConfig", configFile.toString()), ex);
-		}
-		finally
-		{
-			try
-			{
-				if (istr != null)
-				{
-					istr.close();
-				}
-			}
-			catch (IOException ex)
-			{
-				Logger.getLogger(EssentialsConf.class.getName()).log(Level.SEVERE, null, ex);
-			}
-			try
-			{
-				if (ostr != null)
-				{
-					ostr.close();
-				}
-			}
-			catch (IOException ex)
-			{
-				LOGGER.log(Level.SEVERE, _("failedToCloseConfig", configFile.toString()), ex);
-			}
-		}
-	}
-
-	public void setTemplateName(final String templateName)
-	{
-		this.templateName = templateName;
-	}
-
-	public File getFile()
-	{
-		return configFile;
-	}
-
-	public void setTemplateName(final String templateName, final Class<?> resClass)
-	{
-		this.templateName = templateName;
-		this.resourceClass = resClass;
-	}
-
-	public boolean hasProperty(final String path)
-	{
-		return isSet(path);
-	}
-
-	public Location getLocation(final String path, final Server server) throws Exception
-	{
-		final String worldName = getString((path == null ? "" : path + ".") + "world");
-		if (worldName == null || worldName.isEmpty())
-		{
-			return null;
-		}
-		final World world = server.getWorld(worldName);
-		if (world == null)
-		{
-			throw new Exception(_("invalidWorld"));
-		}
-		return new Location(world,
-							getDouble((path == null ? "" : path + ".") + "x", 0),
-							getDouble((path == null ? "" : path + ".") + "y", 0),
-							getDouble((path == null ? "" : path + ".") + "z", 0),
-							(float)getDouble((path == null ? "" : path + ".") + "yaw", 0),
-							(float)getDouble((path == null ? "" : path + ".") + "pitch", 0));
-	}
-
-	public void setProperty(final String path, final Location loc)
-	{
-		set((path == null ? "" : path + ".") + "world", loc.getWorld().getName());
-		set((path == null ? "" : path + ".") + "x", loc.getX());
-		set((path == null ? "" : path + ".") + "y", loc.getY());
-		set((path == null ? "" : path + ".") + "z", loc.getZ());
-		set((path == null ? "" : path + ".") + "yaw", loc.getYaw());
-		set((path == null ? "" : path + ".") + "pitch", loc.getPitch());
-	}
-
-	@Override
-	public ItemStack getItemStack(final String path)
-	{
-		final ItemStack stack = new ItemStack(
-				Material.valueOf(getString(path + ".type", "AIR")),
-				getInt(path + ".amount", 1),
-				(short)getInt(path + ".damage", 0));
-		final ConfigurationSection enchants = getConfigurationSection(path + ".enchant");
-		if (enchants != null)
-		{
-			for (String enchant : enchants.getKeys(false))
-			{
-				final Enchantment enchantment = Enchantment.getByName(enchant.toUpperCase(Locale.ENGLISH));
-				if (enchantment == null)
-				{
-					continue;
-				}
-				final int level = getInt(path + ".enchant." + enchant, enchantment.getStartLevel());
-				stack.addUnsafeEnchantment(enchantment, level);
-			}
-		}
-		return stack;
-		/*
-		 * ,
-		 * (byte)getInt(path + ".data", 0)
-		 */
-	}
-
-	public void setProperty(final String path, final ItemStack stack)
-	{
-		final Map<String, Object> map = new HashMap<String, Object>();
-		map.put("type", stack.getType().toString());
-		map.put("amount", stack.getAmount());
-		map.put("damage", stack.getDurability());
-		Map<Enchantment, Integer> enchantments = stack.getEnchantments();
-		if (!enchantments.isEmpty())
-		{
-			Map<String, Integer> enchant = new HashMap<String, Integer>();
-			for (Map.Entry<Enchantment, Integer> entry : enchantments.entrySet())
-			{
-				enchant.put(entry.getKey().getName().toLowerCase(Locale.ENGLISH), entry.getValue());
-			}
-			map.put("enchant", enchant);
-		}
-		// getData().getData() is broken
-		//map.put("data", stack.getDurability());
-		set(path, map);
-	}
-
-	public long getLong(final String path, final long def)
-	{
-		try
-		{
-			final Number num = (Number)get(path);
-			return num == null ? def : num.longValue();
-		}
-		catch (ClassCastException ex)
-		{
-			return def;
-		}
-	}
-
-	@Override
-	public double getDouble(final String path, final double def)
-	{
-		try
-		{
-			Number num = (Number)get(path);
-			return num == null ? def : num.doubleValue();
-		}
-		catch (ClassCastException ex)
-		{
-			return def;
-		}
-	}
-
-	public void save()
-	{
-		try
-		{
-			save(configFile);
-		}
-		catch (IOException ex)
-		{
-			LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
-		}
-	}
-
-	public void saveWithError() throws IOException
-	{
-		save(configFile);
-	}
-
-	@Override
-	public synchronized void save(final File file) throws IOException
-	{
-		if (file == null)
-		{
-			throw new IllegalArgumentException("File cannot be null");
-		}
-
-		Files.createParentDirs(file);
-
-		final String data = saveToString();
-
-		if (data.length() == 0)
-		{
-			return;
-		}
-
-		if (!configFile.exists())
-		{
-			try
-			{
-				LOGGER.log(Level.INFO, _("creatingEmptyConfig", configFile.toString()));
-				if (!configFile.createNewFile())
-				{
-					LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()));
-				}
-			}
-			catch (IOException ex)
-			{
-				LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()), ex);
-			}
-		}
-
-
-		final OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(file), UTF8);
-
-		try
-		{
-			writer.write(data);
-		}
-		finally
-		{
-			writer.close();
-		}
-	}
-
-	public Object getProperty(String path)
-	{
-		return get(path);
-	}
-
-	public void setProperty(String path, Object object)
-	{
-		set(path, object);
-	}
-
-	public void removeProperty(String path)
-	{
-		set(path, null);
-	}
-
-	@Override
-	public synchronized Object get(String path)
-	{
-		return super.get(path);
-	}
-
-	@Override
-	public synchronized Object get(String path, Object def)
-	{
-		return super.get(path, def);
-	}
-
-	@Override
-	public synchronized boolean getBoolean(String path)
-	{
-		return super.getBoolean(path);
-	}
-
-	@Override
-	public synchronized boolean getBoolean(String path, boolean def)
-	{
-		return super.getBoolean(path, def);
-	}
-
-	@Override
-	public synchronized List<Boolean> getBooleanList(String path)
-	{
-		return super.getBooleanList(path);
-	}
-
-	@Override
-	public synchronized List<Byte> getByteList(String path)
-	{
-		return super.getByteList(path);
-	}
-
-	@Override
-	public synchronized List<Character> getCharacterList(String path)
-	{
-		return super.getCharacterList(path);
-	}
-
-	@Override
-	public synchronized ConfigurationSection getConfigurationSection(String path)
-	{
-		return super.getConfigurationSection(path);
-	}
-
-	@Override
-	public synchronized double getDouble(String path)
-	{
-		return super.getDouble(path);
-	}
-
-	@Override
-	public synchronized List<Double> getDoubleList(String path)
-	{
-		return super.getDoubleList(path);
-	}
-
-	@Override
-	public synchronized List<Float> getFloatList(String path)
-	{
-		return super.getFloatList(path);
-	}
-
-	@Override
-	public synchronized int getInt(String path)
-	{
-		return super.getInt(path);
-	}
-
-	@Override
-	public synchronized int getInt(String path, int def)
-	{
-		return super.getInt(path, def);
-	}
-
-	@Override
-	public synchronized List<Integer> getIntegerList(String path)
-	{
-		return super.getIntegerList(path);
-	}
-
-	@Override
-	public synchronized ItemStack getItemStack(String path, ItemStack def)
-	{
-		return super.getItemStack(path, def);
-	}
-
-	@Override
-	public synchronized Set<String> getKeys(boolean deep)
-	{
-		return super.getKeys(deep);
-	}
-
-	@Override
-	public synchronized List<?> getList(String path)
-	{
-		return super.getList(path);
-	}
-
-	@Override
-	public synchronized List<?> getList(String path, List<?> def)
-	{
-		return super.getList(path, def);
-	}
-
-	@Override
-	public synchronized long getLong(String path)
-	{
-		return super.getLong(path);
-	}
-
-	@Override
-	public synchronized List<Long> getLongList(String path)
-	{
-		return super.getLongList(path);
-	}
-
-	public synchronized Map<String, Object> getMap()
-	{
-		return map;
-	}
-
-	@Override
-	public synchronized List<Map<?, ?>> getMapList(String path)
-	{
-		return super.getMapList(path);
-	}
-
-	@Override
-	public synchronized OfflinePlayer getOfflinePlayer(String path)
-	{
-		return super.getOfflinePlayer(path);
-	}
-
-	@Override
-	public synchronized OfflinePlayer getOfflinePlayer(String path, OfflinePlayer def)
-	{
-		return super.getOfflinePlayer(path, def);
-	}
-
-	@Override
-	public synchronized List<Short> getShortList(String path)
-	{
-		return super.getShortList(path);
-	}
-
-	@Override
-	public synchronized String getString(String path)
-	{
-		return super.getString(path);
-	}
-
-	@Override
-	public synchronized String getString(String path, String def)
-	{
-		return super.getString(path, def);
-	}
-
-	@Override
-	public synchronized List<String> getStringList(String path)
-	{
-		return super.getStringList(path);
-	}
-
-	@Override
-	public synchronized Map<String, Object> getValues(boolean deep)
-	{
-		return super.getValues(deep);
-	}
-
-	@Override
-	public synchronized Vector getVector(String path)
-	{
-		return super.getVector(path);
-	}
-
-	@Override
-	public synchronized Vector getVector(String path, Vector def)
-	{
-		return super.getVector(path, def);
-	}
-
-	@Override
-	public synchronized boolean isBoolean(String path)
-	{
-		return super.isBoolean(path);
-	}
-
-	@Override
-	public synchronized boolean isConfigurationSection(String path)
-	{
-		return super.isConfigurationSection(path);
-	}
-
-	@Override
-	public synchronized boolean isDouble(String path)
-	{
-		return super.isDouble(path);
-	}
-
-	@Override
-	public synchronized boolean isInt(String path)
-	{
-		return super.isInt(path);
-	}
-
-	@Override
-	public synchronized boolean isItemStack(String path)
-	{
-		return super.isItemStack(path);
-	}
-
-	@Override
-	public synchronized boolean isList(String path)
-	{
-		return super.isList(path);
-	}
-
-	@Override
-	public synchronized boolean isLong(String path)
-	{
-		return super.isLong(path);
-	}
-
-	@Override
-	public synchronized boolean isOfflinePlayer(String path)
-	{
-		return super.isOfflinePlayer(path);
-	}
-
-	@Override
-	public synchronized boolean isSet(String path)
-	{
-		return super.isSet(path);
-	}
-
-	@Override
-	public synchronized boolean isString(String path)
-	{
-		return super.isString(path);
-	}
-
-	@Override
-	public synchronized boolean isVector(String path)
-	{
-		return super.isVector(path);
-	}
-
-	@Override
-	public synchronized void set(String path, Object value)
-	{
-		super.set(path, value);
-	}
-}
@@ -1,200 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.Material;
-import org.bukkit.entity.*;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
-import org.bukkit.event.entity.*;
-import org.bukkit.inventory.ItemStack;
-
-
-public class EssentialsEntityListener implements Listener
-{
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private final IEssentials ess;
-
-	public EssentialsEntityListener(IEssentials ess)
-	{
-		this.ess = ess;
-	}
-
-	// This method does something undocumented reguarding certain bucket types #EasterEgg
-	@EventHandler(priority = EventPriority.LOW)
-	public void onEntityDamage(final EntityDamageByEntityEvent event)
-	{
-		final Entity eAttack = event.getDamager();
-		final Entity eDefend = event.getEntity();
-		if (eDefend instanceof Player && eAttack instanceof Player)
-		{
-			final User defender = ess.getUser(eDefend);
-			final User attacker = ess.getUser(eAttack);
-			onPlayerVsPlayerDamage(event, defender, attacker);
-			onPlayerVsPlayerPowertool(event, defender, attacker);
-		}
-		else if (eDefend instanceof Player && eAttack instanceof Projectile)
-		{
-			Entity shooter = ((Projectile)event.getDamager()).getShooter();
-			if (shooter instanceof Player)
-			{
-				final User defender = ess.getUser(eDefend);
-				final User attacker = ess.getUser(shooter);
-				onPlayerVsPlayerDamage(event, defender, attacker);
-				onPlayerVsPlayerPowertool(event, defender, attacker);
-			}
-		}
-		else if (eAttack instanceof Player)
-		{
-			final User player = ess.getUser(eAttack);
-			player.updateActivity(true);
-			if (eDefend instanceof Ageable)
-			{
-				final ItemStack hand = player.getItemInHand();
-				if (hand != null && hand.getType() == Material.MILK_BUCKET)
-				{
-					((Ageable)eDefend).setBaby();
-					hand.setType(Material.BUCKET);
-					player.setItemInHand(hand);
-					player.updateInventory();
-					event.setCancelled(true);
-				}
-			}
-		}
-	}
-
-	private void onPlayerVsPlayerDamage(final EntityDamageByEntityEvent event, final User defender, final User attacker)
-	{
-		if (ess.getSettings().getLoginAttackDelay() > 0 && !attacker.isAuthorized("essentials.pvpdelay.exempt")
-			&& (System.currentTimeMillis() < (attacker.getLastLogin() + ess.getSettings().getLoginAttackDelay())))
-		{
-			event.setCancelled(true);
-		}
-
-		if (attacker.hasInvulnerabilityAfterTeleport() || defender.hasInvulnerabilityAfterTeleport())
-		{
-			event.setCancelled(true);
-		}
-
-		if (attacker.isGodModeEnabled() && !attacker.isAuthorized("essentials.god.pvp"))
-		{
-			event.setCancelled(true);
-		}
-
-		if (attacker.isHidden() && !attacker.isAuthorized("essentials.vanish.pvp"))
-		{
-			event.setCancelled(true);
-		}
-
-		attacker.updateActivity(true);
-	}
-
-	private void onPlayerVsPlayerPowertool(final EntityDamageByEntityEvent event, final User defender, final User attacker)
-	{
-		final List<String> commandList = attacker.getPowertool(attacker.getItemInHand());
-		if (commandList != null && !commandList.isEmpty())
-		{
-			for (final String command : commandList)
-			{
-				if (command != null && !command.isEmpty())
-				{
-					ess.scheduleSyncDelayedTask(
-							new Runnable()
-							{
-								@Override
-								public void run()
-								{
-									attacker.getServer().dispatchCommand(attacker.getBase(), command.replaceAll("\\{player\\}", defender.getName()));
-									LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", attacker.getName(), command));
-								}
-							});
-
-					event.setCancelled(true);
-					return;
-				}
-			}
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onEntityDamage(final EntityDamageEvent event)
-	{
-		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
-		{
-			final Player player = (Player)event.getEntity();
-			player.setFireTicks(0);
-			player.setRemainingAir(player.getMaximumAir());
-			event.setCancelled(true);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onEntityCombust(final EntityCombustEvent event)
-	{
-		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
-		{
-			event.setCancelled(true);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onPlayerDeathEvent(final PlayerDeathEvent event)
-	{
-		final User user = ess.getUser(event.getEntity());
-		if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back"))
-		{
-			user.setLastLocation();
-			user.sendMessage(_("backAfterDeath"));
-		}
-		if (!ess.getSettings().areDeathMessagesEnabled())
-		{
-			event.setDeathMessage("");
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW)
-	public void onPlayerDeathExpEvent(final PlayerDeathEvent event)
-	{
-		final User user = ess.getUser(event.getEntity());
-		if (user.isAuthorized("essentials.keepxp"))
-		{
-			event.setKeepLevel(true);
-			event.setDroppedExp(0);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onFoodLevelChange(final FoodLevelChangeEvent event)
-	{
-		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
-		{
-			event.setCancelled(true);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onEntityRegainHealth(final EntityRegainHealthEvent event)
-	{
-		if (event.getRegainReason() == RegainReason.SATIATED && event.getEntity() instanceof Player
-			&& ess.getUser(event.getEntity()).isAfk() && ess.getSettings().getFreezeAfkPlayers())
-		{
-			event.setCancelled(true);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onPotionSplashEvent(final PotionSplashEvent event)
-	{
-		for (LivingEntity entity : event.getAffectedEntities())
-		{
-			if (entity instanceof Player && ess.getUser(entity).isGodModeEnabled())
-			{
-				event.setIntensity(entity, 0d);
-			}
-		}
-	}
-}
@@ -1,564 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.textreader.IText;
-import com.earth2me.essentials.textreader.KeywordReplacer;
-import com.earth2me.essentials.textreader.TextInput;
-import com.earth2me.essentials.textreader.TextPager;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.event.player.*;
-import org.bukkit.event.player.PlayerLoginEvent.Result;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.inventory.ItemStack;
-
-
-public class EssentialsPlayerListener implements Listener
-{
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private final transient IEssentials ess;
-	private static final int AIR = Material.AIR.getId();
-	private static final int BED = Material.BED_BLOCK.getId();
-
-	public EssentialsPlayerListener(final IEssentials parent)
-	{
-		this.ess = parent;
-	}
-
-	@EventHandler(priority = EventPriority.NORMAL)
-	public void onPlayerRespawn(final PlayerRespawnEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		updateCompass(user);
-		user.setDisplayNick();
-	}
-
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onPlayerChat(final AsyncPlayerChatEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		if (user.isMuted())
-		{
-			event.setCancelled(true);
-			user.sendMessage(_("playerMuted"));
-			LOGGER.info(_("mutedUserSpeaks", user.getName()));
-		}
-		final Iterator<Player> it = event.getRecipients().iterator();
-		while (it.hasNext())
-		{
-			final User u = ess.getUser(it.next());
-			if (u.isIgnoredPlayer(user))
-			{
-				it.remove();
-			}
-		}
-		user.updateActivity(true);
-		user.setDisplayNick();
-	}
-
-	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-	public void onPlayerMove(final PlayerMoveEvent event)
-	{
-		if ((!ess.getSettings().cancelAfkOnMove() && !ess.getSettings().getFreezeAfkPlayers())
-			|| event.getFrom().getBlockX() == event.getTo().getBlockX()
-			   && event.getFrom().getBlockZ() == event.getTo().getBlockZ()
-			   && event.getFrom().getBlockY() == event.getTo().getBlockY())
-		{
-			return;
-		}
-
-		final User user = ess.getUser(event.getPlayer());
-		if (user.isAfk() && ess.getSettings().getFreezeAfkPlayers())
-		{
-			final Location from = event.getFrom();
-			final Location origTo = event.getTo();
-			final Location to = origTo.clone();
-			if (ess.getSettings().cancelAfkOnMove() && origTo.getY() >= from.getBlockY() + 1)
-			{
-				user.updateActivity(true);
-				return;
-			}
-			to.setX(from.getX());
-			to.setY(from.getY());
-			to.setZ(from.getZ());
-			try
-			{
-				event.setTo(Util.getSafeDestination(to));
-			}
-			catch (Exception ex)
-			{
-				event.setTo(to);
-			}
-			return;
-		}
-		final Location afk = user.getAfkPosition();
-		if (afk == null || !event.getTo().getWorld().equals(afk.getWorld()) || afk.distanceSquared(event.getTo()) > 9)
-		{
-			user.updateActivity(true);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerQuit(final PlayerQuitEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		if (ess.getSettings().removeGodOnDisconnect() && user.isGodModeEnabled())
-		{
-			user.setGodModeEnabled(false);
-		}
-		if (user.isVanished())
-		{
-			user.toggleVanished();
-		}
-		if (!user.isJailed())
-		{
-			user.setLastLocation();
-		}
-		user.updateActivity(false);
-		user.dispose();
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerJoin(final PlayerJoinEvent event)
-	{
-		ess.scheduleAsyncDelayedTask(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				delayedJoin(event.getPlayer());
-			}
-		});
-	}
-
-	public void delayedJoin(final Player player)
-	{
-		if (!player.isOnline())
-		{
-			return;
-		}
-		ess.getBackup().onPlayerJoin();
-		final User user = ess.getUser(player);
-		user.setDisplayNick();
-		updateCompass(user);
-		user.setLastLogin(System.currentTimeMillis());
-		user.updateActivity(false);
-
-		if (!ess.getVanishedPlayers().isEmpty() && !user.isAuthorized("essentials.vanish.see"))
-		{
-			for (String p : ess.getVanishedPlayers())
-			{
-				Player toVanish = ess.getUser(p).getBase();
-				if (toVanish.isOnline())
-				{
-					user.hidePlayer(toVanish);
-				}
-			}
-		}
-
-		if (user.isAuthorized("essentials.sleepingignored"))
-		{
-			ess.scheduleSyncDelayedTask(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					user.setSleepingIgnored(true);
-				}
-			});
-		}
-
-		if (!ess.getSettings().isCommandDisabled("motd") && user.isAuthorized("essentials.motd"))
-		{
-			try
-			{
-				final IText input = new TextInput(user, "motd", true, ess);
-				final IText output = new KeywordReplacer(input, user, ess);
-				final TextPager pager = new TextPager(output, true);
-				pager.showPage("1", null, "motd", user);
-			}
-			catch (IOException ex)
-			{
-				if (ess.getSettings().isDebug())
-				{
-					LOGGER.log(Level.WARNING, ex.getMessage(), ex);
-				}
-				else
-				{
-					LOGGER.log(Level.WARNING, ex.getMessage());
-				}
-			}
-		}
-
-		if (!ess.getSettings().isCommandDisabled("mail") && user.isAuthorized("essentials.mail"))
-		{
-			final List<String> mail = user.getMails();
-			if (mail.isEmpty())
-			{
-				final String msg = _("noNewMail");
-				if (!msg.isEmpty())
-				{
-					user.sendMessage(msg);
-				}
-			}
-			else
-			{
-				user.sendMessage(_("youHaveNewMail", mail.size()));
-			}
-		}
-	}
-
-	// Makes the compass item ingame always point to the first essentials home.  #EasterEgg
-	private void updateCompass(final User user)
-	{
-		Location loc = user.getHome(user.getLocation());
-		if (loc == null)
-		{
-			loc = user.getBedSpawnLocation();
-		}
-		if (loc != null)
-		{
-			final Location updateLoc = loc;
-			ess.scheduleSyncDelayedTask(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					user.setCompassTarget(updateLoc);
-				}
-			});
-		}
-	}
-
-	@EventHandler(priority = EventPriority.HIGH)
-	public void onPlayerLogin(final PlayerLoginEvent event)
-	{
-		switch (event.getResult())
-		{
-		case ALLOWED:
-		case KICK_FULL:
-		case KICK_BANNED:
-			break;
-		default:
-			return;
-		}
-
-		final User user = ess.getUser(event.getPlayer());
-		if (user.isNPC())
-		{
-			user.setNPC(false);
-		}
-
-		final long currentTime = System.currentTimeMillis();
-		final boolean banExpired = user.checkBanTimeout(currentTime);
-		user.checkMuteTimeout(currentTime);
-		user.checkJailTimeout(currentTime);
-
-		if (!banExpired && (user.isBanned() || event.getResult() == Result.KICK_BANNED))
-		{
-			final String banReason = user.getBanReason();
-			event.disallow(Result.KICK_BANNED, banReason != null && !banReason.isEmpty() && !banReason.equalsIgnoreCase("ban") ? banReason : _("defaultBanReason"));
-			return;
-		}
-
-		if (event.getResult() == Result.KICK_FULL && !user.isAuthorized("essentials.joinfullserver"))
-		{
-			event.disallow(Result.KICK_FULL, _("serverFull"));
-			return;
-		}
-		event.allow();
-	}
-
-	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-	public void onPlayerTeleport(final PlayerTeleportEvent event)
-	{
-		final boolean backListener = ess.getSettings().registerBackInListener();
-		final boolean teleportInvulnerability = ess.getSettings().isTeleportInvulnerability();
-		if (backListener || teleportInvulnerability)
-		{
-			final User user = ess.getUser(event.getPlayer());
-			//There is TeleportCause.COMMMAND but plugins have to actively pass the cause in on their teleports.
-			if (backListener && (event.getCause() == TeleportCause.PLUGIN || event.getCause() == TeleportCause.COMMAND))
-			{
-				user.setLastLocation();
-			}
-			if (teleportInvulnerability)
-			{
-				user.enableInvulnerabilityAfterTeleport();
-			}
-		}
-	}
-
-	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-	public void onPlayerEggThrow(final PlayerEggThrowEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		final ItemStack stack = new ItemStack(Material.EGG, 1);
-		if (user.hasUnlimited(stack))
-		{
-			user.getInventory().addItem(stack);
-			user.updateInventory();
-		}
-	}
-
-	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-	public void onPlayerBucketEmpty(final PlayerBucketEmptyEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		if (user.hasUnlimited(new ItemStack(event.getBucket())))
-		{
-			event.getItemStack().setType(event.getBucket());
-			ess.scheduleSyncDelayedTask(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					user.updateInventory();
-				}
-			});
-		}
-	}
-	private final static List<String> COMMANDS = Arrays.asList("msg", "w", "r", "mail", "m", "t", "whisper", "emsg", "tell", "er", "reply", "ereply", "email", "action", "describe", "eme", "eaction", "edescribe", "etell", "ewhisper", "pm");
-
-	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-	public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event)
-	{
-		final Player player = event.getPlayer();
-		final String cmd = event.getMessage().toLowerCase(Locale.ENGLISH).split(" ")[0].replace("/", "").toLowerCase(Locale.ENGLISH);
-		if (COMMANDS.contains(cmd))
-		{
-			for (Player onlinePlayer : ess.getServer().getOnlinePlayers())
-			{
-				final User spyer = ess.getUser(onlinePlayer);
-				if (spyer.isSocialSpyEnabled() && !player.equals(onlinePlayer))
-				{
-					onlinePlayer.sendMessage(player.getDisplayName() + " : " + event.getMessage());
-				}
-			}
-		}
-		else if (!cmd.equalsIgnoreCase("afk"))
-		{
-			final User user = ess.getUser(player);
-			user.updateActivity(true);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW)
-	public void onPlayerChangedWorldHack(final PlayerChangedWorldEvent event)
-	{
-		final Player user = event.getPlayer();
-		if (user.getGameMode() != GameMode.CREATIVE)
-		{
-			user.setAllowFlight(false);
-		}
-		user.setFlySpeed(0.1f);
-		user.setWalkSpeed(0.2f);
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerChangedWorld(final PlayerChangedWorldEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		final String newWorld = event.getPlayer().getLocation().getWorld().getName();
-		user.setDisplayNick();
-		updateCompass(user);
-		if (ess.getSettings().getNoGodWorlds().contains(newWorld) && user.isGodModeEnabledRaw())
-		{
-			user.sendMessage(_("noGodWorldWarning"));
-		}
-
-		if (!event.getPlayer().getWorld().getName().equals(newWorld))
-		{
-			user.sendMessage(_("currentWorld", newWorld));
-		}
-	}
-
-	@EventHandler(priority = EventPriority.NORMAL)
-	public void onPlayerInteract(final PlayerInteractEvent event)
-	{
-		switch (event.getAction())
-		{
-		case RIGHT_CLICK_BLOCK:
-			if (!event.isCancelled() && event.getClickedBlock().getTypeId() == BED && ess.getSettings().getUpdateBedAtDaytime())
-			{
-				Player player = event.getPlayer();
-				player.setBedSpawnLocation(event.getClickedBlock().getLocation());
-				player.sendMessage(_("homeSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
-			}
-			break;
-		case LEFT_CLICK_AIR:
-			if (event.getPlayer().isFlying())
-			{
-				final User user = ess.getUser(event.getPlayer());
-				if (user.isFlyClickJump())
-				{
-					useFlyClickJump(user);
-					return;
-				}
-			}
-		case LEFT_CLICK_BLOCK:
-			if (event.getItem() != null && event.getItem().getTypeId() != AIR)
-			{
-				final User user = ess.getUser(event.getPlayer());
-				user.updateActivity(true);
-				if (user.hasPowerTools() && user.arePowerToolsEnabled() && usePowertools(user, event.getItem().getTypeId()))
-				{
-					event.setCancelled(true);
-				}
-			}
-			break;
-		default:
-			break;
-		}
-	}
-
-	// This method allows the /jump lock feature to work, allows teleporting while flying #EasterEgg
-	private void useFlyClickJump(final User user)
-	{
-		try
-		{
-			final Location otarget = Util.getTarget(user);
-
-			ess.scheduleSyncDelayedTask(
-					new Runnable()
-					{
-						@Override
-						public void run()
-						{
-							Location loc = user.getLocation();
-							loc.setX(otarget.getX());
-							loc.setZ(otarget.getZ());
-							while (Util.isBlockDamaging(loc.getWorld(), loc.getBlockX(), loc.getBlockY() - 1, loc.getBlockZ()))
-							{
-								loc.setY(loc.getY() + 1d);
-							}
-							user.getBase().teleport(loc, TeleportCause.PLUGIN);
-						}
-					});
-		}
-		catch (Exception ex)
-		{
-			if (ess.getSettings().isDebug())
-			{
-				LOGGER.log(Level.WARNING, ex.getMessage(), ex);
-			}
-		}
-	}
-
-	private boolean usePowertools(final User user, final int id)
-	{
-		final List<String> commandList = user.getPowertool(id);
-		if (commandList == null || commandList.isEmpty())
-		{
-			return false;
-		}
-		boolean used = false;
-		// We need to loop through each command and execute
-		for (final String command : commandList)
-		{
-			if (command.contains("{player}"))
-			{
-				continue;
-			}
-			else if (command.startsWith("c:"))
-			{
-				used = true;
-				user.chat(command.substring(2));
-			}
-			else
-			{
-				used = true;
-				ess.scheduleSyncDelayedTask(
-						new Runnable()
-						{
-							@Override
-							public void run()
-							{
-								user.getServer().dispatchCommand(user.getBase(), command);
-								LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", user.getName(), command));
-							}
-						});
-			}
-		}
-		return used;
-	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onPlayerPickupItem(final PlayerPickupItemEvent event)
-	{
-		if (ess.getSettings().getDisableItemPickupWhileAfk())
-		{
-			if (ess.getUser(event.getPlayer()).isAfk())
-			{
-				event.setCancelled(true);
-			}
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-	public void onInventoryClickEvent(final InventoryClickEvent event)
-	{
-		if (event.getView().getTopInventory().getType() == InventoryType.PLAYER)
-		{
-			final User user = ess.getUser(event.getWhoClicked());
-			final InventoryHolder invHolder = event.getView().getTopInventory().getHolder();
-			if (invHolder != null && invHolder instanceof HumanEntity)
-			{
-				final User invOwner = ess.getUser((HumanEntity)invHolder);
-				if (user.isInvSee() && (!user.isAuthorized("essentials.invsee.modify")
-										|| invOwner.isAuthorized("essentials.invsee.preventmodify")
-										|| !invOwner.isOnline()))
-				{
-					event.setCancelled(true);
-				}
-			}
-		}
-		else if (event.getView().getTopInventory().getType() == InventoryType.ENDER_CHEST)
-		{
-			final User user = ess.getUser(event.getWhoClicked());
-			if (user.isEnderSee() && (!user.isAuthorized("essentials.enderchest.modify")))
-			{
-				event.setCancelled(true);
-			}
-		}
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onInventoryCloseEvent(final InventoryCloseEvent event)
-	{
-		if (event.getView().getTopInventory().getType() == InventoryType.PLAYER)
-		{
-			final User user = ess.getUser(event.getPlayer());
-			user.setInvSee(false);
-		}
-		else if (event.getView().getTopInventory().getType() == InventoryType.ENDER_CHEST)
-		{
-			final User user = ess.getUser(event.getPlayer());
-			user.setEnderSee(false);
-		}
-	}
-	
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onPlayerFishEvent(final PlayerFishEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		user.updateActivity(true);
-	}
-}
@@ -1,56 +0,0 @@
-package com.earth2me.essentials;
-
-import java.util.logging.Level;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.server.PluginDisableEvent;
-import org.bukkit.event.server.PluginEnableEvent;
-
-
-public class EssentialsPluginListener implements Listener, IConf
-{
-	private final transient IEssentials ess;
-	
-	public EssentialsPluginListener(final IEssentials ess)
-	{
-		this.ess = ess;
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPluginEnable(final PluginEnableEvent event)
-	{
-		if (event.getPlugin().getName().equals("EssentialsChat")) {
-			ess.getSettings().setEssentialsChatActive(true);
-		}
-		ess.getPermissionsHandler().checkPermissions();
-		ess.getAlternativeCommandsHandler().addPlugin(event.getPlugin());
-		if (!ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().setMethod(ess.getServer().getPluginManager()))
-		{
-			ess.getLogger().log(Level.INFO, "Payment method found (" + ess.getPaymentMethod().getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
-		}
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPluginDisable(final PluginDisableEvent event)
-	{
-		if (event.getPlugin().getName().equals("EssentialsChat")) {
-			ess.getSettings().setEssentialsChatActive(false);
-		}
-		ess.getPermissionsHandler().checkPermissions();
-		ess.getAlternativeCommandsHandler().removePlugin(event.getPlugin());
-		// Check to see if the plugin thats being disabled is the one we are using
-		if (ess.getPaymentMethod() != null && ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().checkDisabled(event.getPlugin()))
-		{
-			ess.getPaymentMethod().reset();
-			ess.getLogger().log(Level.INFO, "Payment method was disabled. No longer accepting payments.");
-		}
-	}
-
-	@Override
-	public void reloadConfig()
-	{
-		ess.getPermissionsHandler().setUseSuperperms(ess.getSettings().useBukkitPermissions());
-		ess.getPermissionsHandler().checkPermissions();
-	}
-}
@@ -1,8 +1,14 @@
 package com.earth2me.essentials;

+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.IEssentials;
+import com.earth2me.essentials.api.ISettings;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.user.UserData.TimestampType;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.LinkedList;
+import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
 import org.bukkit.entity.Player;
@@ -11,9 +17,7 @@ import org.bukkit.entity.Player;
 public class EssentialsTimer implements Runnable
 {
 	private final transient IEssentials ess;
-	private final transient Set<User> onlineUsers = new HashSet<User>();
-	private transient long lastPoll = System.currentTimeMillis();
-	private final transient LinkedList<Float> history = new LinkedList<Float>();
+	private final transient Set<IUser> onlineUsers = new HashSet<IUser>();

 	EssentialsTimer(final IEssentials ess)
 	{
@@ -24,29 +28,36 @@ public class EssentialsTimer implements Runnable
 	public void run()
 	{
 		final long currentTime = System.currentTimeMillis();
-		long timeSpent = (currentTime - lastPoll) / 1000;
-		if (timeSpent == 0)
-		{
-			timeSpent = 1;
-		}
-		if (history.size() > 10)
-		{
-			history.remove();
-		}
-		float tps = 100f / timeSpent;
-		if (tps <= 20)
-		{
-			history.add(tps);
-		}
-		lastPoll = currentTime;
 		for (Player player : ess.getServer().getOnlinePlayers())
 		{
+
 			try
 			{
-				final User user = ess.getUser(player);
+				final IUser user = ess.getUser(player);
 				onlineUsers.add(user);
 				user.setLastOnlineActivity(currentTime);
 				user.checkActivity();
+
+				boolean mailDisabled = false;
+				ISettings settings = ess.getSettings();
+				settings.acquireReadLock();
+				try
+				{
+					mailDisabled = settings.getData().getCommands().isDisabled("mail");
+				}
+				finally
+				{
+					settings.unlock();
+				}
+				// New mail notification
+				if (user != null && !mailDisabled && Permissions.MAIL.isAuthorized(user) && !user.gotMailInfo())
+				{
+					final List<String> mail = user.getMails();
+					if (mail != null && !mail.isEmpty())
+					{
+						user.sendMessage(_("youHaveNewMail", mail.size()));
+					}
+				}
 			}
 			catch (Exception e)
 			{
@@ -54,32 +65,18 @@ public class EssentialsTimer implements Runnable
 			}
 		}

-		final Iterator<User> iterator = onlineUsers.iterator();
+		final Iterator<IUser> iterator = onlineUsers.iterator();
 		while (iterator.hasNext())
 		{
-			final User user = iterator.next();
-			if (user.getLastOnlineActivity() < currentTime && user.getLastOnlineActivity() > user.getLastLogout())
+			final IUser user = iterator.next();
+			if (user.getLastOnlineActivity() < currentTime && user.getLastOnlineActivity() > user.getTimestamp(TimestampType.LOGOUT))
 			{
-				user.setLastLogout(user.getLastOnlineActivity());
+				user.setTimestamp(TimestampType.LOGOUT, user.getLastOnlineActivity());
 				iterator.remove();
 				continue;
 			}
 			user.checkMuteTimeout(currentTime);
 			user.checkJailTimeout(currentTime);
-			user.resetInvulnerabilityAfterTeleport();
 		}
 	}
-
-	public float getAverageTPS()
-	{
-		float avg = 0;
-		for (Float f : history)
-		{
-			if (f != null)
-			{
-				avg += f;
-			}
-		}
-		return avg / history.size();
-	}
 }
@@ -1,5 +1,6 @@
 package com.earth2me.essentials;

+import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.II18n;
 import java.io.File;
 import java.io.FileInputStream;
@@ -43,6 +44,7 @@ public class I18n implements II18n
 		instance = null;
 	}

+	@Override
 	public Locale getCurrentLocale()
 	{
 		return currentLocale;
@@ -70,8 +72,7 @@ public class I18n implements II18n

 	public static String _(final String string, final Object... objects)
 	{
-		if (instance == null)
-		{
+		if (instance == null) {
 			return "";
 		}
 		if (objects.length == 0)
@@ -86,20 +87,11 @@ public class I18n implements II18n

 	public String format(final String string, final Object... objects)
 	{
-		String format = translate(string);
+		final String format = translate(string);
 		MessageFormat messageFormat = messageFormatCache.get(format);
 		if (messageFormat == null)
 		{
-			try
-			{
-				messageFormat = new MessageFormat(format);
-			}
-			catch (IllegalArgumentException e)
-			{
-				ess.getLogger().log(Level.SEVERE, "Invalid Translation key for '" + string + "': " + e.getMessage());
-				format = format.replaceAll("\\{(\\D*?)\\}", "\\[$1\\]");
-				messageFormat = new MessageFormat(format);
-			}
+			messageFormat = new MessageFormat(format);
 			messageFormatCache.put(format, messageFormat);
 		}
 		return messageFormat.format(objects);
@@ -124,7 +116,6 @@ public class I18n implements II18n
 		{
 			currentLocale = new Locale(parts[0], parts[1], parts[2]);
 		}
-		ResourceBundle.clearCache();
 		Logger.getLogger("Minecraft").log(Level.INFO, String.format("Using locale %s", currentLocale.toString()));
 		customBundle = ResourceBundle.getBundle(MESSAGES, currentLocale, new FileResClassLoader(I18n.class.getClassLoader(), ess));
 		localeBundle = ResourceBundle.getBundle(MESSAGES, currentLocale);
@@ -143,7 +134,7 @@ public class I18n implements II18n
 	{
 		private final transient File dataFolder;

-		FileResClassLoader(final ClassLoader classLoader, final IEssentials ess)
+		public FileResClassLoader(final ClassLoader classLoader, final IEssentials ess)
 		{
 			super(classLoader);
 			this.dataFolder = ess.getDataFolder();
@@ -1,5 +0,0 @@
-package com.earth2me.essentials;
-
-public interface IConf {
-	public void reloadConfig();
-}
@@ -1,74 +0,0 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.api.IJails;
-import com.earth2me.essentials.metrics.Metrics;
-import com.earth2me.essentials.perm.PermissionsHandler;
-import com.earth2me.essentials.register.payment.Methods;
-import java.util.List;
-import org.bukkit.World;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.scheduler.BukkitScheduler;
-
-
-public interface IEssentials extends Plugin
-{
-	void addReloadListener(IConf listener);
-
-	void reload();
-
-	boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentialsModule module);
-
-	User getUser(Object base);
-
-	I18n getI18n();
-
-	User getOfflineUser(String name);
-
-	World getWorld(String name);
-
-	int broadcastMessage(IUser sender, String message);
-
-	ISettings getSettings();
-
-	BukkitScheduler getScheduler();
-
-	IJails getJails();
-
-	Warps getWarps();
-
-	Worth getWorth();
-
-	Backup getBackup();
-
-	Methods getPaymentMethod();
-
-	int scheduleAsyncDelayedTask(Runnable run);
-
-	int scheduleSyncDelayedTask(Runnable run);
-
-	int scheduleSyncDelayedTask(Runnable run, long delay);
-
-	int scheduleSyncRepeatingTask(final Runnable run, long delay, long period);
-
-	TNTExplodeListener getTNTListener();
-
-	PermissionsHandler getPermissionsHandler();
-
-	AlternativeCommandsHandler getAlternativeCommandsHandler();
-
-	void showError(final CommandSender sender, final Throwable exception, final String commandLabel);
-
-	ItemDb getItemDb();
-
-	UserMap getUserMap();
-	
-	Metrics getMetrics();
-	
-	void setMetrics(Metrics metrics);
-	
-	EssentialsTimer getTimer();
-	
-	List<String> getVanishedPlayers();
-}
@@ -1,9 +0,0 @@
-package com.earth2me.essentials;
-
-import org.bukkit.command.CommandSender;
-
-public interface IReplyTo {
-	public void setReplyTo(CommandSender user);
-
-	public CommandSender getReplyTo();
-}
@@ -1,186 +0,0 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.commands.IEssentialsCommand;
-import com.earth2me.essentials.signs.EssentialsSign;
-import com.earth2me.essentials.textreader.IText;
-import java.text.MessageFormat;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.bukkit.ChatColor;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.event.EventPriority;
-
-
-public interface ISettings extends IConf
-{
-	boolean areSignsDisabled();
-
-	IText getAnnounceNewPlayerFormat();
-
-	boolean getAnnounceNewPlayers();
-
-	String getNewPlayerKit();
-
-	String getBackupCommand();
-
-	long getBackupInterval();
-
-	MessageFormat getChatFormat(String group);
-
-	int getChatRadius();
-
-	double getCommandCost(IEssentialsCommand cmd);
-
-	double getCommandCost(String label);
-
-	String getCurrencySymbol();
-
-	int getOversizedStackSize();
-
-	int getDefaultStackSize();
-
-	double getHealCooldown();
-
-	Map<String, Object> getKit(String name);
-
-	ConfigurationSection getKits();
-
-	String getLocale();
-
-	String getNewbieSpawn();
-
-	String getNicknamePrefix();
-
-	ChatColor getOperatorColor() throws Exception;
-
-	boolean getPerWarpPermission();
-
-	boolean getProtectBoolean(final String configName, boolean def);
-
-	int getProtectCreeperMaxHeight();
-
-	List<Integer> getProtectList(final String configName);
-
-	boolean getProtectPreventSpawn(final String creatureName);
-
-	String getProtectString(final String configName);
-
-	boolean getRespawnAtHome();
-
-	Set getMultipleHomes();
-
-	int getHomeLimit(String set);
-
-	int getHomeLimit(User user);
-
-	boolean getSortListByGroups();
-
-	int getSpawnMobLimit();
-
-	int getStartingBalance();
-
-	double getTeleportCooldown();
-
-	double getTeleportDelay();
-
-	boolean hidePermissionlessHelp();
-
-	boolean isCommandDisabled(final IEssentialsCommand cmd);
-
-	boolean isCommandDisabled(String label);
-
-	boolean isCommandOverridden(String name);
-
-	boolean isDebug();
-
-	boolean isEcoDisabled();
-
-	boolean isTradeInStacks(int id);
-
-	List<Integer> itemSpawnBlacklist();
-
-	List<EssentialsSign> enabledSigns();
-
-	boolean permissionBasedItemSpawn();
-
-	boolean showNonEssCommandsInHelp();
-
-	boolean warnOnBuildDisallow();
-
-	boolean warnOnSmite();
-
-	double getMaxMoney();
-
-	double getMinMoney();
-
-	boolean isEcoLogEnabled();
-
-	boolean isEcoLogUpdateEnabled();
-
-	boolean removeGodOnDisconnect();
-
-	boolean changeDisplayName();
-
-	boolean changePlayerListName();
-
-	boolean isPlayerCommand(String string);
-
-	boolean useBukkitPermissions();
-
-	boolean addPrefixSuffix();
-
-	boolean disablePrefix();
-
-	boolean disableSuffix();
-
-	long getAutoAfk();
-
-	long getAutoAfkKick();
-
-	boolean getFreezeAfkPlayers();
-
-	boolean cancelAfkOnMove();
-
-	boolean areDeathMessagesEnabled();
-
-	public void setDebug(boolean debug);
-
-	Set<String> getNoGodWorlds();
-
-	boolean getUpdateBedAtDaytime();
-
-	boolean getRepairEnchanted();
-
-	boolean isWorldTeleportPermissions();
-
-	boolean isWorldHomePermissions();
-
-	boolean registerBackInListener();
-
-	boolean getDisableItemPickupWhileAfk();
-
-	EventPriority getRespawnPriority();
-
-	long getTpaAcceptCancellation();
-
-	boolean isMetricsEnabled();
-
-	void setMetricsEnabled(boolean metricsEnabled);
-
-	long getTeleportInvulnerability();
-
-	boolean isTeleportInvulnerability();
-
-	long getLoginAttackDelay();
-
-	int getSignUsePerSecond();
-
-	double getMaxFlySpeed();
-
-	double getMaxWalkSpeed();
-
-	public int getMailsPerMinute();
-
-	public void setEssentialsChatActive(boolean b);
-}
@@ -1,47 +0,0 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.commands.IEssentialsCommand;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-
-
-public interface IUser extends Player
-{
-	long getLastTeleportTimestamp();
-
-	boolean isAuthorized(String node);
-
-	boolean isAuthorized(IEssentialsCommand cmd);
-
-	boolean isAuthorized(IEssentialsCommand cmd, String permissionPrefix);
-
-	void setLastTeleportTimestamp(long time);
-
-	Location getLastLocation();
-
-	Player getBase();
-
-	double getMoney();
-
-	void takeMoney(double value);
-
-	void giveMoney(double value);
-	
-	boolean canAfford(double value);
-
-	String getGroup();
-
-	void setLastLocation();
-
-	Location getHome(String name) throws Exception;
-
-	Location getHome(Location loc) throws Exception;
-
-	boolean isHidden();
-
-	Teleport getTeleport();
-
-	void setJail(String jail);
-	
-	boolean isIgnoreExempt();
-}
@@ -1,13 +1,22 @@
 package com.earth2me.essentials;

+import com.earth2me.essentials.storage.ManagedFile;
 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IItemDb;
-import java.util.*;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.perm.Permissions;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Pattern;
+import lombok.Cleanup;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;


-public class ItemDb implements IConf, IItemDb
+public class ItemDb implements IItemDb
 {
 	private final transient IEssentials ess;

@@ -16,13 +25,12 @@ public class ItemDb implements IConf, IItemDb
 		this.ess = ess;
 		file = new ManagedFile("items.csv", ess);
 	}
-	private final transient Map<String, Integer> items = new HashMap<String, Integer>();
-	private final transient Map<ItemData, List<String>> names = new HashMap<ItemData, List<String>>();
-	private final transient Map<String, Short> durabilities = new HashMap<String, Short>();
+	private final transient Map<String, Long> items = new HashMap<String, Long>();
 	private final transient ManagedFile file;
+	private static final Pattern SPLIT = Pattern.compile("[^a-zA-Z0-9]");

 	@Override
-	public void reloadConfig()
+	public void onReload()
 	{
 		final List<String> lines = file.getLines();

@@ -31,45 +39,52 @@ public class ItemDb implements IConf, IItemDb
 			return;
 		}

-		durabilities.clear();
 		items.clear();
-		names.clear();

 		for (String line : lines)
 		{
-			line = line.trim().toLowerCase(Locale.ENGLISH);
+			line = line.trim();
 			if (line.length() > 0 && line.charAt(0) == '#')
 			{
 				continue;
 			}

-			final String[] parts = line.split("[^a-z0-9]");
+			final String[] parts = SPLIT.split(line);
 			if (parts.length < 2)
 			{
 				continue;
 			}

-			final int numeric = Integer.parseInt(parts[1]);
-			final short data = parts.length > 2 && !parts[2].equals("0") ? Short.parseShort(parts[2]) : 0;
-			String itemName = parts[0].toLowerCase(Locale.ENGLISH);
+			final long numeric = Integer.parseInt(parts[1]);

-			durabilities.put(itemName, data);
-			items.put(itemName, numeric);
+			final long durability = parts.length > 2 && !(parts[2].length() == 1 && parts[2].charAt(0) == '0') ? Short.parseShort(parts[2]) : 0;
+			items.put(parts[0].toLowerCase(Locale.ENGLISH), numeric | (durability << 32));
+		}
+	}

-			ItemData itemData = new ItemData(numeric, data);
-			if (names.containsKey(itemData))
+	public ItemStack get(final String id, final IUser user) throws Exception
+	{
+		final ItemStack stack = get(id.toLowerCase(Locale.ENGLISH));
+
+		@Cleanup
+		com.earth2me.essentials.api.ISettings settings = ess.getSettings();
+		settings.acquireReadLock();
+
+		final int defaultStackSize = settings.getData().getGeneral().getDefaultStacksize();
+
+		if (defaultStackSize > 0)
+		{
+			stack.setAmount(defaultStackSize);
+		}
+		else
+		{
+			final int oversizedStackSize = settings.getData().getGeneral().getOversizedStacksize();
+			if (oversizedStackSize > 0 && Permissions.OVERSIZEDSTACKS.isAuthorized(user))
 			{
-				List<String> nameList = names.get(itemData);
-				nameList.add(itemName);
-				Collections.sort(nameList, new LengthCompare());
-			}
-			else
-			{
-				List<String> nameList = new ArrayList<String>();
-				nameList.add(itemName);
-				names.put(itemData, nameList);
+				stack.setAmount(oversizedStackSize);
 			}
 		}
+		return stack;
 	}

 	public ItemStack get(final String id, final int quantity) throws Exception
@@ -107,10 +122,11 @@ public class ItemDb implements IConf, IItemDb
 		{
 			if (items.containsKey(itemname))
 			{
-				itemid = items.get(itemname);
-				if (durabilities.containsKey(itemname) && metaData == 0)
+				long item = items.get(itemname);
+				itemid = (int)(item & 0xffffffffL);
+				if (metaData == 0)
 				{
-					metaData = durabilities.get(itemname);
+					metaData = (short)((item >> 32) & 0xffffL);
 				}
 			}
 			else if (Material.getMaterial(itemname) != null)
@@ -134,81 +150,4 @@ public class ItemDb implements IConf, IItemDb
 		retval.setDurability(metaData);
 		return retval;
 	}
-
-	public String names(ItemStack item)
-	{
-		ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
-		List<String> nameList = names.get(itemData);
-		if (nameList == null) {
-			itemData = new ItemData(item.getTypeId(), (short) 0);
-			nameList = names.get(itemData);
-			if (nameList == null) {
-				return null;
-			}
-		}
-		
-		if (nameList.size() > 15)
-		{
-			nameList = nameList.subList(0, 14);
-		}
-		return Util.joinList(", ", nameList);
-	}
-
-	class ItemData
-	{
-		final private int itemNo;
-		final private short itemData;
-
-		ItemData(final int itemNo, final short itemData)
-		{
-			this.itemNo = itemNo;
-			this.itemData = itemData;
-		}
-
-		public int getItemNo()
-		{
-			return itemNo;
-		}
-
-		public short getItemData()
-		{
-			return itemData;
-		}
-
-		@Override
-		public int hashCode()
-		{
-			return (31 * itemNo) ^ itemData;
-		}
-
-		@Override
-		public boolean equals(Object o)
-		{
-			if (o == null)
-			{
-				return false;
-			}
-			if (!(o instanceof ItemData))
-			{
-				return false;
-			}
-			ItemData pairo = (ItemData)o;
-			return this.itemNo == pairo.getItemNo()
-				   && this.itemData == pairo.getItemData();
-		}
-	}
-
-	class LengthCompare implements java.util.Comparator<String>
-	{
-		public LengthCompare()
-		{
-			super();
-		}
-
-		@Override
-		public int compare(String s1, String s2)
-		{
-			return s1.length() - s2.length();
-		}
-	}
 }
@@ -1,24 +1,23 @@
 package com.earth2me.essentials;

 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.IJails;
+import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
 import java.io.File;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import lombok.Cleanup;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockDamageEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
@@ -30,20 +29,21 @@ import org.bukkit.plugin.PluginManager;
 public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Jails> implements IJails
 {
 	private static final transient Logger LOGGER = Bukkit.getLogger();
-	private static transient boolean enabled = false;

 	public Jails(final IEssentials ess)
 	{
 		super(ess, com.earth2me.essentials.settings.Jails.class);
-		reloadConfig();
+		onReload();
+		registerListeners();
 	}

 	private void registerListeners()
 	{
-		enabled = true;
 		final PluginManager pluginManager = ess.getServer().getPluginManager();
-		final JailListener blockListener = new JailListener();
+		final JailBlockListener blockListener = new JailBlockListener();
+		final JailPlayerListener playerListener = new JailPlayerListener();
 		pluginManager.registerEvents(blockListener, ess);
+		pluginManager.registerEvents(playerListener, ess);
 	}

 	@Override
@@ -52,24 +52,6 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		return new File(ess.getDataFolder(), "jail.yml");
 	}

-	@Override
-	public void finishRead()
-	{
-		if (enabled == false && getCount() > 0)
-		{
-			registerListeners();
-		}
-	}
-
-	@Override
-	public void finishWrite()
-	{
-		if (enabled == false)
-		{
-			registerListeners();
-		}
-	}
-
 	@Override
 	public Location getJail(final String jailName) throws Exception
 	{
@@ -81,7 +63,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 			{
 				throw new Exception(_("jailNotExist"));
 			}
-			Location loc = getData().getJails().get(jailName.toLowerCase(Locale.ENGLISH));
+			Location loc = getData().getJails().get(jailName.toLowerCase(Locale.ENGLISH)).getBukkitLocation();
 			if (loc == null || loc.getWorld() == null)
 			{
 				throw new Exception(_("jailNotExist"));
@@ -136,12 +118,20 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		acquireReadLock();
 		try
 		{
-			if (user.isOnline())
+			if (!(user.isOnline()))
 			{
 				Location loc = getJail(jail);
 				user.getTeleport().now(loc, false, TeleportCause.COMMAND);
 			}
-			user.setJail(jail);
+			user.acquireWriteLock();
+			try
+			{
+				user.getData().setJail(jail);
+			}
+			finally
+			{
+				unlock();
+			}
 		}
 		finally
 		{
@@ -157,9 +147,9 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		{
 			if (getData().getJails() == null)
 			{
-				getData().setJails(new HashMap<String, Location>());
+				getData().setJails(new HashMap<String, com.earth2me.essentials.storage.Location>());
 			}
-			getData().getJails().put(jailName.toLowerCase(Locale.ENGLISH), loc);
+			getData().getJails().put(jailName.toLowerCase(Locale.ENGLISH), new com.earth2me.essentials.storage.Location(loc));
 		}
 		finally
 		{
@@ -167,92 +157,75 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		}
 	}

-	@Override
-	public int getCount()
+
+	private class JailBlockListener implements Listener
 	{
-		try
+		@EventHandler(priority = EventPriority.LOW)
+		public void onBlockBreak(final BlockBreakEvent event)
 		{
-			return getList().size();
+			@Cleanup
+			final IUser user = ess.getUser(event.getPlayer());
+			user.acquireReadLock();
+			if (user.getData().isJailed())
+			{
+				event.setCancelled(true);
+			}
 		}
-		catch (Exception ex)
+
+		@EventHandler(priority = EventPriority.LOW)
+		public void onBlockPlace(final BlockPlaceEvent event)
 		{
-			return 0;
+			@Cleanup
+			final IUser user = ess.getUser(event.getPlayer());
+			user.acquireReadLock();
+			if (user.getData().isJailed())
+			{
+				event.setCancelled(true);
+			}
+		}
+
+		@EventHandler(priority = EventPriority.LOW)
+		public void onBlockDamage(final BlockDamageEvent event)
+		{
+			@Cleanup
+			final IUser user = ess.getUser(event.getPlayer());
+			user.acquireReadLock();
+			if (user.getData().isJailed())
+			{
+				event.setCancelled(true);
+			}
 		}
 	}


-	private class JailListener implements Listener
+	private class JailPlayerListener implements Listener
 	{
-		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-		public void onBlockBreak(final BlockBreakEvent event)
-		{
-			final User user = ess.getUser(event.getPlayer());
-			if (user.isJailed())
-			{
-				event.setCancelled(true);
-			}
-		}
-
-		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-		public void onBlockPlace(final BlockPlaceEvent event)
-		{
-			final User user = ess.getUser(event.getPlayer());
-			if (user.isJailed())
-			{
-				event.setCancelled(true);
-			}
-		}
-
-		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-		public void onBlockDamage(final BlockDamageEvent event)
-		{
-			final User user = ess.getUser(event.getPlayer());
-			if (user.isJailed())
-			{
-				event.setCancelled(true);
-			}
-		}
-
-		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-		public void onEntityDamageByEntity(final EntityDamageByEntityEvent event)
-		{
-			if (event.getCause() != DamageCause.ENTITY_ATTACK || event.getEntity().getType() != EntityType.PLAYER)
-			{
-				return;
-			}
-			final Entity damager = event.getDamager();
-			if (damager.getType() == EntityType.PLAYER)
-			{
-				final User user = ess.getUser(damager);
-				if (user != null && user.isJailed())
-				{
-					event.setCancelled(true);
-				}
-			}
-		}
-
-		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+		@EventHandler(priority = EventPriority.LOW)
 		public void onPlayerInteract(final PlayerInteractEvent event)
 		{
-			final User user = ess.getUser(event.getPlayer());
-			if (user.isJailed())
+			@Cleanup
+			final IUser user = ess.getUser(event.getPlayer());
+			user.acquireReadLock();
+			if (user.getData().isJailed())
 			{
 				event.setCancelled(true);
 			}
 		}

-		@EventHandler(priority = EventPriority.HIGHEST)
+		@EventHandler(priority = EventPriority.HIGH)
 		public void onPlayerRespawn(final PlayerRespawnEvent event)
 		{
-			final User user = ess.getUser(event.getPlayer());
-			if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
+			@Cleanup
+			final IUser user = ess.getUser(event.getPlayer());
+			user.acquireReadLock();
+			if (!user.getData().isJailed() || user.getData().getJail() == null || user.getData().getJail().isEmpty())
 			{
 				return;
 			}

 			try
 			{
-				event.setRespawnLocation(getJail(user.getJail()));
+				event.setRespawnLocation(getJail(user.getData().getJail()));
 			}
 			catch (Exception ex)
 			{
@@ -270,15 +243,17 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		@EventHandler(priority = EventPriority.HIGH)
 		public void onPlayerTeleport(final PlayerTeleportEvent event)
 		{
-			final User user = ess.getUser(event.getPlayer());
-			if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
+			@Cleanup
+			final IUser user = ess.getUser(event.getPlayer());
+			user.acquireReadLock();
+			if (!user.getData().isJailed() || user.getData().getJail() == null || user.getData().getJail().isEmpty())
 			{
 				return;
 			}

 			try
 			{
-				event.setTo(getJail(user.getJail()));
+				event.setTo(getJail(user.getData().getJail()));
 			}
 			catch (Exception ex)
 			{
@@ -294,18 +269,20 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 			user.sendMessage(_("jailMessage"));
 		}

-		@EventHandler(priority = EventPriority.HIGHEST)
+		@EventHandler(priority = EventPriority.HIGH)
 		public void onPlayerJoin(final PlayerJoinEvent event)
 		{
-			final User user = ess.getUser(event.getPlayer());
-			if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
+			@Cleanup
+			final IUser user = ess.getUser(event.getPlayer());
+			user.acquireReadLock();
+			if (!user.getData().isJailed() || user.getData().getJail() == null || user.getData().getJail().isEmpty())
 			{
 				return;
 			}

 			try
 			{
-				sendToJail(user, user.getJail());
+				sendToJail(user, user.getData().getJail());
 			}
 			catch (Exception ex)
 			{
@@ -1,193 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import static com.earth2me.essentials.I18n.capitalCase;
-import com.earth2me.essentials.commands.NoChargeException;
-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
-import java.util.*;
-import java.util.logging.Level;
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
-
-
-public class Kit
-{
-	//TODO: Convert this to use one of the new text classes?
-	public static String listKits(final IEssentials ess, final User user) throws Exception
-	{
-		try
-		{
-			final ConfigurationSection kits = ess.getSettings().getKits();
-			final StringBuilder list = new StringBuilder();
-			for (String kiteItem : kits.getKeys(false))
-			{
-				if (user == null || user.isAuthorized("essentials.kits." + kiteItem.toLowerCase(Locale.ENGLISH)))
-				{
-					list.append(" ").append(capitalCase(kiteItem));
-				}
-			}
-			return list.toString().trim();
-		}
-		catch (Exception ex)
-		{
-			throw new Exception(_("kitError"), ex);
-		}
-
-	}
-
-	public static void checkTime(final User user, final String kitName, final Map<String, Object> els) throws Exception
-	{
-		if (user.isAuthorized("essentials.kit.exemptdelay")) {
-			return;
-		}
-		
-		final Calendar time = new GregorianCalendar();
-
-		// Take the current time, and remove the delay from it.
-		final double delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0.0d;
-		final Calendar earliestTime = new GregorianCalendar();
-		earliestTime.add(Calendar.SECOND, -(int)delay);
-		earliestTime.add(Calendar.MILLISECOND, -(int)((delay * 1000.0) % 1000.0));
-		// This value contains the most recent time a kit could have been used that would allow another use.
-		final long earliestLong = earliestTime.getTimeInMillis();
-
-		// When was the last kit used?
-		final long lastTime = user.getKitTimestamp(kitName);
-
-		if (lastTime < earliestLong || lastTime == 0L)
-		{
-			user.setKitTimestamp(kitName, time.getTimeInMillis());
-		}
-		else if (lastTime > time.getTimeInMillis())
-		{
-			// This is to make sure time didn't get messed up on last kit use.
-			// If this happens, let's give the user the benifit of the doubt.
-			user.setKitTimestamp(kitName, time.getTimeInMillis());
-		}
-		else if (earliestLong < 0L)
-		{
-			user.sendMessage(_("kitOnce"));
-			throw new NoChargeException();
-		}
-		else
-		{
-			time.setTimeInMillis(lastTime);
-			time.add(Calendar.SECOND, (int)delay);
-			time.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
-			user.sendMessage(_("kitTimed", Util.formatDateDiff(time.getTimeInMillis())));
-			throw new NoChargeException();
-		}
-	}
-
-	public static List<String> getItems(final User user, final Map<String, Object> kit) throws Exception
-	{
-		if (kit == null)
-		{
-			throw new Exception(_("kitError2"));
-		}
-	
-
-		try
-		{
-			return (List<String>)kit.get("items");
-		}
-		catch (Exception e)
-		{
-			user.sendMessage(_("kitError2"));
-			throw new Exception(_("kitErrorHelp"), e);
-		}
-	}
-
-	public static void expandItems(final IEssentials ess, final User user, final List<String> items) throws Exception
-	{
-		try
-		{
-			boolean spew = false;
-			for (String d : items)
-			{
-				if (d.startsWith(ess.getSettings().getCurrencySymbol())) 
-				{
-					Double value = Double.parseDouble(d.substring(ess.getSettings().getCurrencySymbol().length()).trim());
-					Trade t = new Trade(value, ess);
-					t.pay(user);
-					continue;
-				}
-				final String[] parts = d.split(" ");
-				final String[] item = parts[0].split("[:+',;.]", 2);
-				final int id = Material.getMaterial(Integer.parseInt(item[0])).getId();
-				final short data = item.length > 1 ? Short.parseShort(item[1]) : 0;
-				final int amount = parts.length > 1 ? Integer.parseInt(parts[1]) : 1;
-
-				final ItemStack stack = new ItemStack(id, amount, data);
-				if (parts.length > 2)
-				{
-					for (int i = 2; i < parts.length; i++)
-					{
-						final String[] split = parts[i].split("[:+',;.]", 2);
-						if (split.length < 1)
-						{
-							continue;
-						}
-						final Enchantment enchantment = Enchantments.getByName(split[0]);
-						if (enchantment == null)
-						{
-							throw new Exception("Enchantment not found: " + split[0]);
-						}
-						int level;
-						if (split.length > 1)
-						{
-							level = Integer.parseInt(split[1]);
-						}
-						else
-						{
-							level = enchantment.getMaxLevel();
-						}
-						try
-						{
-							stack.addEnchantment(enchantment, level);
-						}
-						catch (Exception ex)
-						{
-							throw new Exception("Enchantment " + enchantment.getName() + ": " + ex.getMessage(), ex);
-						}
-					}
-				}
-
-				final Map<Integer, ItemStack> overfilled;
-				if (user.isAuthorized("essentials.oversizedstacks"))
-				{
-					overfilled = InventoryWorkaround.addOversizedItems(user.getInventory(), ess.getSettings().getOversizedStackSize(), stack);
-				}
-				else
-				{
-					overfilled = InventoryWorkaround.addItems(user.getInventory(), stack);
-				}
-				for (ItemStack itemStack : overfilled.values())
-				{
-					user.getWorld().dropItemNaturally(user.getLocation(), itemStack);
-					spew = true;
-				}
-			}
-			user.updateInventory();
-			if (spew)
-			{
-				user.sendMessage(_("kitInvFull"));
-			}
-		}
-		catch (Exception e)
-		{
-			user.updateInventory();
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().log(Level.WARNING, e.getMessage());
-			}
-			else
-			{
-				ess.getLogger().log(Level.WARNING, e.getMessage());
-			}
-			throw new Exception(_("kitError2"), e);
-		}
-	}
-}
@@ -0,0 +1,90 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.IEssentials;
+import com.earth2me.essentials.api.IKits;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.settings.Kit;
+import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+import org.bukkit.inventory.ItemStack;
+
+
+public class Kits extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Kits> implements IKits
+{
+	public Kits(final IEssentials ess)
+	{
+		super(ess, com.earth2me.essentials.settings.Kits.class);
+		onReload();
+	}
+
+	@Override
+	public File getStorageFile() throws IOException
+	{
+		return new File(ess.getDataFolder(), "kits.yml");
+	}
+
+	@Override
+	public Kit getKit(String kitName) throws Exception
+	{
+		acquireReadLock();
+		try
+		{
+			if (getData().getKits() == null || kitName == null
+				|| !getData().getKits().containsKey(kitName.toLowerCase(Locale.ENGLISH)))
+			{
+				throw new Exception(_("kitError2"));
+			}
+			final Kit kit = getData().getKits().get(kitName.toLowerCase(Locale.ENGLISH));
+			if (kit == null)
+			{
+				throw new Exception(_("kitError2"));
+			}
+			return kit;
+		}
+		finally
+		{
+			unlock();
+		}
+	}
+
+	@Override
+	public void sendKit(IUser user, String kitName) throws Exception
+	{
+		final Kit kit = getKit(kitName);
+		sendKit(user, kit);
+	}
+
+	@Override
+	public void sendKit(IUser user, Kit kit) throws Exception
+	{
+		final List<ItemStack> itemList = kit.getItems();		
+		user.giveItems(itemList, true);					
+	}
+
+	@Override
+	public Collection<String> getList() throws Exception
+	{
+		acquireReadLock();
+		try
+		{
+			if (getData().getKits() == null)
+			{
+				return Collections.emptyList();
+			}
+			return new ArrayList<String>(getData().getKits().keySet());
+		}
+		finally
+		{
+			unlock();
+		}
+	}
+
+	@Override
+	public boolean isEmpty()
+	{
+		return getData().getKits().isEmpty();
+	}
+}
@@ -1,53 +1,48 @@
 package com.earth2me.essentials;

 import static com.earth2me.essentials.I18n._;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Location;
 import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.entity.EntityType;
+import org.bukkit.entity.CreatureType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;


-// Suffixes can be appended on the end of a mob name to make it plural
-// Entities without a suffix, will default to 's'
 public enum Mob
 {
-	CHICKEN("Chicken", Enemies.FRIENDLY, EntityType.CHICKEN),
-	COW("Cow", Enemies.FRIENDLY, EntityType.COW),
-	CREEPER("Creeper", Enemies.ENEMY, EntityType.CREEPER),
-	GHAST("Ghast", Enemies.ENEMY, EntityType.GHAST),
-	GIANT("Giant", Enemies.ENEMY, EntityType.GIANT),
-	PIG("Pig", Enemies.FRIENDLY, EntityType.PIG),
-	PIGZOMB("PigZombie", Enemies.NEUTRAL, EntityType.PIG_ZOMBIE),
-	SHEEP("Sheep", Enemies.FRIENDLY, "", EntityType.SHEEP),
-	SKELETON("Skeleton", Enemies.ENEMY, EntityType.SKELETON),
-	SLIME("Slime", Enemies.ENEMY, EntityType.SLIME),
-	SPIDER("Spider", Enemies.ENEMY, EntityType.SPIDER),
-	SQUID("Squid", Enemies.FRIENDLY, EntityType.SQUID),
-	ZOMBIE("Zombie", Enemies.ENEMY, EntityType.ZOMBIE),
-	WOLF("Wolf", Enemies.NEUTRAL, EntityType.WOLF),
-	CAVESPIDER("CaveSpider", Enemies.ENEMY, EntityType.CAVE_SPIDER),
-	ENDERMAN("Enderman", Enemies.ENEMY, "", EntityType.ENDERMAN),
-	SILVERFISH("Silverfish", Enemies.ENEMY, "", EntityType.SILVERFISH),
-	ENDERDRAGON("EnderDragon", Enemies.ENEMY, EntityType.ENDER_DRAGON),
-	VILLAGER("Villager", Enemies.FRIENDLY, EntityType.VILLAGER),
-	BLAZE("Blaze", Enemies.ENEMY, EntityType.BLAZE),
-	MUSHROOMCOW("MushroomCow", Enemies.FRIENDLY, EntityType.MUSHROOM_COW),
-	MAGMACUBE("MagmaCube", Enemies.ENEMY, EntityType.MAGMA_CUBE),
-	SNOWMAN("Snowman", Enemies.FRIENDLY, "", EntityType.SNOWMAN),
-	OCELOT("Ocelot", Enemies.NEUTRAL, EntityType.OCELOT),
-	IRONGOLEM("IronGolem", Enemies.NEUTRAL, EntityType.IRON_GOLEM),
-	WITHER("Wither", Enemies.ENEMY, EntityType.WITHER),
-	BAT("Bat", Enemies.FRIENDLY, EntityType.BAT),
-	WITCH("Witch", Enemies.ENEMY, EntityType.WITCH);
+	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),
+	WOLF("Wolf", Enemies.NEUTRAL, CreatureType.WOLF),
+	CAVESPIDER("CaveSpider", Enemies.ENEMY, CreatureType.CAVE_SPIDER),
+	ENDERMAN("Enderman", Enemies.ENEMY, "", CreatureType.ENDERMAN),
+	SILVERFISH("Silverfish", Enemies.ENEMY, "", CreatureType.SILVERFISH),
+	ENDERDRAGON("EnderDragon", Enemies.ENEMY, CreatureType.ENDER_DRAGON),
+	VILLAGER("Villager", Enemies.FRIENDLY, CreatureType.VILLAGER),
+	BLAZE("Blaze", Enemies.ENEMY, CreatureType.BLAZE),
+	MUSHROOMCOW("MushroomCow", Enemies.FRIENDLY, CreatureType.MUSHROOM_COW),
+	MAGMACUBE("MagmaCube", Enemies.ENEMY, CreatureType.MAGMA_CUBE),
+	SNOWMAN("Snowman", Enemies.FRIENDLY, "", CreatureType.SNOWMAN);
 	
 	public static final Logger logger = Logger.getLogger("Minecraft");

-	private Mob(String n, Enemies en, String s, EntityType type)
+	private Mob(String n, Enemies en, String s, CreatureType type)
 	{
 		this.suffix = s;
 		this.name = n;
@@ -55,7 +50,7 @@ public enum Mob
 		this.bukkitType = type;
 	}

-	private Mob(String n, Enemies en, EntityType type)
+	private Mob(String n, Enemies en, CreatureType type)
 	{
 		this.name = n;
 		this.type = en;
@@ -64,7 +59,7 @@ public enum Mob
 	public String suffix = "s";
 	final public String name;
 	final public Enemies type;
-	final private EntityType bukkitType;
+	final private CreatureType bukkitType;
 	private static final Map<String, Mob> hashMap = new HashMap<String, Mob>();

 	static
@@ -74,19 +69,14 @@ public enum Mob
 			hashMap.put(mob.name.toLowerCase(Locale.ENGLISH), mob);
 		}
 	}
-
+	
 	public static Set<String> getMobList() {
-		return Collections.unmodifiableSet(hashMap.keySet());
+		return hashMap.keySet();
 	}

 	public LivingEntity spawn(final Player player, final Server server, final Location loc) throws MobException
 	{
-		return spawn(player.getWorld(), server, loc);
-	}
-	
-	public LivingEntity spawn(final World world, final Server server, final Location loc) throws MobException
-	{
-		final LivingEntity entity = world.spawn(loc, (Class<? extends LivingEntity>)this.bukkitType.getEntityClass());
+		final LivingEntity entity = player.getWorld().spawn(loc, (Class<? extends LivingEntity>)this.bukkitType.getEntityClass());
 		if (entity == null)
 		{
 			logger.log(Level.WARNING, _("unableToSpawnMob"));
@@ -109,7 +99,7 @@ public enum Mob
 		final protected String type;
 	}

-	public EntityType getType()
+	public CreatureType getType()
 	{
 		return bukkitType;
 	}
@@ -1,38 +0,0 @@
-package com.earth2me.essentials;
-
-import lombok.Delegate;
-import org.bukkit.command.CommandSender;
-import org.bukkit.configuration.serialization.ConfigurationSerializable;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.Permissible;
-import org.bukkit.permissions.ServerOperator;
-
-
-public class PlayerExtension implements Player
-{
-	@Delegate(types =
-	{
-		Player.class, Entity.class, CommandSender.class, ServerOperator.class,
-		HumanEntity.class, ConfigurationSerializable.class, LivingEntity.class,
-		Permissible.class
-	})
-	protected Player base;
-
-	public PlayerExtension(final Player base)
-	{
-		this.base = base;
-	}
-
-	public final Player getBase()
-	{
-		return base;
-	}
-
-	public final Player setBase(final Player base)
-	{
-		return this.base = base;
-	}
-}
@@ -1,985 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.commands.IEssentialsCommand;
-import com.earth2me.essentials.signs.EssentialsSign;
-import com.earth2me.essentials.signs.Signs;
-import com.earth2me.essentials.textreader.IText;
-import com.earth2me.essentials.textreader.SimpleTextInput;
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.ChatColor;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.MemoryConfiguration;
-import org.bukkit.event.EventPriority;
-import org.bukkit.inventory.ItemStack;
-
-
-public class Settings implements ISettings
-{
-	private final transient EssentialsConf config;
-	private final static Logger logger = Logger.getLogger("Minecraft");
-	private final transient IEssentials ess;
-	private boolean metricsEnabled = true;
-
-	public Settings(IEssentials ess)
-	{
-		this.ess = ess;
-		config = new EssentialsConf(new File(ess.getDataFolder(), "config.yml"));
-		config.setTemplateName("/config.yml");
-		reloadConfig();
-	}
-
-	@Override
-	public boolean getRespawnAtHome()
-	{
-		return config.getBoolean("respawn-at-home", false);
-	}
-
-	@Override
-	public boolean getUpdateBedAtDaytime()
-	{
-		return config.getBoolean("update-bed-at-daytime", true);
-	}
-
-	@Override
-	public Set<String> getMultipleHomes()
-	{
-		return config.getConfigurationSection("sethome-multiple").getKeys(false);
-	}
-
-	@Override
-	public int getHomeLimit(final User user)
-	{
-		int limit = 1;
-		if (user.isAuthorized("essentials.sethome.multiple"))
-		{
-			limit = getHomeLimit("default");
-		}
-
-		final Set<String> homeList = getMultipleHomes();
-		if (homeList != null)
-		{
-			for (String set : homeList)
-			{
-				if (user.isAuthorized("essentials.sethome.multiple." + set) && (limit < getHomeLimit(set)))
-				{
-					limit = getHomeLimit(set);
-				}
-			}
-		}
-		return limit;
-	}
-
-	@Override
-	public int getHomeLimit(final String set)
-	{
-		return config.getInt("sethome-multiple." + set, config.getInt("sethome-multiple.default", 3));
-	}
-	private int chatRadius = 0;
-
-	private int _getChatRadius()
-	{
-		return config.getInt("chat.radius", config.getInt("chat-radius", 0));
-	}
-
-	@Override
-	public int getChatRadius()
-	{
-		return chatRadius;
-	}
-
-	@Override
-	public double getTeleportDelay()
-	{
-		return config.getDouble("teleport-delay", 0);
-	}
-
-	@Override
-	public int getOversizedStackSize()
-	{
-		return config.getInt("oversized-stacksize", 64);
-	}
-
-	@Override
-	public int getDefaultStackSize()
-	{
-		return config.getInt("default-stack-size", -1);
-	}
-
-	@Override
-	public int getStartingBalance()
-	{
-		return config.getInt("starting-balance", 0);
-	}
-
-	@Override
-	public boolean isCommandDisabled(final IEssentialsCommand cmd)
-	{
-		return isCommandDisabled(cmd.getName());
-	}
-	private Set<String> disabledCommands = new HashSet<String>();
-
-	@Override
-	public boolean isCommandDisabled(String label)
-	{
-		return disabledCommands.contains(label);
-	}
-
-	private Set<String> getDisabledCommands()
-	{
-		Set<String> disCommands = new HashSet<String>();
-		for (String c : config.getStringList("disabled-commands"))
-		{
-			disCommands.add(c.toLowerCase(Locale.ENGLISH));
-		}
-		for (String c : config.getKeys(false))
-		{
-			if (c.startsWith("disable-"))
-			{
-				disCommands.add(c.substring(8).toLowerCase(Locale.ENGLISH));
-			}
-		}
-		return disCommands;
-	}
-
-	@Override
-	public boolean isPlayerCommand(String label)
-	{
-		for (String c : config.getStringList("player-commands"))
-		{
-			if (!c.equalsIgnoreCase(label))
-			{
-				continue;
-			}
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isCommandOverridden(String name)
-	{
-		for (String c : config.getStringList("overridden-commands"))
-		{
-			if (!c.equalsIgnoreCase(name))
-			{
-				continue;
-			}
-			return true;
-		}
-		return config.getBoolean("override-" + name.toLowerCase(Locale.ENGLISH), false);
-	}
-	private ConfigurationSection commandCosts;
-
-	@Override
-	public double getCommandCost(IEssentialsCommand cmd)
-	{
-		return getCommandCost(cmd.getName());
-	}
-
-	public ConfigurationSection _getCommandCosts()
-	{
-		if (config.isConfigurationSection("command-costs"))
-		{
-			final ConfigurationSection section = config.getConfigurationSection("command-costs");
-			final ConfigurationSection newSection = new MemoryConfiguration();
-			for (String command : section.getKeys(false))
-			{
-				PluginCommand cmd = ess.getServer().getPluginCommand(command);
-				if (command.charAt(0) == '/')
-				{
-					ess.getLogger().warning("Invalid command cost. '" + command + "' should not start with '/'.");
-				}
-				if (section.isDouble(command))
-				{
-					newSection.set(command.toLowerCase(Locale.ENGLISH), section.getDouble(command));
-				}
-				else if (section.isInt(command))
-				{
-					newSection.set(command.toLowerCase(Locale.ENGLISH), (double)section.getInt(command));
-				}
-				else if (section.isString(command))
-				{
-					String costString = section.getString(command);
-					try
-					{
-						double cost = Double.parseDouble(costString.trim().replace(getCurrencySymbol(), "").replaceAll("\\W", ""));
-						newSection.set(command.toLowerCase(Locale.ENGLISH), cost);
-					}
-					catch (NumberFormatException ex)
-					{
-						ess.getLogger().warning("Invalid command cost for: " + command + " (" + costString + ")");
-					}
-
-				}
-				else
-				{
-					ess.getLogger().warning("Invalid command cost for: " + command);
-				}
-			}
-			return newSection;
-		}
-		return null;
-	}
-
-	@Override
-	public double getCommandCost(String name)
-	{
-		name = name.replace('.', '_').replace('/', '_');
-		if (commandCosts != null)
-		{
-			return commandCosts.getDouble(name, 0.0);
-		}
-		return 0.0;
-	}
-	private String nicknamePrefix = "~";
-
-	private String _getNicknamePrefix()
-	{
-		return config.getString("nickname-prefix", "~");
-	}
-
-	@Override
-	public String getNicknamePrefix()
-	{
-		return nicknamePrefix;
-	}
-
-	@Override
-	public double getTeleportCooldown()
-	{
-		return config.getDouble("teleport-cooldown", 0);
-	}
-
-	@Override
-	public double getHealCooldown()
-	{
-		return config.getDouble("heal-cooldown", 0);
-	}
-	private ConfigurationSection kits;
-
-	public ConfigurationSection _getKits()
-	{
-		if (config.isConfigurationSection("kits"))
-		{
-			final ConfigurationSection section = config.getConfigurationSection("kits");
-			final ConfigurationSection newSection = new MemoryConfiguration();
-			for (String kitItem : section.getKeys(false))
-			{
-				if (section.isConfigurationSection(kitItem))
-				{
-					newSection.set(kitItem.toLowerCase(Locale.ENGLISH), section.getConfigurationSection(kitItem));
-				}
-			}
-			return newSection;
-		}
-		return null;
-	}
-
-	@Override
-	public ConfigurationSection getKits()
-	{
-		return kits;
-	}
-
-	@Override
-	public Map<String, Object> getKit(String name)
-	{
-		name = name.replace('.', '_').replace('/', '_');
-		if (getKits() != null)
-		{
-			final ConfigurationSection kits = getKits();
-			if (kits.isConfigurationSection(name))
-			{
-				return kits.getConfigurationSection(name).getValues(true);
-			}
-		}
-		return null;
-	}
-	private ChatColor operatorColor = null;
-
-	@Override
-	public ChatColor getOperatorColor()
-	{
-		return operatorColor;
-	}
-
-	private ChatColor _getOperatorColor()
-	{
-		String colorName = config.getString("ops-name-color", null);
-
-		if (colorName == null)
-		{
-			return ChatColor.DARK_RED;
-		}
-		if ("none".equalsIgnoreCase(colorName) || colorName.isEmpty())
-		{
-			return null;
-		}
-
-		try
-		{
-			return ChatColor.valueOf(colorName.toUpperCase(Locale.ENGLISH));
-		}
-		catch (IllegalArgumentException ex)
-		{
-		}
-
-		return ChatColor.getByChar(colorName);
-	}
-
-	@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 !signsEnabled;
-	}
-
-	@Override
-	public long getBackupInterval()
-	{
-		return config.getInt("backup.interval", 1440); // 1440 = 24 * 60
-	}
-
-	@Override
-	public String getBackupCommand()
-	{
-		return config.getString("backup.command", null);
-	}
-	private Map<String, MessageFormat> chatFormats = Collections.synchronizedMap(new HashMap<String, MessageFormat>());
-
-	@Override
-	public MessageFormat getChatFormat(String group)
-	{
-		MessageFormat mFormat = chatFormats.get(group);
-		if (mFormat == null)
-		{
-			String format = config.getString("chat.group-formats." + (group == null ? "Default" : group),
-											 config.getString("chat.format", "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}"));
-			format = Util.replaceFormat(format);
-			format = format.replace("{DISPLAYNAME}", "%1$s");
-			format = format.replace("{GROUP}", "{0}");
-			format = format.replace("{MESSAGE}", "%2$s");
-			format = format.replace("{WORLDNAME}", "{1}");
-			format = format.replace("{SHORTWORLDNAME}", "{2}");
-			format = format.replaceAll("\\{(\\D*?)\\}", "\\[$1\\]");
-			format = "§r".concat(format);
-			mFormat = new MessageFormat(format);
-			chatFormats.put(group, mFormat);
-		}
-		return mFormat;
-	}
-
-	@Override
-	public boolean getAnnounceNewPlayers()
-	{
-		return !config.getString("newbies.announce-format", "-").isEmpty();
-	}
-
-	@Override
-	public IText getAnnounceNewPlayerFormat()
-	{
-		return new SimpleTextInput(Util.replaceFormat(config.getString("newbies.announce-format", "&dWelcome {DISPLAYNAME} to the server!")));
-	}
-
-	@Override
-	public String getNewPlayerKit()
-	{
-		return config.getString("newbies.kit", "");
-	}
-
-	@Override
-	public String getNewbieSpawn()
-	{
-		return config.getString("newbies.spawnpoint", "default");
-	}
-
-	@Override
-	public boolean getPerWarpPermission()
-	{
-		return config.getBoolean("per-warp-permission", false);
-	}
-
-	@Override
-	public boolean getSortListByGroups()
-	{
-		return config.getBoolean("sort-list-by-groups", true);
-	}
-
-	@Override
-	public void reloadConfig()
-	{
-		config.load();
-		noGodWorlds = new HashSet<String>(config.getStringList("no-god-in-worlds"));
-		enabledSigns = _getEnabledSigns();
-		teleportInvulnerability = _isTeleportInvulnerability();
-		disableItemPickupWhileAfk = _getDisableItemPickupWhileAfk();
-		registerBackInListener = _registerBackInListener();
-		cancelAfkOnMove = _cancelAfkOnMove();
-		getFreezeAfkPlayers = _getFreezeAfkPlayers();
-		itemSpawnBl = _getItemSpawnBlacklist();
-		loginAttackDelay = _getLoginAttackDelay();
-		signUsePerSecond = _getSignUsePerSecond();
-		kits = _getKits();
-		chatFormats.clear();
-		changeDisplayName = _changeDisplayName();
-		disabledCommands = getDisabledCommands();
-		nicknamePrefix = _getNicknamePrefix();
-		operatorColor = _getOperatorColor();
-		changePlayerListName = _changePlayerListName();
-		configDebug = _isDebug();
-		prefixsuffixconfigured = _isPrefixSuffixConfigured();
-		addprefixsuffix = _addPrefixSuffix();
-		disablePrefix = _disablePrefix();
-		disableSuffix = _disableSuffix();
-		chatRadius = _getChatRadius();
-		commandCosts = _getCommandCosts();
-		warnOnBuildDisallow = _warnOnBuildDisallow();
-		mailsPerMinute = _getMailsPerMinute();
-	}
-	private List<Integer> itemSpawnBl = new ArrayList<Integer>();
-
-	@Override
-	public List<Integer> itemSpawnBlacklist()
-	{
-		return itemSpawnBl;
-	}
-
-	private List<Integer> _getItemSpawnBlacklist()
-	{
-		final List<Integer> epItemSpwn = new ArrayList<Integer>();
-		if (ess.getItemDb() == null)
-		{
-			logger.log(Level.FINE, "Aborting ItemSpawnBL read, itemDB not yet loaded.");
-			return epItemSpwn;
-		}
-		for (String itemName : config.getString("item-spawn-blacklist", "").split(","))
-		{
-			itemName = itemName.trim();
-			if (itemName.isEmpty())
-			{
-				continue;
-			}
-			try
-			{
-				final ItemStack iStack = ess.getItemDb().get(itemName);
-				epItemSpwn.add(iStack.getTypeId());
-			}
-			catch (Exception ex)
-			{
-				logger.log(Level.SEVERE, _("unknownItemInList", itemName, "item-spawn-blacklist"));
-			}
-		}
-		return epItemSpwn;
-	}
-	private List<EssentialsSign> enabledSigns = new ArrayList<EssentialsSign>();
-	private boolean signsEnabled = false;
-
-	@Override
-	public List<EssentialsSign> enabledSigns()
-	{
-		return enabledSigns;
-	}
-
-	private List<EssentialsSign> _getEnabledSigns()
-	{
-		List<EssentialsSign> newSigns = new ArrayList<EssentialsSign>();
-
-		for (String signName : config.getStringList("enabledSigns"))
-		{
-			signName = signName.trim().toUpperCase(Locale.ENGLISH);
-			if (signName.isEmpty())
-			{
-				continue;
-			}
-			if (signName.equals("COLOR") || signName.equals("COLOUR"))
-			{
-				signsEnabled = true;
-				continue;
-			}
-			try
-			{
-				newSigns.add(Signs.valueOf(signName).getSign());
-			}
-			catch (Exception ex)
-			{
-				logger.log(Level.SEVERE, _("unknownItemInList", signName, "enabledSigns"));
-				continue;
-			}
-			signsEnabled = true;
-		}
-		return newSigns;
-	}
-	private boolean warnOnBuildDisallow;
-
-	private boolean _warnOnBuildDisallow()
-	{
-		return config.getBoolean("protect.disable.warn-on-build-disallow", false);
-	}
-
-	@Override
-	public boolean warnOnBuildDisallow()
-	{
-		return warnOnBuildDisallow;
-	}
-	private boolean debug = false;
-	private boolean configDebug = false;
-
-	private boolean _isDebug()
-	{
-		return config.getBoolean("debug", false);
-	}
-
-	@Override
-	public boolean isDebug()
-	{
-		return debug || configDebug;
-	}
-
-	@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", "");
-	}
-
-	//This method should always only return one character due to the implementation of the calling methods
-	//If you need to use a string currency, for example "coins", use the translation key 'currency'.
-	@Override
-	public String getCurrencySymbol()
-	{
-		return config.getString("currency-symbol", "$").concat("$").substring(0, 1).replaceAll("[0-9]", "$");
-	}
-
-	@Override
-	public boolean isTradeInStacks(int id)
-	{
-		return config.getBoolean("trade-in-stacks-" + id, false);
-	}
-
-	@Override
-	public boolean isEcoDisabled()
-	{
-		return config.getBoolean("disable-eco", false);
-	}
-
-	@Override
-	public boolean getProtectPreventSpawn(final String creatureName)
-	{
-		return config.getBoolean("protect.prevent.spawn." + creatureName, false);
-	}
-
-	@Override
-	public List<Integer> getProtectList(final String configName)
-	{
-		final List<Integer> list = new ArrayList<Integer>();
-		for (String itemName : config.getString(configName, "").split(","))
-		{
-			itemName = itemName.trim();
-			if (itemName.isEmpty())
-			{
-				continue;
-			}
-			ItemStack itemStack;
-			try
-			{
-				itemStack = ess.getItemDb().get(itemName);
-				list.add(itemStack.getTypeId());
-			}
-			catch (Exception ex)
-			{
-				logger.log(Level.SEVERE, _("unknownItemInList", itemName, configName));
-			}
-		}
-		return list;
-	}
-
-	@Override
-	public String getProtectString(final String configName)
-	{
-		return config.getString(configName, null);
-	}
-
-	@Override
-	public boolean getProtectBoolean(final String configName, boolean def)
-	{
-		return config.getBoolean(configName, def);
-	}
-	private final static double MAXMONEY = 10000000000000.0;
-
-	@Override
-	public double getMaxMoney()
-	{
-		double max = config.getDouble("max-money", MAXMONEY);
-		if (Math.abs(max) > MAXMONEY)
-		{
-			max = max < 0 ? -MAXMONEY : MAXMONEY;
-		}
-		return max;
-	}
-	private final static double MINMONEY = -10000000000000.0;
-
-	@Override
-	public double getMinMoney()
-	{
-		double min = config.getDouble("min-money", MINMONEY);
-		if (min > 0)
-		{
-			min = -min;
-		}
-		if (min < MINMONEY)
-		{
-			min = MINMONEY;
-		}
-		return min;
-	}
-
-	@Override
-	public boolean isEcoLogEnabled()
-	{
-		return config.getBoolean("economy-log-enabled", false);
-	}
-
-	@Override
-	public boolean isEcoLogUpdateEnabled()
-	{
-		return config.getBoolean("economy-log-update-enabled", false);
-	}
-
-	@Override
-	public boolean removeGodOnDisconnect()
-	{
-		return config.getBoolean("remove-god-on-disconnect", false);
-	}
-	private boolean changeDisplayName = true;
-
-	private boolean _changeDisplayName()
-	{
-		return config.getBoolean("change-displayname", true);
-	}
-
-	@Override
-	public boolean changeDisplayName()
-	{
-		return changeDisplayName;
-	}
-	private boolean changePlayerListName = false;
-
-	private boolean _changePlayerListName()
-	{
-		return config.getBoolean("change-playerlist", false);
-	}
-
-	@Override
-	public boolean changePlayerListName()
-	{
-		return changePlayerListName;
-	}
-
-	@Override
-	public boolean useBukkitPermissions()
-	{
-		return config.getBoolean("use-bukkit-permissions", false);
-	}
-	private boolean prefixsuffixconfigured = false;
-	private boolean addprefixsuffix = false;
-	private boolean essentialsChatActive = false;
-
-	private boolean _addPrefixSuffix()
-	{
-		return config.getBoolean("add-prefix-suffix", false);
-	}
-
-	private boolean _isPrefixSuffixConfigured()
-	{
-		return config.hasProperty("add-prefix-suffix");
-	}
-
-	@Override
-	public void setEssentialsChatActive(boolean essentialsChatActive)
-	{
-		this.essentialsChatActive = essentialsChatActive;
-	}
-
-	@Override
-	public boolean addPrefixSuffix()
-	{
-		return prefixsuffixconfigured ? addprefixsuffix : essentialsChatActive;
-	}
-	private boolean disablePrefix = false;
-
-	private boolean _disablePrefix()
-	{
-		return config.getBoolean("disablePrefix", false);
-	}
-
-	@Override
-	public boolean disablePrefix()
-	{
-		return disablePrefix;
-	}
-	private boolean disableSuffix = false;
-
-	private boolean _disableSuffix()
-	{
-		return config.getBoolean("disableSuffix", false);
-	}
-
-	@Override
-	public boolean disableSuffix()
-	{
-		return disableSuffix;
-	}
-
-	@Override
-	public long getAutoAfk()
-	{
-		return config.getLong("auto-afk", 300);
-	}
-
-	@Override
-	public long getAutoAfkKick()
-	{
-		return config.getLong("auto-afk-kick", -1);
-	}
-	private boolean getFreezeAfkPlayers;
-
-	@Override
-	public boolean getFreezeAfkPlayers()
-	{
-		return getFreezeAfkPlayers;
-	}
-
-	private boolean _getFreezeAfkPlayers()
-	{
-		return config.getBoolean("freeze-afk-players", false);
-	}
-	private boolean cancelAfkOnMove;
-
-	@Override
-	public boolean cancelAfkOnMove()
-	{
-		return cancelAfkOnMove;
-	}
-
-	private boolean _cancelAfkOnMove()
-	{
-		return config.getBoolean("cancel-afk-on-move", true);
-	}
-
-	@Override
-	public boolean areDeathMessagesEnabled()
-	{
-		return config.getBoolean("death-messages", true);
-	}
-	private Set<String> noGodWorlds = new HashSet<String>();
-
-	@Override
-	public Set<String> getNoGodWorlds()
-	{
-		return noGodWorlds;
-	}
-
-	@Override
-	public void setDebug(final boolean debug)
-	{
-		this.debug = debug;
-	}
-
-	@Override
-	public boolean getRepairEnchanted()
-	{
-		return config.getBoolean("repair-enchanted", true);
-	}
-
-	@Override
-	public boolean isWorldTeleportPermissions()
-	{
-		return config.getBoolean("world-teleport-permissions", false);
-	}
-
-	@Override
-	public boolean isWorldHomePermissions()
-	{
-		return config.getBoolean("world-home-permissions", false);
-	}
-	private boolean registerBackInListener;
-
-	@Override
-	public boolean registerBackInListener()
-	{
-		return registerBackInListener;
-	}
-
-	private boolean _registerBackInListener()
-	{
-		return config.getBoolean("register-back-in-listener", false);
-	}
-	private boolean disableItemPickupWhileAfk;
-
-	@Override
-	public boolean getDisableItemPickupWhileAfk()
-	{
-		return disableItemPickupWhileAfk;
-	}
-
-	private boolean _getDisableItemPickupWhileAfk()
-	{
-		return config.getBoolean("disable-item-pickup-while-afk", false);
-	}
-
-	@Override
-	public EventPriority getRespawnPriority()
-	{
-		String priority = config.getString("respawn-listener-priority", "normal").toLowerCase(Locale.ENGLISH);
-		if ("lowest".equals(priority))
-		{
-			return EventPriority.LOWEST;
-		}
-		if ("low".equals(priority))
-		{
-			return EventPriority.LOW;
-		}
-		if ("normal".equals(priority))
-		{
-			return EventPriority.NORMAL;
-		}
-		if ("high".equals(priority))
-		{
-			return EventPriority.HIGH;
-		}
-		if ("highest".equals(priority))
-		{
-			return EventPriority.HIGHEST;
-		}
-		return EventPriority.NORMAL;
-	}
-
-	@Override
-	public long getTpaAcceptCancellation()
-	{
-		return config.getLong("tpa-accept-cancellation", 0);
-	}
-
-	@Override
-	public boolean isMetricsEnabled()
-	{
-		return metricsEnabled;
-	}
-
-	@Override
-	public void setMetricsEnabled(boolean metricsEnabled)
-	{
-		this.metricsEnabled = metricsEnabled;
-	}
-	private boolean teleportInvulnerability;
-
-	@Override
-	public long getTeleportInvulnerability()
-	{
-		return config.getLong("teleport-invulnerability", 0) * 1000;
-	}
-
-	private boolean _isTeleportInvulnerability()
-	{
-		return (config.getLong("teleport-invulnerability", 0) > 0);
-	}
-
-	@Override
-	public boolean isTeleportInvulnerability()
-	{
-		return teleportInvulnerability;
-	}
-	private long loginAttackDelay;
-
-	private long _getLoginAttackDelay()
-	{
-		return config.getLong("login-attack-delay", 0) * 1000;
-	}
-
-	@Override
-	public long getLoginAttackDelay()
-	{
-		return loginAttackDelay;
-	}
-	private int signUsePerSecond;
-
-	private int _getSignUsePerSecond()
-	{
-		final int perSec = config.getInt("sign-use-per-second", 4);
-		return perSec > 0 ? perSec : 1;
-	}
-
-	@Override
-	public int getSignUsePerSecond()
-	{
-		return signUsePerSecond;
-	}
-
-	@Override
-	public double getMaxFlySpeed()
-	{
-		double maxSpeed = config.getDouble("max-fly-speed", 1.0);
-		return maxSpeed > 1.0 ? 1.0 : Math.abs(maxSpeed);
-	}
-
-	//This option does not exist in the config.yml because it wasn't yet implemented in bukkit
-	//The code was commented out in the /speed command
-	@Override
-	public double getMaxWalkSpeed()
-	{
-		double maxSpeed = config.getDouble("max-walk-speed", 0.8);
-		return maxSpeed > 1.0 ? 1.0 : Math.abs(maxSpeed);
-	}
-	private int mailsPerMinute;
-
-	private int _getMailsPerMinute()
-	{
-		return config.getInt("mails-per-minute", 1000);
-	}
-
-	@Override
-	public int getMailsPerMinute()
-	{
-		return mailsPerMinute;
-	}
-}
@@ -1,287 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Mob.MobException;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Random;
-import java.util.Set;
-import org.bukkit.DyeColor;
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.block.Block;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.*;
-import org.bukkit.entity.Skeleton.SkeletonType;
-import org.bukkit.material.Colorable;
-
-
-public class SpawnMob
-{
-	public static String mobList(final User user)
-	{
-		final Set<String> mobList = Mob.getMobList();
-		final Set<String> availableList = new HashSet<String>();
-		for (String mob : mobList)
-		{
-			if (user.isAuthorized("essentials.spawnmob." + mob.toLowerCase()))
-			{
-				availableList.add(mob);
-			}
-		}
-		if (availableList.isEmpty())
-		{
-			availableList.add(_("none"));
-		}
-		return Util.joinList(availableList);
-	}
-
-	public static String[] mobData(final String mobString)
-	{
-		String[] returnString = new String[4];
-
-		final String[] parts = mobString.split(",");
-		String[] mobParts = parts[0].split(":");
-
-		returnString[0] = mobParts[0];
-		if (mobParts.length == 2)
-		{
-			returnString[1] = mobParts[1];
-		}
-
-		if (parts.length > 1)
-		{
-			String[] mountParts = parts[1].split(":");
-			returnString[2] = mountParts[0];
-			if (mountParts.length == 2)
-			{
-				returnString[3] = mountParts[1];
-			}
-		}
-
-		return returnString;
-	}
-
-	// This method spawns a mob where the user is looking, owned by user
-	public static void spawnmob(final IEssentials ess, final Server server, final User user, final String[] Data, int mobCount) throws Exception
-	{
-		final Block block = Util.getTarget(user).getBlock();
-		if (block == null)
-		{
-			throw new Exception(_("unableToSpawnMob"));
-		}
-		spawnmob(ess, server, user, user, block.getLocation(), Data, mobCount);
-	}
-
-	// This method spawns a mob at loc, owned by noone
-	public static void spawnmob(final IEssentials ess, final Server server, final CommandSender sender, final Location loc, final String[] Data, int mobCount) throws Exception
-	{
-		spawnmob(ess, server, sender, null, loc, Data, mobCount);
-	}
-
-	// This method spawns a mob at target, owned by target
-	public static void spawnmob(final IEssentials ess, final Server server, final CommandSender sender, final User target, final String[] Data, int mobCount) throws Exception
-	{
-		spawnmob(ess, server, sender, target, target.getLocation(), Data, mobCount);
-	}
-
-	// This method spawns a mob at loc, owned by target
-	public static void spawnmob(final IEssentials ess, final Server server, final CommandSender sender, final User target, final Location loc, final String[] Data, int mobCount) throws Exception
-	{
-		final Location sloc = Util.getSafeDestination(loc);
-		final String mobType = Data[0];
-		final String mobData = Data[1];
-		final String mountType = Data[2];
-		final String mountData = Data[3];
-
-		Mob mob = Mob.fromName(mobType);
-		Mob mobMount = null;
-
-		checkSpawnable(ess, sender, mob);
-
-		if (mountType != null)
-		{
-			mobMount = Mob.fromName(mountType);
-			checkSpawnable(ess, sender, mobMount);
-		}
-
-		int serverLimit = ess.getSettings().getSpawnMobLimit();
-		if (mobCount > serverLimit)
-		{
-			mobCount = serverLimit;
-			sender.sendMessage(_("mobSpawnLimit"));
-		}
-
-		try
-		{
-			for (int i = 0; i < mobCount; i++)
-			{
-				spawnMob(ess, server, sender, target, sloc, mob, mobData, mobMount, mountData);
-			}
-			sender.sendMessage(mobCount + " " + mob.name.toLowerCase(Locale.ENGLISH) + mob.suffix + " " + _("spawned"));
-		}
-		catch (MobException e1)
-		{
-			throw new Exception(_("unableToSpawnMob"), e1);
-		}
-		catch (NumberFormatException e2)
-		{
-			throw new Exception(_("numberRequired"), e2);
-		}
-		catch (NullPointerException np)
-		{
-			throw new Exception(_("soloMob"), np);
-		}
-	}
-
-	private static void spawnMob(final IEssentials ess, final Server server, final CommandSender sender, final User target, final Location sloc, Mob mob, String mobData, Mob mobMount, String mountData) throws Exception
-	{
-		Entity spawnedMob = mob.spawn(sloc.getWorld(), server, sloc);
-		Entity spawnedMount = null;
-
-		if (mobMount != null)
-		{
-			spawnedMount = mobMount.spawn(sloc.getWorld(), server, sloc);
-			spawnedMob.setPassenger(spawnedMount);
-		}
-		if (mobData != null)
-		{
-			changeMobData(mob.getType(), spawnedMob, mobData, target);
-		}
-		if (spawnedMount != null && mountData != null)
-		{
-			changeMobData(mobMount.getType(), spawnedMount, mountData, target);
-		}
-	}
-
-	private static void checkSpawnable(IEssentials ess, CommandSender sender, Mob mob) throws Exception
-	{
-		if (mob == null)
-		{
-			throw new Exception(_("invalidMob"));
-		}
-
-		if (ess.getSettings().getProtectPreventSpawn(mob.getType().toString().toLowerCase(Locale.ENGLISH)))
-		{
-			throw new Exception(_("disabledToSpawnMob"));
-		}
-
-		if (sender instanceof User && !((User)sender).isAuthorized("essentials.spawnmob." + mob.name.toLowerCase()))
-		{
-			throw new Exception(_("noPermToSpawnMob"));
-		}
-	}
-
-	private static void changeMobData(final EntityType type, final Entity spawned, String data, final User target) throws Exception
-	{
-		data = data.toLowerCase(Locale.ENGLISH);
-
-		if (spawned instanceof Slime)
-		{
-			try
-			{
-				((Slime)spawned).setSize(Integer.parseInt(data));
-			}
-			catch (Exception e)
-			{
-				throw new Exception(_("slimeMalformedSize"), e);
-			}
-		}
-
-		if ((spawned instanceof Ageable) && data.contains("baby"))
-		{
-			((Ageable)spawned).setBaby();
-			data = data.replace("baby", "");
-		}
-
-		if (spawned instanceof Colorable)
-		{
-			final String color = data.toUpperCase(Locale.ENGLISH);
-			try
-			{
-				if (color.equals("RANDOM"))
-				{
-					final Random rand = new Random();
-					((Colorable)spawned).setColor(DyeColor.values()[rand.nextInt(DyeColor.values().length)]);
-				}
-				else if (color.length() > 1)
-				{
-					((Colorable)spawned).setColor(DyeColor.valueOf(color));
-				}
-			}
-			catch (Exception e)
-			{
-				throw new Exception(_("sheepMalformedColor"), e);
-			}
-		}
-
-		if (spawned instanceof Tameable && data.contains("tamed") && target != null)
-		{
-			final Tameable tameable = ((Tameable)spawned);
-			tameable.setTamed(true);
-			tameable.setOwner(target.getBase());
-			data = data.replace("tamed", "");
-		}
-
-		if (type == EntityType.WOLF)
-		{
-			if (data.contains("angry"))
-			{
-				((Wolf)spawned).setAngry(true);
-			}
-		}
-
-		if (type == EntityType.CREEPER && data.contains("powered"))
-		{
-			((Creeper)spawned).setPowered(true);
-		}
-
-		if (type == EntityType.OCELOT)
-		{
-			if (data.contains("siamese"))
-			{
-				((Ocelot)spawned).setCatType(Ocelot.Type.SIAMESE_CAT);
-			}
-			else if (data.contains("red"))
-			{
-				((Ocelot)spawned).setCatType(Ocelot.Type.RED_CAT);
-			}
-			else if (data.contains("black"))
-			{
-				((Ocelot)spawned).setCatType(Ocelot.Type.BLACK_CAT);
-			}
-		}
-
-		if (type == EntityType.VILLAGER)
-		{
-			for (Villager.Profession prof : Villager.Profession.values())
-			{
-				if (data.contains(prof.toString().toLowerCase(Locale.ENGLISH)))
-				{
-					((Villager)spawned).setProfession(prof);
-				}
-			}
-		}
-
-		if (spawned instanceof Zombie)
-		{
-			if (data.contains("villager"))
-			{
-				((Zombie)spawned).setVillager(true);
-			}
-			if (data.contains("baby"))
-			{
-				((Zombie)spawned).setBaby(true);
-			}
-		}
-
-		if (type == EntityType.SKELETON)
-		{
-			if (data.contains("wither"))
-			{
-				((Skeleton)spawned).setSkeletonType(SkeletonType.WITHER);
-			}
-		}
-
-	}
-}
@@ -1,61 +0,0 @@
-package com.earth2me.essentials;
-
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityExplodeEvent;
-
-
-public class TNTExplodeListener implements Listener, Runnable
-{
-	private final transient IEssentials ess;
-	private transient boolean enabled = false;
-	private transient int timer = -1;
-
-	public TNTExplodeListener(final IEssentials ess)
-	{
-		super();
-		this.ess = ess;
-	}
-
-	public void enable()
-	{
-		if (!enabled)
-		{
-			enabled = true;
-			timer = ess.scheduleSyncDelayedTask(this, 200);
-			return;
-		}
-		if (timer != -1)
-		{
-			ess.getScheduler().cancelTask(timer);
-			timer = ess.scheduleSyncDelayedTask(this, 200);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW)
-	public void onEntityExplode(final EntityExplodeEvent event)
-	{
-		if (!enabled)
-		{
-			return;
-		}
-		if (event.getEntity() instanceof LivingEntity)
-		{
-			return;
-		}
-		if (event.blockList().size() < 1)
-		{
-			return;
-		}
-		event.setCancelled(true);
-		event.getLocation().getWorld().createExplosion(event.getLocation(), 0F);
-	}
-
-	@Override
-	public void run()
-	{
-		enabled = false;
-	}
-}
@@ -1,13 +1,18 @@
 package com.earth2me.essentials;

 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.IEssentials;
 import com.earth2me.essentials.api.ITeleport;
-import com.earth2me.essentials.commands.NoChargeException;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.commands.NotEnoughArgumentsException;
+import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.user.CooldownException;
+import com.earth2me.essentials.user.UserData.TimestampType;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.logging.Logger;
 import org.bukkit.Location;
-import org.bukkit.Material;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -18,38 +23,36 @@ public class Teleport implements Runnable, ITeleport
 	private static final double MOVE_CONSTANT = 0.3;


-	private class Target
+	private static class Target
 	{
 		private final Location location;
-		private final String name;
+		private final Entity entity;

-		Target(Location location)
+		public Target(Location location)
 		{
 			this.location = location;
-			this.name = null;
+			this.entity = null;
 		}

-		Target(Player entity)
+		public Target(Entity entity)
 		{
-			this.name = entity.getName();
+			this.entity = entity;
 			this.location = null;
 		}

 		public Location getLocation()
 		{
-			if (this.name != null)
+			if (this.entity != null)
 			{
-
-				return ess.getServer().getPlayerExact(name).getLocation();
+				return this.entity.getLocation();
 			}
 			return location;
 		}
 	}
 	private IUser user;
-	private IUser teleportUser;
 	private int teleTimer = -1;
 	private long started;	// time this task was initiated
-	private long tpdelay;		// how long to delay the teleport
+	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)
@@ -58,30 +61,22 @@ public class Teleport implements Runnable, ITeleport
 	private long initY;
 	private long initZ;
 	private Target teleportTarget;
-	private boolean respawn;
 	private Trade chargeFor;
 	private final IEssentials ess;
 	private static final Logger logger = Logger.getLogger("Minecraft");
 	private TeleportCause cause;

 	private void initTimer(long delay, Target target, Trade chargeFor, TeleportCause cause)
-	{
-		initTimer(delay, user, target, chargeFor, cause, false);
-	}
-
-	private void initTimer(long delay, IUser teleportUser, Target target, Trade chargeFor, TeleportCause cause, boolean respawn)
 	{
 		this.started = System.currentTimeMillis();
-		this.tpdelay = delay;
-		this.health = teleportUser.getHealth();
-		this.initX = Math.round(teleportUser.getLocation().getX() * MOVE_CONSTANT);
-		this.initY = Math.round(teleportUser.getLocation().getY() * MOVE_CONSTANT);
-		this.initZ = Math.round(teleportUser.getLocation().getZ() * MOVE_CONSTANT);
-		this.teleportUser = teleportUser;
+		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;
 		this.cause = cause;
-		this.respawn = respawn;
 	}

 	@Override
@@ -90,42 +85,31 @@ public class Teleport implements Runnable, ITeleport

 		if (user == null || !user.isOnline() || user.getLocation() == null)
 		{
-			cancel(false);
+			cancel();
 			return;
 		}
-		if (teleportUser == null || !teleportUser.isOnline() || teleportUser.getLocation() == null)
-		{
-			cancel(false);
-			return;
-		}
-
-		if (!user.isAuthorized("essentials.teleport.timer.move")
-			&& (Math.round(teleportUser.getLocation().getX() * MOVE_CONSTANT) != initX
-				|| Math.round(teleportUser.getLocation().getY() * MOVE_CONSTANT) != initY
-				|| Math.round(teleportUser.getLocation().getZ() * MOVE_CONSTANT) != initZ
-				|| teleportUser.getHealth() < health))
-		{
-			// user moved, cancel teleport
+		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 = teleportUser.getHealth();  // in case user healed, then later gets injured
+
+		health = user.getHealth();  // in case user healed, then later gets injured
+
 		long now = System.currentTimeMillis();
-		if (now > started + tpdelay)
+		if (now > started + delay)
 		{
 			try
 			{
 				cooldown(false);
-				teleportUser.sendMessage(_("teleportationCommencing"));
+				user.sendMessage(_("teleportationCommencing"));
 				try
 				{
-					if (respawn) {
-						teleportUser.getTeleport().respawn(cause);
-					}
-					else {
-						teleportUser.getTeleport().now(teleportTarget, cause);
-					}
-					cancel(false);
+
+					now(teleportTarget, cause);
 					if (chargeFor != null)
 					{
 						chargeFor.charge(user);
@@ -133,16 +117,12 @@ public class Teleport implements Runnable, ITeleport
 				}
 				catch (Throwable ex)
 				{
-					ess.showError(user.getBase(), ex, "teleport");
+					ess.getCommandHandler().showCommandError(user.getBase(), "teleport", ex);
 				}
 			}
 			catch (Exception ex)
 			{
 				user.sendMessage(_("cooldownWithMessage", ex.getMessage()));
-				if (user != teleportUser)
-				{
-					teleportUser.sendMessage(_("cooldownWithMessage", ex.getMessage()));
-				}
 			}
 		}
 	}
@@ -153,45 +133,35 @@ public class Teleport implements Runnable, ITeleport
 		this.ess = ess;
 	}

+	public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		final Player player = user.getBase();
+		final Location bed = player.getBedSpawnLocation();
+		final PlayerRespawnEvent pre = new PlayerRespawnEvent(player, bed == null ? player.getWorld().getSpawnLocation() : bed, bed != null);
+		ess.getServer().getPluginManager().callEvent(pre);
+		teleport(new Target(pre.getRespawnLocation()), chargeFor, cause);
+	}
+
+	public void warp(String warp, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		final Location loc = ess.getWarps().getWarp(warp);
+		teleport(new Target(loc), chargeFor, cause);
+		user.sendMessage(_("warpingTo", warp));
+	}
+
 	public void cooldown(boolean check) throws Exception
 	{
-		final Calendar time = new GregorianCalendar();
-		if (user.getLastTeleportTimestamp() > 0)
+		try
 		{
-			// Take the current time, and remove the delay from it.
-			final double cooldown = ess.getSettings().getTeleportCooldown();
-			final Calendar earliestTime = new GregorianCalendar();
-			earliestTime.add(Calendar.SECOND, -(int)cooldown);
-			earliestTime.add(Calendar.MILLISECOND, -(int)((cooldown * 1000.0) % 1000.0));
-			// This value contains the most recent time a teleport could have been used that would allow another use.
-			final long earliestLong = earliestTime.getTimeInMillis();
-
-			// When was the last teleport used?
-			final Long lastTime = user.getLastTeleportTimestamp();
-
-			if (lastTime > time.getTimeInMillis())
-			{
-				// This is to make sure time didn't get messed up on last kit use.
-				// If this happens, let's give the user the benifit of the doubt.
-				user.setLastTeleportTimestamp(time.getTimeInMillis());
-				return;
-			}
-			else if (lastTime > earliestLong && !user.isAuthorized("essentials.teleport.cooldown.bypass"))
-			{
-				time.setTimeInMillis(lastTime);
-				time.add(Calendar.SECOND, (int)cooldown);
-				time.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
-				throw new Exception(_("timeBeforeTeleport", Util.formatDateDiff(time.getTimeInMillis())));
-			}
+			user.checkCooldown(TimestampType.LASTTELEPORT, ess.getGroups().getTeleportCooldown(user), !check, Permissions.TELEPORT_COOLDOWN_BYPASS);
 		}
-		// if justCheck is set, don't update lastTeleport; we're just checking
-		if (!check)
+		catch (CooldownException ex)
 		{
-			user.setLastTeleportTimestamp(time.getTimeInMillis());
+			throw new Exception(_("timeBeforeTeleport", ex.getMessage()));
+
 		}
 	}

-	//If we need to cancel a pending teleport call this method
 	public void cancel(boolean notifyUser)
 	{
 		if (teleTimer == -1)
@@ -204,10 +174,6 @@ public class Teleport implements Runnable, ITeleport
 			if (notifyUser)
 			{
 				user.sendMessage(_("pendingTeleportCancelled"));
-				if (teleportUser != user)
-				{
-					teleportUser.sendMessage(_("pendingTeleportCancelled"));
-				}
 			}
 		}
 		finally
@@ -216,38 +182,14 @@ public class Teleport implements Runnable, ITeleport
 		}
 	}

-	//The now function is used when you want to skip tp delay when teleporting someone to a location or player.
-	public void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception
-	{
-		if (cooldown)
-		{
-			cooldown(false);
-		}
-		now(new Target(loc), cause);
-	}
-
-	public void now(Player entity, boolean cooldown, TeleportCause cause) throws Exception
-	{
-		if (cooldown)
-		{
-			cooldown(false);
-		}
-		now(new Target(entity), cause);
-	}
-
-	private void now(Target target, TeleportCause cause) throws Exception
+	public void cancel()
 	{
 		cancel(false);
-		user.setLastLocation();
-		user.getBase().teleport(Util.getSafeDestination(target.getLocation()), cause);
 	}

-	//The teleport function is used when you want to normally teleport someone to a location or player.
-	//This method is nolonger used internally and will be removed.
-	@Deprecated
 	public void teleport(Location loc, Trade chargeFor) throws Exception
 	{
-		teleport(loc, chargeFor, TeleportCause.PLUGIN);
+		teleport(new Target(loc), chargeFor, TeleportCause.PLUGIN);
 	}

 	public void teleport(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
@@ -255,21 +197,21 @@ public class Teleport implements Runnable, ITeleport
 		teleport(new Target(loc), chargeFor, cause);
 	}

-	public void teleport(Player entity, Trade chargeFor, TeleportCause cause) throws Exception
+	public void teleport(Entity entity, Trade chargeFor, TeleportCause cause) throws Exception
 	{
 		teleport(new Target(entity), chargeFor, cause);
 	}

 	private void teleport(Target target, Trade chargeFor, TeleportCause cause) throws Exception
 	{
-		double delay = ess.getSettings().getTeleportDelay();
+		double delay = ess.getGroups().getTeleportDelay(user);

 		if (chargeFor != null)
 		{
 			chargeFor.isAffordableFor(user);
 		}
 		cooldown(true);
-		if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
+		if (delay <= 0 || Permissions.TELEPORT_TIMER_BYPASS.isAuthorized(user))
 		{
 			cooldown(false);
 			now(target, cause);
@@ -280,113 +222,81 @@ public class Teleport implements Runnable, ITeleport
 			return;
 		}

-		cancel(false);
-		warnUser(user, delay);
+		cancel();
+		Calendar c = new GregorianCalendar();
+		c.add(Calendar.SECOND, (int)delay);
+		c.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
+		user.sendMessage(_("dontMoveMessage", Util.formatDateDiff(c.getTimeInMillis())));
 		initTimer((long)(delay * 1000.0), target, chargeFor, cause);

 		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
 	}

-	//The teleportToMe function is a wrapper used to handle teleporting players to them, like /tphere
-	public void teleportToMe(User otherUser, Trade chargeFor, TeleportCause cause) throws Exception
+	private void now(Target target, TeleportCause cause) throws Exception
 	{
-		Target target = new Target(user);
-		double delay = ess.getSettings().getTeleportDelay();
+		cancel();
+		user.setLastLocation();
+		user.getBase().teleport(Util.getSafeDestination(target.getLocation()), cause);
+	}

-		if (chargeFor != null)
-		{
-			chargeFor.isAffordableFor(user);
-		}
-		cooldown(true);
-		if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
+	public void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception
+	{
+		if (cooldown)
 		{
 			cooldown(false);
-			otherUser.getTeleport().now(target, cause);
-			if (chargeFor != null)
-			{
-				chargeFor.charge(user);
-			}
-			return;
 		}
-
-		cancel(false);
-		warnUser(otherUser, delay);
-		initTimer((long)(delay * 1000.0), otherUser, target, chargeFor, cause, false);
-		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
+		now(new Target(loc), cause);
 	}

-	private void warnUser(final IUser user, final double delay)
+	public void now(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
 	{
-		Calendar c = new GregorianCalendar();
-		c.add(Calendar.SECOND, (int)delay);
-		c.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
-		user.sendMessage(_("dontMoveMessage", Util.formatDateDiff(c.getTimeInMillis())));
+		cooldown(false);
+		chargeFor.charge(user);
+		now(new Target(loc), cause);
 	}

-	//The respawn function is a wrapper used to handle tp fallback, on /jail and /home
-	public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception
+	public void now(Entity entity, boolean cooldown, TeleportCause cause) throws Exception
 	{
-		double delay = ess.getSettings().getTeleportDelay();
-		if (chargeFor != null)
-		{
-			chargeFor.isAffordableFor(user);
-		}
-		cooldown(true);
-		if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
+		if (cooldown)
 		{
 			cooldown(false);
-			respawn(cause);
-			if (chargeFor != null)
-			{
-				chargeFor.charge(user);
-			}
-			return;
-		}
-
-		cancel(false);
-		initTimer((long)(delay * 1000.0), user, null, chargeFor, cause, true);
-		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
-	}
-		
-	public void respawn(TeleportCause cause) throws Exception
-	{
-		final Player player = user.getBase();
-		Location bed = player.getBedSpawnLocation();
-		if (bed != null && bed.getBlock().getType() != Material.BED_BLOCK)
-		{
-			now(new Target(bed), cause);
-		}
-		else
-		{
-			final PlayerRespawnEvent pre = new PlayerRespawnEvent(player, player.getWorld().getSpawnLocation(), false);
-			ess.getServer().getPluginManager().callEvent(pre);
-			now(new Target(pre.getRespawnLocation()), cause);
 		}
+		now(new Target(entity), cause);
 	}

-	//The warp function is a wrapper used to teleport a player to a /warp
-	public void warp(String warp, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		Location loc = ess.getWarps().getWarp(warp);
-		user.sendMessage(_("warpingTo", warp));
-		teleport(new Target(loc), chargeFor, cause);
-	}
-
-	//The back function is a wrapper used to teleport a player /back to their previous location.	
 	public void back(Trade chargeFor) throws Exception
 	{
-		teleport(new Target(user.getLastLocation()), chargeFor, TeleportCause.COMMAND);
+		user.acquireReadLock();
+		try
+		{
+			teleport(new Target(user.getData().getLastLocation().getBukkitLocation()), chargeFor, TeleportCause.COMMAND);
+		}
+		finally
+		{
+			user.unlock();
+		}
 	}

-	//This function is used to throw a user back after a jail sentence
 	public void back() throws Exception
 	{
-		now(new Target(user.getLastLocation()), TeleportCause.COMMAND);
+		user.acquireReadLock();
+		try
+		{
+			now(new Target(user.getData().getLastLocation().getBukkitLocation()), TeleportCause.COMMAND);
+		}
+		finally
+		{
+			user.unlock();
+		}
 	}

-	//This function handles teleporting to /home
-	public void home(Location loc, Trade chargeFor) throws Exception
+	public void home(IUser user, String home, Trade chargeFor) throws Exception
 	{
+		final Location loc = user.getHome(home);
+		if (loc == null)
+		{
+			throw new NotEnoughArgumentsException();
+		}
 		teleport(new Target(loc), chargeFor, TeleportCause.COMMAND);
 	}
 }
@@ -1,8 +1,14 @@
 package com.earth2me.essentials;

 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.ChargeException;
+import com.earth2me.essentials.api.IEssentials;
+import com.earth2me.essentials.api.ISettings;
+import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import com.earth2me.essentials.craftbukkit.SetExpFix;
+import com.earth2me.essentials.perm.NoCommandCostPermissions;
+import com.earth2me.essentials.perm.Permissions;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -12,6 +18,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import lombok.Cleanup;
 import org.bukkit.Location;
 import org.bukkit.entity.Item;
 import org.bukkit.inventory.ItemStack;
@@ -20,7 +27,6 @@ import org.bukkit.inventory.ItemStack;
 public class Trade
 {
 	private final transient String command;
-	private final transient Trade fallbackTrade;
 	private final transient Double money;
 	private final transient ItemStack itemStack;
 	private final transient Integer exp;
@@ -28,33 +34,27 @@ public class Trade

 	public Trade(final String command, final IEssentials ess)
 	{
-		this(command, null, null, null, null, ess);
-	}
-
-	public Trade(final String command, final Trade fallback, final IEssentials ess)
-	{
-		this(command, fallback, null, null, null, ess);
+		this(command, null, null, null, ess);
 	}

 	public Trade(final double money, final IEssentials ess)
 	{
-		this(null, null, money, null, null, ess);
+		this(null, money, null, null, ess);
 	}

 	public Trade(final ItemStack items, final IEssentials ess)
 	{
-		this(null, null, null, items, null, ess);
+		this(null, null, items, null, ess);
 	}

 	public Trade(final int exp, final IEssentials ess)
 	{
-		this(null, null, null, null, exp, ess);
+		this(null, null, null, exp, ess);
 	}

-	private Trade(final String command, final Trade fallback, final Double money, final ItemStack item, final Integer exp, final IEssentials ess)
+	private Trade(final String command, final Double money, final ItemStack item, final Integer exp, final IEssentials ess)
 	{
 		this.command = command;
-		this.fallbackTrade = fallback;
 		this.money = money;
 		this.itemStack = item;
 		this.exp = exp;
@@ -63,29 +63,30 @@ public class Trade

 	public void isAffordableFor(final IUser user) throws ChargeException
 	{
-
-		if (ess.getSettings().isDebug())
-		{
-			ess.getLogger().log(Level.INFO, "checking if " + user.getName() + " can afford charge.");
-		}
-
+		final double mon = user.getMoney();
 		if (getMoney() != null
+			&& mon < getMoney()
 			&& getMoney() > 0
-			&& !user.canAfford(getMoney()))
+			&& !Permissions.ECO_LOAN.isAuthorized(user))
 		{
 			throw new ChargeException(_("notEnoughMoney"));
 		}

 		if (getItemStack() != null
-			&& !user.getInventory().containsAtLeast(itemStack, itemStack.getAmount()))
+			&& !InventoryWorkaround.containsItem(user.getInventory(), true, true, itemStack))
 		{
 			throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
 		}

-		double money;
+		@Cleanup
+		final ISettings settings = ess.getSettings();
+		settings.acquireReadLock();
+
 		if (command != null && !command.isEmpty()
-			&& 0 < (money = getCommandCost(user))
-			&& !user.canAfford(money))
+			&& !NoCommandCostPermissions.getPermission(command).isAuthorized(user)
+			&& mon < settings.getData().getEconomy().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
+			&& 0 < settings.getData().getEconomy().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
+			&& !Permissions.ECO_LOAN.isAuthorized(user))
 		{
 			throw new ChargeException(_("notEnoughMoney"));
 		}
@@ -113,23 +114,23 @@ public class Trade
 		{
 			if (dropItems)
 			{
-				final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItems(user.getInventory(), getItemStack());
+				final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItem(user.getInventory(), true, getItemStack());
 				final Location loc = user.getLocation();
-				for (ItemStack itemStack : leftOver.values())
+				for (ItemStack dropStack : leftOver.values())
 				{
-					final int maxStackSize = itemStack.getType().getMaxStackSize();
-					final int stacks = itemStack.getAmount() / maxStackSize;
-					final int leftover = itemStack.getAmount() % maxStackSize;
+					final int maxStackSize = dropStack.getType().getMaxStackSize();
+					final int stacks = dropStack.getAmount() / maxStackSize;
+					final int leftover = dropStack.getAmount() % maxStackSize;
 					final Item[] itemStacks = new Item[stacks + (leftover > 0 ? 1 : 0)];
 					for (int i = 0; i < stacks; i++)
 					{
-						final ItemStack stack = itemStack.clone();
+						final ItemStack stack = dropStack.clone();
 						stack.setAmount(maxStackSize);
 						itemStacks[i] = loc.getWorld().dropItem(loc, stack);
 					}
 					if (leftover > 0)
 					{
-						final ItemStack stack = itemStack.clone();
+						final ItemStack stack = dropStack.clone();
 						stack.setAmount(leftover);
 						itemStacks[stacks] = loc.getWorld().dropItem(loc, stack);
 					}
@@ -137,7 +138,7 @@ public class Trade
 			}
 			else
 			{
-				success = InventoryWorkaround.addAllItems(user.getInventory(), getItemStack());
+				success = InventoryWorkaround.addAllItems(user.getInventory(), true, getItemStack());
 			}
 			user.updateInventory();
 		}
@@ -150,14 +151,10 @@ public class Trade

 	public void charge(final IUser user) throws ChargeException
 	{
-		if (ess.getSettings().isDebug())
-		{
-			ess.getLogger().log(Level.INFO, "charging user " + user.getName());
-		}
-
 		if (getMoney() != null)
 		{
-			if (!user.canAfford(getMoney()) && getMoney() > 0.0d)
+			final double mon = user.getMoney();
+			if (mon < getMoney() && getMoney() > 0 && !Permissions.ECO_LOAN.isAuthorized(user))
 			{
 				throw new ChargeException(_("notEnoughMoney"));
 			}
@@ -165,17 +162,22 @@ public class Trade
 		}
 		if (getItemStack() != null)
 		{
-			if (!user.getInventory().containsAtLeast(itemStack, itemStack.getAmount()))
+			if (!InventoryWorkaround.containsItem(user.getInventory(), true, true, itemStack))
 			{
 				throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
 			}
-			user.getInventory().removeItem(getItemStack());
+			InventoryWorkaround.removeItem(user.getInventory(), true, true, getItemStack());
 			user.updateInventory();
 		}
-		if (command != null)
+		if (command != null && !command.isEmpty()
+			&& !NoCommandCostPermissions.getPermission(command).isAuthorized(user))
 		{
-			final double cost = getCommandCost(user);
-			if (!user.canAfford(cost) && cost > 0.0d)
+			@Cleanup
+			final ISettings settings = ess.getSettings();
+			settings.acquireReadLock();
+			final double mon = user.getMoney();
+			final double cost = settings.getData().getEconomy().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
+			if (mon < cost && cost > 0 && !Permissions.ECO_LOAN.isAuthorized(user))
 			{
 				throw new ChargeException(_("notEnoughMoney"));
 			}
@@ -206,39 +208,14 @@ public class Trade
 	{
 		return exp;
 	}
-
-	public Double getCommandCost(final IUser user)
-	{
-		double cost = 0.0d;
-		if (command != null && !command.isEmpty())
-		{
-			cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
-			if (cost == 0.0d && fallbackTrade != null)
-			{
-				cost = fallbackTrade.getCommandCost(user);
-			}
-
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().log(Level.INFO, "calculated command (" + command + ") cost for " + user.getName() + " as " + cost);
-			}
-		}
-		if (cost != 0.0d && (user.isAuthorized("essentials.nocommandcost.all")
-							 || user.isAuthorized("essentials.nocommandcost." + command)))
-		{
-			return 0.0d;
-		}
-		return cost;
-	}
 	private static FileWriter fw = null;

 	public static void log(String type, String subtype, String event, String sender, Trade charge, String receiver, Trade pay, Location loc, IEssentials ess)
 	{
-		//isEcoLogUpdateEnabled() - This refers to log entries with no location, ie API updates #EasterEgg
-		//isEcoLogEnabled() - This refers to log entries with with location, ie /pay /sell and eco signs.
-		
-		if ((loc == null && !ess.getSettings().isEcoLogUpdateEnabled())
-			|| (loc != null && !ess.getSettings().isEcoLogEnabled()))
+		@Cleanup
+		final ISettings settings = ess.getSettings();
+		settings.acquireReadLock();
+		if (!settings.getData().getEconomy().isLogEnabled())
 		{
 			return;
 		}
@@ -278,7 +255,7 @@ public class Trade
 			{
 				sb.append(charge.getMoney()).append(",");
 				sb.append("money").append(",");
-				sb.append(ess.getSettings().getCurrencySymbol());
+				sb.append(settings.getData().getEconomy().getCurrencySymbol());
 			}
 			if (charge.getExperience() != null)
 			{
@@ -309,7 +286,7 @@ public class Trade
 			{
 				sb.append(pay.getMoney()).append(",");
 				sb.append("money").append(",");
-				sb.append(ess.getSettings().getCurrencySymbol());
+				sb.append(settings.getData().getEconomy().getCurrencySymbol());
 			}
 			if (pay.getExperience() != null)
 			{
@@ -1,746 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.commands.IEssentialsCommand;
-import com.earth2me.essentials.register.payment.Method;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-
-
-public class User extends UserData implements Comparable<User>, IReplyTo, IUser
-{
-	private CommandSender replyTo = null;
-	private transient User teleportRequester;
-	private transient boolean teleportRequestHere;
-	private transient boolean vanished;
-	private transient final Teleport teleport;
-	private transient long teleportRequestTime;
-	private transient long lastOnlineActivity;
-	private transient long lastThrottledAction;
-	private transient long lastActivity = System.currentTimeMillis();
-	private boolean hidden = false;
-	private boolean rightClickJump = false;
-	private transient Location afkPosition = null;
-	private boolean invSee = false;
-	private boolean enderSee = false;
-	private static final Logger logger = Logger.getLogger("Minecraft");
-
-	User(final Player base, final IEssentials ess)
-	{
-		super(base, ess);
-		teleport = new Teleport(this, ess);
-		if (isAfk())
-		{
-			afkPosition = getLocation();
-		}
-	}
-
-	User update(final Player base)
-	{
-		setBase(base);
-		return this;
-	}
-
-	@Override
-	public boolean isAuthorized(final IEssentialsCommand cmd)
-	{
-		return isAuthorized(cmd, "essentials.");
-	}
-
-	@Override
-	public boolean isAuthorized(final IEssentialsCommand cmd, final String permissionPrefix)
-	{
-		return isAuthorized(permissionPrefix + (cmd.getName().equals("r") ? "msg" : cmd.getName()));
-	}
-
-	@Override
-	public boolean isAuthorized(final String node)
-	{
-		final boolean result = isAuthorizedCheck(node);
-		if (ess.getSettings().isDebug())
-		{
-			ess.getLogger().log(Level.INFO, "checking if " + base.getName() + " has " + node + " - " + result);
-		}
-		return result;
-	}
-
-	private boolean isAuthorizedCheck(final String node)
-	{
-
-		if (base instanceof OfflinePlayer)
-		{
-			return false;
-		}
-
-		if (isJailed())
-		{
-			return false;
-		}
-
-		try
-		{
-			return ess.getPermissionsHandler().hasPermission(base, node);
-		}
-		catch (Exception ex)
-		{
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().log(Level.SEVERE, "Permission System Error: " + ess.getPermissionsHandler().getName() + " returned: " + ex.getMessage(), ex);
-			}
-			else
-			{
-				ess.getLogger().log(Level.SEVERE, "Permission System Error: " + ess.getPermissionsHandler().getName() + " returned: " + ex.getMessage());
-			}
-
-			return false;
-		}
-	}
-
-	public void healCooldown() throws Exception
-	{
-		final Calendar now = new GregorianCalendar();
-		if (getLastHealTimestamp() > 0)
-		{
-			final double cooldown = ess.getSettings().getHealCooldown();
-			final Calendar cooldownTime = new GregorianCalendar();
-			cooldownTime.setTimeInMillis(getLastHealTimestamp());
-			cooldownTime.add(Calendar.SECOND, (int)cooldown);
-			cooldownTime.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
-			if (cooldownTime.after(now) && !isAuthorized("essentials.heal.cooldown.bypass"))
-			{
-				throw new Exception(_("timeBeforeHeal", Util.formatDateDiff(cooldownTime.getTimeInMillis())));
-			}
-		}
-		setLastHealTimestamp(now.getTimeInMillis());
-	}
-
-	@Override
-	public void giveMoney(final double value)
-	{
-		giveMoney(value, null);
-	}
-
-	public void giveMoney(final double value, final CommandSender initiator)
-	{
-		if (value == 0.0d)
-		{
-			return;
-		}
-		setMoney(getMoney() + value);
-		sendMessage(_("addedToAccount", Util.displayCurrency(value, ess)));
-		if (initiator != null)
-		{
-			initiator.sendMessage(_("addedToOthersAccount", Util.displayCurrency(value, ess), this.getDisplayName(), Util.displayCurrency(getMoney(), ess)));
-		}
-	}
-
-	public void payUser(final User reciever, final double value) throws Exception
-	{
-		if (value == 0.0d)
-		{
-			return;
-		}
-		if (canAfford(value))
-		{
-			setMoney(getMoney() - value);
-			reciever.setMoney(reciever.getMoney() + value);
-			sendMessage(_("moneySentTo", Util.displayCurrency(value, ess), reciever.getDisplayName()));
-			reciever.sendMessage(_("moneyRecievedFrom", Util.displayCurrency(value, ess), getDisplayName()));
-		}
-		else
-		{
-			throw new Exception(_("notEnoughMoney"));
-		}
-	}
-
-	@Override
-	public void takeMoney(final double value)
-	{
-		takeMoney(value, null);
-	}
-
-	public void takeMoney(final double value, final CommandSender initiator)
-	{
-		if (value == 0.0d)
-		{
-			return;
-		}
-		setMoney(getMoney() - value);
-		sendMessage(_("takenFromAccount", Util.displayCurrency(value, ess)));
-		if (initiator != null)
-		{
-			initiator.sendMessage(_("takenFromOthersAccount", Util.displayCurrency(value, ess), this.getDisplayName(), Util.displayCurrency(getMoney(), ess)));
-		}
-	}
-
-	@Override
-	public boolean canAfford(final double cost)
-	{
-		return canAfford(cost, true);
-	}
-
-	public boolean canAfford(final double cost, final boolean permcheck)
-	{
-		if (cost <= 0.0d)
-		{
-			return true;
-		}
-		final double mon = getMoney();
-		if (!permcheck || isAuthorized("essentials.eco.loan"))
-		{
-			return (mon - cost) >= ess.getSettings().getMinMoney();
-		}
-		return cost <= mon;
-	}
-
-	public void dispose()
-	{
-		this.base = new OfflinePlayer(getName(), ess);
-	}
-
-	@Override
-	public void setReplyTo(final CommandSender user)
-	{
-		replyTo = user;
-	}
-
-	@Override
-	public CommandSender getReplyTo()
-	{
-		return replyTo;
-	}
-
-	@Override
-	public int compareTo(final User other)
-	{
-		return Util.stripFormat(this.getDisplayName()).compareToIgnoreCase(Util.stripFormat(other.getDisplayName()));
-	}
-
-	@Override
-	public boolean equals(final Object object)
-	{
-		if (!(object instanceof User))
-		{
-			return false;
-		}
-		return this.getName().equalsIgnoreCase(((User)object).getName());
-
-	}
-
-	@Override
-	public int hashCode()
-	{
-		return this.getName().hashCode();
-	}
-
-	public Boolean canSpawnItem(final int itemId)
-	{
-		return !ess.getSettings().itemSpawnBlacklist().contains(itemId);
-	}
-
-	public Location getHome() throws Exception
-	{
-		return getHome(getHomes().get(0));
-	}
-
-	@Override
-	public void setLastLocation()
-	{
-		setLastLocation(getLocation());
-	}
-
-	public void requestTeleport(final User player, final boolean here)
-	{
-		teleportRequestTime = System.currentTimeMillis();
-		teleportRequester = player;
-		teleportRequestHere = here;
-	}
-
-	public User getTeleportRequest()
-	{
-		return teleportRequester;
-	}
-
-	public boolean isTpRequestHere()
-	{
-		return teleportRequestHere;
-	}
-
-	public String getNick(final boolean longnick)
-	{
-		final StringBuilder prefix = new StringBuilder();
-		String nickname;
-		String suffix = "";
-		final String nick = getNickname();
-		if (ess.getSettings().isCommandDisabled("nick") || nick == null || nick.isEmpty() || nick.equals(getName()))
-		{
-			nickname = getName();
-		}
-		else
-		{
-			nickname = ess.getSettings().getNicknamePrefix() + nick;
-		}
-
-		if (isOp())
-		{
-			try
-			{
-				final ChatColor opPrefix = ess.getSettings().getOperatorColor();
-				if (opPrefix != null && opPrefix.toString().length() > 0)
-				{
-					prefix.insert(0, opPrefix.toString());
-					suffix = "§r";
-				}
-			}
-			catch (Exception e)
-			{
-			}
-		}
-
-		if (ess.getSettings().addPrefixSuffix())
-		{
-			//These two extra toggles are not documented, because they are mostly redundant #EasterEgg
-			if (!ess.getSettings().disablePrefix())
-			{
-				final String ptext = ess.getPermissionsHandler().getPrefix(base).replace('&', '§');
-				prefix.insert(0, ptext);
-				suffix = "§r";
-			}
-			if (!ess.getSettings().disableSuffix())
-			{
-				final String stext = ess.getPermissionsHandler().getSuffix(base).replace('&', '§');
-				suffix = stext + "§r";
-				suffix = suffix.replace("§f§f", "§f").replace("§f§r", "§r").replace("§r§r", "§r");
-			}
-		}
-		final String strPrefix = prefix.toString();
-		String output = strPrefix + nickname + suffix;
-		if (!longnick && output.length() > 16)
-		{
-			output = strPrefix + nickname;
-		}
-		if (!longnick && output.length() > 16)
-		{
-			output = Util.lastCode(strPrefix) + nickname;
-		}
-		if (!longnick && output.length() > 16)
-		{
-			output = Util.lastCode(strPrefix) + nickname.substring(0, 14);
-		}
-		if (output.charAt(output.length() - 1) == '§')
-		{
-			output = output.substring(0, output.length() - 1);
-		}
-		return output;
-	}
-
-	public void setDisplayNick()
-	{
-		if (base.isOnline() && ess.getSettings().changeDisplayName())
-		{
-			setDisplayName(getNick(true));
-			if (ess.getSettings().changePlayerListName())
-			{
-				String name = getNick(false);
-				try
-				{
-					setPlayerListName(name);
-				}
-				catch (IllegalArgumentException e)
-				{
-					if (ess.getSettings().isDebug())
-					{
-						logger.log(Level.INFO, "Playerlist for " + name + " was not updated. Name clashed with another online player.");
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	public String getDisplayName()
-	{
-		return super.getDisplayName() == null ? super.getName() : super.getDisplayName();
-	}
-
-	@Override
-	public Teleport getTeleport()
-	{
-		return teleport;
-	}
-
-	public long getLastOnlineActivity()
-	{
-		return lastOnlineActivity;
-	}
-
-	public void setLastOnlineActivity(final long timestamp)
-	{
-		lastOnlineActivity = timestamp;
-	}
-
-	@Override
-	public double getMoney()
-	{
-		if (ess.getPaymentMethod().hasMethod())
-		{
-			try
-			{
-				final Method method = ess.getPaymentMethod().getMethod();
-				if (!method.hasAccount(this.getName()))
-				{
-					throw new Exception();
-				}
-				final Method.MethodAccount account = ess.getPaymentMethod().getMethod().getAccount(this.getName());
-				return account.balance();
-			}
-			catch (Throwable ex)
-			{
-			}
-		}
-		return super.getMoney();
-	}
-
-	@Override
-	public void setMoney(final double value)
-	{
-		if (ess.getPaymentMethod().hasMethod())
-		{
-			try
-			{
-				final Method method = ess.getPaymentMethod().getMethod();
-				if (!method.hasAccount(this.getName()))
-				{
-					throw new Exception();
-				}
-				final Method.MethodAccount account = ess.getPaymentMethod().getMethod().getAccount(this.getName());
-				account.set(value);
-			}
-			catch (Throwable ex)
-			{
-			}
-		}
-		super.setMoney(value);
-		Trade.log("Update", "Set", "API", getName(), new Trade(value, ess), null, null, null, ess);
-	}
-
-	public void updateMoneyCache(final double value)
-	{
-		if (ess.getPaymentMethod().hasMethod() && super.getMoney() != value)
-		{
-			super.setMoney(value);
-		}
-	}
-
-	@Override
-	public void setAfk(final boolean set)
-	{
-		this.setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : set);
-		if (set && !isAfk())
-		{
-			afkPosition = getLocation();
-		}
-		else if (!set && isAfk())
-		{
-			afkPosition = null;
-		}
-		super.setAfk(set);
-	}
-
-	@Override
-	public boolean toggleAfk()
-	{
-		final boolean now = super.toggleAfk();
-		this.setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : now);
-		return now;
-	}
-
-	@Override
-	public boolean isHidden()
-	{
-		return hidden;
-	}
-
-	public void setHidden(final boolean hidden)
-	{
-		this.hidden = hidden;
-		if (hidden == true)
-		{
-			setLastLogout(getLastOnlineActivity());
-		}
-	}
-
-	//Returns true if status expired during this check
-	public boolean checkJailTimeout(final long currentTime)
-	{
-		if (getJailTimeout() > 0 && getJailTimeout() < currentTime && isJailed())
-		{
-			setJailTimeout(0);
-			setJailed(false);
-			sendMessage(_("haveBeenReleased"));
-			setJail(null);
-			try
-			{
-				getTeleport().back();
-			}
-			catch (Exception ex)
-			{
-				try
-				{
-					getTeleport().respawn(null, TeleportCause.PLUGIN);
-				}
-				catch (Exception ex1)
-				{
-				}
-			}
-			return true;
-		}
-		return false;
-	}
-
-	//Returns true if status expired during this check
-	public boolean checkMuteTimeout(final long currentTime)
-	{
-		if (getMuteTimeout() > 0 && getMuteTimeout() < currentTime && isMuted())
-		{
-			setMuteTimeout(0);
-			sendMessage(_("canTalkAgain"));
-			setMuted(false);
-			return true;
-		}
-		return false;
-	}
-
-	//Returns true if status expired during this check
-	public boolean checkBanTimeout(final long currentTime)
-	{
-		if (getBanTimeout() > 0 && getBanTimeout() < currentTime && isBanned())
-		{
-			setBanTimeout(0);
-			setBanned(false);
-			return true;
-		}
-		return false;
-	}
-
-	public void updateActivity(final boolean broadcast)
-	{
-		if (isAfk())
-		{
-			setAfk(false);
-			if (broadcast && !isHidden())
-			{
-				setDisplayNick();
-				final String msg = _("userIsNotAway", getDisplayName());
-				if (!msg.isEmpty())
-				{					
-					ess.broadcastMessage(this, msg);
-				}
-			}
-		}
-		lastActivity = System.currentTimeMillis();
-	}
-
-	public void checkActivity()
-	{
-		final long autoafkkick = ess.getSettings().getAutoAfkKick();
-		if (autoafkkick > 0 && lastActivity > 0 && (lastActivity + (autoafkkick * 1000)) < System.currentTimeMillis()
-			&& !isHidden() && !isAuthorized("essentials.kick.exempt") && !isAuthorized("essentials.afk.kickexempt"))
-		{
-			final String kickReason = _("autoAfkKickReason", autoafkkick / 60.0);
-			lastActivity = 0;
-			kickPlayer(kickReason);
-
-
-			for (Player player : ess.getServer().getOnlinePlayers())
-			{
-				final User user = ess.getUser(player);
-				if (user.isAuthorized("essentials.kick.notify"))
-				{
-					player.sendMessage(_("playerKicked", Console.NAME, getName(), kickReason));
-				}
-			}
-		}
-		final long autoafk = ess.getSettings().getAutoAfk();
-		if (!isAfk() && autoafk > 0 && lastActivity + autoafk * 1000 < System.currentTimeMillis() && isAuthorized("essentials.afk.auto"))
-		{
-			setAfk(true);
-			if (!isHidden())
-			{
-				setDisplayNick();
-				final String msg = _("userIsAway", getDisplayName());
-				if (!msg.isEmpty())
-				{					
-					ess.broadcastMessage(this, msg);
-				}
-			}
-		}
-	}
-
-	public Location getAfkPosition()
-	{
-		return afkPosition;
-	}
-
-	@Override
-	public boolean isGodModeEnabled()
-	{
-		return (super.isGodModeEnabled() && !ess.getSettings().getNoGodWorlds().contains(getLocation().getWorld().getName()))
-			   || (isAfk() && ess.getSettings().getFreezeAfkPlayers());
-	}
-
-	public boolean isGodModeEnabledRaw()
-	{
-		return super.isGodModeEnabled();
-	}
-
-	@Override
-	public String getGroup()
-	{
-		return ess.getPermissionsHandler().getGroup(base);
-	}
-
-	public boolean inGroup(final String group)
-	{
-		return ess.getPermissionsHandler().inGroup(base, group);
-	}
-
-	public boolean canBuild()
-	{
-		if (isOp())
-		{
-			return true;
-		}
-		return ess.getPermissionsHandler().canBuild(base, getGroup());
-	}
-
-	public long getTeleportRequestTime()
-	{
-		return teleportRequestTime;
-	}
-
-	public boolean isInvSee()
-	{
-		return invSee;
-	}
-
-	public void setInvSee(final boolean set)
-	{
-		invSee = set;
-	}
-
-	public boolean isEnderSee()
-	{
-		return enderSee;
-	}
-
-	public void setEnderSee(final boolean set)
-	{
-		enderSee = set;
-	}
-	private transient long teleportInvulnerabilityTimestamp = 0;
-
-	public void enableInvulnerabilityAfterTeleport()
-	{
-		final long time = ess.getSettings().getTeleportInvulnerability();
-		if (time > 0)
-		{
-			teleportInvulnerabilityTimestamp = System.currentTimeMillis() + time;
-		}
-	}
-
-	public void resetInvulnerabilityAfterTeleport()
-	{
-		if (teleportInvulnerabilityTimestamp != 0
-			&& teleportInvulnerabilityTimestamp < System.currentTimeMillis())
-		{
-			teleportInvulnerabilityTimestamp = 0;
-		}
-	}
-
-	public boolean hasInvulnerabilityAfterTeleport()
-	{
-		return teleportInvulnerabilityTimestamp != 0 && teleportInvulnerabilityTimestamp >= System.currentTimeMillis();
-	}
-
-	public boolean isVanished()
-	{
-		return vanished;
-	}
-
-	public void setVanished(final boolean set)
-	{
-		vanished = set;
-		if (set)
-		{
-			for (Player p : ess.getServer().getOnlinePlayers())
-			{
-				if (!ess.getUser(p).isAuthorized("essentials.vanish.see"))
-				{
-					p.hidePlayer(getBase());
-				}
-			}
-			setHidden(true);
-			ess.getVanishedPlayers().add(getName());
-		}
-		else
-		{
-			for (Player p : ess.getServer().getOnlinePlayers())
-			{
-				p.showPlayer(getBase());
-			}
-			setHidden(false);
-			ess.getVanishedPlayers().remove(getName());
-		}
-	}
-
-	public void toggleVanished()
-	{
-		final boolean set = !vanished;
-		this.setVanished(set);
-	}
-
-	public boolean checkSignThrottle()
-	{
-		if (isSignThrottled())
-		{
-			return true;
-		}
-		updateThrottle();
-		return false;
-	}
-
-	public boolean isSignThrottled()
-	{
-		final long minTime = lastThrottledAction + (1000 / ess.getSettings().getSignUsePerSecond());
-		return (System.currentTimeMillis() < minTime);
-	}
-
-	public void updateThrottle()
-	{
-		lastThrottledAction = System.currentTimeMillis();;
-	}
-
-	public boolean isFlyClickJump()
-	{
-		return rightClickJump;
-	}
-
-	public void setRightClickJump(boolean rightClickJump)
-	{
-		this.rightClickJump = rightClickJump;
-	}
-
-	@Override
-	public boolean isIgnoreExempt()
-	{
-		return this.isAuthorized("essentials.chat.ignoreexempt");		
-	}
-}
@@ -1,843 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import java.io.File;
-import java.util.*;
-import org.bukkit.Location;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.MemoryConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-
-public abstract class UserData extends PlayerExtension implements IConf
-{
-	protected final transient IEssentials ess;
-	private EssentialsConf config;
-	private final File folder;
-
-	protected UserData(Player base, IEssentials ess)
-	{
-		super(base);
-		this.ess = ess;
-		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 reset()
-	{
-		config.getFile().delete();
-		config = new EssentialsConf(new File(folder, Util.sanitizeFileName(base.getName()) + ".yml"));
-		reloadConfig();
-	}
-
-	@Override
-	public final void reloadConfig()
-	{
-		config.load();
-		money = _getMoney();
-		unlimited = _getUnlimited();
-		powertools = _getPowertools();
-		homes = _getHomes();
-		lastLocation = _getLastLocation();
-		lastTeleportTimestamp = _getLastTeleportTimestamp();
-		lastHealTimestamp = _getLastHealTimestamp();
-		jail = _getJail();
-		mails = _getMails();
-		teleportEnabled = _getTeleportEnabled();
-		godmode = _getGodModeEnabled();
-		muted = _getMuted();
-		muteTimeout = _getMuteTimeout();
-		jailed = _getJailed();
-		jailTimeout = _getJailTimeout();
-		lastLogin = _getLastLogin();
-		lastLogout = _getLastLogout();
-		lastLoginAddress = _getLastLoginAddress();
-		afk = _getAfk();
-		geolocation = _getGeoLocation();
-		isSocialSpyEnabled = _isSocialSpyEnabled();
-		isNPC = _isNPC();
-		arePowerToolsEnabled = _arePowerToolsEnabled();
-		kitTimestamps = _getKitTimestamps();
-		nickname = _getNickname();
-		setIgnoredPlayers(_getIgnoredPlayers());
-	}
-	private double money;
-
-	private double _getMoney()
-	{
-		double money = ess.getSettings().getStartingBalance();
-		if (config.hasProperty("money"))
-		{
-			money = config.getDouble("money", money);
-		}
-		if (Math.abs(money) > ess.getSettings().getMaxMoney())
-		{
-			money = money < 0 ? -ess.getSettings().getMaxMoney() : ess.getSettings().getMaxMoney();
-		}
-		return money;
-	}
-
-	public double getMoney()
-	{
-		return money;
-	}
-
-	public void setMoney(double value)
-	{
-		money = value;
-		if (Math.abs(money) > ess.getSettings().getMaxMoney())
-		{
-			money = money < 0 ? -ess.getSettings().getMaxMoney() : ess.getSettings().getMaxMoney();
-		}
-		config.setProperty("money", value);
-		config.save();
-	}
-	private Map<String, Object> homes;
-
-	private Map<String, Object> _getHomes()
-	{
-		if (config.isConfigurationSection("homes"))
-		{
-			return config.getConfigurationSection("homes").getValues(false);
-		}
-		return new HashMap<String, Object>();
-	}
-
-	private String getHomeName(String search)
-	{
-		if (Util.isInt(search))
-		{
-			try
-			{
-				search = getHomes().get(Integer.parseInt(search) - 1);
-			}
-			catch (Exception e)
-			{
-			}
-		}
-		return search;
-	}
-		
-	public Location getHome(String name) throws Exception
-	{
-		String search = getHomeName(name);
-		return config.getLocation("homes." + search, getServer());	
-	}
-
-	public Location getHome(final Location world)
-	{
-		try
-		{
-			Location loc;
-			for (String home : getHomes())
-			{
-				loc = config.getLocation("homes." + home, getServer());
-				if (world.getWorld() == loc.getWorld())
-				{
-					return loc;
-				}
-
-			}
-			loc = config.getLocation("homes." + getHomes().get(0), getServer());
-			return loc;
-		}
-		catch (Exception ex)
-		{
-			return null;
-		}
-	}
-
-	public List<String> getHomes()
-	{
-		return new ArrayList<String>(homes.keySet());
-	}
-
-	public void setHome(String name, Location loc)
-	{
-		//Invalid names will corrupt the yaml
-		name = Util.safeString(name);
-		homes.put(name, loc);
-		config.setProperty("homes." + name, loc);
-		config.save();
-	}
-
-	public void delHome(String name) throws Exception
-	{
-		String search = getHomeName(name);
-		if (!homes.containsKey(search))
-		{
-			search = Util.safeString(search);
-		}
-		if (homes.containsKey(search))
-		{
-			homes.remove(search);
-			config.removeProperty("homes." + search);
-			config.save();
-		}
-		else
-		{
-			throw new Exception(_("invalidHome", search));
-		}
-	}
-
-	public boolean hasHome()
-	{
-		if (config.hasProperty("home"))
-		{
-			return true;
-		}
-		return false;
-	}
-	private String nickname;
-
-	public String _getNickname()
-	{
-		return config.getString("nickname");
-	}
-
-	public String getNickname()
-	{
-		return nickname;
-	}
-
-	public void setNickname(String nick)
-	{
-		nickname = nick;
-		config.setProperty("nickname", nick);
-		config.save();
-	}
-	private List<Integer> unlimited;
-
-	private List<Integer> _getUnlimited()
-	{
-		return config.getIntegerList("unlimited");
-	}
-
-	public List<Integer> getUnlimited()
-	{
-		return unlimited;
-	}
-
-	public boolean hasUnlimited(ItemStack stack)
-	{
-		return unlimited.contains(stack.getTypeId());
-	}
-
-	public void setUnlimited(ItemStack stack, boolean state)
-	{
-		if (unlimited.contains(stack.getTypeId()))
-		{
-			unlimited.remove(Integer.valueOf(stack.getTypeId()));
-		}
-		if (state)
-		{
-			unlimited.add(stack.getTypeId());
-		}
-		config.setProperty("unlimited", unlimited);
-		config.save();
-	}
-	private Map<String, Object> powertools;
-
-	private Map<String, Object> _getPowertools()
-	{
-		if (config.isConfigurationSection("powertools"))
-		{
-			return config.getConfigurationSection("powertools").getValues(false);
-		}
-		return new HashMap<String, Object>();
-	}
-
-	public void clearAllPowertools()
-	{
-		powertools.clear();
-		config.setProperty("powertools", powertools);
-		config.save();
-	}
-
-	@SuppressWarnings("unchecked")
-	public List<String> getPowertool(ItemStack stack)
-	{
-		return (List<String>)powertools.get("" + stack.getTypeId());
-	}
-
-	@SuppressWarnings("unchecked")
-	public List<String> getPowertool(int id)
-	{
-		return (List<String>)powertools.get("" + id);
-	}
-
-	public void setPowertool(ItemStack stack, List<String> commandList)
-	{
-		if (commandList == null || commandList.isEmpty())
-		{
-			powertools.remove("" + stack.getTypeId());
-		}
-		else
-		{
-			powertools.put("" + stack.getTypeId(), commandList);
-		}
-		config.setProperty("powertools", powertools);
-		config.save();
-	}
-
-	public boolean hasPowerTools()
-	{
-		return !powertools.isEmpty();
-	}
-	private Location lastLocation;
-
-	private Location _getLastLocation()
-	{
-		try
-		{
-			return config.getLocation("lastlocation", getServer());
-		}
-		catch (Exception e)
-		{
-			return null;
-		}
-	}
-
-	public Location getLastLocation()
-	{
-		return lastLocation;
-	}
-
-	public void setLastLocation(Location loc)
-	{
-		if (loc == null || loc.getWorld() == null)
-		{
-			return;
-		}
-		lastLocation = loc;
-		config.setProperty("lastlocation", loc);
-		config.save();
-	}
-	private long lastTeleportTimestamp;
-
-	private long _getLastTeleportTimestamp()
-	{
-		return config.getLong("timestamps.lastteleport", 0);
-	}
-
-	public long getLastTeleportTimestamp()
-	{
-		return lastTeleportTimestamp;
-	}
-
-	public void setLastTeleportTimestamp(long time)
-	{
-		lastTeleportTimestamp = time;
-		config.setProperty("timestamps.lastteleport", time);
-		config.save();
-	}
-	private long lastHealTimestamp;
-
-	private long _getLastHealTimestamp()
-	{
-		return config.getLong("timestamps.lastheal", 0);
-	}
-
-	public long getLastHealTimestamp()
-	{
-		return lastHealTimestamp;
-	}
-
-	public void setLastHealTimestamp(long time)
-	{
-		lastHealTimestamp = time;
-		config.setProperty("timestamps.lastheal", time);
-		config.save();
-	}
-	private String jail;
-
-	private String _getJail()
-	{
-		return config.getString("jail");
-	}
-
-	public String getJail()
-	{
-		return jail;
-	}
-
-	public void setJail(String jail)
-	{
-		if (jail == null || jail.isEmpty())
-		{
-			this.jail = null;
-			config.removeProperty("jail");
-		}
-		else
-		{
-			this.jail = jail;
-			config.setProperty("jail", jail);
-		}
-		config.save();
-	}
-	private List<String> mails;
-
-	private List<String> _getMails()
-	{
-		return config.getStringList("mail");
-	}
-
-	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 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 Collections.synchronizedList(config.getStringList("ignore"));
-	}
-
-	public void setIgnoredPlayers(List<String> players)
-	{
-		if (players == null || players.isEmpty())
-		{
-			ignoredPlayers = Collections.synchronizedList(new ArrayList<String>());
-			config.removeProperty("ignore");
-		}
-		else
-		{
-			ignoredPlayers = players;
-			config.setProperty("ignore", players);
-		}
-		config.save();
-	}
-
-	@Deprecated
-	public boolean isIgnoredPlayer(final String userName)
-	{
-		final IUser user = ess.getUser(userName);
-		if (user == null || !user.isOnline())
-		{
-			return false;
-		}
-		return isIgnoredPlayer(user);
-	}
-
-	public boolean isIgnoredPlayer(IUser user)
-	{
-		return (ignoredPlayers.contains(user.getName().toLowerCase(Locale.ENGLISH)) && !user.isIgnoreExempt());
-	}
-
-	public void setIgnoredPlayer(IUser user, boolean set)
-	{
-		if (set)
-		{
-			ignoredPlayers.add(user.getName().toLowerCase(Locale.ENGLISH));
-		}
-		else
-		{
-			ignoredPlayers.remove(user.getName().toLowerCase(Locale.ENGLISH));
-		}
-		setIgnoredPlayers(ignoredPlayers);
-	}
-	private boolean godmode;
-
-	private boolean _getGodModeEnabled()
-	{
-		return config.getBoolean("godmode", false);
-	}
-
-	public boolean isGodModeEnabled()
-	{
-		return godmode;
-	}
-
-	public void setGodModeEnabled(boolean set)
-	{
-		godmode = set;
-		config.setProperty("godmode", set);
-		config.save();
-	}
-	private boolean muted;
-
-	public boolean _getMuted()
-	{
-		return config.getBoolean("muted", false);
-	}
-	
-	public boolean getMuted()
-	{
-		return muted;
-	}
-
-	public boolean isMuted()
-	{
-		return muted;
-	}
-
-	public void setMuted(boolean set)
-	{
-		muted = set;
-		config.setProperty("muted", set);
-		config.save();
-	}
-	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", Util.sanitizeString(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;
-	}
-
-	private void _setLastLogin(long time)
-	{
-		lastLogin = time;
-		config.setProperty("timestamps.login", time);
-	}
-
-	public void setLastLogin(long time)
-	{
-		_setLastLogin(time);
-		if (base.getAddress() != null && base.getAddress().getAddress() != null)
-		{
-			_setLastLoginAddress(base.getAddress().getAddress().getHostAddress());
-		}
-		config.save();
-	}
-	private long lastLogout;
-
-	private long _getLastLogout()
-	{
-		return config.getLong("timestamps.logout", 0);
-	}
-
-	public long getLastLogout()
-	{
-		return lastLogout;
-	}
-
-	public void setLastLogout(long time)
-	{
-		lastLogout = time;
-		config.setProperty("timestamps.logout", time);
-		config.save();
-	}
-	private String lastLoginAddress;
-
-	private String _getLastLoginAddress()
-	{
-		return config.getString("ipAddress", "");
-	}
-
-	public String getLastLoginAddress()
-	{
-		return lastLoginAddress;
-	}
-
-	private void _setLastLoginAddress(String address)
-	{
-		lastLoginAddress = address;
-		config.setProperty("ipAddress", address);
-	}
-	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 String geolocation;
-
-	private String _getGeoLocation()
-	{
-		return config.getString("geolocation");
-	}
-
-	public String getGeoLocation()
-	{
-		return geolocation;
-	}
-
-	public void setGeoLocation(String geolocation)
-	{
-		if (geolocation == null || geolocation.isEmpty())
-		{
-			this.geolocation = null;
-			config.removeProperty("geolocation");
-		}
-		else
-		{
-			this.geolocation = geolocation;
-			config.setProperty("geolocation", geolocation);
-		}
-		config.save();
-	}
-	private boolean isSocialSpyEnabled;
-
-	private boolean _isSocialSpyEnabled()
-	{
-		return config.getBoolean("socialspy", false);
-	}
-
-	public boolean isSocialSpyEnabled()
-	{
-		return isSocialSpyEnabled;
-	}
-
-	public void setSocialSpyEnabled(boolean status)
-	{
-		isSocialSpyEnabled = status;
-		config.setProperty("socialspy", status);
-		config.save();
-	}
-	private boolean isNPC;
-
-	private boolean _isNPC()
-	{
-		return config.getBoolean("npc", false);
-	}
-
-	public boolean isNPC()
-	{
-		return isNPC;
-	}
-
-	public void setNPC(boolean set)
-	{
-		isNPC = set;
-		config.setProperty("npc", set);
-		config.save();
-	}
-	private boolean arePowerToolsEnabled;
-
-	public boolean arePowerToolsEnabled()
-	{
-		return arePowerToolsEnabled;
-	}
-
-	public void setPowerToolsEnabled(boolean set)
-	{
-		arePowerToolsEnabled = set;
-		config.setProperty("powertoolsenabled", set);
-		config.save();
-	}
-
-	public boolean togglePowerToolsEnabled()
-	{
-		boolean ret = !arePowerToolsEnabled();
-		setPowerToolsEnabled(ret);
-		return ret;
-	}
-
-	private boolean _arePowerToolsEnabled()
-	{
-		return config.getBoolean("powertoolsenabled", true);
-	}
-	private ConfigurationSection kitTimestamps;
-
-	private ConfigurationSection _getKitTimestamps()
-	{
-
-		if (config.isConfigurationSection("timestamps.kits"))
-		{
-			final ConfigurationSection section = config.getConfigurationSection("timestamps.kits");
-			final ConfigurationSection newSection = new MemoryConfiguration();
-			for (String command : section.getKeys(false))
-			{
-				if (section.isLong(command))
-				{
-					newSection.set(command.toLowerCase(Locale.ENGLISH), section.getLong(command));
-				}
-				else if (section.isInt(command))
-				{
-					newSection.set(command.toLowerCase(Locale.ENGLISH), (long)section.getInt(command));
-				}
-			}
-			return newSection;
-		}
-		return new MemoryConfiguration();
-	}
-
-	public long getKitTimestamp(String name)
-	{
-		name = name.replace('.', '_').replace('/', '_');
-		if (kitTimestamps != null)
-		{
-			return kitTimestamps.getLong(name, 0l);
-		}
-		return 0l;
-	}
-
-	public void setKitTimestamp(final String name, final long time)
-	{
-		kitTimestamps.set(name.toLowerCase(Locale.ENGLISH), time);
-		config.setProperty("timestamps.kits", kitTimestamps);
-		config.save();
-	}
-
-	public void save()
-	{
-		config.save();
-	}
-}
@@ -1,142 +0,0 @@
-package com.earth2me.essentials;
-
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.util.concurrent.UncheckedExecutionException;
-import java.io.File;
-import java.util.Collections;
-import java.util.Set;
-import java.util.concurrent.ConcurrentSkipListSet;
-import java.util.concurrent.ExecutionException;
-import org.bukkit.entity.Player;
-
-
-public class UserMap extends CacheLoader<String, User> implements IConf
-{
-	private final transient IEssentials ess;
-	private final transient Cache<String, User> users = CacheBuilder.newBuilder().softValues().build(this);
-	private final transient ConcurrentSkipListSet<String> keys = new ConcurrentSkipListSet<String>();
-
-	public UserMap(final IEssentials ess)
-	{
-		super();
-		this.ess = ess;
-		loadAllUsersAsync(ess);
-	}
-
-	private void loadAllUsersAsync(final IEssentials ess)
-	{
-		ess.scheduleAsyncDelayedTask(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				final File userdir = new File(ess.getDataFolder(), "userdata");
-				if (!userdir.exists())
-				{
-					return;
-				}
-				keys.clear();
-				users.invalidateAll();
-				for (String string : userdir.list())
-				{
-					if (!string.endsWith(".yml"))
-					{
-						continue;
-					}
-					final String name = string.substring(0, string.length() - 4);
-					keys.add(Util.sanitizeFileName(name));
-				}
-			}
-		});
-	}
-
-	public boolean userExists(final String name)
-	{
-		return keys.contains(Util.sanitizeFileName(name));
-	}
-
-	public User getUser(final String name)
-	{
-		try
-		{
-			return users.get(name);
-		}
-		catch (ExecutionException ex)
-		{
-			return null;
-		}
-		catch (UncheckedExecutionException ex)
-		{
-			return null;
-		}
-	}
-
-	@Override
-	public User load(final String name) throws Exception
-	{
-		String sanitizedName = Util.sanitizeFileName(name);
-		if (!sanitizedName.equals(name))
-		{
-			User user = getUser(sanitizedName);
-			if (user == null)
-			{
-				throw new Exception("User not found!");
-			}
-			else
-			{
-				return user;
-			}
-		}
-		for (Player player : ess.getServer().getOnlinePlayers())
-		{
-			if (player.getName().equalsIgnoreCase(name))
-			{
-				keys.add(sanitizedName);
-				return new User(player, ess);
-			}
-		}
-		final File userFile = getUserFile2(sanitizedName);
-		if (userFile.exists())
-		{
-			keys.add(sanitizedName);
-			return new User(new OfflinePlayer(name, ess), ess);
-		}
-		throw new Exception("User not found!");
-	}
-
-	@Override
-	public void reloadConfig()
-	{
-		loadAllUsersAsync(ess);
-	}
-
-	public void removeUser(final String name)
-	{
-		keys.remove(Util.sanitizeFileName(name));
-		users.invalidate(Util.sanitizeFileName(name));
-		users.invalidate(name);
-	}
-
-	public Set<String> getAllUniqueUsers()
-	{
-		return Collections.unmodifiableSet(keys);
-	}
-
-	public int getUniqueUsers()
-	{
-		return keys.size();
-	}
-
-	public File getUserFile(final String name)
-	{
-		return getUserFile2(Util.sanitizeFileName(name));
-	}
-
-	private File getUserFile2(final String name)
-	{
-		final File userFolder = new File(ess.getDataFolder(), "userdata");
-		return new File(userFolder, name + ".yml");
-	}
-}
@@ -1,42 +1,92 @@
 package com.earth2me.essentials;

 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.IEssentials;
+import com.earth2me.essentials.api.ISettings;
+import com.earth2me.essentials.api.InvalidNameException;
+import com.earth2me.essentials.external.gnu.inet.encoding.Punycode;
+import com.earth2me.essentials.external.gnu.inet.encoding.PunycodeException;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.*;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import lombok.Cleanup;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;
+import org.bukkit.plugin.PluginManager;


-public class Util
+public final class Util
 {
 	private Util()
 	{
 	}
-	private final static Logger logger = Logger.getLogger("Minecraft");
-	private final static Pattern INVALIDFILECHARS = Pattern.compile("[^a-z0-9]");
+	private final static Pattern INVALIDFILECHARS = Pattern.compile("[^\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]");
 	private final static Pattern INVALIDCHARS = Pattern.compile("[^\t\n\r\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]");

-	//Used to clean file names before saving to disk
-	public static String sanitizeFileName(final String name)
+	public static String sanitizeFileName(String name) throws InvalidNameException
 	{
-		return safeString(name);
+		try
+		{
+			String r = name.toLowerCase(Locale.ENGLISH);
+			r = r.replace('.', (char)('\ue200' + '.'));
+			r = r.replace('\\', (char)('\ue200' + '\\'));
+			r = r.replace('/', (char)('\ue200' + '/'));
+			r = r.replace('"', (char)('\ue200' + '"'));
+			r = r.replace('<', (char)('\ue200' + '<'));
+			r = r.replace('>', (char)('\ue200' + '>'));
+			r = r.replace('|', (char)('\ue200' + '|'));
+			r = r.replace('?', (char)('\ue200' + '?'));
+			r = r.replace('*', (char)('\ue200' + '*'));
+			r = r.replace(':', (char)('\ue200' + ':'));
+			r = r.replace('-', (char)('\ue200' + '-'));
+			r = INVALIDFILECHARS.matcher(r).replaceAll("");
+			return Punycode.encode(r);
+		}
+		catch (PunycodeException ex)
+		{
+			throw new InvalidNameException(ex);
+		}
 	}

-	//Used to clean strings/names before saving as filenames/permissions
-	public static String safeString(final String string)
+	public static String decodeFileName(String name) throws InvalidNameException
 	{
-		return INVALIDFILECHARS.matcher(string.toLowerCase(Locale.ENGLISH)).replaceAll("_");
+		try
+		{
+			String r = Punycode.decode(name);
+			r = r.replace((char)('\ue200' + '.'), '.');
+			r = r.replace((char)('\ue200' + '\\'), '\\');
+			r = r.replace((char)('\ue200' + '/'), '/');
+			r = r.replace((char)('\ue200' + '"'), '"');
+			r = r.replace((char)('\ue200' + '<'), '<');
+			r = r.replace((char)('\ue200' + '>'), '>');
+			r = r.replace((char)('\ue200' + '|'), '|');
+			r = r.replace((char)('\ue200' + '?'), '?');
+			r = r.replace((char)('\ue200' + '*'), '*');
+			r = r.replace((char)('\ue200' + ':'), ':');
+			r = r.replace((char)('\ue200' + '-'), '-');
+			return r;
+		}
+		catch (PunycodeException ex)
+		{
+			throw new InvalidNameException(ex);
+		}
+	}
+
+	public static String sanitizeKey(String name)
+	{
+		return INVALIDCHARS.matcher(name.toLowerCase(Locale.ENGLISH)).replaceAll("_");
 	}

-	//Less restrictive string sanitizing, when not used as perm or filename
 	public static String sanitizeString(final String string)
 	{
 		return INVALIDCHARS.matcher(string).replaceAll("");
@@ -87,17 +137,11 @@ public class Util
 			_("second"),
 			_("seconds")
 		};
-		int accuracy = 0;
 		for (int i = 0; i < types.length; i++)
 		{
-			if (accuracy > 2)
-			{
-				break;
-			}
 			int diff = dateDiff(types[i], fromDate, toDate, future);
 			if (diff > 0)
 			{
-				accuracy++;
 				sb.append(" ").append(diff).append(" ").append(names[i * 2 + (diff > 1 ? 1 : 0)]);
 			}
 		}
@@ -105,7 +149,7 @@ public class Util
 		{
 			return "now";
 		}
-		return sb.toString().trim();
+		return sb.toString();
 	}

 	private static int dateDiff(int type, Calendar fromDate, Calendar toDate, boolean future)
@@ -222,13 +266,6 @@ public class Util
 		{
 			c.add(Calendar.SECOND, seconds * (future ? 1 : -1));
 		}
-
-		Calendar max = new GregorianCalendar();
-		max.add(Calendar.YEAR, 10);
-		if (c.after(max))
-		{
-			return max.getTimeInMillis();
-		}
 		return c.getTimeInMillis();
 	}
 	// The player can stand inside these materials 
@@ -262,7 +299,6 @@ public class Util
 		AIR_MATERIALS.add(Material.REDSTONE_TORCH_OFF.getId());
 		AIR_MATERIALS.add(Material.REDSTONE_TORCH_ON.getId());
 		AIR_MATERIALS.add(Material.STONE_BUTTON.getId());
-		AIR_MATERIALS.add(Material.SNOW.getId());
 		AIR_MATERIALS.add(Material.SUGAR_CANE_BLOCK.getId());
 		AIR_MATERIALS.add(Material.DIODE_BLOCK_OFF.getId());
 		AIR_MATERIALS.add(Material.DIODE_BLOCK_ON.getId());
@@ -270,10 +306,8 @@ public class Util
 		AIR_MATERIALS.add(Material.PUMPKIN_STEM.getId());
 		AIR_MATERIALS.add(Material.MELON_STEM.getId());
 		AIR_MATERIALS.add(Material.VINE.getId());
-		AIR_MATERIALS.add(Material.FENCE_GATE.getId());
-		AIR_MATERIALS.add(Material.WATER_LILY.getId());
-		AIR_MATERIALS.add(Material.NETHER_FENCE.getId());
 		AIR_MATERIALS.add(Material.NETHER_WARTS.getId());
+		AIR_MATERIALS.add(Material.WATER_LILY.getId());

 		for (Integer integer : AIR_MATERIALS)
 		{
@@ -292,46 +326,6 @@ public class Util
 		}
 		return block.getLocation();
 	}
-	public final static int RADIUS = 3;
-	public final static Vector3D[] VOLUME;
-
-
-	public static class Vector3D
-	{
-		public Vector3D(int x, int y, int z)
-		{
-			this.x = x;
-			this.y = y;
-			this.z = z;
-		}
-		public int x;
-		public int y;
-		public int z;
-	}
-
-	static
-	{
-		List<Vector3D> pos = new ArrayList<Vector3D>();
-		for (int x = -RADIUS; x <= RADIUS; x++)
-		{
-			for (int y = -RADIUS; y <= RADIUS; y++)
-			{
-				for (int z = -RADIUS; z <= RADIUS; z++)
-				{
-					pos.add(new Vector3D(x, y, z));
-				}
-			}
-		}
-		Collections.sort(pos, new Comparator<Vector3D>()
-		{
-			@Override
-			public int compare(Vector3D a, Vector3D b)
-			{
-				return (a.x * a.x + a.y * a.y + a.z * a.z) - (b.x * b.x + b.y * b.y + b.z * b.z);
-			}
-		});
-		VOLUME = pos.toArray(new Vector3D[0]);
-	}

 	public static Location getSafeDestination(final Location loc) throws Exception
 	{
@@ -343,54 +337,33 @@ public class Util
 		int x = loc.getBlockX();
 		int y = (int)Math.round(loc.getY());
 		int z = loc.getBlockZ();
-		final int origX = x;
-		final int origY = y;
-		final int origZ = z;

 		while (isBlockAboveAir(world, x, y, z))
 		{
 			y -= 1;
 			if (y < 0)
 			{
-				y = origY;
 				break;
 			}
 		}

-		int i = 0;
-		while (isBlockUnsafe(world, x, y, z))
-		{
-			i++;
-			if (i >= VOLUME.length)
-			{
-				x = origX;
-				y = origY + RADIUS;
-				z = origZ;
-				break;
-			}
-			x = origX + VOLUME[i].x;
-			y = origY + VOLUME[i].y;
-			z = origZ + VOLUME[i].z;
-		}
-
 		while (isBlockUnsafe(world, x, y, z))
 		{
 			y += 1;
-			if (y >= world.getMaxHeight())
+			if (y >= 127)
 			{
 				x += 1;
 				break;
 			}
 		}
-
 		while (isBlockUnsafe(world, x, y, z))
 		{
 			y -= 1;
 			if (y <= 1)
 			{
+				y = 127;
 				x += 1;
-				y = world.getHighestBlockYAt(x, z);
-				if (x - 48 > loc.getBlockX())
+				if (x - 32 > loc.getBlockX())
 				{
 					throw new Exception(_("holeInFloor"));
 				}
@@ -405,15 +378,6 @@ public class Util
 	}

 	public static boolean isBlockUnsafe(final World world, final int x, final int y, final int z)
-	{
-		if (isBlockDamaging(world, x, y, z))
-		{
-			return true;
-		}
-		return isBlockAboveAir(world, x, y, z);
-	}
-
-	public static boolean isBlockDamaging(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)
@@ -426,17 +390,12 @@ public class Util
 			return true;
 		}

-		if (below.getType() == Material.BED_BLOCK)
-		{
-			return true;
-		}
-
 		if ((!AIR_MATERIALS.contains(world.getBlockAt(x, y, z).getType().getId()))
 			|| (!AIR_MATERIALS.contains(world.getBlockAt(x, y + 1, z).getType().getId())))
 		{
 			return true;
 		}
-		return false;
+		return isBlockAboveAir(world, x, y, z);
 	}

 	public static ItemStack convertBlockToItem(final Block block)
@@ -520,11 +479,14 @@ public class Util
 		}
 		return is;
 	}
-	private static DecimalFormat dFormat = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US));
+	private static DecimalFormat df = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US));

-	public static String formatAsCurrency(final double value)
+	public static String formatCurrency(final double value, final IEssentials ess)
 	{
-		String str = dFormat.format(value);
+		@Cleanup
+		final ISettings settings = ess.getSettings();
+		settings.acquireReadLock();
+		String str = settings.getData().getEconomy().getCurrencySymbol() + df.format(value);
 		if (str.endsWith(".00"))
 		{
 			str = str.substring(0, str.length() - 3);
@@ -532,16 +494,6 @@ public class Util
 		return str;
 	}

-	public static String displayCurrency(final double value, final IEssentials ess)
-	{
-		return _("currency", ess.getSettings().getCurrencySymbol(), formatAsCurrency(value));
-	}
-
-	public static String shortCurrency(final double value, final IEssentials ess)
-	{
-		return ess.getSettings().getCurrencySymbol() + formatAsCurrency(value);
-	}
-
 	public static double roundDouble(final double d)
 	{
 		return Math.round(d * 100.0) / 100.0;
@@ -594,122 +546,104 @@ public class Util
 		return buf.toString();
 	}

-	public static String lastCode(final String input)
+	public static void registerPermissions(String path, Collection<String> nodes, boolean hasDefault, IEssentials ess)
 	{
-		int pos = input.lastIndexOf("§");
-		if (pos == -1 || (pos + 1) == input.length())
+		if (nodes == null || nodes.isEmpty())
 		{
-			return "";
+			return;
+		}
+		final PluginManager pluginManager = ess.getServer().getPluginManager();
+		Permission basePerm = pluginManager.getPermission(path + ".*");
+		if (basePerm != null && !basePerm.getChildren().isEmpty())
+		{
+			basePerm.getChildren().clear();
+		}
+		if (basePerm == null)
+		{
+			basePerm = new Permission(path + ".*", PermissionDefault.OP);
+			pluginManager.addPermission(basePerm);
+			Permission mainPerm = pluginManager.getPermission("essentials.*");
+			if (mainPerm == null)
+			{
+				mainPerm = new Permission("essentials.*", PermissionDefault.OP);
+				pluginManager.addPermission(mainPerm);
+			}
+			mainPerm.getChildren().put(basePerm.getName(), Boolean.TRUE);
 		}
-		return input.substring(pos, pos + 2);
-	}
-	private static transient final Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-z]{2,3}(?:/\\S+)?)");
-	private static transient final Pattern VANILLA_PATTERN = Pattern.compile("\u00A7+[0-9A-FK-ORa-fk-or]");
-	private static transient final Pattern LOGCOLOR_PATTERN = Pattern.compile("\\x1B\\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]");
-	private static transient final Pattern REPLACE_PATTERN = Pattern.compile("&([0-9a-fk-or])");
-	private static transient final Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00A7+[0-9A-Fa-f]");
-	private static transient final Pattern VANILLA_MAGIC_PATTERN = Pattern.compile("\u00A7+[Kk]");
-	private static transient final Pattern VANILLA_FORMAT_PATTERN = Pattern.compile("\u00A7+[L-ORl-or]");
-	private static transient final Pattern REPLACE_COLOR_PATTERN = Pattern.compile("&([0-9a-f])");
-	private static transient final Pattern REPLACE_MAGIC_PATTERN = Pattern.compile("&(k)");
-	private static transient final Pattern REPLACE_FORMAT_PATTERN = Pattern.compile("&([l-or])");

-	public static String stripFormat(final String input)
+		for (String nodeName : nodes)
+		{
+			final String permissionName = path + "." + nodeName;
+			Permission perm = pluginManager.getPermission(permissionName);
+			if (perm == null)
+			{
+				final PermissionDefault defaultPerm = hasDefault && nodeName.equalsIgnoreCase("default") ? PermissionDefault.TRUE : PermissionDefault.OP;
+				perm = new Permission(permissionName, defaultPerm);
+				pluginManager.addPermission(perm);
+			}
+			basePerm.getChildren().put(permissionName, Boolean.TRUE);
+		}
+		basePerm.recalculatePermissibles();
+	}
+	private static transient final Pattern DOT_PATTERN = Pattern.compile("\\.");
+
+	public static Permission registerPermission(String permission, PermissionDefault defaultPerm)
+	{
+		final PluginManager pluginManager = Bukkit.getServer().getPluginManager();
+		final String[] parts = DOT_PATTERN.split(permission);
+		final StringBuilder builder = new StringBuilder(permission.length());
+		Permission parent = null;
+		for (int i = 0; i < parts.length - 1; i++)
+		{
+			builder.append(parts[i]).append(".*");
+			String permString = builder.toString();
+			Permission perm = pluginManager.getPermission(permString);
+			if (perm == null)
+			{
+				perm = new Permission(permString, PermissionDefault.FALSE);
+				pluginManager.addPermission(perm);
+				if (parent != null)
+				{
+					parent.getChildren().put(perm.getName(), Boolean.TRUE);
+				}
+				parent = perm;
+			}
+			builder.deleteCharAt(builder.length() - 1);
+		}
+		Permission perm = pluginManager.getPermission(permission);
+		if (perm == null)
+		{
+			perm = new Permission(permission, defaultPerm);
+			pluginManager.addPermission(perm);
+			if (parent != null)
+			{
+				parent.getChildren().put(perm.getName(), Boolean.TRUE);
+			}
+			parent = perm;
+		}
+		perm.recalculatePermissibles();
+		return perm;
+	}
+	private static transient final Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00A7+[0-9A-FKa-fk]");
+	private static transient final Pattern EASY_COLOR_PATTERN = Pattern.compile("&([0-9a-fk])");
+
+	public static String stripColor(final String input)
 	{
 		if (input == null)
 		{
 			return null;
 		}
-		return VANILLA_PATTERN.matcher(input).replaceAll("");
+
+		return VANILLA_COLOR_PATTERN.matcher(input).replaceAll("");
 	}

-	public static String stripLogColorFormat(final String input)
+	public static String replaceColor(final String input)
 	{
 		if (input == null)
 		{
 			return null;
 		}
-		return LOGCOLOR_PATTERN.matcher(input).replaceAll("");
-	}

-	public static String replaceFormat(final String input)
-	{
-		if (input == null)
-		{
-			return null;
-		}
-		return REPLACE_PATTERN.matcher(input).replaceAll("\u00a7$1");
-	}
-
-	public static String blockURL(final String input)
-	{
-		if (input == null)
-		{
-			return null;
-		}
-		String text = URL_PATTERN.matcher(input).replaceAll("$1 $2");
-		while (URL_PATTERN.matcher(text).find())
-		{
-			text = URL_PATTERN.matcher(text).replaceAll("$1 $2");
-		}
-		return text;
-	}
-
-	public static String formatString(final IUser user, final String permBase, final String input)
-	{
-		if (input == null)
-		{
-			return null;
-		}
-		String message;
-		if (user.isAuthorized(permBase + ".color"))
-		{
-			message = Util.replaceColor(input, REPLACE_COLOR_PATTERN);
-		}
-		else
-		{
-			message = Util.stripColor(input, VANILLA_COLOR_PATTERN);
-		}
-		if (user.isAuthorized(permBase + ".magic"))
-		{
-			message = Util.replaceColor(message, REPLACE_MAGIC_PATTERN);
-		}
-		else
-		{
-			message = Util.stripColor(message, VANILLA_MAGIC_PATTERN);
-		}
-		if (user.isAuthorized(permBase + ".format"))
-		{
-			message = Util.replaceColor(message, REPLACE_FORMAT_PATTERN);
-		}
-		else
-		{
-			message = Util.stripColor(message, VANILLA_FORMAT_PATTERN);
-		}
-		return message;
-	}
-
-	public static String formatMessage(final IUser user, final String permBase, final String input)
-	{
-		if (input == null)
-		{
-			return null;
-		}
-		String message = formatString(user, permBase, input);
-		if (!user.isAuthorized(permBase + ".url"))
-		{
-			message = Util.blockURL(message);
-		}
-		return message;
-	}
-
-	private static String stripColor(final String input, final Pattern pattern)
-	{
-		return pattern.matcher(input).replaceAll("");
-	}
-
-	private static String replaceColor(final String input, final Pattern pattern)
-	{
-		return pattern.matcher(input).replaceAll("\u00a7$1");
+		return EASY_COLOR_PATTERN.matcher(input).replaceAll("\u00a7$1");
 	}
 }
@@ -1,129 +1,121 @@
 package com.earth2me.essentials;

 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.IEssentials;
+import com.earth2me.essentials.api.IWarp;
+import com.earth2me.essentials.api.IWarps;
+import com.earth2me.essentials.api.InvalidNameException;
 import com.earth2me.essentials.commands.WarpNotFoundException;
+import com.earth2me.essentials.settings.WarpHolder;
+import com.earth2me.essentials.storage.StorageObjectMap;
 import java.io.File;
-import java.io.IOException;
 import java.util.*;
-import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.Server;


-public class Warps implements IConf
+public class Warps extends StorageObjectMap<IWarp> implements IWarps
 {
-	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;
+	private static final Logger logger = Bukkit.getLogger();

-	public Warps(Server server, File dataFolder)
+	public Warps(IEssentials ess)
 	{
-		this.server = server;
-		warpsFolder = new File(dataFolder, "warps");
-		if (!warpsFolder.exists())
-		{
-			warpsFolder.mkdirs();
-		}
-		reloadConfig();
-	}
-
-	public boolean isEmpty()
-	{
-		return warpPoints.isEmpty();
-	}
-
-	public Collection<String> getWarpNames()
-	{
-		final List<String> keys = new ArrayList<String>();
-		for (StringIgnoreCase stringIgnoreCase : warpPoints.keySet())
-		{
-			keys.add(stringIgnoreCase.getString());
-		}
-		Collections.sort(keys, String.CASE_INSENSITIVE_ORDER);
-		return keys;
-	}
-
-	public Location getWarp(String warp) throws Exception
-	{
-		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(warp));
-		if (conf == null)
-		{
-			throw new WarpNotFoundException();
-		}
-		return conf.getLocation(null, server);
-	}
-
-	public void setWarp(String name, Location loc) throws Exception
-	{
-		String filename = Util.sanitizeFileName(name);
-		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
-		if (conf == null)
-		{
-			File confFile = new File(warpsFolder, filename + ".yml");
-			if (confFile.exists())
-			{
-				throw new Exception(_("similarWarpExist"));
-			}
-			conf = new EssentialsConf(confFile);
-			warpPoints.put(new StringIgnoreCase(name), conf);
-		}
-		conf.setProperty(null, loc);
-		conf.setProperty("name", name);
-		try
-		{
-			conf.saveWithError();
-		}
-		catch (IOException ex)
-		{
-			throw new IOException(_("invalidWarpName"));
-		}
-	}
-
-	public void delWarp(String name) throws Exception
-	{
-		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
-		if (conf == null)
-		{
-			throw new Exception(_("warpNotExist"));
-		}
-		if (!conf.getFile().delete())
-		{
-			throw new Exception(_("warpDeleteError"));
-		}
-		warpPoints.remove(new StringIgnoreCase(name));
+		super(ess, "warps");
 	}

 	@Override
-	public final void reloadConfig()
+	public boolean isEmpty()
 	{
-		warpPoints.clear();
-		File[] listOfFiles = warpsFolder.listFiles();
-		if (listOfFiles.length >= 1)
+		return getKeySize() == 0;
+	}
+
+	@Override
+	public Collection<String> getList()
+	{
+		final List<String> names = new ArrayList<String>();
+		for (String key : getAllKeys())
 		{
-			for (int i = 0; i < listOfFiles.length; i++)
+			IWarp warp = getObject(key);
+			if (warp == null)
 			{
-				String filename = listOfFiles[i].getName();
-				if (listOfFiles[i].isFile() && filename.endsWith(".yml"))
-				{
-					try
-					{
-						EssentialsConf conf = new EssentialsConf(listOfFiles[i]);
-						conf.load();
-						String name = conf.getString("name");
-						if (name != null)
-						{
-							warpPoints.put(new StringIgnoreCase(name), conf);
-						}
-					}
-					catch (Exception ex)
-					{
-						logger.log(Level.WARNING, _("loadWarpError", filename), ex);
-					}
-				}
+				continue;
+			}
+			warp.acquireReadLock();
+			try
+			{
+				names.add(warp.getData().getName());
+			}
+			finally
+			{
+				warp.unlock();
 			}
 		}
+		Collections.sort(names, String.CASE_INSENSITIVE_ORDER);
+		return names;
+	}
+
+	@Override
+	public Location getWarp(final String name) throws Exception
+	{
+		IWarp warp = getObject(name);
+		if (warp == null)
+		{
+			throw new WarpNotFoundException(_("warpNotExist"));
+		}
+		warp.acquireReadLock();
+		try
+		{
+			return warp.getData().getLocation().getBukkitLocation();
+		}
+		finally
+		{
+			warp.unlock();
+		}
+	}
+
+	@Override
+	public void setWarp(final String name, final Location loc) throws Exception
+	{
+		setWarp(name, new com.earth2me.essentials.storage.Location(loc));
+	}
+	
+	public void setWarp(final String name, final com.earth2me.essentials.storage.Location loc) throws Exception
+	{
+		IWarp warp = getObject(name);
+		if (warp == null)
+		{
+			warp = new WarpHolder(name, ess);
+		}
+		warp.acquireWriteLock();
+		try
+		{
+			warp.getData().setLocation(loc);
+		}
+		finally
+		{
+			warp.unlock();
+		}
+	}
+
+	@Override
+	public void removeWarp(final String name) throws Exception
+	{
+		removeObject(name);
+	}
+
+	@Override
+	public File getWarpFile(String name) throws InvalidNameException
+	{
+		return getStorageFile(name);
+	}
+
+	@Override
+	public IWarp load(String name) throws Exception
+	{
+		final IWarp warp = new WarpHolder(name, ess);
+		warp.onReload();
+		return warp;
 	}


@@ -1,61 +1,86 @@
 package com.earth2me.essentials;

+import com.earth2me.essentials.api.IEssentials;
+import com.earth2me.essentials.api.IWorth;
+import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
+import com.earth2me.essentials.storage.EnchantmentLevel;
 import java.io.File;
-import java.util.Locale;
-import java.util.logging.Logger;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.material.MaterialData;


-public class Worth implements IConf
+public class Worth extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Worth> implements IWorth
 {
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	private final EssentialsConf config;
-
-	public Worth(File dataFolder)
+	public Worth(final IEssentials ess)
 	{
-		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(Locale.ENGLISH).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(Locale.ENGLISH).replace("_", ""), price);
-		}
-		else
-		{
-			// Bukkit-bug: getDurability still contains the correct value, while getData().getData() is 0.
-			config.setProperty("worth." + itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "") + "." + itemStack.getDurability(), price);
-		}
-		config.removeProperty("worth-" + itemStack.getTypeId());
-		config.save();
+		super(ess, com.earth2me.essentials.settings.Worth.class);
+		onReload(false);
 	}

 	@Override
-	public void reloadConfig()
+	public double getPrice(final ItemStack itemStack)
 	{
-		config.load();
+		this.acquireReadLock();
+		try
+		{
+			final Map<MaterialData, Double> prices = this.getData().getSell();
+			if (prices == null || itemStack == null)
+			{
+				return Double.NaN;
+			}
+			final Double basePrice = prices.get(itemStack.getData());
+			if (basePrice == null || Double.isNaN(basePrice))
+			{
+				return Double.NaN;
+			}
+			double multiplier = 1.0;
+			if (itemStack.getType().getMaxDurability() > 0) {
+				multiplier *= (double)itemStack.getDurability() / (double)itemStack.getType().getMaxDurability();
+			}
+			if (itemStack.getEnchantments() != null && !itemStack.getEnchantments().isEmpty())
+			{
+				final Map<EnchantmentLevel, Double> enchantmentMultipliers = this.getData().getEnchantmentMultiplier();
+				if (enchantmentMultipliers != null)
+				{
+					for (Map.Entry<Enchantment, Integer> entry : itemStack.getEnchantments().entrySet())
+					{
+						final Double enchMult = enchantmentMultipliers.get(new EnchantmentLevel(entry.getKey(), entry.getValue()));
+						if (enchMult != null)
+						{
+							multiplier *= enchMult;
+						}
+					}
+				}
+			}
+			return basePrice * multiplier;
+		}
+		finally
+		{
+			this.unlock();
+		}
+	}
+
+	@Override
+	public void setPrice(final ItemStack itemStack, final double price)
+	{
+		acquireWriteLock();
+		try {
+			if (getData().getSell() == null) {
+				getData().setSell(new HashMap<MaterialData, Double>());
+			}
+			getData().getSell().put(itemStack.getData(), price);
+		} finally {
+			unlock();
+		}
+	}
+
+	@Override
+	public File getStorageFile() throws IOException
+	{
+		return new File(ess.getDataFolder(), "worth.yml");
 	}
 }
@@ -1,4 +1,4 @@
-package com.earth2me.essentials;
+package com.earth2me.essentials.api;


 public class ChargeException extends Exception
@@ -0,0 +1,7 @@
+package com.earth2me.essentials.api;
+
+
+public interface IBackup extends Runnable
+{
+	public void startTask();
+}
@@ -0,0 +1,20 @@
+package com.earth2me.essentials.api;
+
+import java.util.Map;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.Plugin;
+
+
+public interface ICommandHandler extends IReload
+{
+	Map<String, String> disabledCommands();
+
+	public void removePlugin(Plugin plugin);
+
+	public void addPlugin(Plugin plugin);
+
+	boolean handleCommand(CommandSender sender, Command command, String commandLabel, String[] args);
+
+	void showCommandError(CommandSender sender, String commandLabel, Throwable exception);
+}
@@ -0,0 +1,21 @@
+package com.earth2me.essentials.api;
+
+
+public interface IEconomy extends IReload
+{
+	public double getMoney(String name) throws UserDoesNotExistException;
+
+	public void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException;
+
+	public void resetBalance(String name) throws UserDoesNotExistException, NoLoanPermittedException;
+
+	public String format(double amount);
+
+	public boolean playerExists(String name);
+
+	public boolean isNPC(String name) throws UserDoesNotExistException;
+
+	public boolean createNPC(String name);
+
+	public void removeNPC(String name) throws UserDoesNotExistException;
+}
@@ -0,0 +1,64 @@
+package com.earth2me.essentials.api;
+
+import com.earth2me.essentials.listener.TntExplodeListener;
+import com.earth2me.essentials.register.payment.Methods;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+
+public interface IEssentials extends Plugin
+{
+	void addReloadListener(IReload listener);
+
+	IUser getUser(Player player);
+
+	IUser getUser(String playerName);
+
+	int broadcastMessage(IUser sender, String message);
+
+	II18n getI18n();
+
+	ISettings getSettings();
+
+	IGroups getGroups();
+
+	IJails getJails();
+
+	IKits getKits();
+
+	IWarps getWarps();
+
+	IWorth getWorth();
+
+	IItemDb getItemDb();
+
+	IUserMap getUserMap();
+
+	IBackup getBackup();
+
+	ICommandHandler getCommandHandler();
+
+	World getWorld(String name);
+
+	Methods getPaymentMethod();
+
+	int scheduleAsyncDelayedTask(Runnable run);
+
+	int scheduleSyncDelayedTask(Runnable run);
+
+	int scheduleSyncDelayedTask(Runnable run, long delay);
+
+	int scheduleSyncRepeatingTask(Runnable run, long delay, long period);
+
+	//IPermissionsHandler getPermissionsHandler();
+	void reload();
+
+	TntExplodeListener getTNTListener();
+
+	void setGroups(IGroups groups);
+
+	void removeReloadListener(IReload groups);
+
+	IEconomy getEconomy();
+}
@@ -1,4 +1,4 @@
-package com.earth2me.essentials;
+package com.earth2me.essentials.api;


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


-public interface IItemDb
+public interface IItemDb extends IReload
 {
+	ItemStack get(final String name, final IUser user) throws Exception;
+
 	ItemStack get(final String name, final int quantity) throws Exception;
-	
+
 	ItemStack get(final String name) throws Exception;
 }
@@ -10,11 +10,9 @@ public interface IJails extends IReload

 	Collection<String> getList() throws Exception;

-	int getCount();
-
 	void removeJail(String jail) throws Exception;

-	void sendToJail(com.earth2me.essentials.IUser user, String jail) throws Exception;
+	void sendToJail(IUser user, String jail) throws Exception;

 	void setJail(String jailName, Location loc) throws Exception;
 }
@@ -0,0 +1,18 @@
+package com.earth2me.essentials.api;
+
+import com.earth2me.essentials.settings.Kit;
+import java.util.Collection;
+
+
+public interface IKits extends IReload
+{
+	Kit getKit(String kit) throws Exception;
+
+	void sendKit(IUser user, String kit) throws Exception;
+
+	void sendKit(IUser user, Kit kit) throws Exception;
+
+	Collection<String> getList() throws Exception;
+
+	boolean isEmpty();
+}
@@ -0,0 +1,17 @@
+package com.earth2me.essentials.api;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;
+
+
+public interface IPermission
+{
+	String getPermission();
+
+	boolean isAuthorized(CommandSender sender);
+
+	Permission getBukkitPermission();
+
+	PermissionDefault getPermissionDefault();
+}
@@ -0,0 +1,11 @@
+package com.earth2me.essentials.api;
+
+import org.bukkit.command.CommandSender;
+
+
+public interface IReplyTo
+{
+	void setReplyTo(CommandSender user);
+
+	CommandSender getReplyTo();
+}
@@ -0,0 +1,14 @@
+package com.earth2me.essentials.api;
+
+import com.earth2me.essentials.settings.Settings;
+import com.earth2me.essentials.storage.IStorageObjectHolder;
+
+
+public interface ISettings extends IStorageObjectHolder<Settings>
+{
+	public String getLocale();
+
+	public boolean isDebug();
+
+	public void setDebug(boolean b);
+}
@@ -1,10 +1,28 @@
 package com.earth2me.essentials.api;

+import com.earth2me.essentials.Trade;
 import org.bukkit.Location;
+import org.bukkit.entity.Entity;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;


 public interface ITeleport
 {
 	void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception;
+
+	void now(Entity entity, boolean cooldown, TeleportCause cause) throws Exception;
+
+	void back(Trade chargeFor) throws Exception;
+
+	void teleport(Location bed, Trade charge, TeleportCause teleportCause) throws Exception;
+
+	void teleport(Entity entity, Trade chargeFor, TeleportCause cause) throws Exception;
+
+	void home(IUser player, String toLowerCase, Trade charge) throws Exception;
+
+	void respawn(Trade charge, TeleportCause teleportCause) throws Exception;
+
+	void back() throws Exception;
+
+	public void warp(String name, Trade charge, TeleportCause teleportCause) throws Exception;
 }
@@ -0,0 +1,104 @@
+package com.earth2me.essentials.api;
+
+import com.earth2me.essentials.storage.IStorageObjectHolder;
+import com.earth2me.essentials.user.CooldownException;
+import com.earth2me.essentials.user.UserData;
+import java.util.List;
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+
+public interface IUser extends Player, IStorageObjectHolder<UserData>, IReload, IReplyTo, Comparable<IUser>
+{
+	Player getBase();
+
+	double getMoney();
+
+	void takeMoney(double value);
+
+	void takeMoney(double value, CommandSender initiator);
+
+	void giveMoney(double value);
+
+	void giveMoney(double value, CommandSender initiator);
+
+	void giveItems(ItemStack itemStack, Boolean canSpew) throws ChargeException;
+
+	void giveItems(List<ItemStack> itemStacks, Boolean canSpew) throws ChargeException;
+
+	void setMoney(double value);
+
+	void payUser(final IUser reciever, final double value) throws Exception;
+
+	void setLastLocation();
+
+	Location getHome(String name) throws Exception;
+
+	Location getHome(Location loc);
+
+	boolean isHidden();
+
+	ITeleport getTeleport();
+
+	void checkCooldown(UserData.TimestampType cooldownType, double cooldown, boolean set, IPermission bypassPermission) throws CooldownException;
+
+	boolean toggleAfk();
+
+	void updateActivity(boolean broadcast);
+
+	void updateDisplayName();
+
+	boolean checkJailTimeout(long currentTime);
+
+	boolean checkMuteTimeout(long currentTime);
+
+	boolean checkBanTimeout(long currentTime);
+
+	long getTimestamp(UserData.TimestampType name);
+
+	void setTimestamp(UserData.TimestampType name, long value);
+
+	void setLastOnlineActivity(long currentTime);
+
+	void checkActivity();
+
+	long getLastOnlineActivity();
+
+	boolean isGodModeEnabled();
+
+	boolean isIgnoringPlayer(String name);
+
+	void setIgnoredPlayer(String name, boolean set);
+
+	Location getAfkPosition();
+
+	boolean toggleGodModeEnabled();
+
+	void dispose();
+
+	void updateCompass();
+
+	List<String> getHomes();
+
+	void addMail(String string);
+
+	boolean toggleMuted();
+
+	boolean toggleSocialSpy();
+
+	void requestTeleport(IUser user, boolean b);
+
+	boolean isTeleportRequestHere();
+
+	IUser getTeleportRequester();
+
+	boolean toggleTeleportEnabled();
+
+	long getTeleportRequestTime();
+
+	boolean gotMailInfo();
+
+	List<String> getMails();
+}
@@ -0,0 +1,23 @@
+package com.earth2me.essentials.api;
+
+import java.io.File;
+import java.util.Set;
+import org.bukkit.entity.Player;
+
+
+public interface IUserMap extends IReload
+{
+	boolean userExists(final String name);
+
+	IUser getUser(final Player player);
+
+	IUser getUser(final String playerName);
+
+	void removeUser(final String name) throws InvalidNameException;
+
+	Set<String> getAllUniqueUsers();
+
+	int getUniqueUsers();
+
+	File getUserFile(final String name) throws InvalidNameException;
+}
@@ -0,0 +1,9 @@
+package com.earth2me.essentials.api;
+
+import com.earth2me.essentials.settings.Warp;
+import com.earth2me.essentials.storage.IStorageObjectHolder;
+
+
+public interface IWarp extends IStorageObjectHolder<Warp>
+{
+}
@@ -0,0 +1,21 @@
+package com.earth2me.essentials.api;
+
+import java.io.File;
+import java.util.Collection;
+import org.bukkit.Location;
+
+
+public interface IWarps extends IReload
+{
+	Location getWarp(String warp) throws Exception;
+
+	Collection<String> getList();
+
+	void removeWarp(String name) throws Exception;
+
+	void setWarp(String name, Location loc) throws Exception;
+
+	public boolean isEmpty();
+
+	public File getWarpFile(String name) throws InvalidNameException;
+}
@@ -0,0 +1,11 @@
+package com.earth2me.essentials.api;
+
+import org.bukkit.inventory.ItemStack;
+
+
+public interface IWorth extends IReload
+{
+	double getPrice(ItemStack itemStack);
+
+	void setPrice(ItemStack itemStack, double price);
+}
@@ -0,0 +1,10 @@
+package com.earth2me.essentials.api;
+
+
+public class InvalidNameException extends Exception
+{
+	public InvalidNameException(Throwable thrwbl)
+	{
+		super(thrwbl);
+	}
+}
@@ -1,23 +1,20 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import org.bukkit.Server;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.perm.Permissions;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;


 public class Commandafk extends EssentialsCommand
 {
-	public Commandafk()
-	{
-		super("afk");
-	}
-
 	@Override
-	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
-		if (args.length > 0 && user.isAuthorized("essentials.afk.others"))
+		if (args.length > 0 && Permissions.AFK_OTHERS.isAuthorized(user))
 		{
-			User afkUser = ess.getUser(ess.getServer().matchPlayer(args[0]));
+			IUser afkUser = ess.getUser((Player)ess.getServer().matchPlayer(args[0]));
 			if (afkUser != null)
 			{
 				toggleAfk(afkUser);
@@ -29,16 +26,14 @@ public class Commandafk extends EssentialsCommand
 		}
 	}

-	private void toggleAfk(User user)
+	private void toggleAfk(IUser user)
 	{
-		user.setDisplayNick();
-		String msg = "";
 		if (!user.toggleAfk())
 		{
 			//user.sendMessage(_("markedAsNotAway"));
 			if (!user.isHidden())
 			{
-				msg = _("userIsNotAway", user.getDisplayName());
+				ess.broadcastMessage(user, _("userIsNotAway", user.getDisplayName()));
 			}
 			user.updateActivity(false);
 		}
@@ -47,12 +42,14 @@ public class Commandafk extends EssentialsCommand
 			//user.sendMessage(_("markedAsAway"));
 			if (!user.isHidden())
 			{
-				msg = _("userIsAway", user.getDisplayName());
+				ess.broadcastMessage(user, _("userIsAway", user.getDisplayName()));
 			}
 		}
-		if (!msg.isEmpty())
-		{
-			ess.broadcastMessage(user, msg);
-		}
+	}
+	
+	@Override
+	public PermissionDefault getPermissionDefault()
+	{
+		return PermissionDefault.TRUE;
 	}
 }
@@ -1,27 +1,18 @@
 package com.earth2me.essentials.commands;

-import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
+import com.earth2me.essentials.api.IUser;
 import org.bukkit.Location;
-import org.bukkit.Server;
 import org.bukkit.entity.TNTPrimed;

-// This command has a in theme message that only shows if you supply a parameter #EasterEgg
+
 public class Commandantioch extends EssentialsCommand
 {
-	public Commandantioch()
-	{
-		super("antioch");
-	}
-
 	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
-		if (args.length > 0)
-		{
-			ess.broadcastMessage(user, "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,");
-			ess.broadcastMessage(user, "who being naughty in My sight, shall snuff it.");
-		}		
+		ess.broadcastMessage(user, "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,");
+		ess.broadcastMessage(user, "who being naughty in My sight, shall snuff it.");

 		final Location loc = Util.getTarget(user);
 		loc.getWorld().spawn(loc, TNTPrimed.class);
@@ -2,26 +2,15 @@ package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.User;
-import org.bukkit.Server;
+import com.earth2me.essentials.api.IUser;


 public class Commandback extends EssentialsCommand
 {
-	public Commandback()
-	{
-		super("back");
-	}
-
 	@Override
-	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
-		if (user.getWorld() != user.getLastLocation().getWorld() && ess.getSettings().isWorldTeleportPermissions()
-			&& !user.isAuthorized("essentials.worlds." + user.getLastLocation().getWorld().getName()))
-		{
-			throw new Exception(_("noPerm", "essentials.worlds." + user.getLastLocation().getWorld().getName()));
-		}
-		final Trade charge = new Trade(this.getName(), ess);
+		final Trade charge = new Trade(commandName, ess);
 		charge.isAffordableFor(user);
 		user.sendMessage(_("backUsageMsg"));
 		user.getTeleport().back(charge);
@@ -1,31 +1,16 @@
 package com.earth2me.essentials.commands;

-import com.earth2me.essentials.Backup;
 import static com.earth2me.essentials.I18n._;
-import org.bukkit.Server;
+import com.earth2me.essentials.api.IBackup;
 import org.bukkit.command.CommandSender;


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

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
-import org.bukkit.Server;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.perm.Permissions;
 import org.bukkit.command.CommandSender;


 public class Commandbalance extends EssentialsCommand
 {
-	public Commandbalance()
-	{
-		super("balance");
-	}
-
 	@Override
-	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		sender.sendMessage(_("balance", Util.displayCurrency(getPlayer(server, args, 0, true).getMoney(), ess)));
+		sender.sendMessage(_("balance", Util.formatCurrency(getPlayer(args, 0, true).getMoney(), ess)));
 	}

 	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
-		//TODO: Remove 'other' perm
 		final double bal = (args.length < 1
-							|| !(user.isAuthorized("essentials.balance.others")
-								 || user.isAuthorized("essentials.balance.other"))
+							|| !Permissions.BALANCE_OTHERS.isAuthorized(user)
 							? user
-							: getPlayer(server, args, 0, true)).getMoney();
-		user.sendMessage(_("balance", Util.displayCurrency(bal, ess)));
+							: getPlayer(args, 0, true)).getMoney();
+		user.sendMessage(_("balance", Util.formatCurrency(bal, ess)));
 	}
 }
@@ -1,24 +1,19 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
+import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.textreader.ArrayListInput;
 import com.earth2me.essentials.textreader.TextPager;
 import java.text.DateFormat;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.bukkit.Server;
 import org.bukkit.command.CommandSender;


 public class Commandbalancetop extends EssentialsCommand
 {
-	public Commandbalancetop()
-	{
-		super("balancetop");
-	}
 	private static final int CACHETIME = 2 * 60 * 1000;
 	public static final int MINUSERS = 50;
 	private static ArrayListInput cache = new ArrayListInput();
@@ -26,7 +21,7 @@ public class Commandbalancetop extends EssentialsCommand
 	private static ReentrantReadWriteLock lock = new ReentrantReadWriteLock();

 	@Override
-	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		int page = 0;
 		boolean force = false;
@@ -105,18 +100,14 @@ public class Commandbalancetop extends EssentialsCommand
 			{
 				if (force || cacheage <= System.currentTimeMillis() - CACHETIME)
 				{
-					cache.getLines().clear();					
+					cache.getLines().clear();
 					final Map<String, Double> balances = new HashMap<String, Double>();
-					double totalMoney = 0d;
 					for (String u : ess.getUserMap().getAllUniqueUsers())
 					{
-						final User user = ess.getUserMap().getUser(u);
+						final IUser user = ess.getUserMap().getUser(u);
 						if (user != null)
 						{
-							final double userMoney = user.getMoney();
-							user.updateMoneyCache(userMoney);
-							totalMoney += userMoney;
-							balances.put(user.getDisplayName(), userMoney);
+							balances.put(user.getDisplayName(), user.getMoney());
 						}
 					}

@@ -129,12 +120,10 @@ public class Commandbalancetop extends EssentialsCommand
 							return -entry1.getValue().compareTo(entry2.getValue());
 						}
 					});
-					
-					cache.getLines().add(_("serverTotal", Util.displayCurrency(totalMoney, ess)));
 					int pos = 1;
 					for (Map.Entry<String, Double> entry : sortedEntries)
 					{
-						cache.getLines().add(pos + ". " + entry.getKey() + ", " + Util.displayCurrency(entry.getValue(), ess));
+						cache.getLines().add(pos + ". " + entry.getKey() + ", " + Util.formatCurrency(entry.getValue(), ess));
 						pos++;
 					}
 					cacheage = System.currentTimeMillis();
@@ -2,43 +2,28 @@ package com.earth2me.essentials.commands;

 import com.earth2me.essentials.Console;
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.OfflinePlayer;
-import com.earth2me.essentials.User;
-import java.util.logging.Level;
-import org.bukkit.Server;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.user.Ban;
+import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
 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
+	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
-		boolean nomatch = false;
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		User user;
-		try
+		@Cleanup
+		final IUser user = getPlayer(args, 0, true);
+		if (user.isOnline())
 		{
-			user = getPlayer(server, args, 0, true);
-		}
-		catch (NoSuchFieldException e)
-		{
-			nomatch = true;
-			user = ess.getUser(new OfflinePlayer(args[0], ess));
-		}
-		if (!user.isOnline())
-		{
-			if (sender instanceof Player
-				&& !ess.getUser(sender).isAuthorized("essentials.ban.offline"))
+			if (Permissions.BAN_EXEMPT.isAuthorized(user))
 			{
 				sender.sendMessage(_("banExempt"));
 				return;
@@ -46,38 +31,33 @@ public class Commandban extends EssentialsCommand
 		}
 		else
 		{
-			if (user.isAuthorized("essentials.ban.exempt") && sender instanceof Player)
+			if (Permissions.BAN_OFFLINE.isAuthorized(sender))
 			{
 				sender.sendMessage(_("banExempt"));
 				return;
 			}
 		}

-		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
+		user.acquireWriteLock();
 		String banReason;
+		user.getData().setBan(new Ban());
 		if (args.length > 1)
 		{
-			banReason = _("banFormat", getFinalArg(args, 1), senderName);
+			banReason = getFinalArg(args, 1);
+			user.getData().getBan().setReason(banReason);
 		}
 		else
 		{
-			banReason = _("banFormat", _("defaultBanReason"), senderName);
+			banReason = _("defaultBanReason");
 		}
-
-		user.setBanReason(banReason);
 		user.setBanned(true);
 		user.kickPlayer(banReason);
-		
-		server.getLogger().log(Level.INFO, _("playerBanned", senderName, user.getName(), banReason));
-		
-		if (nomatch) {
-			sender.sendMessage(_("userUnknown", user.getName()));
-		}
+		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;

 		for (Player onlinePlayer : server.getOnlinePlayers())
 		{
-			final User player = ess.getUser(onlinePlayer);
-			if (onlinePlayer == sender || player.isAuthorized("essentials.ban.notify"))
+			final IUser player = ess.getUser(onlinePlayer);
+			if (Permissions.BAN_NOTIFY.isAuthorized(player))
 			{
 				onlinePlayer.sendMessage(_("playerBanned", senderName, user.getName(), banReason));
 			}
@@ -1,27 +1,24 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import org.bukkit.Server;
+import com.earth2me.essentials.api.IUser;
+import lombok.Cleanup;
 import org.bukkit.command.CommandSender;


 public class Commandbanip extends EssentialsCommand
 {
-	public Commandbanip()
-	{
-		super("banip");
-	}
-
 	@Override
-	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}

-		final User player = ess.getUser(args[0]);
+		@Cleanup
+		final IUser player = ess.getUser(args[0]);
+		player.acquireReadLock();

 		if (player == null)
 		{
@@ -30,12 +27,12 @@ public class Commandbanip extends EssentialsCommand
 		}
 		else
 		{
-			final String ipAddress = player.getLastLoginAddress();
+			final String ipAddress = player.getData().getIpAddress();
 			if (ipAddress.length() == 0)
 			{
 				throw new Exception(_("playerNotFound"));
 			}
-			ess.getServer().banIP(player.getLastLoginAddress());
+			ess.getServer().banIP(player.getData().getIpAddress());
 			sender.sendMessage(_("banIpAddress"));
 		}
 	}
@@ -1,22 +1,16 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
+import com.earth2me.essentials.api.IUser;
 import org.bukkit.Location;
-import org.bukkit.Server;
 import org.bukkit.TreeType;


 public class Commandbigtree extends EssentialsCommand
 {
-	public Commandbigtree()
-	{
-		super("bigtree");
-	}
-
 	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
 		TreeType tree;
 		if (args.length > 0 && args[0].equalsIgnoreCase("redwood"))
@@ -27,10 +21,6 @@ public class Commandbigtree extends EssentialsCommand
 		{
 			tree = TreeType.BIG_TREE;
 		}
-		else if (args.length > 0 && args[0].equalsIgnoreCase("jungle"))
-		{
-			tree = TreeType.JUNGLE;
-		}
 		else
 		{
 			throw new NotEnoughArgumentsException();
@@ -1,23 +1,17 @@
 package com.earth2me.essentials.commands;

-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.perm.Permissions;
 import org.bukkit.Material;
-import org.bukkit.Server;
 import org.bukkit.block.Block;
 import org.bukkit.event.block.BlockBreakEvent;


 public class Commandbreak extends EssentialsCommand
 {
-	public Commandbreak()
-	{
-		super("break");
-	}
-
 	//TODO: Switch to use util class
 	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
 		final Block block = user.getTargetBlock(null, 20);
 		if (block == null)
@@ -28,12 +22,10 @@ public class Commandbreak extends EssentialsCommand
 		{
 			throw new NoChargeException();
 		}
-		if (block.getType() == Material.BEDROCK && !user.isAuthorized("essentials.break.bedrock"))
+		if (block.getType() == Material.BEDROCK && !Permissions.BREAK_BEDROCK.isAuthorized(user))
 		{
-			throw new Exception(_("noBreakBedrock"));
+			throw new Exception("You are not allowed to destroy bedrock."); //TODO: Translation
 		}
-		//final List<ItemStack> list = (List<ItemStack>)block.getDrops();		
-		//final BlockBreakEvent event = new BlockBreakEvent(block, user.getBase(), list);
 		final BlockBreakEvent event = new BlockBreakEvent(block, user.getBase());
 		server.getPluginManager().callEvent(event);
 		if (event.isCancelled())
@@ -1,26 +1,19 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
-import org.bukkit.Server;
 import org.bukkit.command.CommandSender;


 public class Commandbroadcast extends EssentialsCommand
 {
-	public Commandbroadcast()
-	{
-		super("broadcast");
-	}
-
 	@Override
-	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}

-		ess.broadcastMessage(null, _("broadcast", Util.replaceFormat(getFinalArg(args, 0))));
+		ess.broadcastMessage(null, _("broadcast", getFinalArg(args, 0)));
 	}
 }
@@ -1,31 +1,19 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;


 public class Commandburn extends EssentialsCommand
 {
-	public Commandburn()
-	{
-		super("burn");
-	}
-
 	@Override
-	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 2)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		
-		//TODO: TL this
-		if (args[0].trim().length() < 2)
-		{
-			throw new NotEnoughArgumentsException("You need to specify a player to burn.");
-		}

 		for (Player p : server.matchPlayer(args[0]))
 		{
@@ -1,25 +1,20 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.perm.Permissions;
 import java.util.List;
-import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;


 public class Commandclearinventory extends EssentialsCommand
 {
-	public Commandclearinventory()
-	{
-		super("clearinventory");
-	}
-
 	//TODO: Cleanup
 	@Override
-	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
-		if (args.length > 0 && user.isAuthorized("essentials.clearinventory.others"))
+		if (args.length > 0 && Permissions.CLEARINVENTORY_OTHERS.isAuthorized(user))
 		{
 			//TODO: Fix fringe user match case.
 			if (args[0].length() >= 3)
@@ -59,7 +54,7 @@ public class Commandclearinventory extends EssentialsCommand
 	}

 	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
@@ -1,19 +1,13 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import org.bukkit.Server;
+import com.earth2me.essentials.api.IUser;


 public class Commandcompass extends EssentialsCommand
 {
-	public Commandcompass()
-	{
-		super("compass");
-	}
-
 	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
 		final int bearing = (int)(user.getLocation().getYaw() + 180 + 360) % 360;
 		String dir;
@@ -1,28 +1,26 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.perm.Permissions;
 import java.util.Locale;
-import org.bukkit.Server;
+import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;


 public class Commanddelhome extends EssentialsCommand
 {
-	public Commanddelhome()
-	{
-		super("delhome");
-	}
-
 	@Override
-	public void run(final Server server, final CommandSender sender, final String commandLabel, String[] args) throws Exception
+	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}

-		User user = ess.getUser(sender);
+		@Cleanup
+		IUser user = sender instanceof Player ? ess.getUser((Player)sender) : null;
 		String name;
 		String[] expandedArg;

@@ -37,9 +35,9 @@ public class Commanddelhome extends EssentialsCommand
 			expandedArg = args;
 		}

-		if (expandedArg.length > 1 && (user == null || user.isAuthorized("essentials.delhome.others")))
+		if (expandedArg.length > 1 && (user == null || Permissions.DELHOME_OTHERS.isAuthorized(user)))
 		{
-			user = getPlayer(server, expandedArg, 0, true);
+			user = getPlayer(expandedArg, 0, true);
 			name = expandedArg[1];
 		}
 		else if (user == null)
@@ -54,7 +52,8 @@ public class Commanddelhome extends EssentialsCommand
 		/*
 		 * if (name.equalsIgnoreCase("bed")) { throw new Exception("You cannot remove the vanilla home point"); }
 		 */
-		user.delHome(name.toLowerCase(Locale.ENGLISH));
+		user.acquireWriteLock();
+		user.getData().removeHome(name.toLowerCase(Locale.ENGLISH));
 		sender.sendMessage(_("deleteHome", name));
 	}
 }
@@ -1,19 +1,13 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import org.bukkit.Server;
 import org.bukkit.command.CommandSender;


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

 import static com.earth2me.essentials.I18n._;
-import org.bukkit.Server;
 import org.bukkit.command.CommandSender;


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

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import org.bukkit.Server;
+import com.earth2me.essentials.api.IUser;


 public class Commanddepth extends EssentialsCommand
 {
-	public Commanddepth()
-	{
-		super("depth");
-	}
-
 	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
 		final int depth = user.getLocation().getBlockY() - 63;
 		if (depth > 0)
@@ -1,22 +1,17 @@
 package com.earth2me.essentials.commands;

-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
+import com.earth2me.essentials.api.ISettings;
+import com.earth2me.essentials.api.IUser;
 import java.util.Locale;
-import org.bukkit.Server;
+import lombok.Cleanup;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;


 public class Commandeco extends EssentialsCommand
 {
-	public Commandeco()
-	{
-		super("eco");
-	}
-
 	@Override
-	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 2)
 		{
@@ -34,35 +29,11 @@ public class Commandeco extends EssentialsCommand
 			throw new NotEnoughArgumentsException(ex);
 		}

-		if (args[1].contentEquals("**"))
-		{
-			for (String sUser : ess.getUserMap().getAllUniqueUsers())
-			{
-				final User player = ess.getUser(sUser);
-				switch (cmd)
-				{
-				case GIVE:
-					player.giveMoney(amount);
-					break;
-
-				case TAKE:
-					if (player.canAfford(amount, false))
-					{
-						player.takeMoney(amount);
-					}					
-					break;
-
-				case RESET:
-					player.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
-					break;
-				}
-			}
-		}
-		else if (args[1].contentEquals("*"))
+		if (args[1].contentEquals("*"))
 		{
 			for (Player onlinePlayer : server.getOnlinePlayers())
 			{
-				final User player = ess.getUser(onlinePlayer);
+				final IUser player = ess.getUser(onlinePlayer);
 				switch (cmd)
 				{
 				case GIVE:
@@ -70,22 +41,21 @@ public class Commandeco extends EssentialsCommand
 					break;

 				case TAKE:
-					if (!player.canAfford(amount, false))
-					{
-						throw new Exception(_("notEnoughMoney"));
-					}
 					player.takeMoney(amount);
 					break;

 				case RESET:
-					player.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
+					@Cleanup 
+					ISettings settings = ess.getSettings();
+					settings.acquireReadLock();
+					player.setMoney(amount == 0 ? settings.getData().getEconomy().getStartingBalance() : amount);
 					break;
 				}
 			}
 		}
 		else
 		{
-			final User player = getPlayer(server, args, 1, true);
+			final IUser player = getPlayer(args, 1, true);
 			switch (cmd)
 			{
 			case GIVE:
@@ -93,15 +63,13 @@ public class Commandeco extends EssentialsCommand
 				break;

 			case TAKE:
-				if (!player.canAfford(amount, false))
-				{
-					throw new Exception(_("notEnoughMoney"));
-				}
 				player.takeMoney(amount, sender);
 				break;

 			case RESET:
-				player.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
+				@Cleanup ISettings settings = ess.getSettings();
+				settings.acquireReadLock();
+				player.setMoney(amount == 0 ? settings.getData().getEconomy().getStartingBalance() : amount);
 				break;
 			}
 		}
@@ -2,27 +2,22 @@ package com.earth2me.essentials.commands;

 import com.earth2me.essentials.Enchantments;
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.perm.EnchantPermissions;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-import org.bukkit.Server;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;


 public class Commandenchant extends EssentialsCommand
 {
-	public Commandenchant()
-	{
-		super("enchant");
-	}
-
 	//TODO: Implement charge costs: final Trade charge = new Trade("enchant-" + enchantmentName, ess);
 	@Override
-	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
 		final ItemStack stack = user.getItemInHand();
 		if (stack == null)
@@ -35,7 +30,7 @@ public class Commandenchant extends EssentialsCommand
 			for (Map.Entry<String, Enchantment> entry : Enchantments.entrySet())
 			{
 				final String enchantmentName = entry.getValue().getName().toLowerCase(Locale.ENGLISH);
-				if (enchantmentslist.contains(enchantmentName) || user.isAuthorized("essentials.enchant." + enchantmentName))
+				if (enchantmentslist.contains(enchantmentName) || EnchantPermissions.getPermission(enchantmentName).isAuthorized(user))
 				{
 					enchantmentslist.add(entry.getKey());
 					//enchantmentslist.add(enchantmentName);
@@ -81,7 +76,7 @@ public class Commandenchant extends EssentialsCommand
 		}
 	}

-	public static Enchantment getEnchantment(final String name, final User user) throws Exception
+	public static Enchantment getEnchantment(final String name, final IUser user) throws Exception
 	{

 		final Enchantment enchantment = Enchantments.getByName(name);
@@ -90,7 +85,7 @@ public class Commandenchant extends EssentialsCommand
 			throw new Exception(_("enchantmentNotFound"));
 		}
 		final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
-		if (user != null && !user.isAuthorized("essentials.enchant." + enchantmentName))
+		if (user != null && !EnchantPermissions.getPermission(enchantmentName).isAuthorized(user))
 		{
 			throw new Exception(_("enchantmentPerm", enchantmentName));
 		}
@@ -1,30 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import com.earth2me.essentials.User;
-import org.bukkit.Server;
-
-
-public class Commandenderchest extends EssentialsCommand
-{
-	public Commandenderchest()
-	{
-		super("enderchest");
-	}
-
-	@Override
-	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
-	{		
-		if (args.length > 0 && user.isAuthorized("essentials.enderchest.others"))
-		{
-			final User invUser = getPlayer(server, args, 0);
-			user.openInventory(invUser.getEnderChest());
-			user.setEnderSee(true);
-		}
-		else
-		{
-			user.openInventory(user.getEnderChest());
-			user.setEnderSee(false);
-		}
-
-	}
-}
@@ -1,104 +1,71 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.metrics.Metrics;
-import java.io.IOException;
 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.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;

-// This command has 4 undocumented behaviours #EasterEgg
+
 public class Commandessentials extends EssentialsCommand
 {
-	public Commandessentials()
-	{
-		super("essentials");
-	}
 	private transient int taskid;
 	private final transient Map<Player, Block> noteBlocks = new HashMap<Player, Block>();

 	@Override
-	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
-		if (args.length == 0) {
-			run_disabled(server, sender, commandLabel, args);
+		if (args.length == 0)
+		{
+			run_disabled(sender, args);
 		}
 		else if (args[0].equalsIgnoreCase("debug"))
 		{
-			run_debug(server, sender, commandLabel, args);
+			run_debug(sender, args);
 		}
 		else if (args[0].equalsIgnoreCase("nya"))
 		{
-			run_nya(server, sender, commandLabel, args);
+			run_nya(sender, args);
 		}
-		else if (args[0].equalsIgnoreCase("moo"))
+		else
 		{
-			run_moo(server, sender, commandLabel, args);
-		}
-		else if (args[0].equalsIgnoreCase("reset"))
-		{
-			run_reset(server, sender, commandLabel, args);
-		}
-		else if (args[0].equalsIgnoreCase("opt-out"))
-		{
-			run_optout(server, sender, commandLabel, args);
-		}
-		else {
-			run_reload(server, sender, commandLabel, args);
+			run_reload(sender, args);
 		}
 	}
-	
-	//If you do not supply an argument this command will list 'overridden' commands.
-	private void run_disabled(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+
+	private void run_disabled(final CommandSender sender, final String[] args) throws Exception
 	{
 		sender.sendMessage("Essentials " + ess.getDescription().getVersion());
 		sender.sendMessage("/<command> <reload/debug>");
-		
+		sender.sendMessage(_("blockList"));
 		final StringBuilder disabledCommands = new StringBuilder();
-		for (Map.Entry<String, String> entry : ess.getAlternativeCommandsHandler().disabledCommands().entrySet())
+		for (Map.Entry<String, String> entry : ess.getCommandHandler().disabledCommands().entrySet())
 		{
-			if (disabledCommands.length() > 0) {
+			if (disabledCommands.length() > 0)
+			{
 				disabledCommands.append(", ");
 			}
 			disabledCommands.append(entry.getKey()).append(" => ").append(entry.getValue());
 		}
-		if (disabledCommands.length() > 0) {
-			sender.sendMessage(_("blockList"));
-			sender.sendMessage(disabledCommands.toString());
-		}
+		sender.sendMessage(disabledCommands.toString());
 	}
-	
-	private void run_reset(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 2)
-		{
-			throw new NotEnoughArgumentsException("/<command> reset <player>");
-		}
-		final User user = getPlayer(server, args, 1, true);
-		user.reset();
-		sender.sendMessage("Reset Essentials userdata for player: " + user.getDisplayName());
-	}
-	
-	private void run_debug(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+
+	private void run_debug(final CommandSender sender, final String[] args) throws Exception
 	{
 		ess.getSettings().setDebug(!ess.getSettings().isDebug());
 		sender.sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
 	}
-	
-	private void run_reload(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+
+	private void run_reload(final CommandSender sender, final String[] args) throws Exception
 	{
 		ess.reload();
 		sender.sendMessage(_("essentialsReload", ess.getDescription().getVersion()));
 	}
-	
-	private void run_nya(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+
+	private void run_nya(final CommandSender sender, final String[] args) throws Exception
 	{
 		final Map<String, Byte> noteMap = new HashMap<String, Byte>();
 		noteMap.put("1F#", (byte)0x0);
@@ -125,60 +92,61 @@ public class Commandessentials extends EssentialsCommand
 		noteMap.put("2D#", (byte)(0x9 + 0xC));
 		noteMap.put("2E", (byte)(0xA + 0xC));
 		noteMap.put("2F", (byte)(0xB + 0xC));
-			if (!noteBlocks.isEmpty())
+		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)
 			{
-				return;
+				loc.add(0, 1, 0);
 			}
-			final String tuneStr = "1D#,1E,2F#,,2A#,1E,1D#,1E,2F#,2B,2D#,2E,2D#,2A#,2B,,2F#,,1D#,1E,2F#,2B,2C#,2A#,2B,2C#,2E,2D#,2E,2C#,,2F#,,2G#,,1D,1D#,,1C#,1D,1C#,1B,,1B,,1C#,,1D,,1D,1C#,1B,1C#,1D#,2F#,2G#,1D#,2F#,1C#,1D#,1B,1C#,1B,1D#,,2F#,,2G#,1D#,2F#,1C#,1D#,1B,1D,1D#,1D,1C#,1B,1C#,1D,,1B,1C#,1D#,2F#,1C#,1D,1C#,1B,1C#,,1B,,1C#,,2F#,,2G#,,1D,1D#,,1C#,1D,1C#,1B,,1B,,1C#,,1D,,1D,1C#,1B,1C#,1D#,2F#,2G#,1D#,2F#,1C#,1D#,1B,1C#,1B,1D#,,2F#,,2G#,1D#,2F#,1C#,1D#,1B,1D,1D#,1D,1C#,1B,1C#,1D,,1B,1C#,1D#,2F#,1C#,1D,1C#,1B,1C#,,1B,,1B,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1B,,";
-			final String[] tune = tuneStr.split(",");
-			for (Player player : server.getOnlinePlayers())
+			if (loc.getBlock().getTypeId() == 0)
 			{
-				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);
-				}
+				noteBlocks.put(player, loc.getBlock());
+				loc.getBlock().setType(Material.NOTE_BLOCK);
 			}
-			taskid = ess.scheduleSyncRepeatingTask(new Runnable()
-			{
-				int i = 0;
+		}
+		taskid = ess.scheduleSyncRepeatingTask(new Runnable()
+		{
+			int i = 0;

-				@Override
-				public void run()
+			@Override
+			public void run()
+			{
+				final String note = tune[i];
+				i++;
+				if (i >= tune.length)
 				{
-					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 onlinePlayer : server.getOnlinePlayers())
-					{
-						final Block block = noteBlocks.get(onlinePlayer);
-						if (block == null || block.getType() != Material.NOTE_BLOCK)
-						{
-							continue;
-						}
-						onlinePlayer.playNote(block.getLocation(), (byte)0, noteMap.get(note));
-					}
+					Commandessentials.this.stopTune();
 				}
-			}, 20, 2);
+				if (note.isEmpty())
+				{
+					return;
+				}
+				Map<Player, Block> noteBlocks = Commandessentials.this.noteBlocks;
+				for (Player onlinePlayer : server.getOnlinePlayers())
+				{
+					final Block block = noteBlocks.get(onlinePlayer);
+					if (block == null || block.getType() != Material.NOTE_BLOCK)
+					{
+						continue;
+					}
+					onlinePlayer.playNote(block.getLocation(), (byte)0, noteMap.get(note));
+				}
+			}
+		}, 20, 2);
+		return;
 	}

 	private void stopTune()
 	{
-		ess.getScheduler().cancelTask(taskid);
+		ess.getServer().getScheduler().cancelTask(taskid);
 		for (Block block : noteBlocks.values())
 		{
 			if (block.getType() == Material.NOTE_BLOCK)
@@ -188,31 +156,4 @@ public class Commandessentials extends EssentialsCommand
 		}
 		noteBlocks.clear();
 	}
-	
-	private void run_moo(final Server server, final CommandSender sender, final String command, final String args[])
-	{
-		if(sender instanceof ConsoleCommandSender)
-			sender.sendMessage(new String[]{"         (__)", "         (oo)", "   /------\\/", "  / |    ||", " *  /\\---/\\", "    ~~   ~~", "....\"Have you mooed today?\"..." } );
-		else
-			sender.sendMessage(new String[]{"            (__)", "            (oo)", "   /------\\/", "  /  |      | |", " *  /\\---/\\", "    ~~    ~~", "....\"Have you mooed today?\"..." } );
-	}
-	
-	private void run_optout(final Server server, final CommandSender sender, final String command, final String args[])
-	{
-		final Metrics metrics = ess.getMetrics();
-		try
-		{
-			sender.sendMessage("Essentials collects simple metrics to highlight which features to concentrate work on in the future.");
-			if (metrics.isOptOut()) {
-				metrics.enable();		
-			} else {
-				metrics.disable();
-			}
-			sender.sendMessage("Anonymous Metrics are now: " + (metrics.isOptOut() ? "disabled" : "enabled"));
-		}
-		catch (IOException ex)
-		{
-			sender.sendMessage("Unable to modify 'plugins/PluginMetrics/config.yml': " + ex.getMessage());
-		}
-	}
 }
@@ -1,162 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.craftbukkit.SetExpFix;
-import java.util.Locale;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-
-public class Commandexp extends EssentialsCommand
-{
-	public Commandexp()
-	{
-		super("exp");
-	}
-
-	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length == 0)
-		{
-			showExp(user, user);
-		}
-		else if (args[0].equalsIgnoreCase("set") && user.isAuthorized("essentials.exp.set"))
-		{
-			if (args.length == 3 && user.isAuthorized("essentials.exp.set.others"))
-			{
-				expMatch(server, user, args[1], args[2], false);
-			}
-			else
-			{
-				setExp(user, user, args[1], false);
-			}
-		}
-		else if (args[0].equalsIgnoreCase("give") && user.isAuthorized("essentials.exp.give"))
-		{
-			if (args.length == 3 && user.isAuthorized("essentials.exp.give.others"))
-			{
-				expMatch(server, user, args[1], args[2], true);
-			}
-			else
-			{
-				setExp(user, user, args[1], true);
-			}
-		}
-		else
-		{
-			String match = args[0].trim();
-			if (args.length == 2)
-			{
-				match = args[1].trim();
-			}
-			if (match.equalsIgnoreCase("show") || !user.isAuthorized("essentials.exp.others"))
-			{
-				showExp(user, user);
-			}
-			else
-			{
-				showMatch(server, user, match);
-			}
-		}
-	}
-
-	@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();
-		}
-		else if (args.length > 2 && args[0].equalsIgnoreCase("set"))
-		{
-			expMatch(server, sender, args[1], args[2], false);
-		}
-		else if (args.length > 2 && args[0].equalsIgnoreCase("give"))
-		{
-			expMatch(server, sender, args[1], args[2], true);
-		}
-		else
-		{
-			String match = args[0].trim();
-			if (args.length == 2)
-			{
-				match = args[1].trim();
-			}
-			showMatch(server, sender, match);
-		}
-	}
-
-	private void showMatch(final Server server, final CommandSender sender, final String match) throws NotEnoughArgumentsException
-	{
-		boolean foundUser = false;
-		for (Player matchPlayer : server.matchPlayer(match))
-		{
-			foundUser = true;
-			final User target = ess.getUser(matchPlayer);
-			showExp(sender, target);
-		}
-		if (!foundUser)
-		{
-			throw new NotEnoughArgumentsException(_("playerNotFound"));
-		}
-	}
-
-	private void expMatch(final Server server, final CommandSender sender, final String match, String amount, final boolean toggle) throws NotEnoughArgumentsException
-	{
-		boolean foundUser = false;
-		for (Player matchPlayer : server.matchPlayer(match))
-		{
-			final User target = ess.getUser(matchPlayer);
-			setExp(sender, target, amount, toggle);
-			foundUser = true;
-		}
-		if (!foundUser)
-		{
-			throw new NotEnoughArgumentsException(_("playerNotFound"));
-		}
-	}
-
-	private void showExp(final CommandSender sender, final User target)
-	{
-		final int totalExp = SetExpFix.getTotalExperience(target);
-		sender.sendMessage(_("exp", target.getDisplayName(), SetExpFix.getTotalExperience(target), target.getLevel(), SetExpFix.getExpUntilNextLevel(target)));
-	}
-
-	private void setExp(final CommandSender sender, final User target, String strAmount, final boolean give) throws NotEnoughArgumentsException 
-	{
-		Long amount;
-		strAmount = strAmount.toLowerCase(Locale.ENGLISH);
-		if (strAmount.startsWith("l") || strAmount.endsWith("l"))
-		{
-			strAmount = strAmount.replaceAll("l","");			
-			int neededLevel = Integer.parseInt(strAmount);
-			if (give)
-			{
-				neededLevel += target.getLevel();
-			}
-			amount = (long)SetExpFix.getExpToLevel(neededLevel);
-			SetExpFix.setTotalExperience(target, 0);
-		}
-		else {
-			amount = Long.parseLong(strAmount);
-			if (amount < 0 || amount > Integer.MAX_VALUE)
-			{
-				throw new NotEnoughArgumentsException();	
-			}
-		}
-
-		if (give)
-		{
-			amount += SetExpFix.getTotalExperience(target);
-		}
-		if (amount > Integer.MAX_VALUE)
-		{
-			amount = (long)Integer.MAX_VALUE;
-		}
-		SetExpFix.setTotalExperience(target, amount.intValue());
-		sender.sendMessage(_("expSet", target.getDisplayName(), amount));
-	}
-}
@@ -1,32 +1,26 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import org.bukkit.Server;
+import com.earth2me.essentials.api.IUser;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;


 public class Commandext extends EssentialsCommand
 {
-	public Commandext()
-	{
-		super("ext");
-	}
-
 	@Override
-	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}

-		extinguishPlayers(server, sender, args[0]);
+		extinguishPlayers(sender, args[0]);
 	}

 	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
@@ -35,10 +29,10 @@ public class Commandext extends EssentialsCommand
 			return;
 		}

-		extinguishPlayers(server, user, commandLabel);
+		extinguishPlayers(user, args[0]);
 	}

-	private void extinguishPlayers(final Server server, final CommandSender sender, final String name) throws Exception
+	private void extinguishPlayers(final CommandSender sender, final String name) throws Exception
 	{
 		for (Player matchPlayer : server.matchPlayer(name))
 		{
@@ -1,26 +1,21 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.perm.Permissions;
 import java.util.List;
-import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;


 public class Commandfeed extends EssentialsCommand
 {
-	public Commandfeed()
-	{
-		super("feed");
-	}
-
 	@Override
-	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
-		if (args.length > 0 && user.isAuthorized("essentials.feed.others"))
+		if (args.length > 0 && Permissions.FEED_OTHERS.isAuthorized(user))
 		{
-			feedOtherPlayers(server,user,args[0]);
+			feedOtherPlayers(user, args[0]);
 		}
 		else
 		{
@@ -29,8 +24,8 @@ public class Commandfeed extends EssentialsCommand
 			user.sendMessage(_("feed"));
 		}
 	}
-	
-		private void feedOtherPlayers(final Server server, final CommandSender sender, final String name)
+
+	private void feedOtherPlayers(final CommandSender sender, final String name)
 	{
 		final List<Player> players = server.matchPlayer(name);
 		if (players.isEmpty())
@@ -1,7 +1,6 @@
 package com.earth2me.essentials.commands;

-import com.earth2me.essentials.User;
-import org.bukkit.Server;
+import com.earth2me.essentials.api.IUser;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.SmallFireball;
 import org.bukkit.util.Vector;
@@ -9,13 +8,8 @@ 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
+	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
 		boolean small = false;
 		if (args.length > 0 && args[0].equalsIgnoreCase("small"))
@@ -23,7 +17,7 @@ public class Commandfireball extends EssentialsCommand
 			small = true;
 		}
 		final Vector direction = user.getEyeLocation().getDirection().multiply(2);
-		Fireball fireball = user.getWorld().spawn(user.getEyeLocation().add(direction.getX(), direction.getY(), direction.getZ()), small ? SmallFireball.class : Fireball.class);
+		final Fireball fireball = user.getWorld().spawn(user.getEyeLocation().add(direction.getX(), direction.getY(), direction.getZ()), small ? SmallFireball.class : Fireball.class);
 		fireball.setShooter(user.getBase());
 	}
 }
@@ -1,96 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-
-public class Commandfly extends EssentialsCommand
-{
-	public Commandfly()
-	{
-		super("fly");
-	}
-
-	@Override
-	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-
-		flyOtherPlayers(server, sender, args);
-	}
-
-	@Override
-	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length == 1)
-		{
-			if (args[0].equalsIgnoreCase("on") || args[0].startsWith("ena") || args[0].equalsIgnoreCase("1"))
-			{
-				user.setAllowFlight(true);
-			}
-			else if (args[0].equalsIgnoreCase("off") || args[0].startsWith("dis") || args[0].equalsIgnoreCase("0"))
-			{
-				user.setAllowFlight(false);
-			}
-			else if (user.isAuthorized("essentials.fly.others"))
-			{
-				flyOtherPlayers(server, user, args);
-				return;
-			}
-		}
-		else if (args.length == 2 && user.isAuthorized("essentials.fly.others"))
-		{
-			flyOtherPlayers(server, user, args);
-			return;
-		}
-		else
-		{
-			user.setAllowFlight(!user.getAllowFlight());
-			if (!user.getAllowFlight())
-			{
-				user.setFlying(false);
-			}
-		}
-		user.sendMessage(_("flyMode", _(user.getAllowFlight() ? "enabled" : "disabled"), user.getDisplayName()));
-	}
-
-	private void flyOtherPlayers(final Server server, final CommandSender sender, final String[] args)
-	{
-		for (Player matchPlayer : server.matchPlayer(args[0]))
-		{
-			final User player = ess.getUser(matchPlayer);
-			if (player.isHidden())
-			{
-				continue;
-			}
-
-			if (args.length > 1)
-			{
-				if (args[1].contains("on") || args[1].contains("ena") || args[1].equalsIgnoreCase("1"))
-				{
-					player.setAllowFlight(true);
-				}
-				else
-				{
-					player.setAllowFlight(false);
-				}
-			}
-			else
-			{
-				player.setAllowFlight(!player.getAllowFlight());
-			}
-
-			if (!player.getAllowFlight())
-			{
-				player.setFlying(false);
-			}
-			sender.sendMessage(_("flyMode", _(player.getAllowFlight() ? "enabled" : "disabled"), player.getDisplayName()));
-		}
-	}
-}
@@ -1,134 +1,52 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.perm.Permissions;
 import java.util.Locale;
 import org.bukkit.GameMode;
-import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;


 public class Commandgamemode extends EssentialsCommand
 {
-	public Commandgamemode()
-	{
-		super("gamemode");
-	}
-
 	@Override
-	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
-		GameMode gameMode;
-		if (args.length == 0)
+		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		else if (args.length == 1)
-		{
-			gameMode = matchGameMode(commandLabel);
-			gamemodeOtherPlayers(server, sender, gameMode, args[0]);
-		}
-		else if (args.length == 2)
-		{
-			gameMode = matchGameMode(args[0].toLowerCase(Locale.ENGLISH));
-			gamemodeOtherPlayers(server, sender, gameMode, args[1]);
-		}

+		gamemodeOtherPlayers(sender, args[0]);
 	}

 	@Override
-	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
-		GameMode gameMode;
-		if (args.length == 0)
+		if (args.length > 0 && !args[0].trim().isEmpty() && Permissions.GAMEMODE_OTHERS.isAuthorized(user))
 		{
-			gameMode = matchGameMode(commandLabel);
-		}
-		else if (args.length > 1 && args[1].trim().length() > 2 && user.isAuthorized("essentials.gamemode.others"))
-		{
-			gameMode = matchGameMode(args[0].toLowerCase(Locale.ENGLISH));
-			gamemodeOtherPlayers(server, user, gameMode, args[1]);
+			gamemodeOtherPlayers(user, args[0]);
 			return;
 		}
-		else
-		{
-			try
-			{
-				gameMode = matchGameMode(args[0].toLowerCase(Locale.ENGLISH));
-			}
-			catch (NotEnoughArgumentsException e)
-			{
-				if (user.isAuthorized("essentials.gamemode.others"))
-				{
-					gameMode = matchGameMode(commandLabel);
-					gamemodeOtherPlayers(server, user, gameMode, args[0]);
-					return;
-				}
-				throw new NotEnoughArgumentsException();
-			}
-		}
-		if (gameMode == null)
-		{
-			gameMode = user.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : user.getGameMode() == GameMode.CREATIVE ? GameMode.ADVENTURE : GameMode.SURVIVAL;
-		}
-		user.setGameMode(gameMode);
+
+		user.setGameMode(user.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : GameMode.SURVIVAL);
 		user.sendMessage(_("gameMode", _(user.getGameMode().toString().toLowerCase(Locale.ENGLISH)), user.getDisplayName()));
 	}

-	private void gamemodeOtherPlayers(final Server server, final CommandSender sender, final GameMode gameMode, final String player) throws NotEnoughArgumentsException
+	private void gamemodeOtherPlayers(final CommandSender sender, final String name)
 	{
-		//TODO: TL this
-		if (player.trim().length() < 2 || gameMode == null)
+		for (Player matchPlayer : server.matchPlayer(name))
 		{
-			throw new NotEnoughArgumentsException("You need to specify a valid player/mode.");
-		}
-
-		boolean foundUser = false;
-		for (Player matchPlayer : server.matchPlayer(player))
-		{
-			final User user = ess.getUser(matchPlayer);
-			if (user.isHidden())
+			final IUser player = ess.getUser(matchPlayer);
+			if (player.isHidden())
 			{
 				continue;
 			}
-			user.setGameMode(gameMode);
-			sender.sendMessage(_("gameMode", _(user.getGameMode().toString().toLowerCase(Locale.ENGLISH)), user.getDisplayName()));
-			foundUser = true;
-		}
-		if (!foundUser)
-		{
-			throw new NotEnoughArgumentsException(_("playerNotFound"));
-		}
-	}

-	private GameMode matchGameMode(String modeString) throws NotEnoughArgumentsException
-	{
-		GameMode mode = null;
-		if (modeString.equalsIgnoreCase("gmc") || modeString.equalsIgnoreCase("egmc")
-			|| modeString.contains("creat") || modeString.equalsIgnoreCase("1") || modeString.equalsIgnoreCase("c"))
-		{
-			mode = GameMode.CREATIVE;
+			player.setGameMode(player.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : GameMode.SURVIVAL);
+			sender.sendMessage(_("gameMode", _(player.getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getDisplayName()));
 		}
-		else if (modeString.equalsIgnoreCase("gms") || modeString.equalsIgnoreCase("egms")
-				 || modeString.contains("survi") || modeString.equalsIgnoreCase("0") || modeString.equalsIgnoreCase("s"))
-		{
-			mode = GameMode.SURVIVAL;
-		}
-		else if (modeString.equalsIgnoreCase("gma") || modeString.equalsIgnoreCase("egma")
-				 || modeString.contains("advent") || modeString.equalsIgnoreCase("2") || modeString.equalsIgnoreCase("a"))
-		{
-			mode = GameMode.ADVENTURE;
-		}
-		else if (modeString.equalsIgnoreCase("gmt") || modeString.equalsIgnoreCase("egmt")
-				 || modeString.contains("toggle") || modeString.contains("cycle") || modeString.equalsIgnoreCase("t"))
-		{
-			mode = null;
-		}
-		else
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		return mode;
 	}
-}
+}
@@ -1,60 +1,25 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
-import java.lang.management.ManagementFactory;
-import org.bukkit.ChatColor;
-import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;


 public class Commandgc extends EssentialsCommand
 {
-	public Commandgc()
-	{
-		super("gc");
-	}
-
 	@Override
-	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
-		float tps = ess.getTimer().getAverageTPS();
-		ChatColor color;
-		if (tps >= 18)
-		{
-			color = ChatColor.GREEN;
-		}
-		else if (tps >= 15)
-		{
-			color = ChatColor.YELLOW;
-		}
-		else
-		{
-			color = ChatColor.RED;
-		}
-		
-		sender.sendMessage(_("uptime", Util.formatDateDiff(ManagementFactory.getRuntimeMXBean().getStartTime())));
-		sender.sendMessage(_("tps", "" + color + tps));
 		sender.sendMessage(_("gcmax", (Runtime.getRuntime().maxMemory() / 1024 / 1024)));
 		sender.sendMessage(_("gctotal", (Runtime.getRuntime().totalMemory() / 1024 / 1024)));
-		sender.sendMessage(_("gcfree", (Runtime.getRuntime().freeMemory() / 1024 / 1024)));		
+		sender.sendMessage(_("gcfree", (Runtime.getRuntime().freeMemory() / 1024 / 1024)));

 		for (World w : server.getWorlds())
 		{
-			String worldType = "World";
-			switch (w.getEnvironment())
-			{
-			case NETHER:
-				worldType = "Nether";
-				break;
-			case THE_END:
-				worldType = "The End";
-				break;
-			}
-
-			sender.sendMessage(_("gcWorld", worldType, w.getName(), w.getLoadedChunks().length, w.getEntities().size()));
+			sender.sendMessage(
+					(w.getEnvironment() == World.Environment.NETHER ? "Nether" : "World") + " \"" + w.getName() + "\": "
+					+ w.getLoadedChunks().length + _("gcchunks")
+					+ w.getEntities().size() + _("gcentities"));
 		}
-		
 	}
 }
@@ -1,57 +1,50 @@
 package com.earth2me.essentials.commands;

-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.perm.Permissions;
 import org.bukkit.Location;
-import org.bukkit.Server;
 import org.bukkit.command.CommandSender;


 public class Commandgetpos extends EssentialsCommand
 {
-	public Commandgetpos()
-	{
-		super("getpos");
-	}
-
 	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
-		if (args.length > 0 && user.isAuthorized("essentials.getpos.others"))
+		if (args.length > 0 && Permissions.GETPOS_OTHERS.isAuthorized(user))
 		{
-			final User otherUser = getPlayer(server, args, 0);
-			if (!otherUser.isHidden() || user.isAuthorized("essentials.list.hidden"))
-			{
-				outputPosition(user, otherUser.getLocation(), user.getLocation());
-				return;
-			}
-
+			final IUser otherUser = getPlayer(args, 0);
+			outputPosition(user, otherUser.getLocation(), user.getLocation());
+		}
+		else
+		{
+			outputPosition(user, user.getLocation(), null);
 		}
-		outputPosition(user, user.getLocation(), null);
 	}

 	@Override
-	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		final User user = getPlayer(server, args, 0);
+		final IUser user = getPlayer(args, 0);
 		outputPosition(sender, user.getLocation(), null);
 	}

+	//TODO: Translate
 	private void outputPosition(final CommandSender sender, final Location coords, final Location distance)
 	{
-		sender.sendMessage(_("currentWorld", coords.getWorld().getName()));
-		sender.sendMessage(_("posX", coords.getBlockX()));
-		sender.sendMessage(_("posY", coords.getBlockY()));
-		sender.sendMessage(_("posZ", coords.getBlockZ()));
-		sender.sendMessage(_("posYaw", (coords.getYaw() + 180 + 360) % 360));
-		sender.sendMessage(_("posPitch", coords.getPitch()));
+		sender.sendMessage("§7World: " + coords.getWorld().getName());
+		sender.sendMessage("§7X: " + coords.getBlockX() + " (+East <-> -West)");
+		sender.sendMessage("§7Y: " + coords.getBlockY() + " (+Up <-> -Down)");
+		sender.sendMessage("§7Z: " + coords.getBlockZ() + " (+South <-> -North)");
+		sender.sendMessage("§7Yaw: " + (coords.getYaw() + 180 + 360) % 360 + " (Rotation)");
+		sender.sendMessage("§7Pitch: " + coords.getPitch() + " (Head angle)");
 		if (distance != null && coords.getWorld().equals(distance.getWorld()))
 		{
-			sender.sendMessage(_("distance", coords.distance(distance)));
+			sender.sendMessage("§7Distance: " + coords.distance(distance));
 		}
 	}
 }
@@ -1,12 +1,10 @@
 package com.earth2me.essentials.commands;

-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.perm.GivePermissions;
 import java.util.Locale;
+import org.bukkit.ChatColor;
 import org.bukkit.Material;
-import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
@@ -15,63 +13,40 @@ import org.bukkit.inventory.ItemStack;

 public class Commandgive extends EssentialsCommand
 {
-	public Commandgive()
-	{
-		super("give");
-	}
-
+	//TODO: move these messages to message file
 	@Override
-	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 2)
 		{
 			throw new NotEnoughArgumentsException();
 		}
+		
+		final IUser giveTo = getPlayer(args, 0);

-		final ItemStack stack = ess.getItemDb().get(args[1]);
+		final ItemStack stack = ess.getItemDb().get(args[1], giveTo);

 		final String itemname = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
-		if (sender instanceof Player
-			&& (ess.getSettings().permissionBasedItemSpawn()
-				? (!ess.getUser(sender).isAuthorized("essentials.give.item-all")
-				   && !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()))))
+		if (!GivePermissions.getPermission(stack.getType()).isAuthorized(sender))
 		{
-			throw new Exception(_("cantSpawnItem", itemname));
-		}
+			throw new Exception(ChatColor.RED + "You are not allowed to spawn the item " + itemname);
+		}	

-		final User giveTo = getPlayer(server, args, 0);
-
-		if (args.length > 3 && Util.isInt(args[2]) && Util.isInt(args[3]))
+		if (args.length > 2 && Integer.parseInt(args[2]) > 0)
 		{
 			stack.setAmount(Integer.parseInt(args[2]));
-			stack.setDurability(Short.parseShort(args[3]));
-		}
-		else if (args.length > 2 && Integer.parseInt(args[2]) > 0)
-		{
-			stack.setAmount(Integer.parseInt(args[2]));
-		}
-		else if (ess.getSettings().getDefaultStackSize() > 0)
-		{
-			stack.setAmount(ess.getSettings().getDefaultStackSize());
-		}
-		else if (ess.getSettings().getOversizedStackSize() > 0 && giveTo.isAuthorized("essentials.oversizedstacks"))
-		{
-			stack.setAmount(ess.getSettings().getOversizedStackSize());
-		}
+		}		

 		if (args.length > 3)
 		{
-			for (int i = Util.isInt(args[3]) ? 4 : 3; i < args.length; i++)
+			for (int i = 3; i < args.length; i++)
 			{
 				final String[] split = args[i].split("[:+',;.]", 2);
 				if (split.length < 1)
 				{
 					continue;
 				}
-				final Enchantment enchantment = Commandenchant.getEnchantment(split[0], sender instanceof Player ? ess.getUser(sender) : null);
+				final Enchantment enchantment = Commandenchant.getEnchantment(split[0], sender instanceof Player ? ess.getUser((Player)sender) : null);
 				int level;
 				if (split.length > 1)
 				{
@@ -87,19 +62,13 @@ public class Commandgive extends EssentialsCommand

 		if (stack.getType() == Material.AIR)
 		{
-			throw new Exception(_("cantSpawnItem", "Air"));
+			throw new Exception(ChatColor.RED + "You can't give air.");
 		}
+		
+		giveTo.giveItems(stack, false);

 		final String itemName = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' ');
-		sender.sendMessage(_("giveSpawn", stack.getAmount(), itemName, giveTo.getDisplayName()));
-		if (giveTo.isAuthorized("essentials.oversizedstacks"))
-		{
-			InventoryWorkaround.addOversizedItems(giveTo.getInventory(), ess.getSettings().getOversizedStackSize(), stack);
-		}
-		else
-		{
-			InventoryWorkaround.addItems(giveTo.getInventory(), stack);
-		}
-		giveTo.updateInventory();
+		sender.sendMessage(ChatColor.BLUE + "Giving " + stack.getAmount() + " of " + itemName + " to " + giveTo.getDisplayName() + ".");
+		
 	}
 }
@@ -1,74 +1,47 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import org.bukkit.Server;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.perm.Permissions;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;


 public class Commandgod extends EssentialsCommand
 {
-	public Commandgod()
-	{
-		super("god");
-	}
-
 	@Override
-	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}

-		godOtherPlayers(server, sender, args);
+		godOtherPlayers(sender, args[0]);
 	}

 	@Override
-	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
-		if (args.length > 0 && args[0].trim().length() > 2 && user.isAuthorized("essentials.god.others"))
+		if (args.length > 0 && !args[0].trim().isEmpty() && Permissions.GOD_OTHERS.isAuthorized(user))
 		{
-			godOtherPlayers(server, user, args);
+			godOtherPlayers(user, args[0]);
 			return;
 		}
-		user.setGodModeEnabled(!user.isGodModeEnabled());
-		user.sendMessage(_("godMode", (user.isGodModeEnabled() ? _("enabled") : _("disabled"))));
+
+		user.sendMessage(_("godMode", (user.toggleGodModeEnabled() ? _("enabled") : _("disabled"))));
 	}

-	private void godOtherPlayers(final Server server, final CommandSender sender, final String[] args)
+	private void godOtherPlayers(final CommandSender sender, final String name)
 	{
-		for (Player matchPlayer : server.matchPlayer(args[0]))
+		for (Player matchPlayer : server.matchPlayer(name))
 		{
-			final User player = ess.getUser(matchPlayer);
+			final IUser player = ess.getUser(matchPlayer);
 			if (player.isHidden())
 			{
 				continue;
 			}
-
-			if (args.length > 1)
-			{
-				if (args[1].contains("on") || args[1].contains("ena") || args[1].equalsIgnoreCase("1"))
-				{
-					player.setGodModeEnabled(true);
-				}
-				else
-				{
-					player.setGodModeEnabled(false);
-				}
-			}
-			else
-			{
-				player.setGodModeEnabled(!player.isGodModeEnabled());
-			}
-
-			final boolean enabled = player.isGodModeEnabled();
-			if (enabled)
-			{
-				player.setFoodLevel(20);
-			}
-
+			final boolean enabled = player.toggleGodModeEnabled();
 			player.sendMessage(_("godMode", (enabled ? _("enabled") : _("disabled"))));
 			sender.sendMessage(_("godMode", _(enabled ? "godEnabledFor" : "godDisabledFor", matchPlayer.getDisplayName())));
 		}
@@ -1,63 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
-import org.bukkit.Material;
-import org.bukkit.Server;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
-
-
-public class Commandhat extends EssentialsCommand
-{
-	public Commandhat()
-	{
-		super("hat");
-	}
-
-	@Override
-	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length > 0 && (args[0].contains("rem") || args[0].contains("off") || args[0].equalsIgnoreCase("0")))
-		{
-			final PlayerInventory inv = user.getInventory();
-			final ItemStack head = inv.getHelmet();
-			if (head == null || head.getType() == Material.AIR)
-			{
-				user.sendMessage(_("hatEmpty"));
-			}
-			else
-			{
-				final ItemStack air = new ItemStack(Material.AIR);
-				inv.setHelmet(air);
-				InventoryWorkaround.addItems(user.getInventory(), head);
-				user.sendMessage(_("hatRemoved"));
-			}
-		}
-		else
-		{
-			if (user.getItemInHand().getType() != Material.AIR)
-			{
-				final ItemStack hand = user.getItemInHand();
-				if (hand.getType().getMaxDurability() == 0)
-				{
-					final PlayerInventory inv = user.getInventory();
-					final ItemStack head = inv.getHelmet();
-					inv.removeItem(hand);
-					inv.setHelmet(hand);
-					inv.setItemInHand(head);
-					user.sendMessage(_("hatPlaced"));
-				}
-				else
-				{
-					user.sendMessage(_("hatArmor"));
-				}
-			}
-			else
-			{
-				user.sendMessage(_("hatFail"));
-			}
-		}
-	}
-}
@@ -1,55 +1,47 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
+import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.perm.Permissions;
+import com.earth2me.essentials.user.UserData.TimestampType;
 import java.util.List;
-import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;


 public class Commandheal extends EssentialsCommand
 {
-	public Commandheal()
-	{
-		super("heal");
-	}
-
 	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{

-		if (args.length > 0 && user.isAuthorized("essentials.heal.others"))
+		if (args.length > 0 && Permissions.HEAL_OTHERS.isAuthorized(user))
 		{
-			if (!user.isAuthorized("essentials.heal.cooldown.bypass"))
-			{
-				user.healCooldown();
-			}
-			healOtherPlayers(server, user, args[0]);
+			user.checkCooldown(TimestampType.LASTHEAL, ess.getGroups().getHealCooldown(user), true, Permissions.HEAL_COOLDOWN_BYPASS);
+
+			healOtherPlayers(user, args[0]);
 			return;
 		}

-		if (!user.isAuthorized("essentials.heal.cooldown.bypass"))
-		{
-			user.healCooldown();
-		}
-		healPlayer(user);
+		user.checkCooldown(TimestampType.LASTHEAL, ess.getGroups().getHealCooldown(user), true, Permissions.HEAL_COOLDOWN_BYPASS);
+
+		user.setHealth(20);
+		user.setFoodLevel(20);
+		user.sendMessage(_("heal"));
 	}

 	@Override
-	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}

-		healOtherPlayers(server, sender, args[0]);
+		healOtherPlayers(sender, args[0]);
 	}

-	private void healOtherPlayers(final Server server, final CommandSender sender, final String name)
+	private void healOtherPlayers(final CommandSender sender, final String name)
 	{
 		final List<Player> players = server.matchPlayer(name);
 		if (players.isEmpty())
@@ -63,19 +55,10 @@ public class Commandheal extends EssentialsCommand
 			{
 				continue;
 			}
-			healPlayer(p);
+			p.setHealth(20);
+			p.setFoodLevel(20);
+			p.sendMessage(_("heal"));
 			sender.sendMessage(_("healOther", p.getDisplayName()));
 		}
 	}
-
-	private void healPlayer(final Player p)
-	{
-		p.setHealth(20);
-		p.setFoodLevel(20);
-		p.sendMessage(_("heal"));
-		for (PotionEffect effect : p.getActivePotionEffects())
-		{
-			p.removePotionEffect(effect.getType());
-		}
-	}
 }
Author	SHA1	Message	Date
Paul Buonopane	d06fc84e41	Changed s to dropStack for verbosity, and organized imports. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:46:57 -05:00
Paul Buonopane	1cbb6f1617	ManagedFile was in the correct folder, but had the wrong package header. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:29:49 -05:00
Paul Buonopane	0039f73fb3	Better use of logger. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:27:23 -05:00
Paul Buonopane	a865c9ad01	Formatting. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:26:55 -05:00
Paul Buonopane	8c5d4d83f1	Avoided shadowing. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:26:10 -05:00
Paul Buonopane	53c9265800	Formatting. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:24:46 -05:00
Paul Buonopane	9b25a25e91	Methods' applicable members are now static. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:21:26 -05:00
Paul Buonopane	a2fdf66de4	Renamed TNT explosion listener to be more consistent with naming scheme. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:18:29 -05:00
Paul Buonopane	224e5f129e	ChargeException was in the correct folder, but had the wrong package header. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:14:33 -05:00
Paul Buonopane	146599ae4b	Formatting. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:11:09 -05:00
Paul Buonopane	4203119e9a	Removed poor use of shadowing. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:02:55 -05:00
Paul Buonopane	aefe79bbe7	Added @Override annotation in I18n. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:00:27 -05:00
Paul Buonopane	5da1e9a220	Increased logger efficiency in Essentials. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 11:58:43 -05:00
Paul Buonopane	a0df79cc06	Removed unused imports in Essentials. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 11:56:48 -05:00
snowleo	32840e68f3	Sign settings	2012-02-21 19:17:22 +01:00
snowleo	4da3f52164	Merge branch 'refs/heads/master' into 3.0 Conflicts: .gitignore Essentials/src/com/earth2me/essentials/Essentials.java Essentials/src/com/earth2me/essentials/EssentialsTimer.java Essentials/src/com/earth2me/essentials/ISettings.java Essentials/src/com/earth2me/essentials/Jails.java Essentials/src/com/earth2me/essentials/OfflinePlayer.java Essentials/src/com/earth2me/essentials/Settings.java Essentials/src/com/earth2me/essentials/User.java Essentials/src/com/earth2me/essentials/UserData.java Essentials/src/com/earth2me/essentials/UserMap.java Essentials/src/com/earth2me/essentials/Util.java Essentials/src/com/earth2me/essentials/commands/Commandnear.java Essentials/src/com/earth2me/essentials/commands/Commandping.java Essentials/src/com/earth2me/essentials/commands/Commandspawner.java Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java Essentials/src/com/earth2me/essentials/commands/Commandwarp.java Essentials/src/messages_en.properties Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java EssentialsChat/src/plugin.yml EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java	2012-02-21 18:34:53 +01:00
snowleo	cae3c5a03e	We don't need to get OfflinePlayer again.	2012-02-13 11:22:49 +01:00
md_5	13206b3418	Its a good idea to remove imports when you remove a class	2012-02-13 18:11:01 +11:00
md_5	c713be8c82	No need for that CraftBukkit hack anymore	2012-02-13 18:05:59 +11:00
snowleo	a3c67e23c8	Organize Imports	2012-02-06 22:26:52 +01:00
snowleo	ffcdd99ad0	Cleanup	2012-02-06 22:22:05 +01:00
snowleo	539700cb21	New Groups code, supports groups.yml file, gm and vault, new economy api.	2012-02-06 22:13:39 +01:00
snowleo	1078b7b5f2	copy&paste fail	2012-02-05 18:29:37 +01:00
snowleo	f908eee76c	New permissions for signs	2012-02-05 18:26:21 +01:00
snowleo	b95c662ed5	Finally fix tests	2012-02-05 18:02:45 +01:00
snowleo	a60f280a1c	Fixing the Testcases	2012-02-05 17:35:47 +01:00
snowleo	8ab5bad988	Modified BetterLocation, and new Permission-System	2012-02-05 17:19:32 +01:00
KHobbits	8080abacd6	More general cleanup.	2012-01-28 14:17:27 +00:00
KHobbits	e960078e1a	Random Cleanup	2012-01-28 14:05:50 +00:00
KHobbits	f4413633b8	Clean more imports.	2012-01-28 13:48:30 +00:00
KHobbits	5c44877c4c	Organize Imports	2012-01-28 13:44:06 +00:00
KHobbits	36d7907987	Fix missing import.	2012-01-28 13:40:10 +00:00
KHobbits	047f373631	Merge branch 'master' into 3.0 Conflicts: Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java Essentials/src/com/earth2me/essentials/commands/Commandhome.java Essentials/src/com/earth2me/essentials/commands/Commandsethome.java Essentials/src/messages_fr.properties EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java	2012-01-28 13:33:09 +00:00
KHobbits	72ed86e0dd	Tidy chat.	2012-01-26 00:01:49 +00:00
KHobbits	c689b55c4d	Fix depends	2012-01-25 23:56:54 +00:00
ementalo	cbee61093e	Fix exception when getting displayname Fix exception if null values are in settings groups.yml	2012-01-25 01:09:32 +00:00
KHobbits	df061749dd	2nd sweep over Essentials Chat, to implement 2.8 changes. Formatting cache still needs reimplemented.	2012-01-24 23:20:00 +00:00
KHobbits	38a9327284	Merge branch '3.0' of github.com:essentials/Essentials into 3.0 Conflicts: Essentials/src/messages_en.properties	2012-01-24 22:56:53 +00:00
ementalo	307c6c7bf0	remove merge leftovers Don't try to spawn users who have disconnected before we have a chance to spawn them	2012-01-24 22:50:34 +00:00
KHobbits	bdc695c85b	First sweep over Essentials Chat, to implement 2.8 changes. Formatting cache still needs reimplemented.	2012-01-24 22:08:20 +00:00
KHobbits	8c54f37092	Fix messages file	2012-01-24 20:47:11 +00:00
snowleo	cc0e9aa84b	Merge branch 'refs/heads/master' into 3.0 The changes to EssChat have not been merged Conflicts: Essentials/src/com/earth2me/essentials/Essentials.java Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java Essentials/src/com/earth2me/essentials/ISettings.java Essentials/src/com/earth2me/essentials/OfflinePlayer.java Essentials/src/com/earth2me/essentials/Settings.java Essentials/src/com/earth2me/essentials/Util.java Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java Essentials/src/messages.properties Essentials/src/messages_da.properties Essentials/src/messages_de.properties Essentials/src/messages_en.properties Essentials/src/messages_es.properties Essentials/src/messages_fr.properties Essentials/src/messages_nl.properties EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java	2012-01-24 00:52:08 +01:00
snowleo	6af054631f	More work on 3.0 branch	2012-01-24 00:01:31 +01:00
ementalo	01a37df700	Add new permission essentials.protect.alerts.notrigger If user has this permisson they do not trigger EssProtect block alerts Fix spawnmob sign command args	2012-01-23 16:00:23 +00:00
snowleo	f0dd81ee00	Merge branch 'refs/heads/master' into 3.0 Did some tweaks, so that it actually works. Conflicts: Essentials/src/com/earth2me/essentials/Essentials.java Essentials/src/com/earth2me/essentials/User.java Essentials/src/com/earth2me/essentials/Util.java Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java Essentials/src/com/earth2me/essentials/commands/Commandmail.java Essentials/src/com/earth2me/essentials/commands/Commandme.java Essentials/src/com/earth2me/essentials/commands/Commandmsg.java Essentials/src/com/earth2me/essentials/commands/Commandnick.java Essentials/src/com/earth2me/essentials/commands/Commandr.java Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java build.xml	2012-01-18 04:01:01 +01:00
KHobbits	27b0cc86de	Don't charge a user if warp already exists (and they can't set it).	2012-01-17 19:25:56 +00:00
KHobbits	ee88abafcf	Merge branch '3.0' of github.com:essentials/Essentials into 3.0	2012-01-17 17:41:16 +00:00
KHobbits	a1cf08d6ab	Auto update gm version.	2012-01-17 17:23:27 +00:00
ementalo	42e9e105cb	Adding permissions for overwriting exisitng warps essentials.warp.overwrite.[warpname] will allow overwrting of exsiting warps Adding WarpNotFoundException class For ticket #	2012-01-17 16:19:53 +00:00
KHobbits	ec0d6651b0	Removing 2 dead classes.	2012-01-17 03:13:44 +00:00
snowleo	348bb6d0a3	Merge branch 'refs/heads/master' into 3.0	2012-01-13 00:23:39 +01:00
snowleo	64904cdcfd	Create Files, if they don't exist	2012-01-12 16:34:52 +01:00
snowleo	69d57b04d9	ItemDb now loads in half the time, uses 72KB less memory.	2012-01-12 16:33:55 +01:00
snowleo	ef659d5f26	Better Location code for lazy loading worlds This fixes problems with worlds that are loaded after the Location object is created and should prevent memory leaks when a world is unloaded.	2012-01-11 04:36:57 +01:00
snowleo	703c5741bd	Essentials should run now...	2012-01-10 01:02:23 +01:00
snowleo	d64c73fc51	Finished Protect, Essentials should build now.	2012-01-10 00:36:09 +01:00
snowleo	92abba0f25	All tests should work now	2012-01-09 23:27:52 +01:00
snowleo	cc3cd5e89c	Cleanup of Console class	2012-01-06 01:55:41 +01:00
KHobbits	3513d72a7b	Fixing Warp, Spawnmob signs Fix Imports	2012-01-04 21:41:05 +00:00
KHobbits	8432e1fc7d	Fixing kit and protect signs (inGroup) Fix imports	2012-01-04 21:37:00 +00:00
KHobbits	a46f6fd73d	Revert "Possible sign refactor?" This reverts commit `897571db7d`.	2012-01-04 18:56:36 +00:00
KHobbits	897571db7d	Possible sign refactor?	2012-01-04 18:34:37 +00:00
KHobbits	de0a419476	Cleaning up item spawning and kits.	2012-01-04 17:51:14 +00:00
ementalo	6dd73f5247	ReadLock for realname Remove unneeded overrides Redo Khobbits messages_de changes	2012-01-04 15:53:59 +00:00
ementalo	a50cfb3efb	3.0 updates - Main jar should build now	2012-01-04 15:06:10 +00:00
ementalo	bbcf2ecce3	Fix a few things for 3.0 Test #843 - new config option added cancelTpRequestsOnWorldChange Test # 1255 - essentials.nogod.override permission added Test #1311 - added ban reason in /seen	2012-01-04 11:57:00 +00:00
snowleo	86ea654a5d	Cleanup of Backup class	2012-01-04 05:45:32 +01:00
KHobbits	d2bbbd14fc	Organize Imports	2012-01-04 03:45:26 +00:00
KHobbits	a5398e938c	final is cleaner.	2012-01-04 03:37:47 +00:00
KHobbits	7b01bc894d	Readlocks maybe...	2012-01-04 03:27:25 +00:00
KHobbits	2678be90e3	Fixing up kits.	2012-01-04 03:12:21 +00:00
snowleo	781f42fba1	More fixes for commands	2012-01-03 21:43:57 +01:00
snowleo	481749b119	New names	2012-01-03 02:57:44 +01:00
snowleo	a552b88172	I always forget these	2012-01-03 02:53:57 +01:00
snowleo	801562ac2c	More work on Protect	2012-01-03 02:51:19 +01:00
snowleo	869d79ae73	This feels so good D:	2012-01-03 01:53:38 +01:00
snowleo	7153676137	Starting to break Protect	2012-01-03 00:07:44 +01:00
snowleo	d2c1b24e4b	Prototype for grouping permissions into an enum	2012-01-02 23:45:50 +01:00
snowleo	b3de4276bc	Those are permission based now	2012-01-02 23:35:36 +01:00
snowleo	cb31939a7a	New Protect config	2012-01-02 23:25:17 +01:00
snowleo	41e0e64a5f	EssentialsSpawn and EssentialsChat should build now again	2012-01-02 22:38:47 +01:00
snowleo	a20e96af4e	Netbeans 7.1 RC2 project stuff	2012-01-02 22:37:44 +01:00
snowleo	cedf363557	Merge branch 'refs/heads/master' into 3.0	2012-01-02 20:29:00 +01:00
snowleo	9bb6d77bdb	More work done on the 3.0 branch	2011-12-23 12:57:26 +01:00
snowleo	03171616fa	Merge branch 'refs/heads/master' into 3.0 Conflicts: Essentials/src/com/earth2me/essentials/Essentials.java	2011-12-22 23:37:12 +01:00
KHobbits	087a594449	Removing duplicate messages file This causes confusion when trying to override messages in the ess folder.	2011-12-18 11:52:49 +00:00
KHobbits	c0b78cc3d5	Adding /join as alias to /tpa, and /come as alias to /tpahere	2011-12-18 04:30:00 +00:00
KHobbits	b05e4079d9	Essentials now throws a custom event, to handle local chat. (Changing event name, so we don't get custom event conflicts.)	2011-12-17 17:57:57 +00:00
KHobbits	556c990eff	EssentialsChat cleaning.	2011-12-17 17:40:47 +00:00
KHobbits	618f58c3f3	Merge branch 'master' into 3.0	2011-12-15 20:47:59 +00:00
snowleo	a7e71488c6	Merge branch 'refs/heads/master' into 3.0	2011-12-15 10:32:56 +01:00
snowleo	0155bcedb7	Updated all modules to new api, some settings are still missing	2011-12-14 16:31:08 +01:00
snowleo	9ab2fe54fc	Added EssentialsSigns to build.xml	2011-12-14 16:05:35 +01:00
snowleo	0f1eb9b4f9	Moved signs code to a new module	2011-12-14 16:04:15 +01:00
snowleo	503e837cfd	Fail merge :D	2011-12-14 15:22:29 +01:00
snowleo	0a98b8f662	Merge branch 'refs/heads/master' into 3.0 Conflicts: Essentials/src/com/earth2me/essentials/Essentials.java Essentials/src/com/earth2me/essentials/IUser.java Essentials/src/com/earth2me/essentials/Trade.java Essentials/src/com/earth2me/essentials/User.java	2011-12-14 15:20:22 +01:00
snowleo	6e79302908	More work done.	2011-12-12 22:31:19 +01:00
snowleo	ecf72e27bb	More work done	2011-12-11 13:16:36 +01:00
snowleo	d1aea7dd35	Merge branch 'refs/heads/master' into 3.0 Conflicts: Essentials/src/com/earth2me/essentials/Util.java	2011-12-11 09:25:33 +01:00
snowleo	b2a307ec23	Merge branch 'refs/heads/master' into 3.0	2011-12-11 08:56:53 +01:00
snowleo	f0dabdd4b1	Re-Implemented User class	2011-12-10 03:04:10 +01:00