Release the Player object reference on quit.

Fix error message typo

.classpath

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<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>

.gitignore

@@ -1,40 +1,53 @@
-.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/apikey.php
-/WebPush/apikey.php
+.DS_Store
+/BuildAll/nbproject/private/
+/EssentialsProtect/nbproject/private/
+/EssentialsChat/nbproject/private/
+/EssentialsGroupBridge/nbproject/private/
+/EssentialsGeoIP/nbproject/private/
+/EssentialsSpawn/nbproject/private/
+/EssentialsXMPP/nbproject/private/
+/EssentialsGroupManager/nbproject/private/
+/BuildAll/build/
+/EssentialsGroupBridge/dist/
+/EssentialsGroupBridge/build/
+/EssentialsGeoIP/dist/
+/EssentialsGeoIP/build/
+/EssentialsGroupManager/build/
+/EssentialsGroupManager/dist/
+/BuildAll/dist/
+/EssentialsChat/build/
+/EssentialsChat/dist/
+/EssentialsSpawn/build/
+/EssentialsSpawn/dist/
+/EssentialsXMPP/dist/
+/EssentialsXMPP/build/
+/EssentialsProtect/dist/
+/EssentialsProtect/build/
+/EssentialsPermissionsCommands/nbproject/private/
+/EssentialsPermissionsCommands/build/
+/EssentialsPermissionsCommands/dist/
+/Essentials/nbproject/private/
+/Essentials/dist/
+/Essentials/build/
+/YamlAnnotations/
+/EssentialsUpdate/nbproject/private/
+/EssentialsRelease/
+/EssentialsUpdate/dist/
+/EssentialsUpdate/build/
+/WebPush/apikey.php
+/WebPush/nbproject/private
+/EssentialsGroupManager/bin
+/EssentialsGroupManager/.externalToolBuilders
+/EssentialsAntiBuild/nbproject/private/
+/EssentialsAntiBuild/dist/
+/EssentialsAntiBuild/build/
+/jars
+/out
+.idea/
+*.iml
+target/
+dependency-reduced-pom.xml
+/Essentials/config.yml
+/Essentials/userdata/testplayer1.yml
+/Essentials/usermap.csv
+/Essentials/userdata

.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Essentials</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

.travis.yml

@@ -0,0 +1,18 @@
+language: java
+jdk:
+  - oraclejdk7
+  - openjdk7
+  - openjdk6
+script: mvn compile test
+install: true
+notifications:
+  irc: 
+    channels: 
+      - "irc.esper.net#lain"
+    on_success: change
+    on_failure: always
+  email:
+    recipients:
+      - "khobbits@ess3.net"
+    on_success: change
+    on_failure: always

BuildAll/build.xml

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

BuildAll/nbproject/genfiles.properties

@@ -1,8 +0,0 @@
-build.xml.data.CRC32=51b33957
-build.xml.script.CRC32=7a797370
-build.xml.stylesheet.CRC32=28e38971@1.44.1.45
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=51b33957
-nbproject/build-impl.xml.script.CRC32=66b89647
-nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45

BuildAll/nbproject/project.properties

@@ -1,131 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=BuildAll
-application.vendor=
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/BuildAll.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-includes=**
-jar.compress=true
-javac.classpath=\
-    ${reference.Essentials.jar}:\
-    ${reference.EssentialsChat.jar}:\
-    ${reference.EssentialsProtect.jar}:\
-    ${reference.EssentialsSpawn.jar}:\
-    ${reference.EssentialsGeoIP.jar}:\
-    ${reference.EssentialsGroupBridge.jar}:\
-    ${reference.EssentialsXMPP.jar}:\
-    ${reference.EssentialsGroupManager.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.6
-javac.target=1.6
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=default_platform
-project.Essentials=../Essentials
-project.EssentialsChat=../EssentialsChat
-project.EssentialsGeoIP=../EssentialsGeoIP
-project.EssentialsGroupBridge=../EssentialsGroupBridge
-project.EssentialsGroupManager=../EssentialsGroupManager
-project.EssentialsProtect=../EssentialsProtect
-project.EssentialsSpawn=../EssentialsSpawn
-project.EssentialsXMPP=../EssentialsXMPP
-reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
-reference.EssentialsChat.jar=${project.EssentialsChat}/dist/EssentialsChat.jar
-reference.EssentialsGeoIP.jar=${project.EssentialsGeoIP}/dist/EssentialsGeoIP.jar
-reference.EssentialsGroupBridge.jar=${project.EssentialsGroupBridge}/dist/EssentialsGroupBridge.jar
-reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar
-reference.EssentialsProtect.jar=${project.EssentialsProtect}/dist/EssentialsProtect.jar
-reference.EssentialsSpawn.jar=${project.EssentialsSpawn}/dist/EssentialsSpawn.jar
-reference.EssentialsXMPP.jar=${project.EssentialsXMPP}/dist/EssentialsXMPP.jar
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test

BuildAll/nbproject/project.xml

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

Essentials/build.xml

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

Essentials/nbproject/genfiles.properties

@@ -1,11 +0,0 @@
-build.xml.data.CRC32=7d758acf
-build.xml.script.CRC32=3233ee78
-build.xml.stylesheet.CRC32=28e38971@1.38.2.45
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=a830bc14
-nbproject/build-impl.xml.script.CRC32=64a00ba6
-nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
-nbproject/profiler-build-impl.xml.data.CRC32=ab78ce15
-nbproject/profiler-build-impl.xml.script.CRC32=abda56ed
-nbproject/profiler-build-impl.xml.stylesheet.CRC32=f10cf54c@1.11.1

Essentials/nbproject/pmd.settings

@@ -1,2 +0,0 @@
-DoNotUseThreads
-SignatureDeclareThrowsException

Essentials/nbproject/project.properties

@@ -1,145 +0,0 @@
-annotation.processing.enabled=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
-application.title=Essentials
-application.vendor=
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/Essentials.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.BOSEconomy7.jar=../lib/BOSEconomy7.jar
-file.reference.bPermissions.jar=../lib/bPermissions.jar
-file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
-file.reference.iCo4.jar=../lib/iCo4.jar
-file.reference.iCo5.jar=../lib/iCo5.jar
-file.reference.iCo6.jar=../lib/iCo6.jar
-file.reference.junit-4.5.jar=../lib/junit_4/junit-4.5.jar
-file.reference.lombok-0.10.1.jar=../lib/lombok-0.10.1.jar
-file.reference.MultiCurrency.jar=../lib/MultiCurrency.jar
-file.reference.Permissions3.jar=../lib/Permissions3.jar
-file.reference.PermissionsBukkit-1.2.jar=../lib/PermissionsBukkit-1.2.jar
-file.reference.PermissionsEx.jar=../lib/PermissionsEx.jar
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.compress=true
-jar.index=${jnlp.enabled}
-javac.classpath=\
-    ${file.reference.Permissions3.jar}:\
-    ${file.reference.iCo4.jar}:\
-    ${file.reference.iCo5.jar}:\
-    ${file.reference.iCo6.jar}:\
-    ${file.reference.MultiCurrency.jar}:\
-    ${file.reference.BOSEconomy7.jar}:\
-    ${file.reference.PermissionsEx.jar}:\
-    ${file.reference.bPermissions.jar}:\
-    ${file.reference.PermissionsBukkit-1.2.jar}:\
-    ${file.reference.lombok-0.10.1.jar}:\
-    ${reference.EssentialsGroupManager.jar}:\
-    ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.6
-javac.target=1.6
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${file.reference.junit-4.5.jar}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.reference.PermissionsEx.jar=../lib/PermissionsEx-javadoc.jar
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-jnlp.codebase.type=no.codebase
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.mixed.code=default
-jnlp.offline-allowed=false
-jnlp.signed=false
-jnlp.signing=
-jnlp.signing.alias=
-jnlp.signing.keystore=
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=true
-platform.active=default_platform
-project.EssentialsGroupManager=../EssentialsGroupManager
-reference.EssentialsGroupManager.jar=../EssentialsGroupManager/dist/EssentialsGroupManager.jar
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=-Djline.terminal=jline.UnsupportedTerminal
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test

Essentials/nbproject/project.xml

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

Essentials/pom.xml

@@ -0,0 +1,144 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>net.ess3</groupId>
+		<artifactId>EssentialsParent</artifactId>
+		<version>2.x-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>Essentials</artifactId>
+
+	<url>http://ess3.net/</url>
+
+	<organization>
+		<name>Essentials Team</name>
+		<url>http://ess3.net/</url>
+	</organization>
+
+	<licenses>
+		<license>
+			<name>GPLv3</name>
+			<url>http://www.gnu.org/copyleft/gpl.html</url>
+		</license>
+	</licenses>
+
+	<scm>
+		<connection>scm:git:https://github.com/essentials/Essentials.git</connection>
+		<developerConnection>scm:git:https://github.com/essentials/Essentials.git</developerConnection>
+		<url>https://github.com/essentials/Essentials</url>
+	</scm>
+
+	<issueManagement>
+		<system>JIRA</system>
+		<url>http://essentials3.atlassian.net</url>
+	</issueManagement>
+
+	<ciManagement>
+		<system>TeamCity</system>
+		<url>http://ci.ess3.net/</url>
+	</ciManagement>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <showDeprecation>true</showDeprecation>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+		<dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.7.2-R0.3-SNAPSHOT</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/bukkit.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>BOSEconomy</groupId>
+			<artifactId>BOSEconomy</artifactId>
+			<version>v0.7.8.1</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/BOSEconomy.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>de.bananaco</groupId>
+			<artifactId>bPermissions</artifactId>
+			<version>v2.12-DEV</version>
+		</dependency>
+		<dependency>
+			<groupId>iConomy</groupId>
+			<artifactId>iConomy5</artifactId>
+			<version>5</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/iCo5.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>iConomy</groupId>
+			<artifactId>iConomy6</artifactId>
+			<version>6</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/iCo6.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>net.ess3</groupId>
+			<artifactId>GroupManager</artifactId>
+			<version>${project.version}</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../EssentialsGroupManager/dist/EssentialsGroupManager.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>MultiCurrency</groupId>
+			<artifactId>MultiCurrency</artifactId>
+			<version>2.2</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/MultiCurrency.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>com.platymuus</groupId>
+			<artifactId>bukkit-permissions</artifactId>
+			<version>2.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/PermissionsBukkit.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>ru.tehkode</groupId>
+			<artifactId>PermissionsEx</artifactId>
+			<version>1.20.4</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/PermissionsEx.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>Privileges</groupId>
+			<artifactId>Privileges</artifactId>
+			<version>1.8.1</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/Privileges.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>SimplyPerms</groupId>
+			<artifactId>SimplyPerms</artifactId>
+			<version>1.7.6</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/SimplyPerms.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>net.milkbowl.vault</groupId>
+			<artifactId>Vault</artifactId>
+			<version>1.2.32</version>
+		</dependency>
+		<dependency>
+			<groupId>zPermissions</groupId>
+			<artifactId>zPermissions</artifactId>
+			<version>1.1</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/zPermissions.jar</systemPath>
+		</dependency>
+	</dependencies>
+</project>

Essentials/src/book.txt

@@ -0,0 +1,18 @@
+This is the book file.
+
+This file format works similar to the info.txt, motd.txt and rules.txt
+
+Place content in here that you would like to be used by books ingame.
+
+You can use this content by using the book:<section> meta option in kits or item spawning.
+
+#Colors
+Minecraft colors:
+&0 &&0  &1 &&1  &2 &&2  &3 &&3
+&4 &&4  &5 &&5  &6 &&6  &7 &&7
+&8 &&8  &9 &&9  &a &&a  &b &&b
+&c &&c  &d &&d  &e &&e  &f &&f
+&0 
+&&k &kMagic&r   &&l &lBold
+&&m &mStrike&r  &&n &nUline
+&&o &oItalic&r   &&r &rReset

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

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

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

@@ -1,18 +1,19 @@
 package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n.tl;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.CraftServer;
 
 
 public class Backup implements Runnable
 {
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+	private static final Logger LOGGER = Logger.getLogger("Essentials");
 	private transient final Server server;
 	private transient final IEssentials ess;
 	private transient boolean running = false;
@@ -25,16 +26,33 @@ public class Backup implements Runnable
 		server = ess.getServer();
 		if (server.getOnlinePlayers().length > 0)
 		{
-			startTask();
+			ess.runTaskAsynchronously(new Runnable()
+			{
+				@Override
+				public void run()
+				{
+					startTask();
+				}
+			});
 		}
 	}
 
-	void onPlayerJoin()
+	public void onPlayerJoin()
 	{
 		startTask();
 	}
 
-	private void startTask()
+	public synchronized void stopTask()
+	{
+		running = false;
+		if (taskId != -1)
+		{
+			server.getScheduler().cancelTask(taskId);
+		}
+		taskId = -1;
+	}
+
+	private synchronized void startTask()
 	{
 		if (!running)
 		{
@@ -48,6 +66,7 @@ public class Backup implements Runnable
 		}
 	}
 
+	@Override
 	public void run()
 	{
 		if (active)
@@ -60,72 +79,89 @@ public class Backup implements Runnable
 		{
 			return;
 		}
-		LOGGER.log(Level.INFO, Util.i18n("backupStarted"));
+		if ("save-all".equalsIgnoreCase(command))
+		{
+			final CommandSender cs = server.getConsoleSender();
+			server.dispatchCommand(cs, "save-all");
+			active = false;
+			return;
+		}
+		LOGGER.log(Level.INFO, tl("backupStarted"));
 		final CommandSender cs = server.getConsoleSender();
 		server.dispatchCommand(cs, "save-all");
 		server.dispatchCommand(cs, "save-off");
 
-		ess.scheduleAsyncDelayedTask(
-				new Runnable()
+		ess.runTaskAsynchronously(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				try
 				{
-					public void run()
+					final ProcessBuilder childBuilder = new ProcessBuilder(command);
+					childBuilder.redirectErrorStream(true);
+					childBuilder.directory(ess.getDataFolder().getParentFile().getParentFile());
+					final Process child = childBuilder.start();
+					ess.runTaskAsynchronously(new Runnable()
 					{
-						try
+						@Override
+						public void run()
 						{
-							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
+								final BufferedReader reader = new BufferedReader(new InputStreamReader(child.getInputStream()));
+								try
 								{
-									line = reader.readLine();
-									if (line != null)
+									String line;
+									do
 									{
-										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()
-									{
-										public void run()
+										line = reader.readLine();
+										if (line != null)
 										{
-											server.dispatchCommand(cs, "save-on");
-											if (server.getOnlinePlayers().length == 0)
-											{
-												running = false;
-												if (taskId != -1)
-												{
-													server.getScheduler().cancelTask(taskId);
-												}
-											}
-											active = false;
-											LOGGER.log(Level.INFO, Util.i18n("backupFinished"));
+											LOGGER.log(Level.INFO, line);
 										}
-									});
+									}
+									while (line != null);
+								}
+								finally
+								{
+									reader.close();
+								}
+							}
+							catch (IOException ex)
+							{
+								LOGGER.log(Level.SEVERE, null, ex);
+							}
 						}
-					}
-				});
+					});
+					child.waitFor();
+				}
+				catch (InterruptedException ex)
+				{
+					LOGGER.log(Level.SEVERE, null, ex);
+				}
+				catch (IOException ex)
+				{
+					LOGGER.log(Level.SEVERE, null, ex);
+				}
+				finally
+				{
+					ess.scheduleSyncDelayedTask(new Runnable()
+					{
+						@Override
+						public void run()
+						{
+							server.dispatchCommand(cs, "save-on");
+							if (server.getOnlinePlayers().length == 0)
+							{
+								stopTask();
+							}
+							active = false;
+							LOGGER.log(Level.INFO, tl("backupFinished"));
+						}
+					});
+				}
+			}
+		});
 	}
 }

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

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

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

@@ -6,8 +6,8 @@ import org.bukkit.command.CommandSender;
 
 public final class Console implements IReplyTo
 {
-	private static Console instance = new Console();
-	private CommandSender replyTo;
+	private static final Console instance = new Console();
+	private CommandSource replyTo;
 	public final static String NAME = "Console";
 
 	private Console()
@@ -19,12 +19,14 @@ public final class Console implements IReplyTo
 		return server.getConsoleSender();
 	}
 
-	public void setReplyTo(CommandSender user)
+	@Override
+	public void setReplyTo(CommandSource user)
 	{
 		replyTo = user;
 	}
 
-	public CommandSender getReplyTo()
+	@Override
+	public CommandSource getReplyTo()
 	{
 		return replyTo;
 	}

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

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

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

@@ -1,110 +1,71 @@
 package com.earth2me.essentials;
 
-import java.util.logging.Logger;
+import com.earth2me.essentials.utils.LocationUtil;
+import java.util.Locale;
+import net.ess3.api.IEssentials;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
-import org.bukkit.event.block.BlockListener;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.CreatureSpawner;
+import org.bukkit.entity.EntityType;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.inventory.ItemStack;
 
 
-public class EssentialsBlockListener extends BlockListener
+public class EssentialsBlockListener implements Listener
 {
-	private final IEssentials ess;
-	private static final Logger logger = Logger.getLogger("Minecraft");
+	private final transient IEssentials ess;
 
-	public EssentialsBlockListener(IEssentials ess)
+	public EssentialsBlockListener(final IEssentials ess)
 	{
 		this.ess = ess;
 	}
 
-	@Override
-	public void onBlockPlace(BlockPlaceEvent event)
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onBlockPlace(final BlockPlaceEvent event)
 	{
-		if (event.isCancelled())
-		{
-			return;
-		}
-		final User user = ess.getUser(event.getPlayer());
 		// Do not rely on getItemInHand();
 		// http://leaky.bukkit.org/issues/663
-		final ItemStack is = new ItemStack(event.getBlockPlaced().getType(), 1, (short)0, event.getBlockPlaced().getData());
-		switch (is.getType())
+		final ItemStack is = LocationUtil.convertBlockToItem(event.getBlockPlaced());
+		if (is == null)
 		{
-		case WOODEN_DOOR:
-			is.setType(Material.WOOD_DOOR);
-			is.setDurability((short)0);
-			break;
-		case IRON_DOOR_BLOCK:
-			is.setType(Material.IRON_DOOR);
-			is.setDurability((short)0);
-			break;
-		case SIGN_POST:
-		case WALL_SIGN:
-			is.setType(Material.SIGN);
-			is.setDurability((short)0);
-			break;
-		case CROPS:
-			is.setType(Material.SEEDS);
-			is.setDurability((short)0);
-			break;
-		case CAKE_BLOCK:
-			is.setType(Material.CAKE);
-			is.setDurability((short)0);
-			break;
-		case BED_BLOCK:
-			is.setType(Material.BED);
-			is.setDurability((short)0);
-			break;
-		case REDSTONE_WIRE:
-			is.setType(Material.REDSTONE);
-			is.setDurability((short)0);
-			break;
-		case REDSTONE_TORCH_OFF:
-		case REDSTONE_TORCH_ON:
-			is.setType(Material.REDSTONE_TORCH_ON);
-			is.setDurability((short)0);
-			break;
-		case DIODE_BLOCK_OFF:
-		case DIODE_BLOCK_ON:
-			is.setType(Material.DIODE);
-			is.setDurability((short)0);
-			break;
-		case DOUBLE_STEP:
-			is.setType(Material.STEP);
-			break;
-		case TORCH:
-		case RAILS:
-		case LADDER:
-		case WOOD_STAIRS:
-		case COBBLESTONE_STAIRS:
-		case LEVER:
-		case STONE_BUTTON:
-		case FURNACE:
-		case DISPENSER:
-		case PUMPKIN:
-		case JACK_O_LANTERN:
-		case WOOD_PLATE:
-		case STONE_PLATE:
-		case PISTON_STICKY_BASE:
-		case PISTON_BASE:
-			is.setDurability((short)0);
-			break;
-		case FIRE:
 			return;
 		}
-		boolean unlimitedForUser = user.hasUnlimited(is);
-		if (unlimitedForUser && user.getGameMode() == GameMode.SURVIVAL)
+
+		if (is.getType() == Material.MOB_SPAWNER && event.getItemInHand() != null && event.getPlayer() != null
+			&& event.getItemInHand().getType() == Material.MOB_SPAWNER)
+		{
+			final BlockState blockState = event.getBlockPlaced().getState();
+			if (blockState instanceof CreatureSpawner)
+			{
+				final CreatureSpawner spawner = (CreatureSpawner)blockState;
+				final EntityType type = EntityType.fromId(event.getItemInHand().getData().getData());
+				if (type != null && Mob.fromBukkitType(type) != null)
+				{
+					if (ess.getUser(event.getPlayer()).isAuthorized("essentials.spawnerconvert." + Mob.fromBukkitType(type).name().toLowerCase(Locale.ENGLISH)))
+					{
+						spawner.setSpawnedType(type);
+					}
+				}
+			}
+		}
+
+		final User user = ess.getUser(event.getPlayer());
+		if (user.hasUnlimited(is) && user.getBase().getGameMode() == GameMode.SURVIVAL)
 		{
 			ess.scheduleSyncDelayedTask(
 					new Runnable()
-					{
-						public void run()
-						{
-							user.getInventory().addItem(is);
-							user.updateInventory();
-						}
-					});
+			{
+				@Override
+				public void run()
+				{
+					user.getBase().getInventory().addItem(is);
+					user.getBase().updateInventory();
+				}
+			});
 		}
 	}
 }

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

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

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

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

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

@@ -1,105 +1,138 @@
 package com.earth2me.essentials;
 
-import java.util.Arrays;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.textreader.IText;
+import com.earth2me.essentials.textreader.KeywordReplacer;
+import com.earth2me.essentials.textreader.TextInput;
+import com.earth2me.essentials.textreader.TextPager;
+import com.earth2me.essentials.utils.DateUtil;
+import com.earth2me.essentials.utils.LocationUtil;
+import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
+import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.block.Block;
+import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.player.PlayerAnimationEvent;
-import org.bukkit.event.player.PlayerAnimationType;
-import org.bukkit.event.player.PlayerBedEnterEvent;
-import org.bukkit.event.player.PlayerBucketEmptyEvent;
-import org.bukkit.event.player.PlayerChatEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerEggThrowEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerListener;
-import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.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.PlayerMoveEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.player.PlayerRespawnEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 
 
-public class EssentialsPlayerListener extends PlayerListener
+public class EssentialsPlayerListener implements Listener
 {
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private final transient Server server;
+	private static final Logger LOGGER = Logger.getLogger("Essentials");
 	private final transient IEssentials ess;
-
+	
 	public EssentialsPlayerListener(final IEssentials parent)
 	{
 		this.ess = parent;
-		this.server = parent.getServer();
 	}
-
-	@Override
+	
+	@EventHandler(priority = EventPriority.NORMAL)
 	public void onPlayerRespawn(final PlayerRespawnEvent event)
 	{
 		final User user = ess.getUser(event.getPlayer());
-		user.setDisplayNick(user.getNick());
 		updateCompass(user);
-		if (ess.getSettings().changeDisplayName())
+		user.setDisplayNick();
+		
+		if (ess.getSettings().isTeleportInvulnerability())
 		{
-			user.setDisplayNick(user.getNick());
+			user.enableInvulnerabilityAfterTeleport();
 		}
 	}
-
-	@Override
-	public void onPlayerChat(final PlayerChatEvent event)
+	
+	@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(Util.i18n("playerMuted"));
-			LOGGER.info(Util.format("mutedUserSpeaks", user.getName()));
+			user.sendMessage(tl("voiceSilenced"));
+			LOGGER.info(tl("mutedUserSpeaks", user.getName()));
 		}
-		final Iterator<Player> it = event.getRecipients().iterator();
-		while (it.hasNext())
+		try
 		{
-			final User u = ess.getUser(it.next());
-			if (u.isIgnoredPlayer(user.getName()))
+			final Iterator<Player> it = event.getRecipients().iterator();
+			while (it.hasNext())
 			{
-				it.remove();
+				final User u = ess.getUser(it.next());
+				if (u.isIgnoredPlayer(user))
+				{
+					it.remove();
+				}
 			}
 		}
-		user.updateActivity(true);
-		if (ess.getSettings().changeDisplayName())
+		catch (UnsupportedOperationException ex)
 		{
-			user.setDisplayNick(user.getNick());
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.INFO, "Ignore could not block chat due to custom chat plugin event.", ex);
+			}
+			else
+			{
+				ess.getLogger().info("Ignore could not block chat due to custom chat plugin event.");
+			}
 		}
+		
+		user.updateActivity(true);
+		user.setDisplayNick();
 	}
-
-	@Override
+	
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void onPlayerMove(final PlayerMoveEvent event)
 	{
-		if (event.isCancelled())
+		if (event.getFrom().getBlockX() == event.getTo().getBlockX()
+			&& event.getFrom().getBlockZ() == event.getTo().getBlockZ()
+			&& event.getFrom().getBlockY() == event.getTo().getBlockY())
 		{
 			return;
 		}
+		
+		if (!ess.getSettings().cancelAfkOnMove() && !ess.getSettings().getFreezeAfkPlayers())
+		{
+			event.getHandlers().unregister(this);
+			
+			if (ess.getSettings().isDebug())
+			{
+				LOGGER.log(Level.INFO, "Unregistering move listener");
+			}
+			
+			return;
+		}
+		
 		final User user = ess.getUser(event.getPlayer());
-
 		if (user.isAfk() && ess.getSettings().getFreezeAfkPlayers())
 		{
 			final Location from = event.getFrom();
-			final Location to = event.getTo().clone();
+			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));
+				event.setTo(LocationUtil.getSafeDestination(to));
 			}
 			catch (Exception ex)
 			{
@@ -107,199 +140,291 @@ public class EssentialsPlayerListener extends PlayerListener
 			}
 			return;
 		}
-
 		final Location afk = user.getAfkPosition();
 		if (afk == null || !event.getTo().getWorld().equals(afk.getWorld()) || afk.distanceSquared(event.getTo()) > 9)
 		{
 			user.updateActivity(true);
 		}
 	}
-
-	@Override
+	
+	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onPlayerQuit(final PlayerQuitEvent event)
 	{
 		final User user = ess.getUser(event.getPlayer());
+		
+		if (ess.getSettings().allowSilentJoinQuit() && user.isAuthorized("essentials.silentquit"))
+		{
+			event.setQuitMessage(null);
+		}
+		else if (ess.getSettings().isCustomQuitMessage() && event.getQuitMessage() != null)
+		{
+			final Player player = event.getPlayer();
+			event.setQuitMessage(
+					ess.getSettings().getCustomQuitMessage()
+					.replace("{PLAYER}", player.getDisplayName())
+					.replace("{USERNAME}", player.getName()));
+		}
+		
 		if (ess.getSettings().removeGodOnDisconnect() && user.isGodModeEnabled())
 		{
-			user.toggleGodModeEnabled();
+			user.setGodModeEnabled(false);
 		}
-		if (user.getSavedInventory() != null)
+		if (user.isVanished())
 		{
-			user.getInventory().setContents(user.getSavedInventory());
-			user.setSavedInventory(null);
+			user.setVanished(false);
+		}
+		user.setLogoutLocation();
+		if (user.isRecipeSee())
+		{
+			user.getBase().getOpenInventory().getTopInventory().clear();
 		}
 		user.updateActivity(false);
 		user.dispose();
-		if (!ess.getSettings().getReclaimSetting())
+	}
+	
+	@EventHandler(priority = EventPriority.HIGHEST)
+	public void onPlayerJoin(final PlayerJoinEvent event)
+	{
+		final String joinMessage = event.getJoinMessage();
+		ess.runTaskAsynchronously(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				delayedJoin(event.getPlayer(), joinMessage);
+			}
+		});
+		if (ess.getSettings().allowSilentJoinQuit() || ess.getSettings().isCustomJoinMessage())
+		{
+			event.setJoinMessage(null);
+		}
+	}
+	
+	public void delayedJoin(final Player player, final String message)
+	{
+		if (!player.isOnline())
 		{
 			return;
 		}
-		final Thread thread = new Thread(new Runnable()
+		
+		ess.getBackup().onPlayerJoin();
+		final User user = ess.getUser(player);
+		
+		
+		if (user.isNPC())
 		{
+			user.setNPC(false);
+		}
+		
+		final long currentTime = System.currentTimeMillis();
+		user.checkMuteTimeout(currentTime);
+		user.updateActivity(false);
+		
+		ess.scheduleSyncDelayedTask(new Runnable()
+		{
+			@Override
 			public void run()
 			{
-				try
-				{
-					Thread.sleep(1000);
-					Runtime rt = Runtime.getRuntime();
-					double mem = rt.freeMemory();
-					rt.runFinalization();
-					rt.gc();
-					mem = rt.freeMemory() - mem;
-					mem /= 1024 * 1024;
-					LOGGER.log(Level.INFO, Util.format("freedMemory", mem));
-				}
-				catch (InterruptedException ex)
+				if (!user.getBase().isOnline())
 				{
 					return;
 				}
+				
+				user.setLastAccountName(user.getBase().getName());
+				user.setLastLogin(currentTime);
+				user.setDisplayNick();
+				updateCompass(user);
+				
+				if (!ess.getVanishedPlayers().isEmpty() && !user.isAuthorized("essentials.vanish.see"))
+				{
+					for (String p : ess.getVanishedPlayers())
+					{
+						Player toVanish = ess.getServer().getPlayerExact(p);
+						if (toVanish != null && toVanish.isOnline())
+						{
+							user.getBase().hidePlayer(toVanish);
+						}
+					}
+				}
+				
+				if (user.isAuthorized("essentials.sleepingignored"))
+				{
+					user.getBase().setSleepingIgnored(true);
+				}
+				
+				if ((ess.getSettings().allowSilentJoinQuit() && user.isAuthorized("essentials.silentjoin")) || message == null)
+				{
+					// Do nothing - silently join
+				}
+				else if (ess.getSettings().isCustomJoinMessage())
+				{
+					ess.getServer().broadcastMessage(
+							ess.getSettings().getCustomJoinMessage()
+							.replace("{PLAYER}", player.getDisplayName())
+							.replace("{USERNAME}", player.getName()));
+				}
+				else if (ess.getSettings().allowSilentJoinQuit())
+				{
+					ess.getServer().broadcastMessage(message);
+				}
+				
+				if (!ess.getSettings().isCommandDisabled("motd") && user.isAuthorized("essentials.motd"))
+				{
+					try
+					{
+						final IText input = new TextInput(user.getSource(), "motd", true, ess);
+						final IText output = new KeywordReplacer(input, user.getSource(), ess);
+						final TextPager pager = new TextPager(output, true);
+						pager.showPage("1", null, "motd", user.getSource());
+					}
+					catch (IOException ex)
+					{
+						if (ess.getSettings().isDebug())
+						{
+							LOGGER.log(Level.WARNING, ex.getMessage(), ex);
+						}
+						else
+						{
+							LOGGER.log(Level.WARNING, ex.getMessage());
+						}
+					}
+				}
+				
+				if (!ess.getSettings().isCommandDisabled("mail") && user.isAuthorized("essentials.mail"))
+				{
+					final List<String> mail = user.getMails();
+					if (mail.isEmpty())
+					{
+						user.sendMessage(tl("noNewMail"));
+					}
+					else
+					{
+						user.sendMessage(tl("youHaveNewMail", mail.size()));
+					}
+				}
+				
+				if (user.isAuthorized("essentials.fly.safelogin"))
+				{
+					user.getBase().setFallDistance(0);
+					if (LocationUtil.shouldFly(user.getLocation()))
+					{
+						user.getBase().setAllowFlight(true);
+						user.getBase().setFlying(true);
+						user.getBase().sendMessage(tl("flyMode", tl("enabled"), user.getDisplayName()));
+					}					
+				}
+				user.getBase().setFlySpeed(0.1f);
+				user.getBase().setWalkSpeed(0.2f);
+				
 			}
 		});
-		thread.setPriority(Thread.MIN_PRIORITY);
-		thread.start();
 	}
 
-	@Override
-	public void onPlayerJoin(final PlayerJoinEvent event)
+	// Makes the compass item ingame always point to the first essentials home.  #EasterEgg
+	private void updateCompass(final User user)
 	{
-		ess.getBackup().onPlayerJoin();
-		final User user = ess.getUser(event.getPlayer());
-
-		if (ess.getSettings().changeDisplayName())
+		Location loc = user.getHome(user.getLocation());
+		if (loc == null)
 		{
-			user.setDisplayNick(user.getNick());
+			loc = user.getBase().getBedSpawnLocation();
 		}
-		user.updateActivity(false);
-		if (user.isAuthorized("essentials.sleepingignored"))
+		if (loc != null)
 		{
-			user.setSleepingIgnored(true);
-		}
-
-		if (!ess.getSettings().isCommandDisabled("motd") && user.isAuthorized("essentials.motd"))
-		{
-			for (String m : ess.getMotd(user, null))
-			{
-				if (m == null)
-				{
-					continue;
-				}
-				user.sendMessage(m);
-			}
-		}
-
-		if (!ess.getSettings().isCommandDisabled("mail") && user.isAuthorized("essentials.mail"))
-		{
-			final List<String> mail = user.getMails();
-			if (mail.isEmpty())
-			{
-				user.sendMessage(Util.i18n("noNewMail"));
-			}
-			else
-			{
-				user.sendMessage(Util.format("youHaveNewMail", mail.size()));
-			}
+			final Location updateLoc = loc;
+			user.getBase().setCompassTarget(updateLoc);
 		}
 	}
-
-	@Override
+	
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void onPlayerLogin2(final PlayerLoginEvent event)
+	{
+		switch (event.getResult())
+		{
+		case KICK_BANNED:
+			break;
+		default:
+			return;
+		}
+		
+		final String banReason = tl("banFormat", tl("defaultBanReason"), "Console");
+		event.disallow(Result.KICK_BANNED, banReason);
+	}
+	
+	@EventHandler(priority = EventPriority.HIGH)
 	public void onPlayerLogin(final PlayerLoginEvent event)
 	{
-		if (event.getResult() != Result.ALLOWED && event.getResult() != Result.KICK_FULL && event.getResult() != Result.KICK_BANNED)
+		switch (event.getResult())
 		{
-			LOGGER.log(Level.INFO, "Disconnecting user " + event.getPlayer().toString() + " due to " + event.getResult().toString());
+		case KICK_FULL:
+		case KICK_BANNED:
+			break;
+		default:
 			return;
 		}
-		User user = ess.getUser(event.getPlayer());
-		user.setNPC(false);
-
-		final long currentTime = System.currentTimeMillis();
-		boolean banExpired = user.checkBanTimeout(currentTime);
-		user.checkMuteTimeout(currentTime);
-		user.checkJailTimeout(currentTime);
-
-		if (banExpired == false && (user.isBanned() || event.getResult() == Result.KICK_BANNED))
+		
+		final User user = ess.getUser(event.getPlayer());
+		
+		if (event.getResult() == Result.KICK_BANNED || user.getBase().isBanned())
 		{
-			final String banReason = user.getBanReason();
-			event.disallow(Result.KICK_BANNED, banReason != null && !banReason.isEmpty() && !banReason.equalsIgnoreCase("ban") ? banReason : Util.i18n("defaultBanReason"));
-			return;
+			final boolean banExpired = user.checkBanTimeout(System.currentTimeMillis());
+			if (!banExpired)
+			{
+				String banReason = user.getBanReason();
+				if (banReason == null || banReason.isEmpty() || banReason.equalsIgnoreCase("ban"))
+				{
+					banReason = event.getKickMessage();
+				}
+				if (user.getBanTimeout() > 0)
+				{
+					//TODO: TL This
+					banReason += "\n\n" + "Expires in " + DateUtil.formatDateDiff(user.getBanTimeout());
+				}
+				event.disallow(Result.KICK_BANNED, banReason);
+				return;
+			}
 		}
-
-		if (server.getOnlinePlayers().length >= server.getMaxPlayers() && !user.isAuthorized("essentials.joinfullserver"))
+		
+		if (event.getResult() == Result.KICK_FULL && !user.isAuthorized("essentials.joinfullserver"))
 		{
-			event.disallow(Result.KICK_FULL, Util.i18n("serverFull"));
+			event.disallow(Result.KICK_FULL, tl("serverFull"));
 			return;
 		}
 		event.allow();
-
-		user.setLastLogin(System.currentTimeMillis());
-		updateCompass(user);
 	}
-
-	private void updateCompass(final User user)
+	
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+	public void onPlayerTeleport(final PlayerTeleportEvent event)
 	{
-		try
+		final boolean backListener = ess.getSettings().registerBackInListener();
+		final boolean teleportInvulnerability = ess.getSettings().isTeleportInvulnerability();
+		if (backListener || teleportInvulnerability)
 		{
-			user.setCompassTarget(user.getHome(user.getLocation()));
-		}
-		catch (Exception ex)
-		{
-		}
-	}
-
-	@Override
-	public void onPlayerTeleport(PlayerTeleportEvent event)
-	{
-		if (event.isCancelled())
-		{
-			return;
-		}
-		final User user = ess.getUser(event.getPlayer());
-		if (ess.getSettings().changeDisplayName())
-		{
-			user.setDisplayNick(user.getNick());
-		}
-		updateCompass(user);
-	}
-
-	@Override
-	public void onPlayerInteract(final PlayerInteractEvent event)
-	{
-		if (event.isCancelled())
-		{
-			return;
-		}
-		if (event.getAction() != Action.RIGHT_CLICK_BLOCK)
-		{
-			return;
-		}
-
-		if (ess.getSettings().getBedSetsHome() && event.getClickedBlock().getType() == Material.BED_BLOCK)
-		{
-			try
+			final User user = ess.getUser(event.getPlayer());
+			//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))
 			{
-				final User user = ess.getUser(event.getPlayer());
-				user.setHome();
-				user.sendMessage(Util.i18n("homeSetToBed"));
+				user.setLastLocation();
 			}
-			catch (Throwable ex)
+			if (teleportInvulnerability && (event.getCause() == TeleportCause.PLUGIN || event.getCause() == TeleportCause.COMMAND))
 			{
+				user.enableInvulnerabilityAfterTeleport();
 			}
 		}
 	}
-
-	@Override
+	
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void onPlayerEggThrow(final PlayerEggThrowEvent event)
 	{
 		final User user = ess.getUser(event.getPlayer());
-		final ItemStack is = new ItemStack(Material.EGG, 1);
-		if (user.hasUnlimited(is))
+		final ItemStack stack = new ItemStack(Material.EGG, 1);
+		if (user.hasUnlimited(stack))
 		{
-			user.getInventory().addItem(is);
-			user.updateInventory();
+			user.getBase().getInventory().addItem(stack);
+			user.getBase().updateInventory();
 		}
 	}
-
-	@Override
+	
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void onPlayerBucketEmpty(final PlayerBucketEmptyEvent event)
 	{
 		final User user = ess.getUser(event.getPlayer());
@@ -308,86 +433,344 @@ public class EssentialsPlayerListener extends PlayerListener
 			event.getItemStack().setType(event.getBucket());
 			ess.scheduleSyncDelayedTask(new Runnable()
 			{
+				@Override
 				public void run()
 				{
-					user.updateInventory();
+					user.getBase().updateInventory();
 				}
 			});
 		}
 	}
-
-	@Override
-	public void onPlayerAnimation(final PlayerAnimationEvent event)
+	
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event)
+	{
+		final Player player = event.getPlayer();
+		final String cmd = event.getMessage().toLowerCase(Locale.ENGLISH).split(" ")[0].replace("/", "").toLowerCase(Locale.ENGLISH);
+		if (ess.getSettings().getSocialSpyCommands().contains(cmd) || ess.getSettings().getSocialSpyCommands().contains("*"))
+		{
+			for (Player onlinePlayer : ess.getServer().getOnlinePlayers())
+			{
+				final User spyer = ess.getUser(onlinePlayer);
+				if (spyer.isSocialSpyEnabled() && !player.equals(onlinePlayer))
+				{
+					spyer.sendMessage(player.getDisplayName() + " : " + event.getMessage());
+				}
+			}
+		}
+		else if (!cmd.equalsIgnoreCase("afk"))
+		{
+			final User user = ess.getUser(player);
+			user.updateActivity(true);
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.NORMAL)
+	public void onPlayerChangedWorldFlyReset(final PlayerChangedWorldEvent event)
 	{
 		final User user = ess.getUser(event.getPlayer());
-		user.updateActivity(true);
-		usePowertools(event);
+		if (user.getBase().getGameMode() != GameMode.CREATIVE && !user.isAuthorized("essentials.fly"))
+		{
+			user.getBase().setFallDistance(0f);
+			user.getBase().setAllowFlight(false);
+		}
+		if (!user.isAuthorized("essentials.speed"))
+		{
+			user.getBase().setFlySpeed(0.1f);
+			user.getBase().setWalkSpeed(0.2f);
+		}
+		else
+		{
+			if (user.getBase().getFlySpeed() > ess.getSettings().getMaxFlySpeed() && !user.isAuthorized("essentials.speed.bypass"))
+			{
+				user.getBase().setFlySpeed((float)ess.getSettings().getMaxFlySpeed());
+			}
+			else
+			{
+				user.getBase().setFlySpeed(user.getBase().getFlySpeed() * 0.99999f);
+			}
+			
+			if (user.getBase().getWalkSpeed() > ess.getSettings().getMaxWalkSpeed() && !user.isAuthorized("essentials.speed.bypass"))
+			{
+				user.getBase().setWalkSpeed((float)ess.getSettings().getMaxWalkSpeed());
+			}
+			else
+			{
+				user.getBase().setWalkSpeed(user.getBase().getWalkSpeed() * 0.99999f);
+			}
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onPlayerChangedWorld(final PlayerChangedWorldEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		final String newWorld = event.getPlayer().getLocation().getWorld().getName();
+		user.setDisplayNick();
+		updateCompass(user);
+		if (ess.getSettings().getNoGodWorlds().contains(newWorld) && user.isGodModeEnabledRaw())
+		{
+			user.sendMessage(tl("noGodWorldWarning"));
+		}
+		
+		if (!user.getWorld().getName().equals(newWorld))
+		{
+			user.sendMessage(tl("currentWorld", newWorld));
+		}
+		if (user.isVanished())
+		{
+			user.setVanished(user.isAuthorized("essentials.vanish"));
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.NORMAL)
+	public void onPlayerInteract(final PlayerInteractEvent event)
+	{
+		switch (event.getAction())
+		{
+		case RIGHT_CLICK_BLOCK:
+			if (!event.isCancelled() && event.getClickedBlock().getType() == Material.BED_BLOCK && ess.getSettings().getUpdateBedAtDaytime())
+			{
+				User player = ess.getUser(event.getPlayer());
+				if (player.isAuthorized("essentials.sethome.bed"))
+				{
+					player.getBase().setBedSpawnLocation(event.getClickedBlock().getLocation());
+					player.sendMessage(tl("bedSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
+				}
+			}
+			break;
+		case LEFT_CLICK_AIR:
+			if (event.getPlayer().isFlying())
+			{
+				final User user = ess.getUser(event.getPlayer());
+				if (user.isFlyClickJump())
+				{
+					useFlyClickJump(user);
+					return;
+				}
+			}
+		case LEFT_CLICK_BLOCK:
+			if (event.getItem() != null && event.getItem().getType() != Material.AIR)
+			{
+				final User user = ess.getUser(event.getPlayer());
+				user.updateActivity(true);
+				if (user.hasPowerTools() && user.arePowerToolsEnabled() && usePowertools(user, event.getItem().getTypeId()))
+				{
+					event.setCancelled(true);
+				}
+			}
+			break;
+		default:
+			break;
+		}
 	}
 
-	private void usePowertools(final PlayerAnimationEvent event)
+	// This method allows the /jump lock feature to work, allows teleporting while flying #EasterEgg
+	private void useFlyClickJump(final User user)
 	{
-		if (event.getAnimationType() != PlayerAnimationType.ARM_SWING)
+		try
 		{
-			return;
+			final Location otarget = LocationUtil.getTarget(user.getBase());
+			
+			ess.scheduleSyncDelayedTask(
+					new Runnable()
+			{
+				@Override
+				public void run()
+				{
+					Location loc = user.getLocation();
+					loc.setX(otarget.getX());
+					loc.setZ(otarget.getZ());
+					while (LocationUtil.isBlockDamaging(loc.getWorld(), loc.getBlockX(), loc.getBlockY() - 1, loc.getBlockZ()))
+					{
+						loc.setY(loc.getY() + 1d);
+					}
+					user.getBase().teleport(loc, TeleportCause.PLUGIN);
+				}
+			});
 		}
-		final User user = ess.getUser(event.getPlayer());
-		final ItemStack is = user.getItemInHand();
-		if (is == null || is.getType() == Material.AIR || !user.arePowerToolsEnabled())
+		catch (Exception ex)
 		{
-			return;
+			if (ess.getSettings().isDebug())
+			{
+				LOGGER.log(Level.WARNING, ex.getMessage(), ex);
+			}
 		}
-		final List<String> commandList = user.getPowertool(is);
+	}
+	
+	private boolean usePowertools(final User user, final int id)
+	{
+		final List<String> commandList = user.getPowertool(id);
 		if (commandList == null || commandList.isEmpty())
 		{
-			return;
+			return false;
 		}
-
+		boolean used = false;
 		// We need to loop through each command and execute
-		for (String command : commandList)
+		for (final String command : commandList)
 		{
-			if (command.matches(".*\\{player\\}.*"))
+			if (command.contains("{player}"))
 			{
-				//user.sendMessage("Click a player to use this command");
 				continue;
 			}
 			else if (command.startsWith("c:"))
 			{
-				for (Player p : server.getOnlinePlayers())
-				{
-					p.sendMessage(user.getDisplayName() + ":" + command.substring(2));
-				}
+				used = true;
+				user.getBase().chat(command.substring(2));
 			}
 			else
 			{
-				user.getServer().dispatchCommand(event.getPlayer(), command);
+				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);
 			}
 		}
 	}
-
-	@Override
-	public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event)
+	
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onInventoryClickEvent(final InventoryClickEvent event)
 	{
-		if (event.isCancelled())
+		Player refreshPlayer = null;
+		final Inventory top = event.getView().getTopInventory();
+		final InventoryType type = top.getType();
+		
+		if (type == InventoryType.PLAYER)
 		{
-			return;
-		}
-		final User user = ess.getUser(event.getPlayer());
-		final String cmd = event.getMessage().toLowerCase().split(" ")[0].replace("/", "").toLowerCase();
-		final List<String> commands = Arrays.asList("msg", "r", "mail", "m", "t", "emsg", "tell", "er", "reply", "ereply", "email");
-		if (commands.contains(cmd))
-		{
-			for (Player player : ess.getServer().getOnlinePlayers())
+			final User user = ess.getUser((Player)event.getWhoClicked());
+			final InventoryHolder invHolder = top.getHolder();
+			if (invHolder != null && invHolder instanceof HumanEntity)
 			{
-				User spyer = ess.getUser(player);
-				if (spyer.isSocialSpyEnabled() && !user.equals(spyer))
+				final User invOwner = ess.getUser((Player)invHolder);
+				if (user.isInvSee() && (!user.isAuthorized("essentials.invsee.modify")
+										|| invOwner.isAuthorized("essentials.invsee.preventmodify")
+										|| !invOwner.getBase().isOnline()))
 				{
-					player.sendMessage(user.getDisplayName() + " : " + event.getMessage());
+					event.setCancelled(true);
+					refreshPlayer = user.getBase();
 				}
 			}
 		}
-		if (!cmd.equalsIgnoreCase("afk"))
+		else if (type == InventoryType.ENDER_CHEST)
 		{
-			user.updateActivity(true);
+			final User user = ess.getUser((Player)event.getWhoClicked());
+			if (user.isEnderSee() && (!user.isAuthorized("essentials.enderchest.modify")))
+			{
+				event.setCancelled(true);
+				refreshPlayer = user.getBase();
+			}
+		}
+		else if (type == InventoryType.WORKBENCH)
+		{
+			User user = ess.getUser((Player)event.getWhoClicked());
+			if (user.isRecipeSee())
+			{
+				event.setCancelled(true);
+				refreshPlayer = user.getBase();
+			}
+		}
+		else if (type == InventoryType.CHEST && top.getSize() == 9)
+		{
+			final User user = ess.getUser((Player)event.getWhoClicked());
+			final InventoryHolder invHolder = top.getHolder();
+			if (invHolder != null && invHolder instanceof HumanEntity && user.isInvSee())
+			{
+				event.setCancelled(true);
+				refreshPlayer = user.getBase();
+			}
+		}
+		
+		if (refreshPlayer != null)
+		{
+			final Player player = refreshPlayer;
+			ess.scheduleSyncDelayedTask(new Runnable()
+			{
+				@Override
+				public void run()
+				{
+					player.updateInventory();
+				}
+			}, 1);
 		}
 	}
+	
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onInventoryCloseEvent(final InventoryCloseEvent event)
+	{
+		Player refreshPlayer = null;
+		final Inventory top = event.getView().getTopInventory();
+		final InventoryType type = top.getType();
+		if (type == InventoryType.PLAYER)
+		{
+			final User user = ess.getUser((Player)event.getPlayer());
+			user.setInvSee(false);
+			refreshPlayer = user.getBase();
+		}
+		else if (type == InventoryType.ENDER_CHEST)
+		{
+			final User user = ess.getUser((Player)event.getPlayer());
+			user.setEnderSee(false);
+			refreshPlayer = user.getBase();
+		}
+		else if (type == InventoryType.WORKBENCH)
+		{
+			final User user = ess.getUser((Player)event.getPlayer());
+			if (user.isRecipeSee())
+			{
+				user.setRecipeSee(false);
+				event.getView().getTopInventory().clear();
+				refreshPlayer = user.getBase();
+			}
+		}
+		else if (type == InventoryType.CHEST && top.getSize() == 9)
+		{
+			final InventoryHolder invHolder = top.getHolder();
+			if (invHolder != null && invHolder instanceof HumanEntity)
+			{
+				final User user = ess.getUser((Player)event.getPlayer());
+				user.setInvSee(false);
+				refreshPlayer = user.getBase();
+			}
+		}
+		
+		if (refreshPlayer != null)
+		{
+			final Player player = refreshPlayer;
+			ess.scheduleSyncDelayedTask(new Runnable()
+			{
+				@Override
+				public void run()
+				{
+					player.updateInventory();
+				}
+			}, 1);
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onPlayerFishEvent(final PlayerFishEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		user.updateActivity(true);
+	}
 }

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

@@ -1,41 +1,58 @@
 package com.earth2me.essentials;
 
+import com.earth2me.essentials.perm.PermissionsHandler;
+import com.earth2me.essentials.register.payment.Methods;
 import java.util.logging.Level;
-import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.event.server.PluginEnableEvent;
-import org.bukkit.event.server.ServerListener;
 
 
-public class EssentialsPluginListener extends ServerListener implements IConf
+public class EssentialsPluginListener implements Listener, IConf
 {
 	private final transient IEssentials ess;
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 
 	public EssentialsPluginListener(final IEssentials ess)
 	{
 		this.ess = ess;
 	}
 
-	@Override
+	@EventHandler(priority = EventPriority.MONITOR)
 	public void onPluginEnable(final PluginEnableEvent event)
 	{
-		ess.getPermissionsHandler().checkPermissions();
-		if (!ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().setMethod(ess.getServer().getPluginManager()))
+		if (event.getPlugin().getName().equals("EssentialsChat"))
 		{
-			LOGGER.log(Level.INFO, "[Essentials] Payment method found (" + ess.getPaymentMethod().getMethod().getName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
+			ess.getSettings().setEssentialsChatActive(true);
+		}
+		ess.getPermissionsHandler().checkPermissions();
+		ess.getAlternativeCommandsHandler().addPlugin(event.getPlugin());
+		if (!Methods.hasMethod() && Methods.setMethod(ess.getServer().getPluginManager()))
+		{
+			ess.getLogger().log(Level.INFO, "Payment method found (" + Methods.getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
 		}
 	}
 
-	@Override
+	@EventHandler(priority = EventPriority.MONITOR)
 	public void onPluginDisable(final PluginDisableEvent event)
 	{
-		ess.getPermissionsHandler().checkPermissions();
+		if (event.getPlugin().getName().equals("EssentialsChat"))
+		{
+			ess.getSettings().setEssentialsChatActive(false);
+		}
+		PermissionsHandler permHandler = ess.getPermissionsHandler();
+		if (permHandler != null)
+		{
+			permHandler.checkPermissions();
+		}
+		ess.getAlternativeCommandsHandler().removePlugin(event.getPlugin());
 		// Check to see if the plugin thats being disabled is the one we are using
-		if (ess.getPaymentMethod() != null && ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().checkDisabled(event.getPlugin()))
+		if (ess.getPaymentMethod() != null && Methods.hasMethod() && Methods.checkDisabled(event.getPlugin()))
 		{
 			ess.getPaymentMethod().reset();
-			LOGGER.log(Level.INFO, "[Essentials] Payment method was disabled. No longer accepting payments.");
+			ess.getLogger().log(Level.INFO, "Payment method was disabled. No longer accepting payments.");
 		}
 	}
 

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

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

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

@@ -1,33 +1,27 @@
 package com.earth2me.essentials;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.craftbukkit.FakeWorld;
+import com.earth2me.essentials.settings.Spawns;
+import com.earth2me.essentials.storage.YamlStorageWriter;
+import com.earth2me.essentials.utils.StringUtil;
+import com.google.common.base.Charsets;
+import java.io.*;
 import java.math.BigInteger;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.inventory.ItemStack;
 
 
 public class EssentialsUpgrade
 {
-	private final static Logger LOGGER = Logger.getLogger("Minecraft");
+	private final static Logger LOGGER = Logger.getLogger("Essentials");
 	private final transient IEssentials ess;
 	private final transient EssentialsConf doneFile;
 
@@ -42,14 +36,19 @@ public class EssentialsUpgrade
 		doneFile.load();
 	}
 
-	private void moveWorthValuesToWorthYml()
+	private void moveMotdRulesToFile(String name)
 	{
-		if (doneFile.getBoolean("moveWorthValuesToWorthYml", false))
+		if (doneFile.getBoolean("move" + name + "ToFile", false))
 		{
 			return;
 		}
 		try
 		{
+			final File file = new File(ess.getDataFolder(), name + ".txt");
+			if (file.exists())
+			{
+				return;
+			}
 			final File configFile = new File(ess.getDataFolder(), "config.yml");
 			if (!configFile.exists())
 			{
@@ -57,28 +56,27 @@ public class EssentialsUpgrade
 			}
 			final EssentialsConf conf = new EssentialsConf(configFile);
 			conf.load();
-			final Worth worth = new Worth(ess.getDataFolder());
-			boolean found = false;
-			for (Material mat : Material.values())
+			List<String> lines = conf.getStringList(name);
+			if (lines != null && !lines.isEmpty())
 			{
-				final int id = mat.getId();
-				final double value = conf.getDouble("worth-" + id, Double.NaN);
-				if (!Double.isNaN(value))
+				if (!file.createNewFile())
 				{
-					found = true;
-					worth.setPrice(new ItemStack(mat, 1, (short)0, (byte)0), value);
+					throw new IOException("Failed to create file " + file);
 				}
+				PrintWriter writer = new PrintWriter(file);
+
+				for (String line : lines)
+				{
+					writer.println(line);
+				}
+				writer.close();
 			}
-			if (found)
-			{
-				removeLinesFromConfig(configFile, "\\s*#?\\s*worth-[0-9]+.*", "# Worth values have been moved to worth.yml");
-			}
-			doneFile.setProperty("moveWorthValuesToWorthYml", true);
+			doneFile.setProperty("move" + name + "ToFile", true);
 			doneFile.save();
 		}
-		catch (Throwable e)
+		catch (IOException e)
 		{
-			LOGGER.log(Level.SEVERE, Util.i18n("upgradingFilesError"), e);
+			LOGGER.log(Level.SEVERE, tl("upgradingFilesError"), e);
 		}
 	}
 
@@ -128,11 +126,11 @@ public class EssentialsUpgrade
 		{
 			if (!file.renameTo(new File(file.getParentFile(), file.getName().concat("." + System.currentTimeMillis() + ".upgradebackup"))))
 			{
-				throw new Exception(Util.i18n("configFileMoveError"));
+				throw new Exception(tl("configFileMoveError"));
 			}
 			if (!tempFile.renameTo(file))
 			{
-				throw new Exception(Util.i18n("configFileRenameError"));
+				throw new Exception(tl("configFileRenameError"));
 			}
 		}
 		else
@@ -141,73 +139,6 @@ public class EssentialsUpgrade
 		}
 	}
 
-	private void updateUsersToNewDefaultHome()
-	{
-		if (doneFile.getBoolean("updateUsersToNewDefaultHome", false))
-		{
-			return;
-		}
-		final File userdataFolder = new File(ess.getDataFolder(), "userdata");
-		if (!userdataFolder.exists() || !userdataFolder.isDirectory())
-		{
-			return;
-		}
-		final File[] userFiles = userdataFolder.listFiles();
-
-		for (File file : userFiles)
-		{
-			if (!file.isFile() || !file.getName().endsWith(".yml"))
-			{
-				continue;
-			}
-			final EssentialsConf config = new EssentialsConf(file);
-			try
-			{
-				config.load();
-				if (config.hasProperty("home") && !config.hasProperty("home.default"))
-				{
-					@SuppressWarnings("unchecked")
-					final List<Object> vals = (List<Object>)config.getProperty("home");
-					if (vals == null)
-					{
-						continue;
-					}
-					World world = ess.getServer().getWorlds().get(0);
-					if (vals.size() > 5)
-					{
-						world = ess.getServer().getWorld((String)vals.get(5));
-					}
-					if (world != null)
-					{
-						final Location loc = new Location(
-								world,
-								((Number)vals.get(0)).doubleValue(),
-								((Number)vals.get(1)).doubleValue(),
-								((Number)vals.get(2)).doubleValue(),
-								((Number)vals.get(3)).floatValue(),
-								((Number)vals.get(4)).floatValue());
-
-						final String worldName = world.getName().toLowerCase();
-						if (worldName != null && !worldName.isEmpty())
-						{
-							config.removeProperty("home");
-							config.setProperty("home.default", worldName);
-							config.setProperty("home.worlds." + worldName, loc);
-							config.save();
-						}
-					}
-				}
-			}
-			catch (RuntimeException ex)
-			{
-				LOGGER.log(Level.INFO, "File: " + file.toString());
-				throw ex;
-			}
-		}
-		doneFile.setProperty("updateUsersToNewDefaultHome", true);
-		doneFile.save();
-	}
-
 	private void updateUsersPowerToolsFormat()
 	{
 		if (doneFile.getBoolean("updateUsersPowerToolsFormat", false))
@@ -234,21 +165,21 @@ public class EssentialsUpgrade
 				if (config.hasProperty("powertools"))
 				{
 					@SuppressWarnings("unchecked")
-					final Map<Integer, Object> powertools = (Map<Integer, Object>)config.getProperty("powertools");
+					final Map<String, Object> powertools = config.getConfigurationSection("powertools").getValues(false);
 					if (powertools == null)
 					{
 						continue;
 					}
-					for (Map.Entry<Integer, Object> entry : powertools.entrySet())
+					for (Map.Entry<String, Object> entry : powertools.entrySet())
 					{
 						if (entry.getValue() instanceof String)
 						{
 							List<String> temp = new ArrayList<String>();
 							temp.add((String)entry.getValue());
-							((Map<Integer, Object>)powertools).put(entry.getKey(), temp);
+							((Map<String, Object>)powertools).put(entry.getKey(), temp);
 						}
 					}
-					config.save();
+					config.forceSave();
 				}
 			}
 			catch (RuntimeException ex)
@@ -295,7 +226,7 @@ public class EssentialsUpgrade
 						config.setProperty("homes.home", defloc);
 					}
 
-					List<String> worlds = config.getKeys("home.worlds");
+					Set<String> worlds = config.getConfigurationSection("home.worlds").getKeys(false);
 					Location loc;
 					String worldName;
 
@@ -314,14 +245,14 @@ public class EssentialsUpgrade
 						{
 							continue;
 						}
-						worldName = loc.getWorld().getName().toLowerCase();
+						worldName = loc.getWorld().getName().toLowerCase(Locale.ENGLISH);
 						if (worldName != null && !worldName.isEmpty())
 						{
 							config.setProperty("homes." + worldName, loc);
 						}
 					}
 					config.removeProperty("home");
-					config.save();
+					config.forceSave();
 				}
 
 			}
@@ -335,195 +266,6 @@ public class EssentialsUpgrade
 		doneFile.save();
 	}
 
-	private void moveUsersDataToUserdataFolder()
-	{
-		final File usersFile = new File(ess.getDataFolder(), "users.yml");
-		if (!usersFile.exists())
-		{
-			return;
-		}
-		final EssentialsConf usersConfig = new EssentialsConf(usersFile);
-		usersConfig.load();
-		for (String username : usersConfig.getKeys(null))
-		{
-			final User user = new User(new OfflinePlayer(username, ess), ess);
-			final String nickname = usersConfig.getString(username + ".nickname");
-			if (nickname != null && !nickname.isEmpty() && !nickname.equals(username))
-			{
-				user.setNickname(nickname);
-			}
-			final List<String> mails = usersConfig.getStringList(username + ".mail", null);
-			if (mails != null && !mails.isEmpty())
-			{
-				user.setMails(mails);
-			}
-			if (!user.hasHome())
-			{
-				@SuppressWarnings("unchecked")
-				final List<Object> vals = (List<Object>)usersConfig.getProperty(username + ".home");
-				if (vals != null)
-				{
-					World world = ess.getServer().getWorlds().get(0);
-					if (vals.size() > 5)
-					{
-						world = getFakeWorld((String)vals.get(5));
-					}
-					if (world != null)
-					{
-						user.setHome("home", new Location(world,
-														  ((Number)vals.get(0)).doubleValue(),
-														  ((Number)vals.get(1)).doubleValue(),
-														  ((Number)vals.get(2)).doubleValue(),
-														  ((Number)vals.get(3)).floatValue(),
-														  ((Number)vals.get(4)).floatValue()));
-					}
-				}
-			}
-		}
-		usersFile.renameTo(new File(usersFile.getAbsolutePath() + ".old"));
-	}
-
-	private void convertWarps()
-	{
-		final File warpsFolder = new File(ess.getDataFolder(), "warps");
-		if (!warpsFolder.exists())
-		{
-			warpsFolder.mkdirs();
-		}
-		final File[] listOfFiles = warpsFolder.listFiles();
-		if (listOfFiles.length >= 1)
-		{
-			for (int i = 0; i < listOfFiles.length; i++)
-			{
-				final String filename = listOfFiles[i].getName();
-				if (listOfFiles[i].isFile() && filename.endsWith(".dat"))
-				{
-					try
-					{
-						final BufferedReader rx = new BufferedReader(new FileReader(listOfFiles[i]));
-						double x, y, z;
-						float yaw, pitch;
-						String worldName;
-						try
-						{
-							if (!rx.ready())
-							{
-								continue;
-							}
-							x = Double.parseDouble(rx.readLine().trim());
-							if (!rx.ready())
-							{
-								continue;
-							}
-							y = Double.parseDouble(rx.readLine().trim());
-							if (!rx.ready())
-							{
-								continue;
-							}
-							z = Double.parseDouble(rx.readLine().trim());
-							if (!rx.ready())
-							{
-								continue;
-							}
-							yaw = Float.parseFloat(rx.readLine().trim());
-							if (!rx.ready())
-							{
-								continue;
-							}
-							pitch = Float.parseFloat(rx.readLine().trim());
-							worldName = rx.readLine();
-						}
-						finally
-						{
-							rx.close();
-						}
-						World w = null;
-						for (World world : ess.getServer().getWorlds())
-						{
-							if (world.getEnvironment() != World.Environment.NETHER)
-							{
-								w = world;
-								break;
-							}
-						}
-						if (worldName != null)
-						{
-							worldName = worldName.trim();
-							World w1 = null;
-							w1 = getFakeWorld(worldName);
-							if (w1 != null)
-							{
-								w = w1;
-							}
-						}
-						final Location loc = new Location(w, x, y, z, yaw, pitch);
-						ess.getWarps().setWarp(filename.substring(0, filename.length() - 4), loc);
-						if (!listOfFiles[i].renameTo(new File(warpsFolder, filename + ".old")))
-						{
-							throw new Exception(Util.format("fileRenameError", filename));
-						}
-					}
-					catch (Exception ex)
-					{
-						LOGGER.log(Level.SEVERE, null, ex);
-					}
-				}
-			}
-
-		}
-		final File warpFile = new File(ess.getDataFolder(), "warps.txt");
-		if (warpFile.exists())
-		{
-			try
-			{
-				final BufferedReader rx = new BufferedReader(new FileReader(warpFile));
-				try
-				{
-					for (String[] parts = new String[0]; rx.ready(); parts = rx.readLine().split(":"))
-					{
-						if (parts.length < 6)
-						{
-							continue;
-						}
-						final String name = parts[0];
-						final double x = Double.parseDouble(parts[1].trim());
-						final double y = Double.parseDouble(parts[2].trim());
-						final double z = Double.parseDouble(parts[3].trim());
-						final float yaw = Float.parseFloat(parts[4].trim());
-						final float pitch = Float.parseFloat(parts[5].trim());
-						if (name.isEmpty())
-						{
-							continue;
-						}
-						World w = null;
-						for (World world : ess.getServer().getWorlds())
-						{
-							if (world.getEnvironment() != World.Environment.NETHER)
-							{
-								w = world;
-								break;
-							}
-						}
-						final Location loc = new Location(w, x, y, z, yaw, pitch);
-						ess.getWarps().setWarp(name, loc);
-						if (!warpFile.renameTo(new File(ess.getDataFolder(), "warps.txt.old")))
-						{
-							throw new Exception(Util.format("fileRenameError", "warps.txt"));
-						}
-					}
-				}
-				finally
-				{
-					rx.close();
-				}
-			}
-			catch (Exception ex)
-			{
-				LOGGER.log(Level.SEVERE, null, ex);
-			}
-		}
-	}
-
 	private void sanitizeAllUserFilenames()
 	{
 		if (doneFile.getBoolean("sanitizeAllUserFilenames", false))
@@ -536,33 +278,33 @@ public class EssentialsUpgrade
 			return;
 		}
 		final File[] listOfFiles = usersFolder.listFiles();
-		for (int i = 0; i < listOfFiles.length; i++)
+		for (File listOfFile : listOfFiles)
 		{
-			final String filename = listOfFiles[i].getName();
-			if (!listOfFiles[i].isFile() || !filename.endsWith(".yml"))
+			final String filename = listOfFile.getName();
+			if (!listOfFile.isFile() || !filename.endsWith(".yml"))
 			{
 				continue;
 			}
-			final String sanitizedFilename = Util.sanitizeFileName(filename.substring(0, filename.length() - 4)) + ".yml";
+			final String sanitizedFilename = StringUtil.sanitizeFileName(filename.substring(0, filename.length() - 4)) + ".yml";
 			if (sanitizedFilename.equals(filename))
 			{
 				continue;
 			}
-			final File tmpFile = new File(listOfFiles[i].getParentFile(), sanitizedFilename + ".tmp");
-			final File newFile = new File(listOfFiles[i].getParentFile(), sanitizedFilename);
-			if (!listOfFiles[i].renameTo(tmpFile))
+			final File tmpFile = new File(listOfFile.getParentFile(), sanitizedFilename + ".tmp");
+			final File newFile = new File(listOfFile.getParentFile(), sanitizedFilename);
+			if (!listOfFile.renameTo(tmpFile))
 			{
-				LOGGER.log(Level.WARNING, Util.format("userdataMoveError", filename, sanitizedFilename));
+				LOGGER.log(Level.WARNING, tl("userdataMoveError", filename, sanitizedFilename));
 				continue;
 			}
 			if (newFile.exists())
 			{
-				LOGGER.log(Level.WARNING, Util.format("duplicatedUserdata", filename, sanitizedFilename));
+				LOGGER.log(Level.WARNING, tl("duplicatedUserdata", filename, sanitizedFilename));
 				continue;
 			}
 			if (!tmpFile.renameTo(newFile))
 			{
-				LOGGER.log(Level.WARNING, Util.format("userdataMoveBackError", sanitizedFilename, sanitizedFilename));
+				LOGGER.log(Level.WARNING, tl("userdataMoveBackError", sanitizedFilename, sanitizedFilename));
 			}
 		}
 		doneFile.setProperty("sanitizeAllUserFilenames", true);
@@ -647,23 +389,291 @@ public class EssentialsUpgrade
 		}
 	}
 
+	private void updateSpawnsToNewSpawnsConfig()
+	{
+		if (doneFile.getBoolean("updateSpawnsToNewSpawnsConfig", false))
+		{
+			return;
+		}
+		final File configFile = new File(ess.getDataFolder(), "spawn.yml");
+		if (configFile.exists())
+		{
+
+			final EssentialsConf config = new EssentialsConf(configFile);
+			try
+			{
+				config.load();
+				if (!config.hasProperty("spawns"))
+				{
+					final Spawns spawns = new Spawns();
+					Set<String> keys = config.getKeys(false);
+					for (String group : keys)
+					{
+						Location loc = getFakeLocation(config, group);
+						spawns.getSpawns().put(group.toLowerCase(Locale.ENGLISH), loc);
+					}
+					if (!configFile.renameTo(new File(ess.getDataFolder(), "spawn.yml.old")))
+					{
+						throw new Exception(tl("fileRenameError", "spawn.yml"));
+					}
+					PrintWriter writer = new PrintWriter(configFile);
+					try
+					{
+						new YamlStorageWriter(writer).save(spawns);
+					}
+					finally
+					{
+						writer.close();
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+			}
+		}
+		doneFile.setProperty("updateSpawnsToNewSpawnsConfig", true);
+		doneFile.save();
+	}
+
+	private void updateJailsToNewJailsConfig()
+	{
+		if (doneFile.getBoolean("updateJailsToNewJailsConfig", false))
+		{
+			return;
+		}
+		final File configFile = new File(ess.getDataFolder(), "jail.yml");
+		if (configFile.exists())
+		{
+
+			final EssentialsConf config = new EssentialsConf(configFile);
+			try
+			{
+				config.load();
+				if (!config.hasProperty("jails"))
+				{
+					final com.earth2me.essentials.settings.Jails jails = new com.earth2me.essentials.settings.Jails();
+					Set<String> keys = config.getKeys(false);
+					for (String jailName : keys)
+					{
+						Location loc = getFakeLocation(config, jailName);
+						jails.getJails().put(jailName.toLowerCase(Locale.ENGLISH), loc);
+					}
+					if (!configFile.renameTo(new File(ess.getDataFolder(), "jail.yml.old")))
+					{
+						throw new Exception(tl("fileRenameError", "jail.yml"));
+					}
+					PrintWriter writer = new PrintWriter(configFile);
+					try
+					{
+						new YamlStorageWriter(writer).save(jails);
+					}
+					finally
+					{
+						writer.close();
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+			}
+		}
+		doneFile.setProperty("updateJailsToNewJailsConfig", true);
+		doneFile.save();
+	}
+
+	private void warnMetrics()
+	{
+		if (doneFile.getBoolean("warnMetrics", false))
+		{
+			return;
+		}
+		ess.getSettings().setMetricsEnabled(false);
+		doneFile.setProperty("warnMetrics", true);
+		doneFile.save();
+	}
+
+	private void uuidFileChange()
+	{
+		if (doneFile.getBoolean("uuidFileChange", false))
+		{
+			return;
+		}
+		
+		final File userdir = new File(ess.getDataFolder(), "userdata");
+		if (!userdir.exists())
+		{
+			return;
+		}
+		
+		int countFiles = 0;
+		int countReqFiles = 0;
+		for (String string : userdir.list())
+		{
+			if (!string.endsWith(".yml") || string.length() < 5)
+			{
+				continue;
+			}
+			
+			countFiles++;
+			
+			final String name = string.substring(0, string.length() - 4);
+			UUID uuid = null;
+			
+			try
+			{
+				uuid = UUID.fromString(name);
+			}
+			catch (IllegalArgumentException ex)
+			{
+				countReqFiles++;
+			}
+			
+			if (countFiles > 100)
+			{
+				break;
+			}			
+		}
+		
+		if (countReqFiles < 1)
+		{
+			return;
+		}
+				
+		ess.getLogger().info("#### Starting Essentials UUID userdata conversion in a few seconds. ####");
+		ess.getLogger().info("We recommend you take a backup of your server before upgrading from the old username system.");
+		
+		try
+		{
+			Thread.sleep(10000);
+		}
+		catch (InterruptedException ex)
+		{
+			// NOOP
+		}
+
+		uuidFileConvert(ess);
+
+		doneFile.setProperty("uuidFileChange", true);
+		doneFile.save();
+	}
+
+	public static void uuidFileConvert(IEssentials ess)
+	{
+		ess.getLogger().info("Starting Essentials UUID userdata conversion");
+
+		final File userdir = new File(ess.getDataFolder(), "userdata");
+		if (!userdir.exists())
+		{
+			return;
+		}
+
+		int countFiles = 0;
+		int countFails = 0;
+		int countEssCache = 0;
+		int countBukkit = 0;
+
+		ess.getLogger().info("Found " + userdir.list().length + " files to convert...");
+
+		for (String string : userdir.list())
+		{
+			if (!string.endsWith(".yml") || string.length() < 5)
+			{
+				continue;
+			}
+
+			final int showProgress = countFiles % 250;
+
+			if (showProgress == 0)
+			{
+				ess.getUserMap().getUUIDMap().forceWriteUUIDMap();
+				ess.getLogger().info("Converted " + countFiles + "/" + userdir.list().length);
+			}
+
+			countFiles++;
+
+			final String name = string.substring(0, string.length() - 4);
+			EssentialsUserConf config;
+			UUID uuid = null;
+			try
+			{
+				uuid = UUID.fromString(name);
+			}
+			catch (IllegalArgumentException ex)
+			{
+				File file = new File(userdir, string);
+				EssentialsConf conf = new EssentialsConf(file);
+				conf.load();
+				conf.setProperty("lastAccountName", name);
+				conf.save();
+
+				String uuidString = conf.getString("uuid", null);
+
+				for (int i = 0; i < 4; i++)
+				{
+					try
+					{
+						uuid = UUID.fromString(uuidString);
+						countEssCache++;
+						break;
+					}
+					catch (Exception ex2)
+					{
+						if (conf.getBoolean("npc", false))
+						{
+							uuid = UUID.nameUUIDFromBytes(("NPC:" + name).getBytes(Charsets.UTF_8));
+							break;
+						}
+						
+						org.bukkit.OfflinePlayer player = ess.getServer().getOfflinePlayer(name);
+						uuid = player.getUniqueId();
+					}
+
+					if (uuid != null)
+					{
+						countBukkit++;
+						break;
+					}					
+				}
+
+				if (uuid != null)
+				{
+					conf.forceSave();
+					config = new EssentialsUserConf(name, uuid, new File(userdir, uuid + ".yml"));
+					config.convertLegacyFile();
+					ess.getUserMap().trackUUID(uuid, name);
+					continue;
+				}
+				countFails++;
+			}
+		}
+		ess.getUserMap().getUUIDMap().forceWriteUUIDMap();
+        
+		ess.getLogger().info("Converted " + countFiles + "/" + countFiles + ".  Conversion complete.");
+		ess.getLogger().info("Converted via cache: " + countEssCache + " :: Converted via lookup: " + countBukkit + " :: Failed to convert: " + countFails);
+		ess.getLogger().info("To rerun the conversion type /essentials uuidconvert");
+	}
+
 	public void beforeSettings()
 	{
 		if (!ess.getDataFolder().exists())
 		{
 			ess.getDataFolder().mkdirs();
 		}
-		moveWorthValuesToWorthYml();
+		moveMotdRulesToFile("motd");
+		moveMotdRulesToFile("rules");
 	}
 
 	public void afterSettings()
 	{
 		sanitizeAllUserFilenames();
-		updateUsersToNewDefaultHome();
-		moveUsersDataToUserdataFolder();
-		convertWarps();
 		updateUsersPowerToolsFormat();
 		updateUsersHomesFormat();
 		deleteOldItemsCsv();
+		updateSpawnsToNewSpawnsConfig();
+		updateJailsToNewJailsConfig();
+		uuidFileChange();
+		warnMetrics();
 	}
 }

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

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

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

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

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

@@ -1,190 +0,0 @@
-package com.earth2me.essentials;
-
-import java.util.HashMap;
-import org.bukkit.Material;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-
-
-public class FakeInventory implements Inventory
-{
-	ItemStack[] items;
-
-	public FakeInventory(ItemStack[] items)
-	{
-		this.items = new ItemStack[items.length];
-		for (int i = 0; i < items.length; i++)
-		{
-			if (items[i] == null)
-			{
-				continue;
-			}
-			this.items[i] = new ItemStack(items[i].getTypeId(), items[i].getAmount(), items[i].getDurability());
-		}
-	}
-
-	@Override
-	public int getSize()
-	{
-		return items.length;
-	}
-
-	@Override
-	public String getName()
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public ItemStack getItem(int i)
-	{
-		return items[i];
-	}
-
-	@Override
-	public void setItem(int i, ItemStack is)
-	{
-		items[i] = is;
-	}
-
-	@Override
-	public HashMap<Integer, ItemStack> addItem(ItemStack... iss)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public HashMap<Integer, ItemStack> removeItem(ItemStack... iss)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public ItemStack[] getContents()
-	{
-		return items;
-	}
-
-	@Override
-	public void setContents(ItemStack[] iss)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public boolean contains(int i)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public boolean contains(Material mtrl)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public boolean contains(ItemStack is)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public boolean contains(int i, int i1)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public boolean contains(Material mtrl, int i)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public boolean contains(ItemStack is, int i)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public HashMap<Integer, ? extends ItemStack> all(int i)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public HashMap<Integer, ? extends ItemStack> all(Material mtrl)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public HashMap<Integer, ? extends ItemStack> all(ItemStack is)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public int first(int i)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public int first(Material mtrl)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public int first(ItemStack is)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public int firstEmpty()
-	{
-		for (int i = 0; i < items.length; i++)
-		{
-			if (items[i] == null || items[i].getTypeId() == 0) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-	@Override
-	public void remove(int i)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public void remove(Material mtrl)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public void remove(ItemStack is)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public void clear(int i)
-	{
-		items[i] = null;
-	}
-
-	@Override
-	public void clear()
-	{
-		for (int i = 0; i < items.length; i++)
-		{
-			items[i] = null;
-		}
-	}
-}

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

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

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

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

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

@@ -1,12 +1,20 @@
 package com.earth2me.essentials;
 
+import com.earth2me.essentials.api.IItemDb;
+import com.earth2me.essentials.api.IJails;
+import com.earth2me.essentials.api.IWarps;
+import com.earth2me.essentials.metrics.Metrics;
 import com.earth2me.essentials.perm.PermissionsHandler;
 import com.earth2me.essentials.register.payment.Methods;
+import java.util.List;
+import java.util.UUID;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.scheduler.BukkitTask;
 
 
 public interface IEssentials extends Plugin
@@ -15,37 +23,46 @@ public interface IEssentials extends Plugin
 
 	void reload();
 
-	boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath, String permissionPrefix);
+	boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentialsModule module);
 
+	@Deprecated
 	User getUser(Object base);
+	
+	User getUser(UUID base);
+	
+	User getUser(String base);
+	
+	User getUser(Player base);
+
+	I18n getI18n();
 
 	User getOfflineUser(String name);
 
 	World getWorld(String name);
 
+	int broadcastMessage(String message);
+
 	int broadcastMessage(IUser sender, String message);
 
+	int broadcastMessage(String permission, String message);
+
 	ISettings getSettings();
 
 	BukkitScheduler getScheduler();
 
-	String[] getMotd(CommandSender sender, String def);
+	IJails getJails();
 
-	String[] getLines(CommandSender sender, String node, String def);
-
-	Jail getJail();
-
-	Warps getWarps();
+	IWarps getWarps();
 
 	Worth getWorth();
 
 	Backup getBackup();
 
-	Spawn getSpawn();
-
 	Methods getPaymentMethod();
 
-	int scheduleAsyncDelayedTask(Runnable run);
+	BukkitTask runTaskAsynchronously(Runnable run);
+
+	BukkitTask runTaskLaterAsynchronously(Runnable run, long delay);
 
 	int scheduleSyncDelayedTask(Runnable run);
 
@@ -57,9 +74,19 @@ public interface IEssentials extends Plugin
 
 	PermissionsHandler getPermissionsHandler();
 
-	void showError(final CommandSender sender, final Throwable exception, final String commandLabel);
+	AlternativeCommandsHandler getAlternativeCommandsHandler();
 
-	ItemDb getItemDb();
+	void showError(final CommandSource sender, final Throwable exception, final String commandLabel);
+
+	IItemDb getItemDb();
 
 	UserMap getUserMap();
+
+	Metrics getMetrics();
+
+	void setMetrics(Metrics metrics);
+
+	EssentialsTimer getTimer();
+
+	List<String> getVanishedPlayers();
 }

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

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

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

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

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

@@ -1,45 +1,56 @@
 package com.earth2me.essentials;
 
 import com.earth2me.essentials.commands.IEssentialsCommand;
+import com.earth2me.essentials.signs.EssentialsSign;
+import com.earth2me.essentials.textreader.IText;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import org.bukkit.ChatColor;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.event.EventPriority;
 
 
 public interface ISettings extends IConf
 {
-
 	boolean areSignsDisabled();
 
-	String format(String format, IUser user);
-
-	String getAnnounceNewPlayerFormat(IUser user);
+	IText getAnnounceNewPlayerFormat();
 
 	boolean getAnnounceNewPlayers();
 
+	String getNewPlayerKit();
+
 	String getBackupCommand();
 
 	long getBackupInterval();
 
-	boolean getBedSetsHome();
-
 	String getChatFormat(String group);
 
 	int getChatRadius();
+	
+	char getChatShout();
+	
+	char getChatQuestion();
 
-	double getCommandCost(IEssentialsCommand cmd);
+	BigDecimal getCommandCost(IEssentialsCommand cmd);
 
-	double getCommandCost(String label);
+	BigDecimal getCommandCost(String label);
 
 	String getCurrencySymbol();
 
+	int getOversizedStackSize();
+
 	int getDefaultStackSize();
 
 	double getHealCooldown();
 
-	Object getKit(String name);
+	Set<String> getSocialSpyCommands();
 
-	Map<String, Object> getKits();
+	Map<String, Object> getKit(String name);
+
+	ConfigurationSection getKits();
 
 	String getLocale();
 
@@ -61,21 +72,19 @@ public interface ISettings extends IConf
 
 	String getProtectString(final String configName);
 
-	boolean getReclaimSetting();
-
 	boolean getRespawnAtHome();
-	
-	List getMultipleHomes();
-	
-	int getHomeLimit(String set);
-	
-	int getHomeLimit(User user);
 
-	boolean getSortListByGroups();
+	Set getMultipleHomes();
+
+	int getHomeLimit(String set);
+
+	int getHomeLimit(User user);
 
 	int getSpawnMobLimit();
 
-	int getStartingBalance();
+	BigDecimal getStartingBalance();
+
+	boolean isTeleportSafetyEnabled();
 
 	double getTeleportCooldown();
 
@@ -89,10 +98,6 @@ public interface ISettings extends IConf
 
 	boolean isCommandOverridden(String name);
 
-	boolean isCommandRestricted(IEssentialsCommand cmd);
-
-	boolean isCommandRestricted(String label);
-
 	boolean isDebug();
 
 	boolean isEcoDisabled();
@@ -101,32 +106,38 @@ public interface ISettings extends IConf
 
 	List<Integer> itemSpawnBlacklist();
 
+	List<EssentialsSign> enabledSigns();
+
 	boolean permissionBasedItemSpawn();
 
 	boolean showNonEssCommandsInHelp();
 
-	boolean spawnIfNoHome();
-
 	boolean warnOnBuildDisallow();
 
 	boolean warnOnSmite();
-	
-	double getMaxMoney();
+
+	BigDecimal getMaxMoney();
+
+	BigDecimal 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();
@@ -134,6 +145,72 @@ public interface ISettings extends IConf
 	long getAutoAfkKick();
 
 	boolean getFreezeAfkPlayers();
-	
+
+	boolean cancelAfkOnMove();
+
+	boolean cancelAfkOnInteract();
+
 	boolean areDeathMessagesEnabled();
+
+	void setDebug(boolean debug);
+
+	Set<String> getNoGodWorlds();
+
+	boolean getUpdateBedAtDaytime();
+
+	boolean allowUnsafeEnchantments();
+
+	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();
+
+	int getMailsPerMinute();
+
+	long getEconomyLagWarning();
+
+	void setEssentialsChatActive(boolean b);
+
+	long getMaxTempban();
+
+	Map<String, Object> getListGroupConfig();
+
+	int getMaxNickLength();
+
+	int getMaxUserCacheCount();
+
+	boolean allowSilentJoinQuit();
+
+	boolean isCustomJoinMessage();
+
+	String getCustomJoinMessage();
+
+	boolean isCustomQuitMessage();
+
+	String getCustomQuitMessage();
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,15 +1,7 @@
 package com.earth2me.essentials;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
+import static com.earth2me.essentials.I18n.tl;
+import java.io.*;
 import java.math.BigInteger;
 import java.security.DigestInputStream;
 import java.security.DigestOutputStream;
@@ -19,12 +11,13 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
+import net.ess3.api.IEssentials;
 import org.bukkit.Bukkit;
 
 
 public class ManagedFile
 {
-	private final static int BUFFERSIZE = 1024 * 8;
+	private static final int BUFFERSIZE = 1024 * 8;
 	private final transient File file;
 
 	public ManagedFile(final String filename, final IEssentials ess)
@@ -54,7 +47,7 @@ public class ManagedFile
 			}
 			catch (IOException ex)
 			{
-				Bukkit.getLogger().log(Level.SEVERE, Util.i18n("itemsCsvNotLoaded"), ex);
+				Bukkit.getLogger().log(Level.SEVERE, tl("itemsCsvNotLoaded"), ex);
 			}
 		}
 	}
@@ -138,12 +131,12 @@ public class ManagedFile
 			try
 			{
 				String hash = reader.readLine();
-				if (hash.matches("#[a-f0-9]{32}"))
+				if (hash != null && hash.matches("#[a-f0-9]{32}"))
 				{
 					hash = hash.substring(1);
 					bais.reset();
 					final String versionline = reader.readLine();
-					if (versionline.matches("#version: .+"))
+					if (versionline != null && versionline.matches("#version: .+"))
 					{
 						final String versioncheck = versionline.substring(10);
 						if (!versioncheck.equalsIgnoreCase(version))

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

@@ -0,0 +1,577 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.textreader.BookInput;
+import com.earth2me.essentials.textreader.BookPager;
+import com.earth2me.essentials.textreader.IText;
+import com.earth2me.essentials.utils.FormatUtil;
+import com.earth2me.essentials.utils.NumberUtil;
+import java.util.*;
+import java.util.regex.Pattern;
+
+import com.google.common.base.Joiner;
+import java.util.logging.Level;
+import net.ess3.api.IEssentials;
+import org.bukkit.Color;
+import org.bukkit.DyeColor;
+import org.bukkit.FireworkEffect;
+import org.bukkit.Material;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.*;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+
+public class MetaItemStack
+{
+	private static final Map<String, DyeColor> colorMap = new HashMap<String, DyeColor>();
+	private static final Map<String, FireworkEffect.Type> fireworkShape = new HashMap<String, FireworkEffect.Type>();
+
+	static
+	{
+		for (DyeColor color : DyeColor.values())
+		{
+			colorMap.put(color.name(), color);
+		}
+		for (FireworkEffect.Type type : FireworkEffect.Type.values())
+		{
+			fireworkShape.put(type.name(), type);
+		}
+	}
+	private final transient Pattern splitPattern = Pattern.compile("[:+',;.]");
+	private ItemStack stack;
+	private FireworkEffect.Builder builder = FireworkEffect.builder();
+	private PotionEffectType pEffectType;
+	private PotionEffect pEffect;
+	private boolean validFirework = false;
+	private boolean validPotionEffect = false;
+	private boolean validPotionDuration = false;
+	private boolean validPotionPower = false;
+	private boolean completePotion = false;
+	private int power = 1;
+	private int duration = 120;
+
+	public MetaItemStack(final ItemStack stack)
+	{
+		this.stack = stack.clone();
+	}
+
+	public ItemStack getItemStack()
+	{
+		return stack;
+	}
+
+	public boolean isValidFirework()
+	{
+		return validFirework;
+	}
+
+	public boolean isValidPotion()
+	{
+		return validPotionEffect && validPotionDuration && validPotionPower;
+	}
+
+	public FireworkEffect.Builder getFireworkBuilder()
+	{
+		return builder;
+	}
+
+	public PotionEffect getPotionEffect()
+	{
+		return pEffect;
+	}
+
+	public boolean completePotion()
+	{
+		return completePotion;
+	}
+
+	private void resetPotionMeta()
+	{
+		pEffect = null;
+		pEffectType = null;
+		validPotionEffect = false;
+		validPotionDuration = false;
+		validPotionPower = false;
+		completePotion = true;
+	}
+
+	public boolean canSpawn(final IEssentials ess)
+	{
+		try
+		{
+			ess.getServer().getUnsafe().modifyItemStack(stack, "{}");
+			return true;
+		}
+		catch (NullPointerException npe)
+		{
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.INFO, "Itemstack is invalid", npe);
+			}
+			return false;
+		}
+		catch (NoSuchMethodError nsme)
+		{
+			return true;
+		}
+		catch (Throwable throwable)
+		{
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.INFO, "Itemstack is invalid", throwable);
+			}
+			return false;
+		}
+	}
+
+	public void parseStringMeta(final CommandSource sender, final boolean allowUnsafe, String[] string, int fromArg, final IEssentials ess) throws Exception
+	{
+		if (string[fromArg].startsWith("{"))
+		{
+			try
+			{
+				stack = ess.getServer().getUnsafe().modifyItemStack(stack, Joiner.on(' ').join(Arrays.asList(string).subList(fromArg, string.length)));
+			}
+			catch (NullPointerException npe)
+			{
+				if (ess.getSettings().isDebug())
+				{
+					ess.getLogger().log(Level.INFO, "Itemstack is invalid", npe);
+				}
+			}
+			catch (NoSuchMethodError nsme)
+			{
+				throw new Exception(tl("noMetaJson"), nsme);
+			}
+			catch (Throwable throwable)
+			{
+				throw new Exception(throwable.getMessage(), throwable);
+			}
+		}
+		else
+		{
+			for (int i = fromArg; i < string.length; i++)
+			{
+				addStringMeta(sender, allowUnsafe, string[i], ess);
+			}
+			if (validFirework)
+			{
+				if (!hasMetaPermission(sender, "firework", true, true, ess))
+				{
+					throw new Exception(tl("noMetaFirework"));
+				}
+				FireworkEffect effect = builder.build();
+				FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta();
+				fmeta.addEffect(effect);
+				if (fmeta.getEffects().size() > 1 && !hasMetaPermission(sender, "firework-multiple", true, true, ess))
+				{
+					throw new Exception(tl("multipleCharges"));
+				}
+				stack.setItemMeta(fmeta);
+			}
+		}
+	}
+
+	public void addStringMeta(final CommandSource sender, final boolean allowUnsafe, final String string, final IEssentials ess) throws Exception
+	{
+		final String[] split = splitPattern.split(string, 2);
+		if (split.length < 1)
+		{
+			return;
+		}
+
+		if (split.length > 1 && split[0].equalsIgnoreCase("name") && hasMetaPermission(sender, "name", false, true, ess))
+		{
+			final String displayName = FormatUtil.replaceFormat(split[1].replace('_', ' '));
+			final ItemMeta meta = stack.getItemMeta();
+			meta.setDisplayName(displayName);
+			stack.setItemMeta(meta);
+		}
+		else if (split.length > 1 && (split[0].equalsIgnoreCase("lore") || split[0].equalsIgnoreCase("desc")) && hasMetaPermission(sender, "lore", false, true, ess))
+		{
+			final List<String> lore = new ArrayList<String>();
+			for (String line : split[1].split("\\|"))
+			{
+				lore.add(FormatUtil.replaceFormat(line.replace('_', ' ')));
+			}
+			final ItemMeta meta = stack.getItemMeta();
+			meta.setLore(lore);
+			stack.setItemMeta(meta);
+		}
+		else if (split.length > 1 && (split[0].equalsIgnoreCase("player") || split[0].equalsIgnoreCase("owner")) && stack.getType() == Material.SKULL_ITEM && hasMetaPermission(sender, "head", false, true, ess))
+		{
+			if (stack.getDurability() == 3)
+			{
+				final String owner = split[1];
+				final SkullMeta meta = (SkullMeta)stack.getItemMeta();
+				meta.setOwner(owner);
+				stack.setItemMeta(meta);
+			}
+			else
+			{
+				throw new Exception(tl("onlyPlayerSkulls"));
+			}
+		}
+		else if (split.length > 1 && split[0].equalsIgnoreCase("book") && stack.getType() == Material.WRITTEN_BOOK
+				 && (hasMetaPermission(sender, "book", true, true, ess) || hasMetaPermission(sender, "chapter-" + split[1].toLowerCase(Locale.ENGLISH), true, true, ess)))
+		{
+			final BookMeta meta = (BookMeta)stack.getItemMeta();
+			final IText input = new BookInput("book", true, ess);
+			final BookPager pager = new BookPager(input);
+
+			List<String> pages = pager.getPages(split[1]);
+			meta.setPages(pages);
+			stack.setItemMeta(meta);
+		}
+		else if (split.length > 1 && split[0].equalsIgnoreCase("author") && stack.getType() == Material.WRITTEN_BOOK && hasMetaPermission(sender, "author", false, true, ess))
+		{
+			final String author = FormatUtil.replaceFormat(split[1]);
+			final BookMeta meta = (BookMeta)stack.getItemMeta();
+			meta.setAuthor(author);
+			stack.setItemMeta(meta);
+		}
+		else if (split.length > 1 && split[0].equalsIgnoreCase("title") && stack.getType() == Material.WRITTEN_BOOK && hasMetaPermission(sender, "title", false, true, ess))
+		{
+			final String title = FormatUtil.replaceFormat(split[1].replace('_', ' '));
+			final BookMeta meta = (BookMeta)stack.getItemMeta();
+			meta.setTitle(title);
+			stack.setItemMeta(meta);
+		}
+		else if (split.length > 1 && split[0].equalsIgnoreCase("power") && stack.getType() == Material.FIREWORK && hasMetaPermission(sender, "firework-power", false, true, ess))
+		{
+			final int power = NumberUtil.isInt(split[1]) ? Integer.parseInt(split[1]) : 0;
+			final FireworkMeta meta = (FireworkMeta)stack.getItemMeta();
+			meta.setPower(power > 3 ? 4 : power);
+			stack.setItemMeta(meta);
+		}
+		else if (stack.getType() == Material.FIREWORK) //WARNING - Meta for fireworks will be ignored after this point.
+		{
+			addFireworkMeta(sender, false, string, ess);
+		}
+		else if (stack.getType() == Material.POTION) //WARNING - Meta for potions will be ignored after this point.
+		{
+			addPotionMeta(sender, false, string, ess);
+		}
+		else if (split.length > 1 && (split[0].equalsIgnoreCase("color") || split[0].equalsIgnoreCase("colour"))
+				 && (stack.getType() == Material.LEATHER_BOOTS
+					 || stack.getType() == Material.LEATHER_CHESTPLATE
+					 || stack.getType() == Material.LEATHER_HELMET
+					 || stack.getType() == Material.LEATHER_LEGGINGS))
+		{
+			final String[] color = split[1].split("(\\||,)");
+			if (color.length == 3)
+			{
+				final int red = NumberUtil.isInt(color[0]) ? Integer.parseInt(color[0]) : 0;
+				final int green = NumberUtil.isInt(color[1]) ? Integer.parseInt(color[1]) : 0;
+				final int blue = NumberUtil.isInt(color[2]) ? Integer.parseInt(color[2]) : 0;
+				final LeatherArmorMeta meta = (LeatherArmorMeta)stack.getItemMeta();
+				meta.setColor(Color.fromRGB(red, green, blue));
+				stack.setItemMeta(meta);
+			}
+			else
+			{
+				throw new Exception(tl("leatherSyntax"));
+			}
+		}
+		else
+		{
+			parseEnchantmentStrings(sender, allowUnsafe, split, ess);
+		}
+	}
+
+	public void addFireworkMeta(final CommandSource sender, final boolean allowShortName, final String string, final IEssentials ess) throws Exception
+	{
+		if (stack.getType() == Material.FIREWORK)
+		{
+			final String[] split = splitPattern.split(string, 2);
+
+			if (split.length < 2)
+			{
+				return;
+			}
+
+			if (split[0].equalsIgnoreCase("color") || split[0].equalsIgnoreCase("colour") || (allowShortName && split[0].equalsIgnoreCase("c")))
+			{
+				if (validFirework)
+				{
+					if (!hasMetaPermission(sender, "firework", true, true, ess))
+					{
+						throw new Exception(tl("noMetaFirework"));
+					}
+					FireworkEffect effect = builder.build();
+					FireworkMeta fmeta = (FireworkMeta)stack.getItemMeta();
+					fmeta.addEffect(effect);
+					if (fmeta.getEffects().size() > 1 && !hasMetaPermission(sender, "firework-multiple", true, true, ess))
+					{
+						throw new Exception(tl("multipleCharges"));
+					}
+					stack.setItemMeta(fmeta);
+					builder = FireworkEffect.builder();
+				}
+
+				List<Color> primaryColors = new ArrayList<Color>();
+				String[] colors = split[1].split(",");
+				for (String color : colors)
+				{
+					if (colorMap.containsKey(color.toUpperCase()))
+					{
+						validFirework = true;
+						primaryColors.add(colorMap.get(color.toUpperCase()).getFireworkColor());
+					}
+					else
+					{
+						throw new Exception(tl("invalidFireworkFormat", split[1], split[0]));
+					}
+				}
+				builder.withColor(primaryColors);
+			}
+			else if (split[0].equalsIgnoreCase("shape") || split[0].equalsIgnoreCase("type") || (allowShortName && (split[0].equalsIgnoreCase("s") || split[0].equalsIgnoreCase("t"))))
+			{
+				FireworkEffect.Type finalEffect = null;
+				split[1] = (split[1].equalsIgnoreCase("large") ? "BALL_LARGE" : split[1]);
+				if (fireworkShape.containsKey(split[1].toUpperCase()))
+				{
+					finalEffect = fireworkShape.get(split[1].toUpperCase());
+				}
+				else
+				{
+					throw new Exception(tl("invalidFireworkFormat", split[1], split[0]));
+				}
+				if (finalEffect != null)
+				{
+					builder.with(finalEffect);
+				}
+			}
+			else if (split[0].equalsIgnoreCase("fade") || (allowShortName && split[0].equalsIgnoreCase("f")))
+			{
+				List<Color> fadeColors = new ArrayList<Color>();
+				String[] colors = split[1].split(",");
+				for (String color : colors)
+				{
+					if (colorMap.containsKey(color.toUpperCase()))
+					{
+						fadeColors.add(colorMap.get(color.toUpperCase()).getFireworkColor());
+					}
+					else
+					{
+						throw new Exception(tl("invalidFireworkFormat", split[1], split[0]));
+					}
+				}
+				if (!fadeColors.isEmpty())
+				{
+					builder.withFade(fadeColors);
+				}
+			}
+			else if (split[0].equalsIgnoreCase("effect") || (allowShortName && split[0].equalsIgnoreCase("e")))
+			{
+				String[] effects = split[1].split(",");
+				for (String effect : effects)
+				{
+					if (effect.equalsIgnoreCase("twinkle"))
+					{
+						builder.flicker(true);
+					}
+					else if (effect.equalsIgnoreCase("trail"))
+					{
+						builder.trail(true);
+					}
+					else
+					{
+						throw new Exception(tl("invalidFireworkFormat", split[1], split[0]));
+					}
+				}
+			}
+		}
+	}
+
+	public void addPotionMeta(final CommandSource sender, final boolean allowShortName, final String string, final IEssentials ess) throws Exception
+	{
+		if (stack.getType() == Material.POTION)
+		{
+			final String[] split = splitPattern.split(string, 2);
+
+			if (split.length < 2)
+			{
+				return;
+			}
+
+			if (split[0].equalsIgnoreCase("effect") || (allowShortName && split[0].equalsIgnoreCase("e")))
+			{
+				pEffectType = Potions.getByName(split[1]);
+				if (pEffectType != null && pEffectType.getName() != null)
+				{
+					if (hasMetaPermission(sender, "potions." + pEffectType.getName().toLowerCase(Locale.ENGLISH), true, false, ess))
+					{
+						validPotionEffect = true;
+					}
+					else
+					{
+						throw new Exception(tl("noPotionEffectPerm", pEffectType.getName().toLowerCase(Locale.ENGLISH)));
+					}
+				}
+				else
+				{
+					throw new Exception(tl("invalidPotionMeta", split[1]));
+				}
+			}
+			else if (split[0].equalsIgnoreCase("power") || (allowShortName && split[0].equalsIgnoreCase("p")))
+			{
+				if (NumberUtil.isInt(split[1]))
+				{
+					validPotionPower = true;
+					power = Integer.parseInt(split[1]);
+					if (power > 0 && power < 4)
+					{
+						power -= 1;
+					}
+				}
+				else
+				{
+					throw new Exception(tl("invalidPotionMeta", split[1]));
+				}
+			}
+			else if (split[0].equalsIgnoreCase("duration") || (allowShortName && split[0].equalsIgnoreCase("d")))
+			{
+				if (NumberUtil.isInt(split[1]))
+				{
+					validPotionDuration = true;
+					duration = Integer.parseInt(split[1]) * 20; //Duration is in ticks by default, converted to seconds
+				}
+				else
+				{
+					throw new Exception(tl("invalidPotionMeta", split[1]));
+				}
+			}
+
+			if (isValidPotion())
+			{
+				PotionMeta pmeta = (PotionMeta)stack.getItemMeta();
+				pEffect = pEffectType.createEffect(duration, power);
+				if (pmeta.getCustomEffects().size() > 1 && !hasMetaPermission(sender, "potions.multiple", true, false, ess))
+				{
+					throw new Exception(tl("multiplePotionEffects"));
+				}
+				pmeta.addCustomEffect(pEffect, true);
+				stack.setItemMeta(pmeta);
+				resetPotionMeta();
+			}
+		}
+	}
+
+	private void parseEnchantmentStrings(final CommandSource sender, final boolean allowUnsafe, final String[] split, final IEssentials ess) throws Exception
+	{
+		final Enchantment enchantment = Enchantments.getByName(split[0]);
+		if (enchantment == null || !hasMetaPermission(sender, "enchantments." + enchantment.getName().toLowerCase(Locale.ENGLISH), false, false, ess))
+		{
+			return;
+		}
+
+		int level = -1;
+		if (split.length > 1)
+		{
+			try
+			{
+				level = Integer.parseInt(split[1]);
+			}
+			catch (NumberFormatException ex)
+			{
+				level = -1;
+			}
+		}
+
+		if (level < 0 || (!allowUnsafe && level > enchantment.getMaxLevel()))
+		{
+			level = enchantment.getMaxLevel();
+		}
+		addEnchantment(sender, allowUnsafe, enchantment, level);
+	}
+
+	public void addEnchantment(final CommandSource sender, final boolean allowUnsafe, final Enchantment enchantment, final int level) throws Exception
+	{
+		if (enchantment == null)
+		{
+			throw new Exception(tl("enchantmentNotFound"));
+		}
+		try
+		{
+			if (stack.getType().equals(Material.ENCHANTED_BOOK))
+			{
+				EnchantmentStorageMeta meta = (EnchantmentStorageMeta)stack.getItemMeta();
+				if (level == 0)
+				{
+					meta.removeStoredEnchant(enchantment);
+				}
+				else
+				{
+					meta.addStoredEnchant(enchantment, level, allowUnsafe);
+				}
+				stack.setItemMeta(meta);
+			}
+			else // all other material types besides ENCHANTED_BOOK
+			{
+				if (level == 0)
+				{
+					stack.removeEnchantment(enchantment);
+				}
+				else
+				{
+					if (allowUnsafe)
+					{
+						stack.addUnsafeEnchantment(enchantment, level);
+					}
+					else
+					{
+						stack.addEnchantment(enchantment, level);
+					}
+				}
+			}
+		}
+		catch (Exception ex)
+		{
+			throw new Exception("Enchantment " + enchantment.getName() + ": " + ex.getMessage(), ex);
+		}
+	}
+
+	public Enchantment getEnchantment(final User user, final String name) throws Exception
+	{
+		final Enchantment enchantment = Enchantments.getByName(name);
+		if (enchantment == null)
+		{
+			return null;
+		}
+
+		final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
+
+		if (!hasMetaPermission(user, "enchantments." + enchantmentName, true, false))
+		{
+			throw new Exception(tl("enchantmentPerm", enchantmentName));
+		}
+		return enchantment;
+	}
+
+	private boolean hasMetaPermission(final CommandSource sender, final String metaPerm, final boolean graceful, final boolean includeBase, final IEssentials ess) throws Exception
+	{
+		final User user = sender != null && sender.isPlayer() ? ess.getUser(sender.getPlayer()) : null;
+		return hasMetaPermission(user, metaPerm, graceful, includeBase);
+	}
+
+	private boolean hasMetaPermission(final User user, final String metaPerm, final boolean graceful, final boolean includeBase) throws Exception
+	{
+		final String permBase = includeBase ? "essentials.itemspawn.meta-" : "essentials.";
+		if (user == null || user.isAuthorized(permBase + metaPerm))
+		{
+			return true;
+		}
+
+		if (graceful)
+		{
+			return false;
+		}
+		else
+		{
+			throw new Exception(tl("noMetaPerm", metaPerm));
+		}
+	}
+}

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

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

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

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

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

@@ -1,12 +1,11 @@
 package com.earth2me.essentials;
 
 import lombok.Delegate;
-import org.bukkit.craftbukkit.entity.CraftPlayer;
-import net.minecraft.server.EntityPlayer;
-import net.minecraft.server.IInventory;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
-import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.LivingEntity;
@@ -15,23 +14,15 @@ import org.bukkit.permissions.Permissible;
 import org.bukkit.permissions.ServerOperator;
 
 
-public class PlayerExtension implements Player
+public class PlayerExtension
 {
-	protected final transient IEssentials ess;
-	@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, final IEssentials ess)
+
+	public PlayerExtension(final Player base)
 	{
 		this.base = base;
-		this.ess = ess;
 	}
-	
+
 	public final Player getBase()
 	{
 		return base;
@@ -42,43 +33,16 @@ public class PlayerExtension implements Player
 		return this.base = base;
 	}
 	
-	public void showInventory(final IInventory inventory)
+	public Server getServer()
 	{
-		getHandle().a(inventory);
-	}
-
-	public void showInventory(final CraftInventoryPlayer inventory)
-	{
-		showInventory((IInventory)inventory.getInventory());
-	}
-
-	public TargetBlock getTarget()
-	{
-		return new TargetBlock(getBase());
-	}
-
-	public String getGroup()
-	{
-		return ess.getPermissionsHandler().getGroup(base);
+		return base.getServer();
 	}
 	
-	public boolean inGroup(final String group)
-	{
-		return ess.getPermissionsHandler().inGroup(base, group);
+	public World getWorld() {
+		return base.getWorld();
 	}
-
-	public boolean canBuild()
-	{
-		return ess.getPermissionsHandler().canBuild(base, getGroup());
-	}
-
-	public EntityPlayer getHandle()
-	{
-		return getCraftPlayer().getHandle();
-	}
-
-	public CraftPlayer getCraftPlayer()
-	{
-		return (CraftPlayer)base;
+	
+	public Location getLocation() {
+		return base.getLocation();
 	}
 }

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

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

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

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

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

@@ -0,0 +1,160 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.utils.NumberUtil;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import org.bukkit.potion.PotionEffectType;
+
+
+public class Potions
+{
+	private static final Map<String, PotionEffectType> POTIONS = new HashMap<String, PotionEffectType>();
+	private static final Map<String, PotionEffectType> ALIASPOTIONS = new HashMap<String, PotionEffectType>();
+
+	static
+	{
+
+		POTIONS.put("speed", PotionEffectType.SPEED);
+		ALIASPOTIONS.put("fast", PotionEffectType.SPEED);
+		ALIASPOTIONS.put("runfast", PotionEffectType.SPEED);
+		ALIASPOTIONS.put("sprint", PotionEffectType.SPEED);
+		ALIASPOTIONS.put("swift", PotionEffectType.SPEED);
+
+		POTIONS.put("slowness", PotionEffectType.SLOW);
+		ALIASPOTIONS.put("slow", PotionEffectType.SLOW);
+		ALIASPOTIONS.put("sluggish", PotionEffectType.SLOW);
+
+		POTIONS.put("haste", PotionEffectType.FAST_DIGGING);
+		ALIASPOTIONS.put("superpick", PotionEffectType.FAST_DIGGING);
+		ALIASPOTIONS.put("quickmine", PotionEffectType.FAST_DIGGING);
+		ALIASPOTIONS.put("digspeed", PotionEffectType.FAST_DIGGING);
+		ALIASPOTIONS.put("digfast", PotionEffectType.FAST_DIGGING);
+		ALIASPOTIONS.put("sharp", PotionEffectType.FAST_DIGGING);
+
+		POTIONS.put("fatigue", PotionEffectType.SLOW_DIGGING);
+		ALIASPOTIONS.put("slow", PotionEffectType.SLOW_DIGGING);
+		ALIASPOTIONS.put("dull", PotionEffectType.SLOW_DIGGING);
+
+		POTIONS.put("strength", PotionEffectType.INCREASE_DAMAGE);
+		ALIASPOTIONS.put("strong", PotionEffectType.INCREASE_DAMAGE);
+		ALIASPOTIONS.put("bull", PotionEffectType.INCREASE_DAMAGE);
+		ALIASPOTIONS.put("attack", PotionEffectType.INCREASE_DAMAGE);
+
+		POTIONS.put("heal", PotionEffectType.HEAL);
+		ALIASPOTIONS.put("healthy", PotionEffectType.HEAL);
+		ALIASPOTIONS.put("instaheal", PotionEffectType.HEAL);
+
+		POTIONS.put("harm", PotionEffectType.HARM);
+		ALIASPOTIONS.put("harming", PotionEffectType.HARM);
+		ALIASPOTIONS.put("injure", PotionEffectType.HARM);
+		ALIASPOTIONS.put("damage", PotionEffectType.HARM);
+		ALIASPOTIONS.put("inflict", PotionEffectType.HARM);
+
+		POTIONS.put("jump", PotionEffectType.JUMP);
+		ALIASPOTIONS.put("leap", PotionEffectType.JUMP);
+
+		POTIONS.put("nausea", PotionEffectType.CONFUSION);
+		ALIASPOTIONS.put("sick", PotionEffectType.CONFUSION);
+		ALIASPOTIONS.put("sickness", PotionEffectType.CONFUSION);
+		ALIASPOTIONS.put("confusion", PotionEffectType.CONFUSION);
+
+		POTIONS.put("regeneration", PotionEffectType.REGENERATION);
+		ALIASPOTIONS.put("regen", PotionEffectType.REGENERATION);
+
+		POTIONS.put("resistance", PotionEffectType.DAMAGE_RESISTANCE);
+		ALIASPOTIONS.put("dmgresist", PotionEffectType.DAMAGE_RESISTANCE);
+		ALIASPOTIONS.put("armor", PotionEffectType.DAMAGE_RESISTANCE);
+
+		POTIONS.put("fireresist", PotionEffectType.FIRE_RESISTANCE);
+		ALIASPOTIONS.put("fireresistance", PotionEffectType.FIRE_RESISTANCE);
+		ALIASPOTIONS.put("resistfire", PotionEffectType.FIRE_RESISTANCE);
+
+		POTIONS.put("waterbreath", PotionEffectType.WATER_BREATHING);
+		ALIASPOTIONS.put("waterbreathing", PotionEffectType.WATER_BREATHING);
+
+		POTIONS.put("invisibility", PotionEffectType.INVISIBILITY);
+		ALIASPOTIONS.put("invisible", PotionEffectType.INVISIBILITY);
+		ALIASPOTIONS.put("invis", PotionEffectType.INVISIBILITY);
+		ALIASPOTIONS.put("vanish", PotionEffectType.INVISIBILITY);
+		ALIASPOTIONS.put("disappear", PotionEffectType.INVISIBILITY);
+
+		POTIONS.put("blindness", PotionEffectType.BLINDNESS);
+		ALIASPOTIONS.put("blind", PotionEffectType.BLINDNESS);
+
+		POTIONS.put("nightvision", PotionEffectType.NIGHT_VISION);
+		ALIASPOTIONS.put("vision", PotionEffectType.NIGHT_VISION);
+
+		POTIONS.put("hunger", PotionEffectType.HUNGER);
+		ALIASPOTIONS.put("hungry", PotionEffectType.HUNGER);
+		ALIASPOTIONS.put("starve", PotionEffectType.HUNGER);
+
+		POTIONS.put("weakness", PotionEffectType.WEAKNESS);
+		ALIASPOTIONS.put("weak", PotionEffectType.WEAKNESS);
+
+		POTIONS.put("poison", PotionEffectType.POISON);
+		ALIASPOTIONS.put("venom", PotionEffectType.POISON);
+
+		POTIONS.put("wither", PotionEffectType.WITHER);
+		ALIASPOTIONS.put("decay", PotionEffectType.WITHER);
+
+
+		try // 1.6 update
+		{
+			POTIONS.put("healthboost", PotionEffectType.HEALTH_BOOST);
+			ALIASPOTIONS.put("boost", PotionEffectType.HEALTH_BOOST);
+
+			POTIONS.put("absorption", PotionEffectType.ABSORPTION);
+			ALIASPOTIONS.put("absorb", PotionEffectType.ABSORPTION);
+
+			POTIONS.put("saturation", PotionEffectType.SATURATION);
+			ALIASPOTIONS.put("food", PotionEffectType.SATURATION);
+		}
+		catch (java.lang.NoSuchFieldError e)
+		{
+			Essentials.wrongVersion();
+		}
+		
+		try // 1.7 update
+		{
+			POTIONS.put("waterbreathing", PotionEffectType.WATER_BREATHING);
+			ALIASPOTIONS.put("underwaterbreathing", PotionEffectType.WATER_BREATHING);
+			ALIASPOTIONS.put("waterbreath", PotionEffectType.WATER_BREATHING);
+			ALIASPOTIONS.put("underwaterbreath", PotionEffectType.WATER_BREATHING);
+			ALIASPOTIONS.put("air", PotionEffectType.WATER_BREATHING);
+		}
+		catch (java.lang.NoSuchFieldError e)
+		{
+			Essentials.wrongVersion();
+		}
+	}
+
+	public static PotionEffectType getByName(String name)
+	{
+		PotionEffectType peffect;
+		if (NumberUtil.isInt(name))
+		{
+			peffect = PotionEffectType.getById(Integer.parseInt(name));
+		}
+		else
+		{
+			peffect = PotionEffectType.getByName(name.toUpperCase(Locale.ENGLISH));
+		}
+		if (peffect == null)
+		{
+			peffect = POTIONS.get(name.toLowerCase(Locale.ENGLISH));
+		}
+		if (peffect == null)
+		{
+			peffect = ALIASPOTIONS.get(name.toLowerCase(Locale.ENGLISH));
+		}
+		return peffect;
+	}
+
+	public static Set<Entry<String, PotionEffectType>> entrySet()
+	{
+		return POTIONS.entrySet();
+	}
+}

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

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

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

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

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

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

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

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

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

@@ -1,271 +1,292 @@
 package com.earth2me.essentials;
 
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.utils.DateUtil;
+import com.earth2me.essentials.utils.LocationUtil;
+import java.math.BigDecimal;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
-import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
 import org.bukkit.Location;
-import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
-public class Teleport implements Runnable
+public class Teleport implements net.ess3.api.ITeleport
 {
-	private static final double MOVE_CONSTANT = 0.3;
-
-
-	private static class Target
-	{
-		private final Location location;
-		private final Entity entity;
-
-		public Target(Location location)
-		{
-			this.location = location;
-			this.entity = null;
-		}
-
-		public Target(Entity entity)
-		{
-			this.entity = entity;
-			this.location = null;
-		}
-
-		public Location getLocation()
-		{
-			if (this.entity != null)
-			{
-				return this.entity.getLocation();
-			}
-			return location;
-		}
-	}
-	private IUser user;
-	private int teleTimer = -1;
-	private long started;	// time this task was initiated
-	private long delay;		// how long to delay the teleport
-	private int health;
-	// note that I initially stored a clone of the location for reference, but...
-	// when comparing locations, I got incorrect mismatches (rounding errors, looked like)
-	// so, the X/Y/Z values are stored instead and rounded off
-	private long initX;
-	private long initY;
-	private long initZ;
-	private Target teleportTarget;
-	private Trade chargeFor;
+	private final IUser teleportOwner;
 	private final IEssentials ess;
-	private static final Logger logger = Logger.getLogger("Minecraft");
-
-	private void initTimer(long delay, Target target, Trade chargeFor)
-	{
-		this.started = System.currentTimeMillis();
-		this.delay = delay;
-		this.health = user.getHealth();
-		this.initX = Math.round(user.getLocation().getX() * MOVE_CONSTANT);
-		this.initY = Math.round(user.getLocation().getY() * MOVE_CONSTANT);
-		this.initZ = Math.round(user.getLocation().getZ() * MOVE_CONSTANT);
-		this.teleportTarget = target;
-		this.chargeFor = chargeFor;
-	}
-
-	public void run()
-	{
-
-		if (user == null || !user.isOnline() || user.getLocation() == null)
-		{
-			cancel();
-			return;
-		}
-		if (Math.round(user.getLocation().getX() * MOVE_CONSTANT) != initX
-			|| Math.round(user.getLocation().getY() * MOVE_CONSTANT) != initY
-			|| Math.round(user.getLocation().getZ() * MOVE_CONSTANT) != initZ
-			|| user.getHealth() < health)
-		{	// user moved, cancel teleport
-			cancel(true);
-			return;
-		}
-
-		health = user.getHealth();  // in case user healed, then later gets injured
-
-		long now = System.currentTimeMillis();
-		if (now > started + delay)
-		{
-			try
-			{
-				cooldown(false);
-				user.sendMessage(Util.i18n("teleportationCommencing"));
-				try
-				{
-
-					now(teleportTarget);
-					if (chargeFor != null)
-					{
-						chargeFor.charge(user);
-					}
-				}
-				catch (Throwable ex)
-				{
-					ess.showError(user.getBase(), ex, "teleport");
-				}
-				return;
-			}
-			catch (Exception ex)
-			{
-				user.sendMessage(Util.format("cooldownWithMessage", ex.getMessage()));
-			}
-		}
-	}
+	private TimedTeleport timedTeleport;
 
 	public Teleport(IUser user, IEssentials ess)
 	{
-		this.user = user;
+		this.teleportOwner = user;
 		this.ess = ess;
 	}
 
-	public void respawn(Spawn spawn, Trade chargeFor) throws Exception
-	{
-		teleport(new Target(spawn.getSpawn(user.getGroup())), chargeFor);
-	}
-
-	public void warp(String warp, Trade chargeFor) throws Exception
-	{
-		Location loc = ess.getWarps().getWarp(warp);
-		teleport(new Target(loc), chargeFor);
-		user.sendMessage(Util.format("warpingTo", warp));
-	}
-
 	public void cooldown(boolean check) throws Exception
 	{
-		Calendar now = new GregorianCalendar();
-		if (user.getLastTeleportTimestamp() > 0)
+		final Calendar time = new GregorianCalendar();
+		if (teleportOwner.getLastTeleportTimestamp() > 0)
 		{
-			double cooldown = ess.getSettings().getTeleportCooldown();
-			Calendar cooldownTime = new GregorianCalendar();
-			cooldownTime.setTimeInMillis(user.getLastTeleportTimestamp());
-			cooldownTime.add(Calendar.SECOND, (int)cooldown);
-			cooldownTime.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
-			if (cooldownTime.after(now) && !user.isAuthorized("essentials.teleport.cooldown.bypass"))
+			// Take the current time, and remove the delay from it.
+			final double cooldown = ess.getSettings().getTeleportCooldown();
+			final Calendar earliestTime = new GregorianCalendar();
+			earliestTime.add(Calendar.SECOND, -(int)cooldown);
+			earliestTime.add(Calendar.MILLISECOND, -(int)((cooldown * 1000.0) % 1000.0));
+			// This value contains the most recent time a teleportPlayer could have been used that would allow another use.
+			final long earliestLong = earliestTime.getTimeInMillis();
+
+			// When was the last teleportPlayer used?
+			final Long lastTime = teleportOwner.getLastTeleportTimestamp();
+
+			if (lastTime > time.getTimeInMillis())
 			{
-				throw new Exception(Util.format("timeBeforeTeleport", Util.formatDateDiff(cooldownTime.getTimeInMillis())));
+				// This is to make sure time didn't get messed up on last teleportPlayer use.
+				// If this happens, let's give the user the benifit of the doubt.
+				teleportOwner.setLastTeleportTimestamp(time.getTimeInMillis());
+				return;
+			}
+			else if (lastTime > earliestLong && !teleportOwner.isAuthorized("essentials.teleport.cooldown.bypass"))
+			{
+				time.setTimeInMillis(lastTime);
+				time.add(Calendar.SECOND, (int)cooldown);
+				time.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
+				throw new Exception(tl("timeBeforeTeleport", DateUtil.formatDateDiff(time.getTimeInMillis())));
 			}
 		}
 		// if justCheck is set, don't update lastTeleport; we're just checking
 		if (!check)
 		{
-			user.setLastTeleportTimestamp(now.getTimeInMillis());
+			teleportOwner.setLastTeleportTimestamp(time.getTimeInMillis());
 		}
 	}
 
-	public void cancel(boolean notifyUser)
+	private void warnUser(final IUser user, final double delay)
 	{
-		if (teleTimer == -1)
-		{
-			return;
-		}
-		try
-		{
-			ess.getServer().getScheduler().cancelTask(teleTimer);
-			if (notifyUser)
-			{
-				user.sendMessage(Util.i18n("pendingTeleportCancelled"));
-			}
-		}
-		finally
-		{
-			teleTimer = -1;
-		}
-	}
-
-	public void cancel()
-	{
-		cancel(false);
-	}
-
-	public void teleport(Location loc, Trade chargeFor) throws Exception
-	{
-		teleport(new Target(loc), chargeFor);
-	}
-
-	public void teleport(Entity entity, Trade chargeFor) throws Exception
-	{
-		teleport(new Target(entity), chargeFor);
-	}
-
-	private void teleport(Target target, Trade chargeFor) throws Exception
-	{
-		double delay = ess.getSettings().getTeleportDelay();
-
-		if (chargeFor != null)
-		{
-			chargeFor.isAffordableFor(user);
-		}
-		cooldown(true);
-		if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
-		{
-			cooldown(false);
-			now(target);
-			if (chargeFor != null)
-			{
-				chargeFor.charge(user);
-			}
-			return;
-		}
-
-		cancel();
 		Calendar c = new GregorianCalendar();
 		c.add(Calendar.SECOND, (int)delay);
 		c.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
-		user.sendMessage(Util.format("dontMoveMessage", Util.formatDateDiff(c.getTimeInMillis())));
-		initTimer((long)(delay * 1000.0), target, chargeFor);
-
-		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
+		user.sendMessage(tl("dontMoveMessage", DateUtil.formatDateDiff(c.getTimeInMillis())));
 	}
 
-	private void now(Target target) throws Exception
-	{
-		cancel();
-		user.setLastLocation();
-		user.getBase().teleport(Util.getSafeDestination(target.getLocation()));
-	}
-
-	public void now(Location loc) throws Exception
-	{
-		cooldown(false);
-		now(new Target(loc));
-	}
-
-	public void now(Location loc, Trade chargeFor) throws Exception
-	{
-		cooldown(false);
-		chargeFor.charge(user);
-		now(new Target(loc));
-	}
-
-	public void now(Entity entity, boolean cooldown) throws Exception
+	//The now function is used when you want to skip tp delay when teleporting someone to a location or player.
+	@Override
+	public void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception
 	{
 		if (cooldown)
 		{
 			cooldown(false);
 		}
-		now(new Target(entity));
+		final ITarget target = new LocationTarget(loc);
+		now(teleportOwner, target, cause);
 	}
 
+	@Override
+	public void now(Player entity, boolean cooldown, TeleportCause cause) throws Exception
+	{
+		if (cooldown)
+		{
+			cooldown(false);
+		}
+		final ITarget target = new PlayerTarget(entity);
+		now(teleportOwner, target, cause);
+		teleportOwner.sendMessage(tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ()));
+	}
+
+	protected void now(IUser teleportee, ITarget target, TeleportCause cause) throws Exception
+	{
+		cancel(false);
+		teleportee.setLastLocation();
+		final Location loc = target.getLocation();
+
+		if (LocationUtil.isBlockUnsafe(loc.getWorld(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()))
+		{
+			if (ess.getSettings().isTeleportSafetyEnabled())
+			{
+				if (teleportee.getBase().isInsideVehicle())
+				{
+					teleportee.getBase().leaveVehicle();
+				}
+				teleportee.getBase().teleport(LocationUtil.getSafeDestination(teleportee, loc), cause);
+			}
+			else
+			{
+				throw new Exception(tl("unsafeTeleportDestination", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+			}
+		}
+		else
+		{
+			if (teleportee.getBase().isInsideVehicle())
+			{
+				teleportee.getBase().leaveVehicle();
+			}
+			teleportee.getBase().teleport(LocationUtil.getRoundedDestination(loc), cause);
+		}
+	}
+
+	//The teleportPlayer function is used when you want to normally teleportPlayer someone to a location or player.
+	//This method is nolonger used internally and will be removed.
+	@Deprecated
+	@Override
+	public void teleport(Location loc, Trade chargeFor) throws Exception
+	{
+		teleport(loc, chargeFor, TeleportCause.PLUGIN);
+	}
+
+	@Override
+	public void teleport(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		teleport(teleportOwner, new LocationTarget(loc), chargeFor, cause);
+	}
+
+	//This is used when teleporting to a player
+	@Override
+	public void teleport(Player entity, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		ITarget target = new PlayerTarget(entity);
+		teleport(teleportOwner, target, chargeFor, cause);
+		teleportOwner.sendMessage(tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ()));
+	}
+
+	//This is used when teleporting to stored location
+	@Override
+	public void teleportPlayer(IUser teleportee, Location loc, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		teleport(teleportee, new LocationTarget(loc), chargeFor, cause);
+	}
+
+	//This is used on /tphere
+	@Override
+	public void teleportPlayer(IUser teleportee, Player entity, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		ITarget target = new PlayerTarget(entity);
+		teleport(teleportee, target, chargeFor, cause);
+		teleportee.sendMessage(tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ()));
+		teleportOwner.sendMessage(tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ()));
+	}
+
+	private void teleport(IUser teleportee, ITarget target, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		double delay = ess.getSettings().getTeleportDelay();
+
+		Trade cashCharge = chargeFor;
+
+		if (chargeFor != null)
+		{
+			chargeFor.isAffordableFor(teleportOwner);
+			
+			//This code is to make sure that commandcosts are checked in the initial world, and not in the resulting world.
+			if (!chargeFor.getCommandCost(teleportOwner).equals(BigDecimal.ZERO))
+			{
+				//By converting a command cost to a regular cost, the command cost permission isn't checked when executing the charge after teleport.
+				cashCharge = new Trade(chargeFor.getCommandCost(teleportOwner), ess);
+			}
+		}
+
+		cooldown(true);
+		if (delay <= 0 || teleportOwner.isAuthorized("essentials.teleport.timer.bypass")
+			|| teleportee.isAuthorized("essentials.teleport.timer.bypass"))
+		{
+			cooldown(false);
+			now(teleportee, target, cause);
+			if (cashCharge != null)
+			{
+				cashCharge.charge(teleportOwner);
+			}
+			return;
+		}
+
+		cancel(false);
+		warnUser(teleportee, delay);
+		initTimer((long)(delay * 1000.0), teleportee, target, cashCharge, cause, false);
+	}
+
+	//The respawn function is a wrapper used to handle tp fallback, on /jail and /home
+	@Override
+	public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		double delay = ess.getSettings().getTeleportDelay();
+		if (chargeFor != null)
+		{
+			chargeFor.isAffordableFor(teleportOwner);
+		}
+		cooldown(true);
+		if (delay <= 0 || teleportOwner.isAuthorized("essentials.teleport.timer.bypass"))
+		{
+			cooldown(false);
+			respawnNow(teleportOwner, cause);
+			if (chargeFor != null)
+			{
+				chargeFor.charge(teleportOwner);
+			}
+			return;
+		}
+
+		cancel(false);
+		warnUser(teleportOwner, delay);
+		initTimer((long)(delay * 1000.0), teleportOwner, null, chargeFor, cause, true);
+	}
+
+	protected void respawnNow(IUser teleportee, TeleportCause cause) throws Exception
+	{
+		final Player player = teleportee.getBase();
+		Location bed = player.getBedSpawnLocation();
+		if (bed != null)
+		{
+			now(teleportee, new LocationTarget(bed), cause);
+		}
+		else
+		{
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().info("Could not find bed spawn, forcing respawn event.");
+			}
+			final PlayerRespawnEvent pre = new PlayerRespawnEvent(player, player.getWorld().getSpawnLocation(), false);
+			ess.getServer().getPluginManager().callEvent(pre);
+			now(teleportee, new LocationTarget(pre.getRespawnLocation()), cause);
+		}
+	}
+
+	//The warp function is a wrapper used to teleportPlayer a player to a /warp
+	@Override
+	public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		Location loc = ess.getWarps().getWarp(warp);
+		teleportee.sendMessage(tl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+		teleport(teleportee, new LocationTarget(loc), chargeFor, cause);
+	}
+
+	//The back function is a wrapper used to teleportPlayer a player /back to their previous location.
+	@Override
 	public void back(Trade chargeFor) throws Exception
 	{
-		teleport(new Target(user.getLastLocation()), chargeFor);
+		final Location loc = teleportOwner.getLastLocation();
+		teleportOwner.sendMessage(tl("backUsageMsg", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+		teleport(teleportOwner, new LocationTarget(loc), chargeFor, TeleportCause.COMMAND);
 	}
 
+	//This function is used to throw a user back after a jail sentence
+	@Override
 	public void back() throws Exception
 	{
-		now(new Target(user.getLastLocation()));
+		now(teleportOwner, new LocationTarget(teleportOwner.getLastLocation()), TeleportCause.COMMAND);
 	}
 
-	public void home(IUser user, String home, Trade chargeFor) throws Exception
+	//If we need to cancelTimer a pending teleportPlayer call this method
+	private void cancel(boolean notifyUser)
 	{
-		final Location loc = user.getHome(home);
-		if (loc == null)
+		if (timedTeleport != null)
 		{
-			throw new NotEnoughArgumentsException();
+			timedTeleport.cancelTimer(notifyUser);
+			timedTeleport = null;
 		}
-		teleport(new Target(loc), chargeFor);
+	}
+
+	private void initTimer(long delay, IUser teleportUser, ITarget target, Trade chargeFor, TeleportCause cause, boolean respawn)
+	{
+		timedTeleport = new TimedTeleport(teleportOwner, ess, this, delay, teleportUser, target, chargeFor, cause, respawn);
 	}
 }

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

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

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

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

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

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

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

@@ -1,35 +1,59 @@
 package com.earth2me.essentials;
 
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.StringUtil;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
+import java.math.BigDecimal;
+import java.util.*;
+import net.ess3.api.IEssentials;
+import net.ess3.api.InvalidWorldException;
+import net.ess3.api.MaxMoneyException;
 import org.bukkit.Location;
-import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 
 public abstract class UserData extends PlayerExtension implements IConf
 {
-	private final EssentialsConf config;
-	private static final Logger logger = Logger.getLogger("Minecraft");
+	protected final transient IEssentials ess;
+	private final EssentialsUserConf config;
+	private final File folder;
 
 	protected UserData(Player base, IEssentials ess)
 	{
-		super(base, ess);
-		File folder = new File(ess.getDataFolder(), "userdata");
+		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"));
+
+		String filename;
+		try
+		{
+			filename = base.getUniqueId().toString();
+		}
+		catch (Throwable ex)
+		{
+			ess.getLogger().warning("Falling back to old username system for " + base.getName());
+			filename = base.getName();
+		}
+
+		config = new EssentialsUserConf(base.getName(), base.getUniqueId(), new File(folder, filename + ".yml"));
 		reloadConfig();
 	}
 
+	public final void reset()
+	{
+		config.forceSave();
+		config.getFile().delete();
+		ess.getUserMap().removeUser(this.getBase().getName());
+	}
+
+	@Override
 	public final void reloadConfig()
 	{
 		config.load();
@@ -42,121 +66,145 @@ public abstract class UserData extends PlayerExtension implements IConf
 		lastHealTimestamp = _getLastHealTimestamp();
 		jail = _getJail();
 		mails = _getMails();
-		savedInventory = _getSavedInventory();
-		teleportEnabled = getTeleportEnabled();
-		ignoredPlayers = getIgnoredPlayers();
-		godmode = getGodModeEnabled();
-		muted = getMuted();
+		teleportEnabled = _getTeleportEnabled();
+		godmode = _getGodModeEnabled();
+		muted = _getMuted();
 		muteTimeout = _getMuteTimeout();
-		jailed = getJailed();
+		jailed = _getJailed();
 		jailTimeout = _getJailTimeout();
 		lastLogin = _getLastLogin();
 		lastLogout = _getLastLogout();
-		afk = getAfk();
-		newplayer = getNew();
+		lastLoginAddress = _getLastLoginAddress();
+		afk = _getAfk();
 		geolocation = _getGeoLocation();
 		isSocialSpyEnabled = _isSocialSpyEnabled();
 		isNPC = _isNPC();
 		arePowerToolsEnabled = _arePowerToolsEnabled();
 		kitTimestamps = _getKitTimestamps();
+		nickname = _getNickname();
+		ignoredPlayers = _getIgnoredPlayers();
+		logoutLocation = _getLogoutLocation();
+		lastAccountName = _getLastAccountName();
 	}
-	private double money;
+	private BigDecimal money;
 
-	private double _getMoney()
+	private BigDecimal _getMoney()
 	{
-		double money = ess.getSettings().getStartingBalance();
+		BigDecimal result = ess.getSettings().getStartingBalance();
+		BigDecimal maxMoney = ess.getSettings().getMaxMoney();
+		BigDecimal minMoney = ess.getSettings().getMinMoney();
+
 		if (config.hasProperty("money"))
 		{
-			money = config.getDouble("money", money);
+			result = config.getBigDecimal("money", result);
 		}
-		if (Math.abs(money) > ess.getSettings().getMaxMoney())
+		if (result.compareTo(maxMoney) > 0)
 		{
-			money = money < 0 ? -ess.getSettings().getMaxMoney() : ess.getSettings().getMaxMoney();
+			result = maxMoney;
 		}
-		return money;
+		if (result.compareTo(minMoney) < 0)
+		{
+			result = minMoney;
+		}
+		return result;
 	}
 
-	public double getMoney()
+	public BigDecimal getMoney()
 	{
 		return money;
 	}
 
-	public void setMoney(double value)
+	public void setMoney(BigDecimal value, boolean throwError) throws MaxMoneyException
 	{
 		money = value;
-		if (Math.abs(money) > ess.getSettings().getMaxMoney())
+		BigDecimal maxMoney = ess.getSettings().getMaxMoney();
+		BigDecimal minMoney = ess.getSettings().getMinMoney();
+		if (money.compareTo(maxMoney) > 0)
 		{
-			money = money < 0 ? -ess.getSettings().getMaxMoney() : ess.getSettings().getMaxMoney();
+			money = maxMoney;
+			if (throwError)
+			{
+				throw new MaxMoneyException();
+			}
 		}
-		config.setProperty("money", value);
+		if (money.compareTo(minMoney) < 0)
+		{
+			money = minMoney;
+		}
+		config.setProperty("money", money);
 		config.save();
 	}
 	private Map<String, Object> homes;
 
 	private Map<String, Object> _getHomes()
 	{
-		Object o = config.getProperty("homes");
-
-		if (o instanceof Map)
+		if (config.isConfigurationSection("homes"))
 		{
-			return (Map<String, Object>)o;
-		}
-		else
-		{
-			return new HashMap<String, Object>();
+			return config.getConfigurationSection("homes").getValues(false);
 		}
+		return new HashMap<String, Object>();
+	}
 
+	private String getHomeName(String search)
+	{
+		if (NumberUtil.isInt(search))
+		{
+			try
+			{
+				search = getHomes().get(Integer.parseInt(search) - 1);
+			}
+			catch (NumberFormatException e)
+			{
+			}
+			catch (IndexOutOfBoundsException e)
+			{
+			}
+		}
+		return search;
 	}
 
 	public Location getHome(String name) throws Exception
 	{
-		Location loc = config.getLocation("homes." + name, getServer());
-		if (loc == null)
-		{
-			try
-			{
-				loc = config.getLocation("homes." + getHomes().get(Integer.parseInt(name) - 1), getServer());
-			}
-			catch (IndexOutOfBoundsException e)
-			{
-				return null;
-			}
-			catch (NumberFormatException e)
-			{
-				return null;
-			}
-		}
-
-		return loc;
+		String search = getHomeName(name);
+		return config.getLocation("homes." + search, this.getBase().getServer());
 	}
 
-	public Location getHome(Location world) throws Exception
+	public Location getHome(final Location world)
 	{
-		Location loc;
-		for (String home : getHomes())
+		try
 		{
-			loc = config.getLocation("homes." + home, getServer());
-			if (world.getWorld() == loc.getWorld())
+			if (getHomes().isEmpty())
 			{
-				return loc;
+				return null;
 			}
+			Location loc;
+			for (String home : getHomes())
+			{
+				loc = config.getLocation("homes." + home, this.getBase().getServer());
+				if (world.getWorld() == loc.getWorld())
+				{
+					return loc;
+				}
 
+			}
+			loc = config.getLocation("homes." + getHomes().get(0), this.getBase().getServer());
+			return loc;
+		}
+		catch (InvalidWorldException ex)
+		{
+			return null;
 		}
-		loc = config.getLocation("homes." + getHomes().get(0), getServer());
-		return loc;
 	}
 
 	public List<String> getHomes()
 	{
-		List<String> list = new ArrayList(homes.keySet());
-		return list;
-
+		return new ArrayList<String>(homes.keySet());
 	}
 
 	public void setHome(String name, Location loc)
 	{
 		//Invalid names will corrupt the yaml
-		name = Util.sanitizeFileName(name);
+		name = StringUtil.safeString(name);
 		homes.put(name, loc);
 		config.setProperty("homes." + name, loc);
 		config.save();
@@ -164,21 +212,20 @@ public abstract class UserData extends PlayerExtension implements IConf
 
 	public void delHome(String name) throws Exception
 	{
-		String search = name;
+		String search = getHomeName(name);
 		if (!homes.containsKey(search))
 		{
-			search = Util.sanitizeFileName(name);
+			search = StringUtil.safeString(search);
 		}
 		if (homes.containsKey(search))
 		{
-			homes.remove(name);
-			config.removeProperty("homes." + name);
+			homes.remove(search);
+			config.removeProperty("homes." + search);
 			config.save();
 		}
 		else
 		{
-			//TODO: move this message to messages file
-			throw new Exception("Home " + name + " doesn't exist");
+			throw new Exception(tl("invalidHome", search));
 		}
 	}
 
@@ -190,14 +237,21 @@ public abstract class UserData extends PlayerExtension implements IConf
 		}
 		return false;
 	}
+	private String nickname;
 
-	public String getNickname()
+	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();
 	}
@@ -205,7 +259,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 
 	private List<Integer> _getUnlimited()
 	{
-		return config.getIntList("unlimited", new ArrayList<Integer>());
+		return config.getIntegerList("unlimited");
 	}
 
 	public List<Integer> getUnlimited()
@@ -231,22 +285,15 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("unlimited", unlimited);
 		config.save();
 	}
-	private Map<Integer, Object> powertools;
+	private Map<String, Object> powertools;
 
-	@SuppressWarnings("unchecked")
-	private Map<Integer, Object> _getPowertools()
+	private Map<String, Object> _getPowertools()
 	{
-		Object o = config.getProperty("powertools");
-
-		if (o instanceof Map)
+		if (config.isConfigurationSection("powertools"))
 		{
-			return (Map<Integer, Object>)o;
+			return config.getConfigurationSection("powertools").getValues(false);
 		}
-		else
-		{
-			return new HashMap<Integer, Object>();
-		}
-
+		return new HashMap<String, Object>();
 	}
 
 	public void clearAllPowertools()
@@ -256,20 +303,27 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.save();
 	}
 
+	@SuppressWarnings("unchecked")
 	public List<String> getPowertool(ItemStack stack)
 	{
-		return (List<String>)powertools.get(stack.getTypeId());
+		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());
+			powertools.remove("" + stack.getTypeId());
 		}
 		else
 		{
-			powertools.put(stack.getTypeId(), commandList);
+			powertools.put("" + stack.getTypeId(), commandList);
 		}
 		config.setProperty("powertools", powertools);
 		config.save();
@@ -277,7 +331,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 
 	public boolean hasPowerTools()
 	{
-		return powertools.size() > 0;
+		return !powertools.isEmpty();
 	}
 	private Location lastLocation;
 
@@ -285,9 +339,9 @@ public abstract class UserData extends PlayerExtension implements IConf
 	{
 		try
 		{
-			return config.getLocation("lastlocation", getServer());
+			return config.getLocation("lastlocation", this.getBase().getServer());
 		}
-		catch (Exception e)
+		catch (InvalidWorldException e)
 		{
 			return null;
 		}
@@ -308,6 +362,35 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("lastlocation", loc);
 		config.save();
 	}
+	private Location logoutLocation;
+
+	private Location _getLogoutLocation()
+	{
+		try
+		{
+			return config.getLocation("logoutlocation", this.getBase().getServer());
+		}
+		catch (InvalidWorldException e)
+		{
+			return null;
+		}
+	}
+
+	public Location getLogoutLocation()
+	{
+		return logoutLocation;
+	}
+
+	public void setLogoutLocation(Location loc)
+	{
+		if (loc == null || loc.getWorld() == null)
+		{
+			return;
+		}
+		logoutLocation = loc;
+		config.setProperty("logoutlocation", loc);
+		config.save();
+	}
 	private long lastTeleportTimestamp;
 
 	private long _getLastTeleportTimestamp()
@@ -374,7 +457,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 
 	private List<String> _getMails()
 	{
-		return config.getStringList("mail", new ArrayList<String>());
+		return config.getStringList("mail");
 	}
 
 	public List<String> getMails()
@@ -402,53 +485,9 @@ public abstract class UserData extends PlayerExtension implements IConf
 		mails.add(mail);
 		setMails(mails);
 	}
-	private ItemStack[] savedInventory;
-
-	public ItemStack[] getSavedInventory()
-	{
-		return savedInventory;
-	}
-
-	private ItemStack[] _getSavedInventory()
-	{
-		int size = config.getInt("inventory.size", 0);
-		if (size < 1 || (getInventory() != null && size > getInventory().getSize()))
-		{
-			return null;
-		}
-		ItemStack[] is = new ItemStack[size];
-		for (int i = 0; i < size; i++)
-		{
-			is[i] = config.getItemStack("inventory." + i);
-		}
-		return is;
-	}
-
-	public void setSavedInventory(ItemStack[] is)
-	{
-		if (is == null || is.length == 0)
-		{
-			savedInventory = null;
-			config.removeProperty("inventory");
-		}
-		else
-		{
-			savedInventory = is;
-			config.setProperty("inventory.size", is.length);
-			for (int i = 0; i < is.length; i++)
-			{
-				if (is[i] == null || is[i].getType() == Material.AIR)
-				{
-					continue;
-				}
-				config.setProperty("inventory." + i, is[i]);
-			}
-		}
-		config.save();
-	}
 	private boolean teleportEnabled;
 
-	private boolean getTeleportEnabled()
+	private boolean _getTeleportEnabled()
 	{
 		return config.getBoolean("teleportenabled", true);
 	}
@@ -464,32 +503,18 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("teleportenabled", set);
 		config.save();
 	}
-
-	public boolean toggleTeleportEnabled()
-	{
-		boolean ret = !isTeleportEnabled();
-		setTeleportEnabled(ret);
-		return ret;
-	}
-
-	public boolean toggleSocialSpy()
-	{
-		boolean ret = !isSocialSpyEnabled();
-		setSocialSpyEnabled(ret);
-		return ret;
-	}
 	private List<String> ignoredPlayers;
 
-	public List<String> getIgnoredPlayers()
+	public List<String> _getIgnoredPlayers()
 	{
-		return config.getStringList("ignore", new ArrayList<String>());
+		return Collections.synchronizedList(config.getStringList("ignore"));
 	}
 
 	public void setIgnoredPlayers(List<String> players)
 	{
 		if (players == null || players.isEmpty())
 		{
-			ignoredPlayers = new ArrayList<String>();
+			ignoredPlayers = Collections.synchronizedList(new ArrayList<String>());
 			config.removeProperty("ignore");
 		}
 		else
@@ -500,26 +525,37 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.save();
 	}
 
-	public boolean isIgnoredPlayer(String name)
+	@Deprecated
+	public boolean isIgnoredPlayer(final String userName)
 	{
-		return ignoredPlayers.contains(name.toLowerCase());
+		final IUser user = ess.getUser(userName);
+		if (user == null || !user.getBase().isOnline())
+		{
+			return false;
+		}
+		return isIgnoredPlayer(user);
 	}
 
-	public void setIgnoredPlayer(String name, boolean set)
+	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(name.toLowerCase());
+			ignoredPlayers.add(user.getName().toLowerCase(Locale.ENGLISH));
 		}
 		else
 		{
-			ignoredPlayers.remove(name.toLowerCase());
+			ignoredPlayers.remove(user.getName().toLowerCase(Locale.ENGLISH));
 		}
 		setIgnoredPlayers(ignoredPlayers);
 	}
 	private boolean godmode;
 
-	private boolean getGodModeEnabled()
+	private boolean _getGodModeEnabled()
 	{
 		return config.getBoolean("godmode", false);
 	}
@@ -535,20 +571,18 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("godmode", set);
 		config.save();
 	}
-
-	public boolean toggleGodModeEnabled()
-	{
-		boolean ret = !isGodModeEnabled();
-		setGodModeEnabled(ret);
-		return ret;
-	}
 	private boolean muted;
 
-	private boolean getMuted()
+	public boolean _getMuted()
 	{
 		return config.getBoolean("muted", false);
 	}
 
+	public boolean getMuted()
+	{
+		return muted;
+	}
+
 	public boolean isMuted()
 	{
 		return muted;
@@ -560,13 +594,6 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("muted", set);
 		config.save();
 	}
-
-	public boolean toggleMuted()
-	{
-		boolean ret = !isMuted();
-		setMuted(ret);
-		return ret;
-	}
 	private long muteTimeout;
 
 	private long _getMuteTimeout()
@@ -587,7 +614,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 	}
 	private boolean jailed;
 
-	private boolean getJailed()
+	private boolean _getJailed()
 	{
 		return config.getBoolean("jailed", false);
 	}
@@ -631,12 +658,12 @@ public abstract class UserData extends PlayerExtension implements IConf
 
 	public String getBanReason()
 	{
-		return config.getString("ban.reason");
+		return config.getString("ban.reason", "");
 	}
 
 	public void setBanReason(String reason)
 	{
-		config.setProperty("ban.reason", reason);
+		config.setProperty("ban.reason", StringUtil.sanitizeString(reason));
 		config.save();
 	}
 
@@ -662,10 +689,19 @@ public abstract class UserData extends PlayerExtension implements IConf
 		return lastLogin;
 	}
 
-	public void setLastLogin(long time)
+	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;
@@ -686,9 +722,26 @@ public abstract class UserData extends PlayerExtension implements IConf
 		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()
+	private boolean _getAfk()
 	{
 		return config.getBoolean("afk", false);
 	}
@@ -698,37 +751,13 @@ public abstract class UserData extends PlayerExtension implements IConf
 		return afk;
 	}
 
-	public void setAfk(boolean set)
+	public void _setAfk(boolean set)
 	{
 		afk = set;
 		config.setProperty("afk", set);
 		config.save();
 	}
-
-	public boolean toggleAfk()
-	{
-		boolean ret = !isAfk();
-		setAfk(ret);
-		return ret;
-	}
 	private boolean newplayer;
-
-	private boolean getNew()
-	{
-		return config.getBoolean("newplayer", true);
-	}
-
-	public boolean isNew()
-	{
-		return newplayer;
-	}
-
-	public void setNew(boolean set)
-	{
-		newplayer = set;
-		config.setProperty("newplayer", set);
-		config.save();
-	}
 	private String geolocation;
 
 	private String _getGeoLocation()
@@ -784,6 +813,25 @@ public abstract class UserData extends PlayerExtension implements IConf
 	{
 		return isNPC;
 	}
+	private String lastAccountName = null;
+
+	public String getLastAccountName()
+	{
+		return lastAccountName;
+	}
+
+	public String _getLastAccountName()
+	{
+		return config.getString("lastAccountName", null);
+	}
+
+	public void setLastAccountName(String lastAccountName)
+	{
+		this.lastAccountName = lastAccountName;
+		config.setProperty("lastAccountName", lastAccountName);
+		config.save();
+		ess.getUserMap().trackUUID(base.getUniqueId(), lastAccountName);
+	}
 
 	public void setNPC(boolean set)
 	{
@@ -816,32 +864,104 @@ public abstract class UserData extends PlayerExtension implements IConf
 	{
 		return config.getBoolean("powertoolsenabled", true);
 	}
-	private Map<String, Object> kitTimestamps;
+	private Map<String, Long> kitTimestamps;
 
-	private Map<String, Object> _getKitTimestamps()
+	private Map<String, Long> _getKitTimestamps()
 	{
-		final Object map = config.getProperty("timestamps.kits");
 
-		if (map instanceof Map)
+		if (config.isConfigurationSection("timestamps.kits"))
 		{
-			return (Map<String, Object>)map;
-		}
-		else
-		{
-			return new HashMap<String, Object>();
+			final ConfigurationSection section = config.getConfigurationSection("timestamps.kits");
+			final Map<String, Long> timestamps = new HashMap<String, Long>();
+			for (String command : section.getKeys(false))
+			{
+				if (section.isLong(command))
+				{
+					timestamps.put(command.toLowerCase(Locale.ENGLISH), section.getLong(command));
+				}
+				else if (section.isInt(command))
+				{
+					timestamps.put(command.toLowerCase(Locale.ENGLISH), (long)section.getInt(command));
+				}
+			}
+			return timestamps;
 		}
+		return new HashMap<String, Long>();
 	}
 
-	public Long getKitTimestamp(final String name)
+	public long getKitTimestamp(String name)
 	{
-		final Number num = (Number)kitTimestamps.get(name.toLowerCase());
-		return num == null ? null : num.longValue();
+		name = name.replace('.', '_').replace('/', '_');
+		if (kitTimestamps != null && kitTimestamps.containsKey(name))
+		{
+			return kitTimestamps.get(name);
+		}
+		return 0l;
 	}
 
 	public void setKitTimestamp(final String name, final long time)
 	{
-		kitTimestamps.put(name.toLowerCase(), time);
+		kitTimestamps.put(name.toLowerCase(Locale.ENGLISH), time);
 		config.setProperty("timestamps.kits", kitTimestamps);
 		config.save();
 	}
+
+	public void setConfigProperty(String node, Object object)
+	{
+		final String prefix = "info.";
+		node = prefix + node;
+		if (object instanceof Map)
+		{
+			config.setProperty(node, (Map)object);
+		}
+		else if (object instanceof List)
+		{
+			config.setProperty(node, (List<String>)object);
+		}
+		else if (object instanceof Location)
+		{
+			config.setProperty(node, (Location)object);
+		}
+		else if (object instanceof ItemStack)
+		{
+			config.setProperty(node, (ItemStack)object);
+		}
+		else
+		{
+			config.setProperty(node, object);
+		}
+		config.save();
+	}
+
+	public Set<String> getConfigKeys()
+	{
+		if (config.isConfigurationSection("info"))
+		{
+			return config.getConfigurationSection("info").getKeys(true);
+		}
+		return new HashSet<String>();
+	}
+
+	public Map<String, Object> getConfigMap()
+	{
+		if (config.isConfigurationSection("info"))
+		{
+			return config.getConfigurationSection("info").getValues(true);
+		}
+		return new HashMap<String, Object>();
+	}
+
+	public Map<String, Object> getConfigMap(String node)
+	{
+		if (config.isConfigurationSection("info." + node))
+		{
+			return config.getConfigurationSection("info." + node).getValues(true);
+		}
+		return new HashMap<String, Object>();
+	}
+
+	public void save()
+	{
+		config.save();
+	}
 }

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

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

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

@@ -1,551 +0,0 @@
-package com.earth2me.essentials;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.text.MessageFormat;
-import java.util.Calendar;
-import java.util.Enumeration;
-import java.util.GregorianCalendar;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-
-
-public class Util
-{
-	private Util()
-	{
-	}
-	private final static Logger logger = Logger.getLogger("Minecraft");
-
-	public static String sanitizeFileName(String name)
-	{
-		return name.toLowerCase().replaceAll("[^a-z0-9]", "_");
-	}
-
-	public static String formatDateDiff(long date)
-	{
-		Calendar c = new GregorianCalendar();
-		c.setTimeInMillis(date);
-		Calendar now = new GregorianCalendar();
-		return Util.formatDateDiff(now, c);
-	}
-
-	public static String formatDateDiff(Calendar fromDate, Calendar toDate)
-	{
-		boolean future = false;
-		if (toDate.equals(fromDate))
-		{
-			return Util.i18n("now");
-		}
-		if (toDate.after(fromDate))
-		{
-			future = true;
-		}
-
-		StringBuilder sb = new StringBuilder();
-		int[] types = new int[]
-		{
-			Calendar.YEAR,
-			Calendar.MONTH,
-			Calendar.DAY_OF_MONTH,
-			Calendar.HOUR_OF_DAY,
-			Calendar.MINUTE,
-			Calendar.SECOND
-		};
-		String[] names = new String[]
-		{
-			Util.i18n("year"),
-			Util.i18n("years"),
-			Util.i18n("month"),
-			Util.i18n("months"),
-			Util.i18n("day"),
-			Util.i18n("days"),
-			Util.i18n("hour"),
-			Util.i18n("hours"),
-			Util.i18n("minute"),
-			Util.i18n("minutes"),
-			Util.i18n("second"),
-			Util.i18n("seconds")
-		};
-		for (int i = 0; i < types.length; i++)
-		{
-			int diff = dateDiff(types[i], fromDate, toDate, future);
-			if (diff > 0)
-			{
-				sb.append(" ").append(diff).append(" ").append(names[i * 2 + (diff > 1 ? 1 : 0)]);
-			}
-		}
-		if (sb.length() == 0)
-		{
-			return "now";
-		}
-		return sb.toString();
-	}
-
-	private static int dateDiff(int type, Calendar fromDate, Calendar toDate, boolean future)
-	{
-		int diff = 0;
-		long savedDate = fromDate.getTimeInMillis();
-		while ((future && !fromDate.after(toDate)) || (!future && !fromDate.before(toDate)))
-		{
-			savedDate = fromDate.getTimeInMillis();
-			fromDate.add(type, future ? 1 : -1);
-			diff++;
-		}
-		diff--;
-		fromDate.setTimeInMillis(savedDate);
-		return diff;
-	}
-
-	public static long parseDateDiff(String time, boolean future) throws Exception
-	{
-		Pattern timePattern = Pattern.compile(
-				"(?:([0-9]+)\\s*y[a-z]*[,\\s]*)?"
-				+ "(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?"
-				+ "(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?"
-				+ "(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?"
-				+ "(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?"
-				+ "(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?"
-				+ "(?:([0-9]+)\\s*(?:s[a-z]*)?)?", Pattern.CASE_INSENSITIVE);
-		Matcher m = timePattern.matcher(time);
-		int years = 0;
-		int months = 0;
-		int weeks = 0;
-		int days = 0;
-		int hours = 0;
-		int minutes = 0;
-		int seconds = 0;
-		boolean found = false;
-		while (m.find())
-		{
-			if (m.group() == null || m.group().isEmpty())
-			{
-				continue;
-			}
-			for (int i = 0; i < m.groupCount(); i++)
-			{
-				if (m.group(i) != null && !m.group(i).isEmpty())
-				{
-					found = true;
-					break;
-				}
-			}
-			if (found)
-			{
-				if (m.group(1) != null && !m.group(1).isEmpty())
-				{
-					years = Integer.parseInt(m.group(1));
-				}
-				if (m.group(2) != null && !m.group(2).isEmpty())
-				{
-					months = Integer.parseInt(m.group(2));
-				}
-				if (m.group(3) != null && !m.group(3).isEmpty())
-				{
-					weeks = Integer.parseInt(m.group(3));
-				}
-				if (m.group(4) != null && !m.group(4).isEmpty())
-				{
-					days = Integer.parseInt(m.group(4));
-				}
-				if (m.group(5) != null && !m.group(5).isEmpty())
-				{
-					hours = Integer.parseInt(m.group(5));
-				}
-				if (m.group(6) != null && !m.group(6).isEmpty())
-				{
-					minutes = Integer.parseInt(m.group(6));
-				}
-				if (m.group(7) != null && !m.group(7).isEmpty())
-				{
-					seconds = Integer.parseInt(m.group(7));
-				}
-				break;
-			}
-		}
-		if (!found)
-		{
-			throw new Exception(Util.i18n("illegalDate"));
-		}
-		Calendar c = new GregorianCalendar();
-		if (years > 0)
-		{
-			c.add(Calendar.YEAR, years * (future ? 1 : -1));
-		}
-		if (months > 0)
-		{
-			c.add(Calendar.MONTH, months * (future ? 1 : -1));
-		}
-		if (weeks > 0)
-		{
-			c.add(Calendar.WEEK_OF_YEAR, weeks * (future ? 1 : -1));
-		}
-		if (days > 0)
-		{
-			c.add(Calendar.DAY_OF_MONTH, days * (future ? 1 : -1));
-		}
-		if (hours > 0)
-		{
-			c.add(Calendar.HOUR_OF_DAY, hours * (future ? 1 : -1));
-		}
-		if (minutes > 0)
-		{
-			c.add(Calendar.MINUTE, minutes * (future ? 1 : -1));
-		}
-		if (seconds > 0)
-		{
-			c.add(Calendar.SECOND, seconds * (future ? 1 : -1));
-		}
-		return c.getTimeInMillis();
-	}
-
-	// The player can stand inside these materials 
-	private static final Set<Integer> AIR_MATERIALS = new HashSet<Integer>();
-	
-	static {
-		AIR_MATERIALS.add(Material.AIR.getId());
-		AIR_MATERIALS.add(Material.SAPLING.getId());
-		AIR_MATERIALS.add(Material.POWERED_RAIL.getId());
-		AIR_MATERIALS.add(Material.DETECTOR_RAIL.getId());
-		AIR_MATERIALS.add(Material.LONG_GRASS.getId());
-		AIR_MATERIALS.add(Material.DEAD_BUSH.getId());
-		AIR_MATERIALS.add(Material.YELLOW_FLOWER.getId());
-		AIR_MATERIALS.add(Material.RED_ROSE.getId());
-		AIR_MATERIALS.add(Material.BROWN_MUSHROOM.getId());
-		AIR_MATERIALS.add(Material.RED_MUSHROOM.getId());	
-		AIR_MATERIALS.add(Material.TORCH.getId());
-		AIR_MATERIALS.add(Material.REDSTONE_WIRE.getId());
-		AIR_MATERIALS.add(Material.SEEDS.getId());
-		AIR_MATERIALS.add(Material.SIGN_POST.getId());
-		AIR_MATERIALS.add(Material.WOODEN_DOOR.getId());
-		AIR_MATERIALS.add(Material.LADDER.getId());
-		AIR_MATERIALS.add(Material.RAILS.getId());
-		AIR_MATERIALS.add(Material.WALL_SIGN.getId());
-		AIR_MATERIALS.add(Material.LEVER.getId());
-		AIR_MATERIALS.add(Material.STONE_PLATE.getId());
-		AIR_MATERIALS.add(Material.IRON_DOOR_BLOCK.getId());
-		AIR_MATERIALS.add(Material.WOOD_PLATE.getId());	
-		AIR_MATERIALS.add(Material.REDSTONE_TORCH_OFF.getId());
-		AIR_MATERIALS.add(Material.REDSTONE_TORCH_ON.getId());
-		AIR_MATERIALS.add(Material.STONE_BUTTON.getId());
-		AIR_MATERIALS.add(Material.SUGAR_CANE_BLOCK.getId());		
-		AIR_MATERIALS.add(Material.DIODE_BLOCK_OFF.getId());
-		AIR_MATERIALS.add(Material.DIODE_BLOCK_ON.getId());		
-		AIR_MATERIALS.add(Material.TRAP_DOOR.getId());
-		AIR_MATERIALS.add(Material.PUMPKIN_STEM.getId());
-		AIR_MATERIALS.add(Material.MELON_STEM.getId());
-		AIR_MATERIALS.add(Material.VINE.getId());
-		//TODO: Add 1.9 materials
-				
-	}
-	
-	public static Location getSafeDestination(final Location loc) throws Exception
-	{
-		if (loc == null || loc.getWorld() == null)
-		{
-			throw new Exception(Util.i18n("destinationNotSet"));
-		}
-		final World world = loc.getWorld();
-		int x = loc.getBlockX();
-		int y = (int)Math.round(loc.getY());
-		int z = loc.getBlockZ();
-	
-		while (isBlockAboveAir(world, x, y, z))
-		{
-			y -= 1;
-			if (y < 0)
-			{
-				break;
-			}
-		}
-
-		while (isBlockUnsafe(world, x, y, z))
-		{
-			y += 1;
-			if (y >= 127)
-			{
-				x += 1;
-				break;
-			}
-		}
-		while (isBlockUnsafe(world, x, y, z))
-		{
-			y -= 1;
-			if (y <= 1)
-			{
-				y = 127;
-				x += 1;
-				if (x - 32 > loc.getBlockX())
-				{
-					throw new Exception(Util.i18n("holeInFloor"));
-				}
-			}
-		}
-		return new Location(world, x + 0.5D, y, z + 0.5D, loc.getYaw(), loc.getPitch());
-	}
-
-	private static boolean isBlockAboveAir(final World world, final int x, final int y, final int z)
-	{
-		return AIR_MATERIALS.contains(world.getBlockAt(x, y - 1, z).getType().getId());
-	}
-
-	public static boolean isBlockUnsafe(final World world, final int x, final int y, final int z)
-	{
-		final Block below = world.getBlockAt(x, y - 1, z);
-		if (below.getType() == Material.LAVA || below.getType() == Material.STATIONARY_LAVA)
-		{
-			return true;
-		}
-
-		if (below.getType() == Material.FIRE)
-		{
-			return true;
-		}
-
-		if ((!AIR_MATERIALS.contains(world.getBlockAt(x, y, z).getType().getId()))
-			|| (!AIR_MATERIALS.contains(world.getBlockAt(x, y + 1, z).getType().getId())))
-		{
-			return true;
-		}
-		return isBlockAboveAir(world, x, y, z);
-	}
-	private static DecimalFormat df = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US));
-
-	public static String formatCurrency(final double value, final IEssentials ess)
-	{
-		String str = ess.getSettings().getCurrencySymbol() + df.format(value);
-		if (str.endsWith(".00"))
-		{
-			str = str.substring(0, str.length() - 3);
-		}
-		return str;
-	}
-
-	public static double roundDouble(final double d)
-	{
-		return Math.round(d * 100.0) / 100.0;
-	}
-
-	public static Locale getCurrentLocale()
-	{
-		return currentLocale;
-	}
-
-
-	private static class ConfigClassLoader extends ClassLoader
-	{
-		private final transient File dataFolder;
-		private final transient ClassLoader cl;
-		private final transient IEssentials ess;
-
-		public ConfigClassLoader(final ClassLoader cl, final IEssentials ess)
-		{
-			this.ess = ess;
-			this.dataFolder = ess.getDataFolder();
-			this.cl = cl;
-		}
-
-		@Override
-		public URL getResource(final String string)
-		{
-			final File file = new File(dataFolder, string);
-			if (file.exists())
-			{
-				try
-				{
-					return file.toURI().toURL();
-				}
-				catch (MalformedURLException ex)
-				{
-					return cl.getResource(string);
-				}
-			}
-			return cl.getResource(string);
-		}
-
-		@Override
-		public synchronized void clearAssertionStatus()
-		{
-			cl.clearAssertionStatus();
-		}
-
-		@Override
-		public InputStream getResourceAsStream(final String string)
-		{
-			final File file = new File(dataFolder, string);
-			if (file.exists())
-			{
-				BufferedReader br = null;
-				try
-				{
-					br = new BufferedReader(new FileReader(file));
-					final String version = br.readLine();
-
-					if (version == null || !version.equals("#version: " + ess.getDescription().getVersion()))
-					{
-						logger.log(Level.WARNING, String.format("Translation file %s is not updated for Essentials version. Will use default.", file));
-						return cl.getResourceAsStream(string);
-					}
-					return new FileInputStream(file);
-				}
-				catch (IOException ex)
-				{
-					return cl.getResourceAsStream(string);
-				}
-				finally
-				{
-					if (br != null)
-					{
-						try
-						{
-							br.close();
-						}
-						catch (IOException ex)
-						{
-						}
-					}
-				}
-			}
-			return cl.getResourceAsStream(string);
-		}
-
-		@Override
-		public Enumeration<URL> getResources(final String string) throws IOException
-		{
-			return cl.getResources(string);
-		}
-
-		@Override
-		public Class<?> loadClass(final String string) throws ClassNotFoundException
-		{
-			return cl.loadClass(string);
-		}
-
-		@Override
-		public synchronized void setClassAssertionStatus(final String string, final boolean bln)
-		{
-			cl.setClassAssertionStatus(string, bln);
-		}
-
-		@Override
-		public synchronized void setDefaultAssertionStatus(final boolean bln)
-		{
-			cl.setDefaultAssertionStatus(bln);
-		}
-
-		@Override
-		public synchronized void setPackageAssertionStatus(final String string, final boolean bln)
-		{
-			cl.setPackageAssertionStatus(string, bln);
-		}
-	}
-	private static final Locale defaultLocale = Locale.getDefault();
-	private static Locale currentLocale = defaultLocale;
-	private static ResourceBundle bundle = ResourceBundle.getBundle("messages", defaultLocale);
-	private static ResourceBundle defaultBundle = ResourceBundle.getBundle("messages", Locale.US);
-
-	public static String i18n(String string)
-	{
-		try
-		{
-			return bundle.getString(string);
-		}
-		catch (MissingResourceException ex)
-		{
-			logger.log(Level.WARNING, String.format("Missing translation key \"%s\" in translation file %s", ex.getKey(), bundle.getLocale().toString()), ex);
-			return defaultBundle.getString(string);
-		}
-	}
-
-	public static String format(String string, Object... objects)
-	{
-		MessageFormat mf = new MessageFormat(i18n(string));
-		return mf.format(objects);
-	}
-
-	public static void updateLocale(String loc, IEssentials ess)
-	{
-		if (loc == null || loc.isEmpty())
-		{
-			return;
-		}
-		String[] parts = loc.split("[_\\.]");
-		if (parts.length == 1)
-		{
-			currentLocale = new Locale(parts[0]);
-		}
-		if (parts.length == 2)
-		{
-			currentLocale = new Locale(parts[0], parts[1]);
-		}
-		if (parts.length == 3)
-		{
-			currentLocale = new Locale(parts[0], parts[1], parts[2]);
-		}
-		logger.log(Level.INFO, String.format("Using locale %s", currentLocale.toString()));
-		bundle = ResourceBundle.getBundle("messages", currentLocale, new ConfigClassLoader(Util.class.getClassLoader(), ess));
-		if (!bundle.keySet().containsAll(defaultBundle.keySet()))
-		{
-			logger.log(Level.WARNING, String.format("Translation file %s does not contain all translation keys.", currentLocale.toString()));
-		}
-	}
-
-	public static String joinList(Object... list)
-	{
-		return joinList(", ", list);
-	}
-	
-	public static String joinList(String seperator, Object... list)
-	{
-		StringBuilder buf = new StringBuilder();
-		for (Object each : list)
-		{
-			if (buf.length() > 0)
-			{
-				buf.append(seperator);
-			}
-			
-			if(each instanceof List)
-			{
-				buf.append(joinList(seperator, ((List)each).toArray()));
-			}
-			else
-			{
-				try 
-				{
-					buf.append(each.toString());
-				}
-				catch (Exception e)
-				{
-					buf.append(each.toString());
-				}
-			}
-		}
-		return buf.toString();
-	}
-	
-	public static String capitalCase(String s)
-	{
-		return s.toUpperCase().charAt(0) + s.toLowerCase().substring(1);
-	}	
-}

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

@@ -1,21 +1,22 @@
 package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.commands.WarpNotFoundException;
+import com.earth2me.essentials.utils.StringUtil;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.io.IOException;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.InvalidNameException;
+import net.ess3.api.InvalidWorldException;
 import org.bukkit.Location;
 import org.bukkit.Server;
 
 
-public class Warps implements IConf
+public class Warps implements IConf, net.ess3.api.IWarps
 {
-	private static final Logger logger = Logger.getLogger("Minecraft");
+	private static final Logger logger = Logger.getLogger("Essentials");
 	private final Map<StringIgnoreCase, EssentialsConf> warpPoints = new HashMap<StringIgnoreCase, EssentialsConf>();
 	private final File warpsFolder;
 	private final Server server;
@@ -31,12 +32,14 @@ public class Warps implements IConf
 		reloadConfig();
 	}
 
+	@Override
 	public boolean isEmpty()
 	{
 		return warpPoints.isEmpty();
 	}
 
-	public Collection<String> getWarpNames()
+	@Override
+	public Collection<String> getList()
 	{
 		final List<String> keys = new ArrayList<String>();
 		for (StringIgnoreCase stringIgnoreCase : warpPoints.keySet())
@@ -47,49 +50,60 @@ public class Warps implements IConf
 		return keys;
 	}
 
-	public Location getWarp(String warp) throws Exception
+	@Override
+	public Location getWarp(String warp) throws WarpNotFoundException, InvalidWorldException
 	{
 		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(warp));
 		if (conf == null)
 		{
-			throw new Exception(Util.i18n("warpNotExist"));
+			throw new WarpNotFoundException();
 		}
 		return conf.getLocation(null, server);
 	}
 
+	@Override
 	public void setWarp(String name, Location loc) throws Exception
 	{
-		String filename = Util.sanitizeFileName(name);
+		String filename = StringUtil.sanitizeFileName(name);
 		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
 		if (conf == null)
 		{
 			File confFile = new File(warpsFolder, filename + ".yml");
 			if (confFile.exists())
 			{
-				throw new Exception(Util.i18n("similarWarpExist"));
+				throw new Exception(tl("similarWarpExist"));
 			}
 			conf = new EssentialsConf(confFile);
 			warpPoints.put(new StringIgnoreCase(name), conf);
 		}
 		conf.setProperty(null, loc);
 		conf.setProperty("name", name);
-		conf.save();
+		try
+		{
+			conf.saveWithError();
+		}
+		catch (IOException ex)
+		{
+			throw new IOException(tl("invalidWarpName"));
+		}
 	}
 
-	public void delWarp(String name) throws Exception
+	@Override
+	public void removeWarp(String name) throws Exception
 	{
 		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
 		if (conf == null)
 		{
-			throw new Exception(Util.i18n("warpNotExist"));
+			throw new Exception(tl("warpNotExist"));
 		}
 		if (!conf.getFile().delete())
 		{
-			throw new Exception(Util.i18n("warpDeleteError"));
+			throw new Exception(tl("warpDeleteError"));
 		}
 		warpPoints.remove(new StringIgnoreCase(name));
 	}
 
+	@Override
 	public final void reloadConfig()
 	{
 		warpPoints.clear();
@@ -113,13 +127,25 @@ public class Warps implements IConf
 					}
 					catch (Exception ex)
 					{
-						logger.log(Level.WARNING, Util.format("loadWarpError", filename), ex);
+						logger.log(Level.WARNING, tl("loadWarpError", filename), ex);
 					}
 				}
 			}
 		}
 	}
 
+	//This is here for future 3.x api support. Not implemented here becasue storage is handled differently
+	@Override
+	public File getWarpFile(String name) throws InvalidNameException
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public int getCount()
+	{
+		return getList().size();
+	}
 
 	private static class StringIgnoreCase
 	{
@@ -133,7 +159,7 @@ public class Warps implements IConf
 		@Override
 		public int hashCode()
 		{
-			return getString().toLowerCase().hashCode();
+			return getString().toLowerCase(Locale.ENGLISH).hashCode();
 		}
 
 		@Override

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

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

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

@@ -1,27 +1,44 @@
 package com.earth2me.essentials.api;
 
 import com.earth2me.essentials.EssentialsConf;
-import com.earth2me.essentials.IEssentials;
+import com.earth2me.essentials.EssentialsUserConf;
+import static com.earth2me.essentials.I18n.tl;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
+import static com.earth2me.essentials.api.Economy.add;
+import static com.earth2me.essentials.api.Economy.divide;
+import static com.earth2me.essentials.api.Economy.format;
+import static com.earth2me.essentials.api.Economy.getMoneyExact;
+import static com.earth2me.essentials.api.Economy.hasEnough;
+import static com.earth2me.essentials.api.Economy.hasLess;
+import static com.earth2me.essentials.api.Economy.hasMore;
+import static com.earth2me.essentials.api.Economy.multiply;
+import static com.earth2me.essentials.api.Economy.setMoney;
+import static com.earth2me.essentials.api.Economy.substract;
+import com.earth2me.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.StringUtil;
+import com.google.common.base.Charsets;
 import java.io.File;
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.bukkit.entity.Player;
+import net.ess3.api.IEssentials;
+import net.ess3.api.MaxMoneyException;
 
 
 /**
- * Instead of using this api directly, we recommend to use the register plugin:
- * http://bit.ly/RegisterMethod
+ * Instead of using this api directly, we recommend to use the register plugin: http://bit.ly/RegisterMethod
  */
-public final class Economy
+public class Economy
 {
-	private Economy()
+	public Economy()
 	{
 	}
-	private static final Logger logger = Logger.getLogger("Minecraft");
+	private static final Logger logger = Logger.getLogger("Essentials");
 	private static IEssentials ess;
 	private static final String noCallBeforeLoad = "Essentials API is called before Essentials is loaded.";
+	public static final MathContext MATH_CONTEXT = MathContext.DECIMAL128;
 
 	/**
 	 * @param aEss the ess to set
@@ -38,31 +55,20 @@ public final class Economy
 		{
 			folder.mkdirs();
 		}
-		EssentialsConf npcConfig = new EssentialsConf(new File(folder, Util.sanitizeFileName(name) + ".yml"));
+		UUID npcUUID = UUID.nameUUIDFromBytes(("NPC:" + name).getBytes(Charsets.UTF_8));
+		EssentialsUserConf npcConfig = new EssentialsUserConf(name, npcUUID, new File(folder, npcUUID.toString() + ".yml"));
 		npcConfig.load();
 		npcConfig.setProperty("npc", true);
+		npcConfig.setProperty("lastAccountName", name);
 		npcConfig.setProperty("money", ess.getSettings().getStartingBalance());
-		npcConfig.save();
+		npcConfig.forceSave();
+		ess.getUserMap().trackUUID(npcUUID, name);
 	}
 
 	private static void deleteNPC(String name)
 	{
-		File folder = new File(ess.getDataFolder(), "userdata");
-		if (!folder.exists())
-		{
-			folder.mkdirs();
-		}
-		File config = new File(folder, Util.sanitizeFileName(name) + ".yml");
-		EssentialsConf npcConfig = new EssentialsConf(config);
-		npcConfig.load();
-		if (npcConfig.hasProperty("npc") && npcConfig.getBoolean("npc", false))
-		{
-			if (!config.delete())
-			{
-				logger.log(Level.WARNING, Util.format("deleteFileError", config));
-			}
-			ess.getUserMap().removeUser(name);
-		}
+		User user = ess.getUser(name);
+		user.reset();
 	}
 
 	private static User getUserByName(String name)
@@ -71,26 +77,23 @@ public final class Economy
 		{
 			throw new RuntimeException(noCallBeforeLoad);
 		}
-		User user;
-		Player player = ess.getServer().getPlayer(name);
-		if (player != null)
-		{
-			user = ess.getUser(player);
-		}
-		else
-		{
-			user = ess.getOfflineUser(name);
-		}
-		return user;
+		return ess.getUser(name);
 	}
 
 	/**
 	 * Returns the balance of a user
+	 *
 	 * @param name Name of the user
 	 * @return balance
-	 * @throws UserDoesNotExistException 
+	 * @throws UserDoesNotExistException
 	 */
+	@Deprecated
 	public static double getMoney(String name) throws UserDoesNotExistException
+	{
+		return getMoneyExact(name).doubleValue();
+	}
+
+	public static BigDecimal getMoneyExact(String name) throws UserDoesNotExistException
 	{
 		User user = getUserByName(name);
 		if (user == null)
@@ -102,79 +105,161 @@ public final class Economy
 
 	/**
 	 * Sets the balance of a user
+	 *
 	 * @param name Name of the user
 	 * @param balance The balance you want to set
 	 * @throws UserDoesNotExistException If a user by that name does not exists
 	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
 	 */
+	@Deprecated
 	public static void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException
+	{
+		try
+		{
+			setMoney(name, BigDecimal.valueOf(balance));
+		}
+		catch (ArithmeticException e)
+		{
+			logger.log(Level.WARNING, "Failed to set balance of " + name + " to " + balance + ": " + e.getMessage(), e);
+		}
+	}
+
+	public static void setMoney(String name, BigDecimal balance) throws UserDoesNotExistException, NoLoanPermittedException
 	{
 		User user = getUserByName(name);
 		if (user == null)
 		{
 			throw new UserDoesNotExistException(name);
 		}
-		if (balance < 0.0 && !user.isAuthorized("essentials.eco.loan"))
+		if (balance.compareTo(ess.getSettings().getMinMoney()) < 0)
 		{
 			throw new NoLoanPermittedException();
 		}
-		user.setMoney(balance);
+		if (balance.signum() < 0 && !user.isAuthorized("essentials.eco.loan"))
+		{
+			throw new NoLoanPermittedException();
+		}
+		try
+		{
+			user.setMoney(balance);
+		}
+		catch (MaxMoneyException ex)
+		{
+			//TODO: Update API to show max balance errors
+		}
 	}
 
 	/**
 	 * Adds money to the balance of a user
+	 *
 	 * @param name Name of the user
 	 * @param amount The money you want to add
 	 * @throws UserDoesNotExistException If a user by that name does not exists
 	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
 	 */
+	@Deprecated
 	public static void add(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
 	{
-		double result = getMoney(name) + amount;
+		try
+		{
+			add(name, BigDecimal.valueOf(amount));
+		}
+		catch (ArithmeticException e)
+		{
+			logger.log(Level.WARNING, "Failed to add " + amount + " to balance of " + name + ": " + e.getMessage(), e);
+		}
+	}
+
+	public static void add(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
+	{
+		BigDecimal result = getMoneyExact(name).add(amount, MATH_CONTEXT);
 		setMoney(name, result);
 	}
 
 	/**
 	 * Substracts money from the balance of a user
+	 *
 	 * @param name Name of the user
 	 * @param amount The money you want to substract
 	 * @throws UserDoesNotExistException If a user by that name does not exists
 	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
 	 */
+	@Deprecated
 	public static void subtract(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
 	{
-		double result = getMoney(name) - amount;
+		try
+		{
+			substract(name, BigDecimal.valueOf(amount));
+		}
+		catch (ArithmeticException e)
+		{
+			logger.log(Level.WARNING, "Failed to substract " + amount + " of balance of " + name + ": " + e.getMessage(), e);
+		}
+	}
+
+	public static void substract(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
+	{
+		BigDecimal result = getMoneyExact(name).subtract(amount, MATH_CONTEXT);
 		setMoney(name, result);
 	}
 
 	/**
 	 * Divides the balance of a user by a value
+	 *
 	 * @param name Name of the user
 	 * @param value The balance is divided by this value
 	 * @throws UserDoesNotExistException If a user by that name does not exists
 	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
 	 */
-	public static void divide(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException
+	@Deprecated
+	public static void divide(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
 	{
-		double result = getMoney(name) / value;
+		try
+		{
+			divide(name, BigDecimal.valueOf(amount));
+		}
+		catch (ArithmeticException e)
+		{
+			logger.log(Level.WARNING, "Failed to divide balance of " + name + " by " + amount + ": " + e.getMessage(), e);
+		}
+	}
+
+	public static void divide(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
+	{
+		BigDecimal result = getMoneyExact(name).divide(amount, MATH_CONTEXT);
 		setMoney(name, result);
 	}
 
 	/**
 	 * Multiplies the balance of a user by a value
+	 *
 	 * @param name Name of the user
 	 * @param value The balance is multiplied by this value
 	 * @throws UserDoesNotExistException If a user by that name does not exists
 	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
 	 */
-	public static void multiply(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException
+	@Deprecated
+	public static void multiply(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
 	{
-		double result = getMoney(name) * value;
+		try
+		{
+			multiply(name, BigDecimal.valueOf(amount));
+		}
+		catch (ArithmeticException e)
+		{
+			logger.log(Level.WARNING, "Failed to multiply balance of " + name + " by " + amount + ": " + e.getMessage(), e);
+		}
+	}
+
+	public static void multiply(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
+	{
+		BigDecimal result = getMoneyExact(name).multiply(amount, MATH_CONTEXT);
 		setMoney(name, result);
 	}
 
 	/**
 	 * Resets the balance of a user to the starting balance
+	 *
 	 * @param name Name of the user
 	 * @throws UserDoesNotExistException If a user by that name does not exists
 	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
@@ -194,9 +279,23 @@ public final class Economy
 	 * @return true, if the user has more or an equal amount of money
 	 * @throws UserDoesNotExistException If a user by that name does not exists
 	 */
+	@Deprecated
 	public static boolean hasEnough(String name, double amount) throws UserDoesNotExistException
 	{
-		return amount <= getMoney(name);
+		try
+		{
+			return hasEnough(name, BigDecimal.valueOf(amount));
+		}
+		catch (ArithmeticException e)
+		{
+			logger.log(Level.WARNING, "Failed to compare balance of " + name + " with " + amount + ": " + e.getMessage(), e);
+			return false;
+		}
+	}
+
+	public static boolean hasEnough(String name, BigDecimal amount) throws UserDoesNotExistException, ArithmeticException
+	{
+		return amount.compareTo(getMoneyExact(name)) <= 0;
 	}
 
 	/**
@@ -205,9 +304,23 @@ public final class Economy
 	 * @return true, if the user has more money
 	 * @throws UserDoesNotExistException If a user by that name does not exists
 	 */
+	@Deprecated
 	public static boolean hasMore(String name, double amount) throws UserDoesNotExistException
 	{
-		return amount < getMoney(name);
+		try
+		{
+			return hasMore(name, BigDecimal.valueOf(amount));
+		}
+		catch (ArithmeticException e)
+		{
+			logger.log(Level.WARNING, "Failed to compare balance of " + name + " with " + amount + ": " + e.getMessage(), e);
+			return false;
+		}
+	}
+
+	public static boolean hasMore(String name, BigDecimal amount) throws UserDoesNotExistException, ArithmeticException
+	{
+		return amount.compareTo(getMoneyExact(name)) < 0;
 	}
 
 	/**
@@ -216,39 +329,69 @@ public final class Economy
 	 * @return true, if the user has less money
 	 * @throws UserDoesNotExistException If a user by that name does not exists
 	 */
+	@Deprecated
 	public static boolean hasLess(String name, double amount) throws UserDoesNotExistException
 	{
-		return amount > getMoney(name);
+		try
+		{
+			return hasLess(name, BigDecimal.valueOf(amount));
+		}
+		catch (ArithmeticException e)
+		{
+			logger.log(Level.WARNING, "Failed to compare balance of " + name + " with " + amount + ": " + e.getMessage(), e);
+			return false;
+		}
+	}
+
+	public static boolean hasLess(String name, BigDecimal amount) throws UserDoesNotExistException, ArithmeticException
+	{
+		return amount.compareTo(getMoneyExact(name)) > 0;
 	}
 
 	/**
 	 * Test if the user has a negative balance
+	 *
 	 * @param name Name of the user
 	 * @return true, if the user has a negative balance
 	 * @throws UserDoesNotExistException If a user by that name does not exists
 	 */
 	public static boolean isNegative(String name) throws UserDoesNotExistException
 	{
-		return getMoney(name) < 0.0;
+		return getMoneyExact(name).signum() < 0;
 	}
 
 	/**
-	 * Formats the amount of money like all other Essentials functions.
-	 * Example: $100000 or $12345.67
+	 * Formats the amount of money like all other Essentials functions. Example: $100000 or $12345.67
+	 *
 	 * @param amount The amount of money
 	 * @return Formatted money
 	 */
+	@Deprecated
 	public static String format(double amount)
+	{
+		try
+		{
+			return format(BigDecimal.valueOf(amount));
+		}
+		catch (NumberFormatException e)
+		{
+			logger.log(Level.WARNING, "Failed to display " + amount + ": " + e.getMessage(), e);
+			return "NaN";
+		}
+	}
+
+	public static String format(BigDecimal amount)
 	{
 		if (ess == null)
 		{
 			throw new RuntimeException(noCallBeforeLoad);
 		}
-		return Util.formatCurrency(amount, ess);
+		return NumberUtil.displayCurrency(amount, ess);
 	}
 
 	/**
 	 * Test if a player exists to avoid the UserDoesNotExistException
+	 *
 	 * @param name Name of the user
 	 * @return true, if the user exists
 	 */
@@ -259,9 +402,10 @@ public final class Economy
 
 	/**
 	 * Test if a player is a npc
+	 *
 	 * @param name Name of the player
 	 * @return true, if it's a npc
-	 * @throws UserDoesNotExistException 
+	 * @throws UserDoesNotExistException
 	 */
 	public static boolean isNPC(String name) throws UserDoesNotExistException
 	{
@@ -275,6 +419,7 @@ public final class Economy
 
 	/**
 	 * Creates dummy files for a npc, if there is no player yet with that name.
+	 *
 	 * @param name Name of the player
 	 * @return true, if a new npc was created
 	 */
@@ -290,9 +435,10 @@ public final class Economy
 	}
 
 	/**
-	 * Deletes a user, if it is marked as npc. 
+	 * Deletes a user, if it is marked as npc.
+	 *
 	 * @param name Name of the player
-	 * @throws UserDoesNotExistException 
+	 * @throws UserDoesNotExistException
 	 */
 	public static void removeNPC(String name) throws UserDoesNotExistException
 	{
@@ -304,3 +450,4 @@ public final class Economy
 		deleteNPC(name);
 	}
 }
+

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,12 +1,12 @@
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.LocationUtil;
 import org.bukkit.Location;
 import org.bukkit.Server;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.TargetBlock;
 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()
@@ -17,10 +17,13 @@ public class Commandantioch extends EssentialsCommand
 	@Override
 	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		ess.broadcastMessage(user, "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,");
-		ess.broadcastMessage(user, "who being naughty in My sight, shall snuff it.");
+		if (args.length > 0)
+		{
+			ess.broadcastMessage(user, "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,");
+			ess.broadcastMessage(user, "who being naughty in My sight, shall snuff it.");
+		}
 
-		final Location loc = new TargetBlock(user).getTargetBlock().getLocation();
+		final Location loc = LocationUtil.getTarget(user.getBase());
 		loc.getWorld().spawn(loc, TNTPrimed.class);
 	}
 }

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

@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;
 
+import static com.earth2me.essentials.I18n.tl;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
 import org.bukkit.Server;
 
 
@@ -14,11 +14,20 @@ public class Commandback extends EssentialsCommand
 	}
 
 	@Override
-	protected void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		Trade charge = new Trade(this.getName(), ess);
+		if (user.getLastLocation() == null)
+		{
+			throw new Exception(tl("noLocationFound"));
+		}
+		if (user.getWorld() != user.getLastLocation().getWorld() && ess.getSettings().isWorldTeleportPermissions()
+			&& !user.isAuthorized("essentials.worlds." + user.getLastLocation().getWorld().getName()))
+		{
+			throw new Exception(tl("noPerm", "essentials.worlds." + user.getLastLocation().getWorld().getName()));
+		}
+		final Trade charge = new Trade(this.getName(), ess);
 		charge.isAffordableFor(user);
-		user.sendMessage(Util.i18n("backUsageMsg"));
 		user.getTeleport().back(charge);
+		throw new NoChargeException();
 	}
 }

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

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

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

@@ -1,9 +1,11 @@
 package com.earth2me.essentials.commands;
 
-import org.bukkit.Server;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
-import org.bukkit.command.CommandSender;
+import com.earth2me.essentials.utils.NumberUtil;
+import java.math.BigDecimal;
+import org.bukkit.Server;
 
 
 public class Commandbalance extends EssentialsCommand
@@ -14,23 +16,34 @@ public class Commandbalance extends EssentialsCommand
 	}
 
 	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		sender.sendMessage(Util.format("balance", Util.formatCurrency(getPlayer(server, args, 0, true).getMoney(), ess)));
+
+		User target = getPlayer(server, args, 0, true, true);
+		sender.sendMessage(tl("balanceOther", target.isHidden() ? target.getName() : target.getDisplayName(), NumberUtil.displayCurrency(target.getMoney(), ess)));
 	}
 
 	@Override
-	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		double bal = (args.length < 1
-					  || !(user.isAuthorized("essentials.balance.others")
-						   || user.isAuthorized("essentials.balance.other"))
-					  ? user
-					  : getPlayer(server, args, 0, true)).getMoney();
-		user.sendMessage(Util.format("balance", Util.formatCurrency(bal, ess)));
+		if (args.length == 1 && user.isAuthorized("essentials.balance.others"))
+		{
+			final User target = getPlayer(server, args, 0, true, true);
+			final BigDecimal bal = target.getMoney();
+			user.sendMessage(tl("balanceOther", target.isHidden() ? target.getName() : target.getDisplayName(), NumberUtil.displayCurrency(bal, ess)));
+		}
+		else if (args.length < 2)
+		{
+			final BigDecimal bal = user.getMoney();
+			user.sendMessage(tl("balance", NumberUtil.displayCurrency(bal, ess)));
+		}
+		else
+		{
+			throw new NotEnoughArgumentsException();
+		}
 	}
 }

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

@@ -1,16 +1,17 @@
 package com.earth2me.essentials.commands;
 
-import java.util.Map.Entry;
-import org.bukkit.Server;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.bukkit.command.CommandSender;
+import com.earth2me.essentials.textreader.SimpleTextInput;
+import com.earth2me.essentials.textreader.TextPager;
+import com.earth2me.essentials.utils.NumberUtil;
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.bukkit.Server;
 
 
 public class Commandbalancetop extends EssentialsCommand
@@ -19,49 +20,178 @@ public class Commandbalancetop extends EssentialsCommand
 	{
 		super("balancetop");
 	}
+	private static final int CACHETIME = 2 * 60 * 1000;
+	public static final int MINUSERS = 50;
+	private static final SimpleTextInput cache = new SimpleTextInput();
+	private static long cacheage = 0;
+	private static final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
 
 	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
 	{
-		int max = 10;
+		int page = 0;
+		boolean force = false;
 		if (args.length > 0)
 		{
 			try
 			{
-				if (Integer.parseInt(args[0]) < 10)
-				{
-					max = Integer.parseInt(args[0]);
-				}
+				page = Integer.parseInt(args[0]);
 			}
 			catch (NumberFormatException ex)
 			{
-				//catch it because they tried to enter a string not number.
+				if (args[0].equalsIgnoreCase("force")
+					&& (!sender.isPlayer() || ess.getUser(sender.getPlayer()).isAuthorized("essentials.balancetop.force")))
+				{
+					force = true;
+				}
 			}
 		}
-		final Map<User, Double> balances = new HashMap<User, Double>();
-		for (User u : ess.getUserMap().getAllUsers())
-		{
-			balances.put(u, u.getMoney());
-		}
 
-		final List<Map.Entry<User, Double>> sortedEntries = new ArrayList<Map.Entry<User, Double>>(balances.entrySet());
-		Collections.sort(sortedEntries, new Comparator<Map.Entry<User, Double>>()
+		if (!force && lock.readLock().tryLock())
 		{
-			public int compare(final Entry<User, Double> entry1, final Entry<User, Double> entry2)
+			try
 			{
-				return -entry1.getValue().compareTo(entry2.getValue());
+				if (cacheage > System.currentTimeMillis() - CACHETIME)
+				{
+					outputCache(sender, page);
+					return;
+				}
+				if (ess.getUserMap().getUniqueUsers() > MINUSERS)
+				{
+					sender.sendMessage(tl("orderBalances", ess.getUserMap().getUniqueUsers()));
+				}
 			}
-		});
-		int count = 0;
-		sender.sendMessage(Util.format("balanceTop", max));
-		for (Map.Entry<User, Double> entry : sortedEntries)
+			finally
+			{
+				lock.readLock().unlock();
+			}
+			ess.runTaskAsynchronously(new Viewer(sender, page, force));
+		}
+		else
 		{
-			if (count == max)
+			if (ess.getUserMap().getUniqueUsers() > MINUSERS)
 			{
-				break;
+				sender.sendMessage(tl("orderBalances", ess.getUserMap().getUniqueUsers()));
 			}
-			sender.sendMessage(entry.getKey().getDisplayName() + ", " + Util.formatCurrency(entry.getValue(), ess));
-			count++;
+			ess.runTaskAsynchronously(new Viewer(sender, page, force));
+		}
+
+	}
+
+	private static void outputCache(final CommandSource sender, int page)
+	{
+		final Calendar cal = Calendar.getInstance();
+		cal.setTimeInMillis(cacheage);
+		final DateFormat format = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
+		sender.sendMessage(tl("balanceTop", format.format(cal.getTime())));
+		new TextPager(cache).showPage(Integer.toString(page), null, "balancetop", sender);
+	}
+
+
+	private class Calculator implements Runnable
+	{
+		private final transient Viewer viewer;
+		private final boolean force;
+
+		public Calculator(final Viewer viewer, final boolean force)
+		{
+			this.viewer = viewer;
+			this.force = force;
+		}
+
+		@Override
+		public void run()
+		{
+			lock.writeLock().lock();
+			try
+			{
+				if (force || cacheage <= System.currentTimeMillis() - CACHETIME)
+				{
+					cache.getLines().clear();
+					final Map<String, BigDecimal> balances = new HashMap<String, BigDecimal>();
+					BigDecimal totalMoney = BigDecimal.ZERO;
+					if (ess.getSettings().isEcoDisabled())
+					{
+						if (ess.getSettings().isDebug())
+						{
+							ess.getLogger().info("Internal economy functions disabled, aborting baltop.");
+						}
+					}
+					else
+					{
+						for (UUID u : ess.getUserMap().getAllUniqueUsers())
+						{
+							final User user = ess.getUserMap().getUser(u);
+							if (user != null)
+							{
+								final BigDecimal userMoney = user.getMoney();
+								user.updateMoneyCache(userMoney);
+								totalMoney = totalMoney.add(userMoney);
+								final String name = user.isHidden() ? user.getName() : user.getDisplayName();
+								balances.put(name, userMoney);
+							}
+						}
+					}
+
+					final List<Map.Entry<String, BigDecimal>> sortedEntries = new ArrayList<Map.Entry<String, BigDecimal>>(balances.entrySet());
+					Collections.sort(sortedEntries, new Comparator<Map.Entry<String, BigDecimal>>()
+					{
+						@Override
+						public int compare(final Entry<String, BigDecimal> entry1, final Entry<String, BigDecimal> entry2)
+						{
+							return entry2.getValue().compareTo(entry1.getValue());
+						}
+					});
+
+					cache.getLines().add(tl("serverTotal", NumberUtil.displayCurrency(totalMoney, ess)));
+					int pos = 1;
+					for (Map.Entry<String, BigDecimal> entry : sortedEntries)
+					{
+						cache.getLines().add(pos + ". " + entry.getKey() + ", " + NumberUtil.displayCurrency(entry.getValue(), ess));
+						pos++;
+					}
+					cacheage = System.currentTimeMillis();
+				}
+			}
+			finally
+			{
+				lock.writeLock().unlock();
+			}
+			ess.runTaskAsynchronously(viewer);
+		}
+	}
+
+
+	private class Viewer implements Runnable
+	{
+		private final transient CommandSource sender;
+		private final transient int page;
+		private final transient boolean force;
+
+		public Viewer(final CommandSource sender, final int page, final boolean force)
+		{
+			this.sender = sender;
+			this.page = page;
+			this.force = force;
+		}
+
+		@Override
+		public void run()
+		{
+			lock.readLock().lock();
+			try
+			{
+				if (!force && cacheage > System.currentTimeMillis() - CACHETIME)
+				{
+					outputCache(sender, page);
+					return;
+				}
+			}
+			finally
+			{
+				lock.readLock().unlock();
+			}
+			ess.runTaskAsynchronously(new Calculator(new Viewer(sender, page, false), force));
 		}
 	}
 }

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

@@ -1,12 +1,13 @@
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.CommandSource;
 import com.earth2me.essentials.Console;
+import static com.earth2me.essentials.I18n.tl;
 import com.earth2me.essentials.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
-import org.bukkit.entity.Player;
+import com.earth2me.essentials.utils.FormatUtil;
+import java.util.logging.Level;
+import org.bukkit.Server;
 
 
 public class Commandban extends EssentialsCommand
@@ -17,52 +18,61 @@ public class Commandban extends EssentialsCommand
 	}
 
 	@Override
-	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
 	{
+		boolean nomatch = false;
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		final User player = getPlayer(server, args, 0, true);
-		if (player.getBase() instanceof OfflinePlayer)
+		User user;
+		try
 		{
-			if (sender instanceof Player
-				&& !ess.getUser(sender).isAuthorized("essentials.ban.offline"))
+			user = getPlayer(server, args, 0, true, true);
+		}
+		catch (PlayerNotFoundException e)
+		{
+			nomatch = true;
+			user = ess.getUser(new OfflinePlayer(args[0], ess.getServer()));
+		}
+		if (!user.getBase().isOnline())
+		{
+			if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.ban.offline"))
 			{
-				sender.sendMessage(Util.i18n("banExempt"));
-				return;
+				throw new Exception(tl("banExemptOffline"));
 			}
 		}
 		else
 		{
-			if (player.isAuthorized("essentials.ban.exempt"))
+			if (user.isAuthorized("essentials.ban.exempt") && sender.isPlayer())
 			{
-				sender.sendMessage(Util.i18n("banExempt"));
-				return;
+				throw new Exception(tl("banExempt"));
 			}
 		}
 
+		final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
 		String banReason;
 		if (args.length > 1)
 		{
-			banReason = getFinalArg(args, 1);
-			player.setBanReason(banReason);
+			banReason = FormatUtil.replaceFormat(getFinalArg(args, 1).replace("\\n", "\n").replace("|", "\n"));
 		}
 		else
 		{
-			banReason = Util.i18n("defaultBanReason");
+			banReason = tl("defaultBanReason");
 		}
-		player.setBanned(true);
-		player.kickPlayer(banReason);
-		String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
-		
-		for(Player p : server.getOnlinePlayers())
+
+		user.setBanReason(tl("banFormat", banReason, senderName));
+		user.getBase().setBanned(true);
+		user.setBanTimeout(0);
+		user.getBase().kickPlayer(tl("banFormat", banReason, senderName));
+
+		server.getLogger().log(Level.INFO, tl("playerBanned", senderName, user.getName(), banReason));
+
+		if (nomatch)
 		{
-			User u = ess.getUser(p);
-			if(u.isAuthorized("essentials.ban.notify"))
-			{
-			p.sendMessage(Util.format("playerBanned", senderName, player.getName(), banReason));
-			}
+			sender.sendMessage(tl("userUnknown", user.getName()));
 		}
+
+		ess.broadcastMessage("essentials.ban.notify", tl("playerBanned", senderName, user.getName(), banReason));
 	}
 }

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

@@ -1,9 +1,12 @@
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.CommandSource;
+import com.earth2me.essentials.Console;
+import static com.earth2me.essentials.I18n.tl;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.FormatUtil;
+import java.util.logging.Level;
 import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandbanip extends EssentialsCommand
@@ -14,24 +17,41 @@ public class Commandbanip extends EssentialsCommand
 	}
 
 	@Override
-	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
 
-		final User u = ess.getUser(args[0]);
+		final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
 
-		if (u == null)
+		String ipAddress;
+		if (FormatUtil.validIP(args[0]))
 		{
-			ess.getServer().banIP(args[0]);
-			sender.sendMessage(Util.i18n("banIpAddress"));
+			ipAddress = args[0];
 		}
 		else
 		{
-			ess.getServer().banIP(u.getAddress().getAddress().getHostAddress());
-			sender.sendMessage(Util.i18n("banIpAddress"));
+			try
+			{
+				User player = getPlayer(server, args, 0, true, true);
+				ipAddress = player.getLastLoginAddress();
+			}
+			catch (PlayerNotFoundException ex)
+			{
+				ipAddress = args[0];
+			}
 		}
+
+		if (ipAddress.isEmpty())
+		{
+			throw new PlayerNotFoundException();
+		}
+
+		ess.getServer().banIP(ipAddress);
+		server.getLogger().log(Level.INFO, tl("playerBanIpAddress", senderName, ipAddress));
+
+		ess.broadcastMessage("essentials.ban.notify", tl("playerBanIpAddress", senderName, ipAddress));
 	}
 }

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

@@ -1,11 +1,11 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.TargetBlock;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.LocationUtil;
+import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.TreeType;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
-import org.bukkit.Location;
 
 
 public class Commandbigtree extends EssentialsCommand
@@ -16,7 +16,7 @@ public class Commandbigtree extends EssentialsCommand
 	}
 
 	@Override
-	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
 		TreeType tree;
 		if (args.length > 0 && args[0].equalsIgnoreCase("redwood"))
@@ -27,25 +27,25 @@ 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();
 		}
 
-		final int[] ignore =
-		{
-			8, 9
-		};		
-		final Location loc = (new TargetBlock(user, 300, 0.2, ignore)).getTargetBlock().getLocation();
-		final Location safeLocation = Util.getSafeDestination(loc);
-		final boolean success = user.getWorld().generateTree(safeLocation, (TreeType)tree);
+		final Location loc = LocationUtil.getTarget(user.getBase());
+		final Location safeLocation = LocationUtil.getSafeDestination(loc);
+		final boolean success = user.getWorld().generateTree(safeLocation, tree);
 		if (success)
 		{
-			user.sendMessage(Util.i18n("bigTreeSuccess"));
+			user.sendMessage(tl("bigTreeSuccess"));
 		}
 		else
 		{
-			throw new Exception(Util.i18n("bigTreeFailure"));
+			throw new Exception(tl("bigTreeFailure"));
 		}
 	}
 }

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

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

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

@@ -0,0 +1,48 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.block.Block;
+import org.bukkit.event.block.BlockBreakEvent;
+
+
+public class Commandbreak extends EssentialsCommand
+{
+	public Commandbreak()
+	{
+		super("break");
+	}
+
+	//TODO: Switch to use util class
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		final Block block = user.getBase().getTargetBlock(null, 20);
+		if (block == null)
+		{
+			throw new NoChargeException();
+		}
+		if (block.getType() == Material.AIR)
+		{
+			throw new NoChargeException();
+		}
+		if (block.getType() == Material.BEDROCK && !user.isAuthorized("essentials.break.bedrock"))
+		{
+			throw new Exception(tl("noBreakBedrock"));
+		}
+		//final List<ItemStack> list = (List<ItemStack>)block.getDrops();		
+		//final BlockBreakEvent event = new BlockBreakEvent(block, user.getBase(), list);
+		final BlockBreakEvent event = new BlockBreakEvent(block, user.getBase());
+		server.getPluginManager().callEvent(event);
+		if (event.isCancelled())
+		{
+			throw new NoChargeException();
+		}
+		else
+		{
+			block.setType(Material.AIR);
+		}
+	}
+}

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

@@ -1,9 +1,10 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.CommandSource;
+import static com.earth2me.essentials.I18n.tl;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.FormatUtil;
 import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 
 public class Commandbroadcast extends EssentialsCommand
@@ -14,14 +15,24 @@ public class Commandbroadcast extends EssentialsCommand
 	}
 
 	@Override
-	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		sendBroadcast(user.getDisplayName(), args);
+	}
+
+	@Override
+	public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	{
+		sendBroadcast(sender.getSender().getName(), args);
+	}
+
+	private void sendBroadcast(final String name, final String[] args) throws NotEnoughArgumentsException
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
 
-		ess.broadcastMessage(null,
-							 Util.format("broadcast", getFinalArg(args, 0)));
+		ess.broadcastMessage(tl("broadcast", FormatUtil.replaceFormat(getFinalArg(args, 0)).replace("\\n", "\n"), name));
 	}
 }

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

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

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

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

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

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

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

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

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

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