Implement new versioning as per #1873 (#1882)

Fixes #1924

PaperMC/Paper#884 has been fixed in recent Paper builds (1368+),
which means the workaround is no longer necessary. Disable it when
running a fixed build.

.classpath

@@ -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>

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,41 @@
+<!--
+Don't put anything inside this block, as it won't be included in the issue.
+
+If you have a question about using EssentialsX, it may be more helpful to ask
+in our Discord server: https://discord.gg/F7gexAQ
+
+If you have a feature suggestion for EssentialsX, please delete the template.
+
+Otherwise, if you are reporting a bug, read on:
+1.  Fill out the template, running the commands either in the console or 
+    as a player. Don't simply put "latest" or we will ignore it.
+
+2.  When linking files, do not attach them to the post! Paste them on 
+    https://gist.github.com/, then paste a link to them in the relevant parts
+    of the template. Avoid using Hastebin or Pastebin, as files are deleted
+    after a period of time.
+
+3.  If you are reporting an issue with lag, please include a timings report.
+
+4.  If you are reporting an issue with messages or in-game behaviour, please
+    include screenshots detailing the problem.
+
+5.  Include a description and any other details that may be helpful under the
+    Details section.
+
+6.  Delete this line and all above lines before posting your issue!       -->
+
+### Information
+
+Full output of `/ess version`:
+
+
+
+
+Server log (upload `logs/latest.log` to [Gist](https://gist.github.com/)):
+
+EssentialsX config (upload `plugins/Essentials/config.yml` to [Gist](https://gist.github.com/)): 
+
+### Details
+
+Describe your issue here.

.gitignore

@@ -6,14 +6,11 @@
 /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/
@@ -36,8 +33,6 @@
 /EssentialsUpdate/build/
 /WebPush/apikey.php
 /WebPush/nbproject/private
-/EssentialsGroupManager/bin
-/EssentialsGroupManager/.externalToolBuilders
 /EssentialsAntiBuild/nbproject/private/
 /EssentialsAntiBuild/dist/
 /EssentialsAntiBuild/build/
@@ -45,5 +40,13 @@
 /out
 .idea/
 *.iml
+*.classpath
+*.project
+*.settings/
 target/
-dependency-reduced-pom.xml
+dependency-reduced-pom.xml
+/Essentials/config.yml
+/Essentials/userdata/testplayer1.yml
+/Essentials/usermap.csv
+/Essentials/userdata
+/EssentialsGroupManager/target/

.project

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

.travis.yml

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

BuildAll/build.xml

@@ -1,73 +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:                  JAR building
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="BuildAll-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-</project>

BuildAll/nbproject/genfiles.properties

@@ -1,8 +0,0 @@
-build.xml.data.CRC32=cab45985
-build.xml.script.CRC32=9113ff80
-build.xml.stylesheet.CRC32=8064a381@1.68.1.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

BuildAll/nbproject/project.properties

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

BuildAll/nbproject/project.xml

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

Essentials/build.xml

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

Essentials/kits.yml

@@ -0,0 +1,39 @@
+# EssentialsX new Kit configuration.
+# If you don't have any kits defined in this file, the plugin will try to copy them from the config.yml
+
+# Note: All items MUST be followed by a quantity!
+# All kit names should be lower case, and will be treated as lower in permissions/costs.
+# Syntax: - itemID[:DataValue/Durability] Amount [Enchantment:Level].. [itemmeta:value]...
+# For Item Meta information visit http://wiki.ess3.net/wiki/Item_Meta
+# 'delay' refers to the cooldown between how often you can use each kit, measured in seconds.
+# Set delay to -1 for a one time kit.
+# For more information, visit http://wiki.ess3.net/wiki/Kits
+kits:
+  tools:
+    delay: 10
+    items:
+      - 272 1
+      - 273 1
+      - 274 1
+      - 275 1
+  dtools:
+    delay: 600
+    items:
+      - 278 1 efficiency:1 durability:1 fortune:1 name:&4Gigadrill lore:The_drill_that_&npierces|the_heavens
+      - 277 1 digspeed:3 name:Dwarf lore:Diggy|Diggy|Hole
+      - 298 1 color:255,255,255 name:Top_Hat lore:Good_day,_Good_day
+      - 279:780 1
+  notch:
+    delay: 6000
+    items:
+      - 397:3 1 player:Notch
+  color:
+    delay: 6000
+    items:
+      - 387 1 title:&4Book_&9o_&6Colors author:KHobbits lore:Ingame_color_codes book:Colors
+  firework:
+    delay: 6000
+    items:
+      - 401 1 name:Angry_Creeper color:red fade:green type:creeper power:1
+      - 401 1 name:Starry_Night color:yellow,orange fade:blue type:star effect:trail,twinkle power:1
+      - 401 2 name:Solar_Wind color:yellow,orange fade:red shape:large effect:twinkle color:yellow,orange fade:red shape:ball effect:trail color:red,purple fade:pink shape:star effect:trail power:1

Essentials/nbproject/genfiles.properties

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

Essentials/nbproject/pmd.settings

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

Essentials/nbproject/project.properties

@@ -1,150 +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.BOSEconomy.jar=../lib/BOSEconomy.jar
-file.reference.bPermissions.jar=../lib/bPermissions.jar
-file.reference.bukkit.jar=../lib/bukkit.jar
-file.reference.iCo5.jar=../lib/iCo5.jar
-file.reference.iCo6.jar=../lib/iCo6.jar
-file.reference.lombok.jar=../lib/lombok-1.12.2.jar
-file.reference.MultiCurrency.jar=../lib/MultiCurrency.jar
-file.reference.PermissionsBukkit-1.2.jar=../lib/PermissionsBukkit.jar
-file.reference.PermissionsEx.jar=../lib/PermissionsEx.jar
-file.reference.Privileges.jar=..\\lib\\Privileges.jar
-file.reference.Vault.jar=../lib/Vault.jar
-file.reference.SimplyPerms.jar=../lib/SimplyPerms.jar
-file.reference.zPermissions.jar=../lib/zPermissions.jar
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.compress=true
-jar.index=${jnlp.enabled}
-javac.classpath=\
-    ${file.reference.iCo5.jar}:\
-    ${file.reference.iCo6.jar}:\
-    ${file.reference.MultiCurrency.jar}:\
-    ${file.reference.BOSEconomy.jar}:\
-    ${file.reference.PermissionsEx.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.bPermissions.jar}:\
-    ${file.reference.SimplyPerms.jar}:\
-    ${file.reference.zPermissions.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

Essentials/nbproject/project.xml

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

Essentials/pom.xml

@@ -1,137 +1,144 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>net.ess3</groupId>
-		<artifactId>EssentialsParent</artifactId>
-		<version>2.x-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>net.ess3</groupId>
+        <artifactId>EssentialsXParent</artifactId>
+        <version>2.15.0</version>
+    </parent>
 
-	<artifactId>Essentials</artifactId>
+    <artifactId>EssentialsX</artifactId>
 
-	<url>http://ess3.net/</url>
+    <licenses>
+        <license>
+            <name>GPLv3</name>
+            <url>http://www.gnu.org/copyleft/gpl.html</url>
+        </license>
+    </licenses>
 
-	<organization>
-		<name>Essentials Team</name>
-		<url>http://ess3.net/</url>
-	</organization>
+    <build>
+        <finalName>EssentialsX-${full.version}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <showDeprecation>false</showDeprecation>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
-	<licenses>
-		<license>
-			<name>GPLv3</name>
-			<url>http://www.gnu.org/copyleft/gpl.html</url>
-		</license>
-	</licenses>
-
-	<scm>
-		<connection>scm:git:https://github.com/essentials/Essentials.git</connection>
-		<developerConnection>scm:git:https://github.com/essentials/Essentials.git</developerConnection>
-		<url>https://github.com/essentials/Essentials</url>
-	</scm>
-
-	<issueManagement>
-		<system>JIRA</system>
-		<url>http://essentials3.atlassian.net</url>
-	</issueManagement>
-
-	<ciManagement>
-		<system>TeamCity</system>
-		<url>http://ci.ess3.net/</url>
-	</ciManagement>
-
-	<repositories>
-		<repository>
-			<id>vault-repo</id>
-			<url>http://ci.herocraftonline.com/plugin/repository/everything</url>
-		</repository>
-		<repository>
-			<id>kitteh-repo</id>
-			<url>http://repo.kitteh.org/content/groups/public/</url>
-		</repository>
-	</repositories>
-
-	<dependencies>
-		<dependency>
-			<groupId>BOSEconomy</groupId>
-			<artifactId>BOSEconomy</artifactId>
-			<version>v0.7.8.1</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/../lib/BOSEconomy.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>de.bananaco</groupId>
-			<artifactId>bPermissions</artifactId>
-			<version>v2.12-DEV</version>
-		</dependency>
-		<dependency>
-			<groupId>iConomy</groupId>
-			<artifactId>iConomy5</artifactId>
-			<version>5</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/../lib/iCo5.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>iConomy</groupId>
-			<artifactId>iConomy6</artifactId>
-			<version>6</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/../lib/iCo6.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>net.ess3</groupId>
-			<artifactId>GroupManager</artifactId>
-			<version>${project.version}</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/../EssentialsGroupManager/dist/EssentialsGroupManager.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>MultiCurrency</groupId>
-			<artifactId>MultiCurrency</artifactId>
-			<version>2.2</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/../lib/MultiCurrency.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>com.platymuus</groupId>
-			<artifactId>bukkit-permissions</artifactId>
-			<version>2.0</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/../lib/PermissionsBukkit.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>ru.tehkode</groupId>
-			<artifactId>PermissionsEx</artifactId>
-			<version>1.20.4</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/../lib/PermissionsEx.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>Privileges</groupId>
-			<artifactId>Privileges</artifactId>
-			<version>1.8.1</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/../lib/Privileges.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>SimplyPerms</groupId>
-			<artifactId>SimplyPerms</artifactId>
-			<version>1.7.6</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/../lib/SimplyPerms.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>net.milkbowl</groupId>
-			<artifactId>vault</artifactId>
-			<version>1.2.27</version>
-		</dependency>
-		<dependency>
-			<groupId>zPermissions</groupId>
-			<artifactId>zPermissions</artifactId>
-			<version>1.1</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/../lib/zPermissions.jar</systemPath>
-		</dependency>
-	</dependencies>
-</project>
+    <dependencies>
+        <dependency>
+            <groupId>BOSEconomy</groupId>
+            <artifactId>BOSEconomy</artifactId>
+            <version>v0.7.8.1</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/../lib/BOSEconomy.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>iConomy</groupId>
+            <artifactId>iConomy5</artifactId>
+            <version>5</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/../lib/iCo5.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>iConomy</groupId>
+            <artifactId>iConomy6</artifactId>
+            <version>6</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/../lib/iCo6.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>MultiCurrency</groupId>
+            <artifactId>MultiCurrency</artifactId>
+            <version>2.2</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/../lib/MultiCurrency.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>net.milkbowl.vault</groupId>
+            <artifactId>Vault</artifactId>
+            <version>1.5.6</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.ess3</groupId>
+            <artifactId>NMSProvider</artifactId>
+            <version>2.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.ess3</groupId>
+            <artifactId>UpdatedMetaProvider</artifactId>
+            <version>2.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.ess3</groupId>
+            <artifactId>1_8_R1Provider</artifactId>
+            <version>2.0.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.0.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.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.ess3</groupId>
+            <artifactId>ReflectionProvider</artifactId>
+            <version>2.0.1</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bukkit</groupId>
+                    <artifactId>craftbukkit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+    <repositories>
+        <repository>
+            <id>vault-repo</id>
+            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
+        </repository>
+    </repositories>
+</project>

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

@@ -1,139 +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 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 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;
+    }
 }

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

@@ -1,155 +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 net.ess3.api.IEssentials;
-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)
-		{
-			ess.runTaskAsynchronously(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					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();
+                }
+            });
+        }
+    }
 
-	public void onPlayerJoin()
-	{
-		startTask();
-	}
+    public void onPlayerJoin() {
+        startTask();
+    }
 
-	public synchronized void stopTask()
-	{
-		running = false;
-		if (taskId != -1)
-		{
-			server.getScheduler().cancelTask(taskId);
-		}
-		taskId = -1;
-	}
+    public synchronized void stopTask() {
+        running = false;
+        if (taskId != -1) {
+            server.getScheduler().cancelTask(taskId);
+        }
+        taskId = -1;
+    }
 
-	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;
-		}
-	}
+    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;
+        }
+    }
 
-	@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");
+    @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();
-							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)
-											{
-												stopTask();
-											}
-											active = false;
-											LOGGER.log(Level.INFO, _("backupFinished"));
-										}
-									});
-						}
-					}
-				});
-	}
+        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());
+                }
+            }
+        });
+    }
 }

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

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

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

@@ -4,58 +4,36 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
-public class CommandSource implements IReplyTo
-{
-	private CommandSource replyTo = null;
-	protected CommandSender sender;
+public class CommandSource {
+    protected CommandSender sender;
 
-	public CommandSource(final CommandSender base)
-	{
-		this.sender = base;
-	}
+    public CommandSource(final CommandSender base) {
+        this.sender = base;
+    }
 
-	public final CommandSender getSender()
-	{
-		return sender;
-	}
+    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 Player getPlayer() {
+        if (sender instanceof Player) {
+            return (Player) sender;
+        }
+        return null;
+    }
 
-	public final CommandSender setSender(final CommandSender base)
-	{
-		return this.sender = base;
-	}
-	
-	
-	public void sendMessage(String message)
-	{
-		if (!message.isEmpty())
-		{
-			sender.sendMessage(message);
-		}
-	}
+    public final boolean isPlayer() {
+        return (sender instanceof Player);
+    }
 
-	@Override
-	public void setReplyTo(final CommandSource user)
-	{
-		replyTo = user;
-	}
+    public final CommandSender setSender(final CommandSender base) {
+        return this.sender = base;
+    }
 
-	@Override
-	public CommandSource getReplyTo()
-	{
-		return replyTo;
-	}
+
+    public void sendMessage(String message) {
+        if (!message.isEmpty()) {
+            sender.sendMessage(message);
+        }
+    }
 }

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

@@ -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 final Console instance = new Console();
-	private CommandSource 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(CommandSource user)
-	{
-		replyTo = user;
-	}
+    private Console(IEssentials ess) {
+        this.ess = ess;
+        this.messageRecipient = new SimpleMessageRecipient(ess, this);
+    }
 
-	@Override
-	public CommandSource 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);
+    }
 }

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

@@ -1,168 +1,225 @@
 package com.earth2me.essentials;
 
 import com.earth2me.essentials.utils.NumberUtil;
+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 org.bukkit.enchantments.Enchantment;
 
 
-public class Enchantments
-{
-	private static final Map<String, Enchantment> ENCHANTMENTS = new HashMap<String, Enchantment>();
-	private static final Map<String, Enchantment> ALIASENCHANTMENTS = new HashMap<String, Enchantment>();
+public class Enchantments {
+    private static final Map<String, Enchantment> ENCHANTMENTS = new HashMap<String, Enchantment>();
+    private static final Map<String, Enchantment> ALIASENCHANTMENTS = new HashMap<String, Enchantment>();
 
-	static
-	{
-		ENCHANTMENTS.put("alldamage", Enchantment.DAMAGE_ALL);
-		ALIASENCHANTMENTS.put("alldmg", Enchantment.DAMAGE_ALL);
-		ENCHANTMENTS.put("sharpness", Enchantment.DAMAGE_ALL);
-		ALIASENCHANTMENTS.put("sharp", Enchantment.DAMAGE_ALL);
-		ALIASENCHANTMENTS.put("dal", Enchantment.DAMAGE_ALL);
+    static {
+        ENCHANTMENTS.put("alldamage", Enchantment.DAMAGE_ALL);
+        ALIASENCHANTMENTS.put("alldmg", Enchantment.DAMAGE_ALL);
+        ENCHANTMENTS.put("sharpness", Enchantment.DAMAGE_ALL);
+        ALIASENCHANTMENTS.put("sharp", Enchantment.DAMAGE_ALL);
+        ALIASENCHANTMENTS.put("dal", Enchantment.DAMAGE_ALL);
 
-		ENCHANTMENTS.put("ardmg", Enchantment.DAMAGE_ARTHROPODS);
-		ENCHANTMENTS.put("baneofarthropods", Enchantment.DAMAGE_ARTHROPODS);
-		ALIASENCHANTMENTS.put("baneofarthropod", Enchantment.DAMAGE_ARTHROPODS);
-		ALIASENCHANTMENTS.put("arthropod", Enchantment.DAMAGE_ARTHROPODS);
-		ALIASENCHANTMENTS.put("dar", Enchantment.DAMAGE_ARTHROPODS);
+        ENCHANTMENTS.put("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("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("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("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("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("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);
+        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("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("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);
+        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);
+        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("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("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);
+        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("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("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);
+        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);
+        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("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);
+        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);
-	}
+        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 (NumberUtil.isInt(name)) {
-			enchantment = Enchantment.getById(Integer.parseInt(name));
-		} else {
-			enchantment = Enchantment.getByName(name.toUpperCase(Locale.ENGLISH));
-		}
-		if (enchantment == null)
-		{
-			enchantment = ENCHANTMENTS.get(name.toLowerCase(Locale.ENGLISH));
-		}
-		if (enchantment == null)
-		{
-			enchantment = ALIASENCHANTMENTS.get(name.toLowerCase(Locale.ENGLISH));
-		}
-		return enchantment;
-	}
+        ENCHANTMENTS.put("luck", Enchantment.LUCK);
+        ALIASENCHANTMENTS.put("luckofsea", Enchantment.LUCK);
+        ALIASENCHANTMENTS.put("luckofseas", Enchantment.LUCK);
+        ALIASENCHANTMENTS.put("rodluck", Enchantment.LUCK);
 
-	public static Set<Entry<String, Enchantment>> entrySet()
-	{
-		return ENCHANTMENTS.entrySet();
-	}
+        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) {}
+    }
+
+    public static Enchantment getByName(String name) {
+        Enchantment enchantment;
+        if (NumberUtil.isInt(name)) {
+            enchantment = Enchantment.getById(Integer.parseInt(name));
+        } else {
+            enchantment = Enchantment.getByName(name.toUpperCase(Locale.ENGLISH));
+        }
+        if (enchantment == null) {
+            enchantment = ENCHANTMENTS.get(name.toLowerCase(Locale.ENGLISH));
+        }
+        if (enchantment == null) {
+            enchantment = ALIASENCHANTMENTS.get(name.toLowerCase(Locale.ENGLISH));
+        }
+        return enchantment;
+    }
+
+    public static Set<Entry<String, Enchantment>> entrySet() {
+        return ENCHANTMENTS.entrySet();
+    }
+
+    public static Set<String> keySet() {
+        return ENCHANTMENTS.keySet();
+    }
 }

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

@@ -1,7 +1,6 @@
 package com.earth2me.essentials;
 
 import com.earth2me.essentials.utils.LocationUtil;
-import java.util.Locale;
 import net.ess3.api.IEssentials;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
@@ -14,58 +13,49 @@ 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 = LocationUtil.convertBlockToItem(event.getBlockPlaced());
-		if (is == null)
-		{
-			return;
-		}
+    public EssentialsBlockListener(final IEssentials ess) {
+        this.ess = ess;
+    }
 
-		if (is.getType() == Material.MOB_SPAWNER && event.getItemInHand() != null && event.getPlayer() != null
-			&& event.getItemInHand().getType() == Material.MOB_SPAWNER)
-		{
-			final BlockState blockState = event.getBlockPlaced().getState();
-			if (blockState instanceof CreatureSpawner)
-			{
-				final CreatureSpawner spawner = (CreatureSpawner)blockState;
-				final EntityType type = EntityType.fromId(event.getItemInHand().getData().getData());
-				if (type != null && Mob.fromBukkitType(type) != null)
-				{
-					if (ess.getUser(event.getPlayer()).isAuthorized("essentials.spawnerconvert." + Mob.fromBukkitType(type).name().toLowerCase(Locale.ENGLISH)))
-					{
-						spawner.setSpawnedType(type);
-					}
-				}
-			}
-		}
+    @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;
+        }
 
-		final User user = ess.getUser(event.getPlayer());
-		if (user.hasUnlimited(is) && user.getGameMode() == GameMode.SURVIVAL)
-		{
-			ess.scheduleSyncDelayedTask(
-					new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					user.getBase().getInventory().addItem(is);
-					user.getBase().updateInventory();
-				}
-			});
-		}
-	}
+        if (is.getType() == Material.MOB_SPAWNER && event.getItemInHand() != null && event.getPlayer() != null && event.getItemInHand().getType() == Material.MOB_SPAWNER) {
+            final BlockState blockState = event.getBlockPlaced().getState();
+            if (blockState instanceof CreatureSpawner) {
+                final CreatureSpawner spawner = (CreatureSpawner) blockState;
+                final EntityType type = 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());
+        }
+    }
 }

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

@@ -1,10 +1,5 @@
 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 java.util.regex.Pattern;
 import net.ess3.api.IEssentials;
 import org.bukkit.Material;
 import org.bukkit.entity.*;
@@ -15,209 +10,202 @@ 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 static final transient Pattern powertoolPlayer = Pattern.compile("\\{player\\}");
-	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 (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.getItemInHand();
-				if (hand != null && hand.getType() == Material.MILK_BUCKET)
-				{
-					((Ageable)eDefend).setBaby();
-					hand.setType(Material.BUCKET);
-					attacker.setItemInHand(hand);
-					attacker.updateInventory();
-					event.setCancelled(true);
-				}
-			}
-			attacker.updateActivity(true);
-		}
-		else if (eAttack instanceof Projectile && eDefend instanceof Player)
-		{
-			Entity shooter = ((Projectile)event.getDamager()).getShooter();
-			if (shooter instanceof Player)
-			{
-				final User attacker = ess.getUser((Player)shooter);
-				onPlayerVsPlayerDamage(event, (Player)eDefend, attacker);
-				attacker.updateActivity(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 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);
-		}
+    public EssentialsEntityListener(IEssentials ess) {
+        this.ess = ess;
+    }
 
-		if (!defender.equals(attacker.getBase()) && (attacker.hasInvulnerabilityAfterTeleport() || ess.getUser(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);
+        }
 
-		onPlayerVsPlayerPowertool(event, defender, attacker);
-	}
+        if (attacker.isGodModeEnabled() && !attacker.isAuthorized("essentials.god.pvp")) {
+            event.setCancelled(true);
+        }
 
-	private void onPlayerVsPlayerPowertool(final EntityDamageByEntityEvent event, final Player defender, final User attacker)
-	{
-		final List<String> commandList = attacker.getPowertool(attacker.getItemInHand());
-		if (commandList != null && !commandList.isEmpty())
-		{
-			for (final String tempCommand : commandList)
-			{
-				final String command = powertoolPlayer.matcher(tempCommand).replaceAll(defender.getName());
-				if (command != null && !command.isEmpty() && !command.equals(tempCommand))
-				{
-					ess.scheduleSyncDelayedTask(
-							new Runnable()
-					{
-						@Override
-						public void run()
-						{
-							attacker.getServer().dispatchCommand(attacker.getBase(), command);
-							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((Player)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((Player)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)
-		{
-			final User user = ess.getUser((Player)event.getEntity());
-			if (user.isGodModeEnabled())
-			{
-				if (user.isGodModeEnabledRaw())
-				{
-					user.setFoodLevel(20);
-					user.setSaturation(10);
-				}
-				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((Player)event.getEntity()).isAfk() && ess.getSettings().getFreezeAfkPlayers())
-		{
-			event.setCancelled(true);
-		}
-	}
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onEntityCombustByEntity(final EntityCombustByEntityEvent event) {
+        if (event.getCombuster() instanceof Arrow) {
+            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((Player)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, ignoreCancelled = true)
-	public void onEntityShootBow(EntityShootBowEvent event)
-	{
-		if (event.getEntity() instanceof Player)
-		{
-			final User user = ess.getUser((Player)event.getEntity());
-			if (user.isAfk())
-			{
-				user.updateActivity(true);
-			}
-		}
-	}
+    @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);
+            }
+        }
+    }
 }

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

@@ -1,8 +1,6 @@
 package com.earth2me.essentials;
 
-import com.earth2me.essentials.perm.PermissionsHandler;
 import com.earth2me.essentials.register.payment.Methods;
-import java.util.logging.Level;
 import net.ess3.api.IEssentials;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -10,56 +8,43 @@ 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;
-	}
+public class EssentialsPluginListener implements Listener, IConf {
+    private final transient IEssentials 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 (!Methods.hasMethod() && Methods.setMethod(ess.getServer().getPluginManager()))
-		{
-			ess.getLogger().log(Level.INFO, "Payment method found (" + Methods.getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
-		}
-	}
+    public EssentialsPluginListener(final IEssentials ess) {
+        this.ess = ess;
+    }
 
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPluginDisable(final PluginDisableEvent event)
-	{
-		if (event.getPlugin().getName().equals("EssentialsChat"))
-		{
-			ess.getSettings().setEssentialsChatActive(false);
-		}
-		PermissionsHandler permHandler = ess.getPermissionsHandler();
-		if (permHandler != null)
-		{
-			permHandler.checkPermissions();
-		}
-		ess.getAlternativeCommandsHandler().removePlugin(event.getPlugin());
-		// Check to see if the plugin thats being disabled is the one we are using
-		if (ess.getPaymentMethod() != null && Methods.hasMethod() && Methods.checkDisabled(event.getPlugin()))
-		{
-			ess.getPaymentMethod().reset();
-			ess.getLogger().log(Level.INFO, "Payment method was disabled. No longer accepting payments.");
-		}
-	}
+    @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() + ")");
+        }
+    }
 
-	@Override
-	public void reloadConfig()
-	{
-		ess.getPermissionsHandler().setUseSuperperms(ess.getSettings().useBukkitPermissions());
-		ess.getPermissionsHandler().checkPermissions();
-	}
+    @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() {
+    }
 }

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

@@ -0,0 +1,90 @@
+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.Iterator;
+import java.util.List;
+import java.util.logging.Level;
+
+
+public class EssentialsServerListener implements Listener {
+    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("Using Paper 1.12+ ServerListPingEvent methods");
+                isPaperSample = true;
+                return;
+            }
+        }
+
+        ess.getLogger().info("Using Spigot 1.7.10+ ServerListPingEvent iterator");
+        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);
+                Iterator<String> iterator = playerNames.iterator();
+                while (iterator.hasNext()) {
+                    String player = iterator.next();
+                    if (ess.getUser(player).isVanished()) {
+                        iterator.remove();
+                    }
+                }
+                setSampleText.invoke(event, playerNames);
+            } catch (IllegalAccessException | InvocationTargetException | ClassCastException e) {
+                if (!unsupportedLogged) {
+                    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) {
+                    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) {
+                    ess.getLogger().warning("Current server implementation does not support "
+                            + "hiding players from server list ping. Update or contact the maintainers.");
+                    unsupportedLogged = true;
+                }
+            }
+        }
+    }
+}

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

@@ -1,124 +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<String> onlineUsers = new HashSet<String>();
-	private transient long lastPoll = System.nanoTime();
-	private final LinkedList<Double> history = new LinkedList<Double>();
-	private int skip1 = 0;
-	private int skip2 = 0;
-	private final long maxTime = 10 * 1000000;
-	private final long tickInterval = 50;
-	
-	EssentialsTimer(final IEssentials ess)
-	{
-		this.ess = ess;
-		history.add(20d);
-	}
-	
-	@Override
-	public void run()
-	{
-		final long startTime = System.nanoTime();
-		final long currentTime = System.currentTimeMillis();
-		long timeSpent = (startTime - lastPoll) / 1000;
-		if (timeSpent == 0)
-		{
-			timeSpent = 1;
-		}
-		if (history.size() > 10)
-		{
-			history.remove();
-		}
-		double tps = tickInterval * 1000000.0 / timeSpent;
-		if (tps <= 21)
-		{
-			history.add(tps);
-		}
-		lastPoll = startTime;
-		int count = 0;
-		for (Player player : ess.getServer().getOnlinePlayers())
-		{
-			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.getName());
-				user.setLastOnlineActivity(currentTime);
-				user.checkActivity();
-			}
-			catch (Exception e)
-			{
-				ess.getLogger().log(Level.WARNING, "EssentialsTimer Error:", e);
-			}
-		}
-		
-		count = 0;
-		final Iterator<String> 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());
-			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();
-	}
+
+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;
+
+    EssentialsTimer(final IEssentials ess) {
+        this.ess = ess;
+        history.add(20d);
+    }
+
+    @Override
+    public void run() {
+        final long startTime = System.nanoTime();
+        final long currentTime = System.currentTimeMillis();
+        long timeSpent = (startTime - lastPoll) / 1000;
+        if (timeSpent == 0) {
+            timeSpent = 1;
+        }
+        if (history.size() > 10) {
+            history.remove();
+        }
+        double tps = tickInterval * 1000000.0 / timeSpent;
+        if (tps <= 21) {
+            history.add(tps);
+        }
+        lastPoll = startTime;
+        int count = 0;
+        for (Player player : ess.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);
+            }
+        }
+
+        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();
+    }
 }

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

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

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

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

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

@@ -1,5 +1,7 @@
 package com.earth2me.essentials;
 
+import net.ess3.api.IEssentials;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -11,179 +13,154 @@ import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
-import net.ess3.api.IEssentials;
 
 
-public class I18n implements net.ess3.api.II18n
-{
-	private static I18n instance;
-	private static final String MESSAGES = "messages";
-	private final transient Locale defaultLocale = Locale.getDefault();
-	private transient Locale currentLocale = defaultLocale;
-	private transient ResourceBundle customBundle;
-	private transient ResourceBundle localeBundle;
-	private final transient ResourceBundle defaultBundle;
-	private final transient Map<String, MessageFormat> messageFormatCache = new HashMap<String, MessageFormat>();
-	private final transient IEssentials ess;
-	private final static Pattern NODOUBLEMARK = Pattern.compile("''");
+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;
+    }
 
-	@Override
-	public Locale getCurrentLocale()
-	{
-		return currentLocale;
-	}
+    public void onDisable() {
+        instance = null;
+    }
 
-	private 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 NODOUBLEMARK.matcher(instance.translate(string)).replaceAll("'");
-		}
-		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);
+    }
 
-	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;
+        }
+    }
 }

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

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

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

@@ -6,7 +6,7 @@ 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;
@@ -15,75 +15,92 @@ 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);
 
-	@Deprecated
-	User getUser(Object base);
-	
-	User getUser(String base);
-	
-	User getUser(Player 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(String message);
+    User getUser(Player base);
 
-	int broadcastMessage(IUser sender, String message);
+    I18n getI18n();
 
-	int broadcastMessage(String permission, String message);
+    User getOfflineUser(String name);
 
-	ISettings getSettings();
+    World getWorld(String name);
 
-	BukkitScheduler getScheduler();
+    int broadcastMessage(String message);
 
-	IJails getJails();
+    int broadcastMessage(IUser sender, String message);
 
-	IWarps getWarps();
+    int broadcastMessage(String permission, String message);
 
-	Worth getWorth();
+    ISettings getSettings();
 
-	Backup getBackup();
+    BukkitScheduler getScheduler();
 
-	Methods getPaymentMethod();
+    IJails getJails();
 
-	BukkitTask runTaskAsynchronously(Runnable run);
+    IWarps getWarps();
 
-	BukkitTask runTaskLaterAsynchronously(Runnable run, long delay);
+    Worth getWorth();
 
-	int scheduleSyncDelayedTask(Runnable run);
+    Backup getBackup();
 
-	int scheduleSyncDelayedTask(Runnable run, long delay);
+    Kits getKits();
 
-	int scheduleSyncRepeatingTask(final Runnable run, long delay, long period);
+    Methods getPaymentMethod();
 
-	TNTExplodeListener getTNTListener();
+    BukkitTask runTaskAsynchronously(Runnable run);
 
-	PermissionsHandler getPermissionsHandler();
+    BukkitTask runTaskLaterAsynchronously(Runnable run, long delay);
 
-	AlternativeCommandsHandler getAlternativeCommandsHandler();
+    BukkitTask runTaskTimerAsynchronously(Runnable run, long delay, long period);
 
-	void showError(final CommandSource sender, final Throwable exception, final String commandLabel);
+    int scheduleSyncDelayedTask(Runnable run);
 
-	IItemDb getItemDb();
+    int scheduleSyncDelayedTask(Runnable run, long delay);
 
-	UserMap getUserMap();
+    int scheduleSyncRepeatingTask(Runnable run, long delay, long period);
 
-	Metrics getMetrics();
+    TNTExplodeListener getTNTListener();
 
-	void setMetrics(Metrics metrics);
+    PermissionsHandler getPermissionsHandler();
 
-	EssentialsTimer getTimer();
+    AlternativeCommandsHandler getAlternativeCommandsHandler();
 
-	List<String> getVanishedPlayers();
+    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();
 }

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

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

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

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

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

@@ -3,198 +3,307 @@ package com.earth2me.essentials;
 import com.earth2me.essentials.commands.IEssentialsCommand;
 import com.earth2me.essentials.signs.EssentialsSign;
 import com.earth2me.essentials.textreader.IText;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.event.EventPriority;
 
+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();
 
-	String getChatFormat(String group);
+    long getBackupInterval();
 
-	int getChatRadius();
+    String getChatFormat(String group);
 
-	BigDecimal getCommandCost(IEssentialsCommand cmd);
+    int getChatRadius();
 
-	BigDecimal 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);
 
-	Set<String> getSocialSpyCommands();
+    String getCurrencySymbol();
 
-	Map<String, Object> getKit(String name);
+    int getOversizedStackSize();
 
-	ConfigurationSection getKits();
+    int getDefaultStackSize();
 
-	String getLocale();
+    double getHealCooldown();
 
-	String getNewbieSpawn();
+    Set<String> getSocialSpyCommands();
 
-	String getNicknamePrefix();
+    boolean getSocialSpyListenMutedPlayers();
 
-	ChatColor getOperatorColor() throws Exception;
+    Set<String> getMuteCommands();
 
-	boolean getPerWarpPermission();
+    /**
+     * @Deprecated in favor of {@link Kits#getKits()}
+     */
+    @Deprecated
+    ConfigurationSection getKits();
 
-	boolean getProtectBoolean(final String configName, boolean def);
+    /**
+     * @Deprecated in favor of {@link Kits#getKit(String)}
+     */
+    @Deprecated
+    Map<String, Object> getKit(String kit);
 
-	int getProtectCreeperMaxHeight();
+    /**
+     * @Deprecated in favor of {@link Kits#addKit(String, List, long)}}
+     */
+    @Deprecated
+    void addKit(String name, List<String> lines, long delay);
 
-	List<Integer> getProtectList(final String configName);
+    @Deprecated
+    ConfigurationSection getKitSection();
 
-	boolean getProtectPreventSpawn(final String creatureName);
+    boolean isSkippingUsedOneTimeKitsFromKitList();
 
-	String getProtectString(final String configName);
+    String getLocale();
 
-	boolean getRespawnAtHome();
+    String getNewbieSpawn();
 
-	Set getMultipleHomes();
+    String getNicknamePrefix();
 
-	int getHomeLimit(String set);
+    ChatColor getOperatorColor() throws Exception;
 
-	int getHomeLimit(User user);
+    boolean getPerWarpPermission();
 
-	int getSpawnMobLimit();
+    boolean getProtectBoolean(final String configName, boolean def);
 
-	BigDecimal getStartingBalance();
+    int getProtectCreeperMaxHeight();
 
-	double getTeleportCooldown();
+    List<Integer> 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);
 
-	BigDecimal getMaxMoney();
+    boolean isCommandDisabled(String label);
 
-	BigDecimal getMinMoney();
+    boolean isCommandOverridden(String name);
 
-	boolean isEcoLogEnabled();
+    boolean isDebug();
 
-	boolean isEcoLogUpdateEnabled();
+    boolean isEcoDisabled();
 
-	boolean removeGodOnDisconnect();
+    boolean isTradeInStacks(int id);
 
-	boolean changeDisplayName();
+    List<Integer> itemSpawnBlacklist();
 
-	boolean changePlayerListName();
+    List<EssentialsSign> enabledSigns();
 
-	boolean isPlayerCommand(String string);
+    boolean permissionBasedItemSpawn();
 
-	boolean useBukkitPermissions();
+    boolean showNonEssCommandsInHelp();
 
-	boolean addPrefixSuffix();
+    boolean warnOnBuildDisallow();
 
-	boolean disablePrefix();
+    boolean warnOnSmite();
 
-	boolean disableSuffix();
+    BigDecimal getMaxMoney();
 
-	long getAutoAfk();
+    BigDecimal getMinMoney();
 
-	long getAutoAfkKick();
+    boolean isEcoLogEnabled();
 
-	boolean getFreezeAfkPlayers();
+    boolean isEcoLogUpdateEnabled();
 
-	boolean cancelAfkOnMove();
+    boolean removeGodOnDisconnect();
 
-	boolean cancelAfkOnInteract();
+    boolean changeDisplayName();
 
-	boolean areDeathMessagesEnabled();
+    boolean changePlayerListName();
 
-	void setDebug(boolean debug);
+    boolean isPlayerCommand(String string);
 
-	Set<String> getNoGodWorlds();
+    boolean useBukkitPermissions();
 
-	boolean getUpdateBedAtDaytime();
+    boolean addPrefixSuffix();
 
-	boolean allowUnsafeEnchantments();
+    boolean disablePrefix();
 
-	boolean getRepairEnchanted();
+    boolean disableSuffix();
 
-	boolean isWorldTeleportPermissions();
+    long getAutoAfk();
 
-	boolean isWorldHomePermissions();
+    long getAutoAfkKick();
 
-	boolean registerBackInListener();
+    boolean getFreezeAfkPlayers();
 
-	boolean getDisableItemPickupWhileAfk();
+    boolean cancelAfkOnMove();
 
-	EventPriority getRespawnPriority();
+    boolean cancelAfkOnInteract();
 
-	long getTpaAcceptCancellation();
+    boolean isAfkListName();
 
-	boolean isMetricsEnabled();
+    String getAfkListName();
 
-	void setMetricsEnabled(boolean metricsEnabled);
+    boolean areDeathMessagesEnabled();
 
-	long getTeleportInvulnerability();
+    void setDebug(boolean debug);
 
-	boolean isTeleportInvulnerability();
+    Set<String> getNoGodWorlds();
 
-	long getLoginAttackDelay();
+    boolean getUpdateBedAtDaytime();
 
-	int getSignUsePerSecond();
+    boolean allowUnsafeEnchantments();
 
-	double getMaxFlySpeed();
+    boolean getRepairEnchanted();
 
-	double getMaxWalkSpeed();
+    boolean isWorldTeleportPermissions();
 
-	int getMailsPerMinute();
+    boolean isWorldHomePermissions();
 
-	long getEconomyLagWarning();
+    boolean registerBackInListener();
 
-	void setEssentialsChatActive(boolean b);
+    boolean getDisableItemPickupWhileAfk();
 
-	long getMaxTempban();
+    EventPriority getRespawnPriority();
 
-	Map<String, Object> getListGroupConfig();
+    EventPriority getSpawnJoinPriority();
 
-	int getMaxNickLength();
-	
-	int getMaxUserCacheCount();
+    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();
+
+    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);
 }

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

@@ -3,7 +3,6 @@ package com.earth2me.essentials;
 import org.bukkit.Location;
 
 
-public interface ITarget
-{
-	public Location getLocation();
+public interface ITarget {
+    Location getLocation();
 }

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

@@ -1,148 +1,187 @@
 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.entity.Player;
+
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import net.ess3.api.ITeleport;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
+import java.util.regex.Pattern;
 
 
-public interface IUser
-{
-	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 healCooldown() throws Exception;
+    void healCooldown() throws Exception;
 
-	void giveMoney(BigDecimal value);
+    void giveMoney(BigDecimal value) throws MaxMoneyException;
 
-	void giveMoney(final BigDecimal value, final CommandSource initiator);
-	@Deprecated
-	void giveMoney(final BigDecimal value, final CommandSender initiator);
+    void giveMoney(final BigDecimal value, final CommandSource initiator) throws MaxMoneyException;
 
-	void payUser(final User reciever, final BigDecimal value) throws Exception;
+    void payUser(final User reciever, final BigDecimal value) throws Exception;
 
-	void takeMoney(BigDecimal value);
+    void takeMoney(BigDecimal value);
 
-	void takeMoney(final BigDecimal value, final CommandSource initiator);
-	@Deprecated
-	void takeMoney(final BigDecimal value, final CommandSender initiator);
+    void takeMoney(final BigDecimal value, final CommandSource initiator);
 
-	boolean canAfford(BigDecimal value);
+    boolean canAfford(BigDecimal value);
 
-	Boolean canSpawnItem(final int itemId);
+    Boolean canSpawnItem(final int itemId);
 
-	void setLastLocation();
+    void setLastLocation();
 
-	void setLogoutLocation();
+    void setLogoutLocation();
 
-	void requestTeleport(final User player, final boolean here);
+    void requestTeleport(final User player, final boolean here);
 
-	ITeleport getTeleport();
+    /**
+     * Returns whether this user has an outstanding teleport request to deal with.
+     *
+     * @return whether there is a teleport request
+     */
+    boolean hasOutstandingTeleportRequest();
 
-	BigDecimal getMoney();
+    ITeleport getTeleport();
 
-	void setMoney(final BigDecimal value);
+    BigDecimal getMoney();
 
-	void setAfk(final boolean set);
+    void setMoney(final BigDecimal value) throws MaxMoneyException;
 
-	/**
-	 * '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 setAfk(final boolean set);
 
-	void setHidden(boolean vanish);
+    /**
+     * '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();
 
-	boolean isGodModeEnabled();
+    void setHidden(boolean vanish);
 
-	String getGroup();
+    boolean isGodModeEnabled();
 
-	boolean inGroup(final String group);
+    String getGroup();
 
-	boolean canBuild();
+    boolean inGroup(final String group);
 
-	long getTeleportRequestTime();
+    boolean canBuild();
 
-	void enableInvulnerabilityAfterTeleport();
+    long getTeleportRequestTime();
 
-	void resetInvulnerabilityAfterTeleport();
+    void enableInvulnerabilityAfterTeleport();
 
-	boolean hasInvulnerabilityAfterTeleport();
+    void resetInvulnerabilityAfterTeleport();
 
-	/**
-	 * '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();
+    boolean hasInvulnerabilityAfterTeleport();
 
-	void setVanished(boolean vanish);
+    /**
+     * '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();
 
-	boolean isIgnoreExempt();
+    void setVanished(boolean vanish);
 
-	public void sendMessage(String message);
+    boolean isIgnoreExempt();
 
-	/*
-	 * UserData
-	 */
-	Location getHome(String name) throws Exception;
+    void sendMessage(String message);
 
-	Location getHome(Location loc) throws Exception;
+    /*
+     * UserData
+     */
+    Location getHome(String name) throws Exception;
 
-	List<String> getHomes();
+    Location getHome(Location loc) throws Exception;
 
-	void setHome(String name, Location loc);
+    List<String> getHomes();
 
-	void delHome(String name) throws Exception;
+    void setHome(String name, Location loc);
 
-	boolean hasHome();
+    void delHome(String name) throws Exception;
 
-	Location getLastLocation();
+    boolean hasHome();
 
-	Location getLogoutLocation();
+    Location getLastLocation();
 
-	long getLastTeleportTimestamp();
+    Location getLogoutLocation();
 
-	void setLastTeleportTimestamp(long time);
+    long getLastTeleportTimestamp();
 
-	String getJail();
+    void setLastTeleportTimestamp(long time);
 
-	void setJail(String jail);
+    String getJail();
 
-	List<String> getMails();
+    void setJail(String jail);
 
-	void addMail(String mail);
+    List<String> getMails();
 
-	boolean isAfk();
+    void addMail(String mail);
 
-	void setConfigProperty(String node, Object object);
+    boolean isAfk();
 
-	Set<String> getConfigKeys();
+    void setIgnoreMsg(boolean ignoreMsg);
 
-	Map<String, Object> getConfigMap();
+    boolean isIgnoreMsg();
 
-	Map<String, Object> getConfigMap(String node);
+    void setConfigProperty(String node, Object object);
 
-	/*
-	 *  PlayerExtension
-	 */
-	Player getBase();
+    Set<String> getConfigKeys();
 
-	CommandSource getSource();
+    Map<String, Object> getConfigMap();
 
-	public String getName();
+    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();
 }

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

@@ -1,293 +1,484 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.utils.NumberUtil;
 import com.earth2me.essentials.utils.StringUtil;
-import java.util.*;
-import java.util.regex.Pattern;
 import net.ess3.api.IEssentials;
+import net.ess3.nms.refl.ReflUtil;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.Color;
+import org.bukkit.FireworkEffect;
 import org.bukkit.Material;
+import org.bukkit.block.Banner;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.EntityType;
+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 java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static com.earth2me.essentials.I18n.tl;
 
 
-public class ItemDb implements IConf, net.ess3.api.IItemDb
-{
-	private final transient IEssentials ess;
-	private final transient Map<String, Integer> items = new HashMap<String, Integer>();
-	private final transient Map<ItemData, List<String>> names = new HashMap<ItemData, List<String>>();
-	private final transient Map<ItemData, String> primaryName = new HashMap<ItemData, String>();
-	private final transient Map<String, Short> durabilities = new HashMap<String, Short>();
-	private final transient ManagedFile file;
-	private final transient Pattern splitPattern = Pattern.compile("[:+',;.]");
+public class ItemDb implements IConf, net.ess3.api.IItemDb {
+    private final transient IEssentials ess;
+    private final transient Map<String, Integer> items = new HashMap<>();
+    private final transient Map<ItemData, List<String>> names = new HashMap<>();
+    private final transient Map<ItemData, String> primaryName = new HashMap<>();
+    private final transient Map<String, Short> durabilities = new HashMap<>();
+    private final transient Map<String, String> nbtData = new HashMap<>();
+    private final transient ManagedFile file;
+    private final transient Pattern splitPattern = Pattern.compile("((.*)[:+',;.](\\d+))");
+    private final transient Pattern csvSplitPattern = Pattern.compile("(\"([^\"]*)\"|[^,]*)(,|$)");
 
-		public ItemDb(final IEssentials ess)
-		{
-			this.ess = ess;
-			file = new ManagedFile("items.csv", ess);
-		}
+    public ItemDb(final IEssentials ess) {
+        this.ess = ess;
+        file = new ManagedFile("items.csv", ess);
+    }
 
-	@Override
-	public void reloadConfig()
-	{
-		final List<String> lines = file.getLines();
+    @Override
+    public void reloadConfig() {
+        final List<String> lines = file.getLines();
 
-		if (lines.isEmpty())
-		{
-			return;
-		}
+        if (lines.isEmpty()) {
+            return;
+        }
 
-		durabilities.clear();
-		items.clear();
-		names.clear();
-		primaryName.clear();
+        durabilities.clear();
+        items.clear();
+        names.clear();
+        primaryName.clear();
 
-		for (String line : lines)
-		{
-			line = line.trim().toLowerCase(Locale.ENGLISH);
-			if (line.length() > 0 && line.charAt(0) == '#')
-			{
-				continue;
-			}
+        for (String line : lines) {
+            if (line.length() > 0 && line.charAt(0) == '#') {
+                continue;
+            }
 
-			final String[] parts = line.split("[^a-z0-9]");
-			if (parts.length < 2)
-			{
-				continue;
-			}
+            String itemName = null;
+            int numeric = -1;
+            short data = 0;
+            String nbt = null;
 
-			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);
+            int col = 0;
+            Matcher matcher = csvSplitPattern.matcher(line);
+            while (matcher.find()) {
+                String match = matcher.group(1);
+                if (StringUtils.stripToNull(match) == null) {
+                    continue;
+                }
+                match = StringUtils.strip(match.trim(), "\"");
+                switch (col) {
+                    case 0:
+                        itemName = match.toLowerCase(Locale.ENGLISH);
+                        break;
+                    case 1:
+                        numeric = Integer.parseInt(match);
+                        break;
+                    case 2:
+                        data = Short.parseShort(match);
+                        break;
+                    case 3:
+                        nbt = StringUtils.stripToNull(match);
+                        break;
+                    default:
+                        continue;
+                }
+                col++;
+            }
+            // Invalid row
+            if (itemName == null || numeric < 0) {
+                continue;
+            }
+            durabilities.put(itemName, data);
+            items.put(itemName, numeric);
+            if (nbt != null) {
+                nbtData.put(itemName, nbt);
+            }
 
-			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);
+            } else {
+                List<String> nameList = new ArrayList<>();
+                nameList.add(itemName);
+                names.put(itemData, nameList);
+                primaryName.put(itemData, itemName);
+            }
+        }
 
-			ItemData itemData = new ItemData(numeric, data);
-			if (names.containsKey(itemData))
-			{
-				List<String> nameList = names.get(itemData);
-				nameList.add(itemName);
-				Collections.sort(nameList, new LengthCompare());
-			}
-			else
-			{
-				List<String> nameList = new ArrayList<String>();
-				nameList.add(itemName);
-				names.put(itemData, nameList);
-				primaryName.put(itemData, itemName);
-			}
-		}
-	}
+        for (List<String> nameList : names.values()) {
+            Collections.sort(nameList, LengthCompare.INSTANCE);
+        }
+    }
 
-	@Override
-	public ItemStack get(final String id, final int quantity) throws Exception
-	{
-		final ItemStack retval = get(id.toLowerCase(Locale.ENGLISH));
-		retval.setAmount(quantity);
-		return retval;
-	}
+    @Override
+    public ItemStack get(final String id, final int quantity) throws Exception {
+        final ItemStack retval = get(id.toLowerCase(Locale.ENGLISH));
+        retval.setAmount(quantity);
+        return retval;
+    }
 
-	@Override
-	public ItemStack get(final String id) throws Exception
-	{
-		int itemid = 0;
-		String itemname = null;
-		short metaData = 0;
-		String[] parts = splitPattern.split(id);
-		if (id.matches("^\\d+[:+',;.]\\d+$"))
-		{
-			itemid = Integer.parseInt(parts[0]);
-			metaData = Short.parseShort(parts[1]);
-		}
-		else if (NumberUtil.isInt(id))
-		{
-			itemid = Integer.parseInt(id);
-		}
-		else if (id.matches("^[^:+',;.]+[:+',;.]\\d+$"))
-		{
-			itemname = parts[0].toLowerCase(Locale.ENGLISH);
-			metaData = Short.parseShort(parts[1]);
-		}
-		else
-		{
-			itemname = id.toLowerCase(Locale.ENGLISH);
-		}
+    @Override
+    public ItemStack get(final String id) throws Exception {
+        int itemid = 0;
+        String itemname;
+        short metaData = 0;
+        Matcher parts = splitPattern.matcher(id);
+        if (parts.matches()) {
+            itemname = parts.group(2);
+            metaData = Short.parseShort(parts.group(3));
+        } else {
+            itemname = id;
+        }
 
-		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.toUpperCase(Locale.ENGLISH)) != null)
-			{
-				itemid = Material.getMaterial(itemname.toUpperCase(Locale.ENGLISH)).getId();
-				metaData = 0;
-			}
-			else
-			{
-				throw new Exception(_("unknownItemName", id));
-			}
-		}
+        if (NumberUtil.isInt(itemname)) {
+            itemid = Integer.parseInt(itemname);
+        } else if (NumberUtil.isInt(id)) {
+            itemid = Integer.parseInt(id);
+        } else {
+            itemname = itemname.toLowerCase(Locale.ENGLISH);
+        }
 
-		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;
-	}
+        if (itemid < 1) {
+            if (items.containsKey(itemname)) {
+                itemid = items.get(itemname);
+                if (durabilities.containsKey(itemname) && metaData == 0) {
+                    metaData = durabilities.get(itemname);
+                }
+            } else if (Material.getMaterial(itemname.toUpperCase(Locale.ENGLISH)) != null) {
+                Material bMaterial = Material.getMaterial(itemname.toUpperCase(Locale.ENGLISH));
+                itemid = bMaterial.getId();
+            } else {
+                try {
+                    Material bMaterial = Bukkit.getUnsafe().getMaterialFromInternalName(itemname.toLowerCase(Locale.ENGLISH));
+                    itemid = bMaterial.getId();
+                } catch (Throwable throwable) {
+                    throw new Exception(tl("unknownItemName", itemname), throwable);
+                }
+            }
+        }
 
-	@Override
-	public List<ItemStack> getMatching(User user, String[] args) throws Exception
-	{
-		List<ItemStack> is = new ArrayList<ItemStack>();
+        if (itemid < 1) {
+            throw new Exception(tl("unknownItemName", itemname));
+        }
 
-		if (args.length < 1)
-		{
-			is.add(user.getItemInHand());
-		}
-		else if (args[0].equalsIgnoreCase("hand"))
-		{
-			is.add(user.getItemInHand());
-		}
-		else if (args[0].equalsIgnoreCase("inventory") || args[0].equalsIgnoreCase("invent") || args[0].equalsIgnoreCase("all"))
-		{
-			for (ItemStack stack : user.getInventory().getContents())
-			{
-				if (stack == null || stack.getType() == Material.AIR)
-				{
-					continue;
-				}
-				is.add(stack);
-			}
-		}
-		else if (args[0].equalsIgnoreCase("blocks"))
-		{
-			for (ItemStack stack : user.getInventory().getContents())
-			{
-				if (stack == null || stack.getTypeId() > 255 || stack.getType() == Material.AIR)
-				{
-					continue;
-				}
-				is.add(stack);
-			}
-		}
-		else
-		{
-			is.add(get(args[0]));
-		}
+        final Material mat = Material.getMaterial(itemid);
+        if (mat == null) {
+            throw new Exception(tl("unknownItemId", itemid));
+        }
+        ItemStack retval = new ItemStack(mat);
+        if (nbtData.containsKey(itemname)) {
+            String nbt = nbtData.get(itemname);
+            if (nbt.startsWith("*")) {
+                nbt = nbtData.get(nbt.substring(1));
+            }
+            retval = ess.getServer().getUnsafe().modifyItemStack(retval, nbt);
+        }
+        if (mat == Material.MOB_SPAWNER) {
+            if (metaData == 0) metaData = EntityType.PIG.getTypeId();
+            try {
+                retval = ess.getSpawnerProvider().setEntityType(retval, EntityType.fromId(metaData));
+            } catch (IllegalArgumentException e) {
+                throw new Exception("Can't spawn entity ID " + metaData + " from mob spawners.");
+            }
+        } else if (mat == Material.MONSTER_EGG) {
+            EntityType type;
+            try {
+                type = EntityType.fromId(metaData);
+            } catch (IllegalArgumentException e) {
+                throw new Exception("Can't spawn entity ID " + metaData + " from spawn eggs.");
+            }
+            retval = ess.getSpawnEggProvider().createEggItem(type);
+        } else if (mat.name().endsWith("POTION")
+                && ReflUtil.getNmsVersionObject().isLowerThan(ReflUtil.V1_11_R1)) { // Only apply this to pre-1.11 as items.csv might only work in 1.11
+            retval = ess.getPotionMetaProvider().createPotionItem(mat, metaData);
+        } else {
+            retval.setDurability(metaData);
+        }
+        retval.setAmount(mat.getMaxStackSize());
+        return retval;
+    }
 
-		if (is.isEmpty() || is.get(0).getType() == Material.AIR)
-		{
-			throw new Exception(_("itemSellAir"));
-		}
+    @Override
+    public List<ItemStack> getMatching(User user, String[] args) throws Exception {
+        List<ItemStack> is = new ArrayList<>();
 
-		return is;
-	}
+        if (args.length < 1) {
+            is.add(user.getItemInHand().clone());
+        } else if (args[0].equalsIgnoreCase("hand")) {
+            is.add(user.getItemInHand().clone());
+        } else if (args[0].equalsIgnoreCase("inventory") || args[0].equalsIgnoreCase("invent") || args[0].equalsIgnoreCase("all")) {
+            for (ItemStack stack : user.getBase().getInventory().getContents()) {
+                if (stack == null || stack.getType() == Material.AIR) {
+                    continue;
+                }
+                is.add(stack.clone());
+            }
+        } else if (args[0].equalsIgnoreCase("blocks")) {
+            for (ItemStack stack : user.getBase().getInventory().getContents()) {
+                if (stack == null || stack.getTypeId() > 255 || stack.getType() == Material.AIR) {
+                    continue;
+                }
+                is.add(stack.clone());
+            }
+        } else {
+            is.add(get(args[0]));
+        }
 
-@Override
-	public String names(ItemStack item)
-	{
-		ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
-		List<String> nameList = names.get(itemData);
-		if (nameList == null)
-		{
-			itemData = new ItemData(item.getTypeId(), (short)0);
-			nameList = names.get(itemData);
-			if (nameList == null)
-			{
-				return null;
-			}
-		}
+        if (is.isEmpty() || is.get(0).getType() == Material.AIR) {
+            throw new Exception(tl("itemSellAir"));
+        }
 
-		if (nameList.size() > 15)
-		{
-			nameList = nameList.subList(0, 14);
-		}
-		return StringUtil.joinList(", ", nameList);
-	}
+        return is;
+    }
 
-@Override
-	public String name(ItemStack item)
-	{
-		ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
-		String name = primaryName.get(itemData);
-		if (name == null)
-		{
-			itemData = new ItemData(item.getTypeId(), (short)0);
-			name = primaryName.get(itemData);
-			if (name == null)
-			{
-				return null;
-			}
-		}
-		return name;
-	}
+    @Override
+    public String names(ItemStack item) {
+        ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
+        List<String> nameList = names.get(itemData);
+        if (nameList == null) {
+            itemData = new ItemData(item.getTypeId(), (short) 0);
+            nameList = names.get(itemData);
+            if (nameList == null) {
+                return null;
+            }
+        }
 
-	static class ItemData
-	{
-		final private int itemNo;
-		final private short itemData;
+        if (nameList.size() > 15) {
+            nameList = nameList.subList(0, 14);
+        }
+        return StringUtil.joinList(", ", nameList);
+    }
 
-		ItemData(final int itemNo, final short itemData)
-		{
-			this.itemNo = itemNo;
-			this.itemData = itemData;
-		}
+    @Override
+    public String name(ItemStack item) {
+        ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
+        String name = primaryName.get(itemData);
+        if (name == null) {
+            itemData = new ItemData(item.getTypeId(), (short) 0);
+            name = primaryName.get(itemData);
+            if (name == null) {
+                return null;
+            }
+        }
+        return name;
+    }
 
-		public int getItemNo()
-		{
-			return itemNo;
-		}
+    @Override
+    public String serialize(ItemStack is) {
+        String mat = is.getType().name();
+        if (is.getData().getData() != 0) {
+            mat = mat + ":" + is.getData().getData();
+        }
+        int quantity = is.getAmount();
+        StringBuilder sb = new StringBuilder(); // Add space AFTER you add something. We can trim at end.
+        sb.append(mat).append(" ").append(quantity).append(" ");
 
-		public short getItemData()
-		{
-			return itemData;
-		}
+        // ItemMeta applies to anything.
+        if (is.hasItemMeta()) {
+            ItemMeta meta = is.getItemMeta();
+            if (meta.hasDisplayName()) {
+                sb.append("name:").append(meta.getDisplayName().replaceAll(" ", "_")).append(" ");
+            }
 
-		@Override
-		public int hashCode()
-		{
-			return (31 * itemNo) ^ itemData;
-		}
+            if (meta.hasLore()) {
+                sb.append("lore:");
+                boolean first = true;
+                for (String s : meta.getLore()) {
+                    // Add | before the line if it's not the first one. Easy but weird way
+                    // to do this since we need each line separated by |
+                    if (!first) {
+                        sb.append("|");
+                    }
+                    first = false;
+                    sb.append(s.replaceAll(" ", "_"));
+                }
+                sb.append(" ");
+            }
 
-		@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();
-		}
-	}
+            if (meta.hasEnchants()) {
+                for (Enchantment e : meta.getEnchants().keySet()) {
+                    sb.append(e.getName().toLowerCase()).append(":").append(meta.getEnchantLevel(e)).append(" ");
+                }
+            }
+
+            Set<ItemFlag> flags = meta.getItemFlags();
+            if (flags != null && !flags.isEmpty()) {
+                sb.append("itemflags:");
+                boolean first = true;
+                for (ItemFlag flag : flags) {
+                    if (!first) {
+                        sb.append(",");
+                    }
+                    sb.append(flag.name());
+                    first = false;
+                }
+            }
+        }
+
+        switch (is.getType()) {
+            case WRITTEN_BOOK:
+                // Everything from http://wiki.ess3.net/wiki/Item_Meta#Books in that order.
+                // Interesting as I didn't see a way to do pages or chapters.
+                BookMeta bookMeta = (BookMeta) is.getItemMeta();
+                if (bookMeta.hasTitle()) {
+                    sb.append("title:").append(bookMeta.getTitle()).append(" ");
+                }
+                if (bookMeta.hasAuthor()) {
+                    sb.append("author:").append(bookMeta.getAuthor()).append(" ");
+                }
+                // Only other thing it could have is lore but that's done up there ^^^
+                break;
+            case ENCHANTED_BOOK:
+                EnchantmentStorageMeta enchantmentStorageMeta = (EnchantmentStorageMeta) is.getItemMeta();
+                for (Enchantment e : enchantmentStorageMeta.getStoredEnchants().keySet()) {
+                    sb.append(e.getName().toLowerCase()).append(":").append(enchantmentStorageMeta.getStoredEnchantLevel(e)).append(" ");
+                }
+                break;
+            case FIREWORK:
+                // Everything from http://wiki.ess3.net/wiki/Item_Meta#Fireworks in that order.
+                FireworkMeta fireworkMeta = (FireworkMeta) is.getItemMeta();
+                if (fireworkMeta.hasEffects()) {
+                    for (FireworkEffect effect : fireworkMeta.getEffects()) {
+                        if (effect.getColors() != null && !effect.getColors().isEmpty()) {
+                            sb.append("color:");
+                            boolean first = true;
+                            for (Color c : effect.getColors()) {
+                                if (!first) {
+                                    sb.append(","); // same thing as above.
+                                }
+                                sb.append(c.toString());
+                                first = false;
+                            }
+                            sb.append(" ");
+                        }
+
+                        sb.append("shape: ").append(effect.getType().name()).append(" ");
+                        if (effect.getFadeColors() != null && !effect.getFadeColors().isEmpty()) {
+                            sb.append("fade:");
+                            boolean first = true;
+                            for (Color c : effect.getFadeColors()) {
+                                if (!first) {
+                                    sb.append(","); // same thing as above.
+                                }
+                                sb.append(c.toString());
+                                first = false;
+                            }
+                            sb.append(" ");
+                        }
+                    }
+                    sb.append("power: ").append(fireworkMeta.getPower()).append(" ");
+                }
+                break;
+            case POTION:
+                Potion potion = Potion.fromItemStack(is);
+                for (PotionEffect e : potion.getEffects()) {
+                    // long but needs to be effect:speed power:2 duration:120 in that order.
+                    sb.append("splash:").append(potion.isSplash()).append(" ").append("effect:").append(e.getType().getName().toLowerCase()).append(" ").append("power:").append(e.getAmplifier()).append(" ").append("duration:").append(e.getDuration() / 20).append(" ");
+                }
+                break;
+            case SKULL_ITEM:
+                // item stack with meta
+                SkullMeta skullMeta = (SkullMeta) is.getItemMeta();
+                if (skullMeta != null && skullMeta.hasOwner()) {
+                    sb.append("player:").append(skullMeta.getOwner()).append(" ");
+                }
+                break;
+            case LEATHER_HELMET:
+            case LEATHER_CHESTPLATE:
+            case LEATHER_LEGGINGS:
+            case LEATHER_BOOTS:
+                LeatherArmorMeta leatherArmorMeta = (LeatherArmorMeta) is.getItemMeta();
+                int rgb = leatherArmorMeta.getColor().asRGB();
+                sb.append("color:").append(rgb).append(" ");
+                break;
+            case BANNER:
+                BannerMeta bannerMeta = (BannerMeta) is.getItemMeta();
+                if (bannerMeta != null) {
+                    int basecolor = bannerMeta.getBaseColor().getColor().asRGB();
+                    sb.append("basecolor:").append(basecolor).append(" ");
+                    for (org.bukkit.block.banner.Pattern p : bannerMeta.getPatterns()) {
+                        String type = p.getPattern().getIdentifier();
+                        int color = p.getColor().getColor().asRGB();
+                        sb.append(type).append(",").append(color).append(" ");
+                    }
+                }
+                break;
+            case SHIELD:
+                // Hacky fix for accessing Shield meta - https://github.com/drtshock/Essentials/pull/745#issuecomment-234843795
+                BlockStateMeta shieldMeta = (BlockStateMeta) is.getItemMeta();
+                Banner shieldBannerMeta = (Banner) shieldMeta.getBlockState();
+                int basecolor = shieldBannerMeta.getBaseColor().getColor().asRGB();
+                sb.append("basecolor:").append(basecolor).append(" ");
+                for (org.bukkit.block.banner.Pattern p : shieldBannerMeta.getPatterns()) {
+                    String type = p.getPattern().getIdentifier();
+                    int color = p.getColor().getColor().asRGB();
+                    sb.append(type).append(",").append(color).append(" ");
+                }
+                break;
+        }
+
+        return sb.toString().trim().replaceAll("§", "&");
+    }
+
+    @Override
+    public Collection<String> listNames() {
+        return primaryName.values();
+    }
+
+    static class ItemData {
+        final private int itemNo;
+        final private short itemData;
+
+        ItemData(final int itemNo, final short itemData) {
+            this.itemNo = itemNo;
+            this.itemData = itemData;
+        }
+
+        public int getItemNo() {
+            return itemNo;
+        }
+
+        public short getItemData() {
+            return itemData;
+        }
+
+        @Override
+        public int hashCode() {
+            return (31 * itemNo) ^ itemData;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o == null) {
+                return false;
+            }
+            if (!(o instanceof ItemData)) {
+                return false;
+            }
+            ItemData pairo = (ItemData) o;
+            return this.itemNo == pairo.getItemNo() && this.itemData == pairo.getItemData();
+        }
+    }
 
 
-	class LengthCompare implements java.util.Comparator<String>
-	{
-		public LengthCompare()
-		{
-			super();
-		}
+    static class LengthCompare implements java.util.Comparator<String> {
 
-		@Override
-		public int compare(String s1, String s2)
-		{
-			return s1.length() - s2.length();
-		}
-	}
+        private static final LengthCompare INSTANCE = new LengthCompare();
+
+        public LengthCompare() {
+            super();
+        }
+
+        @Override
+        public int compare(String s1, String s2) {
+            return s1.length() - s2.length();
+        }
+    }
 }

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

@@ -1,11 +1,6 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n._;
 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;
@@ -28,313 +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 net.ess3.api.IJails
-{
-	private static final transient Logger LOGGER = Bukkit.getLogger();
-	private static transient boolean enabled = false;
-
-	public Jails(final IEssentials ess)
-	{
-		super(ess, com.earth2me.essentials.settings.Jails.class);
-		reloadConfig();
-	}
-
-	private void registerListeners()
-	{
-		enabled = true;
-		final PluginManager pluginManager = ess.getServer().getPluginManager();
-		final JailListener blockListener = new JailListener();
-		pluginManager.registerEvents(blockListener, ess);
-		if (ess.getSettings().isDebug())
-		{
-			LOGGER.log(Level.INFO, "Registering Jail listener");
-		}
-	}
-
-	@Override
-	public File getStorageFile()
-	{
-		return new File(ess.getDataFolder(), "jail.yml");
-	}
-
-	@Override
-	public void finishRead()
-	{
-		checkRegister();
-	}
-
-	@Override
-	public void finishWrite()
-	{
-		checkRegister();
-	}
-
-	public void resetListener()
-	{
-		enabled = false;
-		checkRegister();
-	}
-
-	private void checkRegister()
-	{
-		if (enabled == false && getCount() > 0)
-		{
-			registerListeners();
-		}
-	}
-
-	@Override
-	public Location getJail(final String jailName) throws Exception
-	{
-		acquireReadLock();
-		try
-		{
-			if (getData().getJails() == null || jailName == null
-				|| !getData().getJails().containsKey(jailName.toLowerCase(Locale.ENGLISH)))
-			{
-				throw new Exception(_("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.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;
-		}
-	}
+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((Player)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());
-			final long currentTime = System.currentTimeMillis();
-			user.checkJailTimeout(currentTime);
-			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"));
+        }
+    }
 }

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

@@ -1,7 +1,5 @@
 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;
@@ -9,231 +7,208 @@ import com.earth2me.essentials.textreader.IText;
 import com.earth2me.essentials.textreader.KeywordReplacer;
 import com.earth2me.essentials.textreader.SimpleTextInput;
 import com.earth2me.essentials.utils.DateUtil;
-import com.earth2me.essentials.utils.NumberUtil;
+import net.ess3.api.IEssentials;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.logging.Level;
-import net.ess3.api.IEssentials;
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.inventory.ItemStack;
+
+import static com.earth2me.essentials.I18n.tl;
 
 
-public class Kit
-{
-	//TODO: Convert this to use one of the new text classes?
-	public static String listKits(final IEssentials ess, final User user) throws Exception
-	{
-		try
-		{
-			final ConfigurationSection kits = ess.getSettings().getKits();
-			final StringBuilder list = new StringBuilder();
-			for (String kitItem : kits.getKeys(false))
-			{
-				if (user == null)
-				{
-					list.append(" ").append(capitalCase(kitItem));
-				}
-				else if (user.isAuthorized("essentials.kits." + kitItem.toLowerCase(Locale.ENGLISH)))
-				{
-					String cost = "";
-					String name = capitalCase(kitItem);
-					BigDecimal costPrice = new Trade("kit-" + kitItem.toLowerCase(Locale.ENGLISH), ess).getCommandCost(user);
-					if (costPrice.signum() > 0)
-					{
-						cost = _("kitCost", NumberUtil.displayCurrency(costPrice, ess));
-					}
-					final Map<String, Object> kit = ess.getSettings().getKit(kitItem);
+public class Kit {
+    final IEssentials ess;
+    final String kitName;
+    final Map<String, Object> kit;
+    final Trade charge;
 
-					if (Kit.getNextUse(user, kitItem, kit) != 0)
-					{
-						name = _("kitDelay", name);
-					}
+    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);
 
-					list.append(" ").append(name).append(cost);
-				}
-			}
-			return list.toString().trim();
-		}
-		catch (Exception ex)
-		{
-			throw new Exception(_("kitError"), ex);
-		}
+        if (kit == null) {
+            throw new Exception(tl("kitNotFound"));
+        }
+    }
 
-	}
+    public String getName() {
+        return kitName;
+    }
 
-	public static void checkTime(final User user, final String kitName, final Map<String, Object> els) throws Exception
-	{
-		final Calendar time = new GregorianCalendar();
-		long nextUse = getNextUse(user, kitName, els);
+    public void checkPerms(final User user) throws Exception {
+        if (!user.isAuthorized("essentials.kits." + kitName)) {
+            throw new Exception(tl("noKitPermission", "essentials.kits." + kitName));
+        }
+    }
 
-		if (nextUse == 0L)
-		{
-			user.setKitTimestamp(kitName, time.getTimeInMillis());
-		}
-		else if (nextUse < 0L)
-		{
-			user.sendMessage(_("kitOnce"));
-			throw new NoChargeException();
-		}
-		else
-		{
-			user.sendMessage(_("kitTimed", DateUtil.formatDateDiff(nextUse)));
-			throw new NoChargeException();
-		}
-	}
+    public void checkDelay(final User user) throws Exception {
+        long nextUse = getNextUse(user);
 
-	public static long getNextUse(final User user, final String kitName, final Map<String, Object> els) throws Exception
-	{
-		if (user.isAuthorized("essentials.kit.exemptdelay"))
-		{
-			return 0L;
-		}
+        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 Calendar time = new GregorianCalendar();
+    public void checkAffordable(final User user) throws Exception {
+        charge.isAffordableFor(user);
+    }
 
-		double delay = 0;
-		try
-		{
-			// Make sure delay is valid
-			delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0.0d;
-		}
-		catch (Exception e)
-		{
-			throw new Exception(_("kitError2"));
-		}
+    public void setTime(final User user) throws Exception {
+        final Calendar time = new GregorianCalendar();
+        user.setKitTimestamp(kitName, time.getTimeInMillis());
+    }
 
-		// When was the last kit used?
-		final long lastTime = user.getKitTimestamp(kitName);
+    public void chargeUser(final User user) throws Exception {
+        charge.charge(user);
+    }
 
-		// 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));
+    public long getNextUse(final User user) throws Exception {
+        if (user.isAuthorized("essentials.kit.exemptdelay")) {
+            return 0L;
+        }
 
-		if (lastTime == 0L || lastTime > time.getTimeInMillis())
-		{
-			// If we have no record of kit use, or its corrupted, give them benifit of the doubt.
-			return 0L;
-		}
-		else if (delay < 0d)
-		{
-			// If the kit has a negative kit time, it can only be used once.
-			return -1;
-		}
-		else if (delayTime.before(time))
-		{
-			// If the kit was used in the past, but outside the delay time, it can be used.
-			return 0L;
-		}
-		else
-		{
-			// If the kit has been used recently, return the next time it can be used.
-			return delayTime.getTimeInMillis();
-		}
-	}
+        final Calendar time = new GregorianCalendar();
 
-	public static List<String> getItems(final IEssentials ess, final User user, final String kitName, final Map<String, Object> kit) throws Exception
-	{
-		if (kit == null)
-		{
-			throw new Exception(_("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(_("kitError2"), e);
-		}
-	}
+        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"));
+        }
 
-	public static void expandItems(final IEssentials ess, final User user, final List<String> items) throws Exception
-	{
-		try
-		{
-			IText input = new SimpleTextInput(items);
-			IText output = new KeywordReplacer(input, user.getSource(), ess);
+        // When was the last kit used?
+        final long lastTime = user.getKitTimestamp(kitName);
 
-			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;
-				}
+        // 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));
 
-				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 (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();
+        }
+    }
 
-				if (parts.length > 2)
-				{
-					// We pass a null sender here because kits should not do perm checks
-					metaStack.parseStringMeta(null, allowUnsafe, parts, 2, ess);
-				}
+    @Deprecated
+    public List<String> getItems(final User user) throws Exception {
+        return getItems();
+    }
 
-				final Map<Integer, ItemStack> overfilled;
-				final boolean allowOversizedStacks = user.isAuthorized("essentials.oversizedstacks");
-				if (allowOversizedStacks)
-				{
-					overfilled = InventoryWorkaround.addOversizedItems(user.getInventory(), ess.getSettings().getOversizedStackSize(), metaStack.getItemStack());
-				}
-				else
-				{
-					overfilled = InventoryWorkaround.addItems(user.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.updateInventory();
-			if (spew)
-			{
-				user.sendMessage(_("kitInvFull"));
-			}
-		}
-		catch (Exception e)
-		{
-			user.updateInventory();
-			ess.getLogger().log(Level.WARNING, e.getMessage());
-			throw new Exception(_("kitError2"), e);
-		}
-	}
+    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);
+        }
+    }
 }

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

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

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

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

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

@@ -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,218 +13,155 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
-import net.ess3.api.IEssentials;
-import org.bukkit.Bukkit;
+
+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();
+        }
+    }
 }

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

@@ -1,138 +1,165 @@
 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 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),
-	HORSE("Horse", Enemies.FRIENDLY, EntityType.HORSE),
-	PIG("Pig", Enemies.FRIENDLY, EntityType.PIG),
-	PIGZOMB("PigZombie", Enemies.NEUTRAL, EntityType.PIG_ZOMBIE),
-	SHEEP("Sheep", Enemies.FRIENDLY, "", EntityType.SHEEP),
-	SKELETON("Skeleton", Enemies.ENEMY, EntityType.SKELETON),
-	SLIME("Slime", Enemies.ENEMY, EntityType.SLIME),
-	SPIDER("Spider", Enemies.ENEMY, EntityType.SPIDER),
-	SQUID("Squid", Enemies.FRIENDLY, EntityType.SQUID),
-	ZOMBIE("Zombie", Enemies.ENEMY, EntityType.ZOMBIE),
-	WOLF("Wolf", Enemies.NEUTRAL, "", EntityType.WOLF),
-	CAVESPIDER("CaveSpider", Enemies.ENEMY, EntityType.CAVE_SPIDER),
-	ENDERMAN("Enderman", Enemies.ENEMY, "", EntityType.ENDERMAN),
-	SILVERFISH("Silverfish", Enemies.ENEMY, "", EntityType.SILVERFISH),
-	ENDERDRAGON("EnderDragon", Enemies.ENEMY, EntityType.ENDER_DRAGON),
-	VILLAGER("Villager", Enemies.FRIENDLY, EntityType.VILLAGER),
-	BLAZE("Blaze", Enemies.ENEMY, EntityType.BLAZE),
-	MUSHROOMCOW("MushroomCow", Enemies.FRIENDLY, EntityType.MUSHROOM_COW),
-	MAGMACUBE("MagmaCube", Enemies.ENEMY, EntityType.MAGMA_CUBE),
-	SNOWMAN("Snowman", Enemies.FRIENDLY, "", EntityType.SNOWMAN),
-	OCELOT("Ocelot", Enemies.NEUTRAL, EntityType.OCELOT),
-	IRONGOLEM("IronGolem", Enemies.NEUTRAL, EntityType.IRON_GOLEM),
-	WITHER("Wither", Enemies.ENEMY, EntityType.WITHER),
-	BAT("Bat", Enemies.FRIENDLY, EntityType.BAT),
-	WITCH("Witch", Enemies.ENEMY, EntityType.WITCH),
-	BOAT("Boat", Enemies.NEUTRAL, EntityType.BOAT),
-	MINECART("Minecart", Enemies.NEUTRAL, EntityType.MINECART),
-	MINECART_CHEST("ChestMinecart", Enemies.NEUTRAL, EntityType.MINECART_CHEST),
-	MINECART_FURNACE("FurnaceMinecart", Enemies.NEUTRAL, EntityType.MINECART_FURNACE),
-	MINECART_TNT("TNTMinecart", Enemies.NEUTRAL, EntityType.MINECART_TNT),
-	MINECART_HOPPER("HopperMinecart", Enemies.NEUTRAL, EntityType.MINECART_HOPPER),
-	MINECART_MOB_SPAWNER("SpawnerMinecart", Enemies.NEUTRAL, EntityType.MINECART_MOB_SPAWNER),
-	ENDERCRYSTAL("EnderCrystal", Enemies.NEUTRAL, EntityType.ENDER_CRYSTAL),
-	EXPERIENCEORB("ExperienceOrb", Enemies.NEUTRAL, EntityType.EXPERIENCE_ORB);
-	public static final Logger logger = Logger.getLogger("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"),
+    ;
 
-	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>();
-	private static final Map<EntityType, Mob> bukkitMap = new HashMap<EntityType, 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);
-			bukkitMap.put(mob.bukkitType, 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 Entity spawn(final World world, final Server server, final Location loc) throws MobException
-	{
-		final Entity entity = world.spawn(loc, (Class<? extends Entity>)this.bukkitType.getEntityClass());
-		if (entity == null)
-		{
-			logger.log(Level.WARNING, _("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 fromBukkitType(final EntityType type)
-	{
-		return bukkitMap.get(type);
-	}
+    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;
+    }
 }

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

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

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

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

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

@@ -1,151 +1,123 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.utils.FormatUtil;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
 import org.bukkit.Server;
-import org.bukkit.entity.Player;
+
+import java.util.*;
+
+import static com.earth2me.essentials.I18n.tl;
 
 
-public class PlayerList
-{
-	// Cosmetic list formatting
-	static public 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(_("listAfkTag"));
-			}
-			if (user.isHidden())
-			{
-				groupString.append(_("listHiddenTag"));
-			}
-			user.setDisplayNick();
-			groupString.append(user.getDisplayName());
-			groupString.append("\u00a7f");
-		}
-		return groupString.toString();
-	}
+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.
-	static public String listSummary(final IEssentials ess, final boolean showHidden)
-	{
-		Server server = ess.getServer();
-		int playerHidden = 0;
-		for (Player onlinePlayer : server.getOnlinePlayers())
-		{
-			if (ess.getUser(onlinePlayer).isHidden())
-			{
-				playerHidden++;
-			}
-		}
-		String online;
-		if (showHidden && playerHidden > 0)
-		{
-			online = _("listAmountHidden", server.getOnlinePlayers().length - playerHidden, playerHidden, server.getMaxPlayers());
-		}
-		else
-		{
-			online = _("listAmount", server.getOnlinePlayers().length - playerHidden, server.getMaxPlayers());
-		}
-		return online;
-	}
+    // 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.
-	static public Map<String, List<User>> getPlayerLists(final IEssentials ess, final boolean showHidden)
-	{
-		Server server = ess.getServer();
-		final Map<String, List<User>> playerList = new HashMap<String, List<User>>();
-		for (Player onlinePlayer : server.getOnlinePlayers())
-		{
-			final User onlineUser = ess.getUser(onlinePlayer);
-			if (onlineUser.isHidden() && !showHidden)
-			{
-				continue;
-			}
-			final String group = FormatUtil.stripFormat(FormatUtil.stripEssentialsFormat(onlineUser.getGroup().toLowerCase()));
-			List<User> list = playerList.get(group);
-			if (list == null)
-			{
-				list = new ArrayList<User>();
-				playerList.put(group, list);
-			}
-			list.add(onlineUser);
-		}
-		return playerList;
-	}
+    // 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
-	static public 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;
-	}
+    // 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>
-	static public 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(_("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, ", "));
-	}
+    // 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
-	static public String outputFormat(final String group, final String message)
-	{
-		final StringBuilder outputString = new StringBuilder();
-		outputString.append(_("listGroupTag", FormatUtil.replaceFormat(group)));
-		outputString.append(message);
-		return outputString.toString();
-	}
+    // Build the output string
+    public static String outputFormat(final String group, final String message) {
+        final StringBuilder outputString = new StringBuilder();
+        outputString.append(tl("listGroupTag", FormatUtil.replaceFormat(group)));
+        outputString.append(message);
+        return outputString.toString();
+    }
 }

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

@@ -5,18 +5,15 @@ import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
 
-public class PlayerTarget implements ITarget
-{
-	private final String name;
+public class PlayerTarget implements ITarget {
+    private final String name;
 
-	public PlayerTarget(Player entity)
-	{
-		this.name = entity.getName();
-	}
+    public PlayerTarget(Player entity) {
+        this.name = entity.getName();
+    }
 
-	@Override
-	public Location getLocation()
-	{
-		return Bukkit.getServer().getPlayerExact(name).getLocation();
-	}
+    @Override
+    public Location getLocation() {
+        return Bukkit.getServer().getPlayerExact(name).getLocation();
+    }
 }

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

@@ -1,147 +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;
-import org.bukkit.potion.PotionEffectType;
 
 
-public class Potions
-{
-	private static final Map<String, PotionEffectType> POTIONS = new HashMap<String, PotionEffectType>();
-	private static final Map<String, PotionEffectType> ALIASPOTIONS = new HashMap<String, PotionEffectType>();
+public class Potions {
+    private static final Map<String, PotionEffectType> POTIONS = new HashMap<String, PotionEffectType>();
+    private static final Map<String, PotionEffectType> ALIASPOTIONS = new HashMap<String, PotionEffectType>();
 
-	static
-	{
+    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("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("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("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("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("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("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("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("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("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("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("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("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("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("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("blindness", PotionEffectType.BLINDNESS);
+        ALIASPOTIONS.put("blind", PotionEffectType.BLINDNESS);
 
-		POTIONS.put("nightvision", PotionEffectType.NIGHT_VISION);
-		ALIASPOTIONS.put("vision", PotionEffectType.NIGHT_VISION);
+        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("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("weakness", PotionEffectType.WEAKNESS);
+        ALIASPOTIONS.put("weak", PotionEffectType.WEAKNESS);
 
-		POTIONS.put("poison", PotionEffectType.POISON);
-		ALIASPOTIONS.put("venom", PotionEffectType.POISON);
+        POTIONS.put("poison", PotionEffectType.POISON);
+        ALIASPOTIONS.put("venom", PotionEffectType.POISON);
 
-		POTIONS.put("wither", PotionEffectType.WITHER);
-		ALIASPOTIONS.put("decay", PotionEffectType.WITHER);
+        POTIONS.put("wither", PotionEffectType.WITHER);
+        ALIASPOTIONS.put("decay", PotionEffectType.WITHER);
 
+        POTIONS.put("healthboost", PotionEffectType.HEALTH_BOOST);
+        ALIASPOTIONS.put("boost", PotionEffectType.HEALTH_BOOST);
 
-		try // 1.6 update
-		{
-			POTIONS.put("healthboost", PotionEffectType.HEALTH_BOOST);
-			ALIASPOTIONS.put("boost", PotionEffectType.HEALTH_BOOST);
+        POTIONS.put("absorption", PotionEffectType.ABSORPTION);
+        ALIASPOTIONS.put("absorb", PotionEffectType.ABSORPTION);
 
-			POTIONS.put("absorption", PotionEffectType.ABSORPTION);
-			ALIASPOTIONS.put("absorb", PotionEffectType.ABSORPTION);
+        POTIONS.put("saturation", PotionEffectType.SATURATION);
+        ALIASPOTIONS.put("food", PotionEffectType.SATURATION);
 
-			POTIONS.put("saturation", PotionEffectType.SATURATION);
-			ALIASPOTIONS.put("food", PotionEffectType.SATURATION);
-		}
-		catch (java.lang.NoSuchFieldError e)
-		{
-			Essentials.wrongVersion();
-		}
-	}
+        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);
 
-	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;
-	}
+        // 1.9
+        try {
+            POTIONS.put("glowing", PotionEffectType.GLOWING);
+            ALIASPOTIONS.put("glow", PotionEffectType.GLOWING);
 
-	public static Set<Entry<String, PotionEffectType>> entrySet()
-	{
-		return POTIONS.entrySet();
-	}
+            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();
+    }
 }

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

@@ -1,14 +1,9 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Mob.MobException;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import com.earth2me.essentials.utils.LocationUtil;
 import com.earth2me.essentials.utils.StringUtil;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
 import net.ess3.api.IEssentials;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -18,291 +13,256 @@ import org.bukkit.entity.*;
 import org.bukkit.inventory.EntityEquipment;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.*;
 
-public class SpawnMob
-{
-	public static String mobList(final User user)
-	{
-		final Set<String> mobList = Mob.getMobList();
-		final Set<String> availableList = new HashSet<String>();
-		for (String mob : mobList)
-		{
-			if (user.isAuthorized("essentials.spawnmob." + mob.toLowerCase(Locale.ENGLISH)))
-			{
-				availableList.add(mob);
-			}
-		}
-		if (availableList.isEmpty())
-		{
-			availableList.add(_("none"));
-		}
-		return StringUtil.joinList(availableList);
-	}
+import static com.earth2me.essentials.I18n.tl;
 
-	public static List<String> mobParts(final String mobString)
-	{
-		String[] mobParts = mobString.split(",");
 
-		List<String> mobs = new ArrayList<String>();
+public class SpawnMob {
+    public static String mobList(final User user) {
+        final Set<String> mobList = Mob.getMobList();
+        final Set<String> availableList = new HashSet<String>();
+        for (String mob : mobList) {
+            if (user.isAuthorized("essentials.spawnmob." + mob.toLowerCase(Locale.ENGLISH))) {
+                availableList.add(mob);
+            }
+        }
+        if (availableList.isEmpty()) {
+            availableList.add(tl("none"));
+        }
+        return StringUtil.joinList(availableList);
+    }
 
-		for (String mobPart : mobParts)
-		{
-			String[] mobDatas = mobPart.split(":");
-			mobs.add(mobDatas[0]);
-		}
-		return mobs;
-	}
+    public static List<String> mobParts(final String mobString) {
+        String[] mobParts = mobString.split(",");
 
-	public static List<String> mobData(final String mobString)
-	{
-		String[] mobParts = mobString.split(",");
+        List<String> mobs = new ArrayList<String>();
 
-		List<String> mobData = new ArrayList<String>();
+        for (String mobPart : mobParts) {
+            String[] mobDatas = mobPart.split(":");
+            mobs.add(mobDatas[0]);
+        }
+        return mobs;
+    }
 
-		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]);
-			}
-		}
+    public static List<String> mobData(final String mobString) {
+        String[] mobParts = mobString.split(",");
 
-		return mobData;
-	}
+        List<String> mobData = new ArrayList<String>();
 
-	// 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(_("unableToSpawnMob"));
-		}
-		spawnmob(ess, server, user.getSource(), user, block.getLocation(), parts, 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 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);
-	}
+        return mobData;
+    }
 
-	// 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);
+    // 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);
+    }
 
-		for (int i = 0; i < parts.size(); i++)
-		{
-			Mob mob = Mob.fromName(parts.get(i));
-			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);
+    }
 
-		final int serverLimit = ess.getSettings().getSpawnMobLimit();
-		int effectiveLimit = serverLimit / parts.size();
+    // 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);
 
-		if (effectiveLimit < 1)
-		{
-			effectiveLimit = 1;
-			while (parts.size() > serverLimit)
-			{
-				parts.remove(serverLimit);
-			}
-		}
+        for (int i = 0; i < parts.size(); i++) {
+            Mob mob = Mob.fromName(parts.get(i));
+            checkSpawnable(ess, sender, mob);
+        }
 
-		if (mobCount > effectiveLimit)
-		{
-			mobCount = effectiveLimit;
-			sender.sendMessage(_("mobSpawnLimit"));
-		}
+        final int serverLimit = ess.getSettings().getSpawnMobLimit();
+        int effectiveLimit = serverLimit / parts.size();
 
-		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 + " " + _("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);
-		}
-	}
+        if (effectiveLimit < 1) {
+            effectiveLimit = 1;
+            while (parts.size() > serverLimit) {
+                parts.remove(serverLimit);
+            }
+        }
 
-	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 (mobCount > effectiveLimit) {
+            mobCount = effectiveLimit;
+            sender.sendMessage(tl("mobSpawnLimit"));
+        }
 
-		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);
+        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 (data.get(i) != null)
-				{
-					changeMobData(sender, mob.getType(), spawnedMob, data.get(i).toLowerCase(Locale.ENGLISH), target);
-				}
-			}
+    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;
 
-			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);
+        for (int i = 0; i < parts.size(); i++) {
+            if (i == 0) {
+                mob = Mob.fromName(parts.get(i));
+                spawnedMob = mob.spawn(sloc.getWorld(), server, sloc);
+                defaultMobData(mob.getType(), spawnedMob);
 
-				if (data.get(next) != null)
-				{
-					changeMobData(sender, mMob.getType(), spawnedMount, data.get(next).toLowerCase(Locale.ENGLISH), target);
-				}
+                if (data.get(i) != null) {
+                    changeMobData(sender, mob.getType(), spawnedMob, data.get(i).toLowerCase(Locale.ENGLISH), target);
+                }
+            }
 
-				spawnedMob.setPassenger(spawnedMount);
+            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);
 
-				spawnedMob = spawnedMount;
-			}
-		}
-	}
+                if (data.get(next) != null) {
+                    changeMobData(sender, mMob.getType(), spawnedMount, data.get(next).toLowerCase(Locale.ENGLISH), target);
+                }
 
-	private static void checkSpawnable(IEssentials ess, CommandSource sender, Mob mob) throws Exception
-	{
-		if (mob == null)
-		{
-			throw new Exception(_("invalidMob"));
-		}
+                spawnedMob.setPassenger(spawnedMount);
 
-		if (ess.getSettings().getProtectPreventSpawn(mob.getType().toString().toLowerCase(Locale.ENGLISH)))
-		{
-			throw new Exception(_("disabledToSpawnMob"));
-		}
+                spawnedMob = spawnedMount;
+            }
+        }
+    }
 
-		if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.spawnmob." + mob.name.toLowerCase(Locale.ENGLISH)))
-		{
-			throw new Exception(_("noPermToSpawnMob"));
-		}
-	}
+    private static void checkSpawnable(IEssentials ess, CommandSource sender, Mob mob) throws Exception {
+        if (mob == null || mob.getType() == null) {
+            throw new Exception(tl("invalidMob"));
+        }
 
-	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 (ess.getSettings().getProtectPreventSpawn(mob.getType().toString().toLowerCase(Locale.ENGLISH))) {
+            throw new Exception(tl("disabledToSpawnMob"));
+        }
 
-		if (data.isEmpty())
-		{
-			sender.sendMessage(_("mobDataList", StringUtil.joinList(MobData.getValidHelp(spawned))));
-		}
+        if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.spawnmob." + mob.name.toLowerCase(Locale.ENGLISH))) {
+            throw new Exception(tl("noPermToSpawnMob"));
+        }
+    }
 
-		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 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 || type == EntityType.SKELETON)
-		{
-			if (inputData.contains("armor") || inputData.contains("armour"))
-			{
-				final EntityEquipment invent = ((LivingEntity)spawned).getEquipment();
-				if (inputData.contains("diamond"))
-				{
-					invent.setBoots(new ItemStack(Material.DIAMOND_BOOTS, 1));
-					invent.setLeggings(new ItemStack(Material.DIAMOND_LEGGINGS, 1));
-					invent.setChestplate(new ItemStack(Material.DIAMOND_CHESTPLATE, 1));
-					invent.setHelmet(new ItemStack(Material.DIAMOND_HELMET, 1));
-				}
-				else if (inputData.contains("gold"))
-				{
-					invent.setBoots(new ItemStack(Material.GOLD_BOOTS, 1));
-					invent.setLeggings(new ItemStack(Material.GOLD_LEGGINGS, 1));
-					invent.setChestplate(new ItemStack(Material.GOLD_CHESTPLATE, 1));
-					invent.setHelmet(new ItemStack(Material.GOLD_HELMET, 1));
-				}
-				else if (inputData.contains("leather"))
-				{
-					invent.setBoots(new ItemStack(Material.LEATHER_BOOTS, 1));
-					invent.setLeggings(new ItemStack(Material.LEATHER_LEGGINGS, 1));
-					invent.setChestplate(new ItemStack(Material.LEATHER_CHESTPLATE, 1));
-					invent.setHelmet(new ItemStack(Material.LEATHER_HELMET, 1));
-				}
-				else if (inputData.contains("no"))
-				{
-					invent.clear();
-				}
-				else
-				{
-					invent.setBoots(new ItemStack(Material.IRON_BOOTS, 1));
-					invent.setLeggings(new ItemStack(Material.IRON_LEGGINGS, 1));
-					invent.setChestplate(new ItemStack(Material.IRON_CHESTPLATE, 1));
-					invent.setHelmet(new ItemStack(Material.IRON_HELMET, 1));
-				}
-				invent.setBootsDropChance(0f);
-				invent.setLeggingsDropChance(0f);
-				invent.setChestplateDropChance(0f);
-				invent.setHelmetDropChance(0f);
-			}
+        if (data.isEmpty()) {
+            sender.sendMessage(tl("mobDataList", StringUtil.joinList(MobData.getValidHelp(spawned))));
+        }
 
-		}
-	}
+        if (spawned instanceof Zombie) {
+            ((Zombie) spawned).setBaby(false);
+        } else if (spawned instanceof Ageable) {
+            ((Ageable) spawned).setAdult();
+        }
 
-	private static void defaultMobData(final EntityType type, final Entity spawned)
-	{
-		if (type == EntityType.SKELETON)
-		{
-			final EntityEquipment invent = ((LivingEntity)spawned).getEquipment();
-			invent.setItemInHand(new ItemStack(Material.BOW, 1));
-			invent.setItemInHandDropChance(0.1f);
+        if (spawned instanceof Zombie || type == EntityType.SKELETON) {
+            if (inputData.contains("armor") || inputData.contains("armour")) {
+                final EntityEquipment invent = ((LivingEntity) spawned).getEquipment();
+                if (inputData.contains("noarmor") || inputData.contains("noarmour")) {
+                    invent.clear();
+                } else if (inputData.contains("diamond")) {
+                    invent.setBoots(new ItemStack(Material.DIAMOND_BOOTS, 1));
+                    invent.setLeggings(new ItemStack(Material.DIAMOND_LEGGINGS, 1));
+                    invent.setChestplate(new ItemStack(Material.DIAMOND_CHESTPLATE, 1));
+                    invent.setHelmet(new ItemStack(Material.DIAMOND_HELMET, 1));
+                } else if (inputData.contains("gold")) {
+                    invent.setBoots(new ItemStack(Material.GOLD_BOOTS, 1));
+                    invent.setLeggings(new ItemStack(Material.GOLD_LEGGINGS, 1));
+                    invent.setChestplate(new ItemStack(Material.GOLD_CHESTPLATE, 1));
+                    invent.setHelmet(new ItemStack(Material.GOLD_HELMET, 1));
+                } else if (inputData.contains("leather")) {
+                    invent.setBoots(new ItemStack(Material.LEATHER_BOOTS, 1));
+                    invent.setLeggings(new ItemStack(Material.LEATHER_LEGGINGS, 1));
+                    invent.setChestplate(new ItemStack(Material.LEATHER_CHESTPLATE, 1));
+                    invent.setHelmet(new ItemStack(Material.LEATHER_HELMET, 1));
+                } else {
+                    invent.setBoots(new ItemStack(Material.IRON_BOOTS, 1));
+                    invent.setLeggings(new ItemStack(Material.IRON_LEGGINGS, 1));
+                    invent.setChestplate(new ItemStack(Material.IRON_CHESTPLATE, 1));
+                    invent.setHelmet(new ItemStack(Material.IRON_HELMET, 1));
+                }
+                invent.setBootsDropChance(0f);
+                invent.setLeggingsDropChance(0f);
+                invent.setChestplateDropChance(0f);
+                invent.setHelmetDropChance(0f);
+            }
 
-			invent.setBoots(new ItemStack(Material.GOLD_BOOTS, 1));
-			invent.setBootsDropChance(0.0f);
-		}
+        }
 
-		if (type == EntityType.PIG_ZOMBIE)
-		{
-			final EntityEquipment invent = ((LivingEntity)spawned).getEquipment();
-			invent.setItemInHand(new ItemStack(Material.GOLD_SWORD, 1));
-			invent.setItemInHandDropChance(0.1f);
+        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);
+        }
+    }
 
-			invent.setBoots(new ItemStack(Material.GOLD_BOOTS, 1));
-			invent.setBootsDropChance(0.0f);
-		}
+    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);
 
-		if (type == EntityType.ZOMBIE)
-		{
-			final EntityEquipment invent = ((LivingEntity)spawned).getEquipment();
-			invent.setBoots(new ItemStack(Material.GOLD_BOOTS, 1));
-			invent.setBootsDropChance(0.0f);
-		}
+            invent.setBoots(new ItemStack(Material.GOLD_BOOTS, 1));
+            invent.setBootsDropChance(0.0f);
+        }
 
-		if (type == EntityType.HORSE)
-		{
-			((Horse)spawned).setJumpStrength(1.2);
-		}
-	}
+        if (type == EntityType.PIG_ZOMBIE) {
+            final PigZombie zombie = ((PigZombie) spawned);
+            setVillager(zombie, false);
+
+            final EntityEquipment invent = zombie.getEquipment();
+            InventoryWorkaround.setItemInMainHand(invent, new ItemStack(Material.GOLD_SWORD, 1));
+            InventoryWorkaround.setItemInMainHandDropChance(invent, 0.1f);
+
+            invent.setBoots(new ItemStack(Material.GOLD_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(Material.GOLD_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) {
+        }
+    }
 }

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

@@ -8,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;
+    }
 }

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

@@ -1,10 +1,7 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.utils.DateUtil;
 import com.earth2me.essentials.utils.LocationUtil;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
 import org.bukkit.Location;
@@ -12,233 +9,280 @@ 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 net.ess3.api.ITeleport
-{
-	private final IUser teleportOwner;
-	private final IEssentials ess;
-	private TimedTeleport timedTeleport;
+import static com.earth2me.essentials.I18n.tl;
 
-	public Teleport(IUser user, IEssentials ess)
-	{
-		this.teleportOwner = user;
-		this.ess = ess;
-	}
 
-	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();
+public class Teleport implements net.ess3.api.ITeleport {
+    private final IUser teleportOwner;
+    private final IEssentials ess;
+    private TimedTeleport timedTeleport;
 
-			// When was the last teleportPlayer used?
-			final Long lastTime = teleportOwner.getLastTeleportTimestamp();
+    private TeleportType tpType;
 
-			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 && !teleportOwner.isAuthorized("essentials.teleport.cooldown.bypass"))
-			{
-				time.setTimeInMillis(lastTime);
-				time.add(Calendar.SECOND, (int)cooldown);
-				time.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
-				throw new Exception(_("timeBeforeTeleport", DateUtil.formatDateDiff(time.getTimeInMillis())));
-			}
-		}
-		// if justCheck is set, don't update lastTeleport; we're just checking
-		if (!check)
-		{
-			teleportOwner.setLastTeleportTimestamp(time.getTimeInMillis());
-		}
-	}
+    public Teleport(IUser user, IEssentials ess) {
+        this.teleportOwner = user;
+        this.ess = ess;
+        tpType = TeleportType.NORMAL;
+    }
 
-	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", DateUtil.formatDateDiff(c.getTimeInMillis())));
-	}
+    public enum TeleportType {
+        TPA,
+        BACK,
+        NORMAL
+    }
 
-	//The now function is used when you want to skip tp delay when teleporting someone to a location or player.
-	@Override
-	public void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception
-	{
-		if (cooldown)
-		{
-			cooldown(false);
-		}
-		now(teleportOwner, new LocationTarget(loc), 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();
 
-	@Override
-	public void now(Player entity, boolean cooldown, TeleportCause cause) throws Exception
-	{
-		if (cooldown)
-		{
-			cooldown(false);
-		}
-		now(teleportOwner, new PlayerTarget(entity), cause);
-	}
+            // When was the last teleportPlayer used?
+            final Long lastTime = teleportOwner.getLastTeleportTimestamp();
 
-	protected void now(IUser teleportee, ITarget target, TeleportCause cause) throws Exception
-	{
-		cancel(false);
-		teleportee.setLastLocation();
-		teleportee.getBase().teleport(LocationUtil.getSafeDestination(teleportee, target.getLocation()), cause);
-	}
+            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());
+        }
+    }
 
-	//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);
-	}
+    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;
+    }
 
-	@Override
-	public void teleport(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		teleport(teleportOwner, new LocationTarget(loc), chargeFor, cause);
-	}
+    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())));
+    }
 
-	@Override
-	public void teleport(Player entity, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		teleport(teleportOwner, new PlayerTarget(entity), chargeFor, cause);
-	}
+    //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);
+    }
 
-	@Override
-	public void teleportPlayer(IUser teleportee, Location loc, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		teleport(teleportee, new LocationTarget(loc), chargeFor, cause);
-	}
+    @Override
+    public void now(Player entity, boolean cooldown, TeleportCause cause) throws Exception {
+        if (cooldown) {
+            cooldown(false);
+        }
+        final ITarget target = new PlayerTarget(entity);
+        now(teleportOwner, target, cause);
+        teleportOwner.sendMessage(tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ()));
+    }
 
-	@Override
-	public void teleportPlayer(IUser teleportee, Player entity, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		teleport(teleportee, new PlayerTarget(entity), chargeFor, cause);
-	}
+    protected void now(IUser teleportee, ITarget target, TeleportCause cause) throws Exception {
+        cancel(false);
+        teleportee.setLastLocation();
+        Location loc = target.getLocation();
 
-	private void teleport(IUser teleportee, ITarget target, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		double delay = ess.getSettings().getTeleportDelay();
+        if (LocationUtil.isBlockUnsafeForUser(teleportee, loc.getWorld(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())) {
+            if (ess.getSettings().isTeleportSafetyEnabled()) {
+                if (ess.getSettings().isForceDisableTeleportSafety()) {
+                    teleportee.getBase().teleport(loc, cause);
+                } else {
+                    teleportee.getBase().teleport(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()) {
+                teleportee.getBase().teleport(loc, cause);
+            } else {
+                if (ess.getSettings().isTeleportToCenterLocation()) {
+                    loc = LocationUtil.getRoundedDestination(loc);
+                }
+                teleportee.getBase().teleport(loc, cause);
+            }
+        }
+    }
 
-		if (chargeFor != null)
-		{
-			chargeFor.isAffordableFor(teleportOwner);
-		}
-		cooldown(true);
-		if (delay <= 0 || teleportOwner.isAuthorized("essentials.teleport.timer.bypass")
-			|| teleportee.isAuthorized("essentials.teleport.timer.bypass"))
-		{
-			cooldown(false);
-			now(teleportee, target, cause);
-			if (chargeFor != null)
-			{
-				chargeFor.charge(teleportOwner);
-			}
-			return;
-		}
+    //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);
+    }
 
-		cancel(false);
-		warnUser(teleportee, delay);
-		initTimer((long)(delay * 1000.0), teleportee, target, chargeFor, cause, false);
-	}
+    @Override
+    public void teleport(Location loc, Trade chargeFor, TeleportCause cause) throws Exception {
+        teleport(teleportOwner, new LocationTarget(loc), chargeFor, cause);
+    }
 
-	//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;
-		}
+    //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);
+    }
 
-		cancel(false);
-		warnUser(teleportOwner, delay);
-		initTimer((long)(delay * 1000.0), teleportOwner, null, chargeFor, cause, true);
-	}
+    //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);
+    }
 
-	protected void respawnNow(IUser teleportee, TeleportCause cause) throws Exception
-	{
-		final Player player = teleportee.getBase();
-		Location bed = player.getBedSpawnLocation();
-		if (bed != null)
-		{
-			now(teleportee, new LocationTarget(bed), cause);
-		}
-		else
-		{
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().info("Could not find bed spawn, forcing respawn event.");
-			}
-			final PlayerRespawnEvent pre = new PlayerRespawnEvent(player, player.getWorld().getSpawnLocation(), false);
-			ess.getServer().getPluginManager().callEvent(pre);
-			now(teleportee, new LocationTarget(pre.getRespawnLocation()), cause);
-		}
-	}
+    //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 warp function is a wrapper used to teleportPlayer a player to a /warp
-	@Override
-	public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		Location loc = ess.getWarps().getWarp(warp);
-		teleportee.sendMessage(_("warpingTo", warp));
-		teleport(teleportee, new LocationTarget(loc), chargeFor, cause);
-	}
+    private void teleport(IUser teleportee, ITarget target, Trade chargeFor, TeleportCause cause) throws Exception {
+        double delay = ess.getSettings().getTeleportDelay();
 
-	//The back function is a wrapper used to teleportPlayer a player /back to their previous location.
-	@Override
-	public void back(Trade chargeFor) throws Exception
-	{
-		teleport(teleportOwner, new LocationTarget(teleportOwner.getLastLocation()), chargeFor, TeleportCause.COMMAND);
-	}
+        Trade cashCharge = chargeFor;
 
-	//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);
-	}
+        if (chargeFor != null) {
+            chargeFor.isAffordableFor(teleportOwner);
 
-	//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 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);
+            }
+        }
 
-	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);
-	}
+        cooldown(true);
+        if (delay <= 0 || teleportOwner.isAuthorized("essentials.teleport.timer.bypass") || teleportee.isAuthorized("essentials.teleport.timer.bypass")) {
+            cooldown(false);
+            now(teleportee, target, cause);
+            if (cashCharge != null) {
+                cashCharge.charge(teleportOwner);
+            }
+            return;
+        }
+
+        cancel(false);
+        warnUser(teleportee, delay);
+        initTimer((long) (delay * 1000.0), teleportee, target, cashCharge, cause, false);
+    }
+
+    //The respawn function is a wrapper used to handle tp fallback, on /jail and /home
+    @Override
+    public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception {
+        double delay = ess.getSettings().getTeleportDelay();
+        if (chargeFor != null) {
+            chargeFor.isAffordableFor(teleportOwner);
+        }
+        cooldown(true);
+        if (delay <= 0 || teleportOwner.isAuthorized("essentials.teleport.timer.bypass")) {
+            cooldown(false);
+            respawnNow(teleportOwner, cause);
+            if (chargeFor != null) {
+                chargeFor.charge(teleportOwner);
+            }
+            return;
+        }
+
+        cancel(false);
+        warnUser(teleportOwner, delay);
+        initTimer((long) (delay * 1000.0), teleportOwner, null, chargeFor, cause, true);
+    }
+
+    protected void respawnNow(IUser teleportee, TeleportCause cause) throws Exception {
+        final Player player = teleportee.getBase();
+        Location bed = player.getBedSpawnLocation();
+        if (bed != null) {
+            now(teleportee, new LocationTarget(bed), cause);
+        } else {
+            if (ess.getSettings().isDebug()) {
+                ess.getLogger().info("Could not find bed spawn, forcing respawn event.");
+            }
+            final PlayerRespawnEvent pre = new PlayerRespawnEvent(player, player.getWorld().getSpawnLocation(), false);
+            ess.getServer().getPluginManager().callEvent(pre);
+            now(teleportee, new LocationTarget(pre.getRespawnLocation()), cause);
+        }
+    }
+
+    //The warp function is a wrapper used to teleportPlayer a player to a /warp
+    @Override
+    public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception {
+        Location loc = ess.getWarps().getWarp(warp);
+        teleportee.sendMessage(tl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+        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 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);
+    }
+
+    //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);
+    }
+
+    public void setTpType(TeleportType tpType) {
+        this.tpType = tpType;
+    }
+
+    //If we need to cancelTimer a pending teleportPlayer call this method
+    private void cancel(boolean notifyUser) {
+        if (timedTeleport != null) {
+            timedTeleport.cancelTimer(notifyUser);
+            timedTeleport = null;
+        }
+    }
+
+    private void initTimer(long delay, IUser teleportUser, ITarget target, Trade chargeFor, TeleportCause cause, boolean respawn) {
+        timedTeleport = new TimedTeleport(teleportOwner, ess, this, delay, teleportUser, target, chargeFor, cause, respawn);
+    }
 }

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

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

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

@@ -1,8 +1,15 @@
 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;
@@ -13,438 +20,340 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
-import 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 BigDecimal money;
-	private final transient ItemStack itemStack;
-	private final transient Integer exp;
-	private final transient com.earth2me.essentials.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 enum TradeType
-	{
-		MONEY,
-		EXP,
-		ITEM
-	}
+    public enum TradeType {
+        MONEY,
+        EXP,
+        ITEM
+    }
 
 
-	public enum OverflowType
-	{
-		ABORT,
-		DROP,
-		RETURN
-	}
+    public enum OverflowType {
+        ABORT,
+        DROP,
+        RETURN
+    }
 
-	public Trade(final String command, final IEssentials ess)
-	{
-		this(command, null, null, null, null, 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 Trade(final String command, final Trade fallback, final IEssentials ess) {
+        this(command, fallback, null, null, null, ess);
+    }
 
-	@Deprecated
-	public Trade(final double money, final com.earth2me.essentials.IEssentials ess)
-	{
-		this(null, null, BigDecimal.valueOf(money), null, null, ess);
-	}
+    @Deprecated
+    public Trade(final double money, final com.earth2me.essentials.IEssentials ess) {
+        this(null, null, BigDecimal.valueOf(money), null, null, (IEssentials) ess);
+    }
 
-	public Trade(final BigDecimal money, final IEssentials ess)
-	{
-		this(null, null, money, null, null, ess);
-	}
+    public Trade(final BigDecimal money, final IEssentials ess) {
+        this(null, null, money, null, null, ess);
+    }
 
-	public Trade(final ItemStack items, final IEssentials ess)
-	{
-		this(null, null, null, items, null, ess);
-	}
+    public Trade(final ItemStack items, final IEssentials ess) {
+        this(null, null, null, items, null, ess);
+    }
 
-	public Trade(final int exp, final IEssentials ess)
-	{
-		this(null, null, null, null, exp, ess);
-	}
+    public Trade(final int exp, final IEssentials ess) {
+        this(null, null, null, null, exp, ess);
+    }
 
-	private Trade(final String command, final Trade fallback, final BigDecimal money, final ItemStack item, final Integer exp, final com.earth2me.essentials.IEssentials ess)
-	{
-		this.command = command;
-		this.fallbackTrade = fallback;
-		this.money = money;
-		this.itemStack = item;
-		this.exp = exp;
-		this.ess = ess;
-	}
+    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;
+    }
 
-	public void isAffordableFor(final IUser user) throws ChargeException
-	{
+    public void isAffordableFor(final IUser user) throws ChargeException {
 
-		if (ess.getSettings().isDebug())
-		{
-			ess.getLogger().log(Level.INFO, "checking if " + user.getName() + " can afford charge.");
-		}
+        if (ess.getSettings().isDebug()) {
+            ess.getLogger().log(Level.INFO, "checking if " + user.getName() + " can afford charge.");
+        }
 
-		if (getMoney() != null
-			&& getMoney().signum() > 0
-			&& !user.canAfford(getMoney()))
-		{
-			throw new ChargeException(_("notEnoughMoney"));
-		}
+        if (getMoney() != null && getMoney().signum() > 0 && !user.canAfford(getMoney())) {
+            throw new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(getMoney(), ess)));
+        }
 
-		if (getItemStack() != null
-			&& !user.getBase().getInventory().containsAtLeast(itemStack, itemStack.getAmount()))
-		{
-			throw new ChargeException(_("missingItems", getItemStack().getAmount(), ess.getItemDb().name(getItemStack())));
-		}
+        if (getItemStack() != null && !user.getBase().getInventory().containsAtLeast(itemStack, itemStack.getAmount())) {
+            throw new ChargeException(tl("missingItems", getItemStack().getAmount(), ess.getItemDb().name(getItemStack())));
+        }
 
-		BigDecimal money;
-		if (command != null && !command.isEmpty()
-			&& (money = getCommandCost(user)).signum() > 0
-			&& !user.canAfford(money))
-		{
-			throw new ChargeException(_("notEnoughMoney"));
-		}
+        BigDecimal money;
+        if (command != null && !command.isEmpty() && (money = getCommandCost(user)).signum() > 0 && !user.canAfford(money)) {
+            throw new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(money, ess)));
+        }
 
-		if (exp != null && exp > 0
-			&& SetExpFix.getTotalExperience(user.getBase()) < exp)
-		{
-			throw new ChargeException(_("notEnoughExperience"));
-		}
-	}
+        if (exp != null && exp > 0 && SetExpFix.getTotalExperience(user.getBase()) < exp) {
+            throw new ChargeException(tl("notEnoughExperience"));
+        }
+    }
 
-	public boolean pay(final IUser user)
-	{
-		return pay(user, OverflowType.ABORT) == null;
-	}
+    public boolean pay(final IUser user) throws MaxMoneyException {
+        return pay(user, OverflowType.ABORT) == null;
+    }
 
-	public Map<Integer, ItemStack> pay(final IUser user, final OverflowType type)
-	{
-		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 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());
 
-			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 (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 ");
+                        }
 
-					return overFlow;
+                        return overFlow;
 
-				case RETURN:
-					// Pay the user the items, and return overflow
-					final Map<Integer, ItemStack> returnStack = InventoryWorkaround.addItems(user.getBase().getInventory(), getItemStack());
-					user.getBase().updateInventory();
+                    case RETURN:
+                        // Pay the user the items, and return overflow
+                        final Map<Integer, ItemStack> returnStack = InventoryWorkaround.addItems(user.getBase().getInventory(), getItemStack());
+                        user.getBase().updateInventory();
 
-					if (ess.getSettings().isDebug())
-					{
-						ess.getLogger().log(Level.INFO, "paying " + user.getName() + " partial itemstack " + getItemStack().toString() + " with overflow " + returnStack.get(0).toString());
-					}
+                        if (ess.getSettings().isDebug()) {
+                            ess.getLogger().log(Level.INFO, "paying " + user.getName() + " partial itemstack " + getItemStack().toString() + " with overflow " + returnStack.get(0).toString());
+                        }
 
-					return returnStack;
+                        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;
-	}
+                    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(_("notEnoughMoney"));
-			}
-			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(_("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(_("notEnoughMoney"));
-			}
-			user.takeMoney(cost);
-		}
-		if (getExperience() != null)
-		{
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().log(Level.INFO, "charging user " + user.getName() + " exp " + getExperience());
-			}
-			final int experience = SetExpFix.getTotalExperience(user.getBase());
-			if (experience < getExperience() && getExperience() > 0)
-			{
-				throw new ChargeException(_("notEnoughExperience"));
-			}
-			SetExpFix.setTotalExperience(user.getBase(), experience - getExperience());
-		}
-		if (ess.getSettings().isDebug())
-		{
-			ess.getLogger().log(Level.INFO, "charge user " + user.getName() + " completed");
-		}
-	}
+    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 BigDecimal getMoney() {
+        return money;
+    }
 
-	public ItemStack getItemStack()
-	{
-		return itemStack;
-	}
+    public ItemStack getItemStack() {
+        return itemStack;
+    }
 
-	public Integer getExperience()
-	{
-		return exp;
-	}
+    public Integer getExperience() {
+        return exp;
+    }
 
-	public TradeType getType()
-	{
-		if (getExperience() != null)
-		{
-			return TradeType.EXP;
-		}
+    public TradeType getType() {
+        if (getExperience() != null) {
+            return TradeType.EXP;
+        }
 
-		if (getItemStack() != null)
-		{
-			return TradeType.ITEM;
-		}
+        if (getItemStack() != null) {
+            return TradeType.ITEM;
+        }
 
-		return TradeType.MONEY;
-	}
+        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);
-			}
+    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;
+            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;
+    }
 
-	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.
+    private static FileWriter fw = null;
 
-		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);
-		}
-	}
+    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.
 
-	public static void closeLog()
-	{
-		if (fw != null)
-		{
-			try
-			{
-				fw.close();
-			}
-			catch (IOException ex)
-			{
-				Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
-			}
-			fw = null;
-		}
-	}
+        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;
+        }
+    }
 }

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

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

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

@@ -1,145 +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;
-	private final transient ConcurrentSkipListSet<String> keys = new ConcurrentSkipListSet<String>();
 
-	public UserMap(final IEssentials ess)
-	{
-		super();
-		this.ess = ess;
-		users = CacheBuilder.newBuilder().maximumSize(ess.getSettings().getMaxUserCacheCount()).softValues().build(this);		
-		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.runTaskAsynchronously(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(StringUtil.sanitizeFileName(name));
-				}
-			}
-		});
-	}
+    private final transient Cache<String, User> users;
+    private static boolean legacy = false;
 
-	public boolean userExists(final String name)
-	{
-		return keys.contains(StringUtil.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 = StringUtil.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(StringUtil.sanitizeFileName(name));
-		users.invalidate(StringUtil.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(StringUtil.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;
+    }
 }

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

@@ -1,180 +1,149 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.commands.WarpNotFoundException;
 import com.earth2me.essentials.utils.StringUtil;
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import net.ess3.api.InvalidNameException;
 import net.ess3.api.InvalidWorldException;
 import org.bukkit.Location;
 import org.bukkit.Server;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
-public class Warps implements IConf, net.ess3.api.IWarps
-{
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	private final Map<StringIgnoreCase, EssentialsConf> warpPoints = new HashMap<StringIgnoreCase, EssentialsConf>();
-	private final File warpsFolder;
-	private final Server server;
+import static com.earth2me.essentials.I18n.tl;
 
-	public Warps(Server server, File dataFolder)
-	{
-		this.server = server;
-		warpsFolder = new File(dataFolder, "warps");
-		if (!warpsFolder.exists())
-		{
-			warpsFolder.mkdirs();
-		}
-		reloadConfig();
-	}
 
-	@Override
-	public boolean isEmpty()
-	{
-		return warpPoints.isEmpty();
-	}
+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;
 
-	@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 Warps(Server server, File dataFolder) {
+        this.server = server;
+        warpsFolder = new File(dataFolder, "warps");
+        if (!warpsFolder.exists()) {
+            warpsFolder.mkdirs();
+        }
+        reloadConfig();
+    }
 
-	@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);
-	}
+    @Override
+    public boolean isEmpty() {
+        return warpPoints.isEmpty();
+    }
 
-	@Override
-	public void setWarp(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(_("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 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;
+    }
 
-	@Override
-	public void removeWarp(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 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);
+    }
 
-	@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);
-					}
-				}
-			}
-		}
-	}
+    @Override
+    public void setWarp(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);
+        try {
+            conf.saveWithError();
+        } catch (IOException ex) {
+            throw new IOException(tl("invalidWarpName"));
+        }
+    }
 
-	//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 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));
+    }
 
-	@Override
-	public int getCount()
-	{
-		return getList().size();
-	}
+    @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);
+                    }
+                }
+            }
+        }
+    }
 
-	private static class StringIgnoreCase
-	{
-		private final String string;
+    //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.");
+    }
 
-		public StringIgnoreCase(String string)
-		{
-			this.string = string;
-		}
+    @Override
+    public int getCount() {
+        return getList().size();
+    }
 
-		@Override
-		public int hashCode()
-		{
-			return getString().toLowerCase(Locale.ENGLISH).hashCode();
-		}
+    private static class StringIgnoreCase {
+        private final String string;
 
-		@Override
-		public boolean equals(Object o)
-		{
-			if (o instanceof StringIgnoreCase)
-			{
-				return getString().equalsIgnoreCase(((StringIgnoreCase)o).getString());
-			}
-			return false;
-		}
+        public StringIgnoreCase(String string) {
+            this.string = string;
+        }
 
-		public String getString()
-		{
-			return string;
-		}
-	}
+        @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;
+        }
+
+        public String getString() {
+            return string;
+        }
+    }
 }

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

@@ -1,152 +1,141 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.commands.NotEnoughArgumentsException;
+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;
-import java.util.logging.Logger;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
+
+import static com.earth2me.essentials.I18n.tl;
 
 
-public class Worth implements IConf
-{
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	private final EssentialsConf config;
+public class Worth implements IConf {
+    private final EssentialsConf config;
 
-	public Worth(File dataFolder)
-	{
-		config = new EssentialsConf(new File(dataFolder, "worth.yml"));
-		config.setTemplateName("/worth.yml");
-		config.load();
-	}
+    public Worth(File dataFolder) {
+        config = new EssentialsConf(new File(dataFolder, "worth.yml"));
+        config.setTemplateName("/worth.yml");
+        config.load();
+    }
 
-	public BigDecimal getPrice(ItemStack itemStack)
-	{
-		String itemname = itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
-		BigDecimal result;
-		result = config.getBigDecimal("worth." + itemname + "." + itemStack.getDurability(), BigDecimal.ONE.negate());
-		if (result.signum() < 0)
-		{
-			result = config.getBigDecimal("worth." + itemname + ".0", BigDecimal.ONE.negate());
-		}
-		if (result.signum() < 0)
-		{
-			result = config.getBigDecimal("worth." + itemname, BigDecimal.ONE.negate());
-		}
-		if (result.signum() < 0)
-		{
-			result = config.getBigDecimal("worth." + itemStack.getTypeId() + "." + itemStack.getDurability(), BigDecimal.ONE.negate());
-		}		
-		if (result.signum() < 0)
-		{
-			result = config.getBigDecimal("worth." + itemStack.getTypeId() + ".0", BigDecimal.ONE.negate());
-		}
-		if (result.signum() < 0)
-		{
-			result = config.getBigDecimal("worth." + itemStack.getTypeId(), BigDecimal.ONE.negate());
-		}		
-		if (result.signum() < 0)
-		{
-			result = config.getBigDecimal("worth-" + itemStack.getTypeId(), BigDecimal.ONE.negate());
-		}
-		if (result.signum() < 0)
-		{
-			return null;
-		}
-		return result;
-	}
+    public BigDecimal getPrice(ItemStack itemStack) {
+        String itemname = itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
+        BigDecimal result;
 
-	public int getAmount(IEssentials ess, User user, ItemStack is, String[] args, boolean isBulkSell) throws Exception
-	{
-		if (is == null || is.getType() == Material.AIR)
-		{
-			throw new Exception(_("itemSellAir"));
-		}
-		int id = is.getTypeId();
-		int amount = 0;
+        //First check for matches with item name
+        result = config.getBigDecimal("worth." + itemname + "." + itemStack.getDurability(), BigDecimal.ONE.negate());
+        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());
+            }
+        }
+        if (result.signum() < 0) {
+            result = config.getBigDecimal("worth." + itemname + ".*", BigDecimal.ONE.negate());
+        }
+        if (result.signum() < 0) {
+            result = config.getBigDecimal("worth." + itemname, BigDecimal.ONE.negate());
+        }
 
-		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;
-			}
-		}
+        //Now we should check for item ID
+        if (result.signum() < 0) {
+            result = config.getBigDecimal("worth." + itemStack.getTypeId() + "." + itemStack.getDurability(), BigDecimal.ONE.negate());
+        }
+        if (result.signum() < 0) {
+            final ConfigurationSection itemNumberMatch = config.getConfigurationSection("worth." + itemStack.getTypeId());
+            if (itemNumberMatch != null && itemNumberMatch.getKeys(false).size() == 1) {
+                result = config.getBigDecimal("worth." + itemStack.getTypeId() + ".0", BigDecimal.ONE.negate());
+            }
+        }
+        if (result.signum() < 0) {
+            result = config.getBigDecimal("worth." + itemStack.getTypeId() + ".*", BigDecimal.ONE.negate());
+        }
+        if (result.signum() < 0) {
+            result = config.getBigDecimal("worth." + itemStack.getTypeId(), BigDecimal.ONE.negate());
+        }
 
-		boolean stack = args.length > 1 && args[1].endsWith("s");
-		boolean requireStack = ess.getSettings().isTradeInStacks(id);
+        //This is to match the old worth syntax
+        if (result.signum() < 0) {
+            result = config.getBigDecimal("worth-" + itemStack.getTypeId(), BigDecimal.ONE.negate());
+        }
+        if (result.signum() < 0) {
+            return null;
+        }
+        return result;
+    }
 
-		if (requireStack && !stack)
-		{
-			throw new Exception(_("itemMustBeStacked"));
-		}
+    public int getAmount(IEssentials ess, User user, ItemStack is, String[] args, boolean isBulkSell) throws Exception {
+        if (is == null || is.getType() == Material.AIR) {
+            throw new Exception(tl("itemSellAir"));
+        }
+        int id = is.getTypeId();
+        int amount = 0;
 
-		int max = 0;
-		for (ItemStack s : user.getInventory().getContents())
-		{
-			if (s == null || !s.isSimilar(is))
-			{
-				continue;
-			}
-			max += s.getAmount();
-		}
+        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;
+            }
+        }
 
-		if (stack)
-		{
-			amount *= is.getType().getMaxStackSize();
-		}
-		if (amount < 1)
-		{
-			amount += max;
-		}
+        boolean stack = args.length > 1 && args[1].endsWith("s");
+        boolean requireStack = ess.getSettings().isTradeInStacks(id);
 
-		if (requireStack)
-		{
-			amount -= amount % is.getType().getMaxStackSize();
-		}
-		if (amount > max || amount < 1)
-		{
-			if (!isBulkSell)
-			{
-				user.sendMessage(_("itemNotEnough2"));
-				user.sendMessage(_("itemNotEnough3"));
-				throw new Exception(_("itemNotEnough1"));
-			}
-			else
-			{
-				return amount;
-			}
-		}
+        if (requireStack && !stack) {
+            throw new Exception(tl("itemMustBeStacked"));
+        }
 
-		return amount;
-	}
+        int max = 0;
+        for (ItemStack s : user.getBase().getInventory().getContents()) {
+            if (s == null || !s.isSimilar(is)) {
+                continue;
+            }
+            max += s.getAmount();
+        }
 
-	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();
-	}
+        if (stack) {
+            amount *= is.getType().getMaxStackSize();
+        }
+        if (amount < 1) {
+            amount += max;
+        }
 
-	@Override
-	public void reloadConfig()
-	{
-		config.load();
-	}
+        if (requireStack) {
+            amount -= amount % is.getType().getMaxStackSize();
+        }
+        if (amount > max || amount < 1) {
+            if (!isBulkSell) {
+                user.sendMessage(tl("itemNotEnough2"));
+                user.sendMessage(tl("itemNotEnough3"));
+                throw new Exception(tl("itemNotEnough1"));
+            } else {
+                return amount;
+            }
+        }
+
+        return amount;
+    }
+
+    public void setPrice(ItemStack itemStack, double price) {
+        if (itemStack.getType().getData() == null) {
+            config.setProperty("worth." + itemStack.getType().toString().toLowerCase(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();
+    }
+
+    @Override
+    public void reloadConfig() {
+        config.load();
+    }
 }

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

@@ -1,453 +1,402 @@
 package com.earth2me.essentials.api;
 
-import com.earth2me.essentials.EssentialsConf;
-import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.EssentialsUserConf;
+import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
-import static com.earth2me.essentials.api.Economy.add;
-import static com.earth2me.essentials.api.Economy.divide;
-import static com.earth2me.essentials.api.Economy.format;
-import static com.earth2me.essentials.api.Economy.getMoneyExact;
-import static com.earth2me.essentials.api.Economy.hasEnough;
-import static com.earth2me.essentials.api.Economy.hasLess;
-import static com.earth2me.essentials.api.Economy.hasMore;
-import static com.earth2me.essentials.api.Economy.multiply;
-import static com.earth2me.essentials.api.Economy.setMoney;
-import static com.earth2me.essentials.api.Economy.substract;
 import com.earth2me.essentials.utils.NumberUtil;
 import com.earth2me.essentials.utils.StringUtil;
+import com.google.common.base.Charsets;
+import net.ess3.api.IEssentials;
+import net.ess3.api.MaxMoneyException;
+
 import java.io.File;
 import java.math.BigDecimal;
 import java.math.MathContext;
+import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import net.ess3.api.IEssentials;
 
 
 /**
  * Instead of using this api directly, we recommend to use the register plugin: http://bit.ly/RegisterMethod
  */
-public class Economy
-{
-	public 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 static final MathContext MATH_CONTEXT = MathContext.DECIMAL128;
+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, StringUtil.sanitizeFileName(name) + ".yml"));
-		npcConfig.load();
-		npcConfig.setProperty("npc", true);
-		npcConfig.setProperty("money", ess.getSettings().getStartingBalance());
-		npcConfig.forceSave();
-	}
+    /**
+     * @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, StringUtil.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
-	 */
-	@Deprecated
-	public static double getMoney(String name) throws UserDoesNotExistException
-	{
-		return getMoneyExact(name).doubleValue();
-	}
+    private static User getUserByName(String name) {
+        if (ess == null) {
+            throw new RuntimeException(noCallBeforeLoad);
+        }
+        if (name == null) {
+            throw new RuntimeException("Economy username cannot be null");
+        }
+        return ess.getUser(name);
+    }
 
-	public static BigDecimal getMoneyExact(String name) throws UserDoesNotExistException
-	{
-		User user = getUserByName(name);
-		if (user == null)
-		{
-			throw new UserDoesNotExistException(name);
-		}
-		return user.getMoney();
-	}
+    /**
+     * 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 {
+        return getMoneyExact(name).doubleValue();
+    }
 
-	/**
-	 * Sets the balance of a user
-	 *
-	 * @param name Name of the user
-	 * @param balance The balance you want to set
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
-	 */
-	@Deprecated
-	public static void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		try
-		{
-			setMoney(name, BigDecimal.valueOf(balance));
-		}
-		catch (ArithmeticException e)
-		{
-			logger.log(Level.WARNING, "Failed to set balance of " + name + " to " + balance + ": " + e.getMessage(), e);
-		}
-	}
+    public static BigDecimal getMoneyExact(String name) throws UserDoesNotExistException {
+        User user = getUserByName(name);
+        if (user == null) {
+            throw new UserDoesNotExistException(name);
+        }
+        return user.getMoney();
+    }
 
-	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();
-		}
-		user.setMoney(balance);
-	}
+    /**
+     * 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);
+        }
+    }
 
-	/**
-	 * 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);
-		}
-	}
+    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);
+    }
 
-	public static void add(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
-	{
-		BigDecimal result = getMoneyExact(name).add(amount, MATH_CONTEXT);
-		setMoney(name, result);
-	}
+    /**
+     * 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);
+        }
+    }
 
-	/**
-	 * 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);
-		}
-	}
+    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);
+    }
 
-	public static void substract(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
-	{
-		BigDecimal result = getMoneyExact(name).subtract(amount, MATH_CONTEXT);
-		setMoney(name, result);
-	}
+    /**
+     * Substracts money from the balance of a user
+     *
+     * @param name   Name of the user
+     * @param amount The money you want to substract
+     *
+     * @throws UserDoesNotExistException If a user by that name does not exists
+     * @throws NoLoanPermittedException  If the user is not allowed to have a negative balance
+     */
+    @Deprecated
+    public static void subtract(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException {
+        try {
+            substract(name, BigDecimal.valueOf(amount));
+        } catch (ArithmeticException e) {
+            logger.log(Level.WARNING, "Failed to substract " + amount + " of balance of " + name + ": " + e.getMessage(), e);
+        }
+    }
 
-	/**
-	 * 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
-	 */
-	@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);
-		}
-	}
+    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);
+    }
 
-	public static void divide(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
-	{
-		BigDecimal result = getMoneyExact(name).divide(amount, MATH_CONTEXT);
-		setMoney(name, result);
-	}
+    /**
+     * Divides the balance of a user by a value
+     *
+     * @param name  Name of the user
+     * @param value The balance is divided by this value
+     *
+     * @throws UserDoesNotExistException If a user by that name does not exists
+     * @throws NoLoanPermittedException  If the user is not allowed to have a negative balance
+     */
+    @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);
+        }
+    }
 
-	/**
-	 * 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
-	 */
-	@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);
-		}
-	}
+    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);
+    }
 
-	public static void multiply(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
-	{
-		BigDecimal result = getMoneyExact(name).multiply(amount, MATH_CONTEXT);
-		setMoney(name, result);
-	}
+    /**
+     * Multiplies the balance of a user by a value
+     *
+     * @param name  Name of the user
+     * @param value The balance is multiplied by this value
+     *
+     * @throws UserDoesNotExistException If a user by that name does not exists
+     * @throws NoLoanPermittedException  If the user is not allowed to have a negative balance
+     */
+    @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);
+        }
+    }
 
-	/**
-	 * 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 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);
+    }
 
-	/**
-	 * @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;
-		}
-	}
+    /**
+     * 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);
+    }
 
-	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 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;
+        }
+    }
 
-	/**
-	 * @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 hasEnough(String name, BigDecimal amount) throws UserDoesNotExistException, ArithmeticException {
+        return amount.compareTo(getMoneyExact(name)) <= 0;
+    }
 
-	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 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;
+        }
+    }
 
-	/**
-	 * @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 hasMore(String name, BigDecimal amount) throws UserDoesNotExistException, ArithmeticException {
+        return amount.compareTo(getMoneyExact(name)) < 0;
+    }
 
-	public static boolean hasLess(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;
+        }
+    }
 
-	/**
-	 * 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;
-	}
+    public static boolean hasLess(String name, BigDecimal amount) throws UserDoesNotExistException, ArithmeticException {
+        return amount.compareTo(getMoneyExact(name)) > 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";
-		}
-	}
+    /**
+     * 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;
+    }
 
-	public static String format(BigDecimal amount)
-	{
-		if (ess == null)
-		{
-			throw new RuntimeException(noCallBeforeLoad);
-		}
-		return NumberUtil.displayCurrency(amount, 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
+     */
+    @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";
+        }
+    }
 
-	/**
-	 * 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 String format(BigDecimal amount) {
+        if (ess == null) {
+            throw new RuntimeException(noCallBeforeLoad);
+        }
+        return NumberUtil.displayCurrency(amount, 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();
-	}
+    /**
+     * 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;
+    }
 
-	/**
-	 * 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;
-	}
+    /**
+     * 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();
+    }
 
-	/**
-	 * 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);
-	}
+    /**
+     * Creates dummy files for a npc, if there is no player yet with that name.
+     *
+     * @param name Name of the player
+     *
+     * @return true, if a new npc was created
+     */
+    public static boolean createNPC(String name) {
+        User user = getUserByName(name);
+        if (user == null) {
+            createNPCFile(name);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Deletes a user, if it is marked as npc.
+     *
+     * @param name Name of the player
+     *
+     * @throws UserDoesNotExistException
+     */
+    public static void removeNPC(String name) throws UserDoesNotExistException {
+        User user = getUserByName(name);
+        if (user == null) {
+            throw new UserDoesNotExistException(name);
+        }
+        deleteNPC(name);
+    }
 }
-

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

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

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

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

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

@@ -1,53 +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
-{
-		/**
-	 * Gets the location of the jail with the given name
-	 * @param jailName The name of the jail
-	 * @return the location of the jail
-	 * @throws Exception if the jail does not exist
-	 */
-	Location getJail(String jailName) throws Exception;
 
-	/**
-	 * Gets a list of jails by names
-	 * @return a list of jails, if there are none the list will be empty
-	 * @throws Exception
-	 */
-	Collection<String> getList() throws Exception;
+public interface IJails extends IReload {
+    /**
+     * Gets the location of the jail with the given name
+     *
+     * @param jailName The name of the jail
+     *
+     * @return the location of the jail
+     *
+     * @throws Exception if the jail does not exist
+     */
+    Location getJail(String jailName) throws Exception;
 
-	/**
-	 * Gets the number of jails
-	 * @return the size of the list of jails
-	 */
-	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;
 
-	/**
-	 * 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;
+    /**
+     * Gets the number of jails
+     *
+     * @return the size of the list of jails
+     */
+    int getCount();
 
-	/**
-	 * 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;
+    /**
+     * 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;
 
-	/**
-	 * 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;
+    /**
+     * Attempts to send the given user to the given jail
+     *
+     * @param user the user to send to jail
+     * @param jail the jail to send the user to
+     *
+     * @throws Exception if the user is offline or jail does not exist
+     */
+    void sendToJail(IUser user, String jail) throws Exception;
+
+    /**
+     * Set a new jail with the given name and location
+     *
+     * @param jailName the name of the jail being set
+     * @param loc      the location of the jail being set
+     *
+     * @throws Exception
+     */
+    void setJail(String jailName, Location loc) throws Exception;
 }

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

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

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

@@ -7,106 +7,114 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent;
 
 
-public interface ITeleport
-{
-	/**
-	 * Used to skip teleportPlayer delay when teleporting someone to a location or player.
-	 *
-	 * @param loc - Where should the player end up
-	 * @param cooldown - If cooldown should be enforced
-	 * @param cause - The reported teleportPlayer cause
-	 * @throws Exception
-	 */
-	void now(Location loc, boolean cooldown, PlayerTeleportEvent.TeleportCause cause) throws Exception;
+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;
+    /**
+     * 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;
+    @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 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 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 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 a player to a specific player
+     *
+     * @param otherUser - Which user will be teleported
+     * @param entity    - Where should the player end up
+     * @param chargeFor - What the user will be charged if teleportPlayer is successful
+     * @param cause     - The reported teleportPlayer cause
+     *
+     * @throws Exception
+     */
+    void teleportPlayer(IUser otherUser, Player entity, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception;
 
-	/**
-	 * Teleport wrapper used to handle tp fallback on /jail and /home
-	 *
-	 * @param chargeFor - What the user will be charged if teleportPlayer is successful
-	 * @param cause - The reported teleportPlayer cause
-	 * @throws Exception
-	 */
-	public void respawn(final Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception;
+    /**
+     * Teleport wrapper used to handle 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
-	 */
-	public void warp(IUser otherUser, String warp, 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
-	 */
-	public void back(Trade chargeFor) 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
-	 */
-	public void back() throws Exception;
+    /**
+     * Teleport wrapper used to handle throwing user home after a jail sentence
+     *
+     * @throws Exception
+     */
+    void back() throws Exception;
 
 }

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

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

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

@@ -1,16 +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 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);
-	}
+    public InvalidNameException(Throwable thrwbl) {
+        super(thrwbl);
+    }
 }

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

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

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

@@ -1,7 +1,6 @@
 package com.earth2me.essentials.api;
 
 
-public class NoLoanPermittedException extends net.ess3.api.NoLoanPermittedException
-{
+public class NoLoanPermittedException extends net.ess3.api.NoLoanPermittedException {
 
 }

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

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

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

@@ -1,71 +1,102 @@
 package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n._;
 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 = getPlayer(server, user, args, 0);
-			toggleAfk(afkUser);
-		}
-		else
-		{
-			toggleAfk(user);
-		}
-	}
-	
-	@Override
-	public void run(Server server, CommandSource sender, String commandLabel, String[] args) throws Exception
-	{
-		if (args.length > 0)
-		{
-			User afkUser = getPlayer(server, args, 0, true, false);
-			toggleAfk(afkUser);
-		}
-		else
-		{
-			throw new NotEnoughArgumentsException();
-		}
-	}
 
-	private void toggleAfk(User user)
-	{
-		user.setDisplayNick();
-		String msg = "";
-		if (!user.toggleAfk())
-		{
-			//user.sendMessage(_("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);
+        }
+    }
+
+    @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();
+        }
+    }
 }
 

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

@@ -7,23 +7,19 @@ 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 = LocationUtil.getTarget(user.getBase());
-		loc.getWorld().spawn(loc, TNTPrimed.class);
-	}
+        final Location loc = LocationUtil.getTarget(user.getBase());
+        loc.getWorld().spawn(loc, TNTPrimed.class);
+    }
 }

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

@@ -1,34 +1,28 @@
 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.getLastLocation() == null)
-		{
-			throw new Exception(_("noLocationFound"));
-		}
-		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"));
+        }
+        if (user.getWorld() != user.getLastLocation().getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + user.getLastLocation().getWorld().getName())) {
+            throw new Exception(tl("noPerm", "essentials.worlds." + user.getLastLocation().getWorld().getName()));
+        }
+        final Trade charge = new Trade(this.getName(), ess);
+        charge.isAffordableFor(user);
+        user.getTeleport().back(charge);
+        throw new NoChargeException();
+    }
 }

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

@@ -2,31 +2,27 @@ package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.Backup;
 import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n._;
 import org.bukkit.Server;
 
+import static com.earth2me.essentials.I18n.tl;
 
-public class Commandbackup extends EssentialsCommand
-{
-	public Commandbackup()
-	{
-		super("backup");
-	}
 
-	@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(_("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"));
-	}
+public class Commandbackup extends EssentialsCommand {
+    public Commandbackup() {
+        super("backup");
+    }
+
+    @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"));
+    }
 }

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

@@ -1,49 +1,61 @@
 package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.utils.NumberUtil;
-import java.math.BigDecimal;
 import org.bukkit.Server;
 
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.List;
 
-public class Commandbalance extends EssentialsCommand
-{
-	public Commandbalance()
-	{
-		super("balance");
-	}
+import static com.earth2me.essentials.I18n.tl;
 
-	@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();
-		}
 
-		User target = getPlayer(server, args, 0, true, true);
-		sender.sendMessage(_("balanceOther", target.isHidden() ? target.getName() : target.getDisplayName(), NumberUtil.displayCurrency(target.getMoney(), ess)));
-	}
+public class Commandbalance extends EssentialsCommand {
+    public Commandbalance() {
+        super("balance");
+    }
 
-	@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(_("balanceOther", target.isHidden() ? target.getName() : target.getDisplayName(), NumberUtil.displayCurrency(bal, ess)));
-		}
-		else if (args.length < 2)
-		{
-			final BigDecimal bal = user.getMoney();
-			user.sendMessage(_("balance", NumberUtil.displayCurrency(bal, ess)));
-		}
-		else
-		{
-			throw new NotEnoughArgumentsException();
-		}
-	}
+    @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();
+        }
+
+        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();
+        }
+    }
 }

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

@@ -1,196 +1,178 @@
 package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 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;
 
-//TODO: Remove op and replace with perm
-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 final SimpleTextInput cache = new SimpleTextInput();
-	private static long cacheage = 0;
-	private static final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
-
-	@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.getSender().isOp())
-				{
-					force = true;
-				}
-			}
-		}
-
-		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.runTaskAsynchronously(new Viewer(sender, page, force));
-		}
-		else
-		{
-			if (ess.getUserMap().getUniqueUsers() > MINUSERS)
-			{
-				sender.sendMessage(_("orderBalances", ess.getUserMap().getUniqueUsers()));
-			}
-			ess.runTaskAsynchronously(new Viewer(sender, page, force));
-		}
-
-	}
-
-	private static void outputCache(final CommandSource sender, int page)
-	{
-		final Calendar cal = Calendar.getInstance();
-		cal.setTimeInMillis(cacheage);
-		final DateFormat format = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-		sender.sendMessage(_("balanceTop", format.format(cal.getTime())));
-		new TextPager(cache).showPage(Integer.toString(page), null, "balancetop", sender);
-	}
+import static com.earth2me.essentials.I18n.tl;
 
 
-	private class Calculator implements Runnable
-	{
-		private final transient Viewer viewer;
-		private final boolean force;
+public class Commandbalancetop extends EssentialsCommand {
+    public Commandbalancetop() {
+        super("balancetop");
+    }
 
-		public Calculator(final Viewer viewer, final boolean force)
-		{
-			this.viewer = viewer;
-			this.force = force;
-		}
+    private static final int CACHETIME = 2 * 60 * 1000;
+    public static final int MINUSERS = 50;
+    private static final SimpleTextInput cache = new SimpleTextInput();
+    private static long cacheage = 0;
+    private static final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
 
-		@Override
-		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 (String u : ess.getUserMap().getAllUniqueUsers())
-						{
-							final User user = ess.getUserMap().getUser(u);
-							if (user != null)
-							{
-								final BigDecimal userMoney = user.getMoney();
-								user.updateMoneyCache(userMoney);
-								totalMoney = totalMoney.add(userMoney);
-								final String name = user.isHidden() ? user.getName() : user.getDisplayName();
-								balances.put(name, userMoney);
-							}
-						}
-					}
+    @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;
+                }
+            }
+        }
 
-					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());
-						}
-					});
+        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));
+        }
 
-					cache.getLines().add(_("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 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 Viewer implements Runnable
-	{
-		private final transient CommandSource sender;
-		private final transient int page;
-		private final transient boolean force;
+    private class Calculator implements Runnable {
+        private final transient Viewer viewer;
+        private final boolean force;
 
-		public Viewer(final CommandSource sender, final int page, final boolean force)
-		{
-			this.sender = sender;
-			this.page = page;
-			this.force = force;
-		}
+        public Calculator(final Viewer viewer, final boolean force) {
+            this.viewer = viewer;
+            this.force = force;
+        }
 
-		@Override
-		public void run()
-		{
-			lock.readLock().lock();
-			try
-			{
-				if (!force && cacheage > System.currentTimeMillis() - CACHETIME)
-				{
-					outputCache(sender, page);
-					return;
-				}
-			}
-			finally
-			{
-				lock.readLock().unlock();
-			}
-			ess.runTaskAsynchronously(new Calculator(new Viewer(sender, page, false), force));
-		}
-	}
+        @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, BigDecimal>> sortedEntries = new ArrayList<Map.Entry<String, BigDecimal>>(balances.entrySet());
+                    Collections.sort(sortedEntries, new Comparator<Map.Entry<String, BigDecimal>>() {
+                        @Override
+                        public int compare(final Entry<String, BigDecimal> entry1, final Entry<String, BigDecimal> entry2) {
+                            return entry2.getValue().compareTo(entry1.getValue());
+                        }
+                    });
+
+                    cache.getLines().add(tl("serverTotal", NumberUtil.displayCurrency(totalMoney, ess)));
+                    int pos = 1;
+                    for (Map.Entry<String, BigDecimal> entry : sortedEntries) {
+                        cache.getLines().add(pos + ". " + entry.getKey() + ", " + NumberUtil.displayCurrency(entry.getValue(), ess));
+                        pos++;
+                    }
+                    cacheage = System.currentTimeMillis();
+                }
+            } finally {
+                lock.writeLock().unlock();
+            }
+            ess.runTaskAsynchronously(viewer);
+        }
+    }
+
+
+    private class Viewer implements Runnable {
+        private final transient CommandSource sender;
+        private final transient int page;
+        private final transient boolean force;
+        private final transient String commandLabel;
+
+        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, 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();
+        }
+    }
 }

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

@@ -2,77 +2,75 @@ 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 com.earth2me.essentials.utils.FormatUtil;
-import java.util.logging.Level;
+import org.bukkit.BanList;
 import org.bukkit.Server;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
 
-public class Commandban extends EssentialsCommand
-{
-	public Commandban()
-	{
-		super("ban");
-	}
+import static com.earth2me.essentials.I18n.tl;
 
-	@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));
-		}
-		if (!user.isOnline())
-		{
-			if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.ban.offline"))
-			{
-				throw new Exception(_("banExemptOffline"));
-			}
-		}
-		else
-		{
-			if (user.isAuthorized("essentials.ban.exempt") && sender.isPlayer())
-			{
-				throw new Exception(_("banExempt"));
-			}
-		}
 
-		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 = _("defaultBanReason");
-		}
+public class Commandban extends EssentialsCommand {
+    public Commandban() {
+        super("ban");
+    }
 
-		user.setBanReason(_("banFormat", banReason, senderName));
-		user.setBanned(true);
-		user.setBanTimeout(0);
-		user.kickPlayer(_("banFormat", banReason, senderName));
+    @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"));
+            }
+        }
 
-		server.getLogger().log(Level.INFO, _("playerBanned", senderName, user.getName(), banReason));
+        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");
+        }
 
-		if (nomatch)
-		{
-			sender.sendMessage(_("userUnknown", user.getName()));
-		}
+        ess.getServer().getBanList(BanList.Type.NAME).addBan(user.getName(), banReason, null, senderName);
 
-		ess.broadcastMessage("essentials.ban.notify", _("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();
+        }
+    }
 }

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

@@ -2,56 +2,68 @@ 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.User;
 import com.earth2me.essentials.utils.FormatUtil;
-import java.util.logging.Level;
+import org.bukkit.BanList;
 import org.bukkit.Server;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
 
-public class Commandbanip extends EssentialsCommand
-{
-	public Commandbanip()
-	{
-		super("banip");
-	}
+import static com.earth2me.essentials.I18n.tl;
 
-	@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 String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
+//TODO: Add kick to online players matching ip ban.
+public class Commandbanip extends EssentialsCommand {
+    public Commandbanip() {
+        super("banip");
+    }
 
-		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];
-			}
-		}
+    @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();
+        }
 
-		if (ipAddress.isEmpty())
-		{
-			throw new PlayerNotFoundException();
-		}
+        final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
 
-		ess.getServer().banIP(ipAddress);
-		server.getLogger().log(Level.INFO, _("playerBanIpAddress", senderName, ipAddress));
+        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];
+            }
+        }
 
-		ess.broadcastMessage("essentials.ban.notify", _("playerBanIpAddress", senderName, ipAddress));
-	}
+        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");
+        }
+
+        ess.getServer().getBanList(BanList.Type.IP).addBan(ipAddress, banReason, null, senderName);
+        server.getLogger().log(Level.INFO, tl("playerBanIpAddress", senderName, ipAddress, banReason));
+
+        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();
+        }
+    }
 }

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

@@ -1,51 +1,52 @@
 package com.earth2me.essentials.commands;
 
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 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 = LocationUtil.getTarget(user.getBase());
-		final Location safeLocation = LocationUtil.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 {
+            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");
+        } else {
+            return Collections.emptyList();
+        }
+    }
 }

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

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

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

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

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

@@ -1,38 +1,33 @@
 package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.utils.FormatUtil;
 import org.bukkit.Server;
 
+import static com.earth2me.essentials.I18n.tl;
 
-public class Commandbroadcast extends EssentialsCommand
-{
-	public Commandbroadcast()
-	{
-		super("broadcast");
-	}
 
-	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
-	{
-		sendBroadcast(user.getDisplayName(), args);
-	}
+public class Commandbroadcast extends EssentialsCommand {
+    public Commandbroadcast() {
+        super("broadcast");
+    }
 
-	@Override
-	public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
-	{
-		sendBroadcast(sender.getSender().getName(), args);
-	}
+    @Override
+    public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
+        sendBroadcast(user.getDisplayName(), args);
+    }
 
-	private void sendBroadcast(final String name, final String[] args) throws NotEnoughArgumentsException
-	{
-		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 {
+        sendBroadcast(sender.getSender().getName(), args);
+    }
 
-		ess.broadcastMessage(_("broadcast", FormatUtil.replaceFormat(getFinalArg(args, 0)).replace("\\n", "\n"), name));
-	}
+    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));
+    }
 }

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

@@ -0,0 +1,81 @@
+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 {
+        sendBroadcast(user.getWorld().getName(), user.getDisplayName(), getFinalArg(args, 0));
+    }
+
+    @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"));
+        }
+        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) {
+        return Collections.emptyList(); // The argument is only for non-players
+    }
+
+    @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();
+        }
+    }
+}

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

@@ -1,33 +1,43 @@
 package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import org.bukkit.Server;
 
+import java.util.Collections;
+import java.util.List;
 
-public class Commandburn extends EssentialsCommand
-{
-	public Commandburn()
-	{
-		super("burn");
-	}
+import static com.earth2me.essentials.I18n.tl;
 
-	@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();
-		}
 
-		if (args[0].trim().length() < 2)
-		{
-			throw new NotEnoughArgumentsException();
-		}
+public class Commandburn extends EssentialsCommand {
+    public Commandburn() {
+        super("burn");
+    }
 
-		User user = getPlayer(server, sender, args, 0);
-		user.setFireTicks(Integer.parseInt(args[1]) * 20);
-		sender.sendMessage(_("burnMsg", user.getDisplayName(), Integer.parseInt(args[1])));
-	}
+    @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();
+        }
+
+        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();
+        }
+    }
 }

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

@@ -1,162 +1,207 @@
 package com.earth2me.essentials.commands;
 
+import static com.earth2me.essentials.I18n.tl;
+
 import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import com.earth2me.essentials.utils.NumberUtil;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
+import com.earth2me.essentials.utils.StringUtil;
+
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
 
-public class Commandclearinventory extends EssentialsCommand
-{
-	public Commandclearinventory()
-	{
-		super("clearinventory");
-	}
-	static int BASE_AMOUNT = 100000;
-	static int EXTENDED_CAP = 8;
 
-	@Override
-	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
-	{
-		parseCommand(server, user.getSource(), args, user.isAuthorized("essentials.clearinventory.others"), user.isAuthorized("essentials.clearinventory.all"));
-	}
+public class Commandclearinventory extends EssentialsCommand {
 
-	@Override
-	protected void run(Server server, CommandSource sender, String commandLabel, String[] args) throws Exception
-	{
-		parseCommand(server, sender, args, true, true);
-	}
+    public Commandclearinventory() {
+        super("clearinventory");
+    }
 
-	private void parseCommand(Server server, CommandSource sender, String[] args, boolean allowOthers, boolean allowAll) throws Exception
-	{
-		List<Player> players = new ArrayList<Player>();
-		int offset = 0;
+    private static final int BASE_AMOUNT = 100000;
+    private static final int EXTENDED_CAP = 8;
 
-		if (sender.isPlayer())
-		{
-			players.add(sender.getPlayer());
-		}
+    @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 (allowAll && args.length > 0 && args[0].contentEquals("*"))
-		{
-			sender.sendMessage(_("inventoryClearingFromAll"));
-			offset = 1;
-			players = Arrays.asList(server.getOnlinePlayers());
-		}
-		else if (allowOthers && args.length > 0 && args[0].trim().length() > 2)
-		{
-			offset = 1;
-			players = server.matchPlayer(args[0].trim());
-		}
+    @Override
+    protected void run(Server server, CommandSource sender, String commandLabel, String[] args) throws Exception {
+        parseCommand(server, sender, commandLabel, args, true, true);
+    }
 
-		if (players.size() < 1)
-		{
-			throw new PlayerNotFoundException();
-		}
-		for (Player player : players)
-		{
-			clearHandler(sender, player, args, offset, players.size() < EXTENDED_CAP);
-		}
-	}
+    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;
 
-	protected void clearHandler(CommandSource sender, Player player, String[] args, int offset, boolean showExtended) throws Exception
-	{
-		short data = -1;
-		int type = -1;
-		int amount = -1;
+        if (sender.isPlayer()) {
+            players.add(sender.getPlayer());
+            // Clear previous command execution before potential errors to reset confirmation.
+            previousClearCommand = senderUser.getConfirmingClearCommand();
+            senderUser.setConfirmingClearCommand(null);
+        }
 
-		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(":");
-				final ItemStack item = ess.getItemDb().get(split[0]);
-				type = item.getTypeId();
+        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 (split.length > 1 && NumberUtil.isInt(split[1]))
-				{
-					data = Short.parseShort(split[1]);
-				}
-				else
-				{
-					data = item.getDurability();
-				}
-			}
-		}
+        if (players.size() < 1) {
+            throw new PlayerNotFoundException();
+        }
 
-		if (type == -1) // type -1 represents wildcard or all items
-		{
-			if (showExtended)
-			{
-				sender.sendMessage(_("inventoryClearingAllItems", player.getDisplayName()));
-			}
-			player.getInventory().clear();
-		}
-		else if (type == -2) // type -2 represents double wildcard or all items and armor
-		{
-			if (showExtended)
-			{
-				sender.sendMessage(_("inventoryClearingAllArmor", player.getDisplayName()));
-			}
-			player.getInventory().clear();
-			player.getInventory().setArmorContents(null);
-		}
-		else
-		{
-			if (data == -1) // data -1 means that all subtypes will be cleared
-			{
-				ItemStack stack = new ItemStack(type);
-				if (showExtended)
-				{
-					sender.sendMessage(_("inventoryClearingAllStack", stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
-				}
-				player.getInventory().clear(type, data);
-			}
-			else if (amount == -1) // amount -1 means all items will be cleared
-			{
-				ItemStack stack = new ItemStack(type, BASE_AMOUNT, data);
-				ItemStack removedStack = player.getInventory().removeItem(stack).get(0);
-				final int removedAmount = (BASE_AMOUNT - removedStack.getAmount());
-				if (removedAmount > 0 || showExtended)
-				{
-					sender.sendMessage(_("inventoryClearingStack", removedAmount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
-				}
-			}
-			else
-			{
-				if (amount < 0)
-				{
-					amount = 1;
-				}
-				ItemStack stack = new ItemStack(type, amount, data);
-				if (player.getInventory().containsAtLeast(stack, amount))
-				{
-					sender.sendMessage(_("inventoryClearingStack", amount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
-					player.getInventory().removeItem(stack);
-				}
-				else
-				{
-					if (showExtended)
-					{
-						sender.sendMessage(_("inventoryClearFail", player.getDisplayName(), amount, stack.getType().toString().toLowerCase(Locale.ENGLISH)));
-					}
-				}
-			}
-		}
-	}
+
+        // 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;
+
+        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(":");
+                final ItemStack item = ess.getItemDb().get(split[0]);
+                type = item.getTypeId();
+
+                if (split.length > 1 && NumberUtil.isInt(split[1])) {
+                    data = Short.parseShort(split[1]);
+                } else {
+                    data = item.getDurability();
+                }
+            }
+        }
+
+        if (type == -1) // type -1 represents wildcard or all items
+        {
+            if (showExtended) {
+                sender.sendMessage(tl("inventoryClearingAllItems", player.getDisplayName()));
+            }
+            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 {
+            if (data == -1) // data -1 means that all subtypes will be cleared
+            {
+                ItemStack stack = new ItemStack(type);
+                if (showExtended) {
+                    sender.sendMessage(tl("inventoryClearingAllStack", stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
+                }
+                player.getInventory().clear(type, data);
+            } else if (amount == -1) // amount -1 means all items will be cleared
+            {
+                ItemStack stack = new ItemStack(type, BASE_AMOUNT, data);
+                ItemStack removedStack = player.getInventory().removeItem(stack).get(0);
+                final int removedAmount = (BASE_AMOUNT - removedStack.getAmount());
+                if (removedAmount > 0 || showExtended) {
+                    sender.sendMessage(tl("inventoryClearingStack", removedAmount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
+                }
+            } else {
+                if (amount < 0) {
+                    amount = 1;
+                }
+                ItemStack stack = new ItemStack(type, amount, data);
+                if (player.getInventory().containsAtLeast(stack, amount)) {
+                    sender.sendMessage(tl("inventoryClearingStack", amount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
+                    player.getInventory().removeItem(stack);
+                } else {
+                    if (showExtended) {
+                        sender.sendMessage(tl("inventoryClearFail", player.getDisplayName(), amount, stack.getType().toString().toLowerCase(Locale.ENGLISH)));
+                    }
+                }
+            }
+        }
+    }
+
+    @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);
+    }
 }

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

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

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

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

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

@@ -0,0 +1,206 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.ChargeException;
+import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.Trade.OverflowType;
+import com.earth2me.essentials.User;
+import net.ess3.api.MaxMoneyException;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.Recipe;
+import org.bukkit.inventory.ShapedRecipe;
+import org.bukkit.inventory.ShapelessRecipe;
+
+import java.util.*;
+
+import static com.earth2me.essentials.I18n.tl;
+
+
+public class Commandcondense extends EssentialsCommand {
+    public Commandcondense() {
+        super("condense");
+    }
+
+    private Map<ItemStack, SimpleRecipe> condenseList = new HashMap<>();
+
+    @Override
+    public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
+        List<ItemStack> is = new ArrayList<>();
+
+        boolean validateReverse = false;
+        if (args.length > 0) {
+            is = ess.getItemDb().getMatching(user, args);
+        } else {
+            for (ItemStack stack : user.getBase().getInventory().getContents()) {
+                if (stack == null || stack.getType() == Material.AIR) {
+                    continue;
+                }
+                is.add(stack);
+            }
+            validateReverse = true;
+        }
+
+        boolean didConvert = false;
+        for (final ItemStack itemStack : is) {
+            if (condenseStack(user, itemStack, validateReverse)) {
+                didConvert = true;
+            }
+        }
+        user.getBase().updateInventory();
+
+        if (didConvert) {
+            user.sendMessage(tl("itemsConverted"));
+        } else {
+            user.sendMessage(tl("itemsNotConverted"));
+            throw new NoChargeException();
+        }
+    }
+
+    private boolean condenseStack(final User user, final ItemStack stack, final boolean validateReverse) throws ChargeException, MaxMoneyException {
+        final SimpleRecipe condenseType = getCondenseType(stack);
+        if (condenseType != null) {
+            final ItemStack input = condenseType.getInput();
+            final ItemStack result = condenseType.getResult();
+
+            if (validateReverse) {
+                boolean pass = false;
+                for (Recipe revRecipe : ess.getServer().getRecipesFor(input)) {
+                    if (getStackOnRecipeMatch(revRecipe, result) != null) {
+                        pass = true;
+                        break;
+                    }
+                }
+                if (!pass) {
+                    return false;
+                }
+            }
+
+            int amount = 0;
+
+            for (final ItemStack contents : user.getBase().getInventory().getContents()) {
+                if (contents != null && contents.isSimilar(stack)) {
+                    amount += contents.getAmount();
+                }
+            }
+
+            int output = ((amount / input.getAmount()) * result.getAmount());
+            amount -= amount % input.getAmount();
+
+            if (amount > 0) {
+                input.setAmount(amount);
+                result.setAmount(output);
+                final Trade remove = new Trade(input, ess);
+                final Trade add = new Trade(result, ess);
+                remove.charge(user);
+                add.pay(user, OverflowType.DROP);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private SimpleRecipe getCondenseType(final ItemStack stack) {
+        if (condenseList.containsKey(stack)) {
+            return condenseList.get(stack);
+        }
+
+        final Iterator<Recipe> intr = ess.getServer().recipeIterator();
+        List<SimpleRecipe> bestRecipes = new ArrayList<>();
+        while (intr.hasNext()) {
+            final Recipe recipe = intr.next();
+            final Collection<ItemStack> recipeItems = getStackOnRecipeMatch(recipe, stack);
+
+            if (recipeItems != null && (recipeItems.size() == 4 || recipeItems.size() == 9) && (recipeItems.size() > recipe.getResult().getAmount())) {
+                final ItemStack input = stack.clone();
+                input.setAmount(recipeItems.size());
+                final SimpleRecipe newRecipe = new SimpleRecipe(recipe.getResult(), input);
+                bestRecipes.add(newRecipe);
+            }
+        }
+        if (!bestRecipes.isEmpty()) {
+            if (bestRecipes.size() > 1) {
+                Collections.sort(bestRecipes, SimpleRecipeComparator.INSTANCE);
+            }
+            SimpleRecipe recipe = bestRecipes.get(0);
+            condenseList.put(stack, recipe);
+            return recipe;
+        }
+        condenseList.put(stack, null);
+        return null;
+    }
+
+    private Collection<ItemStack> getStackOnRecipeMatch(final Recipe recipe, final ItemStack stack) {
+        final Collection<ItemStack> inputList;
+
+        if (recipe instanceof ShapedRecipe) {
+            ShapedRecipe sRecipe = (ShapedRecipe) recipe;
+            inputList = sRecipe.getIngredientMap().values();
+        } else if (recipe instanceof ShapelessRecipe) {
+            ShapelessRecipe slRecipe = (ShapelessRecipe) recipe;
+            inputList = slRecipe.getIngredientList();
+        } else {
+            return null;
+        }
+
+        boolean match = true;
+        Iterator<ItemStack> iter = inputList.iterator();
+        while (iter.hasNext()) {
+            ItemStack inputSlot = iter.next();
+            if (inputSlot == null) {
+                iter.remove();
+                continue;
+            }
+
+            if (inputSlot.getDurability() == Short.MAX_VALUE) {
+                inputSlot.setDurability((short) 0);
+            }
+            if (!inputSlot.isSimilar(stack)) {
+                match = false;
+            }
+        }
+
+        if (match) {
+            return inputList;
+        }
+        return null;
+    }
+
+
+    private class SimpleRecipe implements Recipe {
+        private ItemStack result;
+        private ItemStack input;
+
+        private SimpleRecipe(ItemStack result, ItemStack input) {
+            this.result = result;
+            this.input = input;
+        }
+
+        @Override
+        public ItemStack getResult() {
+            return result.clone();
+        }
+
+        public ItemStack getInput() {
+            return input.clone();
+        }
+    }
+
+    @Override
+    protected List<String> getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) {
+        if (args.length == 1) {
+            return getMatchingItems(args[0]);
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    private static class SimpleRecipeComparator implements Comparator<SimpleRecipe> {
+
+        private static final SimpleRecipeComparator INSTANCE = new SimpleRecipeComparator();
+        @Override
+        public int compare(SimpleRecipe o1, SimpleRecipe o2) {
+            return Integer.compare(o2.getInput().getAmount(), o1.getInput().getAmount());
+        }
+    }
+}

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

@@ -0,0 +1,131 @@
+package com.earth2me.essentials.commands;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.CharStreams;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+
+import com.earth2me.essentials.CommandSource;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.DateUtil;
+
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.MemoryConfiguration;
+import org.bukkit.configuration.file.YamlConstructor;
+import org.bukkit.configuration.file.YamlRepresenter;
+import org.bukkit.inventory.ItemStack;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.DumperOptions.FlowStyle;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.representer.Representer;
+
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import static com.earth2me.essentials.I18n.tl;
+
+public class Commandcreatekit extends EssentialsCommand {
+
+    private static final String PASTE_URL = "https://hastebin.com/";
+    private static final String PASTE_UPLOAD_URL = PASTE_URL + "documents";
+    private static final Gson GSON = new Gson();
+
+    private final ExecutorService executorService = Executors.newSingleThreadExecutor();
+    private final DumperOptions yamlOptions = new DumperOptions();
+    private final Representer yamlRepresenter = new YamlRepresenter();
+    private final YamlConstructor yamlConstructor = new YamlConstructor();
+
+    public Commandcreatekit() {
+        super("createkit");
+        yamlOptions.setDefaultFlowStyle(FlowStyle.BLOCK);
+        yamlRepresenter.setDefaultFlowStyle(FlowStyle.BLOCK);
+    }
+
+    // /createkit <name> <delay>
+    @Override
+    public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
+        if (args.length != 2) {
+            throw new NotEnoughArgumentsException();
+        }
+
+        // Command handler will auto fail if this fails.
+        long delay = Long.valueOf(args[1]);
+        String kitname = args[0];
+        ItemStack[] items = user.getBase().getInventory().getContents();
+        List<String> list = new ArrayList<>();
+        for (ItemStack is : items) {
+            if (is != null && is.getType() != null && is.getType() != Material.AIR) {
+                String serialized = ess.getItemDb().serialize(is);
+                list.add(serialized);
+            }
+        }
+        // Some users might want to directly write to config knowing the consequences. *shrug*
+        if (!ess.getSettings().isPastebinCreateKit()) {
+            ess.getKits().addKit(kitname, list, delay);
+            user.sendMessage(tl("createdKit", kitname, list.size(), delay));
+        } else {
+            ConfigurationSection config = new MemoryConfiguration();
+            config.set("kits." + kitname + ".delay", delay);
+            config.set("kits." + kitname + ".items", list);
+
+            final Yaml yaml = new Yaml(yamlConstructor, yamlRepresenter, yamlOptions);
+            String fileContents = "# Copy the kit code below into the kits section in your config.yml file\n";
+            fileContents += yaml.dump(config.getValues(false));
+
+            uploadPaste(user.getSource(), kitname, delay, fileContents);
+        }
+    }
+
+    private void uploadPaste(final CommandSource sender, final String kitName, final long delay, final String contents) {
+        executorService.submit(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    HttpURLConnection connection = (HttpURLConnection) new URL(PASTE_UPLOAD_URL).openConnection();
+                    connection.setRequestMethod("POST");
+                    connection.setDoInput(true);
+                    connection.setDoOutput(true);
+                    connection.setRequestProperty("User-Agent", "EssentialsX plugin");
+                    try (OutputStream os = connection.getOutputStream()) {
+                        os.write(contents.getBytes(Charsets.UTF_8));
+                    }
+                    // Error
+                    if (connection.getResponseCode() >= 400) {
+                        sender.sendMessage(tl("createKitFailed", kitName));
+                        String message = CharStreams.toString(new InputStreamReader(connection.getErrorStream(), Charsets.UTF_8));
+                        ess.getLogger().severe("Error creating kit: " + message);
+                        return;
+                    }
+
+                    // Read URL
+                    JsonObject object = GSON.fromJson(new InputStreamReader(connection.getInputStream(), Charsets.UTF_8), JsonObject.class);
+                    String pasteUrl = PASTE_URL + object.get("key").getAsString();
+                    connection.disconnect();
+
+                    String separator = tl("createKitSeparator");
+                    String delayFormat = "0";
+                    if (delay > 0) {
+                        delayFormat = DateUtil.formatDateDiff(System.currentTimeMillis() + (delay * 1000));
+                    }
+                    sender.sendMessage(separator);
+                    sender.sendMessage(tl("createKitSuccess", kitName, delayFormat, pasteUrl));
+                    sender.sendMessage(separator);
+                    if (ess.getSettings().isDebug()) {
+                        ess.getLogger().info(sender.getSender().getName() + " created a kit: " + pasteUrl);
+                    }
+                } catch (Exception e) {
+                    sender.sendMessage(tl("createKitFailed", kitName));
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+}

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

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