Bump version to 2.16.1

Add #version line to allow automatic items.json updates
Remove Vault repo
2026-11-05 17:12:42 -05:00 · 2019-03-01 22:45:25 +00:00 · 2019-03-01 12:04:08 +00:00 · 2019-03-01 11:41:29 +00:00 · 2019-03-01 11:32:46 +00:00 · 2019-02-22 18:10:36 +00:00
618 changed files with 83352 additions and 86387 deletions
@@ -1,7 +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/Permissions3.jar"/>
-</classpath>
@@ -0,0 +1,45 @@
+---
+name: Help!
+about: Encountered a problem with EssentialsX? Not sure how to fix it?
+
+---
+
+<!-- EssentialsX help guide
+
+Don't write inside the arrows as they will be hidden when you post your issue.
+
+Want faster support? Come join our Discord server to get help sooner:
+https://discord.gg/F7gexAQ
+
+If you're happy to wait (or you were sent here from Discord), read on:
+
+1.  Fill out the template.
+      This will help us understand what problem you've encountered and help us
+      find a solution.
+
+2.  Check the Common Issues page.
+      Read through the wiki page to see if you've encountered a regular issue:
+      https://essentialsx.github.io/#/Common-Issues
+
+3.  Delete this line and all above lines before posting your issue!       -->
+
+### Information
+
+Full output of `/ess version`:
+
+<!-- Replace this with the command output -->
+
+**Server log:** <!-- Upload `logs/latest.log` to https://gist.github.com/ -->
+
+**EssentialsX config** <!-- Upload `plugins/Essentials/config.yml` to https://gist.github.com/ -->
+
+### Help request
+
+**Problem**
+<!-- What problem did you encounter? -->
+
+**What I have tried**
+<!-- What have you tried so far? -->
+
+**Screenshots**
+<!-- If relevant, include any screenshots here. -->
@@ -0,0 +1,58 @@
+---
+name: Report a bug
+about: Report an EssentialsX bug. Only use this if you're 100% sure there's something wrong with EssentialsX - otherwise, try "Help!".
+
+---
+
+<!-- EssentialsX bug reporting guide
+
+Don't put anything inside this block, as it won't be included in the issue.
+
+If you are reporting a bug, please follow the following steps:
+
+1.  Fill out the template in full.
+      Run the commands in the console. Don't just put "latest" as a version,
+      or we will ignore it.
+
+2.  When linking files, do not attach them to the post!
+      Copy and paste any logs into https://gist.github.com/, then paste a
+      link to them in the relevant parts of the template. Avoid using
+      Hastebin or Pastebin, as this makes providing support more difficult.
+      **DO NOT drag files into this box!**
+
+3.  If you are reporting a performance issue, please include a link to a
+    Timings and/or profiler report.
+
+4.  If you are reporting a bug with commands or something else in-game,
+    please include screenshots to help us diagnose the problem.
+
+5.  Make sure not to write between the arrows, as anything there will be
+    hidden.
+
+6.  Delete this line and all above lines before posting your issue!       -->
+
+### Information
+
+**Full output of `/ess version`**:
+
+```
+<!-- Run the command in your console, and copy and paste the whole output here -->
+```
+
+**Server log**: <!-- Upload `logs/latest.log` to https://gist.github.com/, replace this with link -->
+
+**EssentialsX config**: <!-- Upload `plugins/Essentials/config.yml` to https://gist.github.com/, replace this with link -->
+
+### Details
+
+**Description**  
+<!-- Replace this with a brief summary of the bug. -->
+
+**Steps to reproduce**  
+<!-- Replace this with exactly what you did to cause the bug. -->
+
+**Expected behavior**  
+<!-- Replace this with what you expected to happen. -->
+
+**Screenshots**  
+<!-- Replace this with screenshots, if necessary. -->
@@ -0,0 +1,45 @@
+---
+name: Request a feature
+about: Suggest a feature you want to see in EssentialsX!
+
+---
+
+<!-- EssentialsX feature request guide
+
+Fill out the template. Don't write inside the arrows as they will be hidden
+when you post your issue.
+
+Not sure if your feature fits in EssentialsX? Feel free to ask on our Discord
+server: https://discord.gg/F7gexAQ
+
+If you have a feature suggestion for EssentialsX, read the following tips:
+
+1.  Fill out the template.
+      This will help us understand what you're requesting and why you want us
+      to add it.
+
+2.  Keep it simple.
+      Make sure it's easy to understand what you're requesting. A good way is
+      to keep it to one request per GitHub issue, as we can then easily track
+      feature requests.
+
+3.  Check whether it has already been asked or added.
+      You can search the issue tracker to see if your feature has already been
+      requested at https://github.com/EssentialsX/Essentials/issues. You can
+      also check the wiki at https://essentialsx.github.io/ to see if the
+      feature was recently added.
+
+4.  Ask yourself: "Does this belong in EssentialsX?"
+      There are lots of features that we reject because most servers won't
+      need or use them. If your feature is very specific or already exists in
+      another plugin, it might not be a good fit for EssentialsX.
+
+5.  Delete this line and all above lines before posting your issue!       -->
+
+### Feature request
+
+**Feature description**
+<!-- What feature are you suggesting? -->
+
+**How the feature is useful**
+<!-- How is the feature useful to players, server owners and/or developers? -->
@@ -1,47 +1,18 @@
-.DS_Store
-/BuildAll/nbproject/private/
-/EssentialsProtect/nbproject/private/
-/EssentialsChat/nbproject/private/
-/EssentialsGroupBridge/nbproject/private/
-/EssentialsGeoIP/nbproject/private/
-/EssentialsSpawn/nbproject/private/
-/EssentialsXMPP/nbproject/private/
-/EssentialsGroupManager/nbproject/private/
-/BuildAll/build/
-/EssentialsGroupBridge/dist/
-/EssentialsGroupBridge/build/
-/EssentialsGeoIP/dist/
-/EssentialsGeoIP/build/
-/EssentialsGroupManager/build/
-/EssentialsGroupManager/dist/
-/BuildAll/dist/
-/EssentialsChat/build/
-/EssentialsChat/dist/
-/EssentialsSpawn/build/
-/EssentialsSpawn/dist/
-/EssentialsXMPP/dist/
-/EssentialsXMPP/build/
-/EssentialsProtect/dist/
-/EssentialsProtect/build/
-/EssentialsPermissionsCommands/nbproject/private/
-/EssentialsPermissionsCommands/build/
-/EssentialsPermissionsCommands/dist/
-/Essentials/nbproject/private/
-/Essentials/dist/
-/Essentials/build/
-/YamlAnnotations/
-/EssentialsUpdate/nbproject/private/
-/EssentialsRelease/
-/EssentialsUpdate/dist/
-/EssentialsUpdate/build/
-/WebPush/apikey.php
-/WebPush/nbproject/private
-/.idea
-*.iml
-/EssentialsGroupManager/bin
-/EssentialsGroupManager/.externalToolBuilders
-/EssentialsAntiBuild/nbproject/private/
-/EssentialsAntiBuild/dist/
-/EssentialsAntiBuild/build/
-/jars
-/out
+# IDE files
+*.classpath
+*.project
+*.settings/
+.idea/
+*.iml
+.DS_Store
+
+# Essentials files
+/Essentials/userdata
+/Essentials/config.yml
+/Essentials/kits.yml
+/Essentials/userdata/testplayer1.yml
+/Essentials/usermap.csv
+
+# Build files
+target/
+jars/
@@ -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>
@@ -0,0 +1,10 @@
+language: java
+
+cache:
+  directories:
+  - .buildtools
+  - $HOME/.m2
+
+before_install:
+  - chmod +x scripts/buildtools.sh
+  - scripts/buildtools.sh
@@ -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>
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=b4df970c
-build.xml.script.CRC32=7a797370
-build.xml.stylesheet.CRC32=28e38971@1.50.3.46
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=b4df970c
-nbproject/build-impl.xml.script.CRC32=8905537e
-nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46
@@ -1,132 +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.EssentialsAntiBuild.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}
-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.EssentialsAntiBuild=../EssentialsAntiBuild
-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.EssentialsAntiBuild.jar=${project.EssentialsAntiBuild}/dist/EssentialsAntiBuild.jar
-reference.EssentialsProtect.jar=${project.EssentialsProtect}/dist/EssentialsProtect.jar
-reference.EssentialsSpawn.jar=${project.EssentialsSpawn}/dist/EssentialsSpawn.jar
-reference.EssentialsXMPP.jar=${project.EssentialsXMPP}/dist/EssentialsXMPP.jar
-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
@@ -1,92 +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>EssentialsAntiBuild</foreign-project>
-                <artifact-type>jar</artifact-type>
-                <script>build.xml</script>
-                <target>jar</target>
-                <clean-target>clean</clean-target>
-                <id>jar</id>
-            </reference>
-            <reference>
-                <foreign-project>EssentialsProtect</foreign-project>
-                <artifact-type>jar</artifact-type>
-                <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>
@@ -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>
@@ -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=7c507372
-nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46
-nbproject/profiler-build-impl.xml.data.CRC32=ab78ce15
-nbproject/profiler-build-impl.xml.script.CRC32=abda56ed
-nbproject/profiler-build-impl.xml.stylesheet.CRC32=f10cf54c@1.11.1
@@ -1,3 +0,0 @@
-DoNotUseThreads
-LongVariable
-SignatureDeclareThrowsException
@@ -1,152 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=true
-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.importGroupsOrder=*
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
-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.separateImportGroups=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
-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.bpermissions2.jar=../lib/bpermissions2.jar
-file.reference.bukkit.jar=../lib/bukkit.jar
-file.reference.iCo4.jar=../lib/iCo4.jar
-file.reference.iCo5.jar=../lib/iCo5.jar
-file.reference.iCo6.jar=../lib/iCo6.jar
-file.reference.lombok.jar=../lib/lombok-0.10.8.jar
-file.reference.MultiCurrency.jar=../lib/MultiCurrency.jar
-file.reference.Permissions3.jar=../lib/Permissions3.jar
-file.reference.PermissionsBukkit-1.2.jar=../lib/PermissionsBukkit-1.2.jar
-file.reference.PermissionsEx.jar=../lib/PermissionsEx.jar
-file.reference.Privileges.jar=..\\lib\\Privileges.jar
-file.reference.Vault.jar=../lib/Vault.jar
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.compress=true
-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.jar}:\
-    ${reference.EssentialsGroupManager.jar}:\
-    ${file.reference.bukkit.jar}:\
-    ${file.reference.Vault.jar}:\
-    ${file.reference.Privileges.jar}:\
-    ${file.reference.bpermissions2.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=-Xlint:unchecked
-javac.deprecation=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.6
-javac.target=1.6
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit_4.10.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.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
@@ -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>
@@ -0,0 +1,118 @@
+<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>EssentialsXParent</artifactId>
+        <version>2.16.1</version>
+    </parent>
+
+    <artifactId>EssentialsX</artifactId>
+
+    <build>
+        <finalName>EssentialsX-${full.version}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
+                <configuration>
+                    <showDeprecation>false</showDeprecation>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <relocations>
+                        <relocation>
+                            <pattern>io.papermc.lib</pattern>
+                            <shadedPattern>com.earth2me.essentials.paperlib</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>net.milkbowl.vault</groupId>
+            <artifactId>VaultAPI</artifactId>
+            <version>1.7</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.papermc</groupId>
+            <artifactId>paperlib</artifactId>
+            <version>1.0.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.ess3</groupId>
+            <artifactId>NMSProvider</artifactId>
+            <version>2.16.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.ess3</groupId>
+            <artifactId>UpdatedMetaProvider</artifactId>
+            <version>2.16.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.ess3</groupId>
+            <artifactId>1_8_R1Provider</artifactId>
+            <version>2.16.1</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bukkit</groupId>
+                    <artifactId>craftbukkit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>net.ess3</groupId>
+            <artifactId>1_8_R2Provider</artifactId>
+            <version>2.16.1</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bukkit</groupId>
+                    <artifactId>craftbukkit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>net.ess3</groupId>
+            <artifactId>LegacyProvider</artifactId>
+            <version>2.16.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.ess3</groupId>
+            <artifactId>ReflectionProvider</artifactId>
+            <version>2.16.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.ess3</groupId>
+            <artifactId>FlattenedProvider</artifactId>
+            <version>2.16.1</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>
@@ -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
@@ -1,137 +1,113 @@
 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;

+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;

-public class AlternativeCommandsHandler
-{
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private final transient Map<String, List<PluginCommand>> altcommands = new HashMap<String, List<PluginCommand>>();
-	private final transient Map<String, String> disabledList = new HashMap<String, String>();
-	private final transient IEssentials ess;

-	public AlternativeCommandsHandler(final IEssentials ess)
-	{
-		this.ess = ess;
-		for (Plugin plugin : ess.getServer().getPluginManager().getPlugins())
-		{
-			if (plugin.isEnabled())
-			{
-				addPlugin(plugin);
-			}
-		}
-	}
+public class AlternativeCommandsHandler {
+    private static final Logger LOGGER = Logger.getLogger("Essentials");
+    private final transient Map<String, List<PluginCommand>> altcommands = new HashMap<>();
+    private final transient Map<String, String> disabledList = new HashMap<>();
+    private final transient IEssentials ess;

-	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);
+    public AlternativeCommandsHandler(final IEssentials ess) {
+        this.ess = ess;
+        for (Plugin plugin : ess.getServer().getPluginManager().getPlugins()) {
+            if (plugin.isEnabled()) {
+                addPlugin(plugin);
+            }
+        }
+    }

-		for (Command command : commands)
-		{
-			final PluginCommand pc = (PluginCommand)command;
-			final List<String> labels = new ArrayList<String>(pc.getAliases());
-			labels.add(pc.getName());
+    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);

-			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);
-				}
-			}
-		}
-	}
+        for (Command command : commands) {
+            final PluginCommand pc = (PluginCommand) command;
+            final List<String> labels = new ArrayList<>(pc.getAliases());
+            labels.add(pc.getName());

-	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();
-			}
-		}
-	}
+            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<>();
+                    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 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 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 void executed(final String label, final String otherLabel)
-	{
-		if (ess.getSettings().isDebug())
-		{
-			LOGGER.log(Level.INFO, "Essentials: Alternative command " + label + " found, using " + otherLabel);
-		}
-		disabledList.put(label, otherLabel);
-	}
+    public 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 Map<String, String> disabledCommands()
-	{
-		return disabledList;
-	}
+    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;
+    }
 }
@@ -1,140 +1,132 @@
 package com.earth2me.essentials;

-import static com.earth2me.essentials.I18n._;
+import net.ess3.api.IEssentials;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
+
+import static com.earth2me.essentials.I18n.tl;


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

-	public Backup(final IEssentials ess)
-	{
-		this.ess = ess;
-		server = ess.getServer();
-		if (server.getOnlinePlayers().length > 0)
-		{
-			startTask();
-		}
-	}
+    public Backup(final IEssentials ess) {
+        this.ess = ess;
+        server = ess.getServer();
+        if (!ess.getOnlinePlayers().isEmpty()) {
+            ess.runTaskAsynchronously(new Runnable() {
+                @Override
+                public void run() {
+                    startTask();
+                }
+            });
+        }
+    }

-	void onPlayerJoin()
-	{
-		startTask();
-	}
+    public void onPlayerJoin() {
+        startTask();
+    }

-	private void startTask()
-	{
-		if (!running)
-		{
-			final long interval = ess.getSettings().getBackupInterval() * 1200; // minutes -> ticks
-			if (interval < 1200)
-			{
-				return;
-			}
-			taskId = ess.scheduleSyncRepeatingTask(this, interval, interval);
-			running = true;
-		}
-	}
+    public synchronized void stopTask() {
+        running = false;
+        if (taskId != -1) {
+            server.getScheduler().cancelTask(taskId);
+        }
+        taskId = -1;
+    }

-	@Override
-	public void run()
-	{
-		if (active)
-		{
-			return;
-		}
-		active = true;
-		final String command = ess.getSettings().getBackupCommand();
-		if (command == null || "".equals(command))
-		{
-			return;
-		}
-		if ("save-all".equalsIgnoreCase(command)) {
-			final CommandSender cs = server.getConsoleSender();
-			server.dispatchCommand(cs, "save-all");
-			active = false;
-			return;
-		}
-		LOGGER.log(Level.INFO, _("backupStarted"));
-		final CommandSender cs = server.getConsoleSender();
-		server.dispatchCommand(cs, "save-all");
-		server.dispatchCommand(cs, "save-off");
+    private synchronized void startTask() {
+        if (!running) {
+            final long interval = ess.getSettings().getBackupInterval() * 1200; // minutes -> ticks
+            if (interval < 1200) {
+                return;
+            }
+            taskId = ess.scheduleSyncRepeatingTask(this, interval, interval);
+            running = true;
+        }
+    }

-		ess.scheduleAsyncDelayedTask(
-				new Runnable()
-				{
-					@Override
-					public void run()
-					{
-						try
-						{
-							final ProcessBuilder childBuilder = new ProcessBuilder(command);
-							childBuilder.redirectErrorStream(true);
-							childBuilder.directory(ess.getDataFolder().getParentFile().getParentFile());
-							final Process child = childBuilder.start();
-							final BufferedReader reader = new BufferedReader(new InputStreamReader(child.getInputStream()));
-							try
-							{
-								child.waitFor();
-								String line;
-								do
-								{
-									line = reader.readLine();
-									if (line != null)
-									{
-										LOGGER.log(Level.INFO, line);
-									}
-								}
-								while (line != null);
-							}
-							finally
-							{
-								reader.close();
-							}
-						}
-						catch (InterruptedException ex)
-						{
-							LOGGER.log(Level.SEVERE, null, ex);
-						}
-						catch (IOException ex)
-						{
-							LOGGER.log(Level.SEVERE, null, ex);
-						}
-						finally
-						{
-							ess.scheduleSyncDelayedTask(
-									new Runnable()
-									{
-										@Override
-										public void run()
-										{
-											server.dispatchCommand(cs, "save-on");
-											if (server.getOnlinePlayers().length == 0)
-											{
-												running = false;
-												if (taskId != -1)
-												{
-													server.getScheduler().cancelTask(taskId);
-												}
-											}
-											active = false;
-											LOGGER.log(Level.INFO, _("backupFinished"));
-										}
-									});
-						}
-					}
-				});
-	}
+    @Override
+    public void run() {
+        if (active) {
+            return;
+        }
+        active = true;
+        final String command = ess.getSettings().getBackupCommand();
+        if (command == null || "".equals(command)) {
+            return;
+        }
+        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.runTaskAsynchronously(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    final ProcessBuilder childBuilder = new ProcessBuilder(command);
+                    childBuilder.redirectErrorStream(true);
+                    childBuilder.directory(ess.getDataFolder().getParentFile().getParentFile());
+                    final Process child = childBuilder.start();
+                    ess.runTaskAsynchronously(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                final BufferedReader reader = new BufferedReader(new InputStreamReader(child.getInputStream()));
+                                try {
+                                    String line;
+                                    do {
+                                        line = reader.readLine();
+                                        if (line != null) {
+                                            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 {
+                    class BackupEnableSaveTask implements Runnable {
+                        @Override
+                        public void run() {
+                            server.dispatchCommand(cs, "save-on");
+                            if (ess.getOnlinePlayers().isEmpty()) {
+                                stopTask();
+                            }
+                            active = false;
+                            LOGGER.log(Level.INFO, tl("backupFinished"));
+                        }
+                    }
+                    ess.scheduleSyncDelayedTask(new BackupEnableSaveTask());
+                }
+            }
+        });
+    }
 }
@@ -1,15 +1,12 @@
 package com.earth2me.essentials;


-public class ChargeException extends Exception
-{
-	public ChargeException(final String message)
-	{
-		super(message);
-	}
+public class ChargeException extends Exception {
+    public ChargeException(final String message) {
+        super(message);
+    }

-	public ChargeException(final String message, final Throwable throwable)
-	{
-		super(message, throwable);
-	}
+    public ChargeException(final String message, final Throwable throwable) {
+        super(message, throwable);
+    }
 }
@@ -0,0 +1,39 @@
+package com.earth2me.essentials;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class CommandSource {
+    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);
+        }
+    }
+}
@@ -1,38 +1,77 @@
 package com.earth2me.essentials;

+import com.earth2me.essentials.messaging.IMessageRecipient;
+import com.earth2me.essentials.messaging.SimpleMessageRecipient;
+
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;


-public final class Console implements IReplyTo
-{
-	private static Console instance = new Console();
-	private CommandSender replyTo;
-	public final static String NAME = "Console";
+public final class Console implements IMessageRecipient {
+    public static final String NAME = "Console";
+    private static Console instance; // Set in essentials
+    
+    private final IEssentials ess;
+    private final IMessageRecipient messageRecipient;

-	private Console()
-	{
-	}
+    public static Console getInstance() {
+        return instance;
+    }

-	public static CommandSender getCommandSender(Server server) throws Exception
-	{
-		return server.getConsoleSender();
-	}
+    static void setInstance(IEssentials ess) { // Called in Essentials#onEnable()
+        instance = new Console(ess);
+    }
+    
+    /**
+     * @deprecated Use {@link Console#getCommandSender()}
+     */
+    @Deprecated
+    public static CommandSender getCommandSender(Server server) throws Exception {
+        return server.getConsoleSender();
+    }

-	@Override
-	public void setReplyTo(CommandSender user)
-	{
-		replyTo = user;
-	}
+    private Console(IEssentials ess) {
+        this.ess = ess;
+        this.messageRecipient = new SimpleMessageRecipient(ess, this);
+    }

-	@Override
-	public CommandSender getReplyTo()
-	{
-		return replyTo;
-	}
+    public CommandSender getCommandSender() {
+        return ess.getServer().getConsoleSender();
+    }

-	public static Console getConsoleReplyTo()
-	{
-		return instance;
-	}
+    @Override public String getName() {
+        return Console.NAME;
+    }
+
+    @Override public String getDisplayName() {
+        return Console.NAME;
+    }
+
+    @Override public void sendMessage(String message) {
+        getCommandSender().sendMessage(message);
+    }
+
+    @Override public boolean isReachable() {
+        return true;
+    }
+    
+    /* ================================
+     * >> DELEGATE METHODS
+     * ================================ */
+
+    @Override public MessageResponse sendMessage(IMessageRecipient recipient, String message) {
+        return this.messageRecipient.sendMessage(recipient, message);
+    }
+
+    @Override public MessageResponse onReceiveMessage(IMessageRecipient sender, String message) {
+        return this.messageRecipient.onReceiveMessage(sender, message);
+    }
+
+    @Override public IMessageRecipient getReplyRecipient() {
+        return this.messageRecipient.getReplyRecipient();
+    }
+
+    @Override public void setReplyRecipient(IMessageRecipient recipient) {
+        this.messageRecipient.setReplyRecipient(recipient);
+    }
 }
@@ -1,298 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-
-/**
- * This utility class is used for converting between the ingame time in ticks to ingame time as a friendly string. Note
- * that the time is INGAME.
- *
- * http://www.minecraftwiki.net/wiki/Day/night_cycle
- *
- * @author Olof Larsson
- */
-public final class DescParseTickFormat
-{
-	// ============================================
-	// First some information vars. TODO: Should this be in a config file?
-	// --------------------------------------------
-	public static final Map<String, Integer> nameToTicks = new LinkedHashMap<String, Integer>();
-	public static final Set<String> resetAliases = new HashSet<String>();
-	public static final int ticksAtMidnight = 18000;
-	public static final int ticksPerDay = 24000;
-	public static final int ticksPerHour = 1000;
-	public static final double ticksPerMinute = 1000d / 60d;
-	public static final double ticksPerSecond = 1000d / 60d / 60d;
-	private static final SimpleDateFormat SDFTwentyFour = new SimpleDateFormat("HH:mm", Locale.ENGLISH);
-	private static final SimpleDateFormat SDFTwelve = new SimpleDateFormat("h:mmaa", Locale.ENGLISH);
-
-	static
-	{
-		SDFTwentyFour.setTimeZone(TimeZone.getTimeZone("GMT"));
-		SDFTwelve.setTimeZone(TimeZone.getTimeZone("GMT"));
-
-		nameToTicks.put("sunrise", 23000);
-		nameToTicks.put("dawn", 23000);
-
-		nameToTicks.put("daystart", 0);
-		nameToTicks.put("day", 0);
-
-		nameToTicks.put("morning", 1000);
-
-		nameToTicks.put("midday", 6000);
-		nameToTicks.put("noon", 6000);
-
-		nameToTicks.put("afternoon", 9000);
-
-		nameToTicks.put("sunset", 12000);
-		nameToTicks.put("dusk", 12000);
-		nameToTicks.put("sundown", 12000);
-		nameToTicks.put("nightfall", 12000);
-
-		nameToTicks.put("nightstart", 14000);
-		nameToTicks.put("night", 14000);
-
-		nameToTicks.put("midnight", 18000);
-
-		resetAliases.add("reset");
-		resetAliases.add("normal");
-		resetAliases.add("default");
-	}
-
-	private DescParseTickFormat()
-	{
-	}
-
-	// ============================================
-	// PARSE. From describing String to int
-	// --------------------------------------------
-	public static long parse(String desc) throws NumberFormatException
-	{
-		// Only look at alphanumeric and lowercase and : for 24:00
-		desc = desc.toLowerCase(Locale.ENGLISH).replaceAll("[^A-Za-z0-9:]", "");
-
-		// Detect ticks format
-		try
-		{
-			return parseTicks(desc);
-		}
-		catch (Exception e)
-		{
-		}
-
-		// Detect 24-hour format
-		try
-		{
-			return parse24(desc);
-		}
-		catch (Exception e)
-		{
-		}
-
-		// Detect 12-hour format
-		try
-		{
-			return parse12(desc);
-		}
-		catch (Exception e)
-		{
-		}
-
-		// Detect aliases
-		try
-		{
-			return parseAlias(desc);
-		}
-		catch (Exception e)
-		{
-		}
-
-		// Well we failed to understand...
-		throw new NumberFormatException();
-	}
-
-	public static long parseTicks(String desc) throws NumberFormatException
-	{
-		if (!desc.matches("^[0-9]+ti?c?k?s?$"))
-		{
-			throw new NumberFormatException();
-		}
-
-		desc = desc.replaceAll("[^0-9]", "");
-
-		return Long.parseLong(desc) % 24000;
-	}
-
-	public static long parse24(String desc) throws NumberFormatException
-	{
-		if (!desc.matches("^[0-9]{2}[^0-9]?[0-9]{2}$"))
-		{
-			throw new NumberFormatException();
-		}
-
-		desc = desc.toLowerCase(Locale.ENGLISH).replaceAll("[^0-9]", "");
-
-		if (desc.length() != 4)
-		{
-			throw new NumberFormatException();
-		}
-
-		final int hours = Integer.parseInt(desc.substring(0, 2));
-		final int minutes = Integer.parseInt(desc.substring(2, 4));
-
-		return hoursMinutesToTicks(hours, minutes);
-	}
-
-	public static long parse12(String desc) throws NumberFormatException
-	{
-		if (!desc.matches("^[0-9]{1,2}([^0-9]?[0-9]{2})?(pm|am)$"))
-		{
-			throw new NumberFormatException();
-		}
-
-		int hours = 0;
-		int minutes = 0;
-
-		desc = desc.toLowerCase(Locale.ENGLISH);
-		String parsetime = desc.replaceAll("[^0-9]", "");
-
-		if (parsetime.length() > 4)
-		{
-			throw new NumberFormatException();
-		}
-
-		if (parsetime.length() == 4)
-		{
-			hours += Integer.parseInt(parsetime.substring(0, 2));
-			minutes += Integer.parseInt(parsetime.substring(2, 4));
-		}
-		else if (parsetime.length() == 3)
-		{
-			hours += Integer.parseInt(parsetime.substring(0, 1));
-			minutes += Integer.parseInt(parsetime.substring(1, 3));
-		}
-		else if (parsetime.length() == 2)
-		{
-			hours += Integer.parseInt(parsetime.substring(0, 2));
-		}
-		else if (parsetime.length() == 1)
-		{
-			hours += Integer.parseInt(parsetime.substring(0, 1));
-		}
-		else
-		{
-			throw new NumberFormatException();
-		}
-
-		if (desc.endsWith("pm") && hours != 12)
-		{
-			hours += 12;
-		}
-
-		if (desc.endsWith("am") && hours == 12)
-		{
-			hours -= 12;
-		}
-
-		return hoursMinutesToTicks(hours, minutes);
-	}
-
-	public static long hoursMinutesToTicks(final int hours, final int minutes)
-	{
-		long ret = ticksAtMidnight;
-		ret += (hours) * ticksPerHour;
-
-		ret += (minutes / 60.0) * ticksPerHour;
-
-		ret %= ticksPerDay;
-		return ret;
-	}
-
-	public static long parseAlias(final String desc) throws NumberFormatException
-	{
-		final Integer ret = nameToTicks.get(desc);
-		if (ret == null)
-		{
-			throw new NumberFormatException();
-		}
-
-		return ret;
-	}
-
-	public static boolean meansReset(final String desc)
-	{
-		return resetAliases.contains(desc);
-	}
-
-	// ============================================
-	// FORMAT. From int to describing String
-	// --------------------------------------------
-	public static String format(final long ticks)
-	{
-		return _("timeFormat", format24(ticks), format12(ticks), formatTicks(ticks));
-	}
-
-	public static String formatTicks(final long ticks)
-	{
-		return (ticks % ticksPerDay) + "ticks";
-	}
-
-	public static String format24(final long ticks)
-	{
-		synchronized (SDFTwentyFour)
-		{
-			return formatDateFormat(ticks, SDFTwentyFour);
-		}
-	}
-
-	public static String format12(final long ticks)
-	{
-		synchronized (SDFTwelve)
-		{
-			return formatDateFormat(ticks, SDFTwelve);
-		}
-	}
-
-	public static String formatDateFormat(final long ticks, final SimpleDateFormat format)
-	{
-		final Date date = ticksToDate(ticks);
-		return format.format(date);
-	}
-
-	public static Date ticksToDate(long ticks)
-	{
-		// Assume the server time starts at 0. It would start on a day.
-		// But we will simulate that the server started with 0 at midnight.
-		ticks = ticks - ticksAtMidnight + ticksPerDay;
-
-		// How many ingame days have passed since the server start?
-		final long days = ticks / ticksPerDay;
-		ticks -= days * ticksPerDay;
-
-		// How many hours on the last day?
-		final long hours = ticks / ticksPerHour;
-		ticks -= hours * ticksPerHour;
-
-		// How many minutes on the last day?
-		final long minutes = (long)Math.floor(ticks / ticksPerMinute);
-		final double dticks = ticks - minutes * ticksPerMinute;
-
-		// How many seconds on the last day?
-		final long seconds = (long)Math.floor(dticks / ticksPerSecond);
-
-		// Now we create an english GMT calendar (We wan't no daylight savings)
-		final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"), Locale.ENGLISH);
-		cal.setLenient(true);
-
-		// And we set the time to 0! And append the time that passed!
-		cal.set(0, Calendar.JANUARY, 1, 0, 0, 0);
-		cal.add(Calendar.DAY_OF_YEAR, (int)days);
-		cal.add(Calendar.HOUR_OF_DAY, (int)hours);
-		cal.add(Calendar.MINUTE, (int)minutes);
-		cal.add(Calendar.SECOND, (int)seconds + 1); // To solve rounding errors.
-
-		return cal.getTime();
-	}
-}
@@ -1,157 +1,269 @@
 package com.earth2me.essentials;

+import org.bukkit.NamespacedKey;
+import org.bukkit.enchantments.Enchantment;
+
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.regex.Pattern;
-import org.bukkit.enchantments.Enchantment;


-public class Enchantments
-{
-	private static final transient Pattern NUMPATTERN = Pattern.compile("\\d+");
-	private static final Map<String, Enchantment> ENCHANTMENTS = new HashMap<String, Enchantment>();
-	private static final Map<String, Enchantment> ALIASENCHANTMENTS = new HashMap<String, 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>();
+    private static boolean isFlat;

-	static
-	{
-		ENCHANTMENTS.put("alldamage", Enchantment.DAMAGE_ALL);
-		ALIASENCHANTMENTS.put("alldmg", Enchantment.DAMAGE_ALL);
-		ENCHANTMENTS.put("sharpness", Enchantment.DAMAGE_ALL);
-		ENCHANTMENTS.put("sharp", Enchantment.DAMAGE_ALL);
-		ALIASENCHANTMENTS.put("dal", Enchantment.DAMAGE_ALL);
-				
-		ENCHANTMENTS.put("ardmg", Enchantment.DAMAGE_ARTHROPODS);
-		ENCHANTMENTS.put("baneofarthropods", Enchantment.DAMAGE_ARTHROPODS);
-		ALIASENCHANTMENTS.put("baneofarthropod", Enchantment.DAMAGE_ARTHROPODS);
-		ALIASENCHANTMENTS.put("arthropod", Enchantment.DAMAGE_ARTHROPODS);
-		ALIASENCHANTMENTS.put("dar", Enchantment.DAMAGE_ARTHROPODS);
-		
-		ENCHANTMENTS.put("undeaddamage", Enchantment.DAMAGE_UNDEAD);
-		ENCHANTMENTS.put("smite", Enchantment.DAMAGE_UNDEAD);
-		ALIASENCHANTMENTS.put("du", Enchantment.DAMAGE_UNDEAD);
-		
-		ENCHANTMENTS.put("digspeed", Enchantment.DIG_SPEED);
-		ENCHANTMENTS.put("efficiency", Enchantment.DIG_SPEED);
-		ALIASENCHANTMENTS.put("minespeed", Enchantment.DIG_SPEED);
-		ALIASENCHANTMENTS.put("cutspeed", Enchantment.DIG_SPEED);
-		ALIASENCHANTMENTS.put("ds", Enchantment.DIG_SPEED);
-		
-		ENCHANTMENTS.put("durability", Enchantment.DURABILITY);
-		ENCHANTMENTS.put("dura", Enchantment.DURABILITY);
-		ENCHANTMENTS.put("unbreaking", Enchantment.DURABILITY);
-		ALIASENCHANTMENTS.put("d", Enchantment.DURABILITY);
-		
-		ENCHANTMENTS.put("fireaspect", Enchantment.FIRE_ASPECT);
-		ENCHANTMENTS.put("fire", Enchantment.FIRE_ASPECT);
-		ALIASENCHANTMENTS.put("meleefire", Enchantment.FIRE_ASPECT);
-		ALIASENCHANTMENTS.put("meleeflame", Enchantment.FIRE_ASPECT);
-		ALIASENCHANTMENTS.put("fa", Enchantment.FIRE_ASPECT);
-		
-		ENCHANTMENTS.put("knockback", Enchantment.KNOCKBACK);
-		ALIASENCHANTMENTS.put("k", Enchantment.KNOCKBACK);
-		
-		ALIASENCHANTMENTS.put("blockslootbonus", Enchantment.LOOT_BONUS_BLOCKS);
-		ENCHANTMENTS.put("fortune", 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);
-		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);
-		ENCHANTMENTS.put("featherfalling", Enchantment.PROTECTION_FALL);
-		ALIASENCHANTMENTS.put("pfa", Enchantment.PROTECTION_FALL);
-		
-		ALIASENCHANTMENTS.put("fireprotection", Enchantment.PROTECTION_FIRE);
-		ALIASENCHANTMENTS.put("flameprotection", Enchantment.PROTECTION_FIRE);
-		ENCHANTMENTS.put("fireprotect", Enchantment.PROTECTION_FIRE);
-		ALIASENCHANTMENTS.put("flameprotect", Enchantment.PROTECTION_FIRE);
-		ENCHANTMENTS.put("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);
-	}
-	
-	public static Enchantment getByName(String name) {
-		Enchantment enchantment;
-		if (NUMPATTERN.matcher(name).matches()) {
-			enchantment = Enchantment.getById(Integer.parseInt(name));
-		} else {
-			enchantment = Enchantment.getByName(name.toUpperCase(Locale.ENGLISH));
-		}
-		if (enchantment == null)
-		{
-			enchantment = ENCHANTMENTS.get(name.toLowerCase(Locale.ENGLISH));
-		}
-		if (enchantment == null)
-		{
-			enchantment = ALIASENCHANTMENTS.get(name.toLowerCase(Locale.ENGLISH));
-		}
-		return 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);

-	public static Set<Entry<String, Enchantment>> entrySet()
-	{
-		return ENCHANTMENTS.entrySet();
-	}
+        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);
+
+        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);
+
+        // 1.8
+        try {
+            Enchantment depthStrider = Enchantment.getByName("DEPTH_STRIDER");
+            if (depthStrider != null) {
+                ENCHANTMENTS.put("depthstrider", depthStrider);
+                ALIASENCHANTMENTS.put("depth", depthStrider);
+                ALIASENCHANTMENTS.put("strider", depthStrider);
+            }
+        } catch (IllegalArgumentException ignored) {}
+
+        // 1.9
+        try {
+            Enchantment frostWalker = Enchantment.getByName("FROST_WALKER");
+            if (frostWalker != null) {
+                ENCHANTMENTS.put("frostwalker", frostWalker);
+                ALIASENCHANTMENTS.put("frost", frostWalker);
+                ALIASENCHANTMENTS.put("walker", frostWalker);
+            }
+
+            Enchantment mending = Enchantment.getByName("MENDING");
+            if (mending != null) {
+                ENCHANTMENTS.put("mending", mending);
+            }
+        } catch (IllegalArgumentException ignored) {}
+
+        // 1.11
+        try {
+            Enchantment bindingCurse = Enchantment.getByName("BINDING_CURSE");
+            if (bindingCurse != null) {
+                ENCHANTMENTS.put("bindingcurse", bindingCurse);
+                ALIASENCHANTMENTS.put("bindcurse", bindingCurse);
+                ALIASENCHANTMENTS.put("binding", bindingCurse);
+                ALIASENCHANTMENTS.put("bind", bindingCurse);
+            }
+            Enchantment vanishingCurse = Enchantment.getByName("VANISHING_CURSE");
+            if (vanishingCurse != null) {
+                ENCHANTMENTS.put("vanishingcurse", vanishingCurse);
+                ALIASENCHANTMENTS.put("vanishcurse", vanishingCurse);
+                ALIASENCHANTMENTS.put("vanishing", vanishingCurse);
+                ALIASENCHANTMENTS.put("vanish", vanishingCurse);
+            }
+            Enchantment sweeping = Enchantment.getByName("SWEEPING_EDGE");
+            if (sweeping != null) {
+                ENCHANTMENTS.put("sweepingedge", sweeping);
+                ALIASENCHANTMENTS.put("sweepedge", sweeping);
+                ALIASENCHANTMENTS.put("sweeping", sweeping);
+            }
+        } catch (IllegalArgumentException ignored) {}
+
+
+        try { // 1.13
+            Enchantment loyalty = Enchantment.getByName("LOYALTY");
+            if (loyalty != null) {
+                ENCHANTMENTS.put("loyalty", loyalty);
+                ALIASENCHANTMENTS.put("loyal", loyalty);
+                ALIASENCHANTMENTS.put("return", loyalty);
+            }
+            Enchantment impaling = Enchantment.getByName("IMPALING");
+            if (impaling != null) {
+                ENCHANTMENTS.put("impaling", impaling);
+                ALIASENCHANTMENTS.put("impale", impaling);
+                ALIASENCHANTMENTS.put("oceandamage", impaling);
+                ALIASENCHANTMENTS.put("oceandmg", impaling);
+            }
+            Enchantment riptide = Enchantment.getByName("RIPTIDE");
+            if (riptide != null) {
+                ENCHANTMENTS.put("riptide", riptide);
+                ALIASENCHANTMENTS.put("rip", riptide);
+                ALIASENCHANTMENTS.put("tide", riptide);
+                ALIASENCHANTMENTS.put("launch", riptide);
+            }
+            Enchantment channelling = Enchantment.getByName("CHANNELING");
+            if (channelling != null) {
+                ENCHANTMENTS.put("channelling", channelling);
+                ALIASENCHANTMENTS.put("chanelling", channelling);
+                ALIASENCHANTMENTS.put("channeling", channelling);
+                ALIASENCHANTMENTS.put("chaneling", channelling);
+                ALIASENCHANTMENTS.put("channel", channelling);
+            }
+        } catch (IllegalArgumentException ignored) {}
+
+        try {
+            Class<?> namespacedKeyClass = Class.forName("org.bukkit.NamespacedKey");
+            Class<?> enchantmentClass = Class.forName("org.bukkit.enchantments.Enchantment");
+            enchantmentClass.getDeclaredMethod("getByKey", namespacedKeyClass);
+            isFlat = true;
+        } catch (ClassNotFoundException | NoSuchMethodException e) {
+            isFlat = false;
+        }
+    }
+
+    public static Enchantment getByName(String name) {
+        Enchantment enchantment = null;
+        if (isFlat) { // 1.13+ only
+            enchantment = Enchantment.getByKey(NamespacedKey.minecraft(name.toLowerCase()));
+        }
+
+        if (enchantment == null) {
+            enchantment = Enchantment.getByName(name.toUpperCase());
+        }
+        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();
+    }
+
+    public static Set<String> keySet() {
+        return ENCHANTMENTS.keySet();
+    }
 }
@@ -1,46 +1,64 @@
 package com.earth2me.essentials;

+import com.earth2me.essentials.utils.EnumUtil;
+import com.earth2me.essentials.utils.LocationUtil;
+import com.earth2me.essentials.utils.MaterialUtil;
+import net.ess3.api.IEssentials;
 import org.bukkit.GameMode;
+import org.bukkit.Material;
+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;

+import java.util.Locale;

-public class EssentialsBlockListener implements Listener
-{
-	private final transient IEssentials ess;

-	public EssentialsBlockListener(final IEssentials ess)
-	{
-		this.ess = ess;
-	}
+public class EssentialsBlockListener implements Listener {
+    private final transient IEssentials ess;

-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onBlockPlace(final BlockPlaceEvent event)
-	{
-		// Do not rely on getItemInHand();
-		// http://leaky.bukkit.org/issues/663		
-		final ItemStack is = Util.convertBlockToItem(event.getBlockPlaced());
-		if (is == null)
-		{
-			return;
-		}
-		final User user = ess.getUser(event.getPlayer());
-		final boolean unlimitedForUser = user.hasUnlimited(is);
-		if (unlimitedForUser && user.getGameMode() == GameMode.SURVIVAL)
-		{
-			ess.scheduleSyncDelayedTask(
-					new Runnable()
-					{
-						@Override
-						public void run()
-						{
-							user.getInventory().addItem(is);
-							user.updateInventory();
-						}
-					});
-		}
-	}
+    public EssentialsBlockListener(final IEssentials ess) {
+        this.ess = ess;
+    }
+
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    public void onBlockPlace(final BlockPlaceEvent event) {
+        // Do not rely on getItemInHand();
+        // http://leaky.bukkit.org/issues/663
+        final ItemStack is = LocationUtil.convertBlockToItem(event.getBlockPlaced());
+
+        if (is == null) {
+            return;
+        }
+
+        if (is.getType() == MaterialUtil.SPAWNER && event.getItemInHand() != null && event.getPlayer() != null && event.getItemInHand().getType() == MaterialUtil.SPAWNER) {
+            final BlockState blockState = event.getBlockPlaced().getState();
+            if (blockState instanceof CreatureSpawner) {
+                final CreatureSpawner spawner = (CreatureSpawner) blockState;
+                final EntityType type = ess.getSpawnerProvider().getEntityType(event.getItemInHand());
+                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);
+                        spawner.update();
+                    }
+                }
+            }
+        }
+
+        final User user = ess.getUser(event.getPlayer());
+        if (user.hasUnlimited(is) && user.getBase().getGameMode() == GameMode.SURVIVAL) {
+            class UnlimitedItemSpawnTask implements Runnable {
+                @Override
+                public void run() {
+                    user.getBase().getInventory().addItem(is);
+                    user.getBase().updateInventory();
+                }
+            }
+            ess.scheduleSyncDelayedTask(new UnlimitedItemSpawnTask());
+        }
+    }
 }
@@ -1,200 +1,211 @@
 package com.earth2me.essentials;

-import static com.earth2me.essentials.I18n._;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import 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.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.event.entity.*;
+import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.inventory.ItemStack;

+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Pattern;

-public class EssentialsEntityListener implements Listener
-{
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private final IEssentials ess;
+import static com.earth2me.essentials.I18n.tl;

-	public EssentialsEntityListener(IEssentials ess)
-	{
-		this.ess = ess;
-	}

-	// This method does something undocumented reguarding certain bucket types #EasterEgg
-	@EventHandler(priority = EventPriority.LOW)
-	public void onEntityDamage(final EntityDamageByEntityEvent event)
-	{
-		final Entity eAttack = event.getDamager();
-		final Entity eDefend = event.getEntity();
-		if (eDefend instanceof Player && eAttack instanceof Player)
-		{
-			final User defender = ess.getUser(eDefend);
-			final User attacker = ess.getUser(eAttack);
-			onPlayerVsPlayerDamage(event, defender, attacker);
-			onPlayerVsPlayerPowertool(event, defender, attacker);
-		}
-		else if (eDefend instanceof Player && eAttack instanceof Projectile)
-		{
-			Entity shooter = ((Projectile)event.getDamager()).getShooter();
-			if (shooter instanceof Player)
-			{
-				final User defender = ess.getUser(eDefend);
-				final User attacker = ess.getUser(shooter);
-				onPlayerVsPlayerDamage(event, defender, attacker);
-				onPlayerVsPlayerPowertool(event, defender, attacker);
-			}
-		}
-		else if (eAttack instanceof Player)
-		{
-			final User player = ess.getUser(eAttack);
-			player.updateActivity(true);
-			if (eDefend instanceof Ageable)
-			{
-				final ItemStack hand = player.getItemInHand();
-				if (hand != null && hand.getType() == Material.MILK_BUCKET)
-				{
-					((Ageable)eDefend).setBaby();
-					hand.setType(Material.BUCKET);
-					player.setItemInHand(hand);
-					player.updateInventory();
-					event.setCancelled(true);
-				}
-			}
-		}
-	}
+public class EssentialsEntityListener implements Listener {
+    private static final Logger LOGGER = Logger.getLogger("Essentials");
+    private static final transient Pattern powertoolPlayer = Pattern.compile("\\{player\\}");
+    private final IEssentials ess;

-	private void onPlayerVsPlayerDamage(final EntityDamageByEntityEvent event, final User defender, final User attacker)
-	{
-		if (ess.getSettings().getLoginAttackDelay() > 0 && !attacker.isAuthorized("essentials.pvpdelay.exempt")
-			&& (System.currentTimeMillis() < (attacker.getLastLogin() + ess.getSettings().getLoginAttackDelay())))
-		{
-			event.setCancelled(true);
-		}
+    public EssentialsEntityListener(IEssentials ess) {
+        this.ess = ess;
+    }

-		if (attacker.hasInvulnerabilityAfterTeleport() || defender.hasInvulnerabilityAfterTeleport())
-		{
-			event.setCancelled(true);
-		}
+    // This method does something undocumented reguarding certain bucket types #EasterEgg
+    @EventHandler(priority = EventPriority.LOW)
+    public void onEntityDamage(final EntityDamageByEntityEvent event) {
+        final Entity eAttack = event.getDamager();
+        final Entity eDefend = event.getEntity();
+        if (eAttack instanceof Player) {
+            final User attacker = ess.getUser((Player) eAttack);
+            if (eDefend instanceof Player) {
+                onPlayerVsPlayerDamage(event, (Player) eDefend, attacker);
+            } else if (eDefend instanceof Ageable) {
+                final ItemStack hand = attacker.getBase().getItemInHand();
+                if (ess.getSettings().isMilkBucketEasterEggEnabled()
+                        && hand != null && hand.getType() == Material.MILK_BUCKET) {
+                    ((Ageable) eDefend).setBaby();
+                    hand.setType(Material.BUCKET);
+                    attacker.getBase().setItemInHand(hand);
+                    attacker.getBase().updateInventory();
+                    event.setCancelled(true);
+                }
+            }
+            attacker.updateActivityOnInteract(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.updateActivityOnInteract(true);
+            }
+        }
+    }

-		if (attacker.isGodModeEnabled() && !attacker.isAuthorized("essentials.god.pvp"))
-		{
-			event.setCancelled(true);
-		}
+    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 (attacker.isHidden() && !attacker.isAuthorized("essentials.vanish.pvp"))
-		{
-			event.setCancelled(true);
-		}
+        if (!defender.equals(attacker.getBase()) && (attacker.hasInvulnerabilityAfterTeleport() || ess.getUser(defender).hasInvulnerabilityAfterTeleport())) {
+            event.setCancelled(true);
+        }

-		attacker.updateActivity(true);
-	}
+        if (attacker.isGodModeEnabled() && !attacker.isAuthorized("essentials.god.pvp")) {
+            event.setCancelled(true);
+        }

-	private void onPlayerVsPlayerPowertool(final EntityDamageByEntityEvent event, final User defender, final User attacker)
-	{
-		final List<String> commandList = attacker.getPowertool(attacker.getItemInHand());
-		if (commandList != null && !commandList.isEmpty())
-		{
-			for (final String command : commandList)
-			{
-				if (command != null && !command.isEmpty())
-				{
-					ess.scheduleSyncDelayedTask(
-							new Runnable()
-							{
-								@Override
-								public void run()
-								{
-									attacker.getServer().dispatchCommand(attacker.getBase(), command.replaceAll("\\{player\\}", defender.getName()));
-									LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", attacker.getName(), command));
-								}
-							});
+        if (attacker.isHidden() && !attacker.isAuthorized("essentials.vanish.pvp")) {
+            event.setCancelled(true);
+        }

-					event.setCancelled(true);
-					return;
-				}
-			}
-		}
-	}
+        if (attacker.arePowerToolsEnabled()) {
+            onPlayerVsPlayerPowertool(event, defender, attacker);
+        }
+    }

-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onEntityDamage(final EntityDamageEvent event)
-	{
-		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
-		{
-			final Player player = (Player)event.getEntity();
-			player.setFireTicks(0);
-			player.setRemainingAir(player.getMaximumAir());
-			event.setCancelled(true);
-		}
-	}
+    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)) {

-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onEntityCombust(final EntityCombustEvent event)
-	{
-		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
-		{
-			event.setCancelled(true);
-		}
-	}
+                    class PowerToolInteractTask implements Runnable {
+                        @Override
+                        public void run() {
+                            attacker.getServer().dispatchCommand(attacker.getBase(), command);
+                            LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", attacker.getName(), command));
+                        }
+                    }
+                    ess.scheduleSyncDelayedTask(new PowerToolInteractTask());

-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onPlayerDeathEvent(final PlayerDeathEvent event)
-	{
-		final User user = ess.getUser(event.getEntity());
-		if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back"))
-		{
-			user.setLastLocation();
-			user.sendMessage(_("backAfterDeath"));
-		}
-		if (!ess.getSettings().areDeathMessagesEnabled())
-		{
-			event.setDeathMessage("");
-		}
-	}
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        }
+    }

-	@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 onEntityDamage(final EntityDamageEvent event) {
+        if (event.getEntity() instanceof Player && ess.getUser((Player) event.getEntity()).isGodModeEnabled()) {
+            final Player player = (Player) event.getEntity();
+            player.setFireTicks(0);
+            player.setRemainingAir(player.getMaximumAir());
+            event.setCancelled(true);
+        }
+    }

-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onFoodLevelChange(final FoodLevelChangeEvent event)
-	{
-		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
-		{
-			event.setCancelled(true);
-		}
-	}
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    public void onEntityCombust(final EntityCombustEvent event) {
+        if (event.getEntity() instanceof Player && ess.getUser((Player) event.getEntity()).isGodModeEnabled()) {
+            event.setCancelled(true);
+        }
+    }

-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onEntityRegainHealth(final EntityRegainHealthEvent event)
-	{
-		if (event.getRegainReason() == RegainReason.SATIATED && event.getEntity() instanceof Player
-			&& ess.getUser(event.getEntity()).isAfk() && ess.getSettings().getFreezeAfkPlayers())
-		{
-			event.setCancelled(true);
-		}
-	}
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onEntityCombustByEntity(final EntityCombustByEntityEvent event) {
+        if (event.getCombuster() instanceof Arrow && event.getEntity() instanceof Player) {
+            Arrow combuster = (Arrow) event.getCombuster();
+            if (combuster.getShooter() instanceof Player) {
+                final User srcCombuster = ess.getUser(((Player) combuster.getShooter()).getUniqueId());
+                if (srcCombuster.isGodModeEnabled() && !srcCombuster.isAuthorized("essentials.god.pvp")) {
+                    event.setCancelled(true);
+                }
+                if (srcCombuster.isHidden() && !srcCombuster.isAuthorized("essentials.vanish.pvp")) {
+                    event.setCancelled(true);
+                }
+            }
+        }
+    }

-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onPotionSplashEvent(final PotionSplashEvent event)
-	{
-		for (LivingEntity entity : event.getAffectedEntities())
-		{
-			if (entity instanceof Player && ess.getUser(entity).isGodModeEnabled())
-			{
-				event.setIntensity(entity, 0d);
-			}
-		}
-	}
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onPlayerDeathEvent(final PlayerDeathEvent event) {
+        final User user = ess.getUser(event.getEntity());
+        if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back")) {
+            user.setLastLocation();
+            user.sendMessage(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()) {
+                if (user.isGodModeEnabledRaw()) {
+                    user.getBase().setFoodLevel(20);
+                    user.getBase().setSaturation(10);
+                }
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    public void onEntityRegainHealth(final EntityRegainHealthEvent event) {
+        if (event.getRegainReason() == RegainReason.SATIATED && event.getEntity() instanceof Player && ess.getUser((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.updateActivityOnInteract(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    public void onEntityTarget(EntityTargetEvent event) {
+        if (event.getTarget() instanceof Player) {
+            final User user = ess.getUser((Player) event.getTarget());
+            if (user.isVanished()) {
+                event.setCancelled(true);
+            }
+        }
+    }
 }
@@ -1,56 +1,50 @@
 package com.earth2me.essentials;

-import java.util.logging.Level;
+import com.earth2me.essentials.register.payment.Methods;
+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 java.util.logging.Level;

-public class EssentialsPluginListener implements Listener, IConf
-{
-	private final transient IEssentials ess;
-	
-	public EssentialsPluginListener(final IEssentials ess)
-	{
-		this.ess = ess;
-	}

-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPluginEnable(final PluginEnableEvent event)
-	{
-		if (event.getPlugin().getName().equals("EssentialsChat")) {
-			ess.getSettings().setEssentialsChatActive(true);
-		}
-		ess.getPermissionsHandler().checkPermissions();
-		ess.getAlternativeCommandsHandler().addPlugin(event.getPlugin());
-		if (!ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().setMethod(ess.getServer().getPluginManager()))
-		{
-			ess.getLogger().log(Level.INFO, "Payment method found (" + ess.getPaymentMethod().getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
-		}
-	}
+public class EssentialsPluginListener implements Listener, IConf {
+    private final transient IEssentials ess;

-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPluginDisable(final PluginDisableEvent event)
-	{
-		if (event.getPlugin().getName().equals("EssentialsChat")) {
-			ess.getSettings().setEssentialsChatActive(false);
-		}
-		ess.getPermissionsHandler().checkPermissions();
-		ess.getAlternativeCommandsHandler().removePlugin(event.getPlugin());
-		// Check to see if the plugin thats being disabled is the one we are using
-		if (ess.getPaymentMethod() != null && ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().checkDisabled(event.getPlugin()))
-		{
-			ess.getPaymentMethod().reset();
-			ess.getLogger().log(Level.INFO, "Payment method was disabled. No longer accepting payments.");
-		}
-	}
+    public EssentialsPluginListener(final IEssentials ess) {
+        this.ess = ess;
+    }

-	@Override
-	public void reloadConfig()
-	{
-		ess.getPermissionsHandler().setUseSuperperms(ess.getSettings().useBukkitPermissions());
-		ess.getPermissionsHandler().checkPermissions();
-	}
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPluginEnable(final PluginEnableEvent event) {
+        if (event.getPlugin().getName().equals("EssentialsChat")) {
+            ess.getSettings().setEssentialsChatActive(true);
+        }
+        ess.getPermissionsHandler().setUseSuperperms(ess.getSettings().useBukkitPermissions());
+        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() + ")");
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPluginDisable(final PluginDisableEvent event) {
+        if (event.getPlugin().getName().equals("EssentialsChat")) {
+            ess.getSettings().setEssentialsChatActive(false);
+        }
+        ess.getAlternativeCommandsHandler().removePlugin(event.getPlugin());
+        // Check to see if the plugin thats being disabled is the one we are using
+        if (ess.getPaymentMethod() != null && Methods.hasMethod() && Methods.checkDisabled(event.getPlugin())) {
+            Methods.reset();
+            ess.getLogger().log(Level.INFO, "Payment method was disabled. No longer accepting payments.");
+        }
+    }
+
+    @Override
+    public void reloadConfig() {
+    }
 }
@@ -0,0 +1,115 @@
+package com.earth2me.essentials;
+
+import net.ess3.api.IEssentials;
+import net.ess3.nms.refl.ReflUtil;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.server.ServerListPingEvent;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.logging.Level;
+
+
+public class EssentialsServerListener implements Listener {
+    private static List<String> ignoredSLPECallers = Arrays.asList(
+        ".LegacyPingHandler.channelRead(" // CB responding to pings from pre-Netty clients
+    );
+
+    private final transient IEssentials ess;
+    private boolean unsupportedLogged = false;
+    private boolean npeWarned = false;
+    private boolean isPaperSample;
+    private Method setSampleText;
+    private Method getSampleText;
+
+    public EssentialsServerListener(final IEssentials ess) {
+        this.ess = ess;
+
+        if (ReflUtil.getClassCached("com.destroystokyo.paper.event.server.PaperServerListPingEvent") == null) {
+            // This workaround is only necessary for older Paper builds
+            setSampleText = ReflUtil.getMethodCached(ServerListPingEvent.class, "setSampleText", List.class);
+            getSampleText = ReflUtil.getMethodCached(ServerListPingEvent.class, "getSampleText");
+            if (setSampleText != null && getSampleText != null) {
+                ess.getLogger().info("ServerListPingEvent: Paper 1.12.2 setSampleText API");
+                isPaperSample = true;
+                return;
+            }
+        }
+
+        ess.getLogger().info("ServerListPingEvent: Spigot iterator API");
+        isPaperSample = false;
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onServerListPing(final ServerListPingEvent event) throws Exception {
+        if (isPaperSample) {
+            try {
+                List<String> playerNames = (List<String>) getSampleText.invoke(event, null);
+                playerNames.removeIf(player -> ess.getUser(player).isVanished());
+                setSampleText.invoke(event, playerNames);
+            } catch (IllegalAccessException | InvocationTargetException | ClassCastException e) {
+                if (!unsupportedLogged && shouldWarnSLPECaller(e)) {
+                    ess.getLogger().log(Level.WARNING, "Unable to hide players from server list ping "
+                            + "using Paper 1.12 method!", e);
+                    unsupportedLogged = true;
+                }
+            } catch (NullPointerException e) {
+                if (!npeWarned && shouldWarnSLPECaller(e)) {
+                    npeWarned = true;
+                    Exception ex = new Exception("A plugin has fired a ServerListPingEvent "
+                            + "without implementing Paper's methods. Point the author to https://git.io/v7Xzl.");
+                    ex.setStackTrace(e.getStackTrace());
+                    throw ex;
+                }
+            }
+        } else {
+            try {
+                Iterator<Player> iterator = event.iterator();
+                while (iterator.hasNext()) {
+                    Player player = iterator.next();
+                    if (ess.getUser(player).isVanished()) {
+                        iterator.remove();
+                    }
+                }
+            } catch (UnsupportedOperationException e) {
+                if (!unsupportedLogged && shouldWarnSLPECaller(e)) {
+                    ess.getLogger().log(Level.WARNING, "Could not hide vanished players while handling " + event.getClass().getName(), e);
+                    unsupportedLogged = true;
+                }
+            }
+        }
+    }
+
+    /**
+     * Should we warn about this SLPE caller, or should we silently ignore it?
+     * This checks against the ignoredSLPECallers strings, and if it matches one of those, we
+     * return false.
+     *
+     * @param throwable A throwable caught by a catch block
+     * @return Whether or not to send a warning about this particular caller
+     */
+    private boolean shouldWarnSLPECaller(Throwable throwable) {
+        final int maxStackDepth = 20; // Limit the depth when searching through the stack trace
+        int depth = 0;
+        for (StackTraceElement element : throwable.getStackTrace()) {
+            depth++;
+            if (depth > maxStackDepth) {
+                break;
+            }
+
+            for (String ignoredString : ignoredSLPECallers) {
+                if (element.toString().contains(ignoredString)) {
+                    return false; // We know about this error and should ignore it, so don't warn
+                }
+            }
+        }
+
+        return true; // We don't know for certain that we can ignore this, so warn just to be safe
+    }
+}
@@ -1,85 +1,106 @@
 package com.earth2me.essentials;

-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Set;
-import java.util.logging.Level;
+import net.ess3.api.IEssentials;
 import org.bukkit.entity.Player;

+import java.util.*;
+import java.util.logging.Level;

-public class EssentialsTimer implements Runnable
-{
-	private final transient IEssentials ess;
-	private final transient Set<User> onlineUsers = new HashSet<User>();
-	private transient long lastPoll = System.currentTimeMillis();
-	private final transient LinkedList<Float> history = new LinkedList<Float>();

-	EssentialsTimer(final IEssentials ess)
-	{
-		this.ess = ess;
-	}
+public class EssentialsTimer implements Runnable {
+    private final transient IEssentials ess;
+    private final transient Set<UUID> onlineUsers = new HashSet<>(); // Field is necessary for hidden users
+    private transient long lastPoll = System.nanoTime();
+    private final LinkedList<Double> history = new LinkedList<>();
+    private int skip1 = 0;
+    private int skip2 = 0;
+    private final long maxTime = 10 * 1000000;
+    private final long tickInterval = 50;

-	@Override
-	public void run()
-	{
-		final long currentTime = System.currentTimeMillis();
-		long timeSpent = (currentTime - lastPoll) / 1000;
-		if (timeSpent == 0)
-		{
-			timeSpent = 1;
-		}
-		if (history.size() > 10)
-		{
-			history.remove();
-		}
-		float tps = 100f / timeSpent;
-		if (tps <= 20)
-		{
-			history.add(tps);
-		}
-		lastPoll = currentTime;
-		for (Player player : ess.getServer().getOnlinePlayers())
-		{
-			try
-			{
-				final User user = ess.getUser(player);
-				onlineUsers.add(user);
-				user.setLastOnlineActivity(currentTime);
-				user.checkActivity();
-			}
-			catch (Exception e)
-			{
-				ess.getLogger().log(Level.WARNING, "EssentialsTimer Error:", e);
-			}
-		}
+    EssentialsTimer(final IEssentials ess) {
+        this.ess = ess;
+        history.add(20d);
+    }

-		final Iterator<User> iterator = onlineUsers.iterator();
-		while (iterator.hasNext())
-		{
-			final User user = iterator.next();
-			if (user.getLastOnlineActivity() < currentTime && user.getLastOnlineActivity() > user.getLastLogout())
-			{
-				user.setLastLogout(user.getLastOnlineActivity());
-				iterator.remove();
-				continue;
-			}
-			user.checkMuteTimeout(currentTime);
-			user.checkJailTimeout(currentTime);
-			user.resetInvulnerabilityAfterTeleport();
-		}
-	}
+    @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.getOnlinePlayers()) {
+            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);
+            }
+        }

-	public float getAverageTPS()
-	{
-		float avg = 0;
-		for (Float f : history)
-		{
-			if (f != null)
-			{
-				avg += f;
-			}
-		}
-		return avg / history.size();
-	}
+        count = 0;
+        final Iterator<UUID> iterator = onlineUsers.iterator();
+        while (iterator.hasNext()) {
+            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());
+            // Not sure why this would happen, but it does
+            if (user == null) {
+                iterator.remove();
+                continue;
+            }
+            if (user.getLastOnlineActivity() < currentTime && user.getLastOnlineActivity() > user.getLastLogout()) {
+                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();
+    }
 }
@@ -0,0 +1,63 @@
+package com.earth2me.essentials;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Files;
+import org.bukkit.Bukkit;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Locale;
+import java.util.UUID;
+import java.util.logging.Level;
+
+
+public class EssentialsUserConf extends EssentialsConf {
+    public final String username;
+    public 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);
+        }
+    }
+}
@@ -7,83 +7,69 @@ import java.util.List;
 import java.util.Locale;


-public class ExecuteTimer
-{
-	private final transient List<ExecuteRecord> times;
-	private final transient DecimalFormat decimalFormat = new DecimalFormat("#0.000", DecimalFormatSymbols.getInstance(Locale.US));
+public class ExecuteTimer {
+    private final transient List<ExecuteRecord> times;
+    private final transient DecimalFormat decimalFormat = new DecimalFormat("#0.000", DecimalFormatSymbols.getInstance(Locale.US));


-	public ExecuteTimer()
-	{
-		times = new ArrayList<ExecuteRecord>();
-	}
+    public ExecuteTimer() {
+        times = new ArrayList<ExecuteRecord>();
+    }

-	public void start()
-	{
-		times.clear();
-		mark("start");
+    public void start() {
+        times.clear();
+        mark("start");

-	}
+    }

-	public void mark(final String label)
-	{
-		if (!times.isEmpty() || "start".equals(label))
-		{
-			times.add(new ExecuteRecord(label, System.nanoTime()));
-		}
-	}
+    public void mark(final String label) {
+        if (!times.isEmpty() || "start".equals(label)) {
+            times.add(new ExecuteRecord(label, System.nanoTime()));
+        }
+    }

-	public String end()
-	{
-		final StringBuilder output = new StringBuilder();
-		output.append("execution time: ");
-		String mark;
-		long time0 = 0;
-		long time1 = 0;
-		long time2 = 0;
-		double duration;
+    public String end() {
+        final StringBuilder output = new StringBuilder();
+        output.append("execution time: ");
+        String mark;
+        long time0 = 0;
+        long time1 = 0;
+        long time2 = 0;
+        double duration;

-		for (ExecuteRecord pair : times)
-		{
-			mark = (String)pair.getMark();
-			time2 = (Long)pair.getTime();
-			if (time1 > 0)
-			{
-				duration = (time2 - time1)/1000000.0;
-				output.append(mark).append(": ").append(decimalFormat.format(duration)).append("ms - ");
-			}
-			else
-			{
-				time0 = time2;
-			}
-			time1 = time2;
-		}
-		duration = (time1 - time0)/1000000.0;
-		output.append("Total: ").append(decimalFormat.format(duration)).append("ms");
-		times.clear();
-		return output.toString();
-	}
+        for (ExecuteRecord pair : times) {
+            mark = pair.getMark();
+            time2 = pair.getTime();
+            if (time1 > 0) {
+                duration = (time2 - time1) / 1000000.0;
+                output.append(mark).append(": ").append(decimalFormat.format(duration)).append("ms - ");
+            } else {
+                time0 = time2;
+            }
+            time1 = time2;
+        }
+        duration = (time1 - time0) / 1000000.0;
+        output.append("Total: ").append(decimalFormat.format(duration)).append("ms");
+        times.clear();
+        return output.toString();
+    }


-	static private class ExecuteRecord
-	{
-		private final String mark;
-		private final long time;
+    private static class ExecuteRecord {
+        private final String mark;
+        private final long time;

-		public ExecuteRecord(final String mark, final long time)
-		{
-			this.mark = mark;
-			this.time = time;
-		}
+        public ExecuteRecord(final String mark, final long time) {
+            this.mark = mark;
+            this.time = time;
+        }

-		public String getMark()
-		{
-			return mark;
-		}
+        public String getMark() {
+            return mark;
+        }

-		public long getTime()
-		{
-			return time;
-		}
-	}
+        public long getTime() {
+            return time;
+        }
+    }
 }
@@ -1,6 +1,7 @@
 package com.earth2me.essentials;

-import com.earth2me.essentials.api.II18n;
+import net.ess3.api.IEssentials;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -11,176 +12,155 @@ import java.text.MessageFormat;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.regex.Pattern;


-public class I18n implements II18n
-{
-	private static I18n instance;
-	private static final String MESSAGES = "messages";
-	private final transient Locale defaultLocale = Locale.getDefault();
-	private transient Locale currentLocale = defaultLocale;
-	private transient ResourceBundle customBundle;
-	private transient ResourceBundle localeBundle;
-	private final transient ResourceBundle defaultBundle;
-	private final transient Map<String, MessageFormat> messageFormatCache = new HashMap<String, MessageFormat>();
-	private final transient IEssentials ess;
+public 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 transient Map<String, MessageFormat> messageFormatCache = new HashMap<String, MessageFormat>();
+    private final transient IEssentials ess;
+    private static final Pattern NODOUBLEMARK = Pattern.compile("''");
+    private static final ResourceBundle NULL_BUNDLE = new ResourceBundle() {
+        public Enumeration<String> getKeys() {
+            return null;
+        }

-	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);
-	}
+        protected Object handleGetObject(String key) {
+            return null;
+        }
+    };

-	public void onEnable()
-	{
-		instance = this;
-	}
+    public I18n(final IEssentials ess) {
+        this.ess = ess;
+        defaultBundle = ResourceBundle.getBundle(MESSAGES, Locale.ENGLISH);
+        localeBundle = defaultBundle;
+        customBundle = NULL_BUNDLE;
+    }

-	public void onDisable()
-	{
-		instance = null;
-	}
+    public void onEnable() {
+        instance = this;
+    }

-	public Locale getCurrentLocale()
-	{
-		return currentLocale;
-	}
+    public void onDisable() {
+        instance = null;
+    }

-	public String translate(final String string)
-	{
-		try
-		{
-			try
-			{
-				return customBundle.getString(string);
-			}
-			catch (MissingResourceException ex)
-			{
-				return localeBundle.getString(string);
-			}
-		}
-		catch (MissingResourceException ex)
-		{
-			Logger.getLogger("Minecraft").log(Level.WARNING, String.format("Missing translation key \"%s\" in translation file %s", ex.getKey(), localeBundle.getLocale().toString()), ex);
-			return defaultBundle.getString(string);
-		}
-	}
+    @Override
+    public Locale getCurrentLocale() {
+        return currentLocale;
+    }

-	public static String _(final String string, final Object... objects)
-	{
-		if (instance == null)
-		{
-			return "";
-		}
-		if (objects.length == 0)
-		{
-			return instance.translate(string);
-		}
-		else
-		{
-			return instance.format(string, objects);
-		}
-	}
+    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 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 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 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("Minecraft").log(Level.INFO, String.format("Using locale %s", currentLocale.toString()));
-		customBundle = ResourceBundle.getBundle(MESSAGES, currentLocale, new FileResClassLoader(I18n.class.getClassLoader(), ess));
-		localeBundle = ResourceBundle.getBundle(MESSAGES, currentLocale);
-	}
+    public 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).replace(' ', ' '); // replace nbsp with a space
+    }

-	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);
-	}
+    public void updateLocale(final String loc) {
+        if (loc != null && !loc.isEmpty()) {
+            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();
+        messageFormatCache = new HashMap<String, MessageFormat>();
+        Logger.getLogger("Essentials").log(Level.INFO, String.format("Using locale %s", currentLocale.toString()));
+
+        try {
+            localeBundle = ResourceBundle.getBundle(MESSAGES, currentLocale);
+        } catch (MissingResourceException ex) {
+            localeBundle = NULL_BUNDLE;
+        }
+
+        try {
+            customBundle = ResourceBundle.getBundle(MESSAGES, currentLocale, new FileResClassLoader(I18n.class.getClassLoader(), ess));
+        } catch (MissingResourceException ex) {
+            customBundle = NULL_BUNDLE;
+        }
+    }
+
+    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;
+    private static class FileResClassLoader extends ClassLoader {
+        private final transient File dataFolder;

-		FileResClassLoader(final ClassLoader classLoader, final IEssentials ess)
-		{
-			super(classLoader);
-			this.dataFolder = ess.getDataFolder();
-		}
+        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 URL getResource(final String string) {
+            final File file = new File(dataFolder, string);
+            if (file.exists()) {
+                try {
+                    return file.toURI().toURL();
+                } catch (MalformedURLException ex) {
+                }
+            }
+            return null;
+        }

-		@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);
-		}
-	}
+        @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 null;
+        }
+    }
 }
@@ -1,5 +1,5 @@
 package com.earth2me.essentials;

 public interface IConf {
-	public void reloadConfig();
+    void reloadConfig();
 }
@@ -1,74 +1,106 @@
 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 net.ess3.nms.SpawnerProvider;
 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;

+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;

-public interface IEssentials extends Plugin
-{
-	void addReloadListener(IConf listener);
+public interface IEssentials extends Plugin {
+    void addReloadListener(IConf listener);

-	void reload();
+    void reload();

-	boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentialsModule module);
+    List<String> onTabCompleteEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentialsModule module);

-	User getUser(Object base);
+    boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentialsModule module);

-	I18n getI18n();
+    @Deprecated
+    User getUser(Object base);

-	User getOfflineUser(String name);
+    User getUser(UUID base);

-	World getWorld(String name);
+    User getUser(String base);

-	int broadcastMessage(IUser sender, String message);
+    User getUser(Player base);

-	ISettings getSettings();
+    I18n getI18n();

-	BukkitScheduler getScheduler();
+    User getOfflineUser(String name);

-	IJails getJails();
+    World getWorld(String name);

-	Warps getWarps();
+    int broadcastMessage(String message);

-	Worth getWorth();
+    int broadcastMessage(IUser sender, String message);

-	Backup getBackup();
+    int broadcastMessage(String permission, String message);

-	Methods getPaymentMethod();
+    ISettings getSettings();

-	int scheduleAsyncDelayedTask(Runnable run);
+    BukkitScheduler getScheduler();

-	int scheduleSyncDelayedTask(Runnable run);
+    IJails getJails();

-	int scheduleSyncDelayedTask(Runnable run, long delay);
+    IWarps getWarps();

-	int scheduleSyncRepeatingTask(final Runnable run, long delay, long period);
+    Worth getWorth();

-	TNTExplodeListener getTNTListener();
+    Backup getBackup();

-	PermissionsHandler getPermissionsHandler();
+    Kits getKits();

-	AlternativeCommandsHandler getAlternativeCommandsHandler();
+    Methods getPaymentMethod();

-	void showError(final CommandSender sender, final Throwable exception, final String commandLabel);
+    BukkitTask runTaskAsynchronously(Runnable run);

-	ItemDb getItemDb();
+    BukkitTask runTaskLaterAsynchronously(Runnable run, long delay);

-	UserMap getUserMap();
-	
-	Metrics getMetrics();
-	
-	void setMetrics(Metrics metrics);
-	
-	EssentialsTimer getTimer();
-	
-	List<String> getVanishedPlayers();
+    BukkitTask runTaskTimerAsynchronously(Runnable run, long delay, long period);
+
+    int scheduleSyncDelayedTask(Runnable run);
+
+    int scheduleSyncDelayedTask(Runnable run, long delay);
+
+    int scheduleSyncRepeatingTask(Runnable run, long delay, long period);
+
+    TNTExplodeListener getTNTListener();
+
+    PermissionsHandler getPermissionsHandler();
+
+    AlternativeCommandsHandler getAlternativeCommandsHandler();
+
+    void showError(CommandSource sender, Throwable exception, String commandLabel);
+
+    IItemDb getItemDb();
+
+    UserMap getUserMap();
+
+    Metrics getMetrics();
+
+    void setMetrics(Metrics metrics);
+
+    EssentialsTimer getTimer();
+
+    @Deprecated
+    List<String> getVanishedPlayers();
+
+    Collection<Player> getOnlinePlayers();
+
+    Iterable<User> getOnlineUsers();
+
+    SpawnerProvider getSpawnerProvider();
 }
@@ -1,6 +1,5 @@
 package com.earth2me.essentials;


-public interface IEssentialsModule
-{
+public interface IEssentialsModule {
 }
@@ -1,9 +0,0 @@
-package com.earth2me.essentials;
-
-import org.bukkit.command.CommandSender;
-
-public interface IReplyTo {
-	public void setReplyTo(CommandSender user);
-
-	public CommandSender getReplyTo();
-}
@@ -3,184 +3,323 @@ package com.earth2me.essentials;
 import com.earth2me.essentials.commands.IEssentialsCommand;
 import com.earth2me.essentials.signs.EssentialsSign;
 import com.earth2me.essentials.textreader.IText;
-import java.text.MessageFormat;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+
 import org.bukkit.ChatColor;
+import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.event.EventPriority;

+import java.math.BigDecimal;
+import java.text.NumberFormat;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.regex.Pattern;

-public interface ISettings extends IConf
-{
-	boolean areSignsDisabled();

-	IText getAnnounceNewPlayerFormat();
+public interface ISettings extends IConf {
+    boolean areSignsDisabled();

-	boolean getAnnounceNewPlayers();
+    IText getAnnounceNewPlayerFormat();

-	String getNewPlayerKit();
+    boolean getAnnounceNewPlayers();

-	String getBackupCommand();
+    String getNewPlayerKit();

-	long getBackupInterval();
+    String getBackupCommand();

-	MessageFormat getChatFormat(String group);
+    long getBackupInterval();

-	int getChatRadius();
+    String getChatFormat(String group);

-	double getCommandCost(IEssentialsCommand cmd);
+    int getChatRadius();

-	double getCommandCost(String label);
+    int getNearRadius();

-	String getCurrencySymbol();
+    char getChatShout();

-	int getOversizedStackSize();
+    char getChatQuestion();

-	int getDefaultStackSize();
+    BigDecimal getCommandCost(IEssentialsCommand cmd);

-	double getHealCooldown();
+    BigDecimal getCommandCost(String label);

-	Map<String, Object> getKit(String name);
+    String getCurrencySymbol();

-	ConfigurationSection getKits();
+    int getOversizedStackSize();

-	String getLocale();
+    int getDefaultStackSize();

-	String getNewbieSpawn();
+    double getHealCooldown();

-	String getNicknamePrefix();
+    Set<String> getSocialSpyCommands();

-	ChatColor getOperatorColor() throws Exception;
+    boolean getSocialSpyListenMutedPlayers();

-	boolean getPerWarpPermission();
+    Set<String> getMuteCommands();

-	boolean getProtectBoolean(final String configName, boolean def);
+    /**
+     * @Deprecated in favor of {@link Kits#getKits()}
+     */
+    @Deprecated
+    ConfigurationSection getKits();

-	int getProtectCreeperMaxHeight();
+    /**
+     * @Deprecated in favor of {@link Kits#getKit(String)}
+     */
+    @Deprecated
+    Map<String, Object> getKit(String kit);

-	List<Integer> getProtectList(final String configName);
+    /**
+     * @Deprecated in favor of {@link Kits#addKit(String, List, long)}}
+     */
+    @Deprecated
+    void addKit(String name, List<String> lines, long delay);

-	boolean getProtectPreventSpawn(final String creatureName);
+    @Deprecated
+    ConfigurationSection getKitSection();

-	String getProtectString(final String configName);
+    boolean isSkippingUsedOneTimeKitsFromKitList();

-	boolean getRespawnAtHome();
+    String getLocale();

-	Set getMultipleHomes();
+    String getNewbieSpawn();

-	int getHomeLimit(String set);
+    String getNicknamePrefix();

-	int getHomeLimit(User user);
+    ChatColor getOperatorColor() throws Exception;

-	boolean getSortListByGroups();
+    boolean getPerWarpPermission();

-	int getSpawnMobLimit();
+    boolean getProtectBoolean(final String configName, boolean def);

-	int getStartingBalance();
+    int getProtectCreeperMaxHeight();

-	double getTeleportCooldown();
+    List<Material> getProtectList(final String configName);

-	double getTeleportDelay();
+    boolean getProtectPreventSpawn(final String creatureName);

-	boolean hidePermissionlessHelp();
+    String getProtectString(final String configName);

-	boolean isCommandDisabled(final IEssentialsCommand cmd);
+    boolean getRespawnAtHome();

-	boolean isCommandDisabled(String label);
+    Set getMultipleHomes();

-	boolean isCommandOverridden(String name);
+    int getHomeLimit(String set);

-	boolean isDebug();
+    int getHomeLimit(User user);

-	boolean isEcoDisabled();
+    int getSpawnMobLimit();

-	boolean isTradeInStacks(int id);
+    BigDecimal getStartingBalance();

-	List<Integer> itemSpawnBlacklist();
+    boolean isTeleportSafetyEnabled();

-	List<EssentialsSign> enabledSigns();
+    boolean isForceDisableTeleportSafety();

-	boolean permissionBasedItemSpawn();
+    double getTeleportCooldown();

-	boolean showNonEssCommandsInHelp();
+    double getTeleportDelay();

-	boolean warnOnBuildDisallow();
+    boolean hidePermissionlessHelp();

-	boolean warnOnSmite();
+    boolean isCommandDisabled(final IEssentialsCommand cmd);

-	double getMaxMoney();
+    boolean isCommandDisabled(String label);

-	double getMinMoney();
+    boolean isCommandOverridden(String name);

-	boolean isEcoLogEnabled();
+    boolean isDebug();

-	boolean isEcoLogUpdateEnabled();
+    boolean isEcoDisabled();

-	boolean removeGodOnDisconnect();
+    @Deprecated
+    boolean isTradeInStacks(int id);

-	boolean changeDisplayName();
+    boolean isTradeInStacks(Material type);

-	boolean changePlayerListName();
+    List<Material> itemSpawnBlacklist();

-	boolean isPlayerCommand(String string);
+    List<EssentialsSign> enabledSigns();

-	boolean useBukkitPermissions();
+    boolean permissionBasedItemSpawn();

-	boolean addPrefixSuffix();
+    boolean showNonEssCommandsInHelp();

-	boolean disablePrefix();
+    boolean warnOnBuildDisallow();

-	boolean disableSuffix();
+    boolean warnOnSmite();

-	long getAutoAfk();
+    BigDecimal getMaxMoney();

-	long getAutoAfkKick();
+    BigDecimal getMinMoney();

-	boolean getFreezeAfkPlayers();
+    boolean isEcoLogEnabled();

-	boolean cancelAfkOnMove();
+    boolean isEcoLogUpdateEnabled();

-	boolean areDeathMessagesEnabled();
+    boolean removeGodOnDisconnect();

-	public void setDebug(boolean debug);
+    boolean changeDisplayName();

-	Set<String> getNoGodWorlds();
+    boolean changePlayerListName();

-	boolean getUpdateBedAtDaytime();
+    boolean isPlayerCommand(String string);

-	boolean getRepairEnchanted();
+    boolean useBukkitPermissions();

-	boolean isWorldTeleportPermissions();
+    boolean addPrefixSuffix();

-	boolean isWorldHomePermissions();
+    boolean disablePrefix();

-	boolean registerBackInListener();
+    boolean disableSuffix();

-	boolean getDisableItemPickupWhileAfk();
+    long getAutoAfk();

-	EventPriority getRespawnPriority();
+    long getAutoAfkKick();

-	long getTpaAcceptCancellation();
+    boolean getFreezeAfkPlayers();

-	boolean isMetricsEnabled();
+    boolean cancelAfkOnMove();

-	void setMetricsEnabled(boolean metricsEnabled);
+    boolean cancelAfkOnInteract();

-	long getTeleportInvulnerability();
+    boolean isAfkListName();

-	boolean isTeleportInvulnerability();
+    String getAfkListName();

-	long getLoginAttackDelay();
+    boolean areDeathMessagesEnabled();

-	int getSignUsePerSecond();
+    void setDebug(boolean debug);

-	double getMaxFlySpeed();
+    Set<String> getNoGodWorlds();

-	double getMaxWalkSpeed();
+    boolean getUpdateBedAtDaytime();

-	public int getMailsPerMinute();
+    boolean allowUnsafeEnchantments();

-	public void setEssentialsChatActive(boolean b);
+    boolean getRepairEnchanted();
+
+    boolean isWorldTeleportPermissions();
+
+    boolean isWorldHomePermissions();
+
+    boolean registerBackInListener();
+
+    boolean getDisableItemPickupWhileAfk();
+
+    EventPriority getRespawnPriority();
+
+    EventPriority getSpawnJoinPriority();
+
+    long getTpaAcceptCancellation();
+
+    long getTeleportInvulnerability();
+
+    boolean isTeleportInvulnerability();
+
+    long getLoginAttackDelay();
+
+    int getSignUsePerSecond();
+
+    double getMaxFlySpeed();
+
+    double getMaxWalkSpeed();
+
+    int getMailsPerMinute();
+
+    long getEconomyLagWarning();
+
+    long getPermissionsLagWarning();
+
+    void setEssentialsChatActive(boolean b);
+
+    long getMaxTempban();
+
+    Map<String, Object> getListGroupConfig();
+
+    int getMaxNickLength();
+
+    boolean ignoreColorsInMaxLength();
+
+    boolean hideDisplayNameInVanish();
+
+    int getMaxUserCacheCount();
+
+    boolean allowSilentJoinQuit();
+
+    boolean isCustomJoinMessage();
+
+    String getCustomJoinMessage();
+
+    boolean isCustomQuitMessage();
+
+    String getCustomQuitMessage();
+
+    boolean isNotifyNoNewMail();
+
+    boolean isDropItemsIfFull();
+
+    boolean isLastMessageReplyRecipient();
+
+    BigDecimal getMinimumPayAmount();
+
+    long getLastMessageReplyRecipientTimeout();
+
+    boolean isMilkBucketEasterEggEnabled();
+
+    boolean isSendFlyEnableOnJoin();
+
+    boolean isWorldTimePermissions();
+
+    boolean isSpawnOnJoin();
+
+    List<String> getSpawnOnJoinGroups();
+
+    boolean isUserInSpawnOnJoinGroup(IUser user);
+
+    boolean isTeleportToCenterLocation();
+
+    boolean isCommandCooldownsEnabled();
+
+    long getCommandCooldownMs(String label);
+
+    Entry<Pattern, Long> getCommandCooldownEntry(String label);
+
+    boolean isCommandCooldownPersistent(String label);
+
+    boolean isNpcsInBalanceRanking();
+
+    NumberFormat getCurrencyFormat();
+
+    List<EssentialsSign> getUnprotectedSignNames();
+
+    boolean isPastebinCreateKit();
+
+    boolean isAllowBulkBuySell();
+
+    boolean isAddingPrefixInPlayerlist();
+
+    boolean isAddingSuffixInPlayerlist();
+
+    int getNotifyPlayerOfMailCooldown();
+
+    int getMotdDelay();
+
+    boolean isDirectHatAllowed();
+
+    List<String> getDefaultEnabledConfirmCommands();
+
+    boolean isConfirmCommandEnabledByDefault(String commandName);
+
+    boolean isCompassTowardsHomePerm();
+
+    boolean isAllowWorldInBroadcastworld();
+
+    String getItemDbType();
+
+    boolean isForceEnableRecipe();
+
+    boolean allowOldIdSigns();
 }
@@ -0,0 +1,8 @@
+package com.earth2me.essentials;
+
+import org.bukkit.Location;
+
+
+public interface ITarget {
+    Location getLocation();
+}
@@ -1,47 +1,188 @@
 package com.earth2me.essentials;

 import com.earth2me.essentials.commands.IEssentialsCommand;
+import net.ess3.api.ITeleport;
+import net.ess3.api.MaxMoneyException;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;

+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;

-public interface IUser extends Player
-{
-	long getLastTeleportTimestamp();

-	boolean isAuthorized(String node);
+public interface IUser {
+    boolean isAuthorized(String node);

-	boolean isAuthorized(IEssentialsCommand cmd);
+    boolean isAuthorized(IEssentialsCommand cmd);

-	boolean isAuthorized(IEssentialsCommand cmd, String permissionPrefix);
+    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;

-	double getMoney();
+    void payUser(final User reciever, final BigDecimal value) throws Exception;

-	void takeMoney(double value);
+    void takeMoney(BigDecimal value);

-	void giveMoney(double value);
-	
-	boolean canAfford(double value);
+    void takeMoney(final BigDecimal value, final CommandSource initiator);

-	String getGroup();
+    boolean canAfford(BigDecimal value);

-	void setLastLocation();
+    Boolean canSpawnItem(final Material material);

-	Location getHome(String name) throws Exception;
+    void setLastLocation();

-	Location getHome(Location loc) throws Exception;
+    void setLogoutLocation();

-	boolean isHidden();
+    void requestTeleport(final User player, final boolean here);

-	Teleport getTeleport();
+    /**
+     * Returns whether this user has an outstanding teleport request to deal with.
+     *
+     * @return whether there is a teleport request
+     */
+    boolean hasOutstandingTeleportRequest();

-	void setJail(String jail);
-	
-	boolean isIgnoreExempt();
+    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();
+
+    void sendMessage(String message);
+
+    /*
+     * UserData
+     */
+    Location getHome(String name) throws Exception;
+
+    Location getHome(Location loc) throws Exception;
+
+    List<String> getHomes();
+
+    void setHome(String name, Location loc);
+
+    void delHome(String name) throws Exception;
+
+    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 setIgnoreMsg(boolean ignoreMsg);
+
+    boolean isIgnoreMsg();
+
+    void setConfigProperty(String node, Object object);
+
+    Set<String> getConfigKeys();
+
+    Map<String, Object> getConfigMap();
+
+    Map<String, Object> getConfigMap(String node);
+    
+    Map<Pattern, Long> getCommandCooldowns();
+
+    Date getCommandCooldownExpiry(String label);
+    
+    void addCommandCooldown(Pattern pattern, Date expiresAt, boolean save);
+    
+    boolean clearCommandCooldown(Pattern pattern);
+
+    /*
+     *  PlayerExtension
+     */
+    Player getBase();
+
+    CommandSource getSource();
+
+    String getName();
+
+    String getAfkMessage();
+
+    void setAfkMessage(final String message);
+    
+    long getAfkSince();
+    
+    boolean isAcceptingPay();
+    
+    void setAcceptingPay(boolean acceptingPay);
+    
+    boolean isPromptingPayConfirm();
+    
+    void setPromptingPayConfirm(boolean prompt);
+    
+    boolean isPromptingClearConfirm();
+    
+    void setPromptingClearConfirm(boolean prompt);
+
+    Map<User, BigDecimal> getConfirmingPayments();
 }
@@ -1,214 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IItemDb;
-import java.util.*;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-
-
-public class ItemDb implements IConf, IItemDb
-{
-	private final transient IEssentials ess;
-
-	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<ItemData, List<String>> names = new HashMap<ItemData, List<String>>();
-	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())
-		{
-			return;
-		}
-
-		durabilities.clear();
-		items.clear();
-		names.clear();
-
-		for (String line : lines)
-		{
-			line = line.trim().toLowerCase(Locale.ENGLISH);
-			if (line.length() > 0 && line.charAt(0) == '#')
-			{
-				continue;
-			}
-
-			final String[] parts = line.split("[^a-z0-9]");
-			if (parts.length < 2)
-			{
-				continue;
-			}
-
-			final int numeric = Integer.parseInt(parts[1]);
-			final short data = parts.length > 2 && !parts[2].equals("0") ? Short.parseShort(parts[2]) : 0;
-			String itemName = parts[0].toLowerCase(Locale.ENGLISH);
-
-			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);
-			}
-		}
-	}
-
-	public ItemStack get(final String id, final int quantity) throws Exception
-	{
-		final ItemStack retval = get(id.toLowerCase(Locale.ENGLISH));
-		retval.setAmount(quantity);
-		return retval;
-	}
-
-	public ItemStack get(final String id) throws Exception
-	{
-		int itemid = 0;
-		String itemname = null;
-		short metaData = 0;
-		if (id.matches("^\\d+[:+',;.]\\d+$"))
-		{
-			itemid = Integer.parseInt(id.split("[:+',;.]")[0]);
-			metaData = Short.parseShort(id.split("[:+',;.]")[1]);
-		}
-		else if (id.matches("^\\d+$"))
-		{
-			itemid = Integer.parseInt(id);
-		}
-		else if (id.matches("^[^:+',;.]+[:+',;.]\\d+$"))
-		{
-			itemname = id.split("[:+',;.]")[0].toLowerCase(Locale.ENGLISH);
-			metaData = Short.parseShort(id.split("[:+',;.]")[1]);
-		}
-		else
-		{
-			itemname = id.toLowerCase(Locale.ENGLISH);
-		}
-
-		if (itemname != null)
-		{
-			if (items.containsKey(itemname))
-			{
-				itemid = items.get(itemname);
-				if (durabilities.containsKey(itemname) && metaData == 0)
-				{
-					metaData = durabilities.get(itemname);
-				}
-			}
-			else if (Material.getMaterial(itemname) != null)
-			{
-				itemid = Material.getMaterial(itemname).getId();
-				metaData = 0;
-			}
-			else
-			{
-				throw new Exception(_("unknownItemName", id));
-			}
-		}
-
-		final Material mat = Material.getMaterial(itemid);
-		if (mat == null)
-		{
-			throw new Exception(_("unknownItemId", itemid));
-		}
-		final ItemStack retval = new ItemStack(mat);
-		retval.setAmount(mat.getMaxStackSize());
-		retval.setDurability(metaData);
-		return retval;
-	}
-
-	public String names(ItemStack item)
-	{
-		ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
-		List<String> nameList = names.get(itemData);
-		if (nameList == null) {
-			itemData = new ItemData(item.getTypeId(), (short) 0);
-			nameList = names.get(itemData);
-			if (nameList == null) {
-				return null;
-			}
-		}
-		
-		if (nameList.size() > 15)
-		{
-			nameList = nameList.subList(0, 14);
-		}
-		return Util.joinList(", ", nameList);
-	}
-
-	class ItemData
-	{
-		final private int itemNo;
-		final private short itemData;
-
-		ItemData(final int itemNo, final short itemData)
-		{
-			this.itemNo = itemNo;
-			this.itemData = itemData;
-		}
-
-		public int getItemNo()
-		{
-			return itemNo;
-		}
-
-		public short getItemData()
-		{
-			return itemData;
-		}
-
-		@Override
-		public int hashCode()
-		{
-			return (31 * itemNo) ^ itemData;
-		}
-
-		@Override
-		public boolean equals(Object o)
-		{
-			if (o == null)
-			{
-				return false;
-			}
-			if (!(o instanceof ItemData))
-			{
-				return false;
-			}
-			ItemData pairo = (ItemData)o;
-			return this.itemNo == pairo.getItemNo()
-				   && this.itemData == pairo.getItemData();
-		}
-	}
-
-	class LengthCompare implements java.util.Comparator<String>
-	{
-		public LengthCompare()
-		{
-			super();
-		}
-
-		@Override
-		public int compare(String s1, String s2)
-		{
-			return s1.length() - s2.length();
-		}
-	}
-}
@@ -1,16 +1,13 @@
 package com.earth2me.essentials;

-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IJails;
 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;
@@ -26,299 +23,242 @@ import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.plugin.PluginManager;

+import java.io.File;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;

-public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Jails> implements IJails
-{
-	private static final transient Logger LOGGER = Bukkit.getLogger();
-	private static transient boolean enabled = false;
-
-	public Jails(final IEssentials ess)
-	{
-		super(ess, com.earth2me.essentials.settings.Jails.class);
-		reloadConfig();
-	}
-
-	private void registerListeners()
-	{
-		enabled = true;
-		final PluginManager pluginManager = ess.getServer().getPluginManager();
-		final JailListener blockListener = new JailListener();
-		pluginManager.registerEvents(blockListener, ess);
-	}
-
-	@Override
-	public File getStorageFile()
-	{
-		return new File(ess.getDataFolder(), "jail.yml");
-	}
-
-	@Override
-	public void finishRead()
-	{
-		if (enabled == false && getCount() > 0)
-		{
-			registerListeners();
-		}
-	}
-
-	@Override
-	public void finishWrite()
-	{
-		if (enabled == false)
-		{
-			registerListeners();
-		}
-	}
-
-	@Override
-	public Location getJail(final String jailName) throws Exception
-	{
-		acquireReadLock();
-		try
-		{
-			if (getData().getJails() == null || jailName == null
-				|| !getData().getJails().containsKey(jailName.toLowerCase(Locale.ENGLISH)))
-			{
-				throw new Exception(_("jailNotExist"));
-			}
-			Location loc = getData().getJails().get(jailName.toLowerCase(Locale.ENGLISH));
-			if (loc == null || loc.getWorld() == null)
-			{
-				throw new Exception(_("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.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;
-		}
-	}
+import static com.earth2me.essentials.I18n.tl;


-	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);
-			}
-		}
+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;

-		@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);
-			}
-		}
+    public Jails(final IEssentials ess) {
+        super(ess, com.earth2me.essentials.settings.Jails.class);
+        reloadConfig();
+    }

-		@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);
-			}
-		}
+    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");
+        }
+    }

-		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-		public void onEntityDamageByEntity(final EntityDamageByEntityEvent event)
-		{
-			if (event.getCause() != DamageCause.ENTITY_ATTACK || event.getEntity().getType() != EntityType.PLAYER)
-			{
-				return;
-			}
-			final Entity damager = event.getDamager();
-			if (damager.getType() == EntityType.PLAYER)
-			{
-				final User user = ess.getUser(damager);
-				if (user != null && user.isJailed())
-				{
-					event.setCancelled(true);
-				}
-			}
-		}
+    @Override
+    public File getStorageFile() {
+        return new File(ess.getDataFolder(), "jail.yml");
+    }

-		@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);
-			}
-		}
+    @Override
+    public void finishRead() {
+        checkRegister();
+    }

-		@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;
-			}
+    @Override
+    public void finishWrite() {
+        checkRegister();
+    }

-			try
-			{
-				event.setRespawnLocation(getJail(user.getJail()));
-			}
-			catch (Exception ex)
-			{
-				if (ess.getSettings().isDebug())
-				{
-					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
-				}
-				else
-				{
-					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
-				}
-			}
-		}
+    public void resetListener() {
+        enabled = false;
+        checkRegister();
+    }

-		@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;
-			}
+    private void checkRegister() {
+        if (enabled == false && getCount() > 0) {
+            registerListeners();
+        }
+    }

-			try
-			{
-				event.setTo(getJail(user.getJail()));
-			}
-			catch (Exception ex)
-			{
-				if (ess.getSettings().isDebug())
-				{
-					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
-				}
-				else
-				{
-					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
-				}
-			}
-			user.sendMessage(_("jailMessage"));
-		}
+    @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();
+        }
+    }

-		@EventHandler(priority = EventPriority.HIGHEST)
-		public void onPlayerJoin(final PlayerJoinEvent event)
-		{
-			final User user = ess.getUser(event.getPlayer());
-			if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
-			{
-				return;
-			}
+    @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();
+        }
+    }

-			try
-			{
-				sendToJail(user, user.getJail());
-			}
-			catch (Exception ex)
-			{
-				if (ess.getSettings().isDebug())
-				{
-					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
-				}
-				else
-				{
-					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
-				}
-			}
-			user.sendMessage(_("jailMessage"));
-		}
-	}
+    @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 onJailBlockBreak(final BlockBreakEvent event) {
+            final User user = ess.getUser(event.getPlayer());
+            if (user.isJailed()) {
+                event.setCancelled(true);
+            }
+        }
+
+        @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+        public void onJailBlockPlace(final BlockPlaceEvent event) {
+            final User user = ess.getUser(event.getPlayer());
+            if (user.isJailed()) {
+                event.setCancelled(true);
+            }
+        }
+
+        @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+        public void onJailBlockDamage(final BlockDamageEvent event) {
+            final User user = ess.getUser(event.getPlayer());
+            if (user.isJailed()) {
+                event.setCancelled(true);
+            }
+        }
+
+        @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+        public void onJailEntityDamageByEntity(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 onJailPlayerInteract(final PlayerInteractEvent event) {
+            final User user = ess.getUser(event.getPlayer());
+            if (user.isJailed()) {
+                event.setCancelled(true);
+            }
+        }
+
+        @EventHandler(priority = EventPriority.HIGHEST)
+        public void onJailPlayerRespawn(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 onJailPlayerTeleport(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 onJailPlayerJoin(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"));
+        }
+    }
 }
@@ -1,193 +1,214 @@
 package com.earth2me.essentials;

-import static com.earth2me.essentials.I18n._;
-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 java.util.*;
-import java.util.logging.Level;
+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 net.ess3.api.IEssentials;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;

+import java.math.BigDecimal;
+import java.util.*;
+import java.util.logging.Level;

-public class Kit
-{
-	//TODO: Convert this to use one of the new text classes?
-	public static String listKits(final IEssentials ess, final User user) throws Exception
-	{
-		try
-		{
-			final ConfigurationSection kits = ess.getSettings().getKits();
-			final StringBuilder list = new StringBuilder();
-			for (String kiteItem : kits.getKeys(false))
-			{
-				if (user == null || user.isAuthorized("essentials.kits." + kiteItem.toLowerCase(Locale.ENGLISH)))
-				{
-					list.append(" ").append(capitalCase(kiteItem));
-				}
-			}
-			return list.toString().trim();
-		}
-		catch (Exception ex)
-		{
-			throw new Exception(_("kitError"), ex);
-		}
+import static com.earth2me.essentials.I18n.tl;

-	}

-	public static void checkTime(final User user, final String kitName, final Map<String, Object> els) throws Exception
-	{
-		if (user.isAuthorized("essentials.kit.exemptdelay")) {
-			return;
-		}
-		
-		final Calendar time = new GregorianCalendar();
+public class Kit {
+    final IEssentials ess;
+    final String kitName;
+    final Map<String, Object> kit;
+    final Trade charge;

-		// Take the current time, and remove the delay from it.
-		final double delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0.0d;
-		final Calendar earliestTime = new GregorianCalendar();
-		earliestTime.add(Calendar.SECOND, -(int)delay);
-		earliestTime.add(Calendar.MILLISECOND, -(int)((delay * 1000.0) % 1000.0));
-		// This value contains the most recent time a kit could have been used that would allow another use.
-		final long earliestLong = earliestTime.getTimeInMillis();
+    public Kit(final String kitName, final IEssentials ess) throws Exception {
+        this.kitName = kitName;
+        this.ess = ess;
+        this.kit = ess.getKits().getKit(kitName);
+        this.charge = new Trade("kit-" + kitName, new Trade("kit-kit", ess), ess);

-		// When was the last kit used?
-		final long lastTime = user.getKitTimestamp(kitName);
+        if (kit == null) {
+            throw new Exception(tl("kitNotFound"));
+        }
+    }

-		if (lastTime < earliestLong || lastTime == 0L)
-		{
-			user.setKitTimestamp(kitName, time.getTimeInMillis());
-		}
-		else if (lastTime > time.getTimeInMillis())
-		{
-			// This is to make sure time didn't get messed up on last kit use.
-			// If this happens, let's give the user the benifit of the doubt.
-			user.setKitTimestamp(kitName, time.getTimeInMillis());
-		}
-		else if (earliestLong < 0L)
-		{
-			user.sendMessage(_("kitOnce"));
-			throw new NoChargeException();
-		}
-		else
-		{
-			time.setTimeInMillis(lastTime);
-			time.add(Calendar.SECOND, (int)delay);
-			time.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
-			user.sendMessage(_("kitTimed", Util.formatDateDiff(time.getTimeInMillis())));
-			throw new NoChargeException();
-		}
-	}
+    public String getName() {
+        return kitName;
+    }

-	public static List<String> getItems(final User user, final Map<String, Object> kit) throws Exception
-	{
-		if (kit == null)
-		{
-			throw new Exception(_("kitError2"));
-		}
-	
+    public void checkPerms(final User user) throws Exception {
+        if (!user.isAuthorized("essentials.kits." + kitName)) {
+            throw new Exception(tl("noKitPermission", "essentials.kits." + kitName));
+        }
+    }

-		try
-		{
-			return (List<String>)kit.get("items");
-		}
-		catch (Exception e)
-		{
-			user.sendMessage(_("kitError2"));
-			throw new Exception(_("kitErrorHelp"), e);
-		}
-	}
+    public void checkDelay(final User user) throws Exception {
+        long nextUse = getNextUse(user);

-	public static void expandItems(final IEssentials ess, final User user, final List<String> items) throws Exception
-	{
-		try
-		{
-			boolean spew = false;
-			for (String d : items)
-			{
-				if (d.startsWith(ess.getSettings().getCurrencySymbol())) 
-				{
-					Double value = Double.parseDouble(d.substring(ess.getSettings().getCurrencySymbol().length()).trim());
-					Trade t = new Trade(value, ess);
-					t.pay(user);
-					continue;
-				}
-				final String[] parts = d.split(" ");
-				final String[] item = parts[0].split("[:+',;.]", 2);
-				final int id = Material.getMaterial(Integer.parseInt(item[0])).getId();
-				final short data = item.length > 1 ? Short.parseShort(item[1]) : 0;
-				final int amount = parts.length > 1 ? Integer.parseInt(parts[1]) : 1;
+        if (nextUse == 0L) {
+            return;
+        } else if (nextUse < 0L) {
+            user.sendMessage(tl("kitOnce"));
+            throw new NoChargeException();
+        } else {
+            user.sendMessage(tl("kitTimed", DateUtil.formatDateDiff(nextUse)));
+            throw new NoChargeException();
+        }
+    }

-				final ItemStack stack = new ItemStack(id, amount, data);
-				if (parts.length > 2)
-				{
-					for (int i = 2; i < parts.length; i++)
-					{
-						final String[] split = parts[i].split("[:+',;.]", 2);
-						if (split.length < 1)
-						{
-							continue;
-						}
-						final Enchantment enchantment = Enchantments.getByName(split[0]);
-						if (enchantment == null)
-						{
-							throw new Exception("Enchantment not found: " + split[0]);
-						}
-						int level;
-						if (split.length > 1)
-						{
-							level = Integer.parseInt(split[1]);
-						}
-						else
-						{
-							level = enchantment.getMaxLevel();
-						}
-						try
-						{
-							stack.addEnchantment(enchantment, level);
-						}
-						catch (Exception ex)
-						{
-							throw new Exception("Enchantment " + enchantment.getName() + ": " + ex.getMessage(), ex);
-						}
-					}
-				}
+    public void checkAffordable(final User user) throws Exception {
+        charge.isAffordableFor(user);
+    }

-				final Map<Integer, ItemStack> overfilled;
-				if (user.isAuthorized("essentials.oversizedstacks"))
-				{
-					overfilled = InventoryWorkaround.addOversizedItems(user.getInventory(), ess.getSettings().getOversizedStackSize(), stack);
-				}
-				else
-				{
-					overfilled = InventoryWorkaround.addItems(user.getInventory(), stack);
-				}
-				for (ItemStack itemStack : overfilled.values())
-				{
-					user.getWorld().dropItemNaturally(user.getLocation(), itemStack);
-					spew = true;
-				}
-			}
-			user.updateInventory();
-			if (spew)
-			{
-				user.sendMessage(_("kitInvFull"));
-			}
-		}
-		catch (Exception e)
-		{
-			user.updateInventory();
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().log(Level.WARNING, e.getMessage());
-			}
-			else
-			{
-				ess.getLogger().log(Level.WARNING, e.getMessage());
-			}
-			throw new Exception(_("kitError2"), e);
-		}
-	}
+    public void setTime(final User user) throws Exception {
+        final Calendar time = new GregorianCalendar();
+        user.setKitTimestamp(kitName, time.getTimeInMillis());
+    }
+
+    public void chargeUser(final User user) throws Exception {
+        charge.charge(user);
+    }
+
+    public long getNextUse(final User user) 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 = kit.containsKey("delay") ? ((Number) kit.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 benefit 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();
+        }
+    }
+
+    @Deprecated
+    public List<String> getItems(final User user) throws Exception {
+        return getItems();
+    }
+
+    public List<String> getItems() 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 void expandItems(final User user) throws Exception {
+        expandItems(user, getItems(user));
+    }
+
+    public void expandItems(final User user, final List<String> items) throws Exception {
+        try {
+            IText input = new SimpleTextInput(items);
+            IText output = new KeywordReplacer(input, user.getSource(), ess, true, true);
+
+            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;
+                }
+
+                if (kitItem.startsWith("/")) {
+                    String command = kitItem.substring(1);
+                    String name = user.getName();
+                    command = command.replace("{player}", name);
+                    Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
+                    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);
+        }
+    }
 }
@@ -0,0 +1,114 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.utils.NumberUtil;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.MemoryConfiguration;
+
+import java.io.File;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import static com.earth2me.essentials.I18n.capitalCase;
+import static com.earth2me.essentials.I18n.tl;
+
+public class Kits implements IConf {
+
+    private final EssentialsConf config;
+    private ConfigurationSection kits;
+
+    public Kits(final IEssentials essentials) {
+        config = new EssentialsConf(new File(essentials.getDataFolder(), "kits.yml"));
+        config.setTemplateName("/kits.yml");
+
+        reloadConfig();
+    }
+
+    @Override
+    public void reloadConfig() {
+        config.load();
+        kits = _getKits();
+    }
+
+    private ConfigurationSection _getKits() {
+        if (config.isConfigurationSection("kits")) {
+            final ConfigurationSection section = config.getConfigurationSection("kits");
+            final ConfigurationSection newSection = new MemoryConfiguration();
+            for (String kitItem : section.getKeys(false)) {
+                if (section.isConfigurationSection(kitItem)) {
+                    newSection.set(kitItem.toLowerCase(Locale.ENGLISH), section.getConfigurationSection(kitItem));
+                }
+            }
+            return newSection;
+        }
+        return null;
+    }
+
+    public EssentialsConf getConfig() {
+        return config;
+    }
+
+    public ConfigurationSection getKits() {
+        return kits;
+    }
+
+    public Map<String, Object> getKit(String name) {
+        name = name.replace('.', '_').replace('/', '_');
+        if (getKits() != null) {
+            final ConfigurationSection kits = getKits();
+            // For some reason, YAML doesn't sees keys as always lowercase even if they aren't defined like that.
+            // Workaround is to toLowercase when getting from the config, but showing normally elsewhere.
+            // ODDLY ENOUGH when you get the configuration section for ALL kits, it will return the proper
+            // case of each kit. But when you check for each kit's configuration section, it won't return the kit
+            // you just found if you don't toLowercase it.
+            if (kits.isConfigurationSection(name.toLowerCase())) {
+                return kits.getConfigurationSection(name.toLowerCase()).getValues(true);
+            } else {
+            }
+        }
+
+        return null;
+    }
+
+    public void addKit(String name, List<String> lines, long delay) {
+        // Will overwrite but w/e
+        config.set("kits." + name + ".delay", delay);
+        config.set("kits." + name + ".items", lines);
+        kits = _getKits();
+        config.save();
+    }
+
+    public String listKits(final net.ess3.api.IEssentials ess, final User user) throws Exception {
+        try {
+            final ConfigurationSection kits = config.getConfigurationSection("kits");
+            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));
+                    }
+
+                    Kit kit = new Kit(kitItem, ess);
+                    double nextUse = kit.getNextUse(user);
+                    if (nextUse == -1 && ess.getSettings().isSkippingUsedOneTimeKitsFromKitList()) {
+                        continue;
+                    } else if (nextUse != 0) {
+                        name = tl("kitDelay", name);
+                    }
+
+                    list.append(" ").append(name).append(cost);
+                }
+            }
+            return list.toString().trim();
+        } catch (Exception ex) {
+            throw new Exception(tl("kitError"), ex);
+        }
+
+    }
+}
@@ -0,0 +1,17 @@
+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;
+    }
+}
@@ -1,6 +1,8 @@
 package com.earth2me.essentials;

-import static com.earth2me.essentials.I18n._;
+import net.ess3.api.IEssentials;
+import org.bukkit.Bukkit;
+
 import java.io.*;
 import java.math.BigInteger;
 import java.security.DigestInputStream;
@@ -11,217 +13,155 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
-import org.bukkit.Bukkit;
+
+import static com.earth2me.essentials.I18n.tl;


-public class ManagedFile
-{
-	private final static int BUFFERSIZE = 1024 * 8;
-	private final transient File file;
+public class ManagedFile {
+    private static final int BUFFERSIZE = 1024 * 8;
+    private final transient File file;

-	public ManagedFile(final String filename, final IEssentials ess)
-	{
-		file = new File(ess.getDataFolder(), filename);
+    public ManagedFile(final String filename, final IEssentials ess) {
+        file = new File(ess.getDataFolder(), filename);

-		if (file.exists())
-		{
-			try
-			{
-				if (checkForVersion(file, ess.getDescription().getVersion()) && !file.delete())
-				{
-					throw new IOException("Could not delete file " + file.toString());
-				}
-			}
-			catch (IOException ex)
-			{
-				Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
-			}
-		}
+        if (file.exists()) {
+            try {
+                if (checkForVersion(file, ess.getDescription().getVersion()) && !file.delete()) {
+                    throw new IOException("Could not delete file " + file.toString());
+                }
+            } catch (IOException ex) {
+                Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+            }
+        }

-		if (!file.exists())
-		{
-			try
-			{
-				copyResourceAscii("/" + filename, file);
-			}
-			catch (IOException ex)
-			{
-				Bukkit.getLogger().log(Level.SEVERE, _("itemsCsvNotLoaded"), ex);
-			}
-		}
-	}
+        if (!file.exists()) {
+            try {
+                copyResourceAscii("/" + filename, file);
+            } catch (IOException ex) {
+                Bukkit.getLogger().log(Level.SEVERE, tl("itemsCsvNotLoaded"), ex);
+            }
+        }
+    }

-	public static void copyResourceAscii(final String resourceName, final File file) throws IOException
-	{
-		final InputStreamReader reader = new InputStreamReader(ManagedFile.class.getResourceAsStream(resourceName));
-		try
-		{
-			final MessageDigest digest = getDigest();
-			final DigestOutputStream digestStream = new DigestOutputStream(new FileOutputStream(file), digest);
-			try
-			{
-				final OutputStreamWriter writer = new OutputStreamWriter(digestStream);
-				try
-				{
-					final char[] buffer = new char[BUFFERSIZE];
-					do
-					{
-						final int length = reader.read(buffer);
-						if (length >= 0)
-						{
-							writer.write(buffer, 0, length);
-						}
-						else
-						{
-							break;
-						}
-					}
-					while (true);
-					writer.write("\n");
-					writer.flush();
-					final BigInteger hashInt = new BigInteger(1, digest.digest());
-					digestStream.on(false);
-					digestStream.write('#');
-					digestStream.write(hashInt.toString(16).getBytes());
-				}
-				finally
-				{
-					writer.close();
-				}
-			}
-			finally
-			{
-				digestStream.close();
-			}
-		}
-		finally
-		{
-			reader.close();
-		}
-	}
+    public static void copyResourceAscii(final String resourceName, final File file) throws IOException {
+        final InputStreamReader reader = new InputStreamReader(ManagedFile.class.getResourceAsStream(resourceName));
+        try {
+            final MessageDigest digest = getDigest();
+            final DigestOutputStream digestStream = new DigestOutputStream(new FileOutputStream(file), digest);
+            try {
+                final OutputStreamWriter writer = new OutputStreamWriter(digestStream);
+                try {
+                    final char[] buffer = new char[BUFFERSIZE];
+                    do {
+                        final int length = reader.read(buffer);
+                        if (length >= 0) {
+                            writer.write(buffer, 0, length);
+                        } else {
+                            break;
+                        }
+                    } while (true);
+                    writer.write("\n");
+                    writer.flush();
+                    final BigInteger hashInt = new BigInteger(1, digest.digest());
+                    digestStream.on(false);
+                    digestStream.write('#');
+                    digestStream.write(hashInt.toString(16).getBytes());
+                } finally {
+                    writer.close();
+                }
+            } finally {
+                digestStream.close();
+            }
+        } finally {
+            reader.close();
+        }
+    }

-	public static boolean checkForVersion(final File file, final String version) throws IOException
-	{
-		if (file.length() < 33)
-		{
-			return false;
-		}
-		final BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
-		try
-		{
-			final byte[] buffer = new byte[(int)file.length()];
-			int position = 0;
-			do
-			{
-				final int length = bis.read(buffer, position, Math.min((int)file.length() - position, BUFFERSIZE));
-				if (length < 0)
-				{
-					break;
-				}
-				position += length;
-			}
-			while (position < file.length());
-			final ByteArrayInputStream bais = new ByteArrayInputStream(buffer);
-			if (bais.skip(file.length() - 33) != file.length() - 33)
-			{
-				return false;
-			}
-			final BufferedReader reader = new BufferedReader(new InputStreamReader(bais));
-			try
-			{
-				String hash = reader.readLine();
-				if (hash != null && hash.matches("#[a-f0-9]{32}"))
-				{
-					hash = hash.substring(1);
-					bais.reset();
-					final String versionline = reader.readLine();
-					if (versionline != null && versionline.matches("#version: .+"))
-					{
-						final String versioncheck = versionline.substring(10);
-						if (!versioncheck.equalsIgnoreCase(version))
-						{
-							bais.reset();
-							final MessageDigest digest = getDigest();
-							final DigestInputStream digestStream = new DigestInputStream(bais, digest);
-							try
-							{
-								final byte[] bytes = new byte[(int)file.length() - 33];
-								digestStream.read(bytes);
-								final BigInteger correct = new BigInteger(hash, 16);
-								final BigInteger test = new BigInteger(1, digest.digest());
-								if (correct.equals(test))
-								{
-									return true;
-								}
-								else
-								{
-									Bukkit.getLogger().warning("File " + file.toString() + " has been modified by user and file version differs, please update the file manually.");
-								}
-							}
-							finally
-							{
-								digestStream.close();
-							}
-						}
-					}
-				}
-			}
-			finally
-			{
-				reader.close();
-			}
-		}
-		finally
-		{
-			bis.close();
-		}
-		return false;
-	}
+    public static boolean checkForVersion(final File file, final String version) throws IOException {
+        if (file.length() < 33) {
+            return false;
+        }
+        final BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
+        try {
+            final byte[] buffer = new byte[(int) file.length()];
+            int position = 0;
+            do {
+                final int length = bis.read(buffer, position, Math.min((int) file.length() - position, BUFFERSIZE));
+                if (length < 0) {
+                    break;
+                }
+                position += length;
+            } while (position < file.length());
+            final ByteArrayInputStream bais = new ByteArrayInputStream(buffer);
+            if (bais.skip(file.length() - 33) != file.length() - 33) {
+                return false;
+            }
+            final BufferedReader reader = new BufferedReader(new InputStreamReader(bais));
+            try {
+                String hash = reader.readLine();
+                if (hash != null && hash.matches("#[a-f0-9]{32}")) {
+                    hash = hash.substring(1);
+                    bais.reset();
+                    final String versionline = reader.readLine();
+                    if (versionline != null && versionline.matches("#version: .+")) {
+                        final String versioncheck = versionline.substring(10);
+                        if (!versioncheck.equalsIgnoreCase(version)) {
+                            bais.reset();
+                            final MessageDigest digest = getDigest();
+                            final DigestInputStream digestStream = new DigestInputStream(bais, digest);
+                            try {
+                                final byte[] bytes = new byte[(int) file.length() - 33];
+                                digestStream.read(bytes);
+                                final BigInteger correct = new BigInteger(hash, 16);
+                                final BigInteger test = new BigInteger(1, digest.digest());
+                                if (correct.equals(test)) {
+                                    return true;
+                                } else {
+                                    Bukkit.getLogger().warning("File " + file.toString() + " has been modified by user and file version differs, please update the file manually.");
+                                }
+                            } finally {
+                                digestStream.close();
+                            }
+                        }
+                    }
+                }
+            } finally {
+                reader.close();
+            }
+        } finally {
+            bis.close();
+        }
+        return false;
+    }

-	public static MessageDigest getDigest() throws IOException
-	{
-		try
-		{
-			return MessageDigest.getInstance("MD5");
-		}
-		catch (NoSuchAlgorithmException ex)
-		{
-			throw new IOException(ex);
-		}
-	}
+    public static MessageDigest getDigest() throws IOException {
+        try {
+            return MessageDigest.getInstance("MD5");
+        } catch (NoSuchAlgorithmException ex) {
+            throw new IOException(ex);
+        }
+    }

-	public List<String> getLines()
-	{
-		try
-		{
-			final BufferedReader reader = new BufferedReader(new FileReader(file));
-			try
-			{
-				final List<String> lines = new ArrayList<String>();
-				do
-				{
-					final String line = reader.readLine();
-					if (line == null)
-					{
-						break;
-					}
-					else
-					{
-						lines.add(line);
-					}
-				}
-				while (true);
-				return lines;
-			}
-			finally
-			{
-				reader.close();
-			}
-		}
-		catch (IOException ex)
-		{
-			Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
-			return Collections.emptyList();
-		}
-	}
+    public List<String> getLines() {
+        try {
+            final BufferedReader reader = new BufferedReader(new FileReader(file));
+            try {
+                final List<String> lines = new ArrayList<String>();
+                do {
+                    final String line = reader.readLine();
+                    if (line == null) {
+                        break;
+                    } else {
+                        lines.add(line);
+                    }
+                } while (true);
+                return lines;
+            } finally {
+                reader.close();
+            }
+        } catch (IOException ex) {
+            Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+            return Collections.emptyList();
+        }
+    }
 }
@@ -0,0 +1,581 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.textreader.BookInput;
+import com.earth2me.essentials.textreader.BookPager;
+import com.earth2me.essentials.textreader.IText;
+import com.earth2me.essentials.utils.EnumUtil;
+import com.earth2me.essentials.utils.FormatUtil;
+import com.earth2me.essentials.utils.MaterialUtil;
+import com.earth2me.essentials.utils.NumberUtil;
+import com.google.common.base.Joiner;
+import net.ess3.api.IEssentials;
+import net.ess3.nms.refl.ReflUtil;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.bukkit.Color;
+import org.bukkit.DyeColor;
+import org.bukkit.FireworkEffect;
+import org.bukkit.Material;
+import org.bukkit.block.Banner;
+import org.bukkit.block.banner.PatternType;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.ItemFlag;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.*;
+import org.bukkit.potion.Potion;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.regex.Pattern;
+
+import static com.earth2me.essentials.I18n.tl;
+
+
+public class MetaItemStack {
+    private static final Map<String, DyeColor> colorMap = new HashMap<>();
+    private static final Map<String, FireworkEffect.Type> fireworkShape = new HashMap<>();
+
+    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 isSplashPotion = 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;
+        isSplashPotion = false;
+        completePotion = true;
+    }
+
+    public boolean canSpawn(final IEssentials ess) {
+        try {
+            ess.getServer().getUnsafe().modifyItemStack(stack.clone(), "{}");
+            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("{") && hasMetaPermission(sender, "vanilla", false, true, ess)) {
+            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;
+        }
+
+        Material WRITTEN_BOOK = EnumUtil.getMaterial("WRITTEN_BOOK");
+
+        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[0].equalsIgnoreCase("unbreakable") && hasMetaPermission(sender, "unbreakable", false, true, ess)) {
+            boolean value = split.length > 1 ? Boolean.valueOf(split[1]) : true;
+            setUnbreakable(stack, value);
+        } else if (split.length > 1 && (split[0].equalsIgnoreCase("player") || split[0].equalsIgnoreCase("owner")) && hasMetaPermission(sender, "head", false, true, ess)) {
+            if (MaterialUtil.isPlayerHead(stack.getType(), stack.getDurability())) {
+                final String owner = split[1];
+                final SkullMeta meta = (SkullMeta) stack.getItemMeta();
+                meta.setOwningPlayer(ess.getServer().getOfflinePlayer(owner));
+                stack.setItemMeta(meta);
+            } else {
+                throw new Exception(tl("onlyPlayerSkulls"));
+            }
+        } else if (split.length > 1 && split[0].equalsIgnoreCase("book") && stack.getType() == 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() == 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() == 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") && (MaterialUtil.isFirework(stack.getType()))&& 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 (split.length > 1 && split[0].equalsIgnoreCase("itemflags") && hasMetaPermission(sender, "itemflags", false, true, ess)) {
+            addItemFlags(string);
+        } else if (MaterialUtil.isFirework(stack.getType())) {//WARNING - Meta for fireworks will be ignored after this point.
+            addFireworkMeta(sender, false, string, ess);
+        } else if (MaterialUtil.isPotion(stack.getType())) { //WARNING - Meta for potions will be ignored after this point.
+            addPotionMeta(sender, false, string, ess);
+        } else if (MaterialUtil.isBanner(stack.getType())) {
+            //WARNING - Meta for banners will be ignored after this point.
+            addBannerMeta(sender, false, string, ess);
+        } else if (split.length > 1 && (split[0].equalsIgnoreCase("color") || split[0].equalsIgnoreCase("colour")) && MaterialUtil.isLeatherArmor(stack.getType())) {
+            final String[] color = split[1].split("(\\||,)");
+            if (color.length == 1 && (NumberUtil.isInt(color[0]) || color[0].startsWith("#"))) {
+                // Either integer or hexadecimal
+                final LeatherArmorMeta meta = (LeatherArmorMeta) stack.getItemMeta();
+                String input = color[0];
+                if (input.startsWith("#")) { // Hex
+                    meta.setColor(Color.fromRGB(
+                        Integer.valueOf(input.substring(1, 3), 16),
+                        Integer.valueOf(input.substring(3, 5), 16),
+                        Integer.valueOf(input.substring(5, 7), 16)));
+                } else { // Int
+                    meta.setColor(Color.fromRGB(Integer.parseInt(input)));
+                }
+                stack.setItemMeta(meta);
+            } else if (color.length == 3) { // r,g,b
+                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 addItemFlags(final String string) throws Exception {
+        String[] separate = splitPattern.split(string, 2);
+        if (separate.length != 2) {
+            throw new Exception(tl("invalidItemFlagMeta", string));
+        }
+
+        String[] split = separate[1].split(",");
+        ItemMeta meta = stack.getItemMeta();
+
+        for (String s : split) {
+            for (ItemFlag flag : ItemFlag.values()) {
+                if (s.equalsIgnoreCase(flag.name())) {
+                    meta.addItemFlags(flag);
+                }
+            }
+        }
+
+        if (meta.getItemFlags().isEmpty()) {
+            throw new Exception(tl("invalidItemFlagMeta", string));
+        }
+
+        stack.setItemMeta(meta);
+    }
+
+    public void addFireworkMeta(final CommandSource sender, final boolean allowShortName, final String string, final IEssentials ess) throws Exception {
+    if (MaterialUtil.isFirework(stack.getType())) {
+            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 (MaterialUtil.isPotion(stack.getType())) {
+            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]));
+                }
+            } else if (split[0].equalsIgnoreCase("splash") || (allowShortName && split[0].equalsIgnoreCase("s"))) {
+                isSplashPotion = Boolean.valueOf(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);
+                if (ReflUtil.getNmsVersionObject().isHigherThanOrEqualTo(ReflUtil.V1_9_R1)) {
+                    if (isSplashPotion && stack.getType() != Material.SPLASH_POTION) {
+                        stack.setType(Material.SPLASH_POTION);
+                    } else if (!isSplashPotion && stack.getType() != Material.POTION) {
+                        stack.setType(Material.POTION);
+                    }
+                } else {
+                    Potion potion = Potion.fromItemStack(stack);
+                    potion.setSplash(isSplashPotion);
+                    potion.apply(stack);
+                }
+                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;
+    }
+
+    public void addBannerMeta(final CommandSource sender, final boolean allowShortName, final String string, final IEssentials ess) throws Exception {
+        if (MaterialUtil.isBanner(stack.getType()) && !stack.getType().toString().equals("SHIELD") && string != null) {
+            final String[] split = splitPattern.split(string, 2);
+
+            if (split.length < 2) {
+                throw new Exception(tl("invalidBanner", split[1]));
+            }
+
+            PatternType patternType = null;
+            try {
+                patternType = PatternType.valueOf(split[0]);
+            } catch (Exception ignored ) {}
+
+            final BannerMeta meta = (BannerMeta) stack.getItemMeta();
+            if (split[0].equalsIgnoreCase("basecolor")) {
+                Color color = Color.fromRGB(Integer.valueOf(split[1]));
+                meta.setBaseColor(DyeColor.getByColor(color));
+            } else if (patternType != null) {
+                PatternType type = PatternType.valueOf(split[0]);
+                DyeColor color = DyeColor.getByColor(Color.fromRGB(Integer.valueOf(split[1])));
+                org.bukkit.block.banner.Pattern pattern = new org.bukkit.block.banner.Pattern(color, type);
+                meta.addPattern(pattern);
+            }
+
+            stack.setItemMeta(meta);
+        } else if (stack.getType().toString().equals("SHIELD") && string != null) {
+            final String[] split = splitPattern.split(string, 2);
+
+            if (split.length < 2) {
+                throw new Exception(tl("invalidBanner", split[1]));
+            }
+
+            PatternType patternType = null;
+            try {
+                patternType = PatternType.valueOf(split[0]);
+            } catch (Exception ignored ) {}
+
+            // Hacky fix for accessing Shield meta - https://github.com/drtshock/Essentials/pull/745#issuecomment-234843795
+            BlockStateMeta meta = (BlockStateMeta) stack.getItemMeta();
+            Banner banner = (Banner) meta.getBlockState();
+            if (split[0].equalsIgnoreCase("basecolor")) {
+                Color color = Color.fromRGB(Integer.valueOf(split[1]));
+                banner.setBaseColor(DyeColor.getByColor(color));
+            } else if (patternType != null) {
+                PatternType type = PatternType.valueOf(split[0]);
+                DyeColor color = DyeColor.getByColor(Color.fromRGB(Integer.valueOf(split[1])));
+                org.bukkit.block.banner.Pattern pattern = new org.bukkit.block.banner.Pattern(color, type);
+                banner.addPattern(pattern);
+            }
+            banner.update();
+            meta.setBlockState(banner);
+            stack.setItemMeta(meta);
+        }
+    }
+
+    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));
+        }
+    }
+
+    private static int bukkitUnbreakableSupport = -1;
+    private static Method spigotMethod;
+    private static Method setUnbreakableMethod;
+
+    private void setUnbreakable(ItemStack is, boolean unbreakable) {
+        ItemMeta meta = is.getItemMeta();
+        try {
+            if (bukkitUnbreakableSupport == -1) {
+                try {
+                    ItemMeta.class.getDeclaredMethod("setUnbreakable", boolean.class);
+                    bukkitUnbreakableSupport = 1;
+                } catch (NoSuchMethodException | SecurityException ex) {
+                    bukkitUnbreakableSupport = 0;
+                }
+            }
+
+            if (bukkitUnbreakableSupport == 1) {
+                meta.setUnbreakable(unbreakable);
+            } else {
+                if (spigotMethod == null) {
+                    spigotMethod = meta.getClass().getDeclaredMethod("spigot");
+                    spigotMethod.setAccessible(true);
+                }
+                Object itemStackSpigot = spigotMethod.invoke(meta);
+                if (setUnbreakableMethod == null) {
+                    setUnbreakableMethod = itemStackSpigot.getClass().getDeclaredMethod("setUnbreakable", Boolean.TYPE);
+                    setUnbreakableMethod.setAccessible(true);
+                }
+                setUnbreakableMethod.invoke(itemStackSpigot, unbreakable);
+            }
+            is.setItemMeta(meta);
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+    }
+}
@@ -1,127 +1,173 @@
 package com.earth2me.essentials;

-import static com.earth2me.essentials.I18n._;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.World;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
+
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static com.earth2me.essentials.I18n.tl;


 // Suffixes can be appended on the end of a mob name to make it plural
 // Entities without a suffix, will default to 's'
-public enum Mob
-{
-	CHICKEN("Chicken", Enemies.FRIENDLY, EntityType.CHICKEN),
-	COW("Cow", Enemies.FRIENDLY, EntityType.COW),
-	CREEPER("Creeper", Enemies.ENEMY, EntityType.CREEPER),
-	GHAST("Ghast", Enemies.ENEMY, EntityType.GHAST),
-	GIANT("Giant", Enemies.ENEMY, EntityType.GIANT),
-	PIG("Pig", Enemies.FRIENDLY, EntityType.PIG),
-	PIGZOMB("PigZombie", Enemies.NEUTRAL, EntityType.PIG_ZOMBIE),
-	SHEEP("Sheep", Enemies.FRIENDLY, "", EntityType.SHEEP),
-	SKELETON("Skeleton", Enemies.ENEMY, EntityType.SKELETON),
-	SLIME("Slime", Enemies.ENEMY, EntityType.SLIME),
-	SPIDER("Spider", Enemies.ENEMY, EntityType.SPIDER),
-	SQUID("Squid", Enemies.FRIENDLY, EntityType.SQUID),
-	ZOMBIE("Zombie", Enemies.ENEMY, EntityType.ZOMBIE),
-	WOLF("Wolf", Enemies.NEUTRAL, EntityType.WOLF),
-	CAVESPIDER("CaveSpider", Enemies.ENEMY, EntityType.CAVE_SPIDER),
-	ENDERMAN("Enderman", Enemies.ENEMY, "", EntityType.ENDERMAN),
-	SILVERFISH("Silverfish", Enemies.ENEMY, "", EntityType.SILVERFISH),
-	ENDERDRAGON("EnderDragon", Enemies.ENEMY, EntityType.ENDER_DRAGON),
-	VILLAGER("Villager", Enemies.FRIENDLY, EntityType.VILLAGER),
-	BLAZE("Blaze", Enemies.ENEMY, EntityType.BLAZE),
-	MUSHROOMCOW("MushroomCow", Enemies.FRIENDLY, EntityType.MUSHROOM_COW),
-	MAGMACUBE("MagmaCube", Enemies.ENEMY, EntityType.MAGMA_CUBE),
-	SNOWMAN("Snowman", Enemies.FRIENDLY, "", EntityType.SNOWMAN),
-	OCELOT("Ocelot", Enemies.NEUTRAL, EntityType.OCELOT),
-	IRONGOLEM("IronGolem", Enemies.NEUTRAL, EntityType.IRON_GOLEM),
-	WITHER("Wither", Enemies.ENEMY, EntityType.WITHER),
-	BAT("Bat", Enemies.FRIENDLY, EntityType.BAT),
-	WITCH("Witch", Enemies.ENEMY, EntityType.WITCH);
-	
-	public static final Logger logger = Logger.getLogger("Minecraft");
+public enum Mob {
+    CHICKEN("Chicken", Enemies.FRIENDLY, EntityType.CHICKEN),
+    COW("Cow", Enemies.FRIENDLY, EntityType.COW),
+    CREEPER("Creeper", Enemies.ENEMY, EntityType.CREEPER),
+    GHAST("Ghast", Enemies.ENEMY, EntityType.GHAST),
+    GIANT("Giant", Enemies.ENEMY, EntityType.GIANT),
+    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, "EXPERIENCE_ORB"),
+    ARMOR_STAND("ArmorStand", Enemies.NEUTRAL, "ARMOR_STAND"),
+    ENDERMITE("Endermite", Enemies.ENEMY, "ENDERMITE"),
+    GUARDIAN("Guardian", Enemies.ENEMY, "GUARDIAN"),
+    ELDER_GUARDIAN("ElderGuardian", Enemies.ENEMY, "ELDER_GUARDIAN"),
+    RABBIT("Rabbit", Enemies.FRIENDLY, "RABBIT"),
+    SHULKER("Shulker", Enemies.ENEMY, "SHULKER"),
+    POLAR_BEAR("PolarBear", Enemies.NEUTRAL, "POLAR_BEAR"),
+    WITHER_SKELETON("WitherSkeleton", Enemies.ENEMY, "WITHER_SKELETON"),
+    STRAY_SKELETON("StraySkeleton", Enemies.ENEMY, "STRAY"),
+    ZOMBIE_VILLAGER("ZombieVillager", Enemies.FRIENDLY, "ZOMBIE_VILLAGER"),
+    SKELETON_HORSE("SkeletonHorse", Enemies.FRIENDLY, "SKELETON_HORSE"),
+    ZOMBIE_HORSE("ZombieHorse", Enemies.FRIENDLY, "ZOMBIE_HORSE"),
+    DONKEY("Donkey", Enemies.FRIENDLY, "DONKEY"),
+    MULE("Mule", Enemies.FRIENDLY, "MULE"),
+    EVOKER("Evoker", Enemies.ENEMY, "EVOKER"),
+    VEX("Vex", Enemies.ENEMY, "VEX"),
+    VINDICATOR("Vindicator", Enemies.ENEMY, "VINDICATOR"),
+    LLAMA("Llama", Enemies.NEUTRAL, "LLAMA"),
+    HUSK("Husk", Enemies.ENEMY, "HUSK"),
+    ILLUSIONER("Illusioner", Enemies.ENEMY, "ILLUSIONER"),
+    PARROT("Parrot", Enemies.NEUTRAL, "PARROT"),
+    TURTLE("Turtle", Enemies.NEUTRAL, "TURTLE"),
+    PHANTOM("Phantom", Enemies.ENEMY, "PHANTOM"),
+    COD("Cod", Enemies.NEUTRAL, "COD"),
+    SALMON("Salmon", Enemies.NEUTRAL, "SALMON"),
+    PUFFERFISH("Pufferfish", Enemies.NEUTRAL, "PUFFERFISH"),
+    TROPICAL_FISH("TropicalFish", Enemies.NEUTRAL, "TROPICAL_FISH"),
+    DROWNED("Drowned", Enemies.ENEMY, "DROWNED"),
+    DOLPHIN("Dolphin", Enemies.NEUTRAL, "DOLPHIN"),
+    ;

-	private Mob(String n, Enemies en, String s, EntityType type)
-	{
-		this.suffix = s;
-		this.name = n;
-		this.type = en;
-		this.bukkitType = type;
-	}
+    public static final Logger logger = Logger.getLogger("Essentials");

-	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 EntityType bukkitType;
-	private static final Map<String, Mob> hashMap = new HashMap<String, Mob>();
+    Mob(String n, Enemies en, String s, EntityType type) {
+        this.suffix = s;
+        this.name = n;
+        this.type = en;
+        this.bukkitType = type;
+    }

-	static
-	{
-		for (Mob mob : Mob.values())
-		{
-			hashMap.put(mob.name.toLowerCase(Locale.ENGLISH), mob);
-		}
-	}
+    Mob(String n, Enemies en, EntityType type) {
+        this.name = n;
+        this.type = en;
+        this.bukkitType = type;
+    }

-	public static Set<String> getMobList() {
-		return Collections.unmodifiableSet(hashMap.keySet());
-	}
+    Mob(String n, Enemies en, String typeName) {
+        this.name = n;
+        this.type = en;
+        EntityType entityType;
+        try {
+            entityType = EntityType.valueOf(typeName);
+        } catch (IllegalArgumentException ignored) {
+            entityType = null;
+        }
+        bukkitType = entityType;
+    }

-	public LivingEntity spawn(final Player player, final Server server, final Location loc) throws MobException
-	{
-		return spawn(player.getWorld(), server, loc);
-	}
-	
-	public LivingEntity spawn(final World world, final Server server, final Location loc) throws MobException
-	{
-		final LivingEntity entity = world.spawn(loc, (Class<? extends LivingEntity>)this.bukkitType.getEntityClass());
-		if (entity == null)
-		{
-			logger.log(Level.WARNING, _("unableToSpawnMob"));
-			throw new MobException();
-		}
-		return entity;
-	}
+    public String suffix = "s";
+    final public String name;
+    final public Enemies type;
+    final private EntityType bukkitType;
+    private static final Map<String, Mob> hashMap = new HashMap<>();
+    private static final Map<EntityType, Mob> bukkitMap = new HashMap<>();
+
+    static {
+        for (Mob mob : Mob.values()) {
+            hashMap.put(mob.name.toLowerCase(Locale.ENGLISH), mob);
+            if (mob.bukkitType != null) {
+                bukkitMap.put(mob.bukkitType, mob);
+            }
+        }
+    }
+
+    public static Set<String> getMobList() {
+        return Collections.unmodifiableSet(hashMap.keySet());
+    }
+
+    public Entity spawn(final World world, final Server server, final Location loc) throws MobException {
+        final Entity entity = world.spawn(loc, this.bukkitType.getEntityClass());
+        if (entity == null) {
+            logger.log(Level.WARNING, tl("unableToSpawnMob"));
+            throw new MobException();
+        }
+        return entity;
+    }


-	public enum Enemies
-	{
-		FRIENDLY("friendly"),
-		NEUTRAL("neutral"),
-		ENEMY("enemy");
+    public enum Enemies {
+        FRIENDLY("friendly"),
+        NEUTRAL("neutral"),
+        ENEMY("enemy");

-		private Enemies(final String type)
-		{
-			this.type = type;
-		}
-		final protected String type;
-	}
+        Enemies(final String type) {
+            this.type = type;
+        }

-	public EntityType getType()
-	{
-		return bukkitType;
-	}
+        final protected String type;
+    }

-	public static Mob fromName(final String name)
-	{
-		return hashMap.get(name.toLowerCase(Locale.ENGLISH));
-	}
+    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 class MobException extends Exception {
+        private static final long serialVersionUID = 1L;
+    }
 }
@@ -0,0 +1,272 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import com.earth2me.essentials.utils.EnumUtil;
+import com.earth2me.essentials.utils.StringUtil;
+import org.bukkit.DyeColor;
+import org.bukkit.Material;
+import org.bukkit.entity.*;
+import org.bukkit.inventory.EntityEquipment;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.material.Colorable;
+
+import java.util.*;
+import java.util.logging.Logger;
+
+import static com.earth2me.essentials.I18n.tl;
+
+
+public enum MobData {
+    BABY_AGEABLE("baby", Ageable.class, Data.BABY, true),
+    ADULT_AGEABLE("adult", Ageable.class, Data.ADULT, 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),
+    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),
+    SADDLE_HORSE("saddle", EntityType.HORSE, Data.HORSESADDLE, true),
+    GOLD_ARMOR_HORSE("goldarmor", EntityType.HORSE, EnumUtil.getMaterial("GOLDEN_HORSE_ARMOR", "GOLD_BARDING"), true),
+    DIAMOND_ARMOR_HORSE("diamondarmor", EntityType.HORSE, EnumUtil.getMaterial("DIAMOND_HORSE_ARMOR", "DIAMOND_BARDING"), true),
+    ARMOR_HORSE("armor", EntityType.HORSE, EnumUtil.getMaterial("IRON_HORSE_ARMOR", "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),
+    BABY_ZOMBIE("baby", EntityType.ZOMBIE.getEntityClass(), Data.BABYZOMBIE, true),
+    ADULT_ZOMBIE("adult", EntityType.ZOMBIE.getEntityClass(), Data.ADULTZOMBIE, true),
+    DIAMOND_SWORD_ZOMBIE("diamondsword", EntityType.ZOMBIE.getEntityClass(), Material.DIAMOND_SWORD, true),
+    GOLD_SWORD_ZOMBIE("goldsword", EntityType.ZOMBIE.getEntityClass(), EnumUtil.getMaterial("GOLDEN_SWORD", "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, EnumUtil.getMaterial("GOLDEN_SWORD", "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),
+    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),
+    RED_PARROT("red", EntityType.PARROT, Parrot.Variant.RED, true),
+    GREEN_PARROT("green", EntityType.PARROT, Parrot.Variant.GREEN, true),
+    BLUE_PARROT("blue", EntityType.PARROT, Parrot.Variant.BLUE, true),
+    CYAN_PARROT("cyan", EntityType.PARROT, Parrot.Variant.CYAN, true),
+    GRAY_PARROT("gray", EntityType.PARROT, Parrot.Variant.GRAY, true),
+    KOB_TROPICAL_FISH("kob", EntityType.TROPICAL_FISH, TropicalFish.Pattern.KOB, true),
+    SUNSTREAK_TROPICAL_FISH("sunstreak", EntityType.TROPICAL_FISH, TropicalFish.Pattern.SUNSTREAK, true),
+    SNOOPER_TROPICAL_FISH("snooper", EntityType.TROPICAL_FISH, TropicalFish.Pattern.SNOOPER, true),
+    DASHER_TROPICAL_FISH("dasher", EntityType.TROPICAL_FISH, TropicalFish.Pattern.DASHER, true),
+    BRINELY_TROPICAL_FISH("brinely", EntityType.TROPICAL_FISH, TropicalFish.Pattern.BRINELY, true),
+    SPOTTY_TROPICAL_FISH("spotty", EntityType.TROPICAL_FISH, TropicalFish.Pattern.SPOTTY, true),
+    FLOPPER_TROPICAL_FISH("flopper", EntityType.TROPICAL_FISH, TropicalFish.Pattern.FLOPPER, true),
+    STRIPEY_TROPICAL_FISH("stripey", EntityType.TROPICAL_FISH, TropicalFish.Pattern.STRIPEY, true),
+    GLITTER_TROPICAL_FISH("glitter", EntityType.TROPICAL_FISH, TropicalFish.Pattern.GLITTER, true),
+    BLOCKFISH_TROPICAL_FISH("blockfish", EntityType.TROPICAL_FISH, TropicalFish.Pattern.BLOCKFISH, true),
+    BETTY_TROPICAL_FISH("betty", EntityType.TROPICAL_FISH, TropicalFish.Pattern.BETTY, true),
+    CLAYFISH_TROPICAL_FISH("clayfish", EntityType.TROPICAL_FISH, TropicalFish.Pattern.CLAYFISH, true);
+    ;
+
+
+    public enum Data {
+        ADULT,
+        BABY,
+        CHEST,
+        ADULTZOMBIE,
+        BABYZOMBIE,
+        HORSESADDLE,
+        PIGSADDLE,
+        ELECTRIFIED,
+        ANGRY,
+        TAMED,
+        COLORABLE,
+        EXP,
+        SIZE
+    }
+
+    public static final Logger logger = Logger.getLogger("Essentials");
+
+    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;
+    }
+
+    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.ADULT)) {
+            ((Ageable) spawned).setAdult();
+        } else if (this.value.equals(Data.BABY)) {
+            ((Ageable) spawned).setBaby();
+        } else if (this.value.equals(Data.ADULTZOMBIE)) {
+            ((Zombie) spawned).setBaby(false);
+        } else if (this.value.equals(Data.BABYZOMBIE)) {
+            ((Zombie) spawned).setBaby(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.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 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();
+                InventoryWorkaround.setItemInMainHand(invent, new ItemStack((Material) this.value, 1));
+                InventoryWorkaround.setItemInMainHandDropChance(invent, 0.1f);
+            }
+        } else if (this.value instanceof Parrot.Variant) {
+            ((Parrot) spawned).setVariant((Parrot.Variant) this.value);
+        } else if (this.value instanceof TropicalFish.Pattern) {
+            ((TropicalFish) spawned).setPattern((TropicalFish.Pattern) this.value);
+        }
+    }
+}
@@ -1,38 +1,35 @@
 package com.earth2me.essentials;

-import lombok.Delegate;
-import org.bukkit.command.CommandSender;
-import org.bukkit.configuration.serialization.ConfigurationSerializable;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.LivingEntity;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.World;
 import org.bukkit.entity.Player;
-import org.bukkit.permissions.Permissible;
-import org.bukkit.permissions.ServerOperator;


-public class PlayerExtension implements Player
-{
-	@Delegate(types =
-	{
-		Player.class, Entity.class, CommandSender.class, ServerOperator.class,
-		HumanEntity.class, ConfigurationSerializable.class, LivingEntity.class,
-		Permissible.class
-	})
-	protected Player base;
+public class PlayerExtension {
+    protected Player base;

-	public PlayerExtension(final Player base)
-	{
-		this.base = base;
-	}
+    public PlayerExtension(final Player base) {
+        this.base = base;
+    }

-	public final Player getBase()
-	{
-		return base;
-	}
+    public final Player getBase() {
+        return base;
+    }

-	public final Player setBase(final Player base)
-	{
-		return this.base = base;
-	}
+    public final Player setBase(final Player base) {
+        return this.base = base;
+    }
+
+    public Server getServer() {
+        return base.getServer();
+    }
+
+    public World getWorld() {
+        return base.getWorld();
+    }
+
+    public Location getLocation() {
+        return base.getLocation();
+    }
 }
@@ -0,0 +1,123 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.utils.FormatUtil;
+import org.bukkit.Server;
+
+import java.util.*;
+
+import static com.earth2me.essentials.I18n.tl;
+
+
+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 User user, final boolean showHidden) {
+        Server server = ess.getServer();
+        int playerHidden = 0;
+        int hiddenCount = 0;
+        for (User onlinePlayer : ess.getOnlineUsers()) {
+            if (onlinePlayer.isHidden() || (user != null && !user.getBase().canSee(onlinePlayer.getBase()))) {
+                playerHidden++;
+                if (showHidden || user.getBase().canSee(onlinePlayer.getBase())) {
+                    hiddenCount++;
+                }
+            }
+        }
+        String online;
+        if (hiddenCount > 0) {
+            online = tl("listAmountHidden", ess.getOnlinePlayers().size() - playerHidden, hiddenCount, server.getMaxPlayers());
+        } else {
+            online = tl("listAmount", ess.getOnlinePlayers().size() - playerHidden, server.getMaxPlayers());
+        }
+        return online;
+    }
+
+    // Build the basic player list, divided by groups.
+    public static Map<String, List<User>> getPlayerLists(final IEssentials ess, final User sender, final boolean showHidden) {
+        Server server = ess.getServer();
+        final Map<String, List<User>> playerList = new HashMap<String, List<User>>();
+        for (User onlineUser : ess.getOnlineUsers()) {
+            if ((sender == null && !showHidden && onlineUser.isHidden()) || (sender != null && !showHidden && !sender.getBase().canSee(onlineUser.getBase()))) {
+                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();
+    }
+}
@@ -0,0 +1,19 @@
+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();
+    }
+}
@@ -0,0 +1,149 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.utils.NumberUtil;
+import org.bukkit.potion.PotionEffectType;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+
+public class Potions {
+    private static final Map<String, PotionEffectType> POTIONS = new HashMap<>();
+    private static final Map<String, PotionEffectType> ALIASPOTIONS = new HashMap<>();
+
+    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);
+
+        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);
+
+        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);
+
+        // 1.9
+        try {
+            POTIONS.put("glowing", PotionEffectType.GLOWING);
+            ALIASPOTIONS.put("glow", PotionEffectType.GLOWING);
+
+            POTIONS.put("levitation", PotionEffectType.LEVITATION);
+            ALIASPOTIONS.put("levitate", PotionEffectType.LEVITATION);
+
+            POTIONS.put("luck", PotionEffectType.LUCK);
+            POTIONS.put("unluck", PotionEffectType.UNLUCK);
+        } catch (Throwable ignored) {}
+    }
+
+    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();
+    }
+}
@@ -1,287 +1,276 @@
 package com.earth2me.essentials;

-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Mob.MobException;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Random;
-import java.util.Set;
-import org.bukkit.DyeColor;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import com.earth2me.essentials.utils.EnumUtil;
+import com.earth2me.essentials.utils.LocationUtil;
+import com.earth2me.essentials.utils.StringUtil;
+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.command.CommandSender;
 import org.bukkit.entity.*;
-import org.bukkit.entity.Skeleton.SkeletonType;
-import org.bukkit.material.Colorable;
+import org.bukkit.inventory.EntityEquipment;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.*;
+
+import static com.earth2me.essentials.I18n.tl;


-public class SpawnMob
-{
-	public static String mobList(final User user)
-	{
-		final Set<String> mobList = Mob.getMobList();
-		final Set<String> availableList = new HashSet<String>();
-		for (String mob : mobList)
-		{
-			if (user.isAuthorized("essentials.spawnmob." + mob.toLowerCase()))
-			{
-				availableList.add(mob);
-			}
-		}
-		if (availableList.isEmpty())
-		{
-			availableList.add(_("none"));
-		}
-		return Util.joinList(availableList);
-	}
+public class SpawnMob {

-	public static String[] mobData(final String mobString)
-	{
-		String[] returnString = new String[4];
+    private static final Material GOLDEN_HELMET = EnumUtil.getMaterial("GOLDEN_HELMET", "GOLD_HELMET");
+    private static final Material GOLDEN_CHESTPLATE = EnumUtil.getMaterial("GOLDEN_CHESTPLATE", "GOLD_CHESTPLATE");
+    private static final Material GOLDEN_LEGGINGS = EnumUtil.getMaterial("GOLDEN_LEGGINGS", "GOLD_LEGGINGS");
+    private static final Material GOLDEN_BOOTS = EnumUtil.getMaterial("GOLDEN_BOOTS", "GOLD_BOOTS");
+    private static final Material GOLDEN_SWORD = EnumUtil.getMaterial("GOLDEN_SWORD", "GOLD_SWORD");

-		final String[] parts = mobString.split(",");
-		String[] mobParts = parts[0].split(":");
+    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);
+    }

-		returnString[0] = mobParts[0];
-		if (mobParts.length == 2)
-		{
-			returnString[1] = mobParts[1];
-		}
+    public static List<String> mobParts(final String mobString) {
+        String[] mobParts = mobString.split(",");

-		if (parts.length > 1)
-		{
-			String[] mountParts = parts[1].split(":");
-			returnString[2] = mountParts[0];
-			if (mountParts.length == 2)
-			{
-				returnString[3] = mountParts[1];
-			}
-		}
+        List<String> mobs = new ArrayList<String>();

-		return returnString;
-	}
+        for (String mobPart : mobParts) {
+            String[] mobDatas = mobPart.split(":");
+            mobs.add(mobDatas[0]);
+        }
+        return mobs;
+    }

-	// This method spawns a mob where the user is looking, owned by user
-	public static void spawnmob(final IEssentials ess, final Server server, final User user, final String[] Data, int mobCount) throws Exception
-	{
-		final Block block = Util.getTarget(user).getBlock();
-		if (block == null)
-		{
-			throw new Exception(_("unableToSpawnMob"));
-		}
-		spawnmob(ess, server, user, user, block.getLocation(), Data, mobCount);
-	}
+    public static List<String> mobData(final String mobString) {
+        String[] mobParts = mobString.split(",");

-	// This method spawns a mob at loc, owned by noone
-	public static void spawnmob(final IEssentials ess, final Server server, final CommandSender sender, final Location loc, final String[] Data, int mobCount) throws Exception
-	{
-		spawnmob(ess, server, sender, null, loc, Data, mobCount);
-	}
+        List<String> mobData = new ArrayList<String>();

-	// This method spawns a mob at target, owned by target
-	public static void spawnmob(final IEssentials ess, final Server server, final CommandSender sender, final User target, final String[] Data, int mobCount) throws Exception
-	{
-		spawnmob(ess, server, sender, target, target.getLocation(), Data, mobCount);
-	}
+        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]);
+            }
+        }

-	// This method spawns a mob at loc, owned by target
-	public static void spawnmob(final IEssentials ess, final Server server, final CommandSender sender, final User target, final Location loc, final String[] Data, int mobCount) throws Exception
-	{
-		final Location sloc = Util.getSafeDestination(loc);
-		final String mobType = Data[0];
-		final String mobData = Data[1];
-		final String mountType = Data[2];
-		final String mountData = Data[3];
+        return mobData;
+    }

-		Mob mob = Mob.fromName(mobType);
-		Mob mobMount = null;
+    // 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);
+    }

-		checkSpawnable(ess, sender, mob);
+    // 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);
+    }

-		if (mountType != null)
-		{
-			mobMount = Mob.fromName(mountType);
-			checkSpawnable(ess, sender, mobMount);
-		}
+    // 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);

-		int serverLimit = ess.getSettings().getSpawnMobLimit();
-		if (mobCount > serverLimit)
-		{
-			mobCount = serverLimit;
-			sender.sendMessage(_("mobSpawnLimit"));
-		}
+        for (int i = 0; i < parts.size(); i++) {
+            Mob mob = Mob.fromName(parts.get(i));
+            checkSpawnable(ess, sender, mob);
+        }

-		try
-		{
-			for (int i = 0; i < mobCount; i++)
-			{
-				spawnMob(ess, server, sender, target, sloc, mob, mobData, mobMount, mountData);
-			}
-			sender.sendMessage(mobCount + " " + mob.name.toLowerCase(Locale.ENGLISH) + mob.suffix + " " + _("spawned"));
-		}
-		catch (MobException e1)
-		{
-			throw new Exception(_("unableToSpawnMob"), e1);
-		}
-		catch (NumberFormatException e2)
-		{
-			throw new Exception(_("numberRequired"), e2);
-		}
-		catch (NullPointerException np)
-		{
-			throw new Exception(_("soloMob"), np);
-		}
-	}
+        final int serverLimit = ess.getSettings().getSpawnMobLimit();
+        int effectiveLimit = serverLimit / parts.size();

-	private static void spawnMob(final IEssentials ess, final Server server, final CommandSender sender, final User target, final Location sloc, Mob mob, String mobData, Mob mobMount, String mountData) throws Exception
-	{
-		Entity spawnedMob = mob.spawn(sloc.getWorld(), server, sloc);
-		Entity spawnedMount = null;
+        if (effectiveLimit < 1) {
+            effectiveLimit = 1;
+            while (parts.size() > serverLimit) {
+                parts.remove(serverLimit);
+            }
+        }

-		if (mobMount != null)
-		{
-			spawnedMount = mobMount.spawn(sloc.getWorld(), server, sloc);
-			spawnedMob.setPassenger(spawnedMount);
-		}
-		if (mobData != null)
-		{
-			changeMobData(mob.getType(), spawnedMob, mobData, target);
-		}
-		if (spawnedMount != null && mountData != null)
-		{
-			changeMobData(mobMount.getType(), spawnedMount, mountData, target);
-		}
-	}
+        if (mobCount > effectiveLimit) {
+            mobCount = effectiveLimit;
+            sender.sendMessage(tl("mobSpawnLimit"));
+        }

-	private static void checkSpawnable(IEssentials ess, CommandSender sender, Mob mob) throws Exception
-	{
-		if (mob == null)
-		{
-			throw new Exception(_("invalidMob"));
-		}
+        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);
+        }
+    }

-		if (ess.getSettings().getProtectPreventSpawn(mob.getType().toString().toLowerCase(Locale.ENGLISH)))
-		{
-			throw new Exception(_("disabledToSpawnMob"));
-		}
+    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;

-		if (sender instanceof User && !((User)sender).isAuthorized("essentials.spawnmob." + mob.name.toLowerCase()))
-		{
-			throw new Exception(_("noPermToSpawnMob"));
-		}
-	}
+        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);

-	private static void changeMobData(final EntityType type, final Entity spawned, String data, final User target) throws Exception
-	{
-		data = data.toLowerCase(Locale.ENGLISH);
+                if (data.get(i) != null) {
+                    changeMobData(sender, mob.getType(), spawnedMob, data.get(i).toLowerCase(Locale.ENGLISH), target);
+                }
+            }

-		if (spawned instanceof Slime)
-		{
-			try
-			{
-				((Slime)spawned).setSize(Integer.parseInt(data));
-			}
-			catch (Exception e)
-			{
-				throw new Exception(_("slimeMalformedSize"), e);
-			}
-		}
+            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 ((spawned instanceof Ageable) && data.contains("baby"))
-		{
-			((Ageable)spawned).setBaby();
-			data = data.replace("baby", "");
-		}
+                if (data.get(next) != null) {
+                    changeMobData(sender, mMob.getType(), spawnedMount, data.get(next).toLowerCase(Locale.ENGLISH), target);
+                }

-		if (spawned instanceof Colorable)
-		{
-			final String color = data.toUpperCase(Locale.ENGLISH);
-			try
-			{
-				if (color.equals("RANDOM"))
-				{
-					final Random rand = new Random();
-					((Colorable)spawned).setColor(DyeColor.values()[rand.nextInt(DyeColor.values().length)]);
-				}
-				else if (color.length() > 1)
-				{
-					((Colorable)spawned).setColor(DyeColor.valueOf(color));
-				}
-			}
-			catch (Exception e)
-			{
-				throw new Exception(_("sheepMalformedColor"), e);
-			}
-		}
+                spawnedMob.setPassenger(spawnedMount);

-		if (spawned instanceof Tameable && data.contains("tamed") && target != null)
-		{
-			final Tameable tameable = ((Tameable)spawned);
-			tameable.setTamed(true);
-			tameable.setOwner(target.getBase());
-			data = data.replace("tamed", "");
-		}
+                spawnedMob = spawnedMount;
+            }
+        }
+    }

-		if (type == EntityType.WOLF)
-		{
-			if (data.contains("angry"))
-			{
-				((Wolf)spawned).setAngry(true);
-			}
-		}
+    private static void checkSpawnable(IEssentials ess, CommandSource sender, Mob mob) throws Exception {
+        if (mob == null || mob.getType() == null) {
+            throw new Exception(tl("invalidMob"));
+        }

-		if (type == EntityType.CREEPER && data.contains("powered"))
-		{
-			((Creeper)spawned).setPowered(true);
-		}
+        if (ess.getSettings().getProtectPreventSpawn(mob.getType().toString().toLowerCase(Locale.ENGLISH))) {
+            throw new Exception(tl("disabledToSpawnMob"));
+        }

-		if (type == EntityType.OCELOT)
-		{
-			if (data.contains("siamese"))
-			{
-				((Ocelot)spawned).setCatType(Ocelot.Type.SIAMESE_CAT);
-			}
-			else if (data.contains("red"))
-			{
-				((Ocelot)spawned).setCatType(Ocelot.Type.RED_CAT);
-			}
-			else if (data.contains("black"))
-			{
-				((Ocelot)spawned).setCatType(Ocelot.Type.BLACK_CAT);
-			}
-		}
+        if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.spawnmob." + mob.name.toLowerCase(Locale.ENGLISH))) {
+            throw new Exception(tl("noPermToSpawnMob"));
+        }
+    }

-		if (type == EntityType.VILLAGER)
-		{
-			for (Villager.Profession prof : Villager.Profession.values())
-			{
-				if (data.contains(prof.toString().toLowerCase(Locale.ENGLISH)))
-				{
-					((Villager)spawned).setProfession(prof);
-				}
-			}
-		}
+    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 (spawned instanceof Zombie)
-		{
-			if (data.contains("villager"))
-			{
-				((Zombie)spawned).setVillager(true);
-			}
-			if (data.contains("baby"))
-			{
-				((Zombie)spawned).setBaby(true);
-			}
-		}
+        if (data.isEmpty()) {
+            sender.sendMessage(tl("mobDataList", StringUtil.joinList(MobData.getValidHelp(spawned))));
+        }

-		if (type == EntityType.SKELETON)
-		{
-			if (data.contains("wither"))
-			{
-				((Skeleton)spawned).setSkeletonType(SkeletonType.WITHER);
-			}
-		}
+        if (spawned instanceof Zombie) {
+            ((Zombie) spawned).setBaby(false);
+        } else if (spawned instanceof Ageable) {
+            ((Ageable) spawned).setAdult();
+        }

-	}
+        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(GOLDEN_BOOTS, 1));
+                    invent.setLeggings(new ItemStack(GOLDEN_LEGGINGS, 1));
+                    invent.setChestplate(new ItemStack(GOLDEN_CHESTPLATE, 1));
+                    invent.setHelmet(new ItemStack(GOLDEN_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 if (inputData.contains("iron")) {
+                    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();
+            InventoryWorkaround.setItemInMainHand(invent, new ItemStack(Material.BOW, 1));
+            InventoryWorkaround.setItemInMainHandDropChance(invent, 0.1f);
+
+            invent.setBoots(new ItemStack(GOLDEN_BOOTS, 1));
+            invent.setBootsDropChance(0.0f);
+        }
+
+        if (type == EntityType.PIG_ZOMBIE) {
+            final PigZombie zombie = ((PigZombie) spawned);
+            setVillager(zombie, false);
+
+            final EntityEquipment invent = zombie.getEquipment();
+            InventoryWorkaround.setItemInMainHand(invent, new ItemStack(GOLDEN_SWORD, 1));
+            InventoryWorkaround.setItemInMainHandDropChance(invent, 0.1f);
+
+            invent.setBoots(new ItemStack(GOLDEN_BOOTS, 1));
+            invent.setBootsDropChance(0.0f);
+        }
+
+        if (type == EntityType.ZOMBIE) {
+            final Zombie zombie = ((Zombie) spawned);
+            setVillager(zombie, false);
+
+            final EntityEquipment invent = zombie.getEquipment();
+            invent.setBoots(new ItemStack(GOLDEN_BOOTS, 1));
+            invent.setBootsDropChance(0.0f);
+        }
+
+        if (type == EntityType.HORSE) {
+            ((Horse) spawned).setJumpStrength(1.2);
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    private static void setVillager(Zombie zombie, boolean villager) {
+        try {
+            zombie.setVillager(villager);
+        } catch (Exception ignored) {
+        }
+    }
 }
@@ -1,5 +1,6 @@
 package com.earth2me.essentials;

+import net.ess3.api.IEssentials;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -7,55 +8,45 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityExplodeEvent;


-public class TNTExplodeListener implements Listener, Runnable
-{
-	private final transient IEssentials ess;
-	private transient boolean enabled = false;
-	private transient int timer = -1;
+public class TNTExplodeListener implements Listener, Runnable {
+    private final transient IEssentials ess;
+    private transient boolean enabled = false;
+    private transient int timer = -1;

-	public TNTExplodeListener(final IEssentials ess)
-	{
-		super();
-		this.ess = ess;
-	}
+    public TNTExplodeListener(final IEssentials ess) {
+        super();
+        this.ess = ess;
+    }

-	public void enable()
-	{
-		if (!enabled)
-		{
-			enabled = true;
-			timer = ess.scheduleSyncDelayedTask(this, 200);
-			return;
-		}
-		if (timer != -1)
-		{
-			ess.getScheduler().cancelTask(timer);
-			timer = ess.scheduleSyncDelayedTask(this, 200);
-		}
-	}
+    public void enable() {
+        if (!enabled) {
+            enabled = true;
+            timer = ess.scheduleSyncDelayedTask(this, 200);
+            return;
+        }
+        if (timer != -1) {
+            ess.getScheduler().cancelTask(timer);
+            timer = ess.scheduleSyncDelayedTask(this, 200);
+        }
+    }

-	@EventHandler(priority = EventPriority.LOW)
-	public void onEntityExplode(final EntityExplodeEvent event)
-	{
-		if (!enabled)
-		{
-			return;
-		}
-		if (event.getEntity() instanceof LivingEntity)
-		{
-			return;
-		}
-		if (event.blockList().size() < 1)
-		{
-			return;
-		}
-		event.setCancelled(true);
-		event.getLocation().getWorld().createExplosion(event.getLocation(), 0F);
-	}
+    @EventHandler(priority = EventPriority.LOW)
+    public void onEntityExplode(final EntityExplodeEvent event) {
+        if (!enabled) {
+            return;
+        }
+        if (event.getEntity() instanceof LivingEntity) {
+            return;
+        }
+        if (event.blockList().size() < 1) {
+            return;
+        }
+        event.setCancelled(true);
+        event.getLocation().getWorld().createExplosion(event.getLocation(), 0F);
+    }

-	@Override
-	public void run()
-	{
-		enabled = false;
-	}
+    @Override
+    public void run() {
+        enabled = false;
+    }
 }
@@ -1,392 +1,299 @@
 package com.earth2me.essentials;

-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.ITeleport;
-import com.earth2me.essentials.commands.NoChargeException;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.logging.Logger;
+import com.earth2me.essentials.utils.DateUtil;
+import com.earth2me.essentials.utils.LocationUtil;
+import io.papermc.lib.PaperLib;
+import net.ess3.api.IEssentials;
+import net.ess3.api.ITeleport;
+import net.ess3.api.IUser;
+import net.ess3.api.events.UserWarpEvent;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.GregorianCalendar;

-public class Teleport implements Runnable, ITeleport
-{
-	private static final double MOVE_CONSTANT = 0.3;
+import static com.earth2me.essentials.I18n.tl;


-	private class Target
-	{
-		private final Location location;
-		private final String name;
+public class Teleport implements ITeleport {
+    private final IUser teleportOwner;
+    private final IEssentials ess;
+    private TimedTeleport timedTeleport;

-		Target(Location location)
-		{
-			this.location = location;
-			this.name = null;
-		}
+    private TeleportType tpType;

-		Target(Player entity)
-		{
-			this.name = entity.getName();
-			this.location = null;
-		}
+    public Teleport(IUser user, IEssentials ess) {
+        this.teleportOwner = user;
+        this.ess = ess;
+        tpType = TeleportType.NORMAL;
+    }

-		public Location getLocation()
-		{
-			if (this.name != null)
-			{
+    public enum TeleportType {
+        TPA,
+        BACK,
+        NORMAL
+    }

-				return ess.getServer().getPlayerExact(name).getLocation();
-			}
-			return location;
-		}
-	}
-	private IUser user;
-	private IUser teleportUser;
-	private int teleTimer = -1;
-	private long started;	// time this task was initiated
-	private long tpdelay;		// how long to delay the teleport
-	private 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 boolean respawn;
-	private Trade chargeFor;
-	private final IEssentials ess;
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	private TeleportCause cause;
+    public void cooldown(boolean check) throws Exception {
+        final Calendar time = new GregorianCalendar();
+        if (teleportOwner.getLastTeleportTimestamp() > 0) {
+            // 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();

-	private void initTimer(long delay, Target target, Trade chargeFor, TeleportCause cause)
-	{
-		initTimer(delay, user, target, chargeFor, cause, false);
-	}
+            // When was the last teleportPlayer used?
+            final long lastTime = teleportOwner.getLastTeleportTimestamp();

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

-	@Override
-	public void run()
-	{
+    private boolean cooldownApplies() {
+        boolean applies = true;
+        String globalBypassPerm = "essentials.teleport.cooldown.bypass";
+        switch (tpType) {
+            case NORMAL:
+                applies = !teleportOwner.isAuthorized(globalBypassPerm);
+                break;
+            case BACK:
+                applies = !(teleportOwner.isAuthorized(globalBypassPerm) &&
+                        teleportOwner.isAuthorized("essentials.teleport.cooldown.bypass.back"));
+                break;
+            case TPA:
+                applies = !(teleportOwner.isAuthorized(globalBypassPerm) &&
+                        teleportOwner.isAuthorized("essentials.teleport.cooldown.bypass.tpa"));
+                break;
+        }
+        return applies;
+    }

-		if (user == null || !user.isOnline() || user.getLocation() == null)
-		{
-			cancel(false);
-			return;
-		}
-		if (teleportUser == null || !teleportUser.isOnline() || teleportUser.getLocation() == null)
-		{
-			cancel(false);
-			return;
-		}
+    private void warnUser(final IUser user, final double delay) {
+        Calendar c = new GregorianCalendar();
+        c.add(Calendar.SECOND, (int) delay);
+        c.add(Calendar.MILLISECOND, (int) ((delay * 1000.0) % 1000.0));
+        user.sendMessage(tl("dontMoveMessage", DateUtil.formatDateDiff(c.getTimeInMillis())));
+    }

-		if (!user.isAuthorized("essentials.teleport.timer.move")
-			&& (Math.round(teleportUser.getLocation().getX() * MOVE_CONSTANT) != initX
-				|| Math.round(teleportUser.getLocation().getY() * MOVE_CONSTANT) != initY
-				|| Math.round(teleportUser.getLocation().getZ() * MOVE_CONSTANT) != initZ
-				|| teleportUser.getHealth() < health))
-		{
-			// user moved, cancel teleport
-			cancel(true);
-			return;
-		}
-		health = teleportUser.getHealth();  // in case user healed, then later gets injured
-		long now = System.currentTimeMillis();
-		if (now > started + tpdelay)
-		{
-			try
-			{
-				cooldown(false);
-				teleportUser.sendMessage(_("teleportationCommencing"));
-				try
-				{
-					if (respawn) {
-						teleportUser.getTeleport().respawn(cause);
-					}
-					else {
-						teleportUser.getTeleport().now(teleportTarget, cause);
-					}
-					cancel(false);
-					if (chargeFor != null)
-					{
-						chargeFor.charge(user);
-					}
-				}
-				catch (Throwable ex)
-				{
-					ess.showError(user.getBase(), ex, "teleport");
-				}
-			}
-			catch (Exception ex)
-			{
-				user.sendMessage(_("cooldownWithMessage", ex.getMessage()));
-				if (user != teleportUser)
-				{
-					teleportUser.sendMessage(_("cooldownWithMessage", ex.getMessage()));
-				}
-			}
-		}
-	}
+    //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);
+        }
+        final ITarget target = new LocationTarget(loc);
+        now(teleportOwner, target, cause);
+    }

-	public Teleport(IUser user, IEssentials ess)
-	{
-		this.user = user;
-		this.ess = ess;
-	}
+    @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()));
+    }

-	public void cooldown(boolean check) throws Exception
-	{
-		final Calendar time = new GregorianCalendar();
-		if (user.getLastTeleportTimestamp() > 0)
-		{
-			// Take the current time, and remove the delay from it.
-			final double cooldown = ess.getSettings().getTeleportCooldown();
-			final Calendar earliestTime = new GregorianCalendar();
-			earliestTime.add(Calendar.SECOND, -(int)cooldown);
-			earliestTime.add(Calendar.MILLISECOND, -(int)((cooldown * 1000.0) % 1000.0));
-			// This value contains the most recent time a teleport could have been used that would allow another use.
-			final long earliestLong = earliestTime.getTimeInMillis();
+    protected void now(IUser teleportee, ITarget target, TeleportCause cause) throws Exception {
+        cancel(false);
+        teleportee.setLastLocation();
+        Location loc = target.getLocation();

-			// When was the last teleport used?
-			final Long lastTime = user.getLastTeleportTimestamp();
+        if (LocationUtil.isBlockUnsafeForUser(teleportee, loc.getWorld(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())) {
+            if (ess.getSettings().isTeleportSafetyEnabled()) {
+                if (ess.getSettings().isForceDisableTeleportSafety()) {
+                    PaperLib.teleportAsync(teleportee.getBase(), loc, cause);
+                } else {
+                    PaperLib.teleportAsync(teleportee.getBase(), LocationUtil.getSafeDestination(ess, teleportee, loc), cause);
+                }
+            } else {
+                throw new Exception(tl("unsafeTeleportDestination", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+            }
+        } else {
+            if (ess.getSettings().isForceDisableTeleportSafety()) {
+                PaperLib.teleportAsync(teleportee.getBase(), loc, cause);
+            } else {
+                if (ess.getSettings().isTeleportToCenterLocation()) {
+                    loc = LocationUtil.getRoundedDestination(loc);
+                }
+                PaperLib.teleportAsync(teleportee.getBase(), loc, cause);
+            }
+        }
+    }

-			if (lastTime > time.getTimeInMillis())
-			{
-				// This is to make sure time didn't get messed up on last kit use.
-				// If this happens, let's give the user the benifit of the doubt.
-				user.setLastTeleportTimestamp(time.getTimeInMillis());
-				return;
-			}
-			else if (lastTime > earliestLong && !user.isAuthorized("essentials.teleport.cooldown.bypass"))
-			{
-				time.setTimeInMillis(lastTime);
-				time.add(Calendar.SECOND, (int)cooldown);
-				time.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
-				throw new Exception(_("timeBeforeTeleport", Util.formatDateDiff(time.getTimeInMillis())));
-			}
-		}
-		// if justCheck is set, don't update lastTeleport; we're just checking
-		if (!check)
-		{
-			user.setLastTeleportTimestamp(time.getTimeInMillis());
-		}
-	}
+    //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);
+    }

-	//If we need to cancel a pending teleport call this method
-	public void cancel(boolean notifyUser)
-	{
-		if (teleTimer == -1)
-		{
-			return;
-		}
-		try
-		{
-			ess.getServer().getScheduler().cancelTask(teleTimer);
-			if (notifyUser)
-			{
-				user.sendMessage(_("pendingTeleportCancelled"));
-				if (teleportUser != user)
-				{
-					teleportUser.sendMessage(_("pendingTeleportCancelled"));
-				}
-			}
-		}
-		finally
-		{
-			teleTimer = -1;
-		}
-	}
+    @Override
+    public void teleport(Location loc, Trade chargeFor, TeleportCause cause) throws Exception {
+        teleport(teleportOwner, new LocationTarget(loc), chargeFor, cause);
+    }

-	//The now function is used when you want to skip tp delay when teleporting someone to a location or player.
-	public void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception
-	{
-		if (cooldown)
-		{
-			cooldown(false);
-		}
-		now(new Target(loc), cause);
-	}
+    //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);
+        teleportOwner.sendMessage(tl("teleportToPlayer", entity.getDisplayName()));
+        teleport(teleportOwner, target, chargeFor, cause);
+    }

-	public void now(Player entity, boolean cooldown, TeleportCause cause) throws Exception
-	{
-		if (cooldown)
-		{
-			cooldown(false);
-		}
-		now(new Target(entity), cause);
-	}
+    //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);
+    }

-	private void now(Target target, TeleportCause cause) throws Exception
-	{
-		cancel(false);
-		user.setLastLocation();
-		user.getBase().teleport(Util.getSafeDestination(target.getLocation()), 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()));
+    }

-	//The teleport function is used when you want to normally teleport someone to a location or player.
-	//This method is nolonger used internally and will be removed.
-	@Deprecated
-	public void teleport(Location loc, Trade chargeFor) throws Exception
-	{
-		teleport(loc, chargeFor, TeleportCause.PLUGIN);
-	}
+    private void teleport(IUser teleportee, ITarget target, Trade chargeFor, TeleportCause cause) throws Exception {
+        double delay = ess.getSettings().getTeleportDelay();

-	public void teleport(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		teleport(new Target(loc), chargeFor, cause);
-	}
+        Trade cashCharge = chargeFor;

-	public void teleport(Player entity, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		teleport(new Target(entity), chargeFor, cause);
-	}
+        if (chargeFor != null) {
+            chargeFor.isAffordableFor(teleportOwner);

-	private void teleport(Target target, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		double delay = ess.getSettings().getTeleportDelay();
+            //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);
+            }
+        }

-		if (chargeFor != null)
-		{
-			chargeFor.isAffordableFor(user);
-		}
-		cooldown(true);
-		if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
-		{
-			cooldown(false);
-			now(target, cause);
-			if (chargeFor != null)
-			{
-				chargeFor.charge(user);
-			}
-			return;
-		}
+        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(user, delay);
-		initTimer((long)(delay * 1000.0), target, chargeFor, cause);
+        cancel(false);
+        warnUser(teleportee, delay);
+        initTimer((long) (delay * 1000.0), teleportee, target, cashCharge, cause, false);
+    }

-		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
-	}
+    //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;
+        }

-	//The teleportToMe function is a wrapper used to handle teleporting players to them, like /tphere
-	public void teleportToMe(User otherUser, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		Target target = new Target(user);
-		double delay = ess.getSettings().getTeleportDelay();
+        cancel(false);
+        warnUser(teleportOwner, delay);
+        initTimer((long) (delay * 1000.0), teleportOwner, null, chargeFor, cause, true);
+    }

-		if (chargeFor != null)
-		{
-			chargeFor.isAffordableFor(user);
-		}
-		cooldown(true);
-		if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
-		{
-			cooldown(false);
-			otherUser.getTeleport().now(target, cause);
-			if (chargeFor != null)
-			{
-				chargeFor.charge(user);
-			}
-			return;
-		}
+    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);
+        }
+    }

-		cancel(false);
-		warnUser(otherUser, delay);
-		initTimer((long)(delay * 1000.0), otherUser, target, chargeFor, cause, false);
-		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
-	}
+    //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 {
+        UserWarpEvent event = new UserWarpEvent(teleportee, warp, chargeFor);
+        Bukkit.getServer().getPluginManager().callEvent(event);

-	private void warnUser(final IUser user, final double delay)
-	{
-		Calendar c = new GregorianCalendar();
-		c.add(Calendar.SECOND, (int)delay);
-		c.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
-		user.sendMessage(_("dontMoveMessage", Util.formatDateDiff(c.getTimeInMillis())));
-	}
+        if(event.isCancelled()) {
+            return;
+        }
+        warp = event.getWarp();
+        Location loc = ess.getWarps().getWarp(warp);
+        teleportee.sendMessage(tl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+        if (!teleportee.equals(teleportOwner)) {
+            teleportOwner.sendMessage(tl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+        }
+        teleport(teleportee, new LocationTarget(loc), chargeFor, cause);
+    }

-	//The respawn function is a wrapper used to handle tp fallback, on /jail and /home
-	public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		double delay = ess.getSettings().getTeleportDelay();
-		if (chargeFor != null)
-		{
-			chargeFor.isAffordableFor(user);
-		}
-		cooldown(true);
-		if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
-		{
-			cooldown(false);
-			respawn(cause);
-			if (chargeFor != null)
-			{
-				chargeFor.charge(user);
-			}
-			return;
-		}
+    //The back function is a wrapper used to teleportPlayer a player /back to their previous location.
+    @Override
+    public void back(Trade chargeFor) throws Exception {
+        tpType = TeleportType.BACK;
+        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);
+    }

-		cancel(false);
-		initTimer((long)(delay * 1000.0), user, null, chargeFor, cause, true);
-		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
-	}
-		
-	public void respawn(TeleportCause cause) throws Exception
-	{
-		final Player player = user.getBase();
-		Location bed = player.getBedSpawnLocation();
-		if (bed != null && bed.getBlock().getType() != Material.BED_BLOCK)
-		{
-			now(new Target(bed), cause);
-		}
-		else
-		{
-			final PlayerRespawnEvent pre = new PlayerRespawnEvent(player, player.getWorld().getSpawnLocation(), false);
-			ess.getServer().getPluginManager().callEvent(pre);
-			now(new Target(pre.getRespawnLocation()), cause);
-		}
-	}
+    //This function is used to throw a user back after a jail sentence
+    @Override
+    public void back() throws Exception {
+        now(teleportOwner, new LocationTarget(teleportOwner.getLastLocation()), TeleportCause.COMMAND);
+    }

-	//The warp function is a wrapper used to teleport a player to a /warp
-	public void warp(String warp, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		Location loc = ess.getWarps().getWarp(warp);
-		user.sendMessage(_("warpingTo", warp));
-		teleport(new Target(loc), chargeFor, cause);
-	}
+    public void setTpType(TeleportType tpType) {
+        this.tpType = tpType;
+    }

-	//The back function is a wrapper used to teleport a player /back to their previous location.	
-	public void back(Trade chargeFor) throws Exception
-	{
-		teleport(new Target(user.getLastLocation()), chargeFor, TeleportCause.COMMAND);
-	}
+    //If we need to cancelTimer a pending teleportPlayer call this method
+    private void cancel(boolean notifyUser) {
+        if (timedTeleport != null) {
+            timedTeleport.cancelTimer(notifyUser);
+            timedTeleport = null;
+        }
+    }

-	//This function is used to throw a user back after a jail sentence
-	public void back() throws Exception
-	{
-		now(new Target(user.getLastLocation()), TeleportCause.COMMAND);
-	}
-
-	//This function handles teleporting to /home
-	public void home(Location loc, Trade chargeFor) throws Exception
-	{
-		teleport(new Target(loc), chargeFor, TeleportCause.COMMAND);
-	}
+    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);
+    }
 }
@@ -0,0 +1,141 @@
+package com.earth2me.essentials;
+
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
+import org.bukkit.Location;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+
+import java.util.UUID;
+
+import static com.earth2me.essentials.I18n.tl;
+
+
+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 UUID timer_teleportee;
+    private int timer_task;
+    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;
+
+    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.getBase().getUniqueId();
+        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.runTaskTimerAsynchronously(this, 20, 20).getTaskId();
+    }
+
+    @Override
+    public void run() {
+
+        if (teleportOwner == null || !teleportOwner.getBase().isOnline() || teleportOwner.getBase().getLocation() == null) {
+            cancelTimer(false);
+            return;
+        }
+
+        final 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;
+        }
+
+        class DelayedTeleportTask implements Runnable {
+            @Override
+            public void run() {
+
+                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"));
+
+                        try {
+                            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 ignored) {}
+
+                    } catch (Exception ex) {
+                        ess.showError(teleportOwner.getSource(), ex, "\\ teleport");
+                    }
+                }
+            }
+        }
+        ess.scheduleSyncDelayedTask(new DelayedTeleportTask());
+    }
+
+    //If we need to cancelTimer a pending teleportPlayer call this method
+    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.getBase().getUniqueId())) {
+                    ess.getUser(timer_teleportee).sendMessage(tl("pendingTeleportCancelled"));
+                }
+            }
+        } finally {
+            timer_task = -1;
+        }
+    }
+}
@@ -1,360 +1,359 @@
 package com.earth2me.essentials;

-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import com.earth2me.essentials.craftbukkit.SetExpFix;
+import com.earth2me.essentials.utils.NumberUtil;
+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;
+
 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 org.bukkit.Location;
-import org.bukkit.entity.Item;
-import org.bukkit.inventory.ItemStack;
+
+import static com.earth2me.essentials.I18n.tl;


-public class Trade
-{
-	private final transient String command;
-	private final transient Trade fallbackTrade;
-	private final transient Double money;
-	private final transient ItemStack itemStack;
-	private final transient Integer exp;
-	private final transient IEssentials ess;
+public class Trade {
+    private final transient String command;
+    private final transient Trade fallbackTrade;
+    private final transient BigDecimal money;
+    private final transient ItemStack itemStack;
+    private final transient Integer exp;
+    private final transient IEssentials ess;

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

-	public Trade(final String command, final Trade fallback, final IEssentials ess)
-	{
-		this(command, fallback, null, null, null, ess);
-	}
+    public enum TradeType {
+        MONEY,
+        EXP,
+        ITEM
+    }

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

-	public Trade(final ItemStack items, final IEssentials ess)
-	{
-		this(null, null, null, items, null, ess);
-	}
+    public enum OverflowType {
+        ABORT,
+        DROP,
+        RETURN
+    }

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

-	private Trade(final String command, final Trade fallback, final Double money, final ItemStack item, final Integer exp, final IEssentials ess)
-	{
-		this.command = command;
-		this.fallbackTrade = fallback;
-		this.money = money;
-		this.itemStack = item;
-		this.exp = exp;
-		this.ess = ess;
-	}
+    public Trade(final String command, final Trade fallback, final IEssentials ess) {
+        this(command, fallback, null, null, null, ess);
+    }

-	public void isAffordableFor(final IUser user) throws ChargeException
-	{
+    @Deprecated
+    public Trade(final double money, final com.earth2me.essentials.IEssentials ess) {
+        this(null, null, BigDecimal.valueOf(money), null, null, (IEssentials) ess);
+    }

-		if (ess.getSettings().isDebug())
-		{
-			ess.getLogger().log(Level.INFO, "checking if " + user.getName() + " can afford charge.");
-		}
+    public Trade(final BigDecimal money, final IEssentials ess) {
+        this(null, null, money, null, null, ess);
+    }

-		if (getMoney() != null
-			&& getMoney() > 0
-			&& !user.canAfford(getMoney()))
-		{
-			throw new ChargeException(_("notEnoughMoney"));
-		}
+    public Trade(final ItemStack items, final IEssentials ess) {
+        this(null, null, null, items, null, ess);
+    }

-		if (getItemStack() != null
-			&& !user.getInventory().containsAtLeast(itemStack, itemStack.getAmount()))
-		{
-			throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
-		}
+    public Trade(final int exp, final IEssentials ess) {
+        this(null, null, null, null, exp, ess);
+    }

-		double money;
-		if (command != null && !command.isEmpty()
-			&& 0 < (money = getCommandCost(user))
-			&& !user.canAfford(money))
-		{
-			throw new ChargeException(_("notEnoughMoney"));
-		}
+    private Trade(final String command, final Trade fallback, final BigDecimal money, final ItemStack item, final Integer exp, final IEssentials ess) {
+        this.command = command;
+        this.fallbackTrade = fallback;
+        this.money = money;
+        this.itemStack = item;
+        this.exp = exp;
+        this.ess = ess;
+    }

-		if (exp != null && exp > 0
-			&& SetExpFix.getTotalExperience(user) < exp)
-		{
-			throw new ChargeException(_("notEnoughExperience"));
-		}
-	}
+    public void isAffordableFor(final IUser user) throws ChargeException {

-	public void pay(final IUser user)
-	{
-		pay(user, true);
-	}
+        if (ess.getSettings().isDebug()) {
+            ess.getLogger().log(Level.INFO, "checking if " + user.getName() + " can afford charge.");
+        }

-	public boolean pay(final IUser user, final boolean dropItems)
-	{
-		boolean success = true;
-		if (getMoney() != null && getMoney() > 0)
-		{
-			user.giveMoney(getMoney());
-		}
-		if (getItemStack() != null)
-		{
-			if (dropItems)
-			{
-				final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItems(user.getInventory(), getItemStack());
-				final Location loc = user.getLocation();
-				for (ItemStack itemStack : leftOver.values())
-				{
-					final int maxStackSize = itemStack.getType().getMaxStackSize();
-					final int stacks = itemStack.getAmount() / maxStackSize;
-					final int leftover = itemStack.getAmount() % maxStackSize;
-					final Item[] itemStacks = new Item[stacks + (leftover > 0 ? 1 : 0)];
-					for (int i = 0; i < stacks; i++)
-					{
-						final ItemStack stack = itemStack.clone();
-						stack.setAmount(maxStackSize);
-						itemStacks[i] = loc.getWorld().dropItem(loc, stack);
-					}
-					if (leftover > 0)
-					{
-						final ItemStack stack = itemStack.clone();
-						stack.setAmount(leftover);
-						itemStacks[stacks] = loc.getWorld().dropItem(loc, stack);
-					}
-				}
-			}
-			else
-			{
-				success = InventoryWorkaround.addAllItems(user.getInventory(), getItemStack());
-			}
-			user.updateInventory();
-		}
-		if (getExperience() != null)
-		{
-			SetExpFix.setTotalExperience(user, SetExpFix.getTotalExperience(user) + getExperience());
-		}
-		return success;
-	}
+        if (getMoney() != null && getMoney().signum() > 0 && !user.canAfford(getMoney())) {
+            throw new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(getMoney(), ess)));
+        }

-	public void charge(final IUser user) throws ChargeException
-	{
-		if (ess.getSettings().isDebug())
-		{
-			ess.getLogger().log(Level.INFO, "charging user " + user.getName());
-		}
+        if (getItemStack() != null && !user.getBase().getInventory().containsAtLeast(itemStack, itemStack.getAmount())) {
+            throw new ChargeException(tl("missingItems", getItemStack().getAmount(), ess.getItemDb().name(getItemStack())));
+        }

-		if (getMoney() != null)
-		{
-			if (!user.canAfford(getMoney()) && getMoney() > 0.0d)
-			{
-				throw new ChargeException(_("notEnoughMoney"));
-			}
-			user.takeMoney(getMoney());
-		}
-		if (getItemStack() != null)
-		{
-			if (!user.getInventory().containsAtLeast(itemStack, itemStack.getAmount()))
-			{
-				throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
-			}
-			user.getInventory().removeItem(getItemStack());
-			user.updateInventory();
-		}
-		if (command != null)
-		{
-			final double cost = getCommandCost(user);
-			if (!user.canAfford(cost) && cost > 0.0d)
-			{
-				throw new ChargeException(_("notEnoughMoney"));
-			}
-			user.takeMoney(cost);
-		}
-		if (getExperience() != null)
-		{
-			final int experience = SetExpFix.getTotalExperience(user);
-			if (experience < getExperience() && getExperience() > 0)
-			{
-				throw new ChargeException(_("notEnoughExperience"));
-			}
-			SetExpFix.setTotalExperience(user, experience - getExperience());
-		}
-	}
+        BigDecimal money;
+        if (command != null && !command.isEmpty() && (money = getCommandCost(user)).signum() > 0 && !user.canAfford(money)) {
+            throw new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(money, ess)));
+        }

-	public Double getMoney()
-	{
-		return money;
-	}
+        if (exp != null && exp > 0 && SetExpFix.getTotalExperience(user.getBase()) < exp) {
+            throw new ChargeException(tl("notEnoughExperience"));
+        }
+    }

-	public ItemStack getItemStack()
-	{
-		return itemStack;
-	}
+    public boolean pay(final IUser user) throws MaxMoneyException {
+        return pay(user, OverflowType.ABORT) == null;
+    }

-	public Integer getExperience()
-	{
-		return exp;
-	}
+    public Map<Integer, ItemStack> pay(final IUser user, final OverflowType type) throws MaxMoneyException {
+        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) {
+            // This stores the would be overflow
+            Map<Integer, ItemStack> overFlow = InventoryWorkaround.addAllItems(user.getBase().getInventory(), getItemStack());

-	public Double getCommandCost(final IUser user)
-	{
-		double cost = 0.0d;
-		if (command != null && !command.isEmpty())
-		{
-			cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
-			if (cost == 0.0d && fallbackTrade != null)
-			{
-				cost = fallbackTrade.getCommandCost(user);
-			}
+            if (overFlow != null) {
+                switch (type) {
+                    case ABORT:
+                        if (ess.getSettings().isDebug()) {
+                            ess.getLogger().log(Level.INFO, "abort paying " + user.getName() + " itemstack " + getItemStack().toString() + " due to lack of inventory space ");
+                        }

-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().log(Level.INFO, "calculated command (" + command + ") cost for " + user.getName() + " as " + cost);
-			}
-		}
-		if (cost != 0.0d && (user.isAuthorized("essentials.nocommandcost.all")
-							 || user.isAuthorized("essentials.nocommandcost." + command)))
-		{
-			return 0.0d;
-		}
-		return cost;
-	}
-	private static FileWriter fw = null;
+                        return overFlow;

-	public static void log(String type, String subtype, String event, String sender, Trade charge, String receiver, Trade pay, Location loc, IEssentials ess)
-	{
-		//isEcoLogUpdateEnabled() - This refers to log entries with no location, ie API updates #EasterEgg
-		//isEcoLogEnabled() - This refers to log entries with with location, ie /pay /sell and eco signs.
-		
-		if ((loc == null && !ess.getSettings().isEcoLogUpdateEnabled())
-			|| (loc != null && !ess.getSettings().isEcoLogEnabled()))
-		{
-			return;
-		}
-		if (fw == null)
-		{
-			try
-			{
-				fw = new FileWriter(new File(ess.getDataFolder(), "trade.log"), true);
-			}
-			catch (IOException ex)
-			{
-				Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
-			}
-		}
-		StringBuilder sb = new StringBuilder();
-		sb.append(type).append(",").append(subtype).append(",").append(event).append(",\"");
-		sb.append(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).format(new Date()));
-		sb.append("\",\"");
-		if (sender != null)
-		{
-			sb.append(sender);
-		}
-		sb.append("\",");
-		if (charge == null)
-		{
-			sb.append("\"\",\"\",\"\"");
-		}
-		else
-		{
-			if (charge.getItemStack() != null)
-			{
-				sb.append(charge.getItemStack().getAmount()).append(",");
-				sb.append(charge.getItemStack().getType().toString()).append(",");
-				sb.append(charge.getItemStack().getDurability());
-			}
-			if (charge.getMoney() != null)
-			{
-				sb.append(charge.getMoney()).append(",");
-				sb.append("money").append(",");
-				sb.append(ess.getSettings().getCurrencySymbol());
-			}
-			if (charge.getExperience() != null)
-			{
-				sb.append(charge.getExperience()).append(",");
-				sb.append("exp").append(",");
-				sb.append("\"\"");
-			}
-		}
-		sb.append(",\"");
-		if (receiver != null)
-		{
-			sb.append(receiver);
-		}
-		sb.append("\",");
-		if (pay == null)
-		{
-			sb.append("\"\",\"\",\"\"");
-		}
-		else
-		{
-			if (pay.getItemStack() != null)
-			{
-				sb.append(pay.getItemStack().getAmount()).append(",");
-				sb.append(pay.getItemStack().getType().toString()).append(",");
-				sb.append(pay.getItemStack().getDurability());
-			}
-			if (pay.getMoney() != null)
-			{
-				sb.append(pay.getMoney()).append(",");
-				sb.append("money").append(",");
-				sb.append(ess.getSettings().getCurrencySymbol());
-			}
-			if (pay.getExperience() != null)
-			{
-				sb.append(pay.getExperience()).append(",");
-				sb.append("exp").append(",");
-				sb.append("\"\"");
-			}
-		}
-		if (loc == null)
-		{
-			sb.append(",\"\",\"\",\"\",\"\"");
-		}
-		else
-		{
-			sb.append(",\"");
-			sb.append(loc.getWorld().getName()).append("\",");
-			sb.append(loc.getBlockX()).append(",");
-			sb.append(loc.getBlockY()).append(",");
-			sb.append(loc.getBlockZ()).append(",");
-		}
-		sb.append("\n");
-		try
-		{
-			fw.write(sb.toString());
-			fw.flush();
-		}
-		catch (IOException ex)
-		{
-			Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
-		}
-	}
+                    case RETURN:
+                        // Pay the user the items, and return overflow
+                        final Map<Integer, ItemStack> returnStack = InventoryWorkaround.addItems(user.getBase().getInventory(), getItemStack());
+                        user.getBase().updateInventory();

-	public static void closeLog()
-	{
-		if (fw != null)
-		{
-			try
-			{
-				fw.close();
-			}
-			catch (IOException ex)
-			{
-				Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
-			}
-			fw = null;
-		}
-	}
+                        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 if (ess.getSettings().isDebug()) {
+                ess.getLogger().log(Level.INFO, "paying " + user.getName() + " itemstack " + getItemStack().toString());
+            }
+            user.getBase().updateInventory();
+        }
+        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) {
+            if (ess.getSettings().isDebug()) {
+                ess.getLogger().log(Level.INFO, "charging user " + user.getName() + " money " + getMoney().toPlainString());
+            }
+            if (!user.canAfford(getMoney()) && getMoney().signum() > 0) {
+                throw new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(getMoney(), ess)));
+            }
+            user.takeMoney(getMoney());
+        }
+        if (getItemStack() != null) {
+            if (ess.getSettings().isDebug()) {
+                ess.getLogger().log(Level.INFO, "charging user " + user.getName() + " itemstack " + getItemStack().toString());
+            }
+            if (!user.getBase().getInventory().containsAtLeast(getItemStack(), getItemStack().getAmount())) {
+                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", NumberUtil.displayCurrency(cost, ess)));
+            }
+            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 BigDecimal getMoney() {
+        return money;
+    }
+
+    public ItemStack getItemStack() {
+        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) {
+        //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;
+        }
+        if (fw == null) {
+            try {
+                fw = new FileWriter(new File(ess.getDataFolder(), "trade.log"), true);
+            } catch (IOException ex) {
+                Logger.getLogger("Essentials").log(Level.SEVERE, null, ex);
+            }
+        }
+        StringBuilder sb = new StringBuilder();
+        sb.append(type).append(",").append(subtype).append(",").append(event).append(",\"");
+        sb.append(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).format(new Date()));
+        sb.append("\",\"");
+        if (sender != null) {
+            sb.append(sender);
+        }
+        sb.append("\",");
+        if (charge == null) {
+            sb.append("\"\",\"\",\"\"");
+        } else {
+            if (charge.getItemStack() != null) {
+                sb.append(charge.getItemStack().getAmount()).append(",");
+                sb.append(charge.getItemStack().getType().toString()).append(",");
+                sb.append(charge.getItemStack().getDurability());
+            }
+            if (charge.getMoney() != null) {
+                sb.append(charge.getMoney()).append(",");
+                sb.append("money").append(",");
+                sb.append(ess.getSettings().getCurrencySymbol());
+            }
+            if (charge.getExperience() != null) {
+                sb.append(charge.getExperience()).append(",");
+                sb.append("exp").append(",");
+                sb.append("\"\"");
+            }
+        }
+        sb.append(",\"");
+        if (receiver != null) {
+            sb.append(receiver);
+        }
+        sb.append("\",");
+        if (pay == null) {
+            sb.append("\"\",\"\",\"\"");
+        } else {
+            if (pay.getItemStack() != null) {
+                sb.append(pay.getItemStack().getAmount()).append(",");
+                sb.append(pay.getItemStack().getType().toString()).append(",");
+                sb.append(pay.getItemStack().getDurability());
+            }
+            if (pay.getMoney() != null) {
+                sb.append(pay.getMoney()).append(",");
+                sb.append("money").append(",");
+                sb.append(ess.getSettings().getCurrencySymbol());
+            }
+            if (pay.getExperience() != null) {
+                sb.append(pay.getExperience()).append(",");
+                sb.append("exp").append(",");
+                sb.append("\"\"");
+            }
+        }
+        if (loc == null) {
+            sb.append(",\"\",\"\",\"\",\"\"");
+        } else {
+            sb.append(",\"");
+            sb.append(loc.getWorld().getName()).append("\",");
+            sb.append(loc.getBlockX()).append(",");
+            sb.append(loc.getBlockY()).append(",");
+            sb.append(loc.getBlockZ()).append(",");
+        }
+        sb.append("\n");
+        try {
+            fw.write(sb.toString());
+            fw.flush();
+        } catch (IOException ex) {
+            Logger.getLogger("Essentials").log(Level.SEVERE, null, ex);
+        }
+    }
+
+    public static void closeLog() {
+        if (fw != null) {
+            try {
+                fw.close();
+            } catch (IOException ex) {
+                Logger.getLogger("Essentials").log(Level.SEVERE, null, ex);
+            }
+            fw = null;
+        }
+    }
 }
@@ -0,0 +1,154 @@
+package com.earth2me.essentials;
+
+import com.google.common.io.Files;
+import org.bukkit.Bukkit;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.*;
+import java.util.logging.Level;
+import java.util.regex.Pattern;
+
+
+public class UUIDMap {
+    private final transient net.ess3.api.IEssentials ess;
+    private File userList;
+    private final transient Pattern splitPattern = Pattern.compile(",");
+
+    private static boolean pendingWrite;
+    private static final ScheduledExecutorService writeScheduler = Executors.newScheduledThreadPool(1);
+    private final Runnable writeTaskRunnable;
+
+    private static boolean loading = false;
+
+    public UUIDMap(final net.ess3.api.IEssentials ess) {
+        this.ess = ess;
+        userList = new File(ess.getDataFolder(), "usermap.csv");
+        pendingWrite = false;
+        writeTaskRunnable = new Runnable() {
+            @Override
+            public void run() {
+                if (pendingWrite) {
+                    try {
+                        new WriteRunner(ess.getDataFolder(), userList, ess.getUserMap().getNames()).run();
+                    } catch (Throwable t) { // bad code to prevent task from being suppressed
+                        t.printStackTrace();
+                    }
+                }
+            }
+        };
+        writeScheduler.scheduleWithFixedDelay(writeTaskRunnable, 5, 5, TimeUnit.SECONDS);
+    }
+
+    public void loadAllUsers(final ConcurrentSkipListMap<String, UUID> names, final ConcurrentSkipListMap<UUID, ArrayList<String>> history) {
+        try {
+            if (!userList.exists()) {
+                userList.createNewFile();
+            }
+
+            if (ess.getSettings().isDebug()) {
+                ess.getLogger().log(Level.INFO, "Reading usermap from disk");
+            }
+
+            if (loading) {
+                return;
+            }
+
+            names.clear();
+            history.clear();
+            loading = true;
+
+            try (BufferedReader reader = new BufferedReader(new FileReader(userList))) {
+                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<>();
+                                list.add(name);
+                                history.put(uuid, list);
+                            } else {
+                                final ArrayList<String> list = history.get(uuid);
+                                if (!list.contains(name)) {
+                                    list.add(name);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            loading = false;
+        } catch (IOException ex) {
+            Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+        }
+    }
+
+    public void writeUUIDMap() {
+        pendingWrite = true;
+    }
+
+    public void forceWriteUUIDMap() {
+        if (ess.getSettings().isDebug()) {
+            ess.getLogger().log(Level.INFO, "Forcing usermap write to disk");
+        }
+        pendingWrite = true;
+        writeTaskRunnable.run();
+    }
+
+    public void shutdown() {
+        writeScheduler.submit(writeTaskRunnable);
+        writeScheduler.shutdown();
+    }
+
+    private static class WriteRunner implements Runnable {
+        private final File location;
+        private final File endFile;
+        private final Map<String, UUID> names;
+
+        private WriteRunner(final File location, final File endFile, final Map<String, UUID> names) {
+            this.location = location;
+            this.endFile = endFile;
+            this.names = new HashMap<>(names);
+        }
+
+        @Override
+        public void run() {
+            pendingWrite = false;
+            if (loading || names.isEmpty()) {
+                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);
+            }
+        }
+    }
+}
@@ -1,142 +1,318 @@
 package com.earth2me.essentials;

+import com.earth2me.essentials.utils.StringUtil;
+import com.google.common.base.Charsets;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import com.google.common.util.concurrent.UncheckedExecutionException;
-import java.io.File;
-import java.util.Collections;
-import java.util.Set;
-import java.util.concurrent.ConcurrentSkipListSet;
-import java.util.concurrent.ExecutionException;
+import net.ess3.api.IEssentials;
 import org.bukkit.entity.Player;

+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.ExecutionException;
+import java.util.regex.Pattern;

-public class UserMap extends CacheLoader<String, User> implements IConf
-{
-	private final transient IEssentials ess;
-	private final transient Cache<String, User> users = CacheBuilder.newBuilder().softValues().build(this);
-	private final transient ConcurrentSkipListSet<String> keys = new ConcurrentSkipListSet<String>();

-	public UserMap(final IEssentials ess)
-	{
-		super();
-		this.ess = ess;
-		loadAllUsersAsync(ess);
-	}
+public class UserMap extends CacheLoader<String, User> implements IConf {
+    private final transient IEssentials ess;
+    private final transient ConcurrentSkipListSet<UUID> keys = new ConcurrentSkipListSet<>();
+    private final transient ConcurrentSkipListMap<String, UUID> names = new ConcurrentSkipListMap<>();
+    private final transient ConcurrentSkipListMap<UUID, ArrayList<String>> history = new ConcurrentSkipListMap<>();
+    private UUIDMap uuidMap;

-	private void loadAllUsersAsync(final IEssentials ess)
-	{
-		ess.scheduleAsyncDelayedTask(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				final File userdir = new File(ess.getDataFolder(), "userdata");
-				if (!userdir.exists())
-				{
-					return;
-				}
-				keys.clear();
-				users.invalidateAll();
-				for (String string : userdir.list())
-				{
-					if (!string.endsWith(".yml"))
-					{
-						continue;
-					}
-					final String name = string.substring(0, string.length() - 4);
-					keys.add(Util.sanitizeFileName(name));
-				}
-			}
-		});
-	}
+    private final transient Cache<String, User> users;
+    private static boolean legacy = false;

-	public boolean userExists(final String name)
-	{
-		return keys.contains(Util.sanitizeFileName(name));
-	}
+    public UserMap(final IEssentials ess) {
+        super();
+        this.ess = ess;
+        uuidMap = new UUIDMap(ess);
+        //RemovalListener<UUID, User> remListener = new UserMapRemovalListener();
+        //users = CacheBuilder.newBuilder().maximumSize(ess.getSettings().getMaxUserCacheCount()).softValues().removalListener(remListener).build(this);
+        CacheBuilder<Object, Object> cacheBuilder = CacheBuilder.newBuilder();
+        int maxCount = ess.getSettings().getMaxUserCacheCount();
+        try {
+            cacheBuilder.maximumSize(maxCount);
+        } catch (NoSuchMethodError nsme) {
+            legacy = true;
+            legacyMaximumSize(cacheBuilder, maxCount);
+        }
+        cacheBuilder.softValues();
+        if (!legacy) {
+            users = cacheBuilder.build(this);
+        } else {
+            users = legacyBuild(cacheBuilder);
+        }
+    }

-	public User getUser(final String name)
-	{
-		try
-		{
-			return users.get(name);
-		}
-		catch (ExecutionException ex)
-		{
-			return null;
-		}
-		catch (UncheckedExecutionException ex)
-		{
-			return null;
-		}
-	}
+    private void loadAllUsersAsync(final IEssentials ess) {
+        ess.runTaskAsynchronously(new Runnable() {
+            @Override
+            public void run() {
+                synchronized (users) {
+                    final File userdir = new File(ess.getDataFolder(), "userdata");
+                    if (!userdir.exists()) {
+                        return;
+                    }
+                    keys.clear();
+                    users.invalidateAll();
+                    for (String string : userdir.list()) {
+                        if (!string.endsWith(".yml")) {
+                            continue;
+                        }
+                        final String name = string.substring(0, string.length() - 4);
+                        try {
+                            keys.add(UUID.fromString(name));
+                        } catch (IllegalArgumentException ex) {
+                            //Ignore these users till they rejoin.
+                        }
+                    }
+                    uuidMap.loadAllUsers(names, history);
+                }
+            }
+        });
+    }

-	@Override
-	public User load(final String name) throws Exception
-	{
-		String sanitizedName = Util.sanitizeFileName(name);
-		if (!sanitizedName.equals(name))
-		{
-			User user = getUser(sanitizedName);
-			if (user == null)
-			{
-				throw new Exception("User not found!");
-			}
-			else
-			{
-				return user;
-			}
-		}
-		for (Player player : ess.getServer().getOnlinePlayers())
-		{
-			if (player.getName().equalsIgnoreCase(name))
-			{
-				keys.add(sanitizedName);
-				return new User(player, ess);
-			}
-		}
-		final File userFile = getUserFile2(sanitizedName);
-		if (userFile.exists())
-		{
-			keys.add(sanitizedName);
-			return new User(new OfflinePlayer(name, ess), ess);
-		}
-		throw new Exception("User not found!");
-	}
+    public boolean userExists(final UUID uuid) {
+        return keys.contains(uuid);
+    }

-	@Override
-	public void reloadConfig()
-	{
-		loadAllUsersAsync(ess);
-	}
+    public User getUser(final String name) {
+        try {
+            final String sanitizedName = StringUtil.safeString(name);
+            if (names.containsKey(sanitizedName)) {
+                final UUID uuid = names.get(sanitizedName);
+                return getUser(uuid);
+            }

-	public void removeUser(final String name)
-	{
-		keys.remove(Util.sanitizeFileName(name));
-		users.invalidate(Util.sanitizeFileName(name));
-		users.invalidate(name);
-	}
+            final File userFile = getUserFileFromString(sanitizedName);
+            if (userFile.exists()) {
+                ess.getLogger().info("Importing user " + name + " to usermap.");
+                User user = new User(new OfflinePlayer(sanitizedName, ess.getServer()), ess);
+                trackUUID(user.getBase().getUniqueId(), user.getName(), true);
+                return user;
+            }
+            return null;
+        } catch (UncheckedExecutionException ex) {
+            return null;
+        }
+    }

-	public Set<String> getAllUniqueUsers()
-	{
-		return Collections.unmodifiableSet(keys);
-	}
+    public User getUser(final UUID uuid) {
+        try {
+            if (!legacy) {
+                return ((LoadingCache<String, User>) users).get(uuid.toString());
+            } else {
+                return legacyCacheGet(uuid);
+            }
+        } catch (ExecutionException ex) {
+            return null;
+        } catch (UncheckedExecutionException ex) {
+            return null;
+        }
+    }

-	public int getUniqueUsers()
-	{
-		return keys.size();
-	}
+    public void trackUUID(final UUID uuid, final String name, boolean replace) {
+        if (uuid != null) {
+            keys.add(uuid);
+            if (name != null && name.length() > 0) {
+                final String keyName = StringUtil.safeString(name);
+                if (!names.containsKey(keyName)) {
+                    names.put(keyName, uuid);
+                    uuidMap.writeUUIDMap();
+                } else if (!names.get(keyName).equals(uuid)) {
+                    if (replace) {
+                        ess.getLogger().info("Found new UUID for " + name + ". Replacing " + names.get(keyName).toString() + " with " + uuid.toString());
+                        names.put(keyName, uuid);
+                        uuidMap.writeUUIDMap();
+                    } else {
+                        if (ess.getSettings().isDebug()) {
+                            ess.getLogger().info("Found old UUID for " + name + " (" + uuid.toString() + "). Not adding to usermap.");
+                        }
+                    }
+                }
+            }
+        }
+    }

-	public File getUserFile(final String name)
-	{
-		return getUserFile2(Util.sanitizeFileName(name));
-	}
+    @Override
+    public User load(final String stringUUID) throws Exception {
+        UUID uuid = UUID.fromString(stringUUID);
+        Player player = ess.getServer().getPlayer(uuid);
+        if (player != null) {
+            final User user = new User(player, ess);
+            trackUUID(uuid, user.getName(), true);
+            return user;
+        }

-	private File getUserFile2(final String name)
-	{
-		final File userFolder = new File(ess.getDataFolder(), "userdata");
-		return new File(userFolder, name + ".yml");
-	}
+        final File userFile = getUserFileFromID(uuid);
+
+        if (userFile.exists()) {
+            player = new OfflinePlayer(uuid, ess.getServer());
+            final User user = new User(player, ess);
+            ((OfflinePlayer) player).setName(user.getLastAccountName());
+            trackUUID(uuid, user.getName(), false);
+            return user;
+        }
+
+        throw new Exception("User not found!");
+    }
+
+    @Override
+    public void reloadConfig() {
+        getUUIDMap().forceWriteUUIDMap();
+        loadAllUsersAsync(ess);
+    }
+
+    public void invalidateAll() {
+        users.invalidateAll();
+    }
+
+    public void removeUser(final String name) {
+        if (names == null) {
+            ess.getLogger().warning("Name collection is null, cannot remove user.");
+            return;
+        }
+        UUID uuid = names.get(name);
+        if (uuid != null) {
+            keys.remove(uuid);
+            users.invalidate(uuid.toString());
+        }
+        names.remove(name);
+        names.remove(StringUtil.safeString(name));
+    }
+
+    public Set<UUID> getAllUniqueUsers() {
+        return Collections.unmodifiableSet(keys);
+    }
+
+    public int getUniqueUsers() {
+        return keys.size();
+    }
+
+    protected ConcurrentSkipListMap<String, UUID> getNames() {
+        return names;
+    }
+
+    protected 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");
+    }
+//	class UserMapRemovalListener implements RemovalListener
+//	{
+//		@Override
+//		public void onRemoval(final RemovalNotification notification)
+//		{
+//			Object value = notification.getValue();
+//			if (value != null)
+//			{
+//				((User)value).cleanup();
+//			}
+//		}
+//	}
+
+    private final Pattern validUserPattern = Pattern.compile("^[a-zA-Z0-9_]{2,16}$");
+
+    @SuppressWarnings("deprecation")
+    public User getUserFromBukkit(String name) {
+        name = StringUtil.safeString(name);
+        if (ess.getSettings().isDebug()) {
+            ess.getLogger().warning("Using potentially blocking Bukkit UUID lookup for: " + name);
+        }
+        // Don't attempt to look up entirely invalid usernames
+        if (name == null || !validUserPattern.matcher(name).matches()) {
+            return null;
+        }
+        org.bukkit.OfflinePlayer offlinePlayer = ess.getServer().getOfflinePlayer(name);
+        if (offlinePlayer == null) {
+            return null;
+        }
+        UUID uuid;
+        try {
+            uuid = offlinePlayer.getUniqueId();
+        } catch (UnsupportedOperationException | NullPointerException e) {
+            return null;
+        }
+        // This is how Bukkit generates fake UUIDs
+        if (UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(Charsets.UTF_8)).equals(uuid)) {
+            return null;
+        } else {
+            names.put(name, uuid);
+            return getUser(uuid);
+        }
+    }
+
+    private static Method getLegacy;
+
+    private User legacyCacheGet(UUID uuid) {
+        if (getLegacy == null) {
+            Class<?> usersClass = users.getClass();
+            for (Method m : usersClass.getDeclaredMethods()) {
+                if (m.getName().equals("get")) {
+                    getLegacy = m;
+                    getLegacy.setAccessible(true);
+                    break;
+                }
+            }
+        }
+        try {
+            return (User) getLegacy.invoke(users, uuid.toString());
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            return null;
+        }
+    }
+
+    private void legacyMaximumSize(CacheBuilder builder, int maxCount) {
+        try {
+            Method maxSizeLegacy = builder.getClass().getDeclaredMethod("maximumSize", Integer.TYPE);
+            maxSizeLegacy.setAccessible(true);
+            maxSizeLegacy.invoke(builder, maxCount);
+        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private Cache<String, User> legacyBuild(CacheBuilder builder) {
+        Method build = null;
+        for (Method method : builder.getClass().getDeclaredMethods()) {
+            if (method.getName().equals("build")) {
+                build = method;
+                break;
+            }
+        }
+        Cache<String, User> legacyUsers;
+        try {
+            assert build != null;
+            build.setAccessible(true);
+            legacyUsers = (Cache<String, User>) build.invoke(builder, this);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            legacyUsers = null;
+        }
+        return legacyUsers;
+    }
 }
@@ -1,715 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.util.*;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.inventory.ItemStack;
-
-
-public class Util
-{
-	private Util()
-	{
-	}
-	private final static Logger logger = Logger.getLogger("Minecraft");
-	private final static Pattern INVALIDFILECHARS = Pattern.compile("[^a-z0-9]");
-	private final static Pattern INVALIDCHARS = Pattern.compile("[^\t\n\r\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]");
-
-	//Used to clean file names before saving to disk
-	public static String sanitizeFileName(final String name)
-	{
-		return safeString(name);
-	}
-
-	//Used to clean strings/names before saving as filenames/permissions
-	public static String safeString(final String string)
-	{
-		return INVALIDFILECHARS.matcher(string.toLowerCase(Locale.ENGLISH)).replaceAll("_");
-	}
-
-	//Less restrictive string sanitizing, when not used as perm or filename
-	public static String sanitizeString(final String string)
-	{
-		return INVALIDCHARS.matcher(string).replaceAll("");
-	}
-
-	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 _("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[]
-		{
-			_("year"),
-			_("years"),
-			_("month"),
-			_("months"),
-			_("day"),
-			_("days"),
-			_("hour"),
-			_("hours"),
-			_("minute"),
-			_("minutes"),
-			_("second"),
-			_("seconds")
-		};
-		int accuracy = 0;
-		for (int i = 0; i < types.length; i++)
-		{
-			if (accuracy > 2)
-			{
-				break;
-			}
-			int diff = dateDiff(types[i], fromDate, toDate, future);
-			if (diff > 0)
-			{
-				accuracy++;
-				sb.append(" ").append(diff).append(" ").append(names[i * 2 + (diff > 1 ? 1 : 0)]);
-			}
-		}
-		if (sb.length() == 0)
-		{
-			return "now";
-		}
-		return sb.toString().trim();
-	}
-
-	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(_("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));
-		}
-
-		Calendar max = new GregorianCalendar();
-		max.add(Calendar.YEAR, 10);
-		if (c.after(max))
-		{
-			return max.getTimeInMillis();
-		}
-		return c.getTimeInMillis();
-	}
-	// The player can stand inside these materials 
-	private static final Set<Integer> AIR_MATERIALS = new HashSet<Integer>();
-	private static final HashSet<Byte> AIR_MATERIALS_TARGET = new HashSet<Byte>();
-
-	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.SNOW.getId());
-		AIR_MATERIALS.add(Material.SUGAR_CANE_BLOCK.getId());
-		AIR_MATERIALS.add(Material.DIODE_BLOCK_OFF.getId());
-		AIR_MATERIALS.add(Material.DIODE_BLOCK_ON.getId());
-		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());
-		AIR_MATERIALS.add(Material.FENCE_GATE.getId());
-		AIR_MATERIALS.add(Material.WATER_LILY.getId());
-		AIR_MATERIALS.add(Material.NETHER_FENCE.getId());
-		AIR_MATERIALS.add(Material.NETHER_WARTS.getId());
-
-		for (Integer integer : AIR_MATERIALS)
-		{
-			AIR_MATERIALS_TARGET.add(integer.byteValue());
-		}
-		AIR_MATERIALS_TARGET.add((byte)Material.WATER.getId());
-		AIR_MATERIALS_TARGET.add((byte)Material.STATIONARY_WATER.getId());
-	}
-
-	public static Location getTarget(final LivingEntity entity) throws Exception
-	{
-		final Block block = entity.getTargetBlock(AIR_MATERIALS_TARGET, 300);
-		if (block == null)
-		{
-			throw new Exception("Not targeting a block");
-		}
-		return block.getLocation();
-	}
-	public final static int RADIUS = 3;
-	public final static Vector3D[] VOLUME;
-
-
-	public static class Vector3D
-	{
-		public Vector3D(int x, int y, int z)
-		{
-			this.x = x;
-			this.y = y;
-			this.z = z;
-		}
-		public int x;
-		public int y;
-		public int z;
-	}
-
-	static
-	{
-		List<Vector3D> pos = new ArrayList<Vector3D>();
-		for (int x = -RADIUS; x <= RADIUS; x++)
-		{
-			for (int y = -RADIUS; y <= RADIUS; y++)
-			{
-				for (int z = -RADIUS; z <= RADIUS; z++)
-				{
-					pos.add(new Vector3D(x, y, z));
-				}
-			}
-		}
-		Collections.sort(pos, new Comparator<Vector3D>()
-		{
-			@Override
-			public int compare(Vector3D a, Vector3D b)
-			{
-				return (a.x * a.x + a.y * a.y + a.z * a.z) - (b.x * b.x + b.y * b.y + b.z * b.z);
-			}
-		});
-		VOLUME = pos.toArray(new Vector3D[0]);
-	}
-
-	public static Location getSafeDestination(final Location loc) throws Exception
-	{
-		if (loc == null || loc.getWorld() == null)
-		{
-			throw new Exception(_("destinationNotSet"));
-		}
-		final World world = loc.getWorld();
-		int x = loc.getBlockX();
-		int y = (int)Math.round(loc.getY());
-		int z = loc.getBlockZ();
-		final int origX = x;
-		final int origY = y;
-		final int origZ = z;
-
-		while (isBlockAboveAir(world, x, y, z))
-		{
-			y -= 1;
-			if (y < 0)
-			{
-				y = origY;
-				break;
-			}
-		}
-
-		int i = 0;
-		while (isBlockUnsafe(world, x, y, z))
-		{
-			i++;
-			if (i >= VOLUME.length)
-			{
-				x = origX;
-				y = origY + RADIUS;
-				z = origZ;
-				break;
-			}
-			x = origX + VOLUME[i].x;
-			y = origY + VOLUME[i].y;
-			z = origZ + VOLUME[i].z;
-		}
-
-		while (isBlockUnsafe(world, x, y, z))
-		{
-			y += 1;
-			if (y >= world.getMaxHeight())
-			{
-				x += 1;
-				break;
-			}
-		}
-
-		while (isBlockUnsafe(world, x, y, z))
-		{
-			y -= 1;
-			if (y <= 1)
-			{
-				x += 1;
-				y = world.getHighestBlockYAt(x, z);
-				if (x - 48 > loc.getBlockX())
-				{
-					throw new Exception(_("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)
-	{
-		if (isBlockDamaging(world, x, y, z))
-		{
-			return true;
-		}
-		return isBlockAboveAir(world, x, y, z);
-	}
-
-	public static boolean isBlockDamaging(final World world, final int x, final int y, final int z)
-	{
-		final Block below = world.getBlockAt(x, y - 1, z);
-		if (below.getType() == Material.LAVA || below.getType() == Material.STATIONARY_LAVA)
-		{
-			return true;
-		}
-
-		if (below.getType() == Material.FIRE)
-		{
-			return true;
-		}
-
-		if (below.getType() == Material.BED_BLOCK)
-		{
-			return true;
-		}
-
-		if ((!AIR_MATERIALS.contains(world.getBlockAt(x, y, z).getType().getId()))
-			|| (!AIR_MATERIALS.contains(world.getBlockAt(x, y + 1, z).getType().getId())))
-		{
-			return true;
-		}
-		return false;
-	}
-
-	public static ItemStack convertBlockToItem(final Block block)
-	{
-		final ItemStack is = new ItemStack(block.getType(), 1, (short)0, block.getData());
-		switch (is.getType())
-		{
-		case WOODEN_DOOR:
-			is.setType(Material.WOOD_DOOR);
-			is.setDurability((short)0);
-			break;
-		case IRON_DOOR_BLOCK:
-			is.setType(Material.IRON_DOOR);
-			is.setDurability((short)0);
-			break;
-		case SIGN_POST:
-		case WALL_SIGN:
-			is.setType(Material.SIGN);
-			is.setDurability((short)0);
-			break;
-		case CROPS:
-			is.setType(Material.SEEDS);
-			is.setDurability((short)0);
-			break;
-		case CAKE_BLOCK:
-			is.setType(Material.CAKE);
-			is.setDurability((short)0);
-			break;
-		case BED_BLOCK:
-			is.setType(Material.BED);
-			is.setDurability((short)0);
-			break;
-		case REDSTONE_WIRE:
-			is.setType(Material.REDSTONE);
-			is.setDurability((short)0);
-			break;
-		case REDSTONE_TORCH_OFF:
-		case REDSTONE_TORCH_ON:
-			is.setType(Material.REDSTONE_TORCH_ON);
-			is.setDurability((short)0);
-			break;
-		case DIODE_BLOCK_OFF:
-		case DIODE_BLOCK_ON:
-			is.setType(Material.DIODE);
-			is.setDurability((short)0);
-			break;
-		case DOUBLE_STEP:
-			is.setType(Material.STEP);
-			break;
-		case TORCH:
-		case RAILS:
-		case LADDER:
-		case WOOD_STAIRS:
-		case COBBLESTONE_STAIRS:
-		case LEVER:
-		case STONE_BUTTON:
-		case FURNACE:
-		case DISPENSER:
-		case PUMPKIN:
-		case JACK_O_LANTERN:
-		case WOOD_PLATE:
-		case STONE_PLATE:
-		case PISTON_STICKY_BASE:
-		case PISTON_BASE:
-		case IRON_FENCE:
-		case THIN_GLASS:
-		case TRAP_DOOR:
-		case FENCE:
-		case FENCE_GATE:
-		case NETHER_FENCE:
-			is.setDurability((short)0);
-			break;
-		case FIRE:
-			return null;
-		case PUMPKIN_STEM:
-			is.setType(Material.PUMPKIN_SEEDS);
-			break;
-		case MELON_STEM:
-			is.setType(Material.MELON_SEEDS);
-			break;
-		}
-		return is;
-	}
-	private static DecimalFormat dFormat = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US));
-
-	public static String formatAsCurrency(final double value)
-	{
-		String str = dFormat.format(value);
-		if (str.endsWith(".00"))
-		{
-			str = str.substring(0, str.length() - 3);
-		}
-		return str;
-	}
-
-	public static String displayCurrency(final double value, final IEssentials ess)
-	{
-		return _("currency", ess.getSettings().getCurrencySymbol(), formatAsCurrency(value));
-	}
-
-	public static String shortCurrency(final double value, final IEssentials ess)
-	{
-		return ess.getSettings().getCurrencySymbol() + formatAsCurrency(value);
-	}
-
-	public static double roundDouble(final double d)
-	{
-		return Math.round(d * 100.0) / 100.0;
-	}
-
-	public static boolean isInt(final String sInt)
-	{
-		try
-		{
-			Integer.parseInt(sInt);
-		}
-		catch (NumberFormatException e)
-		{
-			return false;
-		}
-		return true;
-	}
-
-	public static String joinList(Object... list)
-	{
-		return joinList(", ", list);
-	}
-
-	public static String joinList(String seperator, Object... list)
-	{
-		StringBuilder buf = new StringBuilder();
-		for (Object each : list)
-		{
-			if (buf.length() > 0)
-			{
-				buf.append(seperator);
-			}
-
-			if (each instanceof Collection)
-			{
-				buf.append(joinList(seperator, ((Collection)each).toArray()));
-			}
-			else
-			{
-				try
-				{
-					buf.append(each.toString());
-				}
-				catch (Exception e)
-				{
-					buf.append(each.toString());
-				}
-			}
-		}
-		return buf.toString();
-	}
-
-	public static String lastCode(final String input)
-	{
-		int pos = input.lastIndexOf("§");
-		if (pos == -1 || (pos + 1) == input.length())
-		{
-			return "";
-		}
-		return input.substring(pos, pos + 2);
-	}
-	private static transient final Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-z]{2,3}(?:/\\S+)?)");
-	private static transient final Pattern VANILLA_PATTERN = Pattern.compile("\u00A7+[0-9A-FK-ORa-fk-or]");
-	private static transient final Pattern LOGCOLOR_PATTERN = Pattern.compile("\\x1B\\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]");
-	private static transient final Pattern REPLACE_PATTERN = Pattern.compile("&([0-9a-fk-or])");
-	private static transient final Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00A7+[0-9A-Fa-f]");
-	private static transient final Pattern VANILLA_MAGIC_PATTERN = Pattern.compile("\u00A7+[Kk]");
-	private static transient final Pattern VANILLA_FORMAT_PATTERN = Pattern.compile("\u00A7+[L-ORl-or]");
-	private static transient final Pattern REPLACE_COLOR_PATTERN = Pattern.compile("&([0-9a-f])");
-	private static transient final Pattern REPLACE_MAGIC_PATTERN = Pattern.compile("&(k)");
-	private static transient final Pattern REPLACE_FORMAT_PATTERN = Pattern.compile("&([l-or])");
-
-	public static String stripFormat(final String input)
-	{
-		if (input == null)
-		{
-			return null;
-		}
-		return VANILLA_PATTERN.matcher(input).replaceAll("");
-	}
-
-	public static String stripLogColorFormat(final String input)
-	{
-		if (input == null)
-		{
-			return null;
-		}
-		return LOGCOLOR_PATTERN.matcher(input).replaceAll("");
-	}
-
-	public static String replaceFormat(final String input)
-	{
-		if (input == null)
-		{
-			return null;
-		}
-		return REPLACE_PATTERN.matcher(input).replaceAll("\u00a7$1");
-	}
-
-	public static String blockURL(final String input)
-	{
-		if (input == null)
-		{
-			return null;
-		}
-		String text = URL_PATTERN.matcher(input).replaceAll("$1 $2");
-		while (URL_PATTERN.matcher(text).find())
-		{
-			text = URL_PATTERN.matcher(text).replaceAll("$1 $2");
-		}
-		return text;
-	}
-
-	public static String formatString(final IUser user, final String permBase, final String input)
-	{
-		if (input == null)
-		{
-			return null;
-		}
-		String message;
-		if (user.isAuthorized(permBase + ".color"))
-		{
-			message = Util.replaceColor(input, REPLACE_COLOR_PATTERN);
-		}
-		else
-		{
-			message = Util.stripColor(input, VANILLA_COLOR_PATTERN);
-		}
-		if (user.isAuthorized(permBase + ".magic"))
-		{
-			message = Util.replaceColor(message, REPLACE_MAGIC_PATTERN);
-		}
-		else
-		{
-			message = Util.stripColor(message, VANILLA_MAGIC_PATTERN);
-		}
-		if (user.isAuthorized(permBase + ".format"))
-		{
-			message = Util.replaceColor(message, REPLACE_FORMAT_PATTERN);
-		}
-		else
-		{
-			message = Util.stripColor(message, VANILLA_FORMAT_PATTERN);
-		}
-		return message;
-	}
-
-	public static String formatMessage(final IUser user, final String permBase, final String input)
-	{
-		if (input == null)
-		{
-			return null;
-		}
-		String message = formatString(user, permBase, input);
-		if (!user.isAuthorized(permBase + ".url"))
-		{
-			message = Util.blockURL(message);
-		}
-		return message;
-	}
-
-	private static String stripColor(final String input, final Pattern pattern)
-	{
-		return pattern.matcher(input).replaceAll("");
-	}
-
-	private static String replaceColor(final String input, final Pattern pattern)
-	{
-		return pattern.matcher(input).replaceAll("\u00a7$1");
-	}
-}
@@ -1,160 +1,167 @@
 package com.earth2me.essentials;

-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.commands.WarpNotFoundException;
+import com.earth2me.essentials.utils.StringUtil;
+import net.ess3.api.InvalidNameException;
+import net.ess3.api.InvalidWorldException;
+import org.bukkit.Location;
+import org.bukkit.Server;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.bukkit.Location;
-import org.bukkit.Server;
+import static com.earth2me.essentials.I18n.tl;


-public class Warps implements IConf
-{
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	private final Map<StringIgnoreCase, EssentialsConf> warpPoints = new HashMap<StringIgnoreCase, EssentialsConf>();
-	private final File warpsFolder;
-	private final Server server;
+public class Warps implements IConf, net.ess3.api.IWarps {
+    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;

-	public Warps(Server server, File dataFolder)
-	{
-		this.server = server;
-		warpsFolder = new File(dataFolder, "warps");
-		if (!warpsFolder.exists())
-		{
-			warpsFolder.mkdirs();
-		}
-		reloadConfig();
-	}
+    public Warps(Server server, File dataFolder) {
+        this.server = server;
+        warpsFolder = new File(dataFolder, "warps");
+        if (!warpsFolder.exists()) {
+            warpsFolder.mkdirs();
+        }
+        reloadConfig();
+    }

-	public boolean isEmpty()
-	{
-		return warpPoints.isEmpty();
-	}
+    @Override
+    public boolean isEmpty() {
+        return warpPoints.isEmpty();
+    }

-	public Collection<String> getWarpNames()
-	{
-		final List<String> keys = new ArrayList<String>();
-		for (StringIgnoreCase stringIgnoreCase : warpPoints.keySet())
-		{
-			keys.add(stringIgnoreCase.getString());
-		}
-		Collections.sort(keys, String.CASE_INSENSITIVE_ORDER);
-		return keys;
-	}
+    @Override
+    public Collection<String> getList() {
+        final List<String> keys = new ArrayList<String>();
+        for (StringIgnoreCase stringIgnoreCase : warpPoints.keySet()) {
+            keys.add(stringIgnoreCase.getString());
+        }
+        Collections.sort(keys, String.CASE_INSENSITIVE_ORDER);
+        return keys;
+    }

-	public Location getWarp(String warp) throws Exception
-	{
-		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(warp));
-		if (conf == null)
-		{
-			throw new WarpNotFoundException();
-		}
-		return conf.getLocation(null, server);
-	}
+    @Override
+    public Location getWarp(String warp) throws WarpNotFoundException, InvalidWorldException {
+        EssentialsConf conf = warpPoints.get(new StringIgnoreCase(warp));
+        if (conf == null) {
+            throw new WarpNotFoundException();
+        }
+        return conf.getLocation(null, server);
+    }

-	public void setWarp(String name, Location loc) throws Exception
-	{
-		String filename = Util.sanitizeFileName(name);
-		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
-		if (conf == null)
-		{
-			File confFile = new File(warpsFolder, filename + ".yml");
-			if (confFile.exists())
-			{
-				throw new Exception(_("similarWarpExist"));
-			}
-			conf = new EssentialsConf(confFile);
-			warpPoints.put(new StringIgnoreCase(name), conf);
-		}
-		conf.setProperty(null, loc);
-		conf.setProperty("name", name);
-		try
-		{
-			conf.saveWithError();
-		}
-		catch (IOException ex)
-		{
-			throw new IOException(_("invalidWarpName"));
-		}
-	}
+    @Override
+    public void setWarp(String name, Location loc) throws Exception {
+        setWarp(null, name, loc);
+    }
+    
+    @Override
+    public void setWarp(IUser user, String name, Location loc) throws Exception {
+        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(tl("similarWarpExist"));
+            }
+            conf = new EssentialsConf(confFile);
+            warpPoints.put(new StringIgnoreCase(name), conf);
+        }
+        conf.setProperty(null, loc);
+        conf.setProperty("name", name);
+        if (user != null) conf.setProperty("lastowner", user.getBase().getUniqueId().toString());
+        try {
+            conf.saveWithError();
+        } catch (IOException ex) {
+            throw new IOException(tl("invalidWarpName"));
+        }
+    }
+    
+    @Override
+    public UUID getLastOwner(String warp) throws WarpNotFoundException {
+        EssentialsConf conf = warpPoints.get(new StringIgnoreCase(warp));
+        if (conf == null) {
+            throw new WarpNotFoundException();
+        }
+        UUID uuid = null;
+        try {
+            uuid = UUID.fromString(conf.getString("lastowner"));
+        }
+        catch (Exception ex) {}
+        return uuid;
+    }
+    
+    @Override
+    public void removeWarp(String name) throws Exception {
+        EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
+        if (conf == null) {
+            throw new Exception(tl("warpNotExist"));
+        }
+        if (!conf.getFile().delete()) {
+            throw new Exception(tl("warpDeleteError"));
+        }
+        warpPoints.remove(new StringIgnoreCase(name));
+    }

-	public void delWarp(String name) throws Exception
-	{
-		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
-		if (conf == null)
-		{
-			throw new Exception(_("warpNotExist"));
-		}
-		if (!conf.getFile().delete())
-		{
-			throw new Exception(_("warpDeleteError"));
-		}
-		warpPoints.remove(new StringIgnoreCase(name));
-	}
+    @Override
+    public final void reloadConfig() {
+        warpPoints.clear();
+        File[] listOfFiles = warpsFolder.listFiles();
+        if (listOfFiles.length >= 1) {
+            for (int i = 0; i < listOfFiles.length; i++) {
+                String filename = listOfFiles[i].getName();
+                if (listOfFiles[i].isFile() && filename.endsWith(".yml")) {
+                    try {
+                        EssentialsConf conf = new EssentialsConf(listOfFiles[i]);
+                        conf.load();
+                        String name = conf.getString("name");
+                        if (name != null) {
+                            warpPoints.put(new StringIgnoreCase(name), conf);
+                        }
+                    } catch (Exception ex) {
+                        logger.log(Level.WARNING, tl("loadWarpError", filename), ex);
+                    }
+                }
+            }
+        }
+    }

-	@Override
-	public final void reloadConfig()
-	{
-		warpPoints.clear();
-		File[] listOfFiles = warpsFolder.listFiles();
-		if (listOfFiles.length >= 1)
-		{
-			for (int i = 0; i < listOfFiles.length; i++)
-			{
-				String filename = listOfFiles[i].getName();
-				if (listOfFiles[i].isFile() && filename.endsWith(".yml"))
-				{
-					try
-					{
-						EssentialsConf conf = new EssentialsConf(listOfFiles[i]);
-						conf.load();
-						String name = conf.getString("name");
-						if (name != null)
-						{
-							warpPoints.put(new StringIgnoreCase(name), conf);
-						}
-					}
-					catch (Exception ex)
-					{
-						logger.log(Level.WARNING, _("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
-	{
-		private final String string;
+    private static class StringIgnoreCase {
+        private final String string;

-		public StringIgnoreCase(String string)
-		{
-			this.string = string;
-		}
+        public StringIgnoreCase(String string) {
+            this.string = string;
+        }

-		@Override
-		public int hashCode()
-		{
-			return getString().toLowerCase(Locale.ENGLISH).hashCode();
-		}
+        @Override
+        public int hashCode() {
+            return getString().toLowerCase(Locale.ENGLISH).hashCode();
+        }

-		@Override
-		public boolean equals(Object o)
-		{
-			if (o instanceof StringIgnoreCase)
-			{
-				return getString().equalsIgnoreCase(((StringIgnoreCase)o).getString());
-			}
-			return false;
-		}
+        @Override
+        public boolean equals(Object o) {
+            if (o instanceof StringIgnoreCase) {
+                return getString().equalsIgnoreCase(((StringIgnoreCase) o).getString());
+            }
+            return false;
+        }

-		public String getString()
-		{
-			return string;
-		}
-	}
+        public String getString() {
+            return string;
+        }
+    }
 }
@@ -1,61 +1,156 @@
 package com.earth2me.essentials;

-import java.io.File;
-import java.util.Locale;
-import java.util.logging.Logger;
+import com.earth2me.essentials.commands.NotEnoughArgumentsException;
+import com.earth2me.essentials.utils.VersionUtil;
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;

+import java.io.File;
+import java.math.BigDecimal;
+import java.util.Locale;

-public class Worth implements IConf
-{
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	private final EssentialsConf config;
+import static com.earth2me.essentials.I18n.tl;

-	public Worth(File dataFolder)
-	{
-		config = new EssentialsConf(new File(dataFolder, "worth.yml"));
-		config.setTemplateName("/worth.yml");
-		config.load();
-	}

-	public double getPrice(ItemStack itemStack)
-	{
-		String itemname = itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
-		double result;
-		result = config.getDouble("worth." + itemname + "." + itemStack.getDurability(), Double.NaN);
-		if (Double.isNaN(result))
-		{
-			result = config.getDouble("worth." + itemname + ".0", Double.NaN);
-		}
-		if (Double.isNaN(result))
-		{
-			result = config.getDouble("worth." + itemname, Double.NaN);
-		}
-		if (Double.isNaN(result))
-		{
-			result = config.getDouble("worth-" + itemStack.getTypeId(), Double.NaN);
-		}
-		return result;
-	}
+public class Worth implements IConf {
+    private final EssentialsConf config;

-	public void setPrice(ItemStack itemStack, double price)
-	{
-		if (itemStack.getType().getData() == null)
-		{
-			config.setProperty("worth." + itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), price);
-		}
-		else
-		{
-			// Bukkit-bug: getDurability still contains the correct value, while getData().getData() is 0.
-			config.setProperty("worth." + itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "") + "." + itemStack.getDurability(), price);
-		}
-		config.removeProperty("worth-" + itemStack.getTypeId());
-		config.save();
-	}
+    public Worth(File dataFolder) {
+        config = new EssentialsConf(new File(dataFolder, "worth.yml"));
+        config.setTemplateName("/worth.yml");
+        config.load();
+    }

-	@Override
-	public void reloadConfig()
-	{
-		config.load();
-	}
+    /**
+     * Get the value of an item stack from the config.
+     *
+     * @param ess       The Essentials instance.
+     * @param itemStack The item stack to look up in the config.
+     * @return The price from the config.
+     */
+    public BigDecimal getPrice(IEssentials ess, ItemStack itemStack) {
+        BigDecimal result;
+
+        String itemname = itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
+
+        // Check for matches with data value from stack
+        // Note that we always default to BigDecimal.ONE.negate(), equivalent to -1
+        result = config.getBigDecimal("worth." + itemname + "." + itemStack.getDurability(), BigDecimal.ONE.negate());
+
+        // Check for matches with data value 0
+        if (result.signum() < 0) {
+            final ConfigurationSection itemNameMatch = config.getConfigurationSection("worth." + itemname);
+            if (itemNameMatch != null && itemNameMatch.getKeys(false).size() == 1) {
+                result = config.getBigDecimal("worth." + itemname + ".0", BigDecimal.ONE.negate());
+            }
+        }
+
+        // Check for matches with data value wildcard
+        if (result.signum() < 0) {
+            result = config.getBigDecimal("worth." + itemname + ".*", BigDecimal.ONE.negate());
+        }
+
+        // Check for matches with item name alone
+        if (result.signum() < 0) {
+            result = config.getBigDecimal("worth." + itemname, BigDecimal.ONE.negate());
+        }
+
+        if (result.signum() < 0) {
+            return null;
+        }
+        return result;
+    }
+
+    /**
+     * Get the amount of items to be sold from a player's inventory.
+     *
+     * @param ess        The Essentials instance.
+     * @param user       The user attempting to sell the item.
+     * @param is         A stack of the item to search the inventory for.
+     * @param args       The amount to try to sell.
+     * @param isBulkSell Whether or not to try and bulk sell all items.
+     * @return The amount of items to sell from the player's inventory.
+     * @throws Exception Thrown if trying to sell air or an invalid amount.
+     */
+    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 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(is.getType());
+
+        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;
+    }
+
+    /**
+     * Set the price of an item and save it to the config.
+     *
+     * @param ess       The Essentials instance.
+     * @param itemStack A stack of the item to save.
+     * @param price     The new price of the item.
+     */
+    public void setPrice(IEssentials ess, ItemStack itemStack, double price) {
+        String path = "worth." + itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
+
+        // Spigot 1.13+ throws an exception if a 1.13+ plugin even *attempts* to do set data.
+        if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_13_0_R01) && itemStack.getType().getData() == null) {
+            // Bukkit-bug: getDurability still contains the correct value, while getData().getData() is 0.
+            path = path + "." + itemStack.getDurability();
+        }
+
+        config.setProperty(path, price);
+        config.save();
+    }
+
+    @Override
+    public void reloadConfig() {
+        config.load();
+    }
 }
@@ -1,300 +1,427 @@
 package com.earth2me.essentials.api;

-import com.earth2me.essentials.EssentialsConf;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.IEssentials;
+import com.earth2me.essentials.EssentialsUserConf;
+import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.StringUtil;
+import com.google.common.base.Charsets;
+import net.ess3.api.IEssentials;
+import net.ess3.api.MaxMoneyException;
+import org.bukkit.entity.Player;
+
 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;


 /**
- * Instead of using this api directly, we recommend to use the register plugin:
- * http://bit.ly/RegisterMethod
+ * You should use Vault instead of directly using this class.
 */
-public final class Economy
-{
-	private Economy()
-	{
-	}
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	private static IEssentials ess;
-	private static final String noCallBeforeLoad = "Essentials API is called before Essentials is loaded.";
+public class Economy {
+    public Economy() {
+    }

-	/**
-	 * @param aEss the ess to set
-	 */
-	public static void setEss(IEssentials aEss)
-	{
-		ess = aEss;
-	}
+    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;

-	private static void createNPCFile(String name)
-	{
-		File folder = new File(ess.getDataFolder(), "userdata");
-		if (!folder.exists())
-		{
-			folder.mkdirs();
-		}
-		EssentialsConf npcConfig = new EssentialsConf(new File(folder, Util.sanitizeFileName(name) + ".yml"));
-		npcConfig.load();
-		npcConfig.setProperty("npc", true);
-		npcConfig.setProperty("money", ess.getSettings().getStartingBalance());
-		npcConfig.save();
-	}
+    /**
+     * @param aEss the ess to set
+     */
+    public static void setEss(IEssentials aEss) {
+        ess = aEss;
+    }

-	private static void deleteNPC(String name)
-	{
-		File folder = new File(ess.getDataFolder(), "userdata");
-		if (!folder.exists())
-		{
-			folder.mkdirs();
-		}
-		File config = new File(folder, Util.sanitizeFileName(name) + ".yml");
-		EssentialsConf npcConfig = new EssentialsConf(config);
-		npcConfig.load();
-		if (npcConfig.hasProperty("npc") && npcConfig.getBoolean("npc", false))
-		{
-			if (!config.delete())
-			{
-				logger.log(Level.WARNING, _("deleteFileError", config));
-			}
-			ess.getUserMap().removeUser(name);
-		}
-	}
+    private static void createNPCFile(String name) {
+        File folder = new File(ess.getDataFolder(), "userdata");
+        name = StringUtil.safeString(name);
+        if (!folder.exists()) {
+            folder.mkdirs();
+        }
+        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.forceSave();
+        ess.getUserMap().trackUUID(npcUUID, name, false);
+    }

-	private static User getUserByName(String name)
-	{
-		if (ess == null)
-		{
-			throw new RuntimeException(noCallBeforeLoad);
-		}
-		return ess.getUser(name);
-	}
+    private static void deleteNPC(String name) {
+        User user = ess.getUser(name);
+        user.reset();
+    }

-	/**
-	 * Returns the balance of a user
-	 * @param name Name of the user
-	 * @return balance
-	 * @throws UserDoesNotExistException 
-	 */
-	public static double getMoney(String name) throws UserDoesNotExistException
-	{
-		User user = getUserByName(name);
-		if (user == null)
-		{
-			throw new UserDoesNotExistException(name);
-		}
-		return user.getMoney();
-	}
+    private static User getUserByName(String name) {
+        if (ess == null) {
+            throw new RuntimeException(noCallBeforeLoad);
+        }
+        if (name == null) {
+            throw new RuntimeException("Economy username cannot be null");
+        }

-	/**
-	 * Sets the balance of a user
-	 * @param name Name of the user
-	 * @param balance The balance you want to set
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
-	 */
-	public static void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		User user = getUserByName(name);
-		if (user == null)
-		{
-			throw new UserDoesNotExistException(name);
-		}
-		if (balance < ess.getSettings().getMinMoney())
-		{
-			throw new NoLoanPermittedException();
-		}
-		if (balance < 0.0 && !user.isAuthorized("essentials.eco.loan"))
-		{
-			throw new NoLoanPermittedException();
-		}
-		user.setMoney(balance);
-	}
+        User user = ess.getUser(name);
+        if (user == null) {
+            /*
+                Attempt lookup using UUID - this prevents balance resets when accessing economy
+                via Vault during player join.
+                See: https://github.com/EssentialsX/Essentials/issues/2400
+            */
+            Player player = ess.getServer().getPlayerExact(name);
+            if (player != null) {
+                user = ess.getUser(player.getUniqueId());
+                if (user != null) {
+                    logger.info(String.format("[Economy] Found player %s by UUID %s but not by their actual name - they may have changed their username", name, player.getUniqueId().toString()));
+                }
+            }
+        }

-	/**
-	 * Adds money to the balance of a user
-	 * @param name Name of the user
-	 * @param amount The money you want to add
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
-	 */
-	public static void add(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		double result = getMoney(name) + amount;
-		setMoney(name, result);
-	}
+        return user;
+    }

-	/**
-	 * Substracts money from the balance of a user
-	 * @param name Name of the user
-	 * @param amount The money you want to substract
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
-	 */
-	public static void subtract(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		double result = getMoney(name) - amount;
-		setMoney(name, result);
-	}
+    /**
+     * Returns the balance of a user
+     *
+     * @param name Name of the user
+     *
+     * @return balance
+     *
+     * @throws UserDoesNotExistException
+     */
+    @Deprecated
+    public static double getMoney(String name) throws UserDoesNotExistException {
+        BigDecimal exactAmount = getMoneyExact(name);
+        double amount = exactAmount.doubleValue();
+        if (new BigDecimal(amount).compareTo(exactAmount) > 0) {
+            // closest double is bigger than the exact amount
+            // -> get the previous double value to not return more money than the user has
+            amount = Math.nextAfter(amount, Double.NEGATIVE_INFINITY);
+        }
+        return amount;
+    }

-	/**
-	 * Divides the balance of a user by a value
-	 * @param name Name of the user
-	 * @param value The balance is divided by this value
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
-	 */
-	public static void divide(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		double result = getMoney(name) / value;
-		setMoney(name, result);
-	}
+    public static BigDecimal getMoneyExact(String name) throws UserDoesNotExistException {
+        User user = getUserByName(name);
+        if (user == null) {
+            throw new UserDoesNotExistException(name);
+        }
+        return user.getMoney();
+    }

-	/**
-	 * Multiplies the balance of a user by a value
-	 * @param name Name of the user
-	 * @param value The balance is multiplied by this value
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
-	 */
-	public static void multiply(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		double result = getMoney(name) * value;
-		setMoney(name, result);
-	}
+    /**
+     * 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);
+        }
+    }

-	/**
-	 * Resets the balance of a user to the starting balance
-	 * @param name Name of the user
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
-	 */
-	public static void resetBalance(String name) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		if (ess == null)
-		{
-			throw new RuntimeException(noCallBeforeLoad);
-		}
-		setMoney(name, ess.getSettings().getStartingBalance());
-	}
+    public static void setMoney(String name, BigDecimal balance) throws UserDoesNotExistException, NoLoanPermittedException {
+        User user = getUserByName(name);
+        if (user == null) {
+            throw new UserDoesNotExistException(name);
+        }
+        if (balance.compareTo(ess.getSettings().getMinMoney()) < 0) {
+            throw new NoLoanPermittedException();
+        }
+        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
+        }
+        Trade.log("API", "Set", "API", name, new Trade(balance, ess), null, null, null, ess);
+    }

-	/**
-	 * @param name Name of the user
-	 * @param amount The amount of money the user should have
-	 * @return true, if the user has more or an equal amount of money
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 */
-	public static boolean hasEnough(String name, double amount) throws UserDoesNotExistException
-	{
-		return amount <= getMoney(name);
-	}
+    /**
+     * 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 {
+        try {
+            add(name, BigDecimal.valueOf(amount));
+        } catch (ArithmeticException e) {
+            logger.log(Level.WARNING, "Failed to add " + amount + " to balance of " + name + ": " + e.getMessage(), e);
+        }
+    }

-	/**
-	 * @param name Name of the user
-	 * @param amount The amount of money the user should have
-	 * @return true, if the user has more money
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 */
-	public static boolean hasMore(String name, double amount) throws UserDoesNotExistException
-	{
-		return amount < getMoney(name);
-	}
+    public static void add(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException {
+        BigDecimal result = getMoneyExact(name).add(amount, MATH_CONTEXT);
+        setMoney(name, result);
+        Trade.log("API", "Add", "API", name, new Trade(amount, ess), null, null, null, ess);
+    }

-	/**
-	 * @param name Name of the user
-	 * @param amount The amount of money the user should not have
-	 * @return true, if the user has less money
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 */
-	public static boolean hasLess(String name, double amount) throws UserDoesNotExistException
-	{
-		return amount > getMoney(name);
-	}
+    /**
+     * 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 {
+        try {
+            substract(name, BigDecimal.valueOf(amount));
+        } catch (ArithmeticException e) {
+            logger.log(Level.WARNING, "Failed to substract " + amount + " of balance of " + name + ": " + e.getMessage(), e);
+        }
+    }

-	/**
-	 * 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;
-	}
+    public static void substract(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException {
+        BigDecimal result = getMoneyExact(name).subtract(amount, MATH_CONTEXT);
+        setMoney(name, result);
+        Trade.log("API", "Subtract", "API", name, new Trade(amount, ess), null, null, null, ess);
+    }

-	/**
-	 * Formats the amount of money like all other Essentials functions.
-	 * Example: $100000 or $12345.67
-	 * @param amount The amount of money
-	 * @return Formatted money
-	 */
-	public static String format(double amount)
-	{
-		if (ess == null)
-		{
-			throw new RuntimeException(noCallBeforeLoad);
-		}
-		return Util.displayCurrency(amount, ess);
-	}
+    /**
+     * Divides the balance of a user by a value
+     *
+     * @param name  Name of the user
+     * @param amount 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
+     */
+    @Deprecated
+    public static void divide(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException {
+        try {
+            divide(name, BigDecimal.valueOf(amount));
+        } catch (ArithmeticException e) {
+            logger.log(Level.WARNING, "Failed to divide balance of " + name + " by " + amount + ": " + e.getMessage(), e);
+        }
+    }

-	/**
-	 * Test if a player exists to avoid the UserDoesNotExistException
-	 * @param name Name of the user
-	 * @return true, if the user exists
-	 */
-	public static boolean playerExists(String name)
-	{
-		return getUserByName(name) != null;
-	}
+    public static void divide(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException {
+        BigDecimal result = getMoneyExact(name).divide(amount, MATH_CONTEXT);
+        setMoney(name, result);
+        Trade.log("API", "Divide", "API", name, new Trade(amount, ess), null, null, null, ess);
+    }

-	/**
-	 * Test if a player is a npc
-	 * @param name Name of the player
-	 * @return true, if it's a npc
-	 * @throws UserDoesNotExistException 
-	 */
-	public static boolean isNPC(String name) throws UserDoesNotExistException
-	{
-		User user = getUserByName(name);
-		if (user == null)
-		{
-			throw new UserDoesNotExistException(name);
-		}
-		return user.isNPC();
-	}
+    /**
+     * Multiplies the balance of a user by a value
+     *
+     * @param name  Name of the user
+     * @param amount 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
+     */
+    @Deprecated
+    public static void multiply(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException {
+        try {
+            multiply(name, BigDecimal.valueOf(amount));
+        } catch (ArithmeticException e) {
+            logger.log(Level.WARNING, "Failed to multiply balance of " + name + " by " + amount + ": " + e.getMessage(), e);
+        }
+    }

-	/**
-	 * Creates dummy files for a npc, if there is no player yet with that name.
-	 * @param name Name of the player
-	 * @return true, if a new npc was created
-	 */
-	public static boolean createNPC(String name)
-	{
-		User user = getUserByName(name);
-		if (user == null)
-		{
-			createNPCFile(name);
-			return true;
-		}
-		return false;
-	}
+    public static void multiply(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException {
+        BigDecimal result = getMoneyExact(name).multiply(amount, MATH_CONTEXT);
+        setMoney(name, result);
+        Trade.log("API", "Multiply", "API", name, new Trade(amount, ess), null, null, null, ess);
+    }

-	/**
-	 * Deletes a user, if it is marked as npc. 
-	 * @param name Name of the player
-	 * @throws UserDoesNotExistException 
-	 */
-	public static void removeNPC(String name) throws UserDoesNotExistException
-	{
-		User user = getUserByName(name);
-		if (user == null)
-		{
-			throw new UserDoesNotExistException(name);
-		}
-		deleteNPC(name);
-	}
+    /**
+     * Resets the balance of a user to the starting balance
+     *
+     * @param name Name of the user
+     *
+     * @throws UserDoesNotExistException If a user by that name does not exists
+     * @throws NoLoanPermittedException  If the user is not allowed to have a negative balance
+     */
+    public static void resetBalance(String name) throws UserDoesNotExistException, NoLoanPermittedException {
+        if (ess == null) {
+            throw new RuntimeException(noCallBeforeLoad);
+        }
+        setMoney(name, ess.getSettings().getStartingBalance());
+        Trade.log("API", "Reset", "API", name, new Trade(BigDecimal.ZERO, ess), null, null, null, ess);
+    }
+
+    /**
+     * @param name   Name of the user
+     * @param amount The amount of money the user should have
+     *
+     * @return true, if the user has more or an equal amount of money
+     *
+     * @throws UserDoesNotExistException If a user by that name does not exists
+     */
+    @Deprecated
+    public static boolean hasEnough(String name, double amount) throws UserDoesNotExistException {
+        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;
+    }
+
+    /**
+     * @param name   Name of the user
+     * @param amount The amount of money the user should have
+     *
+     * @return true, if the user has more money
+     *
+     * @throws UserDoesNotExistException If a user by that name does not exists
+     */
+    @Deprecated
+    public static boolean hasMore(String name, double amount) throws UserDoesNotExistException {
+        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;
+    }
+
+    /**
+     * @param name   Name of the user
+     * @param amount The amount of money the user should not have
+     *
+     * @return true, if the user has less money
+     *
+     * @throws UserDoesNotExistException If a user by that name does not exists
+     */
+    @Deprecated
+    public static boolean hasLess(String name, double amount) throws UserDoesNotExistException {
+        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 getMoneyExact(name).signum() < 0;
+    }
+
+    /**
+     * Formats the amount of money like all other Essentials functions. Example: $100000 or $12345.67
+     *
+     * @param amount The amount of money
+     *
+     * @return Formatted money
+     */
+    @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 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
+     */
+    public static boolean playerExists(String name) {
+        return getUserByName(name) != null;
+    }
+
+    /**
+     * Test if a player is a npc
+     *
+     * @param name Name of the player
+     *
+     * @return true, if it's a npc
+     *
+     * @throws UserDoesNotExistException
+     */
+    public static boolean isNPC(String name) throws UserDoesNotExistException {
+        User user = getUserByName(name);
+        if (user == null) {
+            throw new UserDoesNotExistException(name);
+        }
+        return user.isNPC();
+    }
+
+    /**
+     * Creates dummy files for a npc, if there is no player yet with that name.
+     *
+     * @param name Name of the player
+     *
+     * @return true, if a new npc was created
+     */
+    public static boolean createNPC(String name) {
+        User user = getUserByName(name);
+        if (user == null) {
+            createNPCFile(name);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Deletes a user, if it is marked as npc.
+     *
+     * @param name Name of the player
+     *
+     * @throws UserDoesNotExistException
+     */
+    public static void removeNPC(String name) throws UserDoesNotExistException {
+        User user = getUserByName(name);
+        if (user == null) {
+            throw new UserDoesNotExistException(name);
+        }
+        deleteNPC(name);
+    }
 }
@@ -3,7 +3,11 @@ package com.earth2me.essentials.api;
 import java.util.Locale;


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

+import com.earth2me.essentials.CommandSource;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.MaterialUtil;
+import com.earth2me.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.StringUtil;
+import net.ess3.api.IEssentials;
+import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;

+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;

-public interface IItemDb
-{
-	ItemStack get(final String name, final int quantity) throws Exception;
-	
-	ItemStack get(final String name) throws Exception;
+
+public interface IItemDb {
+
+    /**
+     * Create a stack from the given name with the given quantity.
+     *
+     * @param name Item name to look up in the database
+     * @param quantity Quantity of the item stack
+     * @return The requested item stack
+     * @throws Exception if the item stack cannot be created
+     */
+    default ItemStack get(final String name, final int quantity) throws Exception {
+        final ItemStack stack = get(name.toLowerCase(Locale.ENGLISH));
+        stack.setAmount(quantity);
+        return stack;
+    }
+
+    /**
+     * Create a stack from the given name with the maximum stack size for that material.
+     *
+     * @param name Item name to look up in the database
+     * @return The requested item stack with the maximum stack size
+     * @throws Exception if the item stack cannot be created
+     */
+    ItemStack get(final String name) throws Exception;
+
+    /**
+     * Get a comma-separated string list of up to 15 aliases for the given stack.
+     *
+     * @param item Item stack whose names to find
+     * @return Comma-separated list of up to 15 item names
+     */
+    default String names(ItemStack item) {
+        List<String> nameList = nameList(item);
+
+        if (nameList.size() > 15) {
+            nameList = nameList.subList(0, 14);
+        }
+        return StringUtil.joinList(", ", nameList);
+    };
+
+    /**
+     * Get a List of all aliases for the given item stack.
+     *
+     * @param item Item stack whose names to find
+     * @return List of all names
+     */
+    List<String> nameList(ItemStack item);
+
+    /**
+     * Get the primary name for the given item stack.
+     *
+     * @param item Item stack whose name to find
+     * @return Primary name of the item
+     */
+    String name(ItemStack item);
+
+    /**
+     * Get all stacks in a given User's inventory that matches the given arguments.
+     *
+     * @param user The user with the player inventory to search
+     * @param args Either an item name, or one of the following:
+     *             hand (default), inventory/invent/all, blocks
+     * @return A List of all matching ItemStacks
+     * @throws Exception if the given args are invalid or no blocks are found
+     */
+    List<ItemStack> getMatching(User user, String[] args) throws Exception;
+
+    /**
+     * Serialise an ItemStack into a format that can be decoded by
+     * {@link #get(String) get} and
+     * {@link com.earth2me.essentials.MetaItemStack#parseStringMeta(CommandSource, boolean, String[], int, IEssentials)} MetaItemStack#parseStringMeta}.
+     * Used to encode items for kits.
+     *
+     * @param is Stack to serialise
+     * @return Serialised stack
+     */
+    String serialize(ItemStack is);
+
+    /**
+     * Return names recognised by the database, intended for tab-completion.
+     *
+     * @return Collection of all item names
+     */
+    Collection<String> listNames();
+
+    /**
+     * Get the material matching the given legacy ID. Used for conversion from item IDs to
+     * modern names.
+     *
+     * @param id Legacy ID of material to find
+     * @return Updated material
+     */
+    @Deprecated
+    default Material getFromLegacyId(int id) {
+        return getFromLegacy(id, (byte) 0);
+    }
+
+    /**
+     * Get the legacy ID for the given material.
+     *
+     * @param material Material to look up
+     * @return Legacy ID of given material
+     * @throws Exception if the ID cannot be looked up
+     * @deprecated Item IDs are no longer supported.
+     */
+    @Deprecated
+    int getLegacyId(Material material) throws Exception;
+
+    /**
+     * Convert colon syntax (eg. "13", "1:5") legacy IDs to Material. Used for conversion from
+     * item IDs to modern names.
+     *
+     * @param item Legacy ID in colon syntax.
+     * @return
+     */
+    default Material getFromLegacy(String item) {
+        final String[] split = item.split(":");
+
+        final int id = Integer.parseInt(split[0]);
+        byte damage = 0;
+
+        if (split.length > 1 && NumberUtil.isInt(split[1])) {
+            damage = Byte.parseByte(split[1]);
+        }
+
+        return getFromLegacy(id, damage);
+    }
+
+    /**
+     * Convert legacy ID and damage value to Material. Used for conversion from item IDs to
+     * modern names.
+     *
+     * @param id Legacy ID
+     * @param damage Damage value
+     * @return Material
+     */
+    default Material getFromLegacy(final int id, final byte damage) {
+        return MaterialUtil.convertFromLegacy(id, damage);
+    }
+
+    /**
+     * Check whether the item database is loaded and ready for use.
+     *
+     * @return Whether items have finished loading
+     */
+    boolean isReady();
 }
@@ -1,20 +1,65 @@
 package com.earth2me.essentials.api;

-import java.util.Collection;
+import net.ess3.api.IUser;
 import org.bukkit.Location;

+import java.util.Collection;

-public interface IJails extends IReload
-{
-	Location getJail(String jailName) throws Exception;

-	Collection<String> getList() throws Exception;
+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;

-	int getCount();
+    /**
+     * 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;

-	void removeJail(String jail) throws Exception;
+    /**
+     * Gets the number of jails
+     *
+     * @return the size of the list of jails
+     */
+    int getCount();

-	void sendToJail(com.earth2me.essentials.IUser user, String jail) throws Exception;
+    /**
+     * 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;

-	void setJail(String jailName, Location loc) 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;
 }
@@ -1,7 +1,6 @@
 package com.earth2me.essentials.api;


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

+import com.earth2me.essentials.Trade;
+import net.ess3.api.IUser;
 import org.bukkit.Location;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerTeleportEvent;


-public interface ITeleport
-{
-	void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception;
+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
+     */
+    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
+     */
+    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
+     */
+    void back(Trade chargeFor) throws Exception;
+
+    /**
+     * Teleport wrapper used to handle throwing user home after a jail sentence
+     *
+     * @throws Exception
+     */
+    void back() throws Exception;
+
 }
@@ -0,0 +1,95 @@
+package com.earth2me.essentials.api;
+
+import com.earth2me.essentials.IConf;
+import com.earth2me.essentials.IUser;
+import com.earth2me.essentials.commands.WarpNotFoundException;
+import org.bukkit.Location;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.UUID;
+
+
+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;
+
+    /**
+     * Set a warp
+     *
+     * @param user - User of warp
+     * @param name - Name of warp
+     * @param loc  - Location of warp
+     *
+     * @throws Exception
+     */
+    void setWarp(IUser user, String name, Location loc) throws Exception;
+      
+    /**
+     * Gets Lastowner UUID
+     *   
+     * @param name - Name of warp
+     *
+     * @throws WarpNotFoundException
+     */
+    UUID getLastOwner(String warp) throws WarpNotFoundException;
+    /**
+     * 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;
+}
@@ -0,0 +1,14 @@
+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);
+    }
+}
@@ -0,0 +1,17 @@
+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;
+    }
+}
@@ -1,12 +1,6 @@
 package com.earth2me.essentials.api;

-import static com.earth2me.essentials.I18n._;

+public class NoLoanPermittedException extends net.ess3.api.NoLoanPermittedException {

-public class NoLoanPermittedException extends Exception
-{
-	public NoLoanPermittedException()
-	{
-		super(_("negativeBalanceError"));
-	}
 }
@@ -1,12 +1,10 @@
 package com.earth2me.essentials.api;

-import static com.earth2me.essentials.I18n._;
+import static com.earth2me.essentials.I18n.tl;


-public class UserDoesNotExistException extends Exception
-{
-	public UserDoesNotExistException(String name)
-	{
-		super(_("userDoesNotExist", name));
-	}
+public class UserDoesNotExistException extends Exception {
+    public UserDoesNotExistException(String name) {
+        super(tl("userDoesNotExist", name));
+    }
 }
@@ -1,58 +1,103 @@
 package com.earth2me.essentials.commands;

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

+import java.util.Collections;
+import java.util.List;

-public class Commandafk extends EssentialsCommand
-{
-	public Commandafk()
-	{
-		super("afk");
-	}
+import static com.earth2me.essentials.I18n.tl;

-	@Override
-	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length > 0 && user.isAuthorized("essentials.afk.others"))
-		{
-			User afkUser = ess.getUser(ess.getServer().matchPlayer(args[0]));
-			if (afkUser != null)
-			{
-				toggleAfk(afkUser);
-			}
-		}
-		else
-		{
-			toggleAfk(user);
-		}
-	}

-	private void toggleAfk(User user)
-	{
-		user.setDisplayNick();
-		String msg = "";
-		if (!user.toggleAfk())
-		{
-			//user.sendMessage(_("markedAsNotAway"));
-			if (!user.isHidden())
-			{
-				msg = _("userIsNotAway", user.getDisplayName());
-			}
-			user.updateActivity(false);
-		}
-		else
-		{
-			//user.sendMessage(_("markedAsAway"));
-			if (!user.isHidden())
-			{
-				msg = _("userIsAway", user.getDisplayName());
-			}
-		}
-		if (!msg.isEmpty())
-		{
-			ess.broadcastMessage(user, msg);
-		}
-	}
+public class Commandafk extends EssentialsCommand {
+    public Commandafk() {
+        super("afk");
+    }
+
+    @Override
+    public void run(Server server, User user, String commandLabel, String[] args) throws Exception {
+        if (args.length > 0 && user.isAuthorized("essentials.afk.others")) {
+            User afkUser = user; // if no player found, but message specified, set command executor to target user
+            String message;
+            try {
+                afkUser = getPlayer(server, user, args, 0);
+                message = args.length > 1 ? getFinalArg(args, 1) : null;
+            } catch (PlayerNotFoundException e) {
+                // If only one arg is passed, assume the command executor is targeting another player.
+                if (args.length == 1) {
+                    throw e;
+                }
+                message = getFinalArg(args, 0);
+            }
+            toggleAfk(user, afkUser, message);
+        } else {
+            String message = args.length > 0 ? getFinalArg(args, 0) : null;
+            toggleAfk(user, user, message);
+        }
+    }
+
+    @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);
+            String message = args.length > 1 ? getFinalArg(args, 1) : null;
+            toggleAfk(null, afkUser, message);
+        } else {
+            throw new NotEnoughArgumentsException();
+        }
+    }
+
+    private void toggleAfk(User sender, User user, String message) throws Exception {
+        if (message != null && sender != null) {
+            if (sender.isMuted()) {
+                throw new Exception(tl("voiceSilenced"));
+            }
+            if (!sender.isAuthorized("essentials.afk.message")) {
+                throw new Exception(tl("noPermToAFKMessage"));
+            }
+        }
+        user.setDisplayNick();
+        String msg = "";
+        if (!user.toggleAfk()) {
+            //user.sendMessage(_("markedAsNotAway"));
+            if (!user.isHidden()) {
+                msg = tl("userIsNotAway", user.getDisplayName());
+            }
+            user.updateActivity(false);
+        } else {
+            //user.sendMessage(_("markedAsAway"));
+            if (!user.isHidden()) {
+                if (message != null) {
+                    msg = tl("userIsAwayWithMessage", user.getDisplayName(), message);
+                } else {
+                    msg = tl("userIsAway", user.getDisplayName());
+                }
+            }
+            user.setAfkMessage(message);
+        }
+        if (!msg.isEmpty()) {
+            ess.broadcastMessage(user, msg);
+        }
+        user.setDisplayNick(); // Set this again after toggling
+    }
+
+    @Override
+    protected List<String> getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) {
+        if (args.length == 1 && user.isAuthorized("essentials.afk.others")) {
+            return getPlayers(server, user);
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
+        if (args.length == 1) {
+            return getPlayers(server, sender);
+        } else {
+            return Collections.emptyList();
+        }
+    }
 }
+
@@ -1,29 +1,25 @@
 package com.earth2me.essentials.commands;

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

 // This command has a in theme message that only shows if you supply a parameter #EasterEgg
-public class Commandantioch extends EssentialsCommand
-{
-	public Commandantioch()
-	{
-		super("antioch");
-	}
+public class Commandantioch extends EssentialsCommand {
+    public Commandantioch() {
+        super("antioch");
+    }

-	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
-	{
-		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.");
-		}		
+    @Override
+    public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
+        if (args.length > 0) {
+            ess.broadcastMessage(user, "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,");
+            ess.broadcastMessage(user, "who being naughty in My sight, shall snuff it.");
+        }

-		final Location loc = Util.getTarget(user);
-		loc.getWorld().spawn(loc, TNTPrimed.class);
-	}
+        final Location loc = LocationUtil.getTarget(user.getBase());
+        loc.getWorld().spawn(loc, TNTPrimed.class);
+    }
 }
@@ -1,30 +1,36 @@
 package com.earth2me.essentials.commands;

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

+import static com.earth2me.essentials.I18n.tl;

-public class Commandback extends EssentialsCommand
-{
-	public Commandback()
-	{
-		super("back");
-	}

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

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


-public class Commandbackup extends EssentialsCommand
-{
-	public Commandbackup()
-	{
-		super("backup");
-	}
+public class Commandbackup extends EssentialsCommand {
+    public Commandbackup() {
+        super("backup");
+    }

-	@Override
-	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		final Backup backup = ess.getBackup();
-		if (backup == null)
-		{
-			throw new Exception(_("backupDisabled"));
-		}
-		final String command = ess.getSettings().getBackupCommand();
-		if (command == null || "".equals(command) || "save-all".equalsIgnoreCase(command))
-		{
-			throw new Exception(_("backupDisabled"));
-		}
-		backup.run();
-		sender.sendMessage(_("backupStarted"));
-	}
+    @Override
+    protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
+        final Backup backup = ess.getBackup();
+        if (backup == null) {
+            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(tl("backupStarted"));
+    }
 }
@@ -1,38 +1,61 @@
 package com.earth2me.essentials.commands;

-import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.CommandSource;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.NumberUtil;
 import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
+
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.List;
+
+import static com.earth2me.essentials.I18n.tl;


-public class Commandbalance extends EssentialsCommand
-{
-	public Commandbalance()
-	{
-		super("balance");
-	}
+public class Commandbalance extends EssentialsCommand {
+    public Commandbalance() {
+        super("balance");
+    }

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

-	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
-	{
-		//TODO: Remove 'other' perm
-		final double bal = (args.length < 1
-							|| !(user.isAuthorized("essentials.balance.others")
-								 || user.isAuthorized("essentials.balance.other"))
-							? user
-							: getPlayer(server, args, 0, true)).getMoney();
-		user.sendMessage(_("balance", Util.displayCurrency(bal, 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(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
+        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();
+        }
+    }
+
+    @Override
+    protected List<String> getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) {
+        if (args.length == 1 && user.isAuthorized("essentials.balance.others")) {
+            return getPlayers(server, user);
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
+        if (args.length == 1) {
+            return getPlayers(server, sender);
+        } else {
+            return Collections.emptyList();
+        }
+    }
 }
@@ -1,184 +1,178 @@
 package com.earth2me.essentials.commands;

-import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.CommandSource;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
-import com.earth2me.essentials.textreader.ArrayListInput;
+import com.earth2me.essentials.textreader.SimpleTextInput;
 import com.earth2me.essentials.textreader.TextPager;
+import com.earth2me.essentials.utils.NumberUtil;
+import com.google.common.collect.Lists;
+import org.bukkit.Server;
+
+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;
-import org.bukkit.command.CommandSender;
+
+import static com.earth2me.essentials.I18n.tl;


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

-	@Override
-	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		int page = 0;
-		boolean force = false;
-		if (args.length > 0)
-		{
-			try
-			{
-				page = Integer.parseInt(args[0]);
-			}
-			catch (NumberFormatException ex)
-			{
-				if (args[0].equalsIgnoreCase("force") && sender.isOp())
-				{
-					force = true;
-				}
-			}
-		}
+    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();

-		if (!force && lock.readLock().tryLock())
-		{
-			try
-			{
-				if (cacheage > System.currentTimeMillis() - CACHETIME)
-				{
-					outputCache(sender, page);
-					return;
-				}
-				if (ess.getUserMap().getUniqueUsers() > MINUSERS)
-				{
-					sender.sendMessage(_("orderBalances", ess.getUserMap().getUniqueUsers()));
-				}
-			}
-			finally
-			{
-				lock.readLock().unlock();
-			}
-			ess.scheduleAsyncDelayedTask(new Viewer(sender, page, force));
-		}
-		else
-		{
-			if (ess.getUserMap().getUniqueUsers() > MINUSERS)
-			{
-				sender.sendMessage(_("orderBalances", ess.getUserMap().getUniqueUsers()));
-			}
-			ess.scheduleAsyncDelayedTask(new Viewer(sender, page, force));
-		}
+    @Override
+    protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
+        int page = 0;
+        boolean force = false;
+        if (args.length > 0) {
+            try {
+                page = Integer.parseInt(args[0]);
+            } catch (NumberFormatException ex) {
+                if (args[0].equalsIgnoreCase("force") && (!sender.isPlayer() || ess.getUser(sender.getPlayer()).isAuthorized("essentials.balancetop.force"))) {
+                    force = true;
+                }
+            }
+        }

-	}
+        if (!force && lock.readLock().tryLock()) {
+            try {
+                if (cacheage > System.currentTimeMillis() - CACHETIME) {
+                    outputCache(sender, commandLabel, page);
+                    return;
+                }
+                if (ess.getUserMap().getUniqueUsers() > MINUSERS) {
+                    sender.sendMessage(tl("orderBalances", ess.getUserMap().getUniqueUsers()));
+                }
+            } finally {
+                lock.readLock().unlock();
+            }
+            ess.runTaskAsynchronously(new Viewer(sender, commandLabel, page, force));
+        } else {
+            if (ess.getUserMap().getUniqueUsers() > MINUSERS) {
+                sender.sendMessage(tl("orderBalances", ess.getUserMap().getUniqueUsers()));
+            }
+            ess.runTaskAsynchronously(new Viewer(sender, commandLabel, page, force));
+        }

-	private static void outputCache(final CommandSender sender, int page)
-	{
-		final Calendar cal = Calendar.getInstance();
-		cal.setTimeInMillis(cacheage);
-		final DateFormat format = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-		sender.sendMessage(_("balanceTop", format.format(cal.getTime())));
-		new TextPager(cache).showPage(Integer.toString(page), "", "balancetop", sender);
-	}
+    }
+
+    private static void outputCache(final CommandSource sender, String command, 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;
+    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;
-		}
+        public Calculator(final Viewer viewer, final boolean force) {
+            this.viewer = viewer;
+            this.force = force;
+        }

-		@Override
-		public void run()
-		{
-			lock.writeLock().lock();
-			try
-			{
-				if (force || cacheage <= System.currentTimeMillis() - CACHETIME)
-				{
-					cache.getLines().clear();					
-					final Map<String, Double> balances = new HashMap<String, Double>();
-					double totalMoney = 0d;
-					for (String u : ess.getUserMap().getAllUniqueUsers())
-					{
-						final User user = ess.getUserMap().getUser(u);
-						if (user != null)
-						{
-							final double userMoney = user.getMoney();
-							user.updateMoneyCache(userMoney);
-							totalMoney += userMoney;
-							balances.put(user.getDisplayName(), userMoney);
-						}
-					}
+        @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) {
+                                if (!ess.getSettings().isNpcsInBalanceRanking() && user.isNPC()) {
+                                    // Don't list NPCs in output
+                                    continue;
+                                }
+                                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, Double>> sortedEntries = new ArrayList<Map.Entry<String, Double>>(balances.entrySet());
-					Collections.sort(sortedEntries, new Comparator<Map.Entry<String, Double>>()
-					{
-						@Override
-						public int compare(final Entry<String, Double> entry1, final Entry<String, Double> entry2)
-						{
-							return -entry1.getValue().compareTo(entry2.getValue());
-						}
-					});
-					
-					cache.getLines().add(_("serverTotal", Util.displayCurrency(totalMoney, ess)));
-					int pos = 1;
-					for (Map.Entry<String, Double> entry : sortedEntries)
-					{
-						cache.getLines().add(pos + ". " + entry.getKey() + ", " + Util.displayCurrency(entry.getValue(), ess));
-						pos++;
-					}
-					cacheage = System.currentTimeMillis();
-				}
-			}
-			finally
-			{
-				lock.writeLock().unlock();
-			}
-			ess.scheduleAsyncDelayedTask(viewer);
-		}
-	}
+                    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 CommandSender sender;
-		private final transient int page;
-		private final transient boolean force;
+    private class Viewer implements Runnable {
+        private final transient CommandSource sender;
+        private final transient int page;
+        private final transient boolean force;
+        private final transient String commandLabel;

-		public Viewer(final CommandSender sender, final int page, final boolean force)
-		{
-			this.sender = sender;
-			this.page = page;
-			this.force = force;
-		}
+        public Viewer(final CommandSource sender, final String commandLabel, final int page, final boolean force) {
+            this.sender = sender;
+            this.page = page;
+            this.force = force;
+            this.commandLabel = commandLabel;
+        }

-		@Override
-		public void run()
-		{
-			lock.readLock().lock();
-			try
-			{
-				if (!force && cacheage > System.currentTimeMillis() - CACHETIME)
-				{
-					outputCache(sender, page);
-					return;
-				}
-			}
-			finally
-			{
-				lock.readLock().unlock();
-			}
-			ess.scheduleAsyncDelayedTask(new Calculator(new Viewer(sender, page, force), force));
-		}
-	}
+        @Override
+        public void run() {
+            lock.readLock().lock();
+            try {
+                if (!force && cacheage > System.currentTimeMillis() - CACHETIME) {
+                    outputCache(sender, commandLabel, page);
+                    return;
+                }
+            } finally {
+                lock.readLock().unlock();
+            }
+            ess.runTaskAsynchronously(new Calculator(new Viewer(sender, commandLabel, page, false), force));
+        }
+    }
+
+    @Override
+    protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
+        if (args.length == 1) {
+            List<String> options = Lists.newArrayList("1");
+            if (!sender.isPlayer() || ess.getUser(sender.getPlayer()).isAuthorized("essentials.balancetop.force")) {
+                options.add("force");
+            }
+            return options;
+        } else {
+            return Collections.emptyList();
+        }
+    }
 }
@@ -1,86 +1,76 @@
 package com.earth2me.essentials.commands;

+import com.earth2me.essentials.CommandSource;
 import com.earth2me.essentials.Console;
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.OfflinePlayer;
 import com.earth2me.essentials.User;
-import java.util.logging.Level;
+import com.earth2me.essentials.utils.FormatUtil;
+import org.bukkit.BanList;
 import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+
+import static com.earth2me.essentials.I18n.tl;


-public class Commandban extends EssentialsCommand
-{
-	public Commandban()
-	{
-		super("ban");
-	}
+public class Commandban extends EssentialsCommand {
+    public Commandban() {
+        super("ban");
+    }

-	@Override
-	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		boolean nomatch = false;
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		User user;
-		try
-		{
-			user = getPlayer(server, args, 0, true);
-		}
-		catch (NoSuchFieldException e)
-		{
-			nomatch = true;
-			user = ess.getUser(new OfflinePlayer(args[0], ess));
-		}
-		if (!user.isOnline())
-		{
-			if (sender instanceof Player
-				&& !ess.getUser(sender).isAuthorized("essentials.ban.offline"))
-			{
-				sender.sendMessage(_("banExempt"));
-				return;
-			}
-		}
-		else
-		{
-			if (user.isAuthorized("essentials.ban.exempt") && sender instanceof Player)
-			{
-				sender.sendMessage(_("banExempt"));
-				return;
-			}
-		}
+    @Override
+    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();
+        }
+        User user;
+        try {
+            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")) {
+                throw new Exception(tl("banExemptOffline"));
+            }
+        } else {
+            if (user.isAuthorized("essentials.ban.exempt") && sender.isPlayer()) {
+                throw new Exception(tl("banExempt"));
+            }
+        }

-		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
-		String banReason;
-		if (args.length > 1)
-		{
-			banReason = _("banFormat", getFinalArg(args, 1), senderName);
-		}
-		else
-		{
-			banReason = _("banFormat", _("defaultBanReason"), senderName);
-		}
+        final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
+        String banReason;
+        if (args.length > 1) {
+            banReason = FormatUtil.replaceFormat(getFinalArg(args, 1).replace("\\n", "\n").replace("|", "\n"));
+        } else {
+            banReason = tl("defaultBanReason");
+        }

-		user.setBanReason(banReason);
-		user.setBanned(true);
-		user.kickPlayer(banReason);
-		
-		server.getLogger().log(Level.INFO, _("playerBanned", senderName, user.getName(), banReason));
-		
-		if (nomatch) {
-			sender.sendMessage(_("userUnknown", user.getName()));
-		}
+        ess.getServer().getBanList(BanList.Type.NAME).addBan(user.getName(), banReason, null, senderName);

-		for (Player onlinePlayer : server.getOnlinePlayers())
-		{
-			final User player = ess.getUser(onlinePlayer);
-			if (onlinePlayer == sender || player.isAuthorized("essentials.ban.notify"))
-			{
-				onlinePlayer.sendMessage(_("playerBanned", senderName, user.getName(), banReason));
-			}
-		}
-	}
+        String banDisplay = tl("banFormat", banReason, senderName);
+
+        user.getBase().kickPlayer(banDisplay);
+        server.getLogger().log(Level.INFO, tl("playerBanned", senderName, user.getName(), banDisplay));
+
+        if (nomatch) {
+            sender.sendMessage(tl("userUnknown", user.getName()));
+        }
+
+        ess.broadcastMessage("essentials.ban.notify", tl("playerBanned", senderName, user.getName(), banReason));
+    }
+
+    @Override
+    protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
+        if (args.length == 1) {
+            return getPlayers(server, sender);
+        } else {
+            return Collections.emptyList();
+        }
+    }
 }
@@ -1,42 +1,77 @@
 package com.earth2me.essentials.commands;

-import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.CommandSource;
+import com.earth2me.essentials.Console;
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.FormatUtil;
+import org.bukkit.BanList;
 import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+
+import static com.earth2me.essentials.I18n.tl;


-public class Commandbanip extends EssentialsCommand
-{
-	public Commandbanip()
-	{
-		super("banip");
-	}
+public class Commandbanip extends EssentialsCommand {
+    public Commandbanip() {
+        super("banip");
+    }

-	@Override
-	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
+    @Override
+    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 player = ess.getUser(args[0]);
+        final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;

-		if (player == null)
-		{
-			ess.getServer().banIP(args[0]);
-			sender.sendMessage(_("banIpAddress"));
-		}
-		else
-		{
-			final String ipAddress = player.getLastLoginAddress();
-			if (ipAddress.length() == 0)
-			{
-				throw new Exception(_("playerNotFound"));
-			}
-			ess.getServer().banIP(player.getLastLoginAddress());
-			sender.sendMessage(_("banIpAddress"));
-		}
-	}
+        String ipAddress;
+        if (FormatUtil.validIP(args[0])) {
+            ipAddress = args[0];
+        } else {
+            try {
+                User player = getPlayer(server, args, 0, true, true);
+                ipAddress = player.getLastLoginAddress();
+            } catch (PlayerNotFoundException ex) {
+                ipAddress = args[0];
+            }
+        }
+
+        if (ipAddress.isEmpty()) {
+            throw new PlayerNotFoundException();
+        }
+
+        String banReason;
+        if (args.length > 1) {
+            banReason = FormatUtil.replaceFormat(getFinalArg(args, 1).replace("\\n", "\n").replace("|", "\n"));
+        } else {
+            banReason = tl("defaultBanReason");
+        }
+
+        String banDisplay = tl("banFormat", banReason, senderName);
+
+        ess.getServer().getBanList(BanList.Type.IP).addBan(ipAddress, banReason, null, senderName);
+        server.getLogger().log(Level.INFO, tl("playerBanIpAddress", senderName, ipAddress, banReason));
+
+        for (Player player : ess.getServer().getOnlinePlayers()) {
+            if (player.getAddress().getAddress().getHostAddress().equalsIgnoreCase(ipAddress)) {
+                player.kickPlayer(banDisplay);
+            }
+        }
+
+        ess.broadcastMessage("essentials.banip.notify", tl("playerBanIpAddress", senderName, ipAddress, banReason));
+    }
+
+    @Override
+    protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
+        if (args.length == 1) {
+            // TODO: Also list IP addresses?
+            return getPlayers(server, sender);
+        } else {
+            return Collections.emptyList();
+        }
+    }
 }
@@ -1,51 +1,54 @@
 package com.earth2me.essentials.commands;

-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.utils.LocationUtil;
+import com.google.common.collect.Lists;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.TreeType;

+import java.util.Collections;
+import java.util.List;

-public class Commandbigtree extends EssentialsCommand
-{
-	public Commandbigtree()
-	{
-		super("bigtree");
-	}
+import static com.earth2me.essentials.I18n.tl;

-	@Override
-	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"))
-		{
-			tree = TreeType.TALL_REDWOOD;
-		}
-		else if (args.length > 0 && args[0].equalsIgnoreCase("tree"))
-		{
-			tree = TreeType.BIG_TREE;
-		}
-		else if (args.length > 0 && args[0].equalsIgnoreCase("jungle"))
-		{
-			tree = TreeType.JUNGLE;
-		}
-		else
-		{
-			throw new NotEnoughArgumentsException();
-		}

-		final Location loc = Util.getTarget(user);
-		final Location safeLocation = Util.getSafeDestination(loc);
-		final boolean success = user.getWorld().generateTree(safeLocation, tree);
-		if (success)
-		{
-			user.sendMessage(_("bigTreeSuccess"));
-		}
-		else
-		{
-			throw new Exception(_("bigTreeFailure"));
-		}
-	}
+public class Commandbigtree extends EssentialsCommand {
+    public Commandbigtree() {
+        super("bigtree");
+    }
+
+    @Override
+    public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
+        TreeType tree;
+        if (args.length > 0 && args[0].equalsIgnoreCase("redwood")) {
+            tree = TreeType.TALL_REDWOOD;
+        } else if (args.length > 0 && args[0].equalsIgnoreCase("tree")) {
+            tree = TreeType.BIG_TREE;
+        } else if (args.length > 0 && args[0].equalsIgnoreCase("jungle")) {
+            tree = TreeType.JUNGLE;
+        } else if (args.length > 0 && args[0].equalsIgnoreCase("darkoak")) {
+            tree = TreeType.DARK_OAK;
+        } else {
+            throw new NotEnoughArgumentsException();
+        }
+
+        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(tl("bigTreeSuccess"));
+        } else {
+            throw new Exception(tl("bigTreeFailure"));
+        }
+    }
+
+    @Override
+    protected List<String> getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) {
+        if (args.length == 1) {
+            return Lists.newArrayList("redwood", "tree", "jungle", "darkoak");
+        } else {
+            return Collections.emptyList();
+        }
+    }
 }
@@ -0,0 +1,98 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import com.earth2me.essentials.utils.EnumUtil;
+import com.google.common.collect.Lists;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.BookMeta;
+
+import java.util.Collections;
+import java.util.List;
+
+import static com.earth2me.essentials.I18n.tl;
+
+
+public class Commandbook extends EssentialsCommand {
+
+    private static final Material WRITABLE_BOOK = EnumUtil.getMaterial("WRITABLE_BOOK", "BOOK_AND_QUILL");
+
+    public Commandbook() {
+        super("book");
+    }
+
+    @Override
+    public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
+        final ItemStack item = user.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(WRITABLE_BOOK, item.getAmount());
+                    newItem.setItemMeta(bmeta);
+                    InventoryWorkaround.setItemInMainHand(user.getBase(), newItem);
+                    user.sendMessage(tl("editBookContents"));
+                } else {
+                    throw new Exception(tl("denyBookEdit"));
+                }
+            }
+        } else if (item.getType() == WRITABLE_BOOK) {
+            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);
+            InventoryWorkaround.setItemInMainHand(user.getBase(), 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);
+    }
+
+    @Override
+    protected List<String> getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) {
+        // Right now, we aren't testing what's held in the player's hand - we could, but it's not necessarily worth it
+        if (args.length == 1) {
+            List<String> options = Lists.newArrayList("sign", "unsign");  // sign and unsign aren't real, but work
+            if (user.isAuthorized("essentials.book.author")) {
+                options.add("author");
+            }
+            if (user.isAuthorized("essentials.book.title")) {
+                options.add("title");
+            }
+            return options;
+        } else if (args.length == 2 && args[0].equalsIgnoreCase("author") && user.isAuthorized("essentials.book.author")) {
+            List<String> options = getPlayers(server, user);
+            options.add("Herobrine"); // #EasterEgg
+            return options;
+        } else {
+            return Collections.emptyList();
+        }
+    }
+}
@@ -1,48 +1,42 @@
 package com.earth2me.essentials.commands;

-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.block.Block;
 import org.bukkit.event.block.BlockBreakEvent;

+import java.util.Set;

-public class Commandbreak extends EssentialsCommand
-{
-	public Commandbreak()
-	{
-		super("break");
-	}
+import static com.earth2me.essentials.I18n.tl;

-	//TODO: Switch to use util class
-	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
-	{
-		final Block block = user.getTargetBlock(null, 20);
-		if (block == null)
-		{
-			throw new NoChargeException();
-		}
-		if (block.getType() == Material.AIR)
-		{
-			throw new NoChargeException();
-		}
-		if (block.getType() == Material.BEDROCK && !user.isAuthorized("essentials.break.bedrock"))
-		{
-			throw new Exception(_("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);
-		}
-	}
-}
+
+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((Set<Material>) 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);
+        }
+    }
+}
@@ -1,26 +1,33 @@
 package com.earth2me.essentials.commands;

-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.CommandSource;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.FormatUtil;
 import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
+
+import static com.earth2me.essentials.I18n.tl;


-public class Commandbroadcast extends EssentialsCommand
-{
-	public Commandbroadcast()
-	{
-		super("broadcast");
-	}
+public class Commandbroadcast extends EssentialsCommand {
+    public Commandbroadcast() {
+        super("broadcast");
+    }

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

-		ess.broadcastMessage(null, _("broadcast", Util.replaceFormat(getFinalArg(args, 0))));
-	}
+    @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(tl("broadcast", FormatUtil.replaceFormat(getFinalArg(args, 0)).replace("\\n", "\n"), name));
+    }
 }
@@ -0,0 +1,110 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n.tl;
+
+import com.earth2me.essentials.CommandSource;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.textreader.IText;
+import com.earth2me.essentials.textreader.KeywordReplacer;
+import com.earth2me.essentials.textreader.SimpleTextInput;
+import com.earth2me.essentials.utils.FormatUtil;
+import com.google.common.collect.Lists;
+
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+
+public class Commandbroadcastworld extends EssentialsCommand {
+
+    public Commandbroadcastworld() {
+        super("broadcastworld");
+    }
+
+    @Override
+    public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
+        World world = user.getWorld();
+        String message = getFinalArg(args, 0);
+
+        if (args.length < 1) {
+            throw new NotEnoughArgumentsException();
+        } else if (args.length > 1 && ess.getSettings().isAllowWorldInBroadcastworld()) {
+            World argWorld = ess.getWorld(args[0]);
+            if (argWorld != null) {
+                world = argWorld;
+                message = getFinalArg(args, 1);
+            }
+        }
+
+        if (world == null) {
+            world = user.getWorld();
+            message = getFinalArg(args, 0);
+        }
+
+        sendBroadcast(world.getName(), user.getDisplayName(), message);
+    }
+
+    @Override
+    public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
+        if (args.length < 2) {
+            throw new NotEnoughArgumentsException("world");
+        }
+        sendBroadcast(args[0], sender.getSender().getName(), getFinalArg(args, 1));
+    }
+
+    private void sendBroadcast(final String worldName, final String name, final String message) throws Exception {
+        World world = ess.getWorld(worldName);
+        if (world == null) {
+            throw new Exception(tl("invalidWorld"));
+        }
+        if (message.isEmpty()) {
+            throw new NotEnoughArgumentsException();
+        }
+        sendToWorld(world, tl("broadcast", FormatUtil.replaceFormat(message).replace("\\n", "\n"), name));
+    }
+
+    private void sendToWorld(World world, String message) {
+        IText broadcast = new SimpleTextInput(message);
+        final Collection<Player> players = ess.getOnlinePlayers();
+
+        for (Player player : players) {
+            if (player.getWorld().equals(world)) {
+                final User user = ess.getUser(player);
+                broadcast = new KeywordReplacer(broadcast, new CommandSource(player), ess, false);
+                for (String messageText : broadcast.getLines()) {
+                    user.sendMessage(messageText);
+                }
+            }
+        }
+    }
+
+    @Override
+    protected List<String> getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) {
+        if (args.length == 1 && ess.getSettings().isAllowWorldInBroadcastworld()) {
+            List<String> worlds = Lists.newArrayList();
+            for (World world : server.getWorlds()) {
+                worlds.add(world.getName());
+            }
+            return worlds;
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
+        if (args.length == 1) {
+            List<String> worlds = Lists.newArrayList();
+            for (World world : server.getWorlds()) {
+                worlds.add(world.getName());
+            }
+            return worlds;
+        } else {
+            return Collections.emptyList();
+        }
+    }
+}
@@ -1,36 +1,43 @@
 package com.earth2me.essentials.commands;

-import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.CommandSource;
+import com.earth2me.essentials.User;
 import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
+
+import java.util.Collections;
+import java.util.List;
+
+import static com.earth2me.essentials.I18n.tl;


-public class Commandburn extends EssentialsCommand
-{
-	public Commandburn()
-	{
-		super("burn");
-	}
+public class Commandburn extends EssentialsCommand {
+    public Commandburn() {
+        super("burn");
+    }

-	@Override
-	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 2)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		
-		//TODO: TL this
-		if (args[0].trim().length() < 2)
-		{
-			throw new NotEnoughArgumentsException("You need to specify a player to burn.");
-		}
+    @Override
+    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]))
-		{
-			p.setFireTicks(Integer.parseInt(args[1]) * 20);
-			sender.sendMessage(_("burnMsg", p.getDisplayName(), Integer.parseInt(args[1])));
-		}
-	}
+        if (args[0].trim().length() < 2) {
+            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])));
+    }
+
+    @Override
+    protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
+        if (args.length == 1) {
+            return getPlayers(server, sender);
+        } else if (args.length == 2) {
+            return COMMON_DURATIONS;
+        } else {
+            return Collections.emptyList();
+        }
+    }
 }
@@ -1,98 +1,200 @@
 package com.earth2me.essentials.commands;

-import static com.earth2me.essentials.I18n._;
+import static com.earth2me.essentials.I18n.tl;
+
+import com.earth2me.essentials.CommandSource;
 import com.earth2me.essentials.User;
-import java.util.List;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import com.earth2me.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.StringUtil;
+
+import org.bukkit.Material;
 import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.*;


-public class Commandclearinventory extends EssentialsCommand
-{
-	public Commandclearinventory()
-	{
-		super("clearinventory");
-	}
+public class Commandclearinventory extends EssentialsCommand {

-	//TODO: Cleanup
-	@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]);
+    public Commandclearinventory() {
+        super("clearinventory");
+    }

-				if (!online.isEmpty())
-				{
-					for (Player p : online)
-					{
-						p.getInventory().clear();
-						user.sendMessage(_("inventoryClearedOthers", p.getDisplayName()));
-					}
-					return;
-				}
-				throw new Exception(_("playerNotFound"));
-			}
-			else
-			{
-				Player p = server.getPlayer(args[0]);
-				if (p != null)
-				{
-					p.getInventory().clear();
-					user.sendMessage(_("inventoryClearedOthers", p.getDisplayName()));
-				}
-				else
-				{
-					throw new Exception(_("playerNotFound"));
-				}
-			}
-		}
-		else
-		{
-			user.getInventory().clear();
-			user.sendMessage(_("inventoryCleared"));
-		}
-	}
+    private static final int BASE_AMOUNT = 100000;
+    private static final int EXTENDED_CAP = 8;

-	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
+    @Override
+    public void run(Server server, User user, String commandLabel, String[] args) throws Exception {
+        parseCommand(server, user.getSource(), commandLabel, args, user.isAuthorized("essentials.clearinventory.others"),
+            user.isAuthorized("essentials.clearinventory.all") || user.isAuthorized("essentials.clearinventory.multiple"));
+    }

-		if (args[0].length() >= 3)
-		{
-			List<Player> online = server.matchPlayer(args[0]);
+    @Override
+    protected void run(Server server, CommandSource sender, String commandLabel, String[] args) throws Exception {
+        parseCommand(server, sender, commandLabel, args, true, true);
+    }

-			if (!online.isEmpty())
-			{
-				for (Player p : online)
-				{
-					p.getInventory().clear();
-					sender.sendMessage(_("inventoryClearedOthers", p.getDisplayName()));
-				}
-				return;
-			}
-			throw new Exception(_("playerNotFound"));
-		}
-		else
-		{
-			Player u = server.getPlayer(args[0]);
-			if (u != null)
-			{
-				u.getInventory().clear();
-				sender.sendMessage(_("inventoryClearedOthers", u.getDisplayName()));
-			}
-			else
-			{
-				throw new Exception(_("playerNotFound"));
-			}
-		}
-	}
+    private void parseCommand(Server server, CommandSource sender, String commandLabel, String[] args, boolean allowOthers, boolean allowAll)
+        throws Exception {
+        Collection<Player> players = new ArrayList<Player>();
+        User senderUser = ess.getUser(sender.getPlayer());
+        String previousClearCommand = "";
+        
+        int offset = 0;
+
+        if (sender.isPlayer()) {
+            players.add(sender.getPlayer());
+            // Clear previous command execution before potential errors to reset confirmation.
+            previousClearCommand = senderUser.getConfirmingClearCommand();
+            senderUser.setConfirmingClearCommand(null);
+        }
+
+        if (allowAll && args.length > 0 && args[0].contentEquals("*")) {
+            sender.sendMessage(tl("inventoryClearingFromAll"));
+            offset = 1;
+            players = ess.getOnlinePlayers();
+        } else if (allowOthers && args.length > 0 && args[0].trim().length() > 2) {
+            offset = 1;
+            players = server.matchPlayer(args[0].trim());
+        }
+
+        if (players.size() < 1) {
+            throw new PlayerNotFoundException();
+        }
+
+
+        // Confirm
+        String formattedCommand = formatCommand(commandLabel, args);
+        if (senderUser != null && senderUser.isPromptingClearConfirm()) {
+            if (!formattedCommand.equals(previousClearCommand)) {
+                senderUser.setConfirmingClearCommand(formattedCommand);
+                senderUser.sendMessage(tl("confirmClear", formattedCommand));
+                return;
+            }
+        }
+
+        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;
+        final Set<Material> mats = new HashSet<>();
+
+        if (args.length > (offset + 1) && NumberUtil.isInt(args[(offset + 1)])) {
+            amount = Integer.parseInt(args[(offset + 1)]);
+        }
+        if (args.length > offset) {
+            if (args[offset].equalsIgnoreCase("**")) {
+                type = -2;
+            } else if (!args[offset].equalsIgnoreCase("*")) {
+                final String[] split = args[offset].split(",");
+
+                for (String name : split) {
+                    try {
+                        mats.add(ess.getItemDb().get(name).getType());
+                    } catch (Exception ignored) {}
+                }
+
+                type = 1;
+            }
+        }
+
+        if (type == -1) // type -1 represents wildcard or all items
+        {
+            if (showExtended) {
+                sender.sendMessage(tl("inventoryClearingAllItems", player.getDisplayName()));
+            }
+            InventoryWorkaround.clearInventoryNoArmor(player.getInventory());
+            InventoryWorkaround.setItemInOffHand(player, null);
+        } else if (type == -2) // type -2 represents double wildcard or all items and armor
+        {
+            if (showExtended) {
+                sender.sendMessage(tl("inventoryClearingAllArmor", player.getDisplayName()));
+            }
+            InventoryWorkaround.clearInventoryNoArmor(player.getInventory());
+            InventoryWorkaround.setItemInOffHand(player, null);
+            player.getInventory().setArmorContents(null);
+        } else {
+            for (Material mat : mats) {
+                if (amount == -1) // amount -1 means all items will be cleared
+                {
+                    ItemStack stack = new ItemStack(mat, 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 {
+                    if (amount < 0) {
+                        amount = 1;
+                    }
+                    ItemStack stack = new ItemStack(mat, amount);
+                    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)));
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    protected List<String> getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) {
+        if (user.isAuthorized("essentials.clearinventory.others")) {
+            if (args.length == 1) {
+                List<String> options = getPlayers(server, user);
+                if (user.isAuthorized("essentials.clearinventory.all") || user.isAuthorized("essentials.clearinventory.multiple")) {
+                    // Assume that nobody will have the 'all' permission without the 'others' permission
+                    options.add("*");
+                }
+                return options;
+            } else if (args.length == 2) {
+                List<String> items = new ArrayList<>(getItems());
+                items.add("*");
+                items.add("**");
+                return items;
+            } else {
+                return Collections.emptyList();
+            }
+        } else {
+            if (args.length == 1) {
+                List<String> items = new ArrayList<>(getItems());
+                items.add("*");
+                items.add("**");
+                return items;
+            } else {
+                return Collections.emptyList();
+            }
+        }
+    }
+
+    @Override
+    protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
+        if (args.length == 1) {
+            List<String> options = getPlayers(server, sender);
+            options.add("*");
+            return options;
+        } else if (args.length == 2) {
+            List<String> items = new ArrayList<>(getItems());
+            items.add("*");
+            items.add("**");
+            return items;
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    private String formatCommand(String commandLabel, String[] args) {
+        return "/" + commandLabel + " " + StringUtil.joinList(" ", (Object[]) args);
+    }
 }
@@ -0,0 +1,32 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n.tl;
+
+import com.earth2me.essentials.User;
+
+import org.bukkit.Server;
+
+public class Commandclearinventoryconfirmtoggle extends EssentialsCommand {
+
+    public Commandclearinventoryconfirmtoggle() {
+        super("clearinventoryconfirmtoggle");
+    }
+
+    @Override
+    public void run(Server server, User user, String commandLabel, String[] args) throws Exception {
+        boolean confirmingClear = !user.isPromptingClearConfirm();
+        if (commandLabel.toLowerCase().endsWith("on")) {
+            confirmingClear = true;
+        } else if (commandLabel.toLowerCase().endsWith("off")) {
+            confirmingClear = false;
+        }
+        user.setPromptingClearConfirm(confirmingClear);
+        if (confirmingClear) {
+            user.sendMessage(tl("clearInventoryConfirmToggleOn"));
+        } else {
+            user.sendMessage(tl("clearInventoryConfirmToggleOff"));
+        }
+        user.setConfirmingClearCommand(null);
+    }
+}
+