Update Bukkit/CB to 1.3.2 R1

Bukkit: 1546 CB: 2377

.classpath

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

.gitignore

@@ -36,18 +36,10 @@
 /EssentialsUpdate/build/
 /WebPush/apikey.php
 /WebPush/nbproject/private
+/.idea
+*.iml
 /EssentialsGroupManager/bin
 /EssentialsGroupManager/.externalToolBuilders
 /EssentialsAntiBuild/nbproject/private/
 /EssentialsAntiBuild/dist/
-/EssentialsAntiBuild/build/
-/jars
-/out
-.idea/
-*.iml
-target/
-dependency-reduced-pom.xml
-/Essentials/config.yml
-/Essentials/userdata/testplayer1.yml
-/Essentials/usermap.csv
-/Essentials/userdata
+/EssentialsAntiBuild/build/

.project

@@ -0,0 +1,17 @@
+<?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: mvn compile test
-install: true
-notifications:
-  irc: 
-    channels: 
-      - "irc.esper.net#lain"
-    on_success: change
-    on_failure: always
-  email:
-    recipients:
-      - "khobbits@ess3.net"
-    on_success: change
-    on_failure: always

BuildAll/build.xml

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

BuildAll/nbproject/genfiles.properties

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

BuildAll/nbproject/project.properties

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

BuildAll/nbproject/project.xml

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

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

Essentials/nbproject/genfiles.properties

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

Essentials/nbproject/pmd.settings

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

Essentials/nbproject/project.properties

@@ -0,0 +1,154 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=true
+annotation.processing.processors.list=lombok.core.AnnotationProcessor
+annotation.processing.run.all.processors=false
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=Essentials
+application.vendor=
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder=*
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateImportGroups=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/Essentials.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+file.reference.BOSEconomy7.jar=../lib/BOSEconomy7.jar
+file.reference.bPermissions.jar=../lib/bPermissions.jar
+file.reference.bpermissions2.jar=../lib/bpermissions2.jar
+file.reference.bukkit.jar=../lib/bukkit.jar
+file.reference.craftbukkit.jar=../lib/craftbukkit.jar
+file.reference.iCo4.jar=../lib/iCo4.jar
+file.reference.iCo5.jar=../lib/iCo5.jar
+file.reference.iCo6.jar=../lib/iCo6.jar
+file.reference.lombok.jar=../lib/lombok-0.10.8.jar
+file.reference.MultiCurrency.jar=../lib/MultiCurrency.jar
+file.reference.Permissions3.jar=../lib/Permissions3.jar
+file.reference.PermissionsBukkit-1.2.jar=../lib/PermissionsBukkit-1.2.jar
+file.reference.PermissionsEx.jar=../lib/PermissionsEx.jar
+file.reference.Privileges.jar=..\\lib\\Privileges.jar
+file.reference.Vault.jar=../lib/Vault.jar
+includes=**
+jar.archive.disabled=${jnlp.enabled}
+jar.compress=true
+jar.index=${jnlp.enabled}
+javac.classpath=\
+    ${file.reference.Permissions3.jar}:\
+    ${file.reference.iCo4.jar}:\
+    ${file.reference.iCo5.jar}:\
+    ${file.reference.iCo6.jar}:\
+    ${file.reference.MultiCurrency.jar}:\
+    ${file.reference.BOSEconomy7.jar}:\
+    ${file.reference.PermissionsEx.jar}:\
+    ${file.reference.bPermissions.jar}:\
+    ${file.reference.PermissionsBukkit-1.2.jar}:\
+    ${file.reference.lombok.jar}:\
+    ${reference.EssentialsGroupManager.jar}:\
+    ${file.reference.bukkit.jar}:\
+    ${file.reference.craftbukkit.jar}:\
+    ${file.reference.Vault.jar}:\
+    ${file.reference.Privileges.jar}:\
+    ${file.reference.bpermissions2.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.6
+javac.target=1.6
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${libs.junit_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

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

Essentials/src/book.txt

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

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

@@ -3,7 +3,6 @@ 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;
@@ -12,7 +11,7 @@ import org.bukkit.plugin.Plugin;
 
 public class AlternativeCommandsHandler
 {
-	private static final Logger LOGGER = Logger.getLogger("Essentials");
+	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;
@@ -122,14 +121,13 @@ public class AlternativeCommandsHandler
 		return commands.get(0);
 	}
 
-	public void executed(final String label, final PluginCommand pc)
+	public void executed(final String label, final String otherLabel)
 	{
-		final String altString = pc.getPlugin().getName() + ":" + pc.getLabel();
 		if (ess.getSettings().isDebug())
 		{
-			LOGGER.log(Level.INFO, "Essentials: Alternative command " + label + " found, using " + altString);
+			LOGGER.log(Level.INFO, "Essentials: Alternative command " + label + " found, using " + otherLabel);
 		}
-		disabledList.put(label, altString);
+		disabledList.put(label, otherLabel);
 	}
 
 	public Map<String, String> disabledCommands()

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

@@ -1,19 +1,18 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 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;
 
 
 public class Backup implements Runnable
 {
-	private static final Logger LOGGER = Logger.getLogger("Essentials");
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private transient final Server server;
 	private transient final IEssentials ess;
 	private transient boolean running = false;
@@ -24,35 +23,18 @@ public class Backup implements Runnable
 	{
 		this.ess = ess;
 		server = ess.getServer();
-		if (!ess.getOnlinePlayers().isEmpty())
+		if (server.getOnlinePlayers().length > 0)
 		{
-			ess.runTaskAsynchronously(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					startTask();
-				}
-			});
+			startTask();
 		}
 	}
 
-	public void onPlayerJoin()
+	void onPlayerJoin()
 	{
 		startTask();
 	}
 
-	public synchronized void stopTask()
-	{
-		running = false;
-		if (taskId != -1)
-		{
-			server.getScheduler().cancelTask(taskId);
-		}
-		taskId = -1;
-	}
-
-	private synchronized void startTask()
+	private void startTask()
 	{
 		if (!running)
 		{
@@ -79,90 +61,80 @@ public class Backup implements Runnable
 		{
 			return;
 		}
-		if ("save-all".equalsIgnoreCase(command))
-		{
+		if ("save-all".equalsIgnoreCase(command)) {
 			final CommandSender cs = server.getConsoleSender();
 			server.dispatchCommand(cs, "save-all");
 			active = false;
 			return;
 		}
-		LOGGER.log(Level.INFO, tl("backupStarted"));
+		LOGGER.log(Level.INFO, _("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
+		ess.scheduleAsyncDelayedTask(
+				new Runnable()
 				{
-					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()
 					{
-						@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
 							{
-								final BufferedReader reader = new BufferedReader(new InputStreamReader(child.getInputStream()));
-								try
+								child.waitFor();
+								String line;
+								do
 								{
-									String line;
-									do
+									line = reader.readLine();
+									if (line != null)
 									{
-										line = reader.readLine();
-										if (line != null)
-										{
-											LOGGER.log(Level.INFO, line);
-										}
+										LOGGER.log(Level.INFO, line);
 									}
-									while (line != null);
-								}
-								finally
-								{
-									reader.close();
 								}
+								while (line != null);
 							}
-							catch (IOException ex)
+							finally
 							{
-								LOGGER.log(Level.SEVERE, null, ex);
+								reader.close();
 							}
 						}
-					});
-					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()
+						catch (InterruptedException ex)
 						{
-							server.dispatchCommand(cs, "save-on");
-							if (ess.getOnlinePlayers().isEmpty())
-							{
-								stopTask();
-							}
-							active = false;
-							LOGGER.log(Level.INFO, tl("backupFinished"));
+							LOGGER.log(Level.SEVERE, null, ex);
+						}
+						catch (IOException ex)
+						{
+							LOGGER.log(Level.SEVERE, null, ex);
+						}
+						finally
+						{
+							ess.scheduleSyncDelayedTask(
+									new Runnable()
+									{
+										@Override
+										public void run()
+										{
+											server.dispatchCommand(cs, "save-on");
+											if (server.getOnlinePlayers().length == 0)
+											{
+												running = false;
+												if (taskId != -1)
+												{
+													server.getScheduler().cancelTask(taskId);
+												}
+											}
+											active = false;
+											LOGGER.log(Level.INFO, _("backupFinished"));
+										}
+									});
 						}
 					}
-					ess.scheduleSyncDelayedTask(new BackupEnableSaveTask());
-				}
-			}
-		});
+				});
 	}
 }

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

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

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

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

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

@@ -1,6 +1,6 @@
-package com.earth2me.essentials.utils;
+package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -26,7 +26,7 @@ public final class DescParseTickFormat
 	public static final double ticksPerMinute = 1000d / 60d;
 	public static final double ticksPerSecond = 1000d / 60d / 60d;
 	private static final SimpleDateFormat SDFTwentyFour = new SimpleDateFormat("HH:mm", Locale.ENGLISH);
-	private static final SimpleDateFormat SDFTwelve = new SimpleDateFormat("h:mm aa", Locale.ENGLISH);
+	private static final SimpleDateFormat SDFTwelve = new SimpleDateFormat("h:mmaa", Locale.ENGLISH);
 
 	static
 	{
@@ -61,7 +61,13 @@ public final class DescParseTickFormat
 		resetAliases.add("default");
 	}
 
+	private DescParseTickFormat()
+	{
+	}
+
 	// ============================================
+	// PARSE. From describing String to int
+	// --------------------------------------------
 	public static long parse(String desc) throws NumberFormatException
 	{
 		// Only look at alphanumeric and lowercase and : for 24:00
@@ -72,7 +78,7 @@ public final class DescParseTickFormat
 		{
 			return parseTicks(desc);
 		}
-		catch (NumberFormatException e)
+		catch (Exception e)
 		{
 		}
 
@@ -81,7 +87,7 @@ public final class DescParseTickFormat
 		{
 			return parse24(desc);
 		}
-		catch (NumberFormatException e)
+		catch (Exception e)
 		{
 		}
 
@@ -90,7 +96,7 @@ public final class DescParseTickFormat
 		{
 			return parse12(desc);
 		}
-		catch (NumberFormatException e)
+		catch (Exception e)
 		{
 		}
 
@@ -99,13 +105,14 @@ public final class DescParseTickFormat
 		{
 			return parseAlias(desc);
 		}
-		catch (NumberFormatException e)
+		catch (Exception e)
 		{
 		}
 
 		// Well we failed to understand...
 		throw new NumberFormatException();
 	}
+
 	public static long parseTicks(String desc) throws NumberFormatException
 	{
 		if (!desc.matches("^[0-9]+ti?c?k?s?$"))
@@ -220,10 +227,13 @@ public final class DescParseTickFormat
 	}
 
 	// ============================================
+	// FORMAT. From int to describing String
+	// --------------------------------------------
 	public static String format(final long ticks)
 	{
-		return tl("timeFormat", format24(ticks), format12(ticks), formatTicks(ticks));
+		return _("timeFormat", format24(ticks), format12(ticks), formatTicks(ticks));
 	}
+
 	public static String formatTicks(final long ticks)
 	{
 		return (ticks % ticksPerDay) + "ticks";
@@ -285,8 +295,4 @@ public final class DescParseTickFormat
 
 		return cal.getTime();
 	}
-
-	private DescParseTickFormat()
-	{
-	}
 }

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

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

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

@@ -17,12 +17,12 @@
  */
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
-import com.earth2me.essentials.commands.EssentialsCommand;
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.Economy;
+import com.earth2me.essentials.api.IJails;
 import com.earth2me.essentials.commands.IEssentialsCommand;
 import com.earth2me.essentials.commands.NoChargeException;
 import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import com.earth2me.essentials.commands.QuietAbortException;
 import com.earth2me.essentials.metrics.Metrics;
 import com.earth2me.essentials.metrics.MetricsListener;
 import com.earth2me.essentials.metrics.MetricsStarter;
@@ -31,46 +31,25 @@ import com.earth2me.essentials.register.payment.Methods;
 import com.earth2me.essentials.signs.SignBlockListener;
 import com.earth2me.essentials.signs.SignEntityListener;
 import com.earth2me.essentials.signs.SignPlayerListener;
-import com.earth2me.essentials.textreader.IText;
-import com.earth2me.essentials.textreader.KeywordReplacer;
-import com.earth2me.essentials.textreader.SimpleTextInput;
-import com.earth2me.essentials.utils.DateUtil;
-import com.google.common.base.Function;
-import com.google.common.base.Throwables;
-import com.google.common.collect.Iterables;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
-import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import net.ess3.api.Economy;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IItemDb;
-import net.ess3.api.IJails;
-import net.ess3.api.ISettings;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Server;
 import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
-import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.world.WorldLoadEvent;
@@ -80,16 +59,14 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.plugin.java.JavaPluginLoader;
 import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scheduler.BukkitTask;
 import org.yaml.snakeyaml.error.YAMLException;
 
 
-public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
+public class Essentials extends JavaPlugin implements IEssentials
 {
-	public static final int BUKKIT_VERSION = 3050;
-	private static final Logger LOGGER = Logger.getLogger("Essentials");
+	public static final int BUKKIT_VERSION = 2352;
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private transient ISettings settings;
 	private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this);
 	private transient Jails jails;
@@ -106,17 +83,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 	private transient I18n i18n;
 	private transient Metrics metrics;
 	private transient EssentialsTimer timer;
-	private final transient List<String> vanishedPlayers = new ArrayList<String>();
-	private transient Method oldGetOnlinePlayers;
-
-	public Essentials()
-	{
-	}
-
-	public Essentials(final Server server)
-	{
-		super(new JavaPluginLoader(server), new PluginDescriptionFile("Essentials", "", "com.earth2me.essentials.Essentials"), null, null);
-	}
+	private transient List<String> vanishedPlayers = new ArrayList<String>();
 
 	@Override
 	public ISettings getSettings()
@@ -137,161 +104,109 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 		}
 		i18n = new I18n(this);
 		i18n.onEnable();
-		i18n.updateLocale("en");
-		LOGGER.log(Level.INFO, tl("usingTempFolderForTesting"));
+		LOGGER.log(Level.INFO, _("usingTempFolderForTesting"));
 		LOGGER.log(Level.INFO, dataFolder.toString());
 		this.initialize(null, server, new PluginDescriptionFile(new FileReader(new File("src" + File.separator + "plugin.yml"))), dataFolder, null, null);
 		settings = new Settings(this);
+		i18n.updateLocale("en");
 		userMap = new UserMap(this);
 		permissionsHandler = new PermissionsHandler(this, false);
 		Economy.setEss(this);
-		confList = new ArrayList<IConf>();
-		jails = new Jails(this);
-		registerListeners(server.getPluginManager());
 	}
 
 	@Override
 	public void onEnable()
 	{
+		execTimer = new ExecuteTimer();
+		execTimer.start();
+		i18n = new I18n(this);
+		i18n.onEnable();
+		execTimer.mark("I18n1");
+		final PluginManager pm = getServer().getPluginManager();
+		for (Plugin plugin : pm.getPlugins())
+		{
+			if (plugin.getDescription().getName().startsWith("Essentials")
+				&& !plugin.getDescription().getVersion().equals(this.getDescription().getVersion())
+				&& !plugin.getDescription().getName().equals("EssentialsAntiCheat"))
+			{
+				LOGGER.log(Level.WARNING, _("versionMismatch", plugin.getDescription().getName()));
+			}
+		}
+		final Matcher versionMatch = Pattern.compile("git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*").matcher(getServer().getVersion());
+		if (versionMatch.matches())
+		{
+			final int versionNumber = Integer.parseInt(versionMatch.group(1));
+			if (versionNumber < BUKKIT_VERSION && versionNumber > 100)
+			{
+				LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
+				LOGGER.log(Level.SEVERE, _("notRecommendedBukkit"));
+				LOGGER.log(Level.SEVERE, _("requiredBukkit", Integer.toString(BUKKIT_VERSION)));
+				LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
+				this.setEnabled(false);
+				return;
+			}
+		}
+		else
+		{
+			LOGGER.log(Level.INFO, _("bukkitFormatChanged"));
+			LOGGER.log(Level.INFO, getServer().getVersion());
+			LOGGER.log(Level.INFO, getServer().getBukkitVersion());
+		}
+		execTimer.mark("BukkitCheck");
 		try
 		{
-			LOGGER.setParent(this.getLogger());
-			execTimer = new ExecuteTimer();
-			execTimer.start();
-			i18n = new I18n(this);
-			i18n.onEnable();
-			execTimer.mark("I18n1");
-			final PluginManager pm = getServer().getPluginManager();
-			for (Plugin plugin : pm.getPlugins())
+			final EssentialsUpgrade upgrade = new EssentialsUpgrade(this);
+			upgrade.beforeSettings();
+			execTimer.mark("Upgrade");
+			confList = new ArrayList<IConf>();
+			settings = new Settings(this);
+			confList.add(settings);
+			execTimer.mark("Settings");
+			upgrade.afterSettings();
+			execTimer.mark("Upgrade2");
+			i18n.updateLocale(settings.getLocale());
+			userMap = new UserMap(this);
+			confList.add(userMap);
+			execTimer.mark("Init(Usermap)");
+			warps = new Warps(getServer(), this.getDataFolder());
+			confList.add(warps);
+			execTimer.mark("Init(Spawn/Warp)");
+			worth = new Worth(this.getDataFolder());
+			confList.add(worth);
+			itemDb = new ItemDb(this);
+			confList.add(itemDb);
+			execTimer.mark("Init(Worth/ItemDB)");
+			reload();
+		}
+		catch (YAMLException exception)
+		{
+			if (pm.getPlugin("EssentialsUpdate") != null)
 			{
-				if (plugin.getDescription().getName().startsWith("Essentials")
-					&& !plugin.getDescription().getVersion().equals(this.getDescription().getVersion())
-					&& !plugin.getDescription().getName().equals("EssentialsAntiCheat"))
-				{
-					LOGGER.log(Level.WARNING, tl("versionMismatch", plugin.getDescription().getName()));
-				}
-			}
-			final Matcher versionMatch = Pattern.compile("git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*").matcher(getServer().getVersion());
-			if (versionMatch.matches())
-			{
-				final int versionNumber = Integer.parseInt(versionMatch.group(1));
-				if (versionNumber < BUKKIT_VERSION && versionNumber > 100)
-				{
-					wrongVersion();
-					this.setEnabled(false);
-					return;
-				}
+				LOGGER.log(Level.SEVERE, _("essentialsHelp2"));
 			}
 			else
 			{
-				LOGGER.log(Level.INFO, tl("bukkitFormatChanged"));
-				LOGGER.log(Level.INFO, getServer().getVersion());
-				LOGGER.log(Level.INFO, getServer().getBukkitVersion());
+				LOGGER.log(Level.SEVERE, _("essentialsHelp1"));
 			}
-			execTimer.mark("BukkitCheck");
-
-			for (Method method : Server.class.getDeclaredMethods())
+			LOGGER.log(Level.SEVERE, exception.toString());
+			pm.registerEvents(new Listener()
 			{
-				if (method.getName().endsWith("getOnlinePlayers") && method.getReturnType() == Player[].class)
+				@EventHandler(priority = EventPriority.LOW)
+				public void onPlayerJoin(final PlayerJoinEvent event)
 				{
-					oldGetOnlinePlayers = method;
-					break;
+					event.getPlayer().sendMessage("Essentials failed to load, read the log file.");
 				}
-			}
-
-			try
+			}, this);
+			for (Player player : getServer().getOnlinePlayers())
 			{
-				final EssentialsUpgrade upgrade = new EssentialsUpgrade(this);
-				upgrade.beforeSettings();
-				execTimer.mark("Upgrade");
-				confList = new ArrayList<IConf>();
-				settings = new Settings(this);
-				confList.add(settings);
-				execTimer.mark("Settings");
-				userMap = new UserMap(this);
-				confList.add(userMap);
-				execTimer.mark("Init(Usermap)");
-				upgrade.afterSettings();
-				execTimer.mark("Upgrade2");
-				i18n.updateLocale(settings.getLocale());
-				warps = new Warps(getServer(), this.getDataFolder());
-				confList.add(warps);
-				execTimer.mark("Init(Spawn/Warp)");
-				worth = new Worth(this.getDataFolder());
-				confList.add(worth);
-				itemDb = new ItemDb(this);
-				confList.add(itemDb);
-				execTimer.mark("Init(Worth/ItemDB)");
-				jails = new Jails(this);
-				confList.add(jails);
-				reload();
-			}
-			catch (YAMLException exception)
-			{
-				if (pm.getPlugin("EssentialsUpdate") != null)
-				{
-					LOGGER.log(Level.SEVERE, tl("essentialsHelp2"));
-				}
-				else
-				{
-					LOGGER.log(Level.SEVERE, tl("essentialsHelp1"));
-				}
-				handleCrash(exception);
-				return;
-			}
-			backup = new Backup(this);
-			permissionsHandler = new PermissionsHandler(this, settings.useBukkitPermissions());
-			alternativeCommandsHandler = new AlternativeCommandsHandler(this);
-
-			timer = new EssentialsTimer(this);
-			scheduleSyncRepeatingTask(timer, 1000, 50);
-
-			Economy.setEss(this);
-			execTimer.mark("RegHandler");
-
-			final MetricsStarter metricsStarter = new MetricsStarter(this);
-			if (metricsStarter.getStart() != null && metricsStarter.getStart() == true)
-			{
-				runTaskLaterAsynchronously(metricsStarter, 1);
-			}
-			else if (metricsStarter.getStart() != null && metricsStarter.getStart() == false)
-			{
-				final MetricsListener metricsListener = new MetricsListener(this, metricsStarter);
-				pm.registerEvents(metricsListener, this);
-			}
-
-			final String timeroutput = execTimer.end();
-			if (getSettings().isDebug())
-			{
-				LOGGER.log(Level.INFO, "Essentials load {0}", timeroutput);
+				player.sendMessage("Essentials failed to load, read the log file.");
 			}
+			this.setEnabled(false);
+			return;
 		}
-		catch (NumberFormatException ex)
-		{
-			handleCrash(ex);
-		}
-		catch (Error ex)
-		{
-			handleCrash(ex);
-			throw ex;
-		}
-	}
-
-	@Override
-	public void saveConfig()
-	{
-		// We don't use any of the bukkit config writing, as this breaks our config file formatting.
-	}
-
-	private void registerListeners(PluginManager pm)
-	{
-		HandlerList.unregisterAll(this);
-
-		if (getSettings().isDebug())
-		{
-			LOGGER.log(Level.INFO, "Registering Listeners");
-		}
-
+		backup = new Backup(this);
+		permissionsHandler = new PermissionsHandler(this, settings.useBukkitPermissions());
+		alternativeCommandsHandler = new AlternativeCommandsHandler(this);
 		final EssentialsPluginListener serverListener = new EssentialsPluginListener(this);
 		pm.registerEvents(serverListener, this);
 		confList.add(serverListener);
@@ -317,37 +232,51 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 		final EssentialsWorldListener worldListener = new EssentialsWorldListener(this);
 		pm.registerEvents(worldListener, this);
 
+		//TODO: Check if this should be here, and not above before reload()
+		jails = new Jails(this);
+		confList.add(jails);
+
 		pm.registerEvents(tntListener, this);
 
-		jails.resetListener();
+		timer = new EssentialsTimer(this);
+		getScheduler().scheduleSyncRepeatingTask(this, timer, 100, 100);
+
+		Economy.setEss(this);
+		execTimer.mark("RegListeners");
+
+		final MetricsStarter metricsStarter = new MetricsStarter(this);
+		if (metricsStarter.getStart() != null && metricsStarter.getStart() == true)
+		{
+			getScheduler().scheduleAsyncDelayedTask(this, metricsStarter, 1);
+		}
+		else if (metricsStarter.getStart() != null && metricsStarter.getStart() == false)
+		{
+			final MetricsListener metricsListener = new MetricsListener(this, metricsStarter);
+			pm.registerEvents(metricsListener, this);
+		}
+
+		final String timeroutput = execTimer.end();
+		if (getSettings().isDebug())
+		{
+			LOGGER.log(Level.INFO, "Essentials load " + timeroutput);
+		}
 	}
 
 	@Override
 	public void onDisable()
 	{
-		for (User user : getOnlineUsers())
+		for (Player p : getServer().getOnlinePlayers())
 		{
+			User user = getUser(p);
 			if (user.isVanished())
 			{
-				user.setVanished(false);
-				user.sendMessage(tl("unvanishedReload"));
+				user.toggleVanished();
+				p.sendMessage(_("unvanishedReload"));
 			}
-			user.stopTransaction();
-		}
-		cleanupOpenInventories();
-		if (i18n != null)
-		{
-			i18n.onDisable();
-		}
-		if (backup != null)
-		{
-			backup.stopTask();
 		}
+		i18n.onDisable();
 		Economy.setEss(null);
 		Trade.closeLog();
-		getUserMap().getUUIDMap().forceWriteUUIDMap();
-		
-		HandlerList.unregisterAll(this);
 	}
 
 	@Override
@@ -362,38 +291,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 		}
 
 		i18n.updateLocale(settings.getLocale());
-
-		final PluginManager pm = getServer().getPluginManager();
-		registerListeners(pm);
-	}
-
-	@Override
-	public List<String> onTabComplete(CommandSender sender,
-									  Command command,
-									  String commandLabel,
-									  String[] args)
-	{
-		// Allow plugins to override the command via onCommand
-		if (!getSettings().isCommandOverridden(command.getName()) && (!commandLabel.startsWith("e") || commandLabel.equalsIgnoreCase(command.getName())))
-		{
-			final PluginCommand pc = alternativeCommandsHandler.getAlternative(commandLabel);
-			if (pc != null)
-			{
-				try
-				{
-					TabCompleter completer = pc.getTabCompleter();
-					if (completer != null)
-					{
-						return completer.onTabComplete(sender, command, commandLabel, args);
-					}
-				}
-				catch (final Exception ex)
-				{
-					Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
-				}
-			}
-		}
-		return null;
 	}
 
 	@Override
@@ -403,7 +300,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 	}
 
 	@Override
-	public boolean onCommandEssentials(final CommandSender cSender, final Command command, final String commandLabel, final String[] args, final ClassLoader classLoader, final String commandPath, final String permissionPrefix, final IEssentialsModule module)
+	public boolean onCommandEssentials(final CommandSender sender, final Command command, final String commandLabel, final String[] args, final ClassLoader classLoader, final String commandPath, final String permissionPrefix, final IEssentialsModule module)
 	{
 		// Allow plugins to override the command via onCommand
 		if (!getSettings().isCommandOverridden(command.getName()) && (!commandLabel.startsWith("e") || commandLabel.equalsIgnoreCase(command.getName())))
@@ -411,15 +308,15 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 			final PluginCommand pc = alternativeCommandsHandler.getAlternative(commandLabel);
 			if (pc != null)
 			{
-				alternativeCommandsHandler.executed(commandLabel, pc);
+				alternativeCommandsHandler.executed(commandLabel, pc.getLabel());
 				try
 				{
-					return pc.execute(cSender, commandLabel, args);
+					return pc.execute(sender, commandLabel, args);
 				}
 				catch (final Exception ex)
 				{
 					Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
-					cSender.sendMessage(ChatColor.RED + "An internal error occurred while attempting to perform this command");
+					sender.sendMessage(ChatColor.RED + "An internal error occurred while attempting to perform this command");
 					return true;
 				}
 			}
@@ -427,53 +324,22 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 
 		try
 		{
-
 			User user = null;
-			Block bSenderBlock = null;
-			if (cSender instanceof Player)
+			if (sender instanceof Player)
 			{
-				user = getUser((Player)cSender);
+				user = getUser(sender);
 			}
-			else if (cSender instanceof BlockCommandSender)
-			{
-				BlockCommandSender bsender = (BlockCommandSender)cSender;
-				bSenderBlock = bsender.getBlock();
-			}
-
-			if (bSenderBlock != null)
-			{
-				Bukkit.getLogger().log(Level.INFO, "CommandBlock at {0},{1},{2} issued server command: /{3} {4}", new Object[]
-				{
-					bSenderBlock.getX(), bSenderBlock.getY(), bSenderBlock.getZ(), commandLabel, EssentialsCommand.getFinalArg(args, 0)
-				});
-			}
-			else if (user == null)
-			{
-				Bukkit.getLogger().log(Level.INFO, "{0} issued server command: /{1} {2}", new Object[]
-				{
-					cSender.getName(), commandLabel, EssentialsCommand.getFinalArg(args, 0)
-				});
-			}
-
-			CommandSource sender = new CommandSource(cSender);
 
 			// New mail notification
-			if (user != null && !getSettings().isCommandDisabled("mail") && !command.getName().equals("mail") && user.isAuthorized("essentials.mail"))
+			if (user != null && !getSettings().isCommandDisabled("mail") && !commandLabel.equals("mail") && user.isAuthorized("essentials.mail"))
 			{
 				final List<String> mail = user.getMails();
 				if (mail != null && !mail.isEmpty())
 				{
-					user.sendMessage(tl("youHaveNewMail", mail.size()));
+					user.sendMessage(_("youHaveNewMail", mail.size()));
 				}
 			}
 
-			//Print version even if admin command is not available #easteregg
-			if (commandLabel.equalsIgnoreCase("essversion"))
-			{
-				sender.sendMessage("This server is running Essentials " + getDescription().getVersion());
-				return true;
-			}
-
 			// Check for disabled commands
 			if (getSettings().isCommandDisabled(commandLabel))
 			{
@@ -489,29 +355,16 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 			}
 			catch (Exception ex)
 			{
-				sender.sendMessage(tl("commandNotLoaded", commandLabel));
-				LOGGER.log(Level.SEVERE, tl("commandNotLoaded", commandLabel), ex);
+				sender.sendMessage(_("commandNotLoaded", commandLabel));
+				LOGGER.log(Level.SEVERE, _("commandNotLoaded", commandLabel), ex);
 				return true;
 			}
 
 			// Check authorization
 			if (user != null && !user.isAuthorized(cmd, permissionPrefix))
 			{
-				LOGGER.log(Level.INFO, tl("deniedAccessCommand", user.getName()));
-				user.sendMessage(tl("noAccessCommand"));
-				return true;
-			}
-
-			if (user != null && user.isJailed() && !user.isAuthorized(cmd, "essentials.jail.allow."))
-			{
-				if (user.getJailTimeout() > 0)
-				{
-					user.sendMessage(tl("playerJailedFor", user.getName(), DateUtil.formatDateDiff(user.getJailTimeout())));
-				}
-				else
-				{
-					user.sendMessage(tl("jailMessage"));
-				}
+				LOGGER.log(Level.WARNING, _("deniedAccessCommand", user.getName()));
+				user.sendMessage(_("noAccessCommand"));
 				return true;
 			}
 
@@ -532,10 +385,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 			{
 				return true;
 			}
-			catch (QuietAbortException ex)
-			{
-				return true;
-			}
 			catch (NotEnoughArgumentsException ex)
 			{
 				sender.sendMessage(command.getDescription());
@@ -546,7 +395,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 				}
 				return true;
 			}
-			catch (Exception ex)
+			catch (Throwable ex)
 			{
 				showError(sender, ex, commandLabel);
 				return true;
@@ -554,48 +403,21 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 		}
 		catch (Throwable ex)
 		{
-			LOGGER.log(Level.SEVERE, tl("commandFailed", commandLabel), ex);
+			LOGGER.log(Level.SEVERE, _("commandFailed", commandLabel), ex);
 			return true;
 		}
 	}
 
-	public void cleanupOpenInventories()
-	{
-		for (User user : getOnlineUsers())
-		{
-			if (user.isRecipeSee())
-			{
-				user.getBase().getOpenInventory().getTopInventory().clear();
-				user.getBase().getOpenInventory().close();
-				user.setRecipeSee(false);
-			}
-			if (user.isInvSee() || user.isEnderSee())
-			{
-				user.getBase().getOpenInventory().close();
-				user.setInvSee(false);
-				user.setEnderSee(false);
-			}
-		}
-	}
-
 	@Override
-	public void showError(final CommandSource sender, final Throwable exception, final String commandLabel)
+	public void showError(final CommandSender sender, final Throwable exception, final String commandLabel)
 	{
-		sender.sendMessage(tl("errorWithMessage", exception.getMessage()));
+		sender.sendMessage(_("errorWithMessage", exception.getMessage()));
 		if (getSettings().isDebug())
 		{
-			LOGGER.log(Level.INFO, tl("errorCallingCommand", commandLabel), exception);
+			LOGGER.log(Level.WARNING, _("errorCallingCommand", commandLabel), exception);
 		}
 	}
 
-	public static void wrongVersion()
-	{
-		LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
-		LOGGER.log(Level.SEVERE, tl("notRecommendedBukkit"));
-		LOGGER.log(Level.SEVERE, tl("requiredBukkit", Integer.toString(BUKKIT_VERSION)));
-		LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
-	}
-
 	@Override
 	public BukkitScheduler getScheduler()
 	{
@@ -626,19 +448,16 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 		return backup;
 	}
 
-	@Override
 	public Metrics getMetrics()
 	{
 		return metrics;
 	}
 
-	@Override
 	public void setMetrics(Metrics metrics)
 	{
 		this.metrics = metrics;
 	}
 
-	@Deprecated
 	@Override
 	public User getUser(final Object base)
 	{
@@ -646,79 +465,40 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 		{
 			return getUser((Player)base);
 		}
-		if (base instanceof org.bukkit.OfflinePlayer)
-		{
-			return getUser(((org.bukkit.OfflinePlayer)base).getUniqueId());
-		}
-		if (base instanceof UUID)
-		{
-			return getUser((UUID)base);
-		}
 		if (base instanceof String)
 		{
-			return getOfflineUser((String)base);
+			final User user = userMap.getUser((String)base);
+			if (user != null && user.getBase() instanceof OfflinePlayer)
+			{
+				((OfflinePlayer)user.getBase()).setName((String)base);
+			}
+			return user;
 		}
 		return null;
 	}
 
-	//This will return null if there is not a match.
-	@Override
-	public User getUser(final String base)
-	{
-		return getOfflineUser(base);
-	}
-
-	//This will return null if there is not a match.
-	@Override
-	public User getUser(final UUID base)
-	{
-		return userMap.getUser(base);
-	}
-
-	//This will return null if there is not a match.
-	@Override
-	public User getOfflineUser(final String name)
-	{
-		final User user = userMap.getUser(name);
-		if (user != null && user.getBase() instanceof OfflinePlayer)
-		{
-			//This code should attempt to use the last known name of a user, if Bukkit returns name as null.
-			final String lastName = user.getLastAccountName();
-			if (lastName != null)
-			{
-				((OfflinePlayer)user.getBase()).setName(lastName);
-			}
-			else
-			{
-				((OfflinePlayer)user.getBase()).setName(name);
-			}
-		}
-		return user;
-	}
-
-	//This will create a new user if there is not a match.
-	@Override
-	public User getUser(final Player base)
+	private <T extends Player> User getUser(final T base)
 	{
 		if (base == null)
 		{
 			return null;
 		}
 
+		if (base instanceof User)
+		{
+			return (User)base;
+		}
+
 		if (userMap == null)
 		{
 			LOGGER.log(Level.WARNING, "Essentials userMap not initialized");
 			return null;
 		}
 
-		User user = userMap.getUser(base.getUniqueId());
+		User user = userMap.getUser(base.getName());
 
 		if (user == null)
 		{
-			if (getSettings().isDebug())
-			{
-				LOGGER.log(Level.INFO, "Constructing new userfile from base player {0}", base.getName());
-			}
 			user = new User(base, this);
 		}
 		else
@@ -728,23 +508,15 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 		return user;
 	}
 
-	private void handleCrash(Throwable exception)
+	@Override
+	public User getOfflineUser(final String name)
 	{
-		final PluginManager pm = getServer().getPluginManager();
-		LOGGER.log(Level.SEVERE, exception.toString());
-		pm.registerEvents(new Listener()
+		final User user = userMap.getUser(name);
+		if (user != null && user.getBase() instanceof OfflinePlayer)
 		{
-			@EventHandler(priority = EventPriority.LOW)
-			public void onPlayerJoin(final PlayerJoinEvent event)
-			{
-				event.getPlayer().sendMessage("Essentials failed to load, read the log file.");
-			}
-		}, this);
-		for (Player player : getOnlinePlayers())
-		{
-			player.sendMessage("Essentials failed to load, read the log file.");
+			((OfflinePlayer)user.getBase()).setName(name);
 		}
-		this.setEnabled(false);
+		return user;
 	}
 
 	@Override
@@ -773,71 +545,35 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 		return paymentMethod;
 	}
 
-	@Override
-	public int broadcastMessage(final String message)
-	{
-		return broadcastMessage(null, null, message, true);
-	}
-
 	@Override
 	public int broadcastMessage(final IUser sender, final String message)
 	{
-		return broadcastMessage(sender, null, message, false);
-	}
-
-	@Override
-	public int broadcastMessage(final String permission, final String message)
-	{
-		return broadcastMessage(null, permission, message, false);
-	}
-
-	private int broadcastMessage(final IUser sender, final String permission, final String message, final boolean keywords)
-	{
-		if (sender != null && sender.isHidden())
+		if (sender == null)
+		{
+			return getServer().broadcastMessage(message);
+		}
+		if (sender.isHidden())
 		{
 			return 0;
 		}
-
-		IText broadcast = new SimpleTextInput(message);
-
-		final Collection<Player> players = getOnlinePlayers();
+		final Player[] players = getServer().getOnlinePlayers();
 
 		for (Player player : players)
 		{
 			final User user = getUser(player);
-			if ((permission == null && (sender == null || !user.isIgnoredPlayer(sender)))
-				|| (permission != null && user.isAuthorized(permission)))
+			if (!user.isIgnoredPlayer(sender))
 			{
-				if (keywords)
-				{
-					broadcast = new KeywordReplacer(broadcast, new CommandSource(player), this, false);
-				}
-				for (String messageText : broadcast.getLines())
-				{
-					user.sendMessage(messageText);
-				}
+				player.sendMessage(message);
 			}
 		}
 
-		return players.size();
+		return players.length;
 	}
 
 	@Override
-	public BukkitTask runTaskAsynchronously(final Runnable run)
+	public int scheduleAsyncDelayedTask(final Runnable run)
 	{
-		return this.getScheduler().runTaskAsynchronously(this, run);
-	}
-
-	@Override
-	public BukkitTask runTaskLaterAsynchronously(final Runnable run, final long delay)
-	{
-		return this.getScheduler().runTaskLaterAsynchronously(this, run, delay);
-	}
-	
-	@Override
-	public BukkitTask runTaskTimerAsynchronously(final Runnable run, final long delay, final long period)
-	{
-		return this.getScheduler().runTaskTimerAsynchronously(this, run, delay, period);
+		return this.getScheduler().scheduleAsyncDelayedTask(this, run);
 	}
 
 	@Override
@@ -877,7 +613,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 	}
 
 	@Override
-	public IItemDb getItemDb()
+	public ItemDb getItemDb()
 	{
 		return itemDb;
 	}
@@ -906,43 +642,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 		return vanishedPlayers;
 	}
 
-	@Override
-	public Collection<Player> getOnlinePlayers()
-	{
-		try
-		{
-			return (Collection<Player>)getServer().getOnlinePlayers(); // Needed for sanity here, the Bukkit API is a bit broken in the sense it only allows subclasses of Player to this list
-		}
-		catch (NoSuchMethodError ex)
-		{
-			try
-			{
-				return Arrays.asList((Player[])oldGetOnlinePlayers.invoke(getServer()));
-			}
-			catch (InvocationTargetException ex1)
-			{
-				throw Throwables.propagate(ex.getCause());
-			}
-			catch (IllegalAccessException ex1)
-			{
-				throw new RuntimeException("Error invoking oldGetOnlinePlayers", ex1);
-			}
-		}
-	}
-
-	@Override
-	public Iterable<User> getOnlineUsers()
-	{
-		return Iterables.transform(getOnlinePlayers(), new Function<Player, User>()
-		{
-
-			@Override
-			public User apply(Player player)
-			{
-				return getUser(player);
-			}
-		});
-	}
 
 	private static class EssentialsWorldListener implements Listener, Runnable
 	{

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

@@ -1,13 +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;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.CreatureSpawner;
-import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -28,44 +21,26 @@ public class EssentialsBlockListener implements Listener
 	public void onBlockPlace(final BlockPlaceEvent event)
 	{
 		// Do not rely on getItemInHand();
-		// http://leaky.bukkit.org/issues/663
-		final ItemStack is = LocationUtil.convertBlockToItem(event.getBlockPlaced());
+		// http://leaky.bukkit.org/issues/663		
+		final ItemStack is = Util.convertBlockToItem(event.getBlockPlaced());
 		if (is == null)
 		{
 			return;
 		}
-
-		if (is.getType() == Material.MOB_SPAWNER && event.getItemInHand() != null && event.getPlayer() != null
-			&& event.getItemInHand().getType() == Material.MOB_SPAWNER)
-		{
-			final BlockState blockState = event.getBlockPlaced().getState();
-			if (blockState instanceof CreatureSpawner)
-			{
-				final CreatureSpawner spawner = (CreatureSpawner)blockState;
-				final EntityType type = EntityType.fromId(event.getItemInHand().getData().getData());
-				if (type != null && Mob.fromBukkitType(type) != null)
-				{
-					if (ess.getUser(event.getPlayer()).isAuthorized("essentials.spawnerconvert." + Mob.fromBukkitType(type).name().toLowerCase(Locale.ENGLISH)))
-					{
-						spawner.setSpawnedType(type);
-					}
-				}
-			}
-		}
-
 		final User user = ess.getUser(event.getPlayer());
-		if (user.hasUnlimited(is) && user.getBase().getGameMode() == GameMode.SURVIVAL)
+		final boolean unlimitedForUser = user.hasUnlimited(is);
+		if (unlimitedForUser && user.getGameMode() == GameMode.SURVIVAL)
 		{
-			class UnlimitedItemSpawnTask implements Runnable
-			{
-				@Override
-				public void run()
-				{
-					user.getBase().getInventory().addItem(is);
-					user.getBase().updateInventory();
-				}
-			}
-			ess.scheduleSyncDelayedTask(new UnlimitedItemSpawnTask());
+			ess.scheduleSyncDelayedTask(
+					new Runnable()
+					{
+						@Override
+						public void run()
+						{
+							user.getInventory().addItem(is);
+							user.updateInventory();
+						}
+					});
 		}
 	}
 }

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

@@ -1,25 +1,16 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import com.google.common.io.Files;
 import java.io.*;
-import java.math.BigDecimal;
-import java.math.MathContext;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CoderResult;
 import java.util.*;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import net.ess3.api.InvalidWorldException;
 import org.bukkit.*;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.ConfigurationSection;
@@ -32,34 +23,27 @@ import org.bukkit.util.Vector;
 
 public class EssentialsConf extends YamlConfiguration
 {
-	protected static final Logger LOGGER = Logger.getLogger("Essentials");
-	protected final File configFile;
-	protected String templateName = null;
-	protected static final Charset UTF8 = Charset.forName("UTF-8");
-	private Class<?> resourceClass = EssentialsConf.class;
-	private static final ExecutorService EXECUTOR_SERVICE = Executors.newSingleThreadExecutor();
-	private final AtomicInteger pendingDiskWrites = new AtomicInteger(0);
-	private final AtomicBoolean transaction = new AtomicBoolean(false);
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+	private transient File configFile;
+	private transient String templateName = null;
+	private transient Class<?> resourceClass = EssentialsConf.class;
+	private static final Charset UTF8 = Charset.forName("UTF-8");
 
 	public EssentialsConf(final File configFile)
 	{
 		super();
-		this.configFile = configFile.getAbsoluteFile();
+		this.configFile = configFile;
 	}
 	private final byte[] bytebuffer = new byte[1024];
 
 	public synchronized void load()
 	{
-		if (pendingDiskWrites.get() != 0)
-		{
-			LOGGER.log(Level.INFO, "File {0} not read, because it''s not yet written to disk.", configFile);
-			return;
-		}
+		configFile = configFile.getAbsoluteFile();
 		if (!configFile.getParentFile().exists())
 		{
 			if (!configFile.getParentFile().mkdirs())
 			{
-				LOGGER.log(Level.SEVERE, tl("failedToCreateConfig", configFile.toString()));
+				LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()));
 			}
 		}
 		// This will delete files where the first character is 0. In most cases they are broken.
@@ -100,17 +84,9 @@ public class EssentialsConf extends YamlConfiguration
 
 		if (!configFile.exists())
 		{
-			if (legacyFileExists())
+			if (templateName != null)
 			{
-				convertLegacyFile();
-			}
-			else if (altFileExists())
-			{
-				convertAltFile();
-			}
-			else if (templateName != null)
-			{
-				LOGGER.log(Level.INFO, tl("creatingConfigFromTemplate", configFile.toString()));
+				LOGGER.log(Level.INFO, _("creatingConfigFromTemplate", configFile.toString()));
 				createFromTemplate();
 			}
 			else
@@ -125,28 +101,14 @@ public class EssentialsConf extends YamlConfiguration
 			final FileInputStream inputStream = new FileInputStream(configFile);
 			try
 			{
-				long startSize = configFile.length();
-				if (startSize > Integer.MAX_VALUE)
-				{
-					throw new InvalidConfigurationException("File too big");
-				}
-				ByteBuffer buffer = ByteBuffer.allocate((int)startSize);
+				final ByteBuffer buffer = ByteBuffer.allocate((int)configFile.length());
 				int length;
 				while ((length = inputStream.read(bytebuffer)) != -1)
 				{
-					if (length > buffer.remaining())
-					{
-						ByteBuffer resize = ByteBuffer.allocate(buffer.capacity() + length - buffer.remaining());
-						int resizePosition = buffer.position();
-						buffer.rewind();
-						resize.put(buffer);
-						resize.position(resizePosition);
-						buffer = resize;
-					}
 					buffer.put(bytebuffer, 0, length);
 				}
 				buffer.rewind();
-				final CharBuffer data = CharBuffer.allocate(buffer.capacity());
+				final CharBuffer data = CharBuffer.allocate((int)configFile.length());
 				CharsetDecoder decoder = UTF8.newDecoder();
 				CoderResult result = decoder.decode(buffer, data, true);
 				if (result.isError())
@@ -190,26 +152,6 @@ public class EssentialsConf extends YamlConfiguration
 		}
 	}
 
-	public boolean legacyFileExists()
-	{
-		return false;
-	}
-
-	public void convertLegacyFile()
-	{
-		LOGGER.log(Level.SEVERE, "Unable to import legacy config file.");
-	}
-
-	public boolean altFileExists()
-	{
-		return false;
-	}
-
-	public void convertAltFile()
-	{
-		LOGGER.log(Level.SEVERE, "Unable to import alt config file.");
-	}
-
 	private void createFromTemplate()
 	{
 		InputStream istr = null;
@@ -219,7 +161,7 @@ public class EssentialsConf extends YamlConfiguration
 			istr = resourceClass.getResourceAsStream(templateName);
 			if (istr == null)
 			{
-				LOGGER.log(Level.SEVERE, tl("couldNotFindTemplate", templateName));
+				LOGGER.log(Level.SEVERE, _("couldNotFindTemplate", templateName));
 				return;
 			}
 			ostr = new FileOutputStream(configFile);
@@ -234,7 +176,7 @@ public class EssentialsConf extends YamlConfiguration
 		}
 		catch (IOException ex)
 		{
-			LOGGER.log(Level.SEVERE, tl("failedToWriteConfig", configFile.toString()), ex);
+			LOGGER.log(Level.SEVERE, _("failedToWriteConfig", configFile.toString()), ex);
 		}
 		finally
 		{
@@ -258,7 +200,7 @@ public class EssentialsConf extends YamlConfiguration
 			}
 			catch (IOException ex)
 			{
-				LOGGER.log(Level.SEVERE, tl("failedToCloseConfig", configFile.toString()), ex);
+				LOGGER.log(Level.SEVERE, _("failedToCloseConfig", configFile.toString()), ex);
 			}
 		}
 	}
@@ -279,180 +221,14 @@ public class EssentialsConf extends YamlConfiguration
 		this.resourceClass = resClass;
 	}
 
-	public void startTransaction()
-	{
-		transaction.set(true);
-	}
-
-	public void stopTransaction()
-	{
-		transaction.set(false);
-		save();
-	}
-
-	public void save()
-	{
-		try
-		{
-			save(configFile);
-		}
-		catch (IOException ex)
-		{
-			LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
-		}
-	}
-
-	public void saveWithError() throws IOException
-	{
-		save(configFile);
-	}
-
-	@Override
-	public synchronized void save(final File file) throws IOException
-	{
-		if (!transaction.get())
-		{
-			delayedSave(file);
-		}
-	}
-
-	//This may be aborted if there are stagnant requests sitting in queue.
-	//This needs fixed to discard outstanding save requests.
-	public synchronized void forceSave()
-	{
-		try
-		{
-			Future<?> future = delayedSave(configFile);
-			if (future != null)
-			{
-				future.get();
-			}
-		}
-		catch (InterruptedException ex)
-		{
-			LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
-		}
-		catch (ExecutionException ex)
-		{
-			LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
-		}
-	}
-
-	public synchronized void cleanup()
-	{
-		forceSave();
-	}
-
-	private Future<?> delayedSave(final File file)
-	{
-		if (file == null)
-		{
-			throw new IllegalArgumentException("File cannot be null");
-		}
-
-		final String data = saveToString();
-
-		if (data.length() == 0)
-		{
-			return null;
-		}
-
-		Future<?> future = EXECUTOR_SERVICE.submit(new WriteRunner(configFile, data, pendingDiskWrites));
-
-		return future;
-	}
-
-
-	private static class WriteRunner implements Runnable
-	{
-		private final File configFile;
-		private final String data;
-		private final AtomicInteger pendingDiskWrites;
-
-		private WriteRunner(final File configFile, final String data, final AtomicInteger pendingDiskWrites)
-		{
-			this.configFile = configFile;
-			this.data = data;
-			this.pendingDiskWrites = pendingDiskWrites;
-		}
-
-		@Override
-		public void run()
-		{
-			//long startTime = System.nanoTime();
-			synchronized (configFile)
-			{
-				if (pendingDiskWrites.get() > 1)
-				{
-					// Writes can be skipped, because they are stored in a queue (in the executor).
-					// Only the last is actually written.
-					pendingDiskWrites.decrementAndGet();
-					//LOGGER.log(Level.INFO, configFile + " skipped writing in " + (System.nanoTime() - startTime) + " nsec.");
-					return;
-				}
-				try
-				{
-					Files.createParentDirs(configFile);
-
-					if (!configFile.exists())
-					{
-						try
-						{
-							LOGGER.log(Level.INFO, tl("creatingEmptyConfig", configFile.toString()));
-							if (!configFile.createNewFile())
-							{
-								LOGGER.log(Level.SEVERE, tl("failedToCreateConfig", configFile.toString()));
-								return;
-							}
-						}
-						catch (IOException ex)
-						{
-							LOGGER.log(Level.SEVERE, tl("failedToCreateConfig", configFile.toString()), ex);
-							return;
-						}
-					}
-
-					final FileOutputStream fos = new FileOutputStream(configFile);
-					try
-					{
-						final OutputStreamWriter writer = new OutputStreamWriter(fos, UTF8);
-
-						try
-						{
-							writer.write(data);
-						}
-						finally
-						{
-							writer.close();
-						}
-					}
-					finally
-					{
-						fos.close();
-					}
-				}
-				catch (IOException e)
-				{
-					LOGGER.log(Level.SEVERE, e.getMessage(), e);
-				}
-				finally
-				{
-					//LOGGER.log(Level.INFO, configFile + " written to disk in " + (System.nanoTime() - startTime) + " nsec.");
-					pendingDiskWrites.decrementAndGet();
-				}
-			}
-		}
-	}
-
 	public boolean hasProperty(final String path)
 	{
 		return isSet(path);
 	}
 
-	public Location getLocation(final String path, final Server server) throws InvalidWorldException
+	public Location getLocation(final String path, final Server server) throws Exception
 	{
-		final String worldString = (path == null ? "" : path + ".") + "world";
-		final String worldName = getString(worldString);
+		final String worldName = getString((path == null ? "" : path + ".") + "world");
 		if (worldName == null || worldName.isEmpty())
 		{
 			return null;
@@ -460,7 +236,7 @@ public class EssentialsConf extends YamlConfiguration
 		final World world = server.getWorld(worldName);
 		if (world == null)
 		{
-			throw new InvalidWorldException(worldName);
+			throw new Exception(_("invalidWorld"));
 		}
 		return new Location(world,
 							getDouble((path == null ? "" : path + ".") + "x", 0),
@@ -529,14 +305,89 @@ public class EssentialsConf extends YamlConfiguration
 		set(path, map);
 	}
 
-	public void setProperty(String path, List object)
+	public long getLong(final String path, final long def)
 	{
-		set(path, new ArrayList(object));
+		try
+		{
+			final Number num = (Number)get(path);
+			return num == null ? def : num.longValue();
+		}
+		catch (ClassCastException ex)
+		{
+			return def;
+		}
 	}
 
-	public void setProperty(String path, Map object)
+	@Override
+	public double getDouble(final String path, final double def)
 	{
-		set(path, new LinkedHashMap(object));
+		try
+		{
+			Number num = (Number)get(path);
+			return num == null ? def : num.doubleValue();
+		}
+		catch (ClassCastException ex)
+		{
+			return def;
+		}
+	}
+
+	public void save()
+	{
+		try
+		{
+			save(configFile);
+		}
+		catch (IOException ex)
+		{
+			LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
+		}
+	}
+
+	@Override
+	public synchronized void save(final File file) throws IOException
+	{
+		if (file == null)
+		{
+			throw new IllegalArgumentException("File cannot be null");
+		}
+
+		Files.createParentDirs(file);
+
+		final String data = saveToString();
+
+		if (data.length() == 0)
+		{
+			return;
+		}
+
+		if (!configFile.exists())
+		{
+			try
+			{
+				LOGGER.log(Level.INFO, _("creatingEmptyConfig", configFile.toString()));
+				if (!configFile.createNewFile())
+				{
+					LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()));
+				}
+			}
+			catch (IOException ex)
+			{
+				LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()), ex);
+			}
+		}
+
+
+		final OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(file), UTF8);
+
+		try
+		{
+			writer.write(data);
+		}
+		finally
+		{
+			writer.close();
+		}
 	}
 
 	public Object getProperty(String path)
@@ -544,11 +395,6 @@ public class EssentialsConf extends YamlConfiguration
 		return get(path);
 	}
 
-	public void setProperty(final String path, final BigDecimal bigDecimal)
-	{
-		set(path, bigDecimal.toString());
-	}
-
 	public void setProperty(String path, Object object)
 	{
 		set(path, object);
@@ -571,35 +417,6 @@ public class EssentialsConf extends YamlConfiguration
 		return super.get(path, def);
 	}
 
-	public synchronized BigDecimal getBigDecimal(final String path, final BigDecimal def)
-	{
-		final String input = super.getString(path);
-		return toBigDecimal(input, def);
-	}
-
-	public static BigDecimal toBigDecimal(final String input, final BigDecimal def)
-	{
-		if (input == null || input.isEmpty())
-		{
-			return def;
-		}
-		else
-		{
-			try
-			{
-				return new BigDecimal(input, MathContext.DECIMAL128);
-			}
-			catch (NumberFormatException e)
-			{
-				return def;
-			}
-			catch (ArithmeticException e)
-			{
-				return def;
-			}
-		}
-	}
-
 	@Override
 	public synchronized boolean getBoolean(String path)
 	{
@@ -642,12 +459,6 @@ public class EssentialsConf extends YamlConfiguration
 		return super.getDouble(path);
 	}
 
-	@Override
-	public synchronized double getDouble(final String path, final double def)
-	{
-		return super.getDouble(path, def);
-	}
-
 	@Override
 	public synchronized List<Double> getDoubleList(String path)
 	{
@@ -708,12 +519,6 @@ public class EssentialsConf extends YamlConfiguration
 		return super.getLong(path);
 	}
 
-	@Override
-	public synchronized long getLong(final String path, final long def)
-	{
-		return super.getLong(path, def);
-	}
-
 	@Override
 	public synchronized List<Long> getLongList(String path)
 	{

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

@@ -1,25 +1,25 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
+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.*;
+import org.bukkit.entity.Ageable;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.entity.*;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
+import org.bukkit.event.entity.*;
 import org.bukkit.inventory.ItemStack;
 
 
 public class EssentialsEntityListener implements Listener
 {
-	private static final Logger LOGGER = Logger.getLogger("Essentials");
-	private static final transient Pattern powertoolPlayer = Pattern.compile("\\{player\\}");
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private final IEssentials ess;
 
 	public EssentialsEntityListener(IEssentials ess)
@@ -27,107 +27,80 @@ public class EssentialsEntityListener implements Listener
 		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)
+		if (eDefend instanceof Player && eAttack instanceof Player)
 		{
-			final User attacker = ess.getUser((Player)eAttack);
-			if (eDefend instanceof Player)
+			final User defender = ess.getUser(eDefend);
+			final User attacker = ess.getUser(eAttack);
+
+			if (ess.getSettings().getLoginAttackDelay() > 0 && !attacker.isAuthorized("essentials.pvpdelay.exempt")
+				&& (System.currentTimeMillis() < (attacker.getLastLogin() + ess.getSettings().getLoginAttackDelay())))
 			{
-				onPlayerVsPlayerDamage(event, (Player)eDefend, attacker);
+				event.setCancelled(true);
 			}
-			else if (eDefend instanceof Ageable)
+
+			if (attacker.hasInvulnerabilityAfterTeleport() || defender.hasInvulnerabilityAfterTeleport())
 			{
-				final ItemStack hand = attacker.getBase().getItemInHand();
+				event.setCancelled(true);
+			}
+
+			if (attacker.isGodModeEnabled() && !attacker.isAuthorized("essentials.god.pvp"))
+			{
+				event.setCancelled(true);
+			}
+
+			attacker.updateActivity(true);
+			final List<String> commandList = attacker.getPowertool(attacker.getItemInHand());
+			if (commandList != null && !commandList.isEmpty())
+			{
+				for (final String command : commandList)
+				{
+					if (command != null && !command.isEmpty())
+					{
+						ess.scheduleSyncDelayedTask(
+								new Runnable()
+								{
+									@Override
+									public void run()
+									{
+										attacker.getServer().dispatchCommand(attacker.getBase(), command.replaceAll("\\{player\\}", defender.getName()));
+										LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", attacker.getName(), command));
+									}
+								});
+
+						event.setCancelled(true);
+						return;
+					}
+				}
+			}
+		}
+		else if (eAttack instanceof Player)
+		{
+			final User player = ess.getUser(eAttack);
+			player.updateActivity(true);
+			if (eDefend instanceof Ageable)
+			{
+				final ItemStack hand = player.getItemInHand();
 				if (hand != null && hand.getType() == Material.MILK_BUCKET)
 				{
 					((Ageable)eDefend).setBaby();
 					hand.setType(Material.BUCKET);
-					attacker.getBase().setItemInHand(hand);
-					attacker.getBase().updateInventory();
+					player.setItemInHand(hand);
+					player.updateInventory();
 					event.setCancelled(true);
 				}
 			}
-			attacker.updateActivity(true);
-		}
-		else if (eAttack instanceof Projectile && eDefend instanceof Player)
-		{
-			final Projectile projectile = (Projectile)event.getDamager();
-			//This should return a ProjectileSource on 1.7.3 beta +
-			final Object shooter = projectile.getShooter();
-			if (shooter instanceof Player)
-			{
-				final User attacker = ess.getUser((Player)shooter);
-				onPlayerVsPlayerDamage(event, (Player)eDefend, attacker);
-				attacker.updateActivity(true);
-			}
-		}
-	}
-
-	private void onPlayerVsPlayerDamage(final EntityDamageByEntityEvent event, final Player defender, final User attacker)
-	{
-		if (ess.getSettings().getLoginAttackDelay() > 0
-			&& (System.currentTimeMillis() < (attacker.getLastLogin() + ess.getSettings().getLoginAttackDelay()))
-			&& !attacker.isAuthorized("essentials.pvpdelay.exempt"))
-		{
-			event.setCancelled(true);
-		}
-
-		if (!defender.equals(attacker.getBase()) && (attacker.hasInvulnerabilityAfterTeleport() || ess.getUser(defender).hasInvulnerabilityAfterTeleport()))
-		{
-			event.setCancelled(true);
-		}
-
-		if (attacker.isGodModeEnabled() && !attacker.isAuthorized("essentials.god.pvp"))
-		{
-			event.setCancelled(true);
-		}
-
-		if (attacker.isHidden() && !attacker.isAuthorized("essentials.vanish.pvp"))
-		{
-			event.setCancelled(true);
-		}
-
-		onPlayerVsPlayerPowertool(event, defender, attacker);
-	}
-
-	private void onPlayerVsPlayerPowertool(final EntityDamageByEntityEvent event, final Player defender, final User attacker)
-	{
-		final List<String> commandList = attacker.getPowertool(attacker.getBase().getItemInHand());
-		if (commandList != null && !commandList.isEmpty())
-		{
-			for (final String tempCommand : commandList)
-			{
-				final String command = powertoolPlayer.matcher(tempCommand).replaceAll(defender.getName());
-				if (command != null && !command.isEmpty() && !command.equals(tempCommand))
-				{
-
-					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());
-
-					event.setCancelled(true);
-					return;
-				}
-			}
 		}
 	}
 
 	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 	public void onEntityDamage(final EntityDamageEvent event)
 	{
-		if (event.getEntity() instanceof Player && ess.getUser((Player)event.getEntity()).isGodModeEnabled())
+		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
 		{
 			final Player player = (Player)event.getEntity();
 			player.setFireTicks(0);
@@ -139,7 +112,7 @@ public class EssentialsEntityListener implements Listener
 	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 	public void onEntityCombust(final EntityCombustEvent event)
 	{
-		if (event.getEntity() instanceof Player && ess.getUser((Player)event.getEntity()).isGodModeEnabled())
+		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
 		{
 			event.setCancelled(true);
 		}
@@ -152,7 +125,7 @@ public class EssentialsEntityListener implements Listener
 		if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back"))
 		{
 			user.setLastLocation();
-			user.sendMessage(tl("backAfterDeath"));
+			user.sendMessage(_("backAfterDeath"));
 		}
 		if (!ess.getSettings().areDeathMessagesEnabled())
 		{
@@ -174,18 +147,9 @@ public class EssentialsEntityListener implements Listener
 	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 	public void onFoodLevelChange(final FoodLevelChangeEvent event)
 	{
-		if (event.getEntity() instanceof Player)
+		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
 		{
-			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);
-			}
+			event.setCancelled(true);
 		}
 	}
 
@@ -193,7 +157,7 @@ public class EssentialsEntityListener implements Listener
 	public void onEntityRegainHealth(final EntityRegainHealthEvent event)
 	{
 		if (event.getRegainReason() == RegainReason.SATIATED && event.getEntity() instanceof Player
-			&& ess.getUser((Player)event.getEntity()).isAfk() && ess.getSettings().getFreezeAfkPlayers())
+			&& ess.getUser(event.getEntity()).isAfk() && ess.getSettings().getFreezeAfkPlayers())
 		{
 			event.setCancelled(true);
 		}
@@ -204,23 +168,10 @@ public class EssentialsEntityListener implements Listener
 	{
 		for (LivingEntity entity : event.getAffectedEntities())
 		{
-			if (entity instanceof Player && ess.getUser((Player)entity).isGodModeEnabled())
+			if (entity instanceof Player && ess.getUser(entity).isGodModeEnabled())
 			{
 				event.setIntensity(entity, 0d);
 			}
 		}
 	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onEntityShootBow(EntityShootBowEvent event)
-	{
-		if (event.getEntity() instanceof Player)
-		{
-			final User user = ess.getUser((Player)event.getEntity());
-			if (user.isAfk())
-			{
-				user.updateActivity(true);
-			}
-		}
-	}
 }

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

@@ -1,18 +1,17 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.textreader.IText;
 import com.earth2me.essentials.textreader.KeywordReplacer;
 import com.earth2me.essentials.textreader.TextInput;
 import com.earth2me.essentials.textreader.TextPager;
-import com.earth2me.essentials.utils.LocationUtil;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import net.ess3.api.IEssentials;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -24,18 +23,19 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.event.player.*;
 import org.bukkit.event.player.PlayerLoginEvent.Result;
+import org.bukkit.event.player.*;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 
 
 public class EssentialsPlayerListener implements Listener
 {
-	private static final Logger LOGGER = Logger.getLogger("Essentials");
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private final transient IEssentials ess;
+	private static final int AIR = Material.AIR.getId();
+	private static final int BED = Material.BED_BLOCK.getId();
 
 	public EssentialsPlayerListener(final IEssentials parent)
 	{
@@ -48,11 +48,6 @@ public class EssentialsPlayerListener implements Listener
 		final User user = ess.getUser(event.getPlayer());
 		updateCompass(user);
 		user.setDisplayNick();
-
-		if (ess.getSettings().isTeleportInvulnerability())
-		{
-			user.enableInvulnerabilityAfterTeleport();
-		}
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST)
@@ -62,33 +57,18 @@ public class EssentialsPlayerListener implements Listener
 		if (user.isMuted())
 		{
 			event.setCancelled(true);
-			user.sendMessage(tl("voiceSilenced"));
-			LOGGER.info(tl("mutedUserSpeaks", user.getName()));
+			user.sendMessage(_("playerMuted"));
+			LOGGER.info(_("mutedUserSpeaks", user.getName()));
 		}
-		try
+		final Iterator<Player> it = event.getRecipients().iterator();
+		while (it.hasNext())
 		{
-			final Iterator<Player> it = event.getRecipients().iterator();
-			while (it.hasNext())
+			final User u = ess.getUser(it.next());
+			if (u.isIgnoredPlayer(user))
 			{
-				final User u = ess.getUser(it.next());
-				if (u.isIgnoredPlayer(user))
-				{
-					it.remove();
-				}
+				it.remove();
 			}
 		}
-		catch (UnsupportedOperationException ex)
-		{
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().log(Level.INFO, "Ignore could not block chat due to custom chat plugin event.", ex);
-			}
-			else
-			{
-				ess.getLogger().info("Ignore could not block chat due to custom chat plugin event.");
-			}
-		}
-
 		user.updateActivity(true);
 		user.setDisplayNick();
 	}
@@ -96,25 +76,14 @@ public class EssentialsPlayerListener implements Listener
 	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void onPlayerMove(final PlayerMoveEvent event)
 	{
-		if (event.getFrom().getBlockX() == event.getTo().getBlockX()
-			&& event.getFrom().getBlockZ() == event.getTo().getBlockZ()
-			&& event.getFrom().getBlockY() == event.getTo().getBlockY())
+		if ((!ess.getSettings().cancelAfkOnMove() && !ess.getSettings().getFreezeAfkPlayers())
+			|| event.getFrom().getBlockX() == event.getTo().getBlockX()
+			   && event.getFrom().getBlockZ() == event.getTo().getBlockZ()
+			   && event.getFrom().getBlockY() == event.getTo().getBlockY())
 		{
 			return;
 		}
 
-		if (!ess.getSettings().cancelAfkOnMove() && !ess.getSettings().getFreezeAfkPlayers())
-		{
-			event.getHandlers().unregister(this);
-
-			if (ess.getSettings().isDebug())
-			{
-				LOGGER.log(Level.INFO, "Unregistering move listener");
-			}
-
-			return;
-		}
-
 		final User user = ess.getUser(event.getPlayer());
 		if (user.isAfk() && ess.getSettings().getFreezeAfkPlayers())
 		{
@@ -131,7 +100,7 @@ public class EssentialsPlayerListener implements Listener
 			to.setZ(from.getZ());
 			try
 			{
-				event.setTo(LocationUtil.getSafeDestination(to));
+				event.setTo(Util.getSafeDestination(to));
 			}
 			catch (Exception ex)
 			{
@@ -146,99 +115,76 @@ public class EssentialsPlayerListener implements Listener
 		}
 	}
 
-	@EventHandler(priority = EventPriority.HIGHEST)
+	@EventHandler(priority = EventPriority.MONITOR)
 	public void onPlayerQuit(final PlayerQuitEvent event)
 	{
 		final User user = ess.getUser(event.getPlayer());
-
-		if (ess.getSettings().allowSilentJoinQuit() && user.isAuthorized("essentials.silentquit"))
-		{
-			event.setQuitMessage(null);
-		}
-		else if (ess.getSettings().isCustomQuitMessage() && event.getQuitMessage() != null)
-		{
-			final Player player = event.getPlayer();
-			event.setQuitMessage(
-					ess.getSettings().getCustomQuitMessage()
-					.replace("{PLAYER}", player.getDisplayName())
-					.replace("{USERNAME}", player.getName()));
-		}
-
 		if (ess.getSettings().removeGodOnDisconnect() && user.isGodModeEnabled())
 		{
 			user.setGodModeEnabled(false);
 		}
 		if (user.isVanished())
 		{
-			user.setVanished(false);
+			user.toggleVanished();
 		}
-		user.setLogoutLocation();
-		if (user.isRecipeSee())
+		if (!user.isJailed())
 		{
-			user.getBase().getOpenInventory().getTopInventory().clear();
+			user.setLastLocation();
 		}
-
-		for (HumanEntity viewer : user.getBase().getInventory().getViewers())
-		{
-			if (viewer instanceof Player)
-			{
-				User uviewer = ess.getUser((Player)viewer);
-				if (uviewer.isInvSee())
-				{
-					uviewer.getBase().closeInventory();
-				}
-			}
-		}
-
 		user.updateActivity(false);
 		user.dispose();
 	}
 
-	@EventHandler(priority = EventPriority.HIGHEST)
+	@EventHandler(priority = EventPriority.MONITOR)
 	public void onPlayerJoin(final PlayerJoinEvent event)
 	{
-		final String joinMessage = event.getJoinMessage();
-		ess.runTaskAsynchronously(new Runnable()
+		ess.scheduleAsyncDelayedTask(new Runnable()
 		{
 			@Override
 			public void run()
 			{
-				delayedJoin(event.getPlayer(), joinMessage);
+				delayedJoin(event.getPlayer());
 			}
 		});
-		if (ess.getSettings().allowSilentJoinQuit() || ess.getSettings().isCustomJoinMessage())
-		{
-			event.setJoinMessage(null);
-		}
 	}
 
-	public void delayedJoin(final Player player, final String message)
+	public void delayedJoin(final Player player)
 	{
 		if (!player.isOnline())
 		{
 			return;
 		}
-
 		ess.getBackup().onPlayerJoin();
-		final User dUser = ess.getUser(player);
+		final User user = ess.getUser(player);
+		user.setDisplayNick();
+		updateCompass(user);
+		user.setLastLogin(System.currentTimeMillis());
+		user.updateActivity(false);
 
-
-		if (dUser.isNPC())
+		if (!ess.getVanishedPlayers().isEmpty() && !user.isAuthorized("essentials.vanish.see"))
 		{
-			dUser.setNPC(false);
+			for (String p : ess.getVanishedPlayers())
+			{
+				Player toVanish = ess.getUser(p).getBase();
+				if (toVanish.isOnline()) {
+					user.hidePlayer(toVanish);
+				}
+			}
 		}
 
-		final long currentTime = System.currentTimeMillis();
-		dUser.checkMuteTimeout(currentTime);
-		dUser.updateActivity(false);
+		if (user.isAuthorized("essentials.sleepingignored"))
+		{
+			user.setSleepingIgnored(true);
+		}
 
-		IText tempInput = null;
-
-		if (!ess.getSettings().isCommandDisabled("motd"))
+		if (!ess.getSettings().isCommandDisabled("motd") && user.isAuthorized("essentials.motd"))
 		{
 			try
 			{
-				tempInput = new TextInput(dUser.getSource(), "motd", true, ess);
+				final IText input = new TextInput(user, "motd", true, ess);
+				final IText output = new KeywordReplacer(input, user, ess);
+				final TextPager pager = new TextPager(output, true);
+				pager.showPage("1", null, "motd", user);
 			}
 			catch (IOException ex)
 			{
@@ -253,123 +199,38 @@ public class EssentialsPlayerListener implements Listener
 			}
 		}
 
-		final IText input = tempInput;
-
-		class DelayJoinTask implements Runnable
+		if (!ess.getSettings().isCommandDisabled("mail") && user.isAuthorized("essentials.mail"))
 		{
-			@Override
-			public void run()
+			final List<String> mail = user.getMails();
+			if (mail.isEmpty())
 			{
-				final User user = ess.getUser(player);
-
-				if (!user.getBase().isOnline())
-				{
-					return;
-				}
-
-				user.startTransaction();
-
-				user.setLastAccountName(user.getBase().getName());
-				user.setLastLogin(currentTime);
-				user.setDisplayNick();
-				updateCompass(user);
-
-				if (!ess.getVanishedPlayers().isEmpty() && !user.isAuthorized("essentials.vanish.see"))
-				{
-					for (String p : ess.getVanishedPlayers())
-					{
-						Player toVanish = ess.getServer().getPlayerExact(p);
-						if (toVanish != null && toVanish.isOnline())
-						{
-							user.getBase().hidePlayer(toVanish);
-						}
-					}
-				}
-
-				if (user.isAuthorized("essentials.sleepingignored"))
-				{
-					user.getBase().setSleepingIgnored(true);
-				}
-
-				if (ess.getSettings().allowSilentJoinQuit() && (user.isAuthorized("essentials.silentjoin") || user.isAuthorized("essentials.silentjoin.vanish")))
-				{
-					if (user.isAuthorized("essentials.silentjoin.vanish"))
-					{
-						user.setVanished(true);
-					}
-				}
-				else if (message == null)
-				{
-					//NOOP
-				}
-				else if (ess.getSettings().isCustomJoinMessage())
-				{
-					ess.getServer().broadcastMessage(
-							ess.getSettings().getCustomJoinMessage()
-							.replace("{PLAYER}", player.getDisplayName())
-							.replace("{USERNAME}", player.getName()));
-				}
-				else if (ess.getSettings().allowSilentJoinQuit())
-				{
-					ess.getServer().broadcastMessage(message);
-				}
-
-				if (input != null && user.isAuthorized("essentials.motd"))
-				{
-					final IText output = new KeywordReplacer(input, user.getSource(), ess);
-					final TextPager pager = new TextPager(output, true);
-					pager.showPage("1", null, "motd", user.getSource());
-				}
-
-				if (!ess.getSettings().isCommandDisabled("mail") && user.isAuthorized("essentials.mail"))
-				{
-					final List<String> mail = user.getMails();
-					if (mail.isEmpty())
-					{
-						user.sendMessage(tl("noNewMail"));
-					}
-					else
-					{
-						user.sendMessage(tl("youHaveNewMail", mail.size()));
-					}
-				}
-
-				if (user.isAuthorized("essentials.fly.safelogin"))
-				{
-					user.getBase().setFallDistance(0);
-					if (LocationUtil.shouldFly(user.getLocation()))
-					{
-						user.getBase().setAllowFlight(true);
-						user.getBase().setFlying(true);
-						user.getBase().sendMessage(tl("flyMode", tl("enabled"), user.getDisplayName()));
-					}
-				}
-
-				if (!user.isAuthorized("essentials.speed"))
-				{
-					user.getBase().setFlySpeed(0.1f);
-					user.getBase().setWalkSpeed(0.2f);
-				}
-
-				user.stopTransaction();
+				user.sendMessage(_("noNewMail"));
+			}
+			else
+			{
+				user.sendMessage(_("youHaveNewMail", mail.size()));
 			}
 		}
-
-		ess.scheduleSyncDelayedTask(new DelayJoinTask());
 	}
 
-	// Makes the compass item ingame always point to the first essentials home.  #EasterEgg
 	private void updateCompass(final User user)
 	{
 		Location loc = user.getHome(user.getLocation());
 		if (loc == null)
 		{
-			loc = user.getBase().getBedSpawnLocation();
+			loc = user.getBedSpawnLocation();
 		}
 		if (loc != null)
 		{
 			final Location updateLoc = loc;
-			user.getBase().setCompassTarget(updateLoc);
+			ess.scheduleSyncDelayedTask(new Runnable()
+			{
+				@Override
+				public void run()
+				{
+					user.setCompassTarget(updateLoc);
+				}
+			});
 		}
 	}
 
@@ -378,18 +239,38 @@ public class EssentialsPlayerListener implements Listener
 	{
 		switch (event.getResult())
 		{
+		case ALLOWED:
 		case KICK_FULL:
-			final User kfuser = ess.getUser(event.getPlayer());
-			if (kfuser.isAuthorized("essentials.joinfullserver"))
-			{
-				event.allow();
-				return;
-			}
-			event.disallow(Result.KICK_FULL, tl("serverFull"));
+		case KICK_BANNED:
 			break;
 		default:
-			break;
+			return;
 		}
+
+		final User user = ess.getUser(event.getPlayer());
+		if (user.isNPC())
+		{
+			user.setNPC(false);
+		}
+
+		final long currentTime = System.currentTimeMillis();
+		final boolean banExpired = user.checkBanTimeout(currentTime);
+		user.checkMuteTimeout(currentTime);
+		user.checkJailTimeout(currentTime);
+
+		if (!banExpired && (user.isBanned() || event.getResult() == Result.KICK_BANNED))
+		{
+			final String banReason = user.getBanReason();
+			event.disallow(Result.KICK_BANNED, banReason != null && !banReason.isEmpty() && !banReason.equalsIgnoreCase("ban") ? banReason : _("defaultBanReason"));
+			return;
+		}
+
+		if (event.getResult() == Result.KICK_FULL && !user.isAuthorized("essentials.joinfullserver"))
+		{
+			event.disallow(Result.KICK_FULL, _("serverFull"));
+			return;
+		}
+		event.allow();
 	}
 
 	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
@@ -405,7 +286,7 @@ public class EssentialsPlayerListener implements Listener
 			{
 				user.setLastLocation();
 			}
-			if (teleportInvulnerability && (event.getCause() == TeleportCause.PLUGIN || event.getCause() == TeleportCause.COMMAND))
+			if (teleportInvulnerability)
 			{
 				user.enableInvulnerabilityAfterTeleport();
 			}
@@ -419,8 +300,8 @@ public class EssentialsPlayerListener implements Listener
 		final ItemStack stack = new ItemStack(Material.EGG, 1);
 		if (user.hasUnlimited(stack))
 		{
-			user.getBase().getInventory().addItem(stack);
-			user.getBase().updateInventory();
+			user.getInventory().addItem(stack);
+			user.updateInventory();
 		}
 	}
 
@@ -436,24 +317,26 @@ public class EssentialsPlayerListener implements Listener
 				@Override
 				public void run()
 				{
-					user.getBase().updateInventory();
+					user.updateInventory();
 				}
 			});
 		}
 	}
+	private final static List<String> COMMANDS = Arrays.asList("msg", "r", "mail", "m", "t", "whisper", "emsg", "tell", "er", "reply", "ereply", "email", "action", "describe", "eme", "eaction", "edescribe", "etell", "ewhisper", "pm");
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event)
 	{
 		final Player player = event.getPlayer();
 		final String cmd = event.getMessage().toLowerCase(Locale.ENGLISH).split(" ")[0].replace("/", "").toLowerCase(Locale.ENGLISH);
-		if (ess.getSettings().getSocialSpyCommands().contains(cmd) || ess.getSettings().getSocialSpyCommands().contains("*"))
+		if (COMMANDS.contains(cmd))
 		{
-			for (User spyer : ess.getOnlineUsers())
+			for (Player onlinePlayer : ess.getServer().getOnlinePlayers())
 			{
-				if (spyer.isSocialSpyEnabled() && !player.equals(spyer.getBase()))
+				final User spyer = ess.getUser(onlinePlayer);
+				if (spyer.isSocialSpyEnabled() && !player.equals(onlinePlayer))
 				{
-					spyer.sendMessage(player.getDisplayName() + " : " + event.getMessage());
+					onlinePlayer.sendMessage(player.getDisplayName() + " : " + event.getMessage());
 				}
 			}
 		}
@@ -464,40 +347,15 @@ public class EssentialsPlayerListener implements Listener
 		}
 	}
 
-	@EventHandler(priority = EventPriority.NORMAL)
-	public void onPlayerChangedWorldFlyReset(final PlayerChangedWorldEvent event)
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void onPlayerChangedWorldHack(final PlayerChangedWorldEvent event)
 	{
-		final User user = ess.getUser(event.getPlayer());
-		if (user.getBase().getGameMode() != GameMode.CREATIVE && !user.isAuthorized("essentials.fly"))
-		{
-			user.getBase().setFallDistance(0f);
-			user.getBase().setAllowFlight(false);
-		}
-		if (!user.isAuthorized("essentials.speed"))
-		{
-			user.getBase().setFlySpeed(0.1f);
-			user.getBase().setWalkSpeed(0.2f);
-		}
-		else
-		{
-			if (user.getBase().getFlySpeed() > ess.getSettings().getMaxFlySpeed() && !user.isAuthorized("essentials.speed.bypass"))
-			{
-				user.getBase().setFlySpeed((float)ess.getSettings().getMaxFlySpeed());
-			}
-			else
-			{
-				user.getBase().setFlySpeed(user.getBase().getFlySpeed() * 0.99999f);
-			}
-
-			if (user.getBase().getWalkSpeed() > ess.getSettings().getMaxWalkSpeed() && !user.isAuthorized("essentials.speed.bypass"))
-			{
-				user.getBase().setWalkSpeed((float)ess.getSettings().getMaxWalkSpeed());
-			}
-			else
-			{
-				user.getBase().setWalkSpeed(user.getBase().getWalkSpeed() * 0.99999f);
-			}
-		}
+		final Player user = event.getPlayer();
+		if (user.getGameMode() != GameMode.CREATIVE) {
+			user.setAllowFlight(false);	
+		}		
+		user.setFlySpeed(0.1f);
+		user.setWalkSpeed(0.2f);
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR)
@@ -509,16 +367,12 @@ public class EssentialsPlayerListener implements Listener
 		updateCompass(user);
 		if (ess.getSettings().getNoGodWorlds().contains(newWorld) && user.isGodModeEnabledRaw())
 		{
-			user.sendMessage(tl("noGodWorldWarning"));
+			user.sendMessage(_("noGodWorldWarning"));
 		}
 
-		if (!user.getWorld().getName().equals(newWorld))
+		if (!event.getPlayer().getWorld().getName().equals(newWorld))
 		{
-			user.sendMessage(tl("currentWorld", newWorld));
-		}
-		if (user.isVanished())
-		{
-			user.setVanished(user.isAuthorized("essentials.vanish"));
+			user.sendMessage(_("currentWorld", newWorld));
 		}
 	}
 
@@ -528,14 +382,11 @@ public class EssentialsPlayerListener implements Listener
 		switch (event.getAction())
 		{
 		case RIGHT_CLICK_BLOCK:
-			if (!event.isCancelled() && event.getClickedBlock().getType() == Material.BED_BLOCK && ess.getSettings().getUpdateBedAtDaytime())
+			if (!event.isCancelled() && event.getClickedBlock().getTypeId() == BED && ess.getSettings().getUpdateBedAtDaytime())
 			{
-				User player = ess.getUser(event.getPlayer());
-				if (player.isAuthorized("essentials.sethome.bed"))
-				{
-					player.getBase().setBedSpawnLocation(event.getClickedBlock().getLocation());
-					player.sendMessage(tl("bedSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
-				}
+				Player player = event.getPlayer();
+				player.setBedSpawnLocation(event.getClickedBlock().getLocation());
+				player.sendMessage(_("homeSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
 			}
 			break;
 		case LEFT_CLICK_AIR:
@@ -549,10 +400,9 @@ public class EssentialsPlayerListener implements Listener
 				}
 			}
 		case LEFT_CLICK_BLOCK:
-			if (event.getItem() != null && event.getItem().getType() != Material.AIR)
+			if (event.getItem() != null && event.getItem().getTypeId() != AIR)
 			{
 				final User user = ess.getUser(event.getPlayer());
-				user.updateActivity(true);
 				if (user.hasPowerTools() && user.arePowerToolsEnabled() && usePowertools(user, event.getItem().getTypeId()))
 				{
 					event.setCancelled(true);
@@ -564,29 +414,28 @@ public class EssentialsPlayerListener implements Listener
 		}
 	}
 
-	// This method allows the /jump lock feature to work, allows teleporting while flying #EasterEgg
 	private void useFlyClickJump(final User user)
 	{
 		try
 		{
-			final Location otarget = LocationUtil.getTarget(user.getBase());
+			final Location otarget = Util.getTarget(user);
 
-			class DelayedClickJumpTask implements Runnable
-			{
-				@Override
-				public void run()
-				{
-					Location loc = user.getLocation();
-					loc.setX(otarget.getX());
-					loc.setZ(otarget.getZ());
-					while (LocationUtil.isBlockDamaging(loc.getWorld(), loc.getBlockX(), loc.getBlockY() - 1, loc.getBlockZ()))
+			ess.scheduleSyncDelayedTask(
+					new Runnable()
 					{
-						loc.setY(loc.getY() + 1d);
-					}
-					user.getBase().teleport(loc, TeleportCause.PLUGIN);
-				}
-			}
-			ess.scheduleSyncDelayedTask(new DelayedClickJumpTask());
+						@Override
+						public void run()
+						{
+							Location loc = user.getLocation();
+							loc.setX(otarget.getX());
+							loc.setZ(otarget.getZ());
+							while (Util.isBlockDamaging(loc.getWorld(), loc.getBlockX(), loc.getBlockY() - 1, loc.getBlockZ()))
+							{
+								loc.setY(loc.getY() + 1d);
+							}
+							user.getBase().teleport(loc, TeleportCause.PLUGIN);
+						}
+					});
 		}
 		catch (Exception ex)
 		{
@@ -615,23 +464,21 @@ public class EssentialsPlayerListener implements Listener
 			else if (command.startsWith("c:"))
 			{
 				used = true;
-				user.getBase().chat(command.substring(2));
+				user.chat(command.substring(2));
 			}
 			else
 			{
 				used = true;
-
-				class PowerToolUseTask implements Runnable
-				{
-					@Override
-					public void run()
-					{
-						user.getServer().dispatchCommand(user.getBase(), command);
-						LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", user.getName(), command));
-					}
-				}
-				ess.scheduleSyncDelayedTask(new PowerToolUseTask());
-
+				ess.scheduleSyncDelayedTask(
+						new Runnable()
+						{
+							@Override
+							public void run()
+							{
+								user.getServer().dispatchCommand(user.getBase(), command);
+								LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", user.getName(), command));
+							}
+						});
 			}
 		}
 		return used;
@@ -652,126 +499,43 @@ public class EssentialsPlayerListener implements Listener
 	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
 	public void onInventoryClickEvent(final InventoryClickEvent event)
 	{
-		Player refreshPlayer = null;
-		final Inventory top = event.getView().getTopInventory();
-		final InventoryType type = top.getType();
-
-		if (type == InventoryType.PLAYER)
+		if (event.getView().getTopInventory().getType() == InventoryType.PLAYER)
 		{
-			final User user = ess.getUser((Player)event.getWhoClicked());
-			final InventoryHolder invHolder = top.getHolder();
+			final User user = ess.getUser(event.getWhoClicked());
+			final InventoryHolder invHolder = event.getView().getTopInventory().getHolder();
 			if (invHolder != null && invHolder instanceof HumanEntity)
 			{
-				final User invOwner = ess.getUser((Player)invHolder);
+				final User invOwner = ess.getUser((HumanEntity)invHolder);
 				if (user.isInvSee() && (!user.isAuthorized("essentials.invsee.modify")
 										|| invOwner.isAuthorized("essentials.invsee.preventmodify")
-										|| !invOwner.getBase().isOnline()))
+										|| !invOwner.isOnline()))
 				{
 					event.setCancelled(true);
-					refreshPlayer = user.getBase();
 				}
 			}
 		}
-		else if (type == InventoryType.ENDER_CHEST)
+		else if (event.getView().getTopInventory().getType() == InventoryType.ENDER_CHEST)
 		{
-			final User user = ess.getUser((Player)event.getWhoClicked());
+			final User user = ess.getUser(event.getWhoClicked());
 			if (user.isEnderSee() && (!user.isAuthorized("essentials.enderchest.modify")))
 			{
 				event.setCancelled(true);
-				refreshPlayer = user.getBase();
 			}
 		}
-		else if (type == InventoryType.WORKBENCH)
-		{
-			User user = ess.getUser((Player)event.getWhoClicked());
-			if (user.isRecipeSee())
-			{
-				event.setCancelled(true);
-				refreshPlayer = user.getBase();
-			}
-		}
-		else if (type == InventoryType.CHEST && top.getSize() == 9)
-		{
-			final User user = ess.getUser((Player)event.getWhoClicked());
-			final InventoryHolder invHolder = top.getHolder();
-			if (invHolder != null && invHolder instanceof HumanEntity && user.isInvSee())
-			{
-				event.setCancelled(true);
-				refreshPlayer = user.getBase();
-			}
-		}
-
-		if (refreshPlayer != null)
-		{
-			final Player player = refreshPlayer;
-			ess.scheduleSyncDelayedTask(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					player.updateInventory();
-				}
-			}, 1);
-		}
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void onInventoryCloseEvent(final InventoryCloseEvent event)
 	{
-		Player refreshPlayer = null;
-		final Inventory top = event.getView().getTopInventory();
-		final InventoryType type = top.getType();
-		if (type == InventoryType.PLAYER)
+		if (event.getView().getTopInventory().getType() == InventoryType.PLAYER)
 		{
-			final User user = ess.getUser((Player)event.getPlayer());
+			final User user = ess.getUser(event.getPlayer());
 			user.setInvSee(false);
-			refreshPlayer = user.getBase();
 		}
-		else if (type == InventoryType.ENDER_CHEST)
+		else if (event.getView().getTopInventory().getType() == InventoryType.ENDER_CHEST)
 		{
-			final User user = ess.getUser((Player)event.getPlayer());
+			final User user = ess.getUser(event.getPlayer());
 			user.setEnderSee(false);
-			refreshPlayer = user.getBase();
-		}
-		else if (type == InventoryType.WORKBENCH)
-		{
-			final User user = ess.getUser((Player)event.getPlayer());
-			if (user.isRecipeSee())
-			{
-				user.setRecipeSee(false);
-				event.getView().getTopInventory().clear();
-				refreshPlayer = user.getBase();
-			}
-		}
-		else if (type == InventoryType.CHEST && top.getSize() == 9)
-		{
-			final InventoryHolder invHolder = top.getHolder();
-			if (invHolder != null && invHolder instanceof HumanEntity)
-			{
-				final User user = ess.getUser((Player)event.getPlayer());
-				user.setInvSee(false);
-				refreshPlayer = user.getBase();
-			}
-		}
-
-		if (refreshPlayer != null)
-		{
-			final Player player = refreshPlayer;
-			ess.scheduleSyncDelayedTask(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					player.updateInventory();
-				}
-			}, 1);
 		}
 	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onPlayerFishEvent(final PlayerFishEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		user.updateActivity(true);
-	}
-}
+}

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

@@ -1,9 +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;
 import org.bukkit.event.Listener;
@@ -14,7 +11,7 @@ import org.bukkit.event.server.PluginEnableEvent;
 public class EssentialsPluginListener implements Listener, IConf
 {
 	private final transient IEssentials ess;
-
+	
 	public EssentialsPluginListener(final IEssentials ess)
 	{
 		this.ess = ess;
@@ -23,33 +20,21 @@ public class EssentialsPluginListener implements Listener, IConf
 	@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()))
+		if (!ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().setMethod(ess.getServer().getPluginManager()))
 		{
-			ess.getLogger().log(Level.INFO, "Payment method found (" + Methods.getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
+			ess.getLogger().log(Level.INFO, "Payment method found (" + ess.getPaymentMethod().getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
 		}
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void onPluginDisable(final PluginDisableEvent event)
 	{
-		if (event.getPlugin().getName().equals("EssentialsChat"))
-		{
-			ess.getSettings().setEssentialsChatActive(false);
-		}
-		PermissionsHandler permHandler = ess.getPermissionsHandler();
-		if (permHandler != null)
-		{
-			permHandler.checkPermissions();
-		}
+		ess.getPermissionsHandler().checkPermissions();
 		ess.getAlternativeCommandsHandler().removePlugin(event.getPlugin());
 		// Check to see if the plugin thats being disabled is the one we are using
-		if (ess.getPaymentMethod() != null && Methods.hasMethod() && Methods.checkDisabled(event.getPlugin()))
+		if (ess.getPaymentMethod() != null && ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().checkDisabled(event.getPlugin()))
 		{
 			ess.getPaymentMethod().reset();
 			ess.getLogger().log(Level.INFO, "Payment method was disabled. No longer accepting payments.");

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

@@ -4,35 +4,27 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Set;
-import java.util.UUID;
 import java.util.logging.Level;
-import net.ess3.api.IEssentials;
 import org.bukkit.entity.Player;
 
 
 public class EssentialsTimer implements Runnable
 {
 	private final transient IEssentials ess;
-	private final transient Set<UUID> onlineUsers = new HashSet<UUID>();
-	private transient long lastPoll = System.nanoTime();
-	private final LinkedList<Double> history = new LinkedList<Double>();
-	private int skip1 = 0;
-	private int skip2 = 0;
-	private final long maxTime = 10 * 1000000;
-	private final long tickInterval = 50;
-	
+	private final transient Set<User> onlineUsers = new HashSet<User>();
+	private transient long lastPoll = System.currentTimeMillis();
+	private final transient LinkedList<Float> history = new LinkedList<Float>();
+
 	EssentialsTimer(final IEssentials ess)
 	{
 		this.ess = ess;
-		history.add(20d);
 	}
-	
+
 	@Override
 	public void run()
 	{
-		final long startTime = System.nanoTime();
 		final long currentTime = System.currentTimeMillis();
-		long timeSpent = (startTime - lastPoll) / 1000;
+		long timeSpent = (currentTime - lastPoll) / 1000;
 		if (timeSpent == 0)
 		{
 			timeSpent = 1;
@@ -41,33 +33,18 @@ public class EssentialsTimer implements Runnable
 		{
 			history.remove();
 		}
-		double tps = tickInterval * 1000000.0 / timeSpent;
-		if (tps <= 21)
+		float tps = 100f / timeSpent;
+		if (tps <= 20)
 		{
 			history.add(tps);
 		}
-		lastPoll = startTime;
-		int count = 0;
-		for (Player player : ess.getOnlinePlayers())
+		lastPoll = currentTime;
+		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.getBase().getUniqueId());
+				onlineUsers.add(user);
 				user.setLastOnlineActivity(currentTime);
 				user.checkActivity();
 			}
@@ -76,31 +53,14 @@ public class EssentialsTimer implements Runnable
 				ess.getLogger().log(Level.WARNING, "EssentialsTimer Error:", e);
 			}
 		}
-		
-		count = 0;
-		final Iterator<UUID> iterator = onlineUsers.iterator();
+
+		final Iterator<User> 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());
+			final User user = iterator.next();
 			if (user.getLastOnlineActivity() < currentTime && user.getLastOnlineActivity() > user.getLastLogout())
 			{
-				if (!user.isHidden()) {
-					user.setLastLogout(user.getLastOnlineActivity());
-				}
+				user.setLastLogout(user.getLastOnlineActivity());
 				iterator.remove();
 				continue;
 			}
@@ -109,17 +69,17 @@ public class EssentialsTimer implements Runnable
 			user.resetInvulnerabilityAfterTeleport();
 		}
 	}
-	
-	public double getAverageTPS()
+
+	public float getAverageTPS()
 	{
-		double avg = 0;
-		for (Double f : history)
+		float avg = 0;
+		for (Float f : history)
 		{
 			if (f != null)
 			{
 				avg += f;
 			}
-		}		
+		}
 		return avg / history.size();
 	}
 }

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

@@ -1,12 +1,9 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
-import com.earth2me.essentials.craftbukkit.BanLookup;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.craftbukkit.FakeWorld;
 import com.earth2me.essentials.settings.Spawns;
 import com.earth2me.essentials.storage.YamlStorageWriter;
-import com.earth2me.essentials.utils.StringUtil;
-import com.google.common.base.Charsets;
 import java.io.*;
 import java.math.BigInteger;
 import java.security.DigestInputStream;
@@ -14,16 +11,16 @@ import java.security.MessageDigest;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import net.ess3.api.IEssentials;
-import org.bukkit.BanList;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.inventory.ItemStack;
 
 
 public class EssentialsUpgrade
 {
-	private final static Logger LOGGER = Logger.getLogger("Essentials");
+	private final static Logger LOGGER = Logger.getLogger("Minecraft");
 	private final transient IEssentials ess;
 	private final transient EssentialsConf doneFile;
 
@@ -38,6 +35,46 @@ public class EssentialsUpgrade
 		doneFile.load();
 	}
 
+	private void moveWorthValuesToWorthYml()
+	{
+		if (doneFile.getBoolean("moveWorthValuesToWorthYml", false))
+		{
+			return;
+		}
+		try
+		{
+			final File configFile = new File(ess.getDataFolder(), "config.yml");
+			if (!configFile.exists())
+			{
+				return;
+			}
+			final EssentialsConf conf = new EssentialsConf(configFile);
+			conf.load();
+			final Worth worth = new Worth(ess.getDataFolder());
+			boolean found = false;
+			for (Material mat : Material.values())
+			{
+				final int id = mat.getId();
+				final double value = conf.getDouble("worth-" + id, Double.NaN);
+				if (!Double.isNaN(value))
+				{
+					found = true;
+					worth.setPrice(new ItemStack(mat, 1, (short)0, (byte)0), value);
+				}
+			}
+			if (found)
+			{
+				removeLinesFromConfig(configFile, "\\s*#?\\s*worth-[0-9]+.*", "# Worth values have been moved to worth.yml");
+			}
+			doneFile.setProperty("moveWorthValuesToWorthYml", true);
+			doneFile.save();
+		}
+		catch (Throwable e)
+		{
+			LOGGER.log(Level.SEVERE, _("upgradingFilesError"), e);
+		}
+	}
+
 	private void moveMotdRulesToFile(String name)
 	{
 		if (doneFile.getBoolean("move" + name + "ToFile", false))
@@ -76,9 +113,9 @@ public class EssentialsUpgrade
 			doneFile.setProperty("move" + name + "ToFile", true);
 			doneFile.save();
 		}
-		catch (IOException e)
+		catch (Throwable e)
 		{
-			LOGGER.log(Level.SEVERE, tl("upgradingFilesError"), e);
+			LOGGER.log(Level.SEVERE, _("upgradingFilesError"), e);
 		}
 	}
 
@@ -128,11 +165,11 @@ public class EssentialsUpgrade
 		{
 			if (!file.renameTo(new File(file.getParentFile(), file.getName().concat("." + System.currentTimeMillis() + ".upgradebackup"))))
 			{
-				throw new Exception(tl("configFileMoveError"));
+				throw new Exception(_("configFileMoveError"));
 			}
 			if (!tempFile.renameTo(file))
 			{
-				throw new Exception(tl("configFileRenameError"));
+				throw new Exception(_("configFileRenameError"));
 			}
 		}
 		else
@@ -141,6 +178,73 @@ public class EssentialsUpgrade
 		}
 	}
 
+	private void updateUsersToNewDefaultHome()
+	{
+		if (doneFile.getBoolean("updateUsersToNewDefaultHome", false))
+		{
+			return;
+		}
+		final File userdataFolder = new File(ess.getDataFolder(), "userdata");
+		if (!userdataFolder.exists() || !userdataFolder.isDirectory())
+		{
+			return;
+		}
+		final File[] userFiles = userdataFolder.listFiles();
+
+		for (File file : userFiles)
+		{
+			if (!file.isFile() || !file.getName().endsWith(".yml"))
+			{
+				continue;
+			}
+			final EssentialsConf config = new EssentialsConf(file);
+			try
+			{
+				config.load();
+				if (config.hasProperty("home") && !config.hasProperty("home.default"))
+				{
+					@SuppressWarnings("unchecked")
+					final List<Object> vals = (List<Object>)config.getProperty("home");
+					if (vals == null)
+					{
+						continue;
+					}
+					World world = ess.getServer().getWorlds().get(0);
+					if (vals.size() > 5)
+					{
+						world = ess.getServer().getWorld((String)vals.get(5));
+					}
+					if (world != null)
+					{
+						final Location loc = new Location(
+								world,
+								((Number)vals.get(0)).doubleValue(),
+								((Number)vals.get(1)).doubleValue(),
+								((Number)vals.get(2)).doubleValue(),
+								((Number)vals.get(3)).floatValue(),
+								((Number)vals.get(4)).floatValue());
+
+						final String worldName = world.getName().toLowerCase(Locale.ENGLISH);
+						if (worldName != null && !worldName.isEmpty())
+						{
+							config.removeProperty("home");
+							config.setProperty("home.default", worldName);
+							config.setProperty("home.worlds." + worldName, loc);
+							config.save();
+						}
+					}
+				}
+			}
+			catch (RuntimeException ex)
+			{
+				LOGGER.log(Level.INFO, "File: " + file.toString());
+				throw ex;
+			}
+		}
+		doneFile.setProperty("updateUsersToNewDefaultHome", true);
+		doneFile.save();
+	}
+
 	private void updateUsersPowerToolsFormat()
 	{
 		if (doneFile.getBoolean("updateUsersPowerToolsFormat", false))
@@ -181,7 +285,7 @@ public class EssentialsUpgrade
 							((Map<String, Object>)powertools).put(entry.getKey(), temp);
 						}
 					}
-					config.forceSave();
+					config.save();
 				}
 			}
 			catch (RuntimeException ex)
@@ -254,7 +358,7 @@ public class EssentialsUpgrade
 						}
 					}
 					config.removeProperty("home");
-					config.forceSave();
+					config.save();
 				}
 
 			}
@@ -268,6 +372,195 @@ public class EssentialsUpgrade
 		doneFile.save();
 	}
 
+	private void moveUsersDataToUserdataFolder()
+	{
+		final File usersFile = new File(ess.getDataFolder(), "users.yml");
+		if (!usersFile.exists())
+		{
+			return;
+		}
+		final EssentialsConf usersConfig = new EssentialsConf(usersFile);
+		usersConfig.load();
+		for (String username : usersConfig.getKeys(false))
+		{
+			final User user = new User(new OfflinePlayer(username, ess), ess);
+			final String nickname = usersConfig.getString(username + ".nickname");
+			if (nickname != null && !nickname.isEmpty() && !nickname.equals(username))
+			{
+				user.setNickname(nickname);
+			}
+			final List<String> mails = usersConfig.getStringList(username + ".mail");
+			if (mails != null && !mails.isEmpty())
+			{
+				user.setMails(mails);
+			}
+			if (!user.hasHome())
+			{
+				@SuppressWarnings("unchecked")
+				final List<Object> vals = (List<Object>)usersConfig.getProperty(username + ".home");
+				if (vals != null)
+				{
+					World world = ess.getServer().getWorlds().get(0);
+					if (vals.size() > 5)
+					{
+						world = getFakeWorld((String)vals.get(5));
+					}
+					if (world != null)
+					{
+						user.setHome("home", new Location(world,
+														  ((Number)vals.get(0)).doubleValue(),
+														  ((Number)vals.get(1)).doubleValue(),
+														  ((Number)vals.get(2)).doubleValue(),
+														  ((Number)vals.get(3)).floatValue(),
+														  ((Number)vals.get(4)).floatValue()));
+					}
+				}
+			}
+		}
+		usersFile.renameTo(new File(usersFile.getAbsolutePath() + ".old"));
+	}
+
+	private void convertWarps()
+	{
+		final File warpsFolder = new File(ess.getDataFolder(), "warps");
+		if (!warpsFolder.exists())
+		{
+			warpsFolder.mkdirs();
+		}
+		final File[] listOfFiles = warpsFolder.listFiles();
+		if (listOfFiles.length >= 1)
+		{
+			for (int i = 0; i < listOfFiles.length; i++)
+			{
+				final String filename = listOfFiles[i].getName();
+				if (listOfFiles[i].isFile() && filename.endsWith(".dat"))
+				{
+					try
+					{
+						final BufferedReader rx = new BufferedReader(new FileReader(listOfFiles[i]));
+						double x, y, z;
+						float yaw, pitch;
+						String worldName;
+						try
+						{
+							if (!rx.ready())
+							{
+								continue;
+							}
+							x = Double.parseDouble(rx.readLine().trim());
+							if (!rx.ready())
+							{
+								continue;
+							}
+							y = Double.parseDouble(rx.readLine().trim());
+							if (!rx.ready())
+							{
+								continue;
+							}
+							z = Double.parseDouble(rx.readLine().trim());
+							if (!rx.ready())
+							{
+								continue;
+							}
+							yaw = Float.parseFloat(rx.readLine().trim());
+							if (!rx.ready())
+							{
+								continue;
+							}
+							pitch = Float.parseFloat(rx.readLine().trim());
+							worldName = rx.readLine();
+						}
+						finally
+						{
+							rx.close();
+						}
+						World w = null;
+						for (World world : ess.getServer().getWorlds())
+						{
+							if (world.getEnvironment() != World.Environment.NETHER)
+							{
+								w = world;
+								break;
+							}
+						}
+						if (worldName != null)
+						{
+							worldName = worldName.trim();
+							World w1 = null;
+							w1 = getFakeWorld(worldName);
+							if (w1 != null)
+							{
+								w = w1;
+							}
+						}
+						final Location loc = new Location(w, x, y, z, yaw, pitch);
+						ess.getWarps().setWarp(filename.substring(0, filename.length() - 4), loc);
+						if (!listOfFiles[i].renameTo(new File(warpsFolder, filename + ".old")))
+						{
+							throw new Exception(_("fileRenameError", filename));
+						}
+					}
+					catch (Exception ex)
+					{
+						LOGGER.log(Level.SEVERE, null, ex);
+					}
+				}
+			}
+
+		}
+		final File warpFile = new File(ess.getDataFolder(), "warps.txt");
+		if (warpFile.exists())
+		{
+			try
+			{
+				final BufferedReader rx = new BufferedReader(new FileReader(warpFile));
+				try
+				{
+					for (String[] parts = new String[0]; rx.ready(); parts = rx.readLine().split(":"))
+					{
+						if (parts.length < 6)
+						{
+							continue;
+						}
+						final String name = parts[0];
+						final double x = Double.parseDouble(parts[1].trim());
+						final double y = Double.parseDouble(parts[2].trim());
+						final double z = Double.parseDouble(parts[3].trim());
+						final float yaw = Float.parseFloat(parts[4].trim());
+						final float pitch = Float.parseFloat(parts[5].trim());
+						if (name.isEmpty())
+						{
+							continue;
+						}
+						World w = null;
+						for (World world : ess.getServer().getWorlds())
+						{
+							if (world.getEnvironment() != World.Environment.NETHER)
+							{
+								w = world;
+								break;
+							}
+						}
+						final Location loc = new Location(w, x, y, z, yaw, pitch);
+						ess.getWarps().setWarp(name, loc);
+						if (!warpFile.renameTo(new File(ess.getDataFolder(), "warps.txt.old")))
+						{
+							throw new Exception(_("fileRenameError", "warps.txt"));
+						}
+					}
+				}
+				finally
+				{
+					rx.close();
+				}
+			}
+			catch (Exception ex)
+			{
+				LOGGER.log(Level.SEVERE, null, ex);
+			}
+		}
+	}
+
 	private void sanitizeAllUserFilenames()
 	{
 		if (doneFile.getBoolean("sanitizeAllUserFilenames", false))
@@ -280,33 +573,33 @@ public class EssentialsUpgrade
 			return;
 		}
 		final File[] listOfFiles = usersFolder.listFiles();
-		for (File listOfFile : listOfFiles)
+		for (int i = 0; i < listOfFiles.length; i++)
 		{
-			final String filename = listOfFile.getName();
-			if (!listOfFile.isFile() || !filename.endsWith(".yml"))
+			final String filename = listOfFiles[i].getName();
+			if (!listOfFiles[i].isFile() || !filename.endsWith(".yml"))
 			{
 				continue;
 			}
-			final String sanitizedFilename = StringUtil.sanitizeFileName(filename.substring(0, filename.length() - 4)) + ".yml";
+			final String sanitizedFilename = Util.sanitizeFileName(filename.substring(0, filename.length() - 4)) + ".yml";
 			if (sanitizedFilename.equals(filename))
 			{
 				continue;
 			}
-			final File tmpFile = new File(listOfFile.getParentFile(), sanitizedFilename + ".tmp");
-			final File newFile = new File(listOfFile.getParentFile(), sanitizedFilename);
-			if (!listOfFile.renameTo(tmpFile))
+			final File tmpFile = new File(listOfFiles[i].getParentFile(), sanitizedFilename + ".tmp");
+			final File newFile = new File(listOfFiles[i].getParentFile(), sanitizedFilename);
+			if (!listOfFiles[i].renameTo(tmpFile))
 			{
-				LOGGER.log(Level.WARNING, tl("userdataMoveError", filename, sanitizedFilename));
+				LOGGER.log(Level.WARNING, _("userdataMoveError", filename, sanitizedFilename));
 				continue;
 			}
 			if (newFile.exists())
 			{
-				LOGGER.log(Level.WARNING, tl("duplicatedUserdata", filename, sanitizedFilename));
+				LOGGER.log(Level.WARNING, _("duplicatedUserdata", filename, sanitizedFilename));
 				continue;
 			}
 			if (!tmpFile.renameTo(newFile))
 			{
-				LOGGER.log(Level.WARNING, tl("userdataMoveBackError", sanitizedFilename, sanitizedFilename));
+				LOGGER.log(Level.WARNING, _("userdataMoveBackError", sanitizedFilename, sanitizedFilename));
 			}
 		}
 		doneFile.setProperty("sanitizeAllUserFilenames", true);
@@ -416,7 +709,7 @@ public class EssentialsUpgrade
 					}
 					if (!configFile.renameTo(new File(ess.getDataFolder(), "spawn.yml.old")))
 					{
-						throw new Exception(tl("fileRenameError", "spawn.yml"));
+						throw new Exception(_("fileRenameError", "spawn.yml"));
 					}
 					PrintWriter writer = new PrintWriter(configFile);
 					try
@@ -463,7 +756,7 @@ public class EssentialsUpgrade
 					}
 					if (!configFile.renameTo(new File(ess.getDataFolder(), "jail.yml.old")))
 					{
-						throw new Exception(tl("fileRenameError", "jail.yml"));
+						throw new Exception(_("fileRenameError", "jail.yml"));
 					}
 					PrintWriter writer = new PrintWriter(configFile);
 					try
@@ -496,272 +789,13 @@ public class EssentialsUpgrade
 		doneFile.save();
 	}
 
-	private void uuidFileChange()
-	{
-		if (doneFile.getBoolean("uuidFileChange", false))
-		{
-			return;
-		}
-
-		Boolean ignoreUFCache = doneFile.getBoolean("ignore-userfiles-cache", false);
-
-		final File userdir = new File(ess.getDataFolder(), "userdata");
-		if (!userdir.exists())
-		{
-			return;
-		}
-
-		int countFiles = 0;
-		int countReqFiles = 0;
-		for (String string : userdir.list())
-		{
-			if (!string.endsWith(".yml") || string.length() < 5)
-			{
-				continue;
-			}
-
-			countFiles++;
-
-			final String name = string.substring(0, string.length() - 4);
-			UUID uuid = null;
-
-			try
-			{
-				uuid = UUID.fromString(name);
-			}
-			catch (IllegalArgumentException ex)
-			{
-				countReqFiles++;
-			}
-
-			if (countFiles > 100)
-			{
-				break;
-			}
-		}
-
-		if (countReqFiles < 1)
-		{
-			return;
-		}
-
-		ess.getLogger().info("#### Starting Essentials UUID userdata conversion in a few seconds. ####");
-		ess.getLogger().info("We recommend you take a backup of your server before upgrading from the old username system.");
-
-		try
-		{
-			Thread.sleep(15000);
-		}
-		catch (InterruptedException ex)
-		{
-			// NOOP
-		}
-
-		uuidFileConvert(ess, ignoreUFCache);
-
-		doneFile.setProperty("uuidFileChange", true);
-		doneFile.save();
-	}
-
-	public static void uuidFileConvert(IEssentials ess, Boolean ignoreUFCache)
-	{
-		ess.getLogger().info("Starting Essentials UUID userdata conversion");
-
-		final File userdir = new File(ess.getDataFolder(), "userdata");
-		if (!userdir.exists())
-		{
-			return;
-		}
-
-		int countFiles = 0;
-		int countFails = 0;
-		int countEssCache = 0;
-		int countBukkit = 0;
-
-		ess.getLogger().info("Found " + userdir.list().length + " files to convert...");
-
-		for (String string : userdir.list())
-		{
-			if (!string.endsWith(".yml") || string.length() < 5)
-			{
-				continue;
-			}
-
-			final int showProgress = countFiles % 250;
-
-			if (showProgress == 0)
-			{
-				ess.getUserMap().getUUIDMap().forceWriteUUIDMap();
-				ess.getLogger().info("Converted " + countFiles + "/" + userdir.list().length);
-			}
-
-			countFiles++;
-
-			String name = string.substring(0, string.length() - 4);
-			EssentialsUserConf config;
-			UUID uuid = null;
-			try
-			{
-				uuid = UUID.fromString(name);
-			}
-			catch (IllegalArgumentException ex)
-			{
-				File file = new File(userdir, string);
-				EssentialsConf conf = new EssentialsConf(file);
-				conf.load();
-				conf.setProperty("lastAccountName", name);
-				conf.save();
-
-				String uuidConf = ignoreUFCache ? "force-uuid" : "uuid";
-
-				String uuidString = conf.getString(uuidConf, null);
-
-				for (int i = 0; i < 4; i++)
-				{
-					try
-					{
-						uuid = UUID.fromString(uuidString);
-						countEssCache++;
-						break;
-					}
-					catch (Exception ex2)
-					{
-						if (conf.getBoolean("npc", false))
-						{
-							uuid = UUID.nameUUIDFromBytes(("NPC:" + name).getBytes(Charsets.UTF_8));
-							break;
-						}
-
-						org.bukkit.OfflinePlayer player = ess.getServer().getOfflinePlayer(name);
-						uuid = player.getUniqueId();
-					}
-
-					if (uuid != null)
-					{
-						countBukkit++;
-						break;
-					}
-				}
-
-				if (uuid != null)
-				{
-					conf.forceSave();
-					config = new EssentialsUserConf(name, uuid, new File(userdir, uuid + ".yml"));
-					config.convertLegacyFile();
-					ess.getUserMap().trackUUID(uuid, name, false);
-					continue;
-				}
-				countFails++;
-			}
-		}
-		ess.getUserMap().getUUIDMap().forceWriteUUIDMap();
-
-		ess.getLogger().info("Converted " + countFiles + "/" + countFiles + ".  Conversion complete.");
-		ess.getLogger().info("Converted via cache: " + countEssCache + " :: Converted via lookup: " + countBukkit + " :: Failed to convert: " + countFails);
-		ess.getLogger().info("To rerun the conversion type /essentials uuidconvert");
-	}
-
-	public void banFormatChange()
-	{
-		if (doneFile.getBoolean("banFormatChange", false))
-		{
-			return;
-		}
-
-		ess.getLogger().info("Starting Essentials ban format conversion");
-
-		final File userdir = new File(ess.getDataFolder(), "userdata");
-		if (!userdir.exists())
-		{
-			return;
-		}
-
-		int countFiles = 0;
-
-		ess.getLogger().info("Found " + userdir.list().length + " files to convert...");
-
-		for (String string : userdir.list())
-		{
-			if (!string.endsWith(".yml") || string.length() < 5)
-			{
-				continue;
-			}
-
-			final int showProgress = countFiles % 250;
-
-			if (showProgress == 0)
-			{
-				ess.getLogger().info("Converted " + countFiles + "/" + userdir.list().length);
-			}
-
-			countFiles++;
-			final File pFile = new File(userdir, string);
-			final EssentialsConf conf = new EssentialsConf(pFile);
-			conf.load();
-			
-			String banReason;
-			Long banTimeout;
-
-			try
-			{
-				banReason = conf.getConfigurationSection("ban").getString("reason");
-			}
-			catch (NullPointerException n)
-			{
-				banReason = null;
-			}
-
-			final String playerName = conf.getString("lastAccountName");
-			if (playerName != null && playerName.length() > 1 && banReason != null && banReason.length() > 1)
-			{
-				try
-				{
-					if (conf.getConfigurationSection("ban").contains("timeout"))
-					{
-						banTimeout = Long.parseLong(conf.getConfigurationSection("ban").getString("timeout"));
-					}
-					else
-					{
-						banTimeout = 0L;
-					}
-				}
-				catch (NumberFormatException n)
-				{
-					banTimeout = 0L;
-				}
-				
-				if (BanLookup.isBanned(ess, playerName))
-				{
-					updateBan(playerName, banReason, banTimeout);
-				}
-			}
-			conf.removeProperty("ban");
-			conf.save();
-		}
-
-		doneFile.setProperty("banFormatChange", true);
-		doneFile.save();
-		ess.getLogger().info("Ban format update complete.");
-	}
-
-	private void updateBan(String playerName, String banReason, Long banTimeout)
-	{
-		if (banTimeout == 0)
-		{
-			Bukkit.getBanList(BanList.Type.NAME).addBan(playerName, banReason, null, Console.NAME);
-		}
-		else
-		{
-			Bukkit.getBanList(BanList.Type.NAME).addBan(playerName, banReason, new Date(banTimeout), Console.NAME);
-		}
-	}
-
 	public void beforeSettings()
 	{
 		if (!ess.getDataFolder().exists())
 		{
 			ess.getDataFolder().mkdirs();
 		}
+		moveWorthValuesToWorthYml();
 		moveMotdRulesToFile("motd");
 		moveMotdRulesToFile("rules");
 	}
@@ -769,13 +803,14 @@ public class EssentialsUpgrade
 	public void afterSettings()
 	{
 		sanitizeAllUserFilenames();
+		updateUsersToNewDefaultHome();
+		moveUsersDataToUserdataFolder();
+		convertWarps();
 		updateUsersPowerToolsFormat();
 		updateUsersHomesFormat();
 		deleteOldItemsCsv();
 		updateSpawnsToNewSpawnsConfig();
 		updateJailsToNewJailsConfig();
-		uuidFileChange();
-		banFormatChange();
 		warnMetrics();
 	}
 }

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

@@ -1,76 +0,0 @@
-package com.earth2me.essentials;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-import java.io.File;
-import java.io.IOException;
-import java.util.Locale;
-import java.util.UUID;
-import java.util.logging.Level;
-import org.bukkit.Bukkit;
-
-
-public class EssentialsUserConf extends EssentialsConf
-{
-	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

@@ -65,7 +65,7 @@ public class ExecuteTimer
 	}
 
 
-	private static class ExecuteRecord
+	static private class ExecuteRecord
 	{
 		private final String mark;
 		private final long time;

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

@@ -1,5 +1,6 @@
 package com.earth2me.essentials;
 
+import com.earth2me.essentials.api.II18n;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -10,12 +11,9 @@ import java.text.MessageFormat;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.regex.Pattern;
-import net.ess3.api.IEssentials;
-import org.bukkit.Bukkit;
 
 
-public class I18n implements net.ess3.api.II18n
+public class I18n implements II18n
 {
 	private static I18n instance;
 	private static final String MESSAGES = "messages";
@@ -24,28 +22,15 @@ public class I18n implements net.ess3.api.II18n
 	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 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;
-		}
-
-		protected Object handleGetObject(String key)
-		{
-			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);
-		localeBundle = defaultBundle;
-		customBundle = NULL_BUNDLE;		
 	}
 
 	public void onEnable()
@@ -58,13 +43,12 @@ public class I18n implements net.ess3.api.II18n
 		instance = null;
 	}
 
-	@Override
 	public Locale getCurrentLocale()
 	{
 		return currentLocale;
 	}
 
-	private String translate(final String string)
+	public String translate(final String string)
 	{
 		try
 		{
@@ -79,12 +63,12 @@ public class I18n implements net.ess3.api.II18n
 		}
 		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);
+			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);
 		}
 	}
 
-	public static String tl(final String string, final Object... objects)
+	public static String _(final String string, final Object... objects)
 	{
 		if (instance == null)
 		{
@@ -92,7 +76,7 @@ public class I18n implements net.ess3.api.II18n
 		}
 		if (objects.length == 0)
 		{
-			return NODOUBLEMARK.matcher(instance.translate(string)).replaceAll("'");
+			return instance.translate(string);
 		}
 		else
 		{
@@ -123,43 +107,27 @@ public class I18n implements net.ess3.api.II18n
 
 	public void updateLocale(final String loc)
 	{
-		if (loc != null && !loc.isEmpty())
+		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]);
-			}
+			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();
-		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;
-		}
+		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 static String capitalCase(final String input)
@@ -195,7 +163,7 @@ public class I18n implements net.ess3.api.II18n
 				{
 				}
 			}
-			return null;
+			return super.getResource(string);
 		}
 
 		@Override
@@ -212,7 +180,7 @@ public class I18n implements net.ess3.api.II18n
 				{
 				}
 			}
-			return null;
+			return super.getResourceAsStream(string);
 		}
 	}
 }

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

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

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

@@ -1,21 +1,15 @@
 package com.earth2me.essentials;
 
-import com.earth2me.essentials.api.IItemDb;
 import com.earth2me.essentials.api.IJails;
-import com.earth2me.essentials.api.IWarps;
 import com.earth2me.essentials.metrics.Metrics;
 import com.earth2me.essentials.perm.PermissionsHandler;
 import com.earth2me.essentials.register.payment.Methods;
-import java.util.Collection;
 import java.util.List;
-import java.util.UUID;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scheduler.BukkitTask;
 
 
 public interface IEssentials extends Plugin
@@ -26,14 +20,7 @@ public interface IEssentials extends Plugin
 
 	boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentialsModule module);
 
-	@Deprecated
 	User getUser(Object base);
-	
-	User getUser(UUID base);
-	
-	User getUser(String base);
-	
-	User getUser(Player base);
 
 	I18n getI18n();
 
@@ -41,19 +28,15 @@ public interface IEssentials extends Plugin
 
 	World getWorld(String name);
 
-	int broadcastMessage(String message);
-
 	int broadcastMessage(IUser sender, String message);
 
-	int broadcastMessage(String permission, String message);
-
 	ISettings getSettings();
 
 	BukkitScheduler getScheduler();
 
 	IJails getJails();
 
-	IWarps getWarps();
+	Warps getWarps();
 
 	Worth getWorth();
 
@@ -61,17 +44,13 @@ public interface IEssentials extends Plugin
 
 	Methods getPaymentMethod();
 
-	BukkitTask runTaskAsynchronously(Runnable run);
-
-	BukkitTask runTaskLaterAsynchronously(Runnable run, long delay);
-	
-	BukkitTask runTaskTimerAsynchronously(Runnable run, long delay, long period);
+	int scheduleAsyncDelayedTask(Runnable run);
 
 	int scheduleSyncDelayedTask(Runnable run);
 
 	int scheduleSyncDelayedTask(Runnable run, long delay);
 
-	int scheduleSyncRepeatingTask(Runnable run, long delay, long period);
+	int scheduleSyncRepeatingTask(final Runnable run, long delay, long period);
 
 	TNTExplodeListener getTNTListener();
 
@@ -79,21 +58,17 @@ public interface IEssentials extends Plugin
 
 	AlternativeCommandsHandler getAlternativeCommandsHandler();
 
-	void showError(CommandSource sender, Throwable exception, String commandLabel);
+	void showError(final CommandSender sender, final Throwable exception, final String commandLabel);
 
-	IItemDb getItemDb();
+	ItemDb getItemDb();
 
 	UserMap getUserMap();
-
+	
 	Metrics getMetrics();
-
+	
 	void setMetrics(Metrics metrics);
-
+	
 	EssentialsTimer getTimer();
-
+	
 	List<String> getVanishedPlayers();
-
-	Collection<Player> getOnlinePlayers();
-
-	Iterable<User> getOnlineUsers();
 }

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

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

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

@@ -3,7 +3,7 @@ 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.text.MessageFormat;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -26,17 +26,13 @@ public interface ISettings extends IConf
 
 	long getBackupInterval();
 
-	String getChatFormat(String group);
+	MessageFormat getChatFormat(String group);
 
 	int getChatRadius();
-	
-	char getChatShout();
-	
-	char getChatQuestion();
 
-	BigDecimal getCommandCost(IEssentialsCommand cmd);
+	double getCommandCost(IEssentialsCommand cmd);
 
-	BigDecimal getCommandCost(String label);
+	double getCommandCost(String label);
 
 	String getCurrencySymbol();
 
@@ -46,8 +42,6 @@ public interface ISettings extends IConf
 
 	double getHealCooldown();
 
-	Set<String> getSocialSpyCommands();
-
 	Map<String, Object> getKit(String name);
 
 	ConfigurationSection getKits();
@@ -80,11 +74,11 @@ public interface ISettings extends IConf
 
 	int getHomeLimit(User user);
 
+	boolean getSortListByGroups();
+
 	int getSpawnMobLimit();
 
-	BigDecimal getStartingBalance();
-
-	boolean isTeleportSafetyEnabled();
+	int getStartingBalance();
 
 	double getTeleportCooldown();
 
@@ -116,9 +110,9 @@ public interface ISettings extends IConf
 
 	boolean warnOnSmite();
 
-	BigDecimal getMaxMoney();
+	double getMaxMoney();
 
-	BigDecimal getMinMoney();
+	double getMinMoney();
 
 	boolean isEcoLogEnabled();
 
@@ -148,18 +142,14 @@ public interface ISettings extends IConf
 
 	boolean cancelAfkOnMove();
 
-	boolean cancelAfkOnInteract();
-
 	boolean areDeathMessagesEnabled();
 
-	void setDebug(boolean debug);
+	public void setDebug(boolean debug);
 
 	Set<String> getNoGodWorlds();
 
 	boolean getUpdateBedAtDaytime();
 
-	boolean allowUnsafeEnchantments();
-
 	boolean getRepairEnchanted();
 
 	boolean isWorldTeleportPermissions();
@@ -189,30 +179,4 @@ public interface ISettings extends IConf
 	double getMaxFlySpeed();
 
 	double getMaxWalkSpeed();
-
-	int getMailsPerMinute();
-
-	long getEconomyLagWarning();
-	
-	long getPermissionsLagWarning();
-
-	void setEssentialsChatActive(boolean b);
-
-	long getMaxTempban();
-
-	Map<String, Object> getListGroupConfig();
-
-	int getMaxNickLength();
-
-	int getMaxUserCacheCount();
-
-	boolean allowSilentJoinQuit();
-
-	boolean isCustomJoinMessage();
-
-	String getCustomJoinMessage();
-
-	boolean isCustomQuitMessage();
-
-	String getCustomQuitMessage();
 }

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

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

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

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

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

@@ -1,32 +1,25 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
-import com.earth2me.essentials.utils.NumberUtil;
-import com.earth2me.essentials.utils.StringUtil;
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.IItemDb;
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import net.ess3.api.IEssentials;
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
 
-public class ItemDb implements IConf, net.ess3.api.IItemDb
+public class ItemDb implements IConf, IItemDb
 {
 	private final transient IEssentials ess;
-	private final transient Map<String, Integer> items = new HashMap<String, Integer>();
-	private final transient Map<ItemData, List<String>> names = new HashMap<ItemData, List<String>>();
-	private final transient Map<ItemData, String> primaryName = new HashMap<ItemData, String>();
-	private final transient Map<String, Short> durabilities = new HashMap<String, Short>();
-	private final transient ManagedFile file;
-	private final transient Pattern splitPattern = Pattern.compile("((.*)[:+',;.](\\d+))");
 
 	public ItemDb(final IEssentials ess)
 	{
 		this.ess = ess;
 		file = new ManagedFile("items.csv", ess);
 	}
+	private final transient Map<String, Integer> items = new HashMap<String, Integer>();
+	private final transient Map<ItemData, List<String>> names = new HashMap<ItemData, List<String>>();
+	private final transient Map<String, Short> durabilities = new HashMap<String, Short>();
+	private final transient ManagedFile file;
 
 	@Override
 	public void reloadConfig()
@@ -41,7 +34,6 @@ public class ItemDb implements IConf, net.ess3.api.IItemDb
 		durabilities.clear();
 		items.clear();
 		names.clear();
-		primaryName.clear();
 
 		for (String line : lines)
 		{
@@ -76,12 +68,10 @@ public class ItemDb implements IConf, net.ess3.api.IItemDb
 				List<String> nameList = new ArrayList<String>();
 				nameList.add(itemName);
 				names.put(itemData, nameList);
-				primaryName.put(itemData, itemName);
 			}
 		}
 	}
 
-	@Override
 	public ItemStack get(final String id, final int quantity) throws Exception
 	{
 		final ItemStack retval = get(id.toLowerCase(Locale.ENGLISH));
@@ -89,37 +79,31 @@ public class ItemDb implements IConf, net.ess3.api.IItemDb
 		return retval;
 	}
 
-	@Override
 	public ItemStack get(final String id) throws Exception
 	{
 		int itemid = 0;
 		String itemname = null;
 		short metaData = 0;
-		Matcher parts = splitPattern.matcher(id);
-		if (parts.matches())
+		if (id.matches("^\\d+[:+',;.]\\d+$"))
 		{
-			itemname = parts.group(2);
-			metaData = Short.parseShort(parts.group(3));
+			itemid = Integer.parseInt(id.split("[:+',;.]")[0]);
+			metaData = Short.parseShort(id.split("[:+',;.]")[1]);
 		}
-		else
-		{
-			itemname = id;
-		}
-
-		if (NumberUtil.isInt(itemname))
-		{
-			itemid = Integer.parseInt(itemname);
-		}
-		else if (NumberUtil.isInt(id))
+		else if (id.matches("^\\d+$"))
 		{
 			itemid = Integer.parseInt(id);
 		}
+		else if (id.matches("^[^:+',;.]+[:+',;.]\\d+$"))
+		{
+			itemname = id.split("[:+',;.]")[0].toLowerCase(Locale.ENGLISH);
+			metaData = Short.parseShort(id.split("[:+',;.]")[1]);
+		}
 		else
 		{
-			itemname = itemname.toLowerCase(Locale.ENGLISH);
+			itemname = id.toLowerCase(Locale.ENGLISH);
 		}
 
-		if (itemid < 1)
+		if (itemname != null)
 		{
 			if (items.containsKey(itemname))
 			{
@@ -129,34 +113,21 @@ public class ItemDb implements IConf, net.ess3.api.IItemDb
 					metaData = durabilities.get(itemname);
 				}
 			}
-			else if (Material.getMaterial(itemname.toUpperCase(Locale.ENGLISH)) != null)
+			else if (Material.getMaterial(itemname) != null)
 			{
-				Material bMaterial = Material.getMaterial(itemname.toUpperCase(Locale.ENGLISH));
-				itemid = bMaterial.getId();
+				itemid = Material.getMaterial(itemname).getId();
+				metaData = 0;
 			}
 			else
 			{
-				try
-				{
-					Material bMaterial = Bukkit.getUnsafe().getMaterialFromInternalName(itemname.toLowerCase(Locale.ENGLISH));
-					itemid = bMaterial.getId();
-				}
-				catch (Throwable throwable)
-				{
-					throw new Exception(tl("unknownItemName", itemname), throwable);
-				}
+				throw new Exception(_("unknownItemName", id));
 			}
 		}
 
-		if (itemid < 1)
-		{
-			throw new Exception(tl("unknownItemName", itemname));
-		}
-
 		final Material mat = Material.getMaterial(itemid);
 		if (mat == null)
 		{
-			throw new Exception(tl("unknownItemId", itemid));
+			throw new Exception(_("unknownItemId", itemid));
 		}
 		final ItemStack retval = new ItemStack(mat);
 		retval.setAmount(mat.getMaxStackSize());
@@ -164,95 +135,26 @@ public class ItemDb implements IConf, net.ess3.api.IItemDb
 		return retval;
 	}
 
-	@Override
-	public List<ItemStack> getMatching(User user, String[] args) throws Exception
-	{
-		List<ItemStack> is = new ArrayList<ItemStack>();
-
-		if (args.length < 1)
-		{
-			is.add(user.getBase().getItemInHand());
-		}
-		else if (args[0].equalsIgnoreCase("hand"))
-		{
-			is.add(user.getBase().getItemInHand());
-		}
-		else if (args[0].equalsIgnoreCase("inventory") || args[0].equalsIgnoreCase("invent") || args[0].equalsIgnoreCase("all"))
-		{
-			for (ItemStack stack : user.getBase().getInventory().getContents())
-			{
-				if (stack == null || stack.getType() == Material.AIR)
-				{
-					continue;
-				}
-				is.add(stack);
-			}
-		}
-		else if (args[0].equalsIgnoreCase("blocks"))
-		{
-			for (ItemStack stack : user.getBase().getInventory().getContents())
-			{
-				if (stack == null || stack.getTypeId() > 255 || stack.getType() == Material.AIR)
-				{
-					continue;
-				}
-				is.add(stack);
-			}
-		}
-		else
-		{
-			is.add(get(args[0]));
-		}
-
-		if (is.isEmpty() || is.get(0).getType() == Material.AIR)
-		{
-			throw new Exception(tl("itemSellAir"));
-		}
-
-		return is;
-	}
-
-	@Override
 	public String names(ItemStack item)
 	{
 		ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
 		List<String> nameList = names.get(itemData);
-		if (nameList == null)
-		{
-			itemData = new ItemData(item.getTypeId(), (short)0);
+		if (nameList == null) {
+			itemData = new ItemData(item.getTypeId(), (short) 0);
 			nameList = names.get(itemData);
-			if (nameList == null)
-			{
+			if (nameList == null) {
 				return null;
 			}
 		}
-
+		
 		if (nameList.size() > 15)
 		{
 			nameList = nameList.subList(0, 14);
 		}
-		return StringUtil.joinList(", ", nameList);
+		return Util.joinList(", ", nameList);
 	}
 
-	@Override
-	public String name(ItemStack item)
-	{
-		ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
-		String name = primaryName.get(itemData);
-		if (name == null)
-		{
-			itemData = new ItemData(item.getTypeId(), (short)0);
-			name = primaryName.get(itemData);
-			if (name == null)
-			{
-				return null;
-			}
-		}
-		return name;
-	}
-
-
-	static class ItemData
+	class ItemData
 	{
 		final private int itemNo;
 		final private short itemData;
@@ -296,7 +198,6 @@ public class ItemDb implements IConf, net.ess3.api.IItemDb
 		}
 	}
 
-
 	class LengthCompare implements java.util.Comparator<String>
 	{
 		public LengthCompare()

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

@@ -1,18 +1,16 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.IJails;
 import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
 import java.io.File;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -29,7 +27,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.plugin.PluginManager;
 
 
-public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Jails> implements net.ess3.api.IJails
+public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Jails> implements IJails
 {
 	private static final transient Logger LOGGER = Bukkit.getLogger();
 	private static transient boolean enabled = false;
@@ -46,10 +44,6 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		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
@@ -61,24 +55,16 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 	@Override
 	public void finishRead()
 	{
-		checkRegister();
+		if (enabled == false && getCount() > 0)
+		{
+			registerListeners();
+		}
 	}
 
 	@Override
 	public void finishWrite()
 	{
-		checkRegister();
-	}
-
-	public void resetListener()
-	{
-		enabled = false;
-		checkRegister();
-	}
-
-	private void checkRegister()
-	{
-		if (enabled == false && getCount() > 0)
+		if (enabled == false)
 		{
 			registerListeners();
 		}
@@ -93,12 +79,12 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 			if (getData().getJails() == null || jailName == null
 				|| !getData().getJails().containsKey(jailName.toLowerCase(Locale.ENGLISH)))
 			{
-				throw new Exception(tl("jailNotExist"));
+				throw new Exception(_("jailNotExist"));
 			}
 			Location loc = getData().getJails().get(jailName.toLowerCase(Locale.ENGLISH));
 			if (loc == null || loc.getWorld() == null)
 			{
-				throw new Exception(tl("jailNotExist"));
+				throw new Exception(_("jailNotExist"));
 			}
 			return loc;
 		}
@@ -150,7 +136,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		acquireReadLock();
 		try
 		{
-			if (user.getBase().isOnline())
+			if (user.isOnline())
 			{
 				Location loc = getJail(jail);
 				user.getTeleport().now(loc, false, TeleportCause.COMMAND);
@@ -198,7 +184,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 	private class JailListener implements Listener
 	{
 		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-		public void onJailBlockBreak(final BlockBreakEvent event)
+		public void onBlockBreak(final BlockBreakEvent event)
 		{
 			final User user = ess.getUser(event.getPlayer());
 			if (user.isJailed())
@@ -208,7 +194,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		}
 
 		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-		public void onJailBlockPlace(final BlockPlaceEvent event)
+		public void onBlockPlace(final BlockPlaceEvent event)
 		{
 			final User user = ess.getUser(event.getPlayer());
 			if (user.isJailed())
@@ -218,7 +204,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		}
 
 		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-		public void onJailBlockDamage(final BlockDamageEvent event)
+		public void onBlockDamage(final BlockDamageEvent event)
 		{
 			final User user = ess.getUser(event.getPlayer());
 			if (user.isJailed())
@@ -228,7 +214,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		}
 
 		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-		public void onJailEntityDamageByEntity(final EntityDamageByEntityEvent event)
+		public void onEntityDamageByEntity(final EntityDamageByEntityEvent event)
 		{
 			if (event.getCause() != DamageCause.ENTITY_ATTACK || event.getEntity().getType() != EntityType.PLAYER)
 			{
@@ -237,7 +223,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 			final Entity damager = event.getDamager();
 			if (damager.getType() == EntityType.PLAYER)
 			{
-				final User user = ess.getUser((Player)damager);
+				final User user = ess.getUser(damager);
 				if (user != null && user.isJailed())
 				{
 					event.setCancelled(true);
@@ -246,7 +232,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		}
 
 		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-		public void onJailPlayerInteract(final PlayerInteractEvent event)
+		public void onPlayerInteract(final PlayerInteractEvent event)
 		{
 			final User user = ess.getUser(event.getPlayer());
 			if (user.isJailed())
@@ -256,7 +242,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		}
 
 		@EventHandler(priority = EventPriority.HIGHEST)
-		public void onJailPlayerRespawn(final PlayerRespawnEvent event)
+		public void onPlayerRespawn(final PlayerRespawnEvent event)
 		{
 			final User user = ess.getUser(event.getPlayer());
 			if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
@@ -272,17 +258,17 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 			{
 				if (ess.getSettings().isDebug())
 				{
-					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
+					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
 				}
 				else
 				{
-					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
+					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
 				}
 			}
 		}
 
 		@EventHandler(priority = EventPriority.HIGH)
-		public void onJailPlayerTeleport(final PlayerTeleportEvent event)
+		public void onPlayerTeleport(final PlayerTeleportEvent event)
 		{
 			final User user = ess.getUser(event.getPlayer());
 			if (!user.isJailed() || user.getJail() == null || user.getJail().isEmpty())
@@ -298,22 +284,20 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 			{
 				if (ess.getSettings().isDebug())
 				{
-					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
+					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
 				}
 				else
 				{
-					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
+					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
 				}
 			}
-			user.sendMessage(tl("jailMessage"));
+			user.sendMessage(_("jailMessage"));
 		}
 
 		@EventHandler(priority = EventPriority.HIGHEST)
-		public void onJailPlayerJoin(final PlayerJoinEvent event)
+		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;
@@ -327,14 +311,14 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 			{
 				if (ess.getSettings().isDebug())
 				{
-					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
+					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
 				}
 				else
 				{
-					LOGGER.log(Level.INFO, tl("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
+					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
 				}
 			}
-			user.sendMessage(tl("jailMessage"));
+			user.sendMessage(_("jailMessage"));
 		}
 	}
 }

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

@@ -1,44 +1,19 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import static com.earth2me.essentials.I18n.capitalCase;
-import com.earth2me.essentials.Trade.OverflowType;
 import com.earth2me.essentials.commands.NoChargeException;
 import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
-import com.earth2me.essentials.textreader.IText;
-import com.earth2me.essentials.textreader.KeywordReplacer;
-import com.earth2me.essentials.textreader.SimpleTextInput;
-import com.earth2me.essentials.utils.DateUtil;
-import com.earth2me.essentials.utils.NumberUtil;
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.logging.Level;
-import net.ess3.api.IEssentials;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 
 
 public class Kit
 {
-	final IEssentials ess;
-	final String kitName;
-	final Map<String, Object> kit;
-	final Trade charge;
-
-	public Kit(final String kitName, final IEssentials ess) throws Exception
-	{
-		this.kitName = kitName;
-		this.ess = ess;
-		this.kit = ess.getSettings().getKit(kitName);
-		this.charge = new Trade("kit-" + kitName, new Trade("kit-kit", ess), ess);
-
-		if (kit == null)
-		{
-			throw new Exception(tl("kitNotFound"));
-		}
-	}
-
 	//TODO: Convert this to use one of the new text classes?
 	public static String listKits(final IEssentials ess, final User user) throws Exception
 	{
@@ -46,248 +21,161 @@ public class Kit
 		{
 			final ConfigurationSection kits = ess.getSettings().getKits();
 			final StringBuilder list = new StringBuilder();
-			for (String kitItem : kits.getKeys(false))
+			for (String kiteItem : kits.getKeys(false))
 			{
-				if (user == null)
+				if (user == null || user.isAuthorized("essentials.kits." + kiteItem.toLowerCase(Locale.ENGLISH)))
 				{
-					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);
-					if (kit.getNextUse(user) != 0)
-					{
-						name = tl("kitDelay", name);
-					}
-
-					list.append(" ").append(name).append(cost);
+					list.append(" ").append(capitalCase(kiteItem));
 				}
 			}
 			return list.toString().trim();
 		}
 		catch (Exception ex)
 		{
-			throw new Exception(tl("kitError"), ex);
+			throw new Exception(_("kitError"), ex);
 		}
 
 	}
 
-	public String getName()
+	public static void checkTime(final User user, final String kitName, final Map<String, Object> els) throws NoChargeException
 	{
-		return kitName;
-	}
-
-	public void checkPerms(final User user) throws Exception
-	{
-		if (!user.isAuthorized("essentials.kits." + kitName))
-		{
-			throw new Exception(tl("noKitPermission", "essentials.kits." + kitName));
-		}
-	}
-
-	public void checkDelay(final User user) throws Exception
-	{
-		long nextUse = getNextUse(user);
-
-		if (nextUse == 0L)
-		{
+		if (user.isAuthorized("essentials.kit.exemptdelay")) {
 			return;
 		}
-		else if (nextUse < 0L)
-		{
-			user.sendMessage(tl("kitOnce"));
-			throw new NoChargeException();
-		}
-		else
-		{
-			user.sendMessage(tl("kitTimed", DateUtil.formatDateDiff(nextUse)));
-			throw new NoChargeException();
-		}
-	}
-
-	public void checkAffordable(final User user) throws Exception
-	{
-		charge.isAffordableFor(user);
-	}
-
-	public void setTime(final User user) throws Exception
-	{
-		final Calendar time = new GregorianCalendar();
-		user.setKitTimestamp(kitName, time.getTimeInMillis());
-	}
-
-	public void chargeUser(final User user) throws Exception
-	{
-		charge.charge(user);
-	}
-
-	public long getNextUse(final User user) throws Exception
-	{
-		if (user.isAuthorized("essentials.kit.exemptdelay"))
-		{
-			return 0L;
-		}
-
+		
 		final Calendar time = new GregorianCalendar();
 
-		double delay = 0;
-		try
-		{
-			// Make sure delay is valid
-			delay = kit.containsKey("delay") ? ((Number)kit.get("delay")).doubleValue() : 0.0d;
-		}
-		catch (Exception e)
-		{
-			throw new Exception(tl("kitError2"));
-		}
+		// Take the current time, and remove the delay from it.
+		final double delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0L;
+		final Calendar earliestTime = new GregorianCalendar();
+		earliestTime.add(Calendar.SECOND, -(int)delay);
+		earliestTime.add(Calendar.MILLISECOND, -(int)((delay * 1000.0) % 1000.0));
+		// This value contains the most recent time a kit could have been used that would allow another use.
+		final long earliestLong = earliestTime.getTimeInMillis();
 
 		// When was the last kit used?
 		final long lastTime = user.getKitTimestamp(kitName);
 
-		// When can be use the kit again?
-		final Calendar delayTime = new GregorianCalendar();
-		delayTime.setTimeInMillis(lastTime);
-		delayTime.add(Calendar.SECOND, (int)delay);
-		delayTime.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
-
-		if (lastTime == 0L || lastTime > time.getTimeInMillis())
+		if (lastTime < earliestLong)
 		{
-			// If we have no record of kit use, or its corrupted, give them benifit of the doubt.
-			return 0L;
+			user.setKitTimestamp(kitName, time.getTimeInMillis());
 		}
-		else if (delay < 0d)
+		else if (lastTime > time.getTimeInMillis())
 		{
-			// 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;
+			// This is to make sure time didn't get messed up on last kit use.
+			// If this happens, let's give the user the benifit of the doubt.
+			user.setKitTimestamp(kitName, time.getTimeInMillis());
 		}
 		else
 		{
-			// If the kit has been used recently, return the next time it can be used.
-			return delayTime.getTimeInMillis();
+			time.setTimeInMillis(lastTime);
+			time.add(Calendar.SECOND, (int)delay);
+			time.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
+			user.sendMessage(_("kitTimed", Util.formatDateDiff(time.getTimeInMillis())));
+			throw new NoChargeException();
 		}
 	}
 
-	public List<String> getItems(final User user) throws Exception
+	public static List<String> getItems(final User user, final Map<String, Object> kit) throws Exception
 	{
 		if (kit == null)
 		{
-			throw new Exception(tl("kitNotFound"));
+			throw new Exception(_("kitError2"));
 		}
+	
+
 		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");
+			return (List<String>)kit.get("items");
 		}
 		catch (Exception e)
 		{
-			ess.getLogger().log(Level.WARNING, "Error parsing kit " + kitName + ": " + e.getMessage());
-			throw new Exception(tl("kitError2"), e);
+			user.sendMessage(_("kitError2"));
+			throw new Exception(_("kitErrorHelp"), 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
+	public static void expandItems(final IEssentials ess, final User user, final List<String> items) throws Exception
 	{
 		try
 		{
-			IText input = new SimpleTextInput(items);
-			IText output = new KeywordReplacer(input, user.getSource(), ess);
-
 			boolean spew = false;
-			final boolean allowUnsafe = ess.getSettings().allowUnsafeEnchantments();
-			for (String kitItem : output.getLines())
+			for (String d : items)
 			{
-				if (kitItem.startsWith(ess.getSettings().getCurrencySymbol()))
-				{
-					BigDecimal value = new BigDecimal(kitItem.substring(ess.getSettings().getCurrencySymbol().length()).trim());
-					Trade t = new Trade(value, ess);
-					t.pay(user, OverflowType.DROP);
-					continue;
-				}
-
-				final String[] parts = kitItem.split(" +");
-				final ItemStack parseStack = ess.getItemDb().get(parts[0], parts.length > 1 ? Integer.parseInt(parts[1]) : 1);
-
-				if (parseStack.getType() == Material.AIR)
-				{
-					continue;
-				}
-
-				final MetaItemStack metaStack = new MetaItemStack(parseStack);
+				final String[] parts = d.split(" ");
+				final String[] item = parts[0].split("[:+',;.]", 2);
+				final int id = Material.getMaterial(Integer.parseInt(item[0])).getId();
+				final short data = item.length > 1 ? Short.parseShort(item[1]) : 0;
+				final int amount = parts.length > 1 ? Integer.parseInt(parts[1]) : 1;
 
+				final ItemStack stack = new ItemStack(id, amount, data);
 				if (parts.length > 2)
 				{
-					// We pass a null sender here because kits should not do perm checks
-					metaStack.parseStringMeta(null, allowUnsafe, parts, 2, ess);
+					for (int i = 2; i < parts.length; i++)
+					{
+						final String[] split = parts[i].split("[:+',;.]", 2);
+						if (split.length < 1)
+						{
+							continue;
+						}
+						final Enchantment enchantment = Enchantments.getByName(split[0]);
+						if (enchantment == null)
+						{
+							throw new Exception("Enchantment not found: " + split[0]);
+						}
+						int level;
+						if (split.length > 1)
+						{
+							level = Integer.parseInt(split[1]);
+						}
+						else
+						{
+							level = enchantment.getMaxLevel();
+						}
+						try
+						{
+							stack.addEnchantment(enchantment, level);
+						}
+						catch (Exception ex)
+						{
+							throw new Exception("Enchantment " + enchantment.getName() + ": " + ex.getMessage(), ex);
+						}
+					}
 				}
 
 				final Map<Integer, ItemStack> overfilled;
-				final boolean allowOversizedStacks = user.isAuthorized("essentials.oversizedstacks");
-				if (allowOversizedStacks)
+				if (user.isAuthorized("essentials.oversizedstacks"))
 				{
-					overfilled = InventoryWorkaround.addOversizedItems(user.getBase().getInventory(), ess.getSettings().getOversizedStackSize(), metaStack.getItemStack());
+					overfilled = InventoryWorkaround.addItem(user.getInventory(), true, ess.getSettings().getOversizedStackSize(), stack);
 				}
 				else
 				{
-					overfilled = InventoryWorkaround.addItems(user.getBase().getInventory(), metaStack.getItemStack());
+					overfilled = InventoryWorkaround.addItem(user.getInventory(), true, 0, stack);
 				}
 				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();
-					}
+					user.getWorld().dropItemNaturally(user.getLocation(), itemStack);
 					spew = true;
 				}
 			}
-			user.getBase().updateInventory();
+			user.updateInventory();
 			if (spew)
 			{
-				user.sendMessage(tl("kitInvFull"));
+				user.sendMessage(_("kitInvFull"));
 			}
 		}
 		catch (Exception e)
 		{
-			user.getBase().updateInventory();
-			ess.getLogger().log(Level.WARNING, e.getMessage());
-			throw new Exception(tl("kitError2"), e);
+			user.updateInventory();
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.WARNING, e.getMessage());
+			}
+			else
+			{
+				ess.getLogger().log(Level.WARNING, e.getMessage());
+			}
+			throw new Exception(_("kitError2"), e);
 		}
 	}
 }

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

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

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

@@ -1,6 +1,6 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import java.io.*;
 import java.math.BigInteger;
 import java.security.DigestInputStream;
@@ -11,13 +11,12 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
-import net.ess3.api.IEssentials;
 import org.bukkit.Bukkit;
 
 
 public class ManagedFile
 {
-	private static final int BUFFERSIZE = 1024 * 8;
+	private final static int BUFFERSIZE = 1024 * 8;
 	private final transient File file;
 
 	public ManagedFile(final String filename, final IEssentials ess)
@@ -47,7 +46,7 @@ public class ManagedFile
 			}
 			catch (IOException ex)
 			{
-				Bukkit.getLogger().log(Level.SEVERE, tl("itemsCsvNotLoaded"), ex);
+				Bukkit.getLogger().log(Level.SEVERE, _("itemsCsvNotLoaded"), ex);
 			}
 		}
 	}

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

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

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

@@ -1,18 +1,16 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Location;
 import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
 
 
-// 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),
@@ -20,7 +18,6 @@ public enum Mob
 	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),
@@ -29,7 +26,7 @@ public enum Mob
 	SPIDER("Spider", Enemies.ENEMY, EntityType.SPIDER),
 	SQUID("Squid", Enemies.FRIENDLY, EntityType.SQUID),
 	ZOMBIE("Zombie", Enemies.ENEMY, EntityType.ZOMBIE),
-	WOLF("Wolf", Enemies.NEUTRAL, "", EntityType.WOLF),
+	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),
@@ -40,20 +37,9 @@ public enum Mob
 	MAGMACUBE("MagmaCube", Enemies.ENEMY, EntityType.MAGMA_CUBE),
 	SNOWMAN("Snowman", Enemies.FRIENDLY, "", EntityType.SNOWMAN),
 	OCELOT("Ocelot", Enemies.NEUTRAL, EntityType.OCELOT),
-	IRONGOLEM("IronGolem", Enemies.NEUTRAL, EntityType.IRON_GOLEM),
-	WITHER("Wither", Enemies.ENEMY, EntityType.WITHER),
-	BAT("Bat", Enemies.FRIENDLY, EntityType.BAT),
-	WITCH("Witch", Enemies.ENEMY, EntityType.WITCH),
-	BOAT("Boat", Enemies.NEUTRAL, EntityType.BOAT),
-	MINECART("Minecart", Enemies.NEUTRAL, EntityType.MINECART),
-	MINECART_CHEST("ChestMinecart", Enemies.NEUTRAL, EntityType.MINECART_CHEST),
-	MINECART_FURNACE("FurnaceMinecart", Enemies.NEUTRAL, EntityType.MINECART_FURNACE),
-	MINECART_TNT("TNTMinecart", Enemies.NEUTRAL, EntityType.MINECART_TNT),
-	MINECART_HOPPER("HopperMinecart", Enemies.NEUTRAL, EntityType.MINECART_HOPPER),
-	MINECART_MOB_SPAWNER("SpawnerMinecart", Enemies.NEUTRAL, EntityType.MINECART_MOB_SPAWNER),
-	ENDERCRYSTAL("EnderCrystal", Enemies.NEUTRAL, EntityType.ENDER_CRYSTAL),
-	EXPERIENCEORB("ExperienceOrb", Enemies.NEUTRAL, EntityType.EXPERIENCE_ORB);
-	public static final Logger logger = Logger.getLogger("Essentials");
+	IRONGOLEM("IronGolem", Enemies.NEUTRAL, EntityType.IRON_GOLEM);
+	
+	public static final Logger logger = Logger.getLogger("Minecraft");
 
 	private Mob(String n, Enemies en, String s, EntityType type)
 	{
@@ -74,28 +60,25 @@ public enum Mob
 	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>();
 
 	static
 	{
 		for (Mob mob : Mob.values())
 		{
 			hashMap.put(mob.name.toLowerCase(Locale.ENGLISH), mob);
-			bukkitMap.put(mob.bukkitType, mob);
 		}
 	}
-
-	public static Set<String> getMobList()
-	{
+	
+	public static Set<String> getMobList() {
 		return Collections.unmodifiableSet(hashMap.keySet());
 	}
 
-	public Entity spawn(final World world, final Server server, final Location loc) throws MobException
+	public LivingEntity spawn(final Player player, final Server server, final Location loc) throws MobException
 	{
-		final Entity entity = world.spawn(loc, (Class<? extends Entity>)this.bukkitType.getEntityClass());
+		final LivingEntity entity = player.getWorld().spawn(loc, (Class<? extends LivingEntity>)this.bukkitType.getEntityClass());
 		if (entity == null)
 		{
-			logger.log(Level.WARNING, tl("unableToSpawnMob"));
+			logger.log(Level.WARNING, _("unableToSpawnMob"));
 			throw new MobException();
 		}
 		return entity;
@@ -125,11 +108,6 @@ public enum Mob
 		return hashMap.get(name.toLowerCase(Locale.ENGLISH));
 	}
 
-	public static Mob fromBukkitType(final EntityType type)
-	{
-		return bukkitMap.get(type);
-	}
-
 
 	public static class MobException extends Exception
 	{

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

@@ -1,351 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n.tl;
-import com.earth2me.essentials.utils.StringUtil;
-import java.util.*;
-import java.util.logging.Logger;
-import org.bukkit.DyeColor;
-import org.bukkit.Material;
-import org.bukkit.entity.Ageable;
-import org.bukkit.entity.Creeper;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.ExperienceOrb;
-import org.bukkit.entity.Horse;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Ocelot;
-import org.bukkit.entity.Pig;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Skeleton;
-import org.bukkit.entity.Slime;
-import org.bukkit.entity.Tameable;
-import org.bukkit.entity.Villager;
-import org.bukkit.entity.Wolf;
-import org.bukkit.entity.Zombie;
-import org.bukkit.inventory.EntityEquipment;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.material.Colorable;
-
-
-public enum MobData
-{
-	BABY_AGEABLE("baby", Ageable.class, Data.BABY, true),
-	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),
-	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),
-	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),
-	WHITHER_SKELETON("wither", EntityType.SKELETON, Data.WITHER, true),
-	POWERED_CREEPER("powered", EntityType.CREEPER, Data.ELECTRIFIED, true),
-	ELECTRIC_CREEPER("electric", EntityType.CREEPER, Data.ELECTRIFIED, false),
-	CHARGED_CREEPER("charged", EntityType.CREEPER, Data.ELECTRIFIED, false),
-	SADDLE_PIG("saddle", EntityType.PIG, Data.PIGSADDLE, true),
-	ANGRY_WOLF("angry", EntityType.WOLF, Data.ANGRY, true),
-	RABID_WOLF("rabid", EntityType.WOLF, Data.ANGRY, false),
-	FARMER_VILLAGER("farmer", EntityType.VILLAGER, Villager.Profession.FARMER, true),
-	LIBRARIAN_VILLAGER("librarian", EntityType.VILLAGER, Villager.Profession.LIBRARIAN, true),
-	PRIEST_VILLAGER("priest", EntityType.VILLAGER, Villager.Profession.PRIEST, true),
-	FATHER_VILLAGER("father", EntityType.VILLAGER, Villager.Profession.PRIEST, false),
-	SMITH_VILLAGER("smith", EntityType.VILLAGER, Villager.Profession.BLACKSMITH, true),
-	BUTCHER_VILLAGER("butcher", EntityType.VILLAGER, Villager.Profession.BUTCHER, true),
-	SIZE_SLIME("", "<1-100>", EntityType.SLIME.getEntityClass(), Data.SIZE, true),
-	NUM_EXPERIENCE_ORB("", "<1-2000000000>", EntityType.EXPERIENCE_ORB, Data.EXP, true);
-
-
-	public enum Data
-	{
-		ADULT,
-		BABY,
-		CHEST,
-		ADULTZOMBIE,
-		BABYZOMBIE,
-		VILLAGER,
-		HORSESADDLE,
-		PIGSADDLE,
-		ELECTRIFIED,
-		WITHER,
-		ANGRY,
-		TAMED,
-		COLORABLE,
-		EXP,
-		SIZE;
-	}
-	public static final Logger logger = Logger.getLogger("Essentials");
-
-	private MobData(String n, Object type, Object value, boolean isPublic)
-	{
-		this.nickname = n;
-		this.matched = n;
-		this.helpMessage = n;
-		this.type = type;
-		this.value = value;
-		this.isPublic = isPublic;
-	}
-
-	private MobData(String n, String h, Object type, Object value, boolean isPublic)
-	{
-		this.nickname = n;
-		this.matched = n;
-		this.helpMessage = h;
-		this.type = type;
-		this.value = value;
-		this.isPublic = isPublic;
-	}
-	final private String nickname;
-	final private String helpMessage;
-	final private Object type;
-	final private Object value;
-	final private boolean isPublic;
-	private String matched;
-
-	public static LinkedHashMap<String, MobData> getPossibleData(final Entity spawned, boolean publicOnly)
-	{
-		LinkedHashMap<String, MobData> mobList = new LinkedHashMap<String, MobData>();
-		for (MobData data : MobData.values())
-		{
-			if (data.type instanceof EntityType && spawned.getType().equals(data.type) && ((publicOnly && data.isPublic) || !publicOnly))
-			{
-				mobList.put(data.nickname.toLowerCase(Locale.ENGLISH), data);
-			}
-			else if (data.type instanceof Class && ((Class)data.type).isAssignableFrom(spawned.getClass()) && ((publicOnly && data.isPublic) || !publicOnly))
-			{
-				mobList.put(data.nickname.toLowerCase(Locale.ENGLISH), data);
-			}
-		}
-
-		return mobList;
-	}
-
-	public static List<String> getValidHelp(final Entity spawned)
-	{
-		List<String> output = new ArrayList<String>();
-		LinkedHashMap<String, MobData> posData = getPossibleData(spawned, true);
-
-		for (MobData data : posData.values())
-		{
-			output.add(data.helpMessage);
-		}
-		return output;
-	}
-
-	public static MobData fromData(final Entity spawned, final String name)
-	{
-		if (name.isEmpty())
-		{
-			return null;
-		}
-
-		LinkedHashMap<String, MobData> posData = getPossibleData(spawned, false);
-		for (String data : posData.keySet())
-		{
-			if (name.contains(data))
-			{
-				return posData.get(data);
-			}
-		}
-		return null;
-	}
-
-	public String getMatched()
-	{
-		return this.matched;
-	}
-
-	public void setData(final Entity spawned, final Player target, final String rawData) throws Exception
-	{
-		if (this.value.equals(Data.ANGRY))
-		{
-			((Wolf)spawned).setAngry(true);
-		}
-		else if (this.value.equals(Data.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.CHEST))
-		{
-			((Horse)spawned).setTamed(true);
-			((Horse)spawned).setCarryingChest(true);
-		}
-		else if (this.value.equals(Data.ELECTRIFIED))
-		{
-			((Creeper)spawned).setPowered(true);
-		}
-		else if (this.value.equals(Data.HORSESADDLE))
-		{
-			final Horse horse = ((Horse)spawned);
-			horse.setTamed(true);
-			horse.setOwner(target);
-			horse.getInventory().setSaddle(new ItemStack(Material.SADDLE, 1));
-		}
-		else if (this.value.equals(Data.PIGSADDLE))
-		{
-			((Pig)spawned).setSaddle(true);
-		}
-		else if (this.value.equals(Data.TAMED))
-		{
-			final Tameable tameable = ((Tameable)spawned);
-			tameable.setTamed(true);
-			tameable.setOwner(target);
-		}
-		else if (this.value.equals(Data.VILLAGER))
-		{
-			((Zombie)spawned).setVillager(this.value.equals(Data.VILLAGER));
-		}
-		else if (this.value.equals(Data.WITHER))
-		{
-			((Skeleton)spawned).setSkeletonType(Skeleton.SkeletonType.WITHER);
-		}
-		else if (this.value.equals(Data.COLORABLE))
-		{
-			final String color = rawData.toUpperCase(Locale.ENGLISH);
-			try
-			{
-				if (color.equals("RANDOM"))
-				{
-					final Random rand = new Random();
-					((Colorable)spawned).setColor(DyeColor.values()[rand.nextInt(DyeColor.values().length)]);
-				}
-				else if (!color.isEmpty())
-				{
-					((Colorable)spawned).setColor(DyeColor.valueOf(color));
-				}
-				this.matched = rawData;
-			}
-			catch (Exception e)
-			{
-				throw new Exception(tl("sheepMalformedColor"), e);
-			}
-		}
-		else if (this.value.equals(Data.EXP))
-		{
-			try
-			{
-				((ExperienceOrb)spawned).setExperience(Integer.parseInt(rawData));
-				this.matched = rawData;
-			}
-			catch (NumberFormatException e)
-			{
-				throw new Exception(tl("invalidNumber"), e);
-			}
-		}
-		else if (this.value.equals(Data.SIZE))
-		{
-			try
-			{
-				((Slime)spawned).setSize(Integer.parseInt(rawData));
-				this.matched = rawData;
-			}
-			catch (NumberFormatException e)
-			{
-				throw new Exception(tl("slimeMalformedSize"), e);
-			}
-		}
-		else if (this.value instanceof Horse.Color)
-		{
-			((Horse)spawned).setColor((Horse.Color)this.value);
-		}
-		else if (this.value instanceof Horse.Style)
-		{
-			((Horse)spawned).setStyle((Horse.Style)this.value);
-		}
-		else if (this.value instanceof Horse.Variant)
-		{
-			((Horse)spawned).setVariant((Horse.Variant)this.value);
-		}
-		else if (this.value instanceof Ocelot.Type)
-		{
-			((Ocelot)spawned).setCatType((Ocelot.Type)this.value);
-		}
-		else if (this.value instanceof Villager.Profession)
-		{
-			((Villager)spawned).setProfession((Villager.Profession)this.value);
-		}
-		else if (this.value instanceof Material)
-		{
-			if (this.type.equals(EntityType.HORSE))
-			{
-				((Horse)spawned).setTamed(true);
-				((Horse)spawned).getInventory().setArmor(new ItemStack((Material)this.value, 1));
-			}
-			else if (this.type.equals(EntityType.ZOMBIE.getEntityClass()) || this.type.equals(EntityType.SKELETON))
-			{
-				final EntityEquipment invent = ((LivingEntity)spawned).getEquipment();
-				invent.setItemInHand(new ItemStack((Material)this.value, 1));
-				invent.setItemInHandDropChance(0.1f);
-			}
-		}
-	}
-}

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

@@ -1,9 +1,6 @@
 package com.earth2me.essentials;
 
 import lombok.Delegate;
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
 import org.bukkit.entity.Entity;
@@ -14,8 +11,14 @@ import org.bukkit.permissions.Permissible;
 import org.bukkit.permissions.ServerOperator;
 
 
-public class PlayerExtension
+public class PlayerExtension implements Player
 {
+	@Delegate(types =
+	{
+		Player.class, Entity.class, CommandSender.class, ServerOperator.class,
+		HumanEntity.class, ConfigurationSerializable.class, LivingEntity.class,
+		Permissible.class
+	})
 	protected Player base;
 
 	public PlayerExtension(final Player base)
@@ -32,17 +35,4 @@ public class PlayerExtension
 	{
 		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,156 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n.tl;
-import com.earth2me.essentials.utils.FormatUtil;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-
-
-public class PlayerList
-{
-	// Cosmetic list formatting
-	public static String listUsers(final IEssentials ess, final List<User> users, final String seperator)
-	{
-		final StringBuilder groupString = new StringBuilder();
-		Collections.sort(users);
-		boolean needComma = false;
-		for (User user : users)
-		{
-			if (needComma)
-			{
-				groupString.append(seperator);
-			}
-			needComma = true;
-			if (user.isAfk())
-			{
-				groupString.append(tl("listAfkTag"));
-			}
-			if (user.isHidden())
-			{
-				groupString.append(tl("listHiddenTag"));
-			}
-			user.setDisplayNick();
-			groupString.append(user.getDisplayName());
-			groupString.append("\u00a7f");
-		}
-		return groupString.toString();
-	}
-
-	// Produce a user summary: There are 5 out of maximum 10 players online.
-	public static String listSummary(final IEssentials ess, final User user, final boolean showHidden)
-	{
-		Server server = ess.getServer();
-		int playerHidden = 0;
-		int hiddenCount = 0;
-		for (User onlinePlayer : ess.getOnlineUsers())
-		{
-			if (onlinePlayer.isHidden() || (user != null && !user.getBase().canSee(onlinePlayer.getBase())))
-			{
-				playerHidden++;
-				if (showHidden || user.getBase().canSee(onlinePlayer.getBase()))
-				{
-					hiddenCount++;
-				}
-			}
-		}
-		String online;
-		if (hiddenCount > 0)
-		{
-			online = tl("listAmountHidden", ess.getOnlinePlayers().size() - playerHidden, hiddenCount, server.getMaxPlayers());
-		}
-		else
-		{
-			online = tl("listAmount", ess.getOnlinePlayers().size() - playerHidden, server.getMaxPlayers());
-		}
-		return online;
-	}
-
-	// Build the basic player list, divided by groups.
-	public static Map<String, List<User>> getPlayerLists(final IEssentials ess, final User sender, final boolean showHidden)
-	{
-		Server server = ess.getServer();
-		final Map<String, List<User>> playerList = new HashMap<String, List<User>>();
-		for (User onlineUser : ess.getOnlineUsers())
-		{
-			if ((sender == null && !showHidden && onlineUser.isHidden()) ||
-				(sender != null && !showHidden && !sender.getBase().canSee(onlineUser.getBase())))
-			{
-				continue;
-			}
-			final String group = FormatUtil.stripFormat(FormatUtil.stripEssentialsFormat(onlineUser.getGroup().toLowerCase()));
-			List<User> list = playerList.get(group);
-			if (list == null)
-			{
-				list = new ArrayList<User>();
-				playerList.put(group, list);
-			}
-			list.add(onlineUser);
-		}
-		return playerList;
-	}
-
-	// Handle the merging of groups
-	public static List<User> getMergedList(final IEssentials ess, final Map<String, List<User>> playerList, final String groupName)
-	{
-		final Set<String> configGroups = ess.getSettings().getListGroupConfig().keySet();
-		final List<User> users = new ArrayList<User>();
-		for (String configGroup : configGroups)
-		{
-			if (configGroup.equalsIgnoreCase(groupName))
-			{
-				String[] groupValues = ess.getSettings().getListGroupConfig().get(configGroup).toString().trim().split(" ");
-				for (String groupValue : groupValues)
-				{
-					groupValue = groupValue.toLowerCase(Locale.ENGLISH);
-					if (groupValue == null || groupValue.isEmpty())
-					{
-						continue;
-					}
-					List<User> u = playerList.get(groupValue.trim());
-					if (u == null || u.isEmpty())
-					{
-						continue;
-					}
-					playerList.remove(groupValue);
-					users.addAll(u);
-				}
-			}
-		}
-		return users;
-	}
-
-	// Output a playerlist of just a single group, /list <groupname>
-	public static String listGroupUsers(final IEssentials ess, final Map<String, List<User>> playerList, final String groupName) throws Exception
-	{
-		final List<User> users = getMergedList(ess, playerList, groupName);
-		final List<User> groupUsers = playerList.get(groupName);
-		if (groupUsers != null && !groupUsers.isEmpty())
-		{
-			users.addAll(groupUsers);
-		}
-		if (users == null || users.isEmpty())
-		{
-			throw new Exception(tl("groupDoesNotExist"));
-		}
-		final StringBuilder displayGroupName = new StringBuilder();
-		displayGroupName.append(Character.toTitleCase(groupName.charAt(0)));
-		displayGroupName.append(groupName.substring(1));
-		return outputFormat(displayGroupName.toString(), listUsers(ess, users, ", "));
-	}
-
-	// Build the output string
-	public static String outputFormat(final String group, final String message)
-	{
-		final StringBuilder outputString = new StringBuilder();
-		outputString.append(tl("listGroupTag", FormatUtil.replaceFormat(group)));
-		outputString.append(message);
-		return outputString.toString();
-	}
-}

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

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

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

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

@@ -1,30 +1,27 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.commands.IEssentialsCommand;
 import com.earth2me.essentials.signs.EssentialsSign;
 import com.earth2me.essentials.signs.Signs;
 import com.earth2me.essentials.textreader.IText;
 import com.earth2me.essentials.textreader.SimpleTextInput;
-import com.earth2me.essentials.utils.FormatUtil;
 import java.io.File;
-import java.math.BigDecimal;
+import java.text.MessageFormat;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import net.ess3.api.IEssentials;
 import org.bukkit.ChatColor;
-import org.bukkit.command.PluginCommand;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.MemoryConfiguration;
 import org.bukkit.event.EventPriority;
 import org.bukkit.inventory.ItemStack;
 
 
-public class Settings implements net.ess3.api.ISettings
+public class Settings implements ISettings
 {
 	private final transient EssentialsConf config;
-	private static final Logger logger = Logger.getLogger("Essentials");
+	private final static Logger logger = Logger.getLogger("Minecraft");
 	private final transient IEssentials ess;
 	private boolean metricsEnabled = true;
 
@@ -51,8 +48,7 @@ public class Settings implements net.ess3.api.ISettings
 	@Override
 	public Set<String> getMultipleHomes()
 	{
-		final ConfigurationSection section = config.getConfigurationSection("sethome-multiple");
-		return section == null ? null : section.getKeys(false);
+		return config.getConfigurationSection("sethome-multiple").getKeys(false);
 	}
 
 	@Override
@@ -95,44 +91,6 @@ public class Settings implements net.ess3.api.ISettings
 	{
 		return chatRadius;
 	}
-	// #easteregg
-	private char chatShout = '!';
-
-	private char _getChatShout()
-	{
-		return config.getString("chat.shout", "!").charAt(0);
-	}
-
-	@Override
-	public char getChatShout()
-	{
-		return chatShout;
-	}
-	// #easteregg
-	private char chatQuestion = '?';
-
-	private char _getChatQuestion()
-	{
-		return config.getString("chat.question", "?").charAt(0);
-	}
-
-	@Override
-	public char getChatQuestion()
-	{
-		return chatQuestion;
-	}
-	private boolean teleportSafety;
-
-	public boolean _isTeleportSafetyEnabled()
-	{
-		return config.getBoolean("teleport-safety", true);
-	}
-
-	@Override
-	public boolean isTeleportSafetyEnabled()
-	{
-		return teleportSafety;
-	}
 
 	@Override
 	public double getTeleportDelay()
@@ -153,9 +111,9 @@ public class Settings implements net.ess3.api.ISettings
 	}
 
 	@Override
-	public BigDecimal getStartingBalance()
+	public int getStartingBalance()
 	{
-		return config.getBigDecimal("starting-balance", BigDecimal.ZERO);
+		return config.getInt("starting-balance", 0);
 	}
 
 	@Override
@@ -218,12 +176,12 @@ public class Settings implements net.ess3.api.ISettings
 	private ConfigurationSection commandCosts;
 
 	@Override
-	public BigDecimal getCommandCost(IEssentialsCommand cmd)
+	public double getCommandCost(IEssentialsCommand cmd)
 	{
 		return getCommandCost(cmd.getName());
 	}
 
-	private ConfigurationSection _getCommandCosts()
+	public ConfigurationSection _getCommandCosts()
 	{
 		if (config.isConfigurationSection("command-costs"))
 		{
@@ -231,10 +189,6 @@ public class Settings implements net.ess3.api.ISettings
 			final ConfigurationSection newSection = new MemoryConfiguration();
 			for (String command : section.getKeys(false))
 			{
-				if (command.charAt(0) == '/')
-				{
-					ess.getLogger().warning("Invalid command cost. '" + command + "' should not start with '/'.");
-				}
 				if (section.isDouble(command))
 				{
 					newSection.set(command.toLowerCase(Locale.ENGLISH), section.getDouble(command));
@@ -243,24 +197,6 @@ public class Settings implements net.ess3.api.ISettings
 				{
 					newSection.set(command.toLowerCase(Locale.ENGLISH), (double)section.getInt(command));
 				}
-				else if (section.isString(command))
-				{
-					String costString = section.getString(command);
-					try
-					{
-						double cost = Double.parseDouble(costString.trim().replace(getCurrencySymbol(), "").replaceAll("\\W", ""));
-						newSection.set(command.toLowerCase(Locale.ENGLISH), cost);
-					}
-					catch (NumberFormatException ex)
-					{
-						ess.getLogger().warning("Invalid command cost for: " + command + " (" + costString + ")");
-					}
-
-				}
-				else
-				{
-					ess.getLogger().warning("Invalid command cost for: " + command);
-				}
 			}
 			return newSection;
 		}
@@ -268,40 +204,14 @@ public class Settings implements net.ess3.api.ISettings
 	}
 
 	@Override
-	public BigDecimal getCommandCost(String name)
+	public double getCommandCost(String name)
 	{
 		name = name.replace('.', '_').replace('/', '_');
 		if (commandCosts != null)
 		{
-			return EssentialsConf.toBigDecimal(commandCosts.getString(name), BigDecimal.ZERO);
+			return commandCosts.getDouble(name, 0.0);
 		}
-		return BigDecimal.ZERO;
-	}
-	private Set<String> socialSpyCommands = new HashSet<String>();
-
-	private Set<String> _getSocialSpyCommands()
-	{
-		Set<String> socialspyCommands = new HashSet<String>();
-
-		if (config.isList("socialspy-commands"))
-		{
-			for (String c : config.getStringList("socialspy-commands"))
-			{
-				socialspyCommands.add(c.toLowerCase(Locale.ENGLISH));
-			}
-		}
-		else
-		{
-			socialspyCommands.addAll(Arrays.asList("msg", "r", "mail", "m", "whisper", "emsg", "t", "tell", "er", "reply", "ereply", "email", "action", "describe", "eme", "eaction", "edescribe", "etell", "ewhisper", "pm"));
-		}
-
-		return socialspyCommands;
-	}
-
-	@Override
-	public Set<String> getSocialSpyCommands()
-	{
-		return socialSpyCommands;
+		return 0.0;
 	}
 	private String nicknamePrefix = "~";
 
@@ -329,7 +239,7 @@ public class Settings implements net.ess3.api.ISettings
 	}
 	private ConfigurationSection kits;
 
-	private ConfigurationSection _getKits()
+	public ConfigurationSection _getKits()
 	{
 		if (config.isConfigurationSection("kits"))
 		{
@@ -440,27 +350,25 @@ public class Settings implements net.ess3.api.ISettings
 	{
 		return config.getString("backup.command", null);
 	}
-	private final Map<String, String> chatFormats = Collections.synchronizedMap(new HashMap<String, String>());
+	private Map<String, MessageFormat> chatFormats = Collections.synchronizedMap(new HashMap<String, MessageFormat>());
 
 	@Override
-	public String getChatFormat(String group)
+	public MessageFormat getChatFormat(String group)
 	{
-		String mFormat = chatFormats.get(group);
+		MessageFormat mFormat = chatFormats.get(group);
 		if (mFormat == null)
 		{
-			mFormat = config.getString("chat.group-formats." + (group == null ? "Default" : group),
-									   config.getString("chat.format", "&7[{GROUP}]&r {DISPLAYNAME}&7:&r {MESSAGE}"));
-			mFormat = FormatUtil.replaceFormat(mFormat);
-			mFormat = mFormat.replace("{DISPLAYNAME}", "%1$s");
-			mFormat = mFormat.replace("{MESSAGE}", "%2$s");
-			mFormat = mFormat.replace("{GROUP}", "{0}");
-			mFormat = mFormat.replace("{WORLD}", "{1}");
-			mFormat = mFormat.replace("{WORLDNAME}", "{1}");
-			mFormat = mFormat.replace("{SHORTWORLDNAME}", "{2}");
-			mFormat = mFormat.replace("{TEAMPREFIX}", "{3}");
-			mFormat = mFormat.replace("{TEAMSUFFIX}", "{4}");
-			mFormat = mFormat.replace("{TEAMNAME}", "{5}");
-			mFormat = "§r".concat(mFormat);
+			String format = config.getString("chat.group-formats." + (group == null ? "Default" : group),
+											 config.getString("chat.format", "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}"));
+			format = Util.replaceFormat(format);
+			format = format.replace("{DISPLAYNAME}", "%1$s");
+			format = format.replace("{GROUP}", "{0}");
+			format = format.replace("{MESSAGE}", "%2$s");
+			format = format.replace("{WORLDNAME}", "{1}");
+			format = format.replace("{SHORTWORLDNAME}", "{2}");
+			format = format.replaceAll("\\{(\\D*?)\\}", "\\[$1\\]");
+			format = "§r".concat(format);
+			mFormat = new MessageFormat(format);
 			chatFormats.put(group, mFormat);
 		}
 		return mFormat;
@@ -475,7 +383,7 @@ public class Settings implements net.ess3.api.ISettings
 	@Override
 	public IText getAnnounceNewPlayerFormat()
 	{
-		return new SimpleTextInput(FormatUtil.replaceFormat(config.getString("newbies.announce-format", "&dWelcome {DISPLAYNAME} to the server!")));
+		return new SimpleTextInput(Util.replaceFormat(config.getString("newbies.announce-format", "&dWelcome {DISPLAYNAME} to the server!")));
 	}
 
 	@Override
@@ -497,26 +405,9 @@ public class Settings implements net.ess3.api.ISettings
 	}
 
 	@Override
-	public Map<String, Object> getListGroupConfig()
+	public boolean getSortListByGroups()
 	{
-		if (config.isConfigurationSection("list"))
-		{
-			Map<String, Object> values = config.getConfigurationSection("list").getValues(false);
-			if (!values.isEmpty())
-			{
-				return values;
-			}
-		}
-		Map<String, Object> defaultMap = new HashMap<String, Object>();
-		if (config.getBoolean("sort-list-by-groups", false))
-		{
-			defaultMap.put("ListByGroup", "ListByGroup");
-		}
-		else
-		{
-			defaultMap.put("Players", "*");
-		}
-		return defaultMap;
+		return config.getBoolean("sort-list-by-groups", true);
 	}
 
 	@Override
@@ -525,13 +416,10 @@ public class Settings implements net.ess3.api.ISettings
 		config.load();
 		noGodWorlds = new HashSet<String>(config.getStringList("no-god-in-worlds"));
 		enabledSigns = _getEnabledSigns();
-		teleportSafety = _isTeleportSafetyEnabled();
-		teleportInvulnerabilityTime = _getTeleportInvulnerability();
 		teleportInvulnerability = _isTeleportInvulnerability();
 		disableItemPickupWhileAfk = _getDisableItemPickupWhileAfk();
 		registerBackInListener = _registerBackInListener();
-		cancelAfkOnInteract = _cancelAfkOnInteract();
-		cancelAfkOnMove = _cancelAfkOnMove() && cancelAfkOnInteract;
+		cancelAfkOnMove = _cancelAfkOnMove();
 		getFreezeAfkPlayers = _getFreezeAfkPlayers();
 		itemSpawnBl = _getItemSpawnBlacklist();
 		loginAttackDelay = _getLoginAttackDelay();
@@ -549,24 +437,8 @@ public class Settings implements net.ess3.api.ISettings
 		disablePrefix = _disablePrefix();
 		disableSuffix = _disableSuffix();
 		chatRadius = _getChatRadius();
-		chatShout = _getChatShout();
-		chatQuestion = _getChatQuestion();
 		commandCosts = _getCommandCosts();
-		socialSpyCommands = _getSocialSpyCommands();
 		warnOnBuildDisallow = _warnOnBuildDisallow();
-		mailsPerMinute = _getMailsPerMinute();
-		maxMoney = _getMaxMoney();
-		minMoney = _getMinMoney();
-		permissionsLagWarning = _getPermissionsLagWarning();
-		economyLagWarning = _getEconomyLagWarning();
-		economyLog = _isEcoLogEnabled();
-		economyLogUpdate = _isEcoLogUpdateEnabled();
-		economyDisabled = _isEcoDisabled();
-		allowSilentJoin = _allowSilentJoinQuit();
-		customJoinMessage = _getCustomJoinMessage();
-		isCustomJoinMessage = !customJoinMessage.equals("none");
-		customQuitMessage = _getCustomQuitMessage();
-		isCustomQuitMessage = !customQuitMessage.equals("none");
 	}
 	private List<Integer> itemSpawnBl = new ArrayList<Integer>();
 
@@ -598,7 +470,7 @@ public class Settings implements net.ess3.api.ISettings
 			}
 			catch (Exception ex)
 			{
-				logger.log(Level.SEVERE, tl("unknownItemInList", itemName, "item-spawn-blacklist"));
+				logger.log(Level.SEVERE, _("unknownItemInList", itemName, "item-spawn-blacklist"));
 			}
 		}
 		return epItemSpwn;
@@ -634,7 +506,7 @@ public class Settings implements net.ess3.api.ISettings
 			}
 			catch (Exception ex)
 			{
-				logger.log(Level.SEVERE, tl("unknownItemInList", signName, "enabledSigns"));
+				logger.log(Level.SEVERE, _("unknownItemInList", signName, "enabledSigns"));
 				continue;
 			}
 			signsEnabled = true;
@@ -685,32 +557,22 @@ public class Settings implements net.ess3.api.ISettings
 		return config.getString("locale", "");
 	}
 
-	//This method should always only return one character due to the implementation of the calling methods
-	//If you need to use a string currency, for example "coins", use the translation key 'currency'.
 	@Override
 	public String getCurrencySymbol()
 	{
 		return config.getString("currency-symbol", "$").concat("$").substring(0, 1).replaceAll("[0-9]", "$");
 	}
 
-	// #easteregg
 	@Override
 	public boolean isTradeInStacks(int id)
 	{
 		return config.getBoolean("trade-in-stacks-" + id, false);
 	}
-	// #easteregg
-	private boolean economyDisabled = false;
-
-	public boolean _isEcoDisabled()
-	{
-		return config.getBoolean("disable-eco", false);
-	}
 
 	@Override
 	public boolean isEcoDisabled()
 	{
-		return economyDisabled;
+		return config.getBoolean("disable-eco", false);
 	}
 
 	@Override
@@ -738,7 +600,7 @@ public class Settings implements net.ess3.api.ISettings
 			}
 			catch (Exception ex)
 			{
-				logger.log(Level.SEVERE, tl("unknownItemInList", itemName, configName));
+				logger.log(Level.SEVERE, _("unknownItemInList", itemName, configName));
 			}
 		}
 		return list;
@@ -755,59 +617,43 @@ public class Settings implements net.ess3.api.ISettings
 	{
 		return config.getBoolean(configName, def);
 	}
-	private static final BigDecimal MAXMONEY = new BigDecimal("10000000000000");
-	private BigDecimal maxMoney = MAXMONEY;
-
-	private BigDecimal _getMaxMoney()
-	{
-		return config.getBigDecimal("max-money", MAXMONEY);
-	}
+	private final static double MAXMONEY = 10000000000000.0;
 
 	@Override
-	public BigDecimal getMaxMoney()
+	public double getMaxMoney()
 	{
-		return maxMoney;
-	}
-	private static final BigDecimal MINMONEY = new BigDecimal("-10000000000000");
-	private BigDecimal minMoney = MINMONEY;
-
-	private BigDecimal _getMinMoney()
-	{
-		BigDecimal min = config.getBigDecimal("min-money", MINMONEY);
-		if (min.signum() > 0)
+		double max = config.getDouble("max-money", MAXMONEY);
+		if (Math.abs(max) > MAXMONEY)
 		{
-			min = min.negate();
+			max = max < 0 ? -MAXMONEY : MAXMONEY;
+		}
+		return max;
+	}
+	private final static double MINMONEY = -10000000000000.0;
+
+	@Override
+	public double getMinMoney()
+	{
+		double min = config.getDouble("min-money", MINMONEY);
+		if (min > 0)
+		{
+			min = -min;
+		}
+		if (min < MINMONEY)
+		{
+			min = MINMONEY;
 		}
 		return min;
 	}
 
-	@Override
-	public BigDecimal getMinMoney()
-	{
-		return minMoney;
-	}
-	private boolean economyLog = false;
-
 	@Override
 	public boolean isEcoLogEnabled()
-	{
-		return economyLog;
-	}
-
-	public boolean _isEcoLogEnabled()
 	{
 		return config.getBoolean("economy-log-enabled", false);
 	}
-	// #easteregg
-	private boolean economyLogUpdate = false;
 
 	@Override
 	public boolean isEcoLogUpdateEnabled()
-	{
-		return economyLogUpdate;
-	}
-
-	public boolean _isEcoLogUpdateEnabled()
 	{
 		return config.getBoolean("economy-log-update-enabled", false);
 	}
@@ -849,7 +695,6 @@ public class Settings implements net.ess3.api.ISettings
 	}
 	private boolean prefixsuffixconfigured = false;
 	private boolean addprefixsuffix = false;
-	private boolean essentialsChatActive = false;
 
 	private boolean _addPrefixSuffix()
 	{
@@ -861,18 +706,11 @@ public class Settings implements net.ess3.api.ISettings
 		return config.hasProperty("add-prefix-suffix");
 	}
 
-	@Override
-	public void setEssentialsChatActive(boolean essentialsChatActive)
-	{
-		this.essentialsChatActive = essentialsChatActive;
-	}
-
 	@Override
 	public boolean addPrefixSuffix()
 	{
-		return prefixsuffixconfigured ? addprefixsuffix : essentialsChatActive;
+		return prefixsuffixconfigured ? addprefixsuffix : ess.getServer().getPluginManager().isPluginEnabled("EssentialsChat");
 	}
-	// #easteregg
 	private boolean disablePrefix = false;
 
 	private boolean _disablePrefix()
@@ -885,7 +723,6 @@ public class Settings implements net.ess3.api.ISettings
 	{
 		return disablePrefix;
 	}
-	// #easteregg
 	private boolean disableSuffix = false;
 
 	private boolean _disableSuffix()
@@ -934,18 +771,6 @@ public class Settings implements net.ess3.api.ISettings
 	{
 		return config.getBoolean("cancel-afk-on-move", true);
 	}
-	private boolean cancelAfkOnInteract;
-
-	@Override
-	public boolean cancelAfkOnInteract()
-	{
-		return cancelAfkOnInteract;
-	}
-
-	private boolean _cancelAfkOnInteract()
-	{
-		return config.getBoolean("cancel-afk-on-interact", true);
-	}
 
 	@Override
 	public boolean areDeathMessagesEnabled()
@@ -972,12 +797,6 @@ public class Settings implements net.ess3.api.ISettings
 		return config.getBoolean("repair-enchanted", true);
 	}
 
-	@Override
-	public boolean allowUnsafeEnchantments()
-	{
-		return config.getBoolean("unsafe-enchantments", false);
-	}
-
 	@Override
 	public boolean isWorldTeleportPermissions()
 	{
@@ -1044,7 +863,7 @@ public class Settings implements net.ess3.api.ISettings
 	@Override
 	public long getTpaAcceptCancellation()
 	{
-		return config.getLong("tpa-accept-cancellation", 120);
+		return config.getLong("tpa-accept-cancellation", 0);
 	}
 
 	@Override
@@ -1058,19 +877,13 @@ public class Settings implements net.ess3.api.ISettings
 	{
 		this.metricsEnabled = metricsEnabled;
 	}
-	private long teleportInvulnerabilityTime;
-
-	private long _getTeleportInvulnerability()
-	{
-		return config.getLong("teleport-invulnerability", 0) * 1000;
-	}
+	private boolean teleportInvulnerability;
 
 	@Override
 	public long getTeleportInvulnerability()
 	{
-		return teleportInvulnerabilityTime;
+		return config.getLong("teleport-invulnerability", 0) * 1000;
 	}
-	private boolean teleportInvulnerability;
 
 	private boolean _isTeleportInvulnerability()
 	{
@@ -1111,7 +924,7 @@ public class Settings implements net.ess3.api.ISettings
 	@Override
 	public double getMaxFlySpeed()
 	{
-		double maxSpeed = config.getDouble("max-fly-speed", 0.8);
+		double maxSpeed = config.getDouble("max-fly-speed", 1.0);
 		return maxSpeed > 1.0 ? 1.0 : Math.abs(maxSpeed);
 	}
 
@@ -1121,117 +934,4 @@ public class Settings implements net.ess3.api.ISettings
 		double maxSpeed = config.getDouble("max-walk-speed", 0.8);
 		return maxSpeed > 1.0 ? 1.0 : Math.abs(maxSpeed);
 	}
-	private int mailsPerMinute;
-
-	private int _getMailsPerMinute()
-	{
-		return config.getInt("mails-per-minute", 1000);
-	}
-
-	@Override
-	public int getMailsPerMinute()
-	{
-		return mailsPerMinute;
-	}
-	// #easteregg
-	private long economyLagWarning;
-
-	private long _getEconomyLagWarning()
-	{
-		// Default to 25ms
-		final long value = (long)(config.getDouble("economy-lag-warning", 25.0) * 1000000);
-		return value;
-	}
-
-	@Override
-	public long getEconomyLagWarning()
-	{
-		return economyLagWarning;
-	}
-	
-	// #easteregg
-	private long permissionsLagWarning;
-
-	private long _getPermissionsLagWarning()
-	{
-		// Default to 25ms
-		final long value = (long)(config.getDouble("permissions-lag-warning", 25.0) * 1000000);
-		return value;
-	}
-
-	@Override
-	public long getPermissionsLagWarning()
-	{
-		return permissionsLagWarning;
-	}
-
-	@Override
-	public long getMaxTempban()
-	{
-		return config.getLong("max-tempban-time", -1);
-	}
-
-	@Override
-	public int getMaxNickLength()
-	{
-		return config.getInt("max-nick-length", 30);
-	}
-	private boolean allowSilentJoin;
-
-	public boolean _allowSilentJoinQuit()
-	{
-		return config.getBoolean("allow-silent-join-quit", false);
-	}
-
-	@Override
-	public boolean allowSilentJoinQuit()
-	{
-		return allowSilentJoin;
-	}
-	private String customJoinMessage;
-	private boolean isCustomJoinMessage;
-
-	public String _getCustomJoinMessage()
-	{
-		return FormatUtil.replaceFormat(config.getString("custom-join-message", "none"));
-	}
-
-	@Override
-	public String getCustomJoinMessage()
-	{
-		return customJoinMessage;
-	}
-
-	@Override
-	public boolean isCustomJoinMessage()
-	{
-		return isCustomJoinMessage;
-	}
-	private String customQuitMessage;
-	private boolean isCustomQuitMessage;
-
-	public String _getCustomQuitMessage()
-	{
-		return FormatUtil.replaceFormat(config.getString("custom-quit-message", "none"));
-	}
-
-	@Override
-	public String getCustomQuitMessage()
-	{
-		return customQuitMessage;
-	}
-
-	@Override
-	public boolean isCustomQuitMessage()
-	{
-		return isCustomQuitMessage;
-	}
-
-	// #easteregg
-	@Override
-	public int getMaxUserCacheCount()
-	{
-		long count = Runtime.getRuntime().maxMemory() / 1024 / 96;
-		return config.getInt("max-user-cache-count", (int)count);
-	}
 }

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

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

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

@@ -1,6 +1,5 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -25,13 +24,13 @@ public class TNTExplodeListener implements Listener, Runnable
 		if (!enabled)
 		{
 			enabled = true;
-			timer = ess.scheduleSyncDelayedTask(this, 200);
+			timer = ess.scheduleSyncDelayedTask(this, 1000);
 			return;
 		}
 		if (timer != -1)
 		{
 			ess.getScheduler().cancelTask(timer);
-			timer = ess.scheduleSyncDelayedTask(this, 200);
+			timer = ess.scheduleSyncDelayedTask(this, 1000);
 		}
 	}
 

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

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

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

@@ -1,177 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n.tl;
-import java.util.UUID;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
-import org.bukkit.Location;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-
-
-public class TimedTeleport implements Runnable
-{
-	private static final double MOVE_CONSTANT = 0.3;
-	private final IUser teleportOwner;
-	private final IEssentials ess;
-	private final Teleport teleport;
-	private final 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;
-
-	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.getBase().getUniqueId();
-		this.timer_teleportTarget = target;
-		this.timer_chargeFor = chargeFor;
-		this.timer_cause = cause;
-		this.timer_respawn = respawn;
-		this.timer_canMove = user.isAuthorized("essentials.teleport.timer.move");
-
-		timer_task = ess.runTaskTimerAsynchronously(this, 20, 20).getTaskId();
-	}
-
-	@Override
-	public void run()
-	{
-
-		if (teleportOwner == null || !teleportOwner.getBase().isOnline() || teleportOwner.getBase().getLocation() == null)
-		{
-			cancelTimer(false);
-			return;
-		}
-
-		final IUser teleportUser = ess.getUser(this.timer_teleportee);
-
-		if (teleportUser == null || !teleportUser.getBase().isOnline())
-		{
-			cancelTimer(false);
-			return;
-		}
-
-		final Location currLocation = teleportUser.getBase().getLocation();
-		if (currLocation == null)
-		{
-			cancelTimer(false);
-			return;
-		}
-
-		if (!timer_canMove
-			&& (Math.round(currLocation.getX() * MOVE_CONSTANT) != timer_initX
-				|| Math.round(currLocation.getY() * MOVE_CONSTANT) != timer_initY
-				|| Math.round(currLocation.getZ() * MOVE_CONSTANT) != timer_initZ
-				|| teleportUser.getBase().getHealth() < timer_health))
-		{
-			// user moved, cancelTimer teleportPlayer
-			cancelTimer(true);
-			return;
-		}
-
-		class DelayedTeleportTask implements Runnable
-		{
-			@Override
-			public void run()
-			{
-
-				timer_health = teleportUser.getBase().getHealth();  // in case user healed, then later gets injured
-				final long now = System.currentTimeMillis();
-				if (now > timer_started + timer_delay)
-				{
-					try
-					{
-						teleport.cooldown(false);
-					}
-					catch (Exception ex)
-					{
-						teleportOwner.sendMessage(tl("cooldownWithMessage", ex.getMessage()));
-						if (teleportOwner != teleportUser)
-						{
-							teleportUser.sendMessage(tl("cooldownWithMessage", ex.getMessage()));
-						}
-					}
-					try
-					{
-						cancelTimer(false);
-						teleportUser.sendMessage(tl("teleportationCommencing"));
-
-						try
-						{
-							if (timer_chargeFor != null)
-							{
-								timer_chargeFor.isAffordableFor(teleportOwner);
-							}
-							if (timer_respawn)
-							{
-								teleport.respawnNow(teleportUser, timer_cause);
-							}
-							else
-							{
-								teleport.now(teleportUser, timer_teleportTarget, timer_cause);
-							}
-							if (timer_chargeFor != null)
-							{
-								timer_chargeFor.charge(teleportOwner);
-							}
-						}
-						catch (Exception 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,22 +1,17 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
+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 java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
-import net.ess3.api.MaxMoneyException;
 import org.bukkit.Location;
 import org.bukkit.entity.Item;
 import org.bukkit.inventory.ItemStack;
@@ -26,27 +21,11 @@ public class Trade
 {
 	private final transient String command;
 	private final transient Trade fallbackTrade;
-	private final transient BigDecimal money;
+	private final transient Double money;
 	private final transient ItemStack itemStack;
 	private final transient Integer exp;
 	private final transient IEssentials ess;
 
-
-	public enum TradeType
-	{
-		MONEY,
-		EXP,
-		ITEM
-	}
-
-
-	public enum OverflowType
-	{
-		ABORT,
-		DROP,
-		RETURN
-	}
-
 	public Trade(final String command, final IEssentials ess)
 	{
 		this(command, null, null, null, null, ess);
@@ -57,13 +36,7 @@ public class Trade
 		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, (IEssentials)ess);
-	}
-
-	public Trade(final BigDecimal money, final IEssentials ess)
+	public Trade(final double money, final IEssentials ess)
 	{
 		this(null, null, money, null, null, ess);
 	}
@@ -78,7 +51,7 @@ public class Trade
 		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 IEssentials ess)
+	private Trade(final String command, final Trade fallback, final Double money, final ItemStack item, final Integer exp, final IEssentials ess)
 	{
 		this.command = command;
 		this.fallbackTrade = fallback;
@@ -97,179 +70,129 @@ public class Trade
 		}
 
 		if (getMoney() != null
-			&& getMoney().signum() > 0
+			&& getMoney() > 0
 			&& !user.canAfford(getMoney()))
 		{
-			throw new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(getMoney(), ess)));
+			throw new ChargeException(_("notEnoughMoney"));
 		}
 
 		if (getItemStack() != null
-			&& !user.getBase().getInventory().containsAtLeast(itemStack, itemStack.getAmount()))
+			&& !InventoryWorkaround.containsItem(user.getInventory(), true, true, itemStack))
 		{
-			throw new ChargeException(tl("missingItems", getItemStack().getAmount(), ess.getItemDb().name(getItemStack())));
+			throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
 		}
 
-		BigDecimal money;
+		double money;
 		if (command != null && !command.isEmpty()
-			&& (money = getCommandCost(user)).signum() > 0
+			&& 0 < (money = getCommandCost(user))
 			&& !user.canAfford(money))
 		{
-			throw new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(money, ess)));
+			throw new ChargeException(_("notEnoughMoney"));
 		}
 
 		if (exp != null && exp > 0
-			&& SetExpFix.getTotalExperience(user.getBase()) < exp)
+			&& SetExpFix.getTotalExperience(user) < exp)
 		{
-			throw new ChargeException(tl("notEnoughExperience"));
+			throw new ChargeException(_("notEnoughExperience"));
 		}
 	}
 
-	public boolean pay(final IUser user) throws MaxMoneyException
+	public void pay(final IUser user)
 	{
-		return pay(user, OverflowType.ABORT) == null;
+		pay(user, true);
 	}
 
-	public Map<Integer, ItemStack> pay(final IUser user, final OverflowType type) throws MaxMoneyException
+	public boolean pay(final IUser user, final boolean dropItems)
 	{
-		if (getMoney() != null && getMoney().signum() > 0)
+		boolean success = true;
+		if (getMoney() != null && getMoney() > 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)
+			if (dropItems)
 			{
-				switch (type)
+				final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItem(user.getInventory(), true, getItemStack());
+				final Location loc = user.getLocation();
+				for (ItemStack itemStack : leftOver.values())
 				{
-				case ABORT:
-					if (ess.getSettings().isDebug())
+					final int maxStackSize = itemStack.getType().getMaxStackSize();
+					final int stacks = itemStack.getAmount() / maxStackSize;
+					final int leftover = itemStack.getAmount() % maxStackSize;
+					final Item[] itemStacks = new Item[stacks + (leftover > 0 ? 1 : 0)];
+					for (int i = 0; i < stacks; i++)
 					{
-						ess.getLogger().log(Level.INFO, "abort paying " + user.getName() + " itemstack " + getItemStack().toString() + " due to lack of inventory space ");
+						final ItemStack stack = itemStack.clone();
+						stack.setAmount(maxStackSize);
+						itemStacks[i] = loc.getWorld().dropItem(loc, stack);
 					}
-
-					return overFlow;
-
-				case RETURN:
-					// Pay the user the items, and return overflow
-					final Map<Integer, ItemStack> returnStack = InventoryWorkaround.addItems(user.getBase().getInventory(), getItemStack());
-					user.getBase().updateInventory();
-
-					if (ess.getSettings().isDebug())
+					if (leftover > 0)
 					{
-						ess.getLogger().log(Level.INFO, "paying " + user.getName() + " partial itemstack " + getItemStack().toString() + " with overflow " + returnStack.get(0).toString());
-					}
-
-					return returnStack;
-
-				case DROP:
-					// Pay the users the items directly, and drop the rest, will always return no overflow.
-					final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItems(user.getBase().getInventory(), getItemStack());
-					final Location loc = user.getBase().getLocation();
-					for (ItemStack loStack : leftOver.values())
-					{
-						final int maxStackSize = loStack.getType().getMaxStackSize();
-						final int stacks = loStack.getAmount() / maxStackSize;
-						final int leftover = loStack.getAmount() % maxStackSize;
-						final Item[] itemStacks = new Item[stacks + (leftover > 0 ? 1 : 0)];
-						for (int i = 0; i < stacks; i++)
-						{
-							final ItemStack stack = loStack.clone();
-							stack.setAmount(maxStackSize);
-							itemStacks[i] = loc.getWorld().dropItem(loc, stack);
-						}
-						if (leftover > 0)
-						{
-							final ItemStack stack = loStack.clone();
-							stack.setAmount(leftover);
-							itemStacks[stacks] = loc.getWorld().dropItem(loc, stack);
-						}
-					}
-					if (ess.getSettings().isDebug())
-					{
-						ess.getLogger().log(Level.INFO, "paying " + user.getName() + " partial itemstack " + getItemStack().toString() + " and dropping overflow " + leftOver.get(0).toString());
+						final ItemStack stack = itemStack.clone();
+						stack.setAmount(leftover);
+						itemStacks[stacks] = loc.getWorld().dropItem(loc, stack);
 					}
 				}
 			}
-			else if (ess.getSettings().isDebug())
+			else
 			{
-				ess.getLogger().log(Level.INFO, "paying " + user.getName() + " itemstack " + getItemStack().toString());
+				success = InventoryWorkaround.addAllItems(user.getInventory(), true, getItemStack());
 			}
-			user.getBase().updateInventory();
+			user.updateInventory();
 		}
 		if (getExperience() != null)
 		{
-			SetExpFix.setTotalExperience(user.getBase(), SetExpFix.getTotalExperience(user.getBase()) + getExperience());
+			SetExpFix.setTotalExperience(user, SetExpFix.getTotalExperience(user) + getExperience());
 		}
-		return null;
+		return success;
 	}
 
 	public void charge(final IUser user) throws ChargeException
 	{
 		if (ess.getSettings().isDebug())
 		{
-			ess.getLogger().log(Level.INFO, "attempting to charge user " + user.getName());
+			ess.getLogger().log(Level.INFO, "charging user " + user.getName());
 		}
+
 		if (getMoney() != null)
 		{
-			if (ess.getSettings().isDebug())
+			if (!user.canAfford(getMoney()) && getMoney() > 0.0d)
 			{
-				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)));
+				throw new ChargeException(_("notEnoughMoney"));
 			}
 			user.takeMoney(getMoney());
 		}
 		if (getItemStack() != null)
 		{
-			if (ess.getSettings().isDebug())
+			if (!InventoryWorkaround.containsItem(user.getInventory(), true, true, itemStack))
 			{
-				ess.getLogger().log(Level.INFO, "charging user " + user.getName() + " itemstack " + getItemStack().toString());
+				throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
 			}
-			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();
+			InventoryWorkaround.removeItem(user.getInventory(), true, true, getItemStack());
+			user.updateInventory();
 		}
 		if (command != null)
 		{
-			final BigDecimal cost = getCommandCost(user);
-			if (!user.canAfford(cost) && cost.signum() > 0)
+			final double cost = getCommandCost(user);
+			if (!user.canAfford(cost) && cost > 0.0d)
 			{
-				throw new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(cost, ess)));
+				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());
+			final int experience = SetExpFix.getTotalExperience(user);
 			if (experience < getExperience() && getExperience() > 0)
 			{
-				throw new ChargeException(tl("notEnoughExperience"));
+				throw new ChargeException(_("notEnoughExperience"));
 			}
-			SetExpFix.setTotalExperience(user.getBase(), experience - getExperience());
-		}
-		if (ess.getSettings().isDebug())
-		{
-			ess.getLogger().log(Level.INFO, "charge user " + user.getName() + " completed");
+			SetExpFix.setTotalExperience(user, experience - getExperience());
 		}
 	}
 
-	public BigDecimal getMoney()
+	public Double getMoney()
 	{
 		return money;
 	}
@@ -284,28 +207,13 @@ public class Trade
 		return exp;
 	}
 
-	public TradeType getType()
+	public Double getCommandCost(final IUser user)
 	{
-		if (getExperience() != null)
-		{
-			return TradeType.EXP;
-		}
-
-		if (getItemStack() != null)
-		{
-			return TradeType.ITEM;
-		}
-
-		return TradeType.MONEY;
-	}
-
-	public BigDecimal getCommandCost(final IUser user)
-	{
-		BigDecimal cost = BigDecimal.ZERO;
+		double cost = 0.0d;
 		if (command != null && !command.isEmpty())
 		{
 			cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
-			if (cost.signum() == 0 && fallbackTrade != null)
+			if (cost == 0.0d && fallbackTrade != null)
 			{
 				cost = fallbackTrade.getCommandCost(user);
 			}
@@ -315,10 +223,10 @@ public class Trade
 				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)))
+		if (cost != 0.0d && (user.isAuthorized("essentials.nocommandcost.all")
+							 || user.isAuthorized("essentials.nocommandcost." + command)))
 		{
-			return BigDecimal.ZERO;
+			return 0.0d;
 		}
 		return cost;
 	}
@@ -326,9 +234,6 @@ public class Trade
 
 	public static void log(String type, String subtype, String event, String sender, Trade charge, String receiver, Trade pay, Location loc, IEssentials ess)
 	{
-		//isEcoLogUpdateEnabled() - This refers to log entries with no location, ie API updates #EasterEgg
-		//isEcoLogEnabled() - This refers to log entries with with location, ie /pay /sell and eco signs.
-
 		if ((loc == null && !ess.getSettings().isEcoLogUpdateEnabled())
 			|| (loc != null && !ess.getSettings().isEcoLogEnabled()))
 		{
@@ -342,7 +247,7 @@ public class Trade
 			}
 			catch (IOException ex)
 			{
-				Logger.getLogger("Essentials").log(Level.SEVERE, null, ex);
+				Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
 			}
 		}
 		StringBuilder sb = new StringBuilder();
@@ -430,7 +335,7 @@ public class Trade
 		}
 		catch (IOException ex)
 		{
-			Logger.getLogger("Essentials").log(Level.SEVERE, null, ex);
+			Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
 		}
 	}
 
@@ -444,7 +349,7 @@ public class Trade
 			}
 			catch (IOException ex)
 			{
-				Logger.getLogger("Essentials").log(Level.SEVERE, null, ex);
+				Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
 			}
 			fw = null;
 		}

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

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

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

@@ -1,37 +1,24 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.commands.IEssentialsCommand;
 import com.earth2me.essentials.register.payment.Method;
-import com.earth2me.essentials.register.payment.Methods;
-import com.earth2me.essentials.utils.DateUtil;
-import com.earth2me.essentials.utils.FormatUtil;
-import com.earth2me.essentials.utils.NumberUtil;
-import java.math.BigDecimal;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
-import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import net.ess3.api.IEssentials;
-import net.ess3.api.MaxMoneyException;
-import net.ess3.api.events.AfkStatusChangeEvent;
-import net.ess3.api.events.UserBalanceUpdateEvent;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
 
 
-public class User extends UserData implements Comparable<User>, IReplyTo, net.ess3.api.IUser
+public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 {
-	private static final Logger logger = Logger.getLogger("Essentials");
-	private CommandSource replyTo = null;
-	private transient UUID teleportRequester;
+	private CommandSender replyTo = null;
+	private transient User teleportRequester;
 	private transient boolean teleportRequestHere;
-	private transient Location teleportLocation;
 	private transient boolean vanished;
 	private transient final Teleport teleport;
 	private transient long teleportRequestTime;
@@ -42,21 +29,16 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 	private boolean rightClickJump = false;
 	private transient Location afkPosition = null;
 	private boolean invSee = false;
-	private boolean recipeSee = false;
 	private boolean enderSee = false;
-	private transient long teleportInvulnerabilityTimestamp = 0;
+	private static final Logger logger = Logger.getLogger("Minecraft");
 
-	public User(final Player base, final IEssentials ess)
+	User(final Player base, final IEssentials ess)
 	{
 		super(base, ess);
 		teleport = new Teleport(this, ess);
 		if (isAfk())
 		{
-			afkPosition = this.getLocation();
-		}
-		if (this.getBase().isOnline())
-		{
-			lastOnlineActivity = System.currentTimeMillis();
+			afkPosition = getLocation();
 		}
 	}
 
@@ -88,8 +70,8 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 		}
 		return result;
 	}
-
-	private boolean isAuthorizedCheck(final String node)
+	
+	private boolean isAuthorizedCheck(final String node) 
 	{
 
 		if (base instanceof OfflinePlayer)
@@ -97,6 +79,11 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 			return false;
 		}
 
+		if (isJailed())
+		{
+			return false;
+		}
+
 		try
 		{
 			return ess.getPermissionsHandler().hasPermission(base, node);
@@ -116,7 +103,6 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 		}
 	}
 
-	@Override
 	public void healCooldown() throws Exception
 	{
 		final Calendar now = new GregorianCalendar();
@@ -129,157 +115,155 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 			cooldownTime.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
 			if (cooldownTime.after(now) && !isAuthorized("essentials.heal.cooldown.bypass"))
 			{
-				throw new Exception(tl("timeBeforeHeal", DateUtil.formatDateDiff(cooldownTime.getTimeInMillis())));
+				throw new Exception(_("timeBeforeHeal", Util.formatDateDiff(cooldownTime.getTimeInMillis())));
 			}
 		}
 		setLastHealTimestamp(now.getTimeInMillis());
 	}
 
 	@Override
-	public void giveMoney(final BigDecimal value) throws MaxMoneyException
+	public void giveMoney(final double value)
 	{
-		giveMoney(value, (CommandSource)null);
+		giveMoney(value, null);
 	}
 
-	@Override
-	public void giveMoney(final BigDecimal value, final CommandSource initiator) throws MaxMoneyException
+	public void giveMoney(final double value, final CommandSender initiator)
 	{
-		if (value.signum() == 0)
+		if (value == 0.0d)
 		{
 			return;
 		}
-		setMoney(getMoney().add(value));
-		sendMessage(tl("addedToAccount", NumberUtil.displayCurrency(value, ess)));
+		setMoney(getMoney() + value);
+		sendMessage(_("addedToAccount", Util.displayCurrency(value, ess)));
 		if (initiator != null)
 		{
-			initiator.sendMessage(tl("addedToOthersAccount", NumberUtil.displayCurrency(value, ess), this.getDisplayName(), NumberUtil.displayCurrency(getMoney(), ess)));
+			initiator.sendMessage(_("addedToOthersAccount", Util.displayCurrency(value, ess), this.getDisplayName(), Util.displayCurrency(getMoney(), ess)));
 		}
 	}
 
-	@Override
-	public void payUser(final User reciever, final BigDecimal value) throws ChargeException, MaxMoneyException
+	public void payUser(final User reciever, final double value) throws Exception
 	{
-		if (value.signum() == 0)
+		if (value == 0.0d)
 		{
 			return;
 		}
 		if (canAfford(value))
 		{
-			setMoney(getMoney().subtract(value));
-			reciever.setMoney(reciever.getMoney().add(value));
-			sendMessage(tl("moneySentTo", NumberUtil.displayCurrency(value, ess), reciever.getDisplayName()));
-			reciever.sendMessage(tl("moneyRecievedFrom", NumberUtil.displayCurrency(value, ess), getDisplayName()));
+			setMoney(getMoney() - value);
+			reciever.setMoney(reciever.getMoney() + value);
+			sendMessage(_("moneySentTo", Util.displayCurrency(value, ess), reciever.getDisplayName()));
+			reciever.sendMessage(_("moneyRecievedFrom", Util.displayCurrency(value, ess), getDisplayName()));
 		}
 		else
 		{
-			throw new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(value, ess)));
+			throw new Exception(_("notEnoughMoney"));
 		}
 	}
 
 	@Override
-	public void takeMoney(final BigDecimal value)
+	public void takeMoney(final double value)
 	{
-		takeMoney(value, (CommandSource)null);
+		takeMoney(value, null);
 	}
 
-	@Override
-	public void takeMoney(final BigDecimal value, final CommandSource initiator)
+	public void takeMoney(final double value, final CommandSender initiator)
 	{
-		if (value.signum() == 0)
+		if (value == 0.0d)
 		{
 			return;
 		}
-		try
-		{
-			setMoney(getMoney().subtract(value));
-		}
-		catch (MaxMoneyException ex)
-		{
-			ess.getLogger().log(Level.WARNING, "Invalid call to takeMoney, total balance can't be more than the max-money limit.", ex);
-		}
-		sendMessage(tl("takenFromAccount", NumberUtil.displayCurrency(value, ess)));
+		setMoney(getMoney() - value);
+		sendMessage(_("takenFromAccount", Util.displayCurrency(value, ess)));
 		if (initiator != null)
 		{
-			initiator.sendMessage(tl("takenFromOthersAccount", NumberUtil.displayCurrency(value, ess), this.getDisplayName(), NumberUtil.displayCurrency(getMoney(), ess)));
+			initiator.sendMessage(_("takenFromOthersAccount", Util.displayCurrency(value, ess), this.getDisplayName(), Util.displayCurrency(getMoney(), ess)));
 		}
 	}
 
 	@Override
-	public boolean canAfford(final BigDecimal cost)
+	public boolean canAfford(final double cost)
 	{
 		return canAfford(cost, true);
 	}
 
-	public boolean canAfford(final BigDecimal cost, final boolean permcheck)
+	public boolean canAfford(final double cost, final boolean permcheck)
 	{
-		if (cost.signum() <= 0)
+		if (cost <= 0.0d)
 		{
 			return true;
 		}
-		final BigDecimal remainingBalance = getMoney().subtract(cost);
+		final double mon = getMoney();
 		if (!permcheck || isAuthorized("essentials.eco.loan"))
 		{
-			return (remainingBalance.compareTo(ess.getSettings().getMinMoney()) >= 0);
+			return (mon - cost) >= ess.getSettings().getMinMoney();
 		}
-		return (remainingBalance.signum() >= 0);
+		return cost <= mon;
 	}
 
 	public void dispose()
 	{
-		ess.runTaskAsynchronously(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				_dispose();
-			}
-		});
-	}
-
-	private void _dispose()
-	{
-		if (!base.isOnline())
-		{
-			this.base = new OfflinePlayer(getConfigUUID(), ess.getServer());
-		}
-		cleanup();
+		this.base = new OfflinePlayer(getName(), ess);
 	}
 
 	@Override
+	public void setReplyTo(final CommandSender user)
+	{
+		replyTo = user;
+	}
+
+	@Override
+	public CommandSender getReplyTo()
+	{
+		return replyTo;
+	}
+
+	@Override
+	public int compareTo(final User other)
+	{
+		return Util.stripFormat(this.getDisplayName()).compareToIgnoreCase(Util.stripFormat(other.getDisplayName()));
+	}
+
+	@Override
+	public boolean equals(final Object object)
+	{
+		if (!(object instanceof User))
+		{
+			return false;
+		}
+		return this.getName().equalsIgnoreCase(((User)object).getName());
+
+	}
+
+	@Override
+	public int hashCode()
+	{
+		return this.getName().hashCode();
+	}
+
 	public Boolean canSpawnItem(final int itemId)
 	{
 		return !ess.getSettings().itemSpawnBlacklist().contains(itemId);
 	}
 
+	public Location getHome() throws Exception
+	{
+		return getHome(getHomes().get(0));
+	}
+
 	@Override
 	public void setLastLocation()
 	{
-		setLastLocation(this.getLocation());
+		setLastLocation(getLocation());
 	}
 
-	@Override
-	public void setLogoutLocation()
-	{
-		setLogoutLocation(this.getLocation());
-	}
-
-	@Override
 	public void requestTeleport(final User player, final boolean here)
 	{
 		teleportRequestTime = System.currentTimeMillis();
-		teleportRequester = player == null ? null : player.getBase().getUniqueId();
+		teleportRequester = player;
 		teleportRequestHere = here;
-		if (player == null)
-		{
-			teleportLocation = null;
-		}
-		else
-		{
-			teleportLocation = here ? player.getLocation() : this.getLocation();
-		}
 	}
 
-	public UUID getTeleportRequest()
+	public User getTeleportRequest()
 	{
 		return teleportRequester;
 	}
@@ -289,11 +273,6 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 		return teleportRequestHere;
 	}
 
-	public Location getTpRequestLocation()
-	{
-		return teleportLocation;
-	}
-
 	public String getNick(final boolean longnick)
 	{
 		final StringBuilder prefix = new StringBuilder();
@@ -304,16 +283,12 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 		{
 			nickname = getName();
 		}
-		else if (nick.equalsIgnoreCase(getName())) {
-			nickname = nick;
-		}
 		else
 		{
 			nickname = ess.getSettings().getNicknamePrefix() + nick;
-			suffix = "§r";
 		}
 
-		if (this.getBase().isOp())
+		if (isOp())
 		{
 			try
 			{
@@ -331,7 +306,6 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 
 		if (ess.getSettings().addPrefixSuffix())
 		{
-			//These two extra toggles are not documented, because they are mostly redundant #EasterEgg
 			if (!ess.getSettings().disablePrefix())
 			{
 				final String ptext = ess.getPermissionsHandler().getPrefix(base).replace('&', '§');
@@ -353,11 +327,11 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 		}
 		if (!longnick && output.length() > 16)
 		{
-			output = FormatUtil.lastCode(strPrefix) + nickname;
+			output = Util.lastCode(strPrefix) + nickname;
 		}
 		if (!longnick && output.length() > 16)
 		{
-			output = FormatUtil.lastCode(strPrefix) + nickname.substring(0, 14);
+			output = Util.lastCode(strPrefix) + nickname.substring(0, 14);
 		}
 		if (output.charAt(output.length() - 1) == '§')
 		{
@@ -370,13 +344,13 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 	{
 		if (base.isOnline() && ess.getSettings().changeDisplayName())
 		{
-			this.getBase().setDisplayName(getNick(true));
+			setDisplayName(getNick(true));
 			if (ess.getSettings().changePlayerListName())
 			{
 				String name = getNick(false);
 				try
 				{
-					this.getBase().setPlayerListName(name);
+					setPlayerListName(name);
 				}
 				catch (IllegalArgumentException e)
 				{
@@ -389,9 +363,10 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 		}
 	}
 
+	@Override
 	public String getDisplayName()
 	{
-		return super.getBase().getDisplayName() == null ? super.getBase().getName() : super.getBase().getDisplayName();
+		return super.getDisplayName() == null ? super.getName() : super.getDisplayName();
 	}
 
 	@Override
@@ -411,41 +386,21 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 	}
 
 	@Override
-	public BigDecimal getMoney()
+	public double getMoney()
 	{
-		final long start = System.nanoTime();
-		final BigDecimal value = _getMoney();
-		final long elapsed = System.nanoTime() - start;
-		if (elapsed > ess.getSettings().getEconomyLagWarning())
-		{
-			ess.getLogger().log(Level.INFO, "Lag Notice - Slow Economy Response - Request took over {0}ms!", elapsed / 1000000.0);
-		}
-		return value;
-	}
-
-	private BigDecimal _getMoney()
-	{
-		if (ess.getSettings().isEcoDisabled())
-		{
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().info("Internal economy functions disabled, aborting balance check.");
-			}
-			return BigDecimal.ZERO;
-		}
-		if (Methods.hasMethod())
+		if (ess.getPaymentMethod().hasMethod())
 		{
 			try
 			{
-				final Method method = Methods.getMethod();
+				final Method method = ess.getPaymentMethod().getMethod();
 				if (!method.hasAccount(this.getName()))
 				{
 					throw new Exception();
 				}
-				final Method.MethodAccount account = Methods.getMethod().getAccount(this.getName());
-				return BigDecimal.valueOf(account.balance());
+				final Method.MethodAccount account = ess.getPaymentMethod().getMethod().getAccount(this.getName());
+				return account.balance();
 			}
-			catch (Exception ex)
+			catch (Throwable ex)
 			{
 			}
 		}
@@ -453,83 +408,57 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 	}
 
 	@Override
-	public void setMoney(final BigDecimal value) throws MaxMoneyException
+	public void setMoney(final double value)
 	{
-		if (ess.getSettings().isEcoDisabled())
-		{
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().info("Internal economy functions disabled, aborting balance change.");
-			}
-			return;
-		}
-		final BigDecimal oldBalance = _getMoney();
-		if (Methods.hasMethod())
+		if (ess.getPaymentMethod().hasMethod())
 		{
 			try
 			{
-				final Method method = Methods.getMethod();
+				final Method method = ess.getPaymentMethod().getMethod();
 				if (!method.hasAccount(this.getName()))
 				{
 					throw new Exception();
 				}
-				final Method.MethodAccount account = Methods.getMethod().getAccount(this.getName());
-				account.set(value.doubleValue());
+				final Method.MethodAccount account = ess.getPaymentMethod().getMethod().getAccount(this.getName());
+				account.set(value);
 			}
-			catch (Exception ex)
+			catch (Throwable ex)
 			{
 			}
 		}
-		super.setMoney(value, true);
-		ess.getServer().getPluginManager().callEvent(new UserBalanceUpdateEvent(this.getBase(), oldBalance, value));
+		super.setMoney(value);
 		Trade.log("Update", "Set", "API", getName(), new Trade(value, ess), null, null, null, ess);
 	}
 
-	public void updateMoneyCache(final BigDecimal value)
+	public void updateMoneyCache(final double value)
 	{
-		if (ess.getSettings().isEcoDisabled())
+		if (ess.getPaymentMethod().hasMethod() && super.getMoney() != value)
 		{
-			return;
-		}
-		if (Methods.hasMethod() && super.getMoney() != value)
-		{
-			try
-			{
-				super.setMoney(value, false);
-			}
-			catch (MaxMoneyException ex)
-			{
-				// We don't want to throw any errors here, just updating a cache
-			}
+			super.setMoney(value);
 		}
 	}
 
 	@Override
 	public void setAfk(final boolean set)
 	{
-		final AfkStatusChangeEvent afkEvent = new AfkStatusChangeEvent(this, set);
-		ess.getServer().getPluginManager().callEvent(afkEvent);
-		if (afkEvent.isCancelled())
-		{
-			return;
-		}
-
-		this.getBase().setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : set);
+		this.setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : set);
 		if (set && !isAfk())
 		{
-			afkPosition = this.getLocation();
+			afkPosition = getLocation();
 		}
 		else if (!set && isAfk())
 		{
 			afkPosition = null;
 		}
-		_setAfk(set);
+		super.setAfk(set);
 	}
 
+	@Override
 	public boolean toggleAfk()
 	{
-		setAfk(!isAfk());
-		return isAfk();
+		final boolean now = super.toggleAfk();
+		this.setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : now);
+		return now;
 	}
 
 	@Override
@@ -537,13 +466,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 	{
 		return hidden;
 	}
-	
-	public boolean isHidden(final Player player)
-	{
-		return hidden || !player.canSee(getBase());
-	}
 
-	@Override
 	public void setHidden(final boolean hidden)
 	{
 		this.hidden = hidden;
@@ -560,7 +483,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 		{
 			setJailTimeout(0);
 			setJailed(false);
-			sendMessage(tl("haveBeenReleased"));
+			sendMessage(_("haveBeenReleased"));
 			setJail(null);
 			try
 			{
@@ -587,26 +510,34 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 		if (getMuteTimeout() > 0 && getMuteTimeout() < currentTime && isMuted())
 		{
 			setMuteTimeout(0);
-			sendMessage(tl("canTalkAgain"));
+			sendMessage(_("canTalkAgain"));
 			setMuted(false);
 			return true;
 		}
 		return false;
 	}
 
+	//Returns true if status expired during this check
+	public boolean checkBanTimeout(final long currentTime)
+	{
+		if (getBanTimeout() > 0 && getBanTimeout() < currentTime && isBanned())
+		{
+			setBanTimeout(0);
+			setBanned(false);
+			return true;
+		}
+		return false;
+	}
+
 	public void updateActivity(final boolean broadcast)
 	{
-		if (isAfk() && ess.getSettings().cancelAfkOnInteract())
+		if (isAfk())
 		{
 			setAfk(false);
 			if (broadcast && !isHidden())
 			{
 				setDisplayNick();
-				final String msg = tl("userIsNotAway", getDisplayName());
-				if (!msg.isEmpty())
-				{
-					ess.broadcastMessage(this, msg);
-				}
+				ess.broadcastMessage(this, _("userIsNotAway", getDisplayName()));
 			}
 		}
 		lastActivity = System.currentTimeMillis();
@@ -618,16 +549,17 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 		if (autoafkkick > 0 && lastActivity > 0 && (lastActivity + (autoafkkick * 1000)) < System.currentTimeMillis()
 			&& !isHidden() && !isAuthorized("essentials.kick.exempt") && !isAuthorized("essentials.afk.kickexempt"))
 		{
-			final String kickReason = tl("autoAfkKickReason", autoafkkick / 60.0);
+			final String kickReason = _("autoAfkKickReason", autoafkkick / 60.0);
 			lastActivity = 0;
-			this.getBase().kickPlayer(kickReason);
+			kickPlayer(kickReason);
 
 
-			for (User user : ess.getOnlineUsers())
+			for (Player player : ess.getServer().getOnlinePlayers())
 			{
+				final User user = ess.getUser(player);
 				if (user.isAuthorized("essentials.kick.notify"))
 				{
-					user.sendMessage(tl("playerKicked", Console.NAME, getName(), kickReason));
+					player.sendMessage(_("playerKicked", Console.NAME, getName(), kickReason));
 				}
 			}
 		}
@@ -638,11 +570,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 			if (!isHidden())
 			{
 				setDisplayNick();
-				final String msg = tl("userIsAway", getDisplayName());
-				if (!msg.isEmpty())
-				{
-					ess.broadcastMessage(this, msg);
-				}
+				ess.broadcastMessage(this, _("userIsAway", getDisplayName()));
 			}
 		}
 	}
@@ -655,7 +583,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 	@Override
 	public boolean isGodModeEnabled()
 	{
-		return (super.isGodModeEnabled() && !ess.getSettings().getNoGodWorlds().contains(this.getLocation().getWorld().getName()))
+		return (super.isGodModeEnabled() && !ess.getSettings().getNoGodWorlds().contains(getLocation().getWorld().getName()))
 			   || (isAfk() && ess.getSettings().getFreezeAfkPlayers());
 	}
 
@@ -667,29 +595,17 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 	@Override
 	public String getGroup()
 	{
-		final String result = ess.getPermissionsHandler().getGroup(base);
-		if (ess.getSettings().isDebug())
-		{
-			ess.getLogger().log(Level.INFO, "looking up groupname of " + base.getName() + " - " + result);
-		}
-		return result;
+		return ess.getPermissionsHandler().getGroup(base);
 	}
 
-	@Override
 	public boolean inGroup(final String group)
 	{
-		final boolean result = ess.getPermissionsHandler().inGroup(base, group);
-		if (ess.getSettings().isDebug())
-		{
-			ess.getLogger().log(Level.INFO, "checking if " + base.getName() + " is in group " + group + " - " + result);
-		}
-		return result;
+		return ess.getPermissionsHandler().inGroup(base, group);
 	}
 
-	@Override
 	public boolean canBuild()
 	{
-		if (this.getBase().isOp())
+		if (isOp())
 		{
 			return true;
 		}
@@ -720,8 +636,8 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 	{
 		enderSee = set;
 	}
+	private transient long teleportInvulnerabilityTimestamp = 0;
 
-	@Override
 	public void enableInvulnerabilityAfterTeleport()
 	{
 		final long time = ess.getSettings().getTeleportInvulnerability();
@@ -731,7 +647,6 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 		}
 	}
 
-	@Override
 	public void resetInvulnerabilityAfterTeleport()
 	{
 		if (teleportInvulnerabilityTimestamp != 0
@@ -741,58 +656,48 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 		}
 	}
 
-	@Override
 	public boolean hasInvulnerabilityAfterTeleport()
 	{
 		return teleportInvulnerabilityTimestamp != 0 && teleportInvulnerabilityTimestamp >= System.currentTimeMillis();
 	}
-	
-	public boolean canInteractVanished()
-	{
-		return isAuthorized("essentials.vanish.interact");
-	}
 
-	@Override
 	public boolean isVanished()
 	{
 		return vanished;
 	}
 
-	@Override
 	public void setVanished(final boolean set)
 	{
 		vanished = set;
 		if (set)
 		{
-			for (User user : ess.getOnlineUsers())
+			for (Player p : ess.getServer().getOnlinePlayers())
 			{
-				if (!user.isAuthorized("essentials.vanish.see"))
+				if (!ess.getUser(p).isAuthorized("essentials.vanish.see"))
 				{
-					user.getBase().hidePlayer(getBase());
+					p.hidePlayer(getBase());
 				}
 			}
 			setHidden(true);
 			ess.getVanishedPlayers().add(getName());
-			if (isAuthorized("essentials.vanish.effect"))
-			{
-				this.getBase().addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, Integer.MAX_VALUE, 1, false));
-			}
 		}
 		else
 		{
-			for (Player p : ess.getOnlinePlayers())
+			for (Player p : ess.getServer().getOnlinePlayers())
 			{
 				p.showPlayer(getBase());
 			}
 			setHidden(false);
 			ess.getVanishedPlayers().remove(getName());
-			if (isAuthorized("essentials.vanish.effect"))
-			{
-				this.getBase().removePotionEffect(PotionEffectType.INVISIBILITY);
-			}
 		}
 	}
 
+	public void toggleVanished()
+	{
+		final boolean set = !vanished;
+		this.setVanished(set);
+	}
+
 	public boolean checkSignThrottle()
 	{
 		if (isSignThrottled())
@@ -811,7 +716,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 
 	public void updateThrottle()
 	{
-		lastThrottledAction = System.currentTimeMillis();
+		lastThrottledAction = System.currentTimeMillis();;
 	}
 
 	public boolean isFlyClickJump()
@@ -823,76 +728,4 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
 	{
 		this.rightClickJump = rightClickJump;
 	}
-
-	@Override
-	public boolean isIgnoreExempt()
-	{
-		return this.isAuthorized("essentials.chat.ignoreexempt");
-	}
-
-	public boolean isRecipeSee()
-	{
-		return recipeSee;
-	}
-
-	public void setRecipeSee(boolean recipeSee)
-	{
-		this.recipeSee = recipeSee;
-	}
-
-	@Override
-	public void sendMessage(String message)
-	{
-		if (!message.isEmpty())
-		{
-			base.sendMessage(message);
-		}
-	}
-
-	@Override
-	public void setReplyTo(final CommandSource user)
-	{
-		replyTo = user;
-	}
-
-	@Override
-	public CommandSource getReplyTo()
-	{
-		return replyTo;
-	}
-
-	@Override
-	public int compareTo(final User other)
-	{
-		return FormatUtil.stripFormat(getDisplayName()).compareToIgnoreCase(FormatUtil.stripFormat(other.getDisplayName()));
-	}
-
-	@Override
-	public boolean equals(final Object object)
-	{
-		if (!(object instanceof User))
-		{
-			return false;
-		}
-		return this.getName().equalsIgnoreCase(((User)object).getName());
-
-	}
-
-	@Override
-	public int hashCode()
-	{
-		return this.getName().hashCode();
-	}
-
-	@Override
-	public CommandSource getSource()
-	{
-		return new CommandSource(getBase());
-	}
-
-	@Override
-	public String getName()
-	{
-		return this.getBase().getName();
-	}
 }

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

@@ -1,16 +1,11 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
-import com.earth2me.essentials.utils.NumberUtil;
-import com.earth2me.essentials.utils.StringUtil;
+import static com.earth2me.essentials.I18n._;
 import java.io.File;
-import java.math.BigDecimal;
 import java.util.*;
-import net.ess3.api.IEssentials;
-import net.ess3.api.InvalidWorldException;
-import net.ess3.api.MaxMoneyException;
 import org.bukkit.Location;
 import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.MemoryConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
@@ -18,7 +13,7 @@ import org.bukkit.inventory.ItemStack;
 public abstract class UserData extends PlayerExtension implements IConf
 {
 	protected final transient IEssentials ess;
-	private final EssentialsUserConf config;
+	private EssentialsConf config;
 	private final File folder;
 
 	protected UserData(Player base, IEssentials ess)
@@ -30,35 +25,15 @@ public abstract class UserData extends PlayerExtension implements IConf
 		{
 			folder.mkdirs();
 		}
-
-		String filename;
-		try
-		{
-			filename = base.getUniqueId().toString();
-		}
-		catch (Throwable ex)
-		{
-			ess.getLogger().warning("Falling back to old username system for " + base.getName());
-			filename = base.getName();
-		}
-
-		config = new EssentialsUserConf(base.getName(), base.getUniqueId(), new File(folder, filename + ".yml"));
+		config = new EssentialsConf(new File(folder, Util.sanitizeFileName(base.getName()) + ".yml"));
 		reloadConfig();
 	}
 
 	public final void reset()
 	{
-		config.forceSave();
 		config.getFile().delete();
-		if (config.username != null)
-		{
-			ess.getUserMap().removeUser(config.username);
-		}
-	}
-
-	public final void cleanup()
-	{
-		config.cleanup();
+		config = new EssentialsConf(new File(folder, Util.sanitizeFileName(base.getName()) + ".yml"));
+		reloadConfig();
 	}
 
 	@Override
@@ -74,76 +49,54 @@ public abstract class UserData extends PlayerExtension implements IConf
 		lastHealTimestamp = _getLastHealTimestamp();
 		jail = _getJail();
 		mails = _getMails();
-		teleportEnabled = _getTeleportEnabled();
+		teleportEnabled = getTeleportEnabled();
+		ignoredPlayers = getIgnoredPlayers();
 		godmode = _getGodModeEnabled();
-		muted = _getMuted();
+		muted = getMuted();
 		muteTimeout = _getMuteTimeout();
-		jailed = _getJailed();
+		jailed = getJailed();
 		jailTimeout = _getJailTimeout();
 		lastLogin = _getLastLogin();
 		lastLogout = _getLastLogout();
 		lastLoginAddress = _getLastLoginAddress();
-		afk = _getAfk();
+		afk = getAfk();
 		geolocation = _getGeoLocation();
 		isSocialSpyEnabled = _isSocialSpyEnabled();
 		isNPC = _isNPC();
 		arePowerToolsEnabled = _arePowerToolsEnabled();
 		kitTimestamps = _getKitTimestamps();
 		nickname = _getNickname();
-		ignoredPlayers = _getIgnoredPlayers();
-		logoutLocation = _getLogoutLocation();
-		lastAccountName = _getLastAccountName();
 	}
-	private BigDecimal money;
+	private double money;
 
-	private BigDecimal _getMoney()
+	private double _getMoney()
 	{
-		BigDecimal result = ess.getSettings().getStartingBalance();
-		BigDecimal maxMoney = ess.getSettings().getMaxMoney();
-		BigDecimal minMoney = ess.getSettings().getMinMoney();
-
+		double money = ess.getSettings().getStartingBalance();
 		if (config.hasProperty("money"))
 		{
-			result = config.getBigDecimal("money", result);
+			money = config.getDouble("money", money);
 		}
-		if (result.compareTo(maxMoney) > 0)
+		if (Math.abs(money) > ess.getSettings().getMaxMoney())
 		{
-			result = maxMoney;
+			money = money < 0 ? -ess.getSettings().getMaxMoney() : ess.getSettings().getMaxMoney();
 		}
-		if (result.compareTo(minMoney) < 0)
-		{
-			result = minMoney;
-		}
-		return result;
+		return money;
 	}
 
-	public BigDecimal getMoney()
+	public double getMoney()
 	{
 		return money;
 	}
 
-	public void setMoney(BigDecimal value, boolean throwError) throws MaxMoneyException
+	public void setMoney(double value)
 	{
-		BigDecimal maxMoney = ess.getSettings().getMaxMoney();
-		BigDecimal minMoney = ess.getSettings().getMinMoney();
-		if (value.compareTo(maxMoney) > 0)
+		money = value;
+		if (Math.abs(money) > ess.getSettings().getMaxMoney())
 		{
-			if (throwError)
-			{
-				throw new MaxMoneyException();
-			}
-			money = maxMoney;
+			money = money < 0 ? -ess.getSettings().getMaxMoney() : ess.getSettings().getMaxMoney();
 		}
-		else
-		{
-			money = value;
-		}
-		if (money.compareTo(minMoney) < 0)
-		{
-			money = minMoney;
-		}
-		config.setProperty("money", money);
-		stopTransaction();
+		config.setProperty("money", value);
+		config.save();
 	}
 	private Map<String, Object> homes;
 
@@ -158,50 +111,43 @@ public abstract class UserData extends PlayerExtension implements IConf
 
 	private String getHomeName(String search)
 	{
-		if (NumberUtil.isInt(search))
+		if (Util.isInt(search))
 		{
 			try
 			{
 				search = getHomes().get(Integer.parseInt(search) - 1);
 			}
-			catch (NumberFormatException e)
-			{
-			}
-			catch (IndexOutOfBoundsException e)
+			catch (Exception e)
 			{
 			}
 		}
 		return search;
 	}
-
+		
 	public Location getHome(String name) throws Exception
 	{
 		String search = getHomeName(name);
-		return config.getLocation("homes." + search, this.getBase().getServer());
+		return config.getLocation("homes." + search, getServer());	
 	}
 
 	public Location getHome(final Location world)
 	{
 		try
 		{
-			if (getHomes().isEmpty())
-			{
-				return null;
-			}
 			Location loc;
 			for (String home : getHomes())
 			{
-				loc = config.getLocation("homes." + home, this.getBase().getServer());
+				loc = config.getLocation("homes." + home, getServer());
 				if (world.getWorld() == loc.getWorld())
 				{
 					return loc;
 				}
 
 			}
-			loc = config.getLocation("homes." + getHomes().get(0), this.getBase().getServer());
+			loc = config.getLocation("homes." + getHomes().get(0), getServer());
 			return loc;
 		}
-		catch (InvalidWorldException ex)
+		catch (Exception ex)
 		{
 			return null;
 		}
@@ -215,7 +161,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 	public void setHome(String name, Location loc)
 	{
 		//Invalid names will corrupt the yaml
-		name = StringUtil.safeString(name);
+		name = Util.sanitizeFileName(name);
 		homes.put(name, loc);
 		config.setProperty("homes." + name, loc);
 		config.save();
@@ -226,7 +172,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 		String search = getHomeName(name);
 		if (!homes.containsKey(search))
 		{
-			search = StringUtil.safeString(search);
+			search = Util.sanitizeFileName(search);
 		}
 		if (homes.containsKey(search))
 		{
@@ -236,7 +182,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 		}
 		else
 		{
-			throw new Exception(tl("invalidHome", search));
+			throw new Exception(_("invalidHome", search));
 		}
 	}
 
@@ -350,9 +296,9 @@ public abstract class UserData extends PlayerExtension implements IConf
 	{
 		try
 		{
-			return config.getLocation("lastlocation", this.getBase().getServer());
+			return config.getLocation("lastlocation", getServer());
 		}
-		catch (InvalidWorldException e)
+		catch (Exception e)
 		{
 			return null;
 		}
@@ -373,35 +319,6 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("lastlocation", loc);
 		config.save();
 	}
-	private Location logoutLocation;
-
-	private Location _getLogoutLocation()
-	{
-		try
-		{
-			return config.getLocation("logoutlocation", this.getBase().getServer());
-		}
-		catch (InvalidWorldException e)
-		{
-			return null;
-		}
-	}
-
-	public Location getLogoutLocation()
-	{
-		return logoutLocation;
-	}
-
-	public void setLogoutLocation(Location loc)
-	{
-		if (loc == null || loc.getWorld() == null)
-		{
-			return;
-		}
-		logoutLocation = loc;
-		config.setProperty("logoutlocation", loc);
-		config.save();
-	}
 	private long lastTeleportTimestamp;
 
 	private long _getLastTeleportTimestamp()
@@ -498,7 +415,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 	}
 	private boolean teleportEnabled;
 
-	private boolean _getTeleportEnabled()
+	private boolean getTeleportEnabled()
 	{
 		return config.getBoolean("teleportenabled", true);
 	}
@@ -514,9 +431,23 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("teleportenabled", set);
 		config.save();
 	}
+
+	public boolean toggleTeleportEnabled()
+	{
+		boolean ret = !isTeleportEnabled();
+		setTeleportEnabled(ret);
+		return ret;
+	}
+
+	public boolean toggleSocialSpy()
+	{
+		boolean ret = !isSocialSpyEnabled();
+		setSocialSpyEnabled(ret);
+		return ret;
+	}
 	private List<String> ignoredPlayers;
 
-	public List<String> _getIgnoredPlayers()
+	public List<String> getIgnoredPlayers()
 	{
 		return Collections.synchronizedList(config.getStringList("ignore"));
 	}
@@ -540,7 +471,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 	public boolean isIgnoredPlayer(final String userName)
 	{
 		final IUser user = ess.getUser(userName);
-		if (user == null || !user.getBase().isOnline())
+		if (user == null || !user.isOnline())
 		{
 			return false;
 		}
@@ -549,7 +480,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 
 	public boolean isIgnoredPlayer(IUser user)
 	{
-		return (ignoredPlayers.contains(user.getName().toLowerCase(Locale.ENGLISH)) && !user.isIgnoreExempt());
+		return (ignoredPlayers.contains(user.getName().toLowerCase(Locale.ENGLISH)) && !user.isAuthorized("essentials.chat.ignoreexempt"));
 	}
 
 	public void setIgnoredPlayer(IUser user, boolean set)
@@ -584,14 +515,9 @@ public abstract class UserData extends PlayerExtension implements IConf
 	}
 	private boolean muted;
 
-	public boolean _getMuted()
-	{
-		return config.getBoolean("muted", false);
-	}
-
 	public boolean getMuted()
 	{
-		return muted;
+		return config.getBoolean("muted", false);
 	}
 
 	public boolean isMuted()
@@ -625,7 +551,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 	}
 	private boolean jailed;
 
-	private boolean _getJailed()
+	private boolean getJailed()
 	{
 		return config.getBoolean("jailed", false);
 	}
@@ -667,6 +593,27 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.save();
 	}
 
+	public String getBanReason()
+	{
+		return config.getString("ban.reason");
+	}
+
+	public void setBanReason(String reason)
+	{
+		config.setProperty("ban.reason", Util.sanitizeString(reason));
+		config.save();
+	}
+
+	public long getBanTimeout()
+	{
+		return config.getLong("ban.timeout", 0);
+	}
+
+	public void setBanTimeout(long time)
+	{
+		config.setProperty("ban.timeout", time);
+		config.save();
+	}
 	private long lastLogin;
 
 	private long _getLastLogin()
@@ -688,10 +635,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 	public void setLastLogin(long time)
 	{
 		_setLastLogin(time);
-		if (base.getAddress() != null && base.getAddress().getAddress() != null)
-		{
-			_setLastLoginAddress(base.getAddress().getAddress().getHostAddress());
-		}
+		_setLastLoginAddress(base.getAddress().getAddress().getHostAddress());
 		config.save();
 	}
 	private long lastLogout;
@@ -731,7 +675,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 	}
 	private boolean afk;
 
-	private boolean _getAfk()
+	private boolean getAfk()
 	{
 		return config.getBoolean("afk", false);
 	}
@@ -741,12 +685,19 @@ public abstract class UserData extends PlayerExtension implements IConf
 		return afk;
 	}
 
-	public void _setAfk(boolean set)
+	public void setAfk(boolean set)
 	{
 		afk = set;
 		config.setProperty("afk", set);
 		config.save();
 	}
+
+	public boolean toggleAfk()
+	{
+		boolean ret = !isAfk();
+		setAfk(ret);
+		return ret;
+	}
 	private boolean newplayer;
 	private String geolocation;
 
@@ -803,25 +754,6 @@ public abstract class UserData extends PlayerExtension implements IConf
 	{
 		return isNPC;
 	}
-	private String lastAccountName = null;
-
-	public String getLastAccountName()
-	{
-		return lastAccountName;
-	}
-
-	public String _getLastAccountName()
-	{
-		return config.getString("lastAccountName", null);
-	}
-
-	public void setLastAccountName(String lastAccountName)
-	{
-		this.lastAccountName = lastAccountName;
-		config.setProperty("lastAccountName", lastAccountName);
-		config.save();
-		ess.getUserMap().trackUUID(getConfigUUID(), lastAccountName, true);
-	}
 
 	public void setNPC(boolean set)
 	{
@@ -854,119 +786,50 @@ public abstract class UserData extends PlayerExtension implements IConf
 	{
 		return config.getBoolean("powertoolsenabled", true);
 	}
-	private Map<String, Long> kitTimestamps;
+	private ConfigurationSection kitTimestamps;
 
-	private Map<String, Long> _getKitTimestamps()
+	private ConfigurationSection _getKitTimestamps()
 	{
 
 		if (config.isConfigurationSection("timestamps.kits"))
 		{
 			final ConfigurationSection section = config.getConfigurationSection("timestamps.kits");
-			final Map<String, Long> timestamps = new HashMap<String, Long>();
+			final ConfigurationSection newSection = new MemoryConfiguration();
 			for (String command : section.getKeys(false))
 			{
 				if (section.isLong(command))
 				{
-					timestamps.put(command.toLowerCase(Locale.ENGLISH), section.getLong(command));
+					newSection.set(command.toLowerCase(Locale.ENGLISH), section.getLong(command));
 				}
 				else if (section.isInt(command))
 				{
-					timestamps.put(command.toLowerCase(Locale.ENGLISH), (long)section.getInt(command));
+					newSection.set(command.toLowerCase(Locale.ENGLISH), (long)section.getInt(command));
 				}
 			}
-			return timestamps;
+			return newSection;
 		}
-		return new HashMap<String, Long>();
+		return new MemoryConfiguration();
 	}
 
 	public long getKitTimestamp(String name)
 	{
 		name = name.replace('.', '_').replace('/', '_');
-		if (kitTimestamps != null && kitTimestamps.containsKey(name))
+		if (kitTimestamps != null)
 		{
-			return kitTimestamps.get(name);
+			return kitTimestamps.getLong(name, 0l);
 		}
 		return 0l;
 	}
 
 	public void setKitTimestamp(final String name, final long time)
 	{
-		kitTimestamps.put(name.toLowerCase(Locale.ENGLISH), time);
+		kitTimestamps.set(name.toLowerCase(Locale.ENGLISH), time);
 		config.setProperty("timestamps.kits", kitTimestamps);
 		config.save();
 	}
 
-	public void setConfigProperty(String node, Object object)
-	{
-		final String prefix = "info.";
-		node = prefix + node;
-		if (object instanceof Map)
-		{
-			config.setProperty(node, (Map)object);
-		}
-		else if (object instanceof List)
-		{
-			config.setProperty(node, (List<String>)object);
-		}
-		else if (object instanceof Location)
-		{
-			config.setProperty(node, (Location)object);
-		}
-		else if (object instanceof ItemStack)
-		{
-			config.setProperty(node, (ItemStack)object);
-		}
-		else
-		{
-			config.setProperty(node, object);
-		}
-		config.save();
-	}
-
-	public Set<String> getConfigKeys()
-	{
-		if (config.isConfigurationSection("info"))
-		{
-			return config.getConfigurationSection("info").getKeys(true);
-		}
-		return new HashSet<String>();
-	}
-
-	public Map<String, Object> getConfigMap()
-	{
-		if (config.isConfigurationSection("info"))
-		{
-			return config.getConfigurationSection("info").getValues(true);
-		}
-		return new HashMap<String, Object>();
-	}
-
-	public Map<String, Object> getConfigMap(String node)
-	{
-		if (config.isConfigurationSection("info." + node))
-		{
-			return config.getConfigurationSection("info." + node).getValues(true);
-		}
-		return new HashMap<String, Object>();
-	}
-
-	public UUID getConfigUUID()
-	{
-		return config.uuid;
-	}
-
 	public void save()
 	{
 		config.save();
 	}
-
-	public void startTransaction()
-	{
-		config.startTransaction();
-	}
-
-	public void stopTransaction()
-	{
-		config.stopTransaction();
-	}
 }

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

@@ -1,120 +1,67 @@
 package com.earth2me.essentials;
 
-import com.earth2me.essentials.utils.StringUtil;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
-import com.google.common.cache.RemovalCause;
-import com.google.common.cache.RemovalListener;
-import com.google.common.cache.RemovalNotification;
 import com.google.common.util.concurrent.UncheckedExecutionException;
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.ExecutionException;
-import net.ess3.api.IEssentials;
 import org.bukkit.entity.Player;
 
 
 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<UUID> keys = new ConcurrentSkipListSet<UUID>();
-	private final transient ConcurrentSkipListMap<String, UUID> names = new ConcurrentSkipListMap<String, UUID>();
-	private final transient ConcurrentSkipListMap<UUID, ArrayList<String>> history = new ConcurrentSkipListMap<UUID, ArrayList<String>>();
-	private UUIDMap uuidMap;
+	private final transient Cache<String, User> users = CacheBuilder.newBuilder().softValues().build(this);
+	private final transient ConcurrentSkipListSet<String> keys = new ConcurrentSkipListSet<String>();
 
 	public UserMap(final IEssentials ess)
 	{
 		super();
 		this.ess = ess;
-		uuidMap = new UUIDMap(ess);
-		//RemovalListener<UUID, User> remListener = new UserMapRemovalListener();
-		//users = CacheBuilder.newBuilder().maximumSize(ess.getSettings().getMaxUserCacheCount()).softValues().removalListener(remListener).build(this);
-		users = CacheBuilder.newBuilder().maximumSize(ess.getSettings().getMaxUserCacheCount()).softValues().build(this);
+		loadAllUsersAsync(ess);
 	}
 
 	private void loadAllUsersAsync(final IEssentials ess)
 	{
-		ess.runTaskAsynchronously(new Runnable()
+		ess.scheduleAsyncDelayedTask(new Runnable()
 		{
 			@Override
 			public void run()
 			{
-				synchronized (users)
+				final File userdir = new File(ess.getDataFolder(), "userdata");
+				if (!userdir.exists())
 				{
-					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"))
 					{
-						return;
+						continue;
 					}
-					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);
+					final String name = string.substring(0, string.length() - 4);
+					keys.add(Util.sanitizeFileName(name));
 				}
 			}
 		});
 	}
 
-	public boolean userExists(final UUID uuid)
+	public boolean userExists(final String name)
 	{
-		return keys.contains(uuid);
+		return keys.contains(Util.sanitizeFileName(name));
 	}
 
 	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);
-			}
-
-			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 User getUser(final UUID uuid)
-	{
-		try
-		{
-			return users.get(uuid.toString());
+			return users.get(name);
 		}
 		catch (ExecutionException ex)
 		{
@@ -126,97 +73,55 @@ public class UserMap extends CacheLoader<String, User> implements IConf
 		}
 	}
 
-	public void trackUUID(final UUID uuid, final String name, boolean replace)
+	@Override
+	public User load(final String name) throws Exception
 	{
-		if (uuid != null)
+		String sanitizedName = Util.sanitizeFileName(name);
+		if (!sanitizedName.equals(name))
 		{
-			keys.add(uuid);
-			if (name != null && name.length() > 0)
+			User user = getUser(sanitizedName);
+			if (user == null)
 			{
-				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.");
-						}
-					}
-				}
+				throw new Exception("User not found!");
+			}
+			else
+			{
+				return user;
 			}
 		}
-	}
-
-	@Override
-	public User load(final String stringUUID) throws Exception
-	{
-		UUID uuid = UUID.fromString(stringUUID);
-		Player player = ess.getServer().getPlayer(uuid);
-		if (player != null)
+		for (Player player : ess.getServer().getOnlinePlayers())
 		{
-			final User user = new User(player, ess);
-			trackUUID(uuid, user.getName(), true);
-			return user;
+			if (player.getName().equalsIgnoreCase(name))
+			{
+				keys.add(sanitizedName);
+				return new User(player, ess);
+			}
 		}
-
-		final File userFile = getUserFileFromID(uuid);
-
+		final File userFile = getUserFile2(sanitizedName);
 		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;
+			keys.add(sanitizedName);
+			return new User(new OfflinePlayer(name, ess), ess);
 		}
-
 		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);
-		}
-		names.remove(name);
-		names.remove(StringUtil.safeString(name));
+		keys.remove(Util.sanitizeFileName(name));
+		users.invalidate(Util.sanitizeFileName(name));
+		users.invalidate(name);
 	}
 
-	public Set<UUID> getAllUniqueUsers()
+	public Set<String> getAllUniqueUsers()
 	{
-		return Collections.unmodifiableSet(keys.clone());
+		return Collections.unmodifiableSet(keys);
 	}
 
 	public int getUniqueUsers()
@@ -224,47 +129,14 @@ public class UserMap extends CacheLoader<String, User> implements IConf
 		return keys.size();
 	}
 
-	protected ConcurrentSkipListMap<String, UUID> getNames()
+	public File getUserFile(final String name)
 	{
-		return names;
+		return getUserFile2(Util.sanitizeFileName(name));
 	}
 
-	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)
+	private File getUserFile2(final String name)
 	{
 		final File userFolder = new File(ess.getDataFolder(), "userdata");
-		return new File(userFolder, uuid.toString() + ".yml");
+		return new File(userFolder, name + ".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();
-//			}
-//		}
-//	}
 }

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

@@ -0,0 +1,698 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.*;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.inventory.ItemStack;
+
+
+public class Util
+{
+	private Util()
+	{
+	}
+	private final static Logger logger = Logger.getLogger("Minecraft");
+	private final static Pattern INVALIDFILECHARS = Pattern.compile("[^a-z0-9]");
+	private final static Pattern INVALIDCHARS = Pattern.compile("[^\t\n\r\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]");
+
+	public static String sanitizeFileName(final String name)
+	{
+		final String newName = INVALIDFILECHARS.matcher(name.toLowerCase(Locale.ENGLISH)).replaceAll("_");
+		return newName;
+	}
+
+	public static String sanitizeString(final String string)
+	{
+		return INVALIDCHARS.matcher(string).replaceAll("");
+	}
+
+	public static String formatDateDiff(long date)
+	{
+		Calendar c = new GregorianCalendar();
+		c.setTimeInMillis(date);
+		Calendar now = new GregorianCalendar();
+		return Util.formatDateDiff(now, c);
+	}
+
+	public static String formatDateDiff(Calendar fromDate, Calendar toDate)
+	{
+		boolean future = false;
+		if (toDate.equals(fromDate))
+		{
+			return _("now");
+		}
+		if (toDate.after(fromDate))
+		{
+			future = true;
+		}
+
+		StringBuilder sb = new StringBuilder();
+		int[] types = new int[]
+		{
+			Calendar.YEAR,
+			Calendar.MONTH,
+			Calendar.DAY_OF_MONTH,
+			Calendar.HOUR_OF_DAY,
+			Calendar.MINUTE,
+			Calendar.SECOND
+		};
+		String[] names = new String[]
+		{
+			_("year"),
+			_("years"),
+			_("month"),
+			_("months"),
+			_("day"),
+			_("days"),
+			_("hour"),
+			_("hours"),
+			_("minute"),
+			_("minutes"),
+			_("second"),
+			_("seconds")
+		};
+		int accuracy = 0;
+		for (int i = 0; i < types.length; i++)
+		{
+			if (accuracy > 2)
+			{
+				break;
+			}
+			int diff = dateDiff(types[i], fromDate, toDate, future);
+			if (diff > 0)
+			{
+				accuracy++;
+				sb.append(" ").append(diff).append(" ").append(names[i * 2 + (diff > 1 ? 1 : 0)]);
+			}
+		}
+		if (sb.length() == 0)
+		{
+			return "now";
+		}
+		return sb.toString().trim();
+	}
+
+	private static int dateDiff(int type, Calendar fromDate, Calendar toDate, boolean future)
+	{
+		int diff = 0;
+		long savedDate = fromDate.getTimeInMillis();
+		while ((future && !fromDate.after(toDate)) || (!future && !fromDate.before(toDate)))
+		{
+			savedDate = fromDate.getTimeInMillis();
+			fromDate.add(type, future ? 1 : -1);
+			diff++;
+		}
+		diff--;
+		fromDate.setTimeInMillis(savedDate);
+		return diff;
+	}
+
+	public static long parseDateDiff(String time, boolean future) throws Exception
+	{
+		Pattern timePattern = Pattern.compile(
+				"(?:([0-9]+)\\s*y[a-z]*[,\\s]*)?"
+				+ "(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?"
+				+ "(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?"
+				+ "(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?"
+				+ "(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?"
+				+ "(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?"
+				+ "(?:([0-9]+)\\s*(?:s[a-z]*)?)?", Pattern.CASE_INSENSITIVE);
+		Matcher m = timePattern.matcher(time);
+		int years = 0;
+		int months = 0;
+		int weeks = 0;
+		int days = 0;
+		int hours = 0;
+		int minutes = 0;
+		int seconds = 0;
+		boolean found = false;
+		while (m.find())
+		{
+			if (m.group() == null || m.group().isEmpty())
+			{
+				continue;
+			}
+			for (int i = 0; i < m.groupCount(); i++)
+			{
+				if (m.group(i) != null && !m.group(i).isEmpty())
+				{
+					found = true;
+					break;
+				}
+			}
+			if (found)
+			{
+				if (m.group(1) != null && !m.group(1).isEmpty())
+				{
+					years = Integer.parseInt(m.group(1));
+				}
+				if (m.group(2) != null && !m.group(2).isEmpty())
+				{
+					months = Integer.parseInt(m.group(2));
+				}
+				if (m.group(3) != null && !m.group(3).isEmpty())
+				{
+					weeks = Integer.parseInt(m.group(3));
+				}
+				if (m.group(4) != null && !m.group(4).isEmpty())
+				{
+					days = Integer.parseInt(m.group(4));
+				}
+				if (m.group(5) != null && !m.group(5).isEmpty())
+				{
+					hours = Integer.parseInt(m.group(5));
+				}
+				if (m.group(6) != null && !m.group(6).isEmpty())
+				{
+					minutes = Integer.parseInt(m.group(6));
+				}
+				if (m.group(7) != null && !m.group(7).isEmpty())
+				{
+					seconds = Integer.parseInt(m.group(7));
+				}
+				break;
+			}
+		}
+		if (!found)
+		{
+			throw new Exception(_("illegalDate"));
+		}
+		Calendar c = new GregorianCalendar();
+		if (years > 0)
+		{
+			c.add(Calendar.YEAR, years * (future ? 1 : -1));
+		}
+		if (months > 0)
+		{
+			c.add(Calendar.MONTH, months * (future ? 1 : -1));
+		}
+		if (weeks > 0)
+		{
+			c.add(Calendar.WEEK_OF_YEAR, weeks * (future ? 1 : -1));
+		}
+		if (days > 0)
+		{
+			c.add(Calendar.DAY_OF_MONTH, days * (future ? 1 : -1));
+		}
+		if (hours > 0)
+		{
+			c.add(Calendar.HOUR_OF_DAY, hours * (future ? 1 : -1));
+		}
+		if (minutes > 0)
+		{
+			c.add(Calendar.MINUTE, minutes * (future ? 1 : -1));
+		}
+		if (seconds > 0)
+		{
+			c.add(Calendar.SECOND, seconds * (future ? 1 : -1));
+		}
+
+		Calendar max = new GregorianCalendar();
+		max.add(Calendar.YEAR, 10);
+		if (c.after(max))
+		{
+			return max.getTimeInMillis();
+		}
+		return c.getTimeInMillis();
+	}
+	// The player can stand inside these materials 
+	private static final Set<Integer> AIR_MATERIALS = new HashSet<Integer>();
+	private static final HashSet<Byte> AIR_MATERIALS_TARGET = new HashSet<Byte>();
+
+	static
+	{
+		AIR_MATERIALS.add(Material.AIR.getId());
+		AIR_MATERIALS.add(Material.SAPLING.getId());
+		AIR_MATERIALS.add(Material.POWERED_RAIL.getId());
+		AIR_MATERIALS.add(Material.DETECTOR_RAIL.getId());
+		AIR_MATERIALS.add(Material.LONG_GRASS.getId());
+		AIR_MATERIALS.add(Material.DEAD_BUSH.getId());
+		AIR_MATERIALS.add(Material.YELLOW_FLOWER.getId());
+		AIR_MATERIALS.add(Material.RED_ROSE.getId());
+		AIR_MATERIALS.add(Material.BROWN_MUSHROOM.getId());
+		AIR_MATERIALS.add(Material.RED_MUSHROOM.getId());
+		AIR_MATERIALS.add(Material.TORCH.getId());
+		AIR_MATERIALS.add(Material.REDSTONE_WIRE.getId());
+		AIR_MATERIALS.add(Material.SEEDS.getId());
+		AIR_MATERIALS.add(Material.SIGN_POST.getId());
+		AIR_MATERIALS.add(Material.WOODEN_DOOR.getId());
+		AIR_MATERIALS.add(Material.LADDER.getId());
+		AIR_MATERIALS.add(Material.RAILS.getId());
+		AIR_MATERIALS.add(Material.WALL_SIGN.getId());
+		AIR_MATERIALS.add(Material.LEVER.getId());
+		AIR_MATERIALS.add(Material.STONE_PLATE.getId());
+		AIR_MATERIALS.add(Material.IRON_DOOR_BLOCK.getId());
+		AIR_MATERIALS.add(Material.WOOD_PLATE.getId());
+		AIR_MATERIALS.add(Material.REDSTONE_TORCH_OFF.getId());
+		AIR_MATERIALS.add(Material.REDSTONE_TORCH_ON.getId());
+		AIR_MATERIALS.add(Material.STONE_BUTTON.getId());
+		AIR_MATERIALS.add(Material.SNOW.getId());
+		AIR_MATERIALS.add(Material.SUGAR_CANE_BLOCK.getId());
+		AIR_MATERIALS.add(Material.DIODE_BLOCK_OFF.getId());
+		AIR_MATERIALS.add(Material.DIODE_BLOCK_ON.getId());
+		AIR_MATERIALS.add(Material.TRAP_DOOR.getId());
+		AIR_MATERIALS.add(Material.PUMPKIN_STEM.getId());
+		AIR_MATERIALS.add(Material.MELON_STEM.getId());
+		AIR_MATERIALS.add(Material.VINE.getId());
+		AIR_MATERIALS.add(Material.FENCE_GATE.getId());
+		AIR_MATERIALS.add(Material.WATER_LILY.getId());
+		AIR_MATERIALS.add(Material.NETHER_FENCE.getId());
+		AIR_MATERIALS.add(Material.NETHER_WARTS.getId());
+
+		for (Integer integer : AIR_MATERIALS)
+		{
+			AIR_MATERIALS_TARGET.add(integer.byteValue());
+		}
+		AIR_MATERIALS_TARGET.add((byte)Material.WATER.getId());
+		AIR_MATERIALS_TARGET.add((byte)Material.STATIONARY_WATER.getId());
+	}
+
+	public static Location getTarget(final LivingEntity entity) throws Exception
+	{
+		final Block block = entity.getTargetBlock(AIR_MATERIALS_TARGET, 300);
+		if (block == null)
+		{
+			throw new Exception("Not targeting a block");
+		}
+		return block.getLocation();
+	}
+	public final static int RADIUS = 3;
+	public final static Vector3D[] VOLUME;
+
+
+	public static class Vector3D
+	{
+		public Vector3D(int x, int y, int z)
+		{
+			this.x = x;
+			this.y = y;
+			this.z = z;
+		}
+		public int x;
+		public int y;
+		public int z;
+	}
+
+	static
+	{
+		List<Vector3D> pos = new ArrayList<Vector3D>();
+		for (int x = -RADIUS; x <= RADIUS; x++)
+		{
+			for (int y = -RADIUS; y <= RADIUS; y++)
+			{
+				for (int z = -RADIUS; z <= RADIUS; z++)
+				{
+					pos.add(new Vector3D(x, y, z));
+				}
+			}
+		}
+		Collections.sort(pos, new Comparator<Vector3D>()
+		{
+			@Override
+			public int compare(Vector3D a, Vector3D b)
+			{
+				return (a.x * a.x + a.y * a.y + a.z * a.z) - (b.x * b.x + b.y * b.y + b.z * b.z);
+			}
+		});
+		VOLUME = pos.toArray(new Vector3D[0]);
+	}
+
+	public static Location getSafeDestination(final Location loc) throws Exception
+	{
+		if (loc == null || loc.getWorld() == null)
+		{
+			throw new Exception(_("destinationNotSet"));
+		}
+		final World world = loc.getWorld();
+		int x = loc.getBlockX();
+		int y = (int)Math.round(loc.getY());
+		int z = loc.getBlockZ();
+		final int origX = x;
+		final int origY = y;
+		final int origZ = z;
+
+		while (isBlockAboveAir(world, x, y, z))
+		{
+			y -= 1;
+			if (y < 0)
+			{
+				y = origY;
+				break;
+			}
+		}
+
+		int i = 0;
+		while (isBlockUnsafe(world, x, y, z))
+		{
+			i++;
+			if (i >= VOLUME.length)
+			{
+				x = origX;
+				y = origY + RADIUS;
+				z = origZ;
+				break;
+			}
+			x = origX + VOLUME[i].x;
+			y = origY + VOLUME[i].y;
+			z = origZ + VOLUME[i].z;
+		}
+
+		while (isBlockUnsafe(world, x, y, z))
+		{
+			y += 1;
+			if (y >= world.getMaxHeight())
+			{
+				x += 1;
+				break;
+			}
+		}
+
+		while (isBlockUnsafe(world, x, y, z))
+		{
+			y -= 1;
+			if (y <= 1)
+			{
+				x += 1;
+				y = world.getHighestBlockYAt(x, z);
+				if (x - 48 > loc.getBlockX())
+				{
+					throw new Exception(_("holeInFloor"));
+				}
+			}
+		}
+		return new Location(world, x + 0.5D, y, z + 0.5D, loc.getYaw(), loc.getPitch());
+	}
+
+	private static boolean isBlockAboveAir(final World world, final int x, final int y, final int z)
+	{
+		return AIR_MATERIALS.contains(world.getBlockAt(x, y - 1, z).getType().getId());
+	}
+
+	public static boolean isBlockUnsafe(final World world, final int x, final int y, final int z)
+	{
+		if (isBlockDamaging(world, x, y, z))
+		{
+			return true;
+		}
+		return isBlockAboveAir(world, x, y, z);
+	}
+
+	public static boolean isBlockDamaging(final World world, final int x, final int y, final int z)
+	{
+		final Block below = world.getBlockAt(x, y - 1, z);
+		if (below.getType() == Material.LAVA || below.getType() == Material.STATIONARY_LAVA)
+		{
+			return true;
+		}
+
+		if (below.getType() == Material.FIRE)
+		{
+			return true;
+		}
+
+		if (below.getType() == Material.BED_BLOCK)
+		{
+			return true;
+		}
+
+		if ((!AIR_MATERIALS.contains(world.getBlockAt(x, y, z).getType().getId()))
+			|| (!AIR_MATERIALS.contains(world.getBlockAt(x, y + 1, z).getType().getId())))
+		{
+			return true;
+		}
+		return false;
+	}
+
+	public static ItemStack convertBlockToItem(final Block block)
+	{
+		final ItemStack is = new ItemStack(block.getType(), 1, (short)0, block.getData());
+		switch (is.getType())
+		{
+		case WOODEN_DOOR:
+			is.setType(Material.WOOD_DOOR);
+			is.setDurability((short)0);
+			break;
+		case IRON_DOOR_BLOCK:
+			is.setType(Material.IRON_DOOR);
+			is.setDurability((short)0);
+			break;
+		case SIGN_POST:
+		case WALL_SIGN:
+			is.setType(Material.SIGN);
+			is.setDurability((short)0);
+			break;
+		case CROPS:
+			is.setType(Material.SEEDS);
+			is.setDurability((short)0);
+			break;
+		case CAKE_BLOCK:
+			is.setType(Material.CAKE);
+			is.setDurability((short)0);
+			break;
+		case BED_BLOCK:
+			is.setType(Material.BED);
+			is.setDurability((short)0);
+			break;
+		case REDSTONE_WIRE:
+			is.setType(Material.REDSTONE);
+			is.setDurability((short)0);
+			break;
+		case REDSTONE_TORCH_OFF:
+		case REDSTONE_TORCH_ON:
+			is.setType(Material.REDSTONE_TORCH_ON);
+			is.setDurability((short)0);
+			break;
+		case DIODE_BLOCK_OFF:
+		case DIODE_BLOCK_ON:
+			is.setType(Material.DIODE);
+			is.setDurability((short)0);
+			break;
+		case DOUBLE_STEP:
+			is.setType(Material.STEP);
+			break;
+		case TORCH:
+		case RAILS:
+		case LADDER:
+		case WOOD_STAIRS:
+		case COBBLESTONE_STAIRS:
+		case LEVER:
+		case STONE_BUTTON:
+		case FURNACE:
+		case DISPENSER:
+		case PUMPKIN:
+		case JACK_O_LANTERN:
+		case WOOD_PLATE:
+		case STONE_PLATE:
+		case PISTON_STICKY_BASE:
+		case PISTON_BASE:
+		case IRON_FENCE:
+		case THIN_GLASS:
+		case TRAP_DOOR:
+		case FENCE:
+		case FENCE_GATE:
+		case NETHER_FENCE:
+			is.setDurability((short)0);
+			break;
+		case FIRE:
+			return null;
+		case PUMPKIN_STEM:
+			is.setType(Material.PUMPKIN_SEEDS);
+			break;
+		case MELON_STEM:
+			is.setType(Material.MELON_SEEDS);
+			break;
+		}
+		return is;
+	}
+	private static DecimalFormat dFormat = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US));
+
+	public static String formatAsCurrency(final double value)
+	{
+		String str = dFormat.format(value);
+		if (str.endsWith(".00"))
+		{
+			str = str.substring(0, str.length() - 3);
+		}
+		return str;
+	}
+
+	public static String displayCurrency(final double value, final IEssentials ess)
+	{
+		return _("currency", ess.getSettings().getCurrencySymbol(), formatAsCurrency(value));
+	}
+
+	public static String shortCurrency(final double value, final IEssentials ess)
+	{
+		return ess.getSettings().getCurrencySymbol() + formatAsCurrency(value);
+	}
+
+	public static double roundDouble(final double d)
+	{
+		return Math.round(d * 100.0) / 100.0;
+	}
+
+	public static boolean isInt(final String sInt)
+	{
+		try
+		{
+			Integer.parseInt(sInt);
+		}
+		catch (NumberFormatException e)
+		{
+			return false;
+		}
+		return true;
+	}
+
+	public static String joinList(Object... list)
+	{
+		return joinList(", ", list);
+	}
+
+	public static String joinList(String seperator, Object... list)
+	{
+		StringBuilder buf = new StringBuilder();
+		for (Object each : list)
+		{
+			if (buf.length() > 0)
+			{
+				buf.append(seperator);
+			}
+
+			if (each instanceof Collection)
+			{
+				buf.append(joinList(seperator, ((Collection)each).toArray()));
+			}
+			else
+			{
+				try
+				{
+					buf.append(each.toString());
+				}
+				catch (Exception e)
+				{
+					buf.append(each.toString());
+				}
+			}
+		}
+		return buf.toString();
+	}
+
+	public static String lastCode(final String input)
+	{
+		int pos = input.lastIndexOf("§");
+		if (pos == -1 || (pos + 1) == input.length())
+		{
+			return "";
+		}
+		return input.substring(pos, pos + 2);
+	}
+	private static transient final Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-z]{2,3}(?:/\\S+)?)");
+	private static transient final Pattern VANILLA_PATTERN = Pattern.compile("\u00A7+[0-9A-FK-ORa-fk-or]");
+	private static transient final Pattern REPLACE_PATTERN = Pattern.compile("&([0-9a-fk-or])");
+	private static transient final Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00A7+[0-9A-Fa-f]");
+	private static transient final Pattern VANILLA_MAGIC_PATTERN = Pattern.compile("\u00A7+[Kk]");
+	private static transient final Pattern VANILLA_FORMAT_PATTERN = Pattern.compile("\u00A7+[L-ORl-or]");
+	private static transient final Pattern REPLACE_COLOR_PATTERN = Pattern.compile("&([0-9a-f])");
+	private static transient final Pattern REPLACE_MAGIC_PATTERN = Pattern.compile("&(k)");
+	private static transient final Pattern REPLACE_FORMAT_PATTERN = Pattern.compile("&([l-or])");
+
+	public static String stripFormat(final String input)
+	{
+		if (input == null)
+		{
+			return null;
+		}
+		return VANILLA_PATTERN.matcher(input).replaceAll("");
+	}
+
+	public static String replaceFormat(final String input)
+	{
+		if (input == null)
+		{
+			return null;
+		}
+		return REPLACE_PATTERN.matcher(input).replaceAll("\u00a7$1");
+	}
+
+	public static String blockURL(final String input)
+	{
+		if (input == null)
+		{
+			return null;
+		}
+		String text = URL_PATTERN.matcher(input).replaceAll("$1 $2");
+		while (URL_PATTERN.matcher(text).find())
+		{
+			text = URL_PATTERN.matcher(text).replaceAll("$1 $2");
+		}
+		return text;
+	}
+
+	public static String formatString(final IUser user, final String permBase, final String input)
+	{
+		if (input == null)
+		{
+			return null;
+		}
+		String message;
+		if (user.isAuthorized(permBase + ".color"))
+		{
+			message = Util.replaceColor(input, REPLACE_COLOR_PATTERN);
+		}
+		else
+		{
+			message = Util.stripColor(input, VANILLA_COLOR_PATTERN);
+		}
+		if (user.isAuthorized(permBase + ".magic"))
+		{
+			message = Util.replaceColor(message, REPLACE_MAGIC_PATTERN);
+		}
+		else
+		{
+			message = Util.stripColor(message, VANILLA_MAGIC_PATTERN);
+		}
+		if (user.isAuthorized(permBase + ".format"))
+		{
+			message = Util.replaceColor(message, REPLACE_FORMAT_PATTERN);
+		}
+		else
+		{
+			message = Util.stripColor(message, VANILLA_FORMAT_PATTERN);
+		}
+		return message;
+	}
+
+	public static String formatMessage(final IUser user, final String permBase, final String input)
+	{
+		if (input == null)
+		{
+			return null;
+		}
+		String message = formatString(user, permBase, input);
+		if (!user.isAuthorized(permBase + ".url"))
+		{
+			message = Util.blockURL(message);
+		}
+		return message;
+	}
+
+	private static String stripColor(final String input, final Pattern pattern)
+	{
+		return pattern.matcher(input).replaceAll("");
+	}
+
+	private static String replaceColor(final String input, final Pattern pattern)
+	{
+		return pattern.matcher(input).replaceAll("\u00a7$1");
+	}
+}

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

@@ -1,22 +1,18 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
+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;
 
 
-public class Warps implements IConf, net.ess3.api.IWarps
+public class Warps implements IConf
 {
-	private static final Logger logger = Logger.getLogger("Essentials");
+	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;
@@ -32,14 +28,12 @@ public class Warps implements IConf, net.ess3.api.IWarps
 		reloadConfig();
 	}
 
-	@Override
 	public boolean isEmpty()
 	{
 		return warpPoints.isEmpty();
 	}
 
-	@Override
-	public Collection<String> getList()
+	public Collection<String> getWarpNames()
 	{
 		final List<String> keys = new ArrayList<String>();
 		for (StringIgnoreCase stringIgnoreCase : warpPoints.keySet())
@@ -50,8 +44,7 @@ public class Warps implements IConf, net.ess3.api.IWarps
 		return keys;
 	}
 
-	@Override
-	public Location getWarp(String warp) throws WarpNotFoundException, InvalidWorldException
+	public Location getWarp(String warp) throws Exception
 	{
 		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(warp));
 		if (conf == null)
@@ -61,44 +54,35 @@ public class Warps implements IConf, net.ess3.api.IWarps
 		return conf.getLocation(null, server);
 	}
 
-	@Override
 	public void setWarp(String name, Location loc) throws Exception
 	{
-		String filename = StringUtil.sanitizeFileName(name);
+		String filename = Util.sanitizeFileName(name);
 		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
 		if (conf == null)
 		{
 			File confFile = new File(warpsFolder, filename + ".yml");
 			if (confFile.exists())
 			{
-				throw new Exception(tl("similarWarpExist"));
+				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(tl("invalidWarpName"));
-		}
+		conf.save();
 	}
 
-	@Override
-	public void removeWarp(String name) throws Exception
+	public void delWarp(String name) throws Exception
 	{
 		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
 		if (conf == null)
 		{
-			throw new Exception(tl("warpNotExist"));
+			throw new Exception(_("warpNotExist"));
 		}
 		if (!conf.getFile().delete())
 		{
-			throw new Exception(tl("warpDeleteError"));
+			throw new Exception(_("warpDeleteError"));
 		}
 		warpPoints.remove(new StringIgnoreCase(name));
 	}
@@ -127,25 +111,13 @@ public class Warps implements IConf, net.ess3.api.IWarps
 					}
 					catch (Exception ex)
 					{
-						logger.log(Level.WARNING, tl("loadWarpError", filename), ex);
+						logger.log(Level.WARNING, _("loadWarpError", filename), ex);
 					}
 				}
 			}
 		}
 	}
 
-	//This is here for future 3.x api support. Not implemented here becasue storage is handled differently
-	@Override
-	public File getWarpFile(String name) throws InvalidNameException
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public int getCount()
-	{
-		return getList().size();
-	}
 
 	private static class StringIgnoreCase
 	{

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

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

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

@@ -1,45 +1,28 @@
 package com.earth2me.essentials.api;
 
 import com.earth2me.essentials.EssentialsConf;
-import com.earth2me.essentials.EssentialsUserConf;
-import static com.earth2me.essentials.I18n.tl;
-import com.earth2me.essentials.Trade;
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.IEssentials;
 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 com.earth2me.essentials.Util;
 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;
-import net.ess3.api.MaxMoneyException;
+import org.bukkit.entity.Player;
 
 
 /**
- * Instead of using this api directly, we recommend to use the register plugin: http://bit.ly/RegisterMethod
+ * Instead of using this api directly, we recommend to use the register plugin:
+ * http://bit.ly/RegisterMethod
  */
-public class Economy
+public final class Economy
 {
-	public Economy()
+	private Economy()
 	{
 	}
-	private static final Logger logger = Logger.getLogger("Essentials");
+	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;
 
 	/**
 	 * @param aEss the ess to set
@@ -52,25 +35,35 @@ public class Economy
 	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"));
+		EssentialsConf npcConfig = new EssentialsConf(new File(folder, Util.sanitizeFileName(name) + ".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);
+		npcConfig.save();
 	}
 
 	private static void deleteNPC(String name)
 	{
-		User user = ess.getUser(name);
-		user.reset();
+		File folder = new File(ess.getDataFolder(), "userdata");
+		if (!folder.exists())
+		{
+			folder.mkdirs();
+		}
+		File config = new File(folder, Util.sanitizeFileName(name) + ".yml");
+		EssentialsConf npcConfig = new EssentialsConf(config);
+		npcConfig.load();
+		if (npcConfig.hasProperty("npc") && npcConfig.getBoolean("npc", false))
+		{
+			if (!config.delete())
+			{
+				logger.log(Level.WARNING, _("deleteFileError", config));
+			}
+			ess.getUserMap().removeUser(name);
+		}
 	}
 
 	private static User getUserByName(String name)
@@ -79,27 +72,26 @@ public class Economy
 		{
 			throw new RuntimeException(noCallBeforeLoad);
 		}
-		if (name == null)
+		User user;
+		Player player = ess.getServer().getPlayer(name);
+		if (player != null)
 		{
-			throw new RuntimeException("Economy username cannot be null");
+			user = ess.getUser(player);
 		}
-		return ess.getUser(name);
+		else
+		{
+			user = ess.getOfflineUser(name);
+		}
+		return user;
 	}
 
 	/**
 	 * Returns the balance of a user
-	 *
 	 * @param name Name of the user
 	 * @return balance
-	 * @throws UserDoesNotExistException
+	 * @throws UserDoesNotExistException 
 	 */
-	@Deprecated
 	public static double getMoney(String name) throws UserDoesNotExistException
-	{
-		return getMoneyExact(name).doubleValue();
-	}
-
-	public static BigDecimal getMoneyExact(String name) throws UserDoesNotExistException
 	{
 		User user = getUserByName(name);
 		if (user == null)
@@ -111,166 +103,83 @@ public class Economy
 
 	/**
 	 * Sets the balance of a user
-	 *
 	 * @param name Name of the user
 	 * @param balance The balance you want to set
 	 * @throws UserDoesNotExistException If a user by that name does not exists
 	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
 	 */
-	@Deprecated
 	public static void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		try
-		{
-			setMoney(name, BigDecimal.valueOf(balance));
-		}
-		catch (ArithmeticException e)
-		{
-			logger.log(Level.WARNING, "Failed to set balance of " + name + " to " + balance + ": " + e.getMessage(), e);
-		}
-	}
-
-	public static void setMoney(String name, BigDecimal balance) throws UserDoesNotExistException, NoLoanPermittedException
 	{
 		User user = getUserByName(name);
 		if (user == null)
 		{
 			throw new UserDoesNotExistException(name);
 		}
-		if (balance.compareTo(ess.getSettings().getMinMoney()) < 0)
+		if (balance < ess.getSettings().getMinMoney())
 		{
 			throw new NoLoanPermittedException();
 		}
-		if (balance.signum() < 0 && !user.isAuthorized("essentials.eco.loan"))
+		if (balance < 0.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);
+		user.setMoney(balance);
 	}
 
 	/**
 	 * Adds money to the balance of a user
-	 *
 	 * @param name Name of the user
 	 * @param amount The money you want to add
 	 * @throws UserDoesNotExistException If a user by that name does not exists
 	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
 	 */
-	@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 add(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
-	{
-		BigDecimal result = getMoneyExact(name).add(amount, MATH_CONTEXT);
+		double result = getMoney(name) + amount;
 		setMoney(name, result);
-		Trade.log("API", "Add", "API", name, new Trade(amount, ess), null, null, null, ess);
 	}
 
 	/**
 	 * 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 substract(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
-	{
-		BigDecimal result = getMoneyExact(name).subtract(amount, MATH_CONTEXT);
+		double result = getMoney(name) - amount;
 		setMoney(name, result);
-		Trade.log("API", "Subtract", "API", name, new Trade(amount, ess), null, null, null, ess);
 	}
 
 	/**
 	 * 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
+	public static void divide(String name, double value) 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 divide(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
-	{
-		BigDecimal result = getMoneyExact(name).divide(amount, MATH_CONTEXT);
+		double result = getMoney(name) / value;
 		setMoney(name, result);
-		Trade.log("API", "Divide", "API", name, new Trade(amount, ess), null, null, null, ess);
 	}
 
 	/**
 	 * 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
+	public static void multiply(String name, double value) 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 multiply(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
-	{
-		BigDecimal result = getMoneyExact(name).multiply(amount, MATH_CONTEXT);
+		double result = getMoney(name) * value;
 		setMoney(name, result);
-		Trade.log("API", "Multiply", "API", name, new Trade(amount, ess), null, null, null, ess);
 	}
 
 	/**
 	 * 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
@@ -282,7 +191,6 @@ public class Economy
 			throw new RuntimeException(noCallBeforeLoad);
 		}
 		setMoney(name, ess.getSettings().getStartingBalance());
-		Trade.log("API", "Reset", "API", name, new Trade(BigDecimal.ZERO, ess), null, null, null, ess);
 	}
 
 	/**
@@ -291,23 +199,9 @@ public class Economy
 	 * @return true, if the user has more or an equal amount of money
 	 * @throws UserDoesNotExistException If a user by that name does not exists
 	 */
-	@Deprecated
 	public static boolean hasEnough(String name, double amount) throws UserDoesNotExistException
 	{
-		try
-		{
-			return hasEnough(name, BigDecimal.valueOf(amount));
-		}
-		catch (ArithmeticException e)
-		{
-			logger.log(Level.WARNING, "Failed to compare balance of " + name + " with " + amount + ": " + e.getMessage(), e);
-			return false;
-		}
-	}
-
-	public static boolean hasEnough(String name, BigDecimal amount) throws UserDoesNotExistException, ArithmeticException
-	{
-		return amount.compareTo(getMoneyExact(name)) <= 0;
+		return amount <= getMoney(name);
 	}
 
 	/**
@@ -316,23 +210,9 @@ public class Economy
 	 * @return true, if the user has more money
 	 * @throws UserDoesNotExistException If a user by that name does not exists
 	 */
-	@Deprecated
 	public static boolean hasMore(String name, double amount) throws UserDoesNotExistException
 	{
-		try
-		{
-			return hasMore(name, BigDecimal.valueOf(amount));
-		}
-		catch (ArithmeticException e)
-		{
-			logger.log(Level.WARNING, "Failed to compare balance of " + name + " with " + amount + ": " + e.getMessage(), e);
-			return false;
-		}
-	}
-
-	public static boolean hasMore(String name, BigDecimal amount) throws UserDoesNotExistException, ArithmeticException
-	{
-		return amount.compareTo(getMoneyExact(name)) < 0;
+		return amount < getMoney(name);
 	}
 
 	/**
@@ -341,69 +221,39 @@ public class Economy
 	 * @return true, if the user has less money
 	 * @throws UserDoesNotExistException If a user by that name does not exists
 	 */
-	@Deprecated
 	public static boolean hasLess(String name, double amount) throws UserDoesNotExistException
 	{
-		try
-		{
-			return hasLess(name, BigDecimal.valueOf(amount));
-		}
-		catch (ArithmeticException e)
-		{
-			logger.log(Level.WARNING, "Failed to compare balance of " + name + " with " + amount + ": " + e.getMessage(), e);
-			return false;
-		}
-	}
-
-	public static boolean hasLess(String name, BigDecimal amount) throws UserDoesNotExistException, ArithmeticException
-	{
-		return amount.compareTo(getMoneyExact(name)) > 0;
+		return amount > getMoney(name);
 	}
 
 	/**
 	 * Test if the user has a negative balance
-	 *
 	 * @param name Name of the user
 	 * @return true, if the user has a negative balance
 	 * @throws UserDoesNotExistException If a user by that name does not exists
 	 */
 	public static boolean isNegative(String name) throws UserDoesNotExistException
 	{
-		return getMoneyExact(name).signum() < 0;
+		return getMoney(name) < 0.0;
 	}
 
 	/**
-	 * Formats the amount of money like all other Essentials functions. Example: $100000 or $12345.67
-	 *
+	 * Formats the amount of money like all other Essentials functions.
+	 * Example: $100000 or $12345.67
 	 * @param amount The amount of money
 	 * @return Formatted money
 	 */
-	@Deprecated
 	public static String format(double amount)
-	{
-		try
-		{
-			return format(BigDecimal.valueOf(amount));
-		}
-		catch (NumberFormatException e)
-		{
-			logger.log(Level.WARNING, "Failed to display " + amount + ": " + e.getMessage(), e);
-			return "NaN";
-		}
-	}
-
-	public static String format(BigDecimal amount)
 	{
 		if (ess == null)
 		{
 			throw new RuntimeException(noCallBeforeLoad);
 		}
-		return NumberUtil.displayCurrency(amount, ess);
+		return Util.displayCurrency(amount, ess);
 	}
 
 	/**
 	 * Test if a player exists to avoid the UserDoesNotExistException
-	 *
 	 * @param name Name of the user
 	 * @return true, if the user exists
 	 */
@@ -414,10 +264,9 @@ public class Economy
 
 	/**
 	 * Test if a player is a npc
-	 *
 	 * @param name Name of the player
 	 * @return true, if it's a npc
-	 * @throws UserDoesNotExistException
+	 * @throws UserDoesNotExistException 
 	 */
 	public static boolean isNPC(String name) throws UserDoesNotExistException
 	{
@@ -431,7 +280,6 @@ public class Economy
 
 	/**
 	 * Creates dummy files for a npc, if there is no player yet with that name.
-	 *
 	 * @param name Name of the player
 	 * @return true, if a new npc was created
 	 */
@@ -447,10 +295,9 @@ public class Economy
 	}
 
 	/**
-	 * Deletes a user, if it is marked as npc.
-	 *
+	 * Deletes a user, if it is marked as npc. 
 	 * @param name Name of the player
-	 * @throws UserDoesNotExistException
+	 * @throws UserDoesNotExistException 
 	 */
 	public static void removeNPC(String name) throws UserDoesNotExistException
 	{

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

@@ -5,9 +5,5 @@ import java.util.Locale;
 
 public interface II18n
 {
-	/**
-	 * Gets the current locale setting
-	 * @return the current locale, if not set it will return the default locale
-	 */
 	Locale getCurrentLocale();
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,6 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import org.bukkit.Server;
 
@@ -18,39 +17,27 @@ public class Commandafk extends EssentialsCommand
 	{
 		if (args.length > 0 && user.isAuthorized("essentials.afk.others"))
 		{
-			User afkUser = getPlayer(server, user, args, 0);
-			toggleAfk(afkUser);
+			User afkUser = ess.getUser(ess.getServer().matchPlayer(args[0]));
+			if (afkUser != null)
+			{
+				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 = tl("userIsNotAway", user.getDisplayName());
+				ess.broadcastMessage(user, _("userIsNotAway", user.getDisplayName()));
 			}
 			user.updateActivity(false);
 		}
@@ -59,13 +46,8 @@ public class Commandafk extends EssentialsCommand
 			//user.sendMessage(_("markedAsAway"));
 			if (!user.isHidden())
 			{
-				msg = tl("userIsAway", user.getDisplayName());
+				ess.broadcastMessage(user, _("userIsAway", user.getDisplayName()));
 			}
 		}
-		if (!msg.isEmpty())
-		{
-			ess.broadcastMessage(user, msg);
-		}
 	}
 }
-

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

@@ -1,12 +1,12 @@
 package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.utils.LocationUtil;
+import com.earth2me.essentials.Util;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.entity.TNTPrimed;
 
-// This command has a in theme message that only shows if you supply a parameter #EasterEgg
+
 public class Commandantioch extends EssentialsCommand
 {
 	public Commandantioch()
@@ -21,9 +21,9 @@ public class Commandantioch extends EssentialsCommand
 		{
 			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());
+		final Location loc = Util.getTarget(user);
 		loc.getWorld().spawn(loc, TNTPrimed.class);
 	}
 }

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

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.commands;
 
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
 import org.bukkit.Server;
@@ -16,17 +16,14 @@ public class Commandback extends EssentialsCommand
 	@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()));
+			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();
 	}

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

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

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

@@ -1,11 +1,10 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.utils.NumberUtil;
-import java.math.BigDecimal;
+import com.earth2me.essentials.Util;
 import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandbalance extends EssentialsCommand
@@ -16,34 +15,23 @@ public class Commandbalance extends EssentialsCommand
 	}
 
 	@Override
-	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final Server server, final CommandSender 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)));
+		sender.sendMessage(_("balance", Util.displayCurrency(getPlayer(server, args, 0, true).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();
-		}
+		final double bal = (args.length < 1
+							|| !(user.isAuthorized("essentials.balance.others")
+								 || user.isAuthorized("essentials.balance.other"))
+							? user
+							: getPlayer(server, args, 0, true)).getMoney();
+		user.sendMessage(_("balance", Util.displayCurrency(bal, ess)));
 	}
 }

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

@@ -1,17 +1,16 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.textreader.SimpleTextInput;
+import com.earth2me.essentials.Util;
+import com.earth2me.essentials.textreader.ArrayListInput;
 import com.earth2me.essentials.textreader.TextPager;
-import com.earth2me.essentials.utils.NumberUtil;
-import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandbalancetop extends EssentialsCommand
@@ -22,12 +21,12 @@ public class Commandbalancetop extends EssentialsCommand
 	}
 	private static final int CACHETIME = 2 * 60 * 1000;
 	public static final int MINUSERS = 50;
-	private static final SimpleTextInput cache = new SimpleTextInput();
+	private static ArrayListInput cache = new ArrayListInput();
 	private static long cacheage = 0;
-	private static final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
+	private static ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
 
 	@Override
-	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		int page = 0;
 		boolean force = false;
@@ -39,8 +38,7 @@ public class Commandbalancetop extends EssentialsCommand
 			}
 			catch (NumberFormatException ex)
 			{
-				if (args[0].equalsIgnoreCase("force")
-					&& (!sender.isPlayer() || ess.getUser(sender.getPlayer()).isAuthorized("essentials.balancetop.force")))
+				if (args[0].equalsIgnoreCase("force") && sender.isOp())
 				{
 					force = true;
 				}
@@ -53,38 +51,38 @@ public class Commandbalancetop extends EssentialsCommand
 			{
 				if (cacheage > System.currentTimeMillis() - CACHETIME)
 				{
-					outputCache(sender, commandLabel, page);
+					outputCache(sender, page);
 					return;
 				}
 				if (ess.getUserMap().getUniqueUsers() > MINUSERS)
 				{
-					sender.sendMessage(tl("orderBalances", ess.getUserMap().getUniqueUsers()));
+					sender.sendMessage(_("orderBalances", ess.getUserMap().getUniqueUsers()));
 				}
 			}
 			finally
 			{
 				lock.readLock().unlock();
 			}
-			ess.runTaskAsynchronously(new Viewer(sender, commandLabel, page, force));
+			ess.scheduleAsyncDelayedTask(new Viewer(sender, page, force));
 		}
 		else
 		{
 			if (ess.getUserMap().getUniqueUsers() > MINUSERS)
 			{
-				sender.sendMessage(tl("orderBalances", ess.getUserMap().getUniqueUsers()));
+				sender.sendMessage(_("orderBalances", ess.getUserMap().getUniqueUsers()));
 			}
-			ess.runTaskAsynchronously(new Viewer(sender, commandLabel, page, force));
+			ess.scheduleAsyncDelayedTask(new Viewer(sender, page, force));
 		}
 
 	}
 
-	private static void outputCache(final CommandSource sender, String command,  int page)
+	private static void outputCache(final CommandSender sender, int page)
 	{
 		final Calendar cal = Calendar.getInstance();
 		cal.setTimeInMillis(cacheage);
 		final DateFormat format = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-		sender.sendMessage(tl("balanceTop", format.format(cal.getTime())));
-		new TextPager(cache).showPage(Integer.toString(page), null, "balancetop", sender);
+		sender.sendMessage(_("balanceTop", format.format(cal.getTime())));
+		new TextPager(cache).showPage(Integer.toString(page), "", "balancetop", sender);
 	}
 
 
@@ -107,47 +105,36 @@ public class Commandbalancetop extends EssentialsCommand
 			{
 				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())
+					cache.getLines().clear();					
+					final Map<String, Double> balances = new HashMap<String, Double>();
+					double totalMoney = 0d;
+					for (String u : ess.getUserMap().getAllUniqueUsers())
 					{
-						if (ess.getSettings().isDebug())
+						final User user = ess.getUserMap().getUser(u);
+						if (user != null)
 						{
-							ess.getLogger().info("Internal economy functions disabled, aborting baltop.");
-						}
-					}
-					else
-					{
-						for (UUID u : ess.getUserMap().getAllUniqueUsers())
-						{
-							final User user = ess.getUserMap().getUser(u);
-							if (user != null)
-							{
-								final BigDecimal userMoney = user.getMoney();
-								user.updateMoneyCache(userMoney);
-								totalMoney = totalMoney.add(userMoney);
-								final String name = user.isHidden() ? user.getName() : user.getDisplayName();
-								balances.put(name, userMoney);
-							}
+							final double userMoney = user.getMoney();
+							user.updateMoneyCache(userMoney);
+							totalMoney += userMoney;
+							balances.put(user.getDisplayName(), 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>>()
+					final List<Map.Entry<String, Double>> sortedEntries = new ArrayList<Map.Entry<String, Double>>(balances.entrySet());
+					Collections.sort(sortedEntries, new Comparator<Map.Entry<String, Double>>()
 					{
 						@Override
-						public int compare(final Entry<String, BigDecimal> entry1, final Entry<String, BigDecimal> entry2)
+						public int compare(final Entry<String, Double> entry1, final Entry<String, Double> entry2)
 						{
-							return entry2.getValue().compareTo(entry1.getValue());
+							return -entry1.getValue().compareTo(entry2.getValue());
 						}
 					});
-
-					cache.getLines().add(tl("serverTotal", NumberUtil.displayCurrency(totalMoney, ess)));
+					
+					cache.getLines().add(_("serverTotal", Util.displayCurrency(totalMoney, ess)));
 					int pos = 1;
-					for (Map.Entry<String, BigDecimal> entry : sortedEntries)
+					for (Map.Entry<String, Double> entry : sortedEntries)
 					{
-						cache.getLines().add(pos + ". " + entry.getKey() + ", " + NumberUtil.displayCurrency(entry.getValue(), ess));
+						cache.getLines().add(pos + ". " + entry.getKey() + ", " + Util.displayCurrency(entry.getValue(), ess));
 						pos++;
 					}
 					cacheage = System.currentTimeMillis();
@@ -157,24 +144,22 @@ public class Commandbalancetop extends EssentialsCommand
 			{
 				lock.writeLock().unlock();
 			}
-			ess.runTaskAsynchronously(viewer);
+			ess.scheduleAsyncDelayedTask(viewer);
 		}
 	}
 
 
 	private class Viewer implements Runnable
 	{
-		private final transient CommandSource sender;
+		private final transient CommandSender 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)
+		public Viewer(final CommandSender sender, final int page, final boolean force)
 		{
 			this.sender = sender;
 			this.page = page;
 			this.force = force;
-			this.commandLabel = commandLabel;
 		}
 
 		@Override
@@ -185,7 +170,7 @@ public class Commandbalancetop extends EssentialsCommand
 			{
 				if (!force && cacheage > System.currentTimeMillis() - CACHETIME)
 				{
-					outputCache(sender, commandLabel, page);
+					outputCache(sender, page);
 					return;
 				}
 			}
@@ -193,7 +178,7 @@ public class Commandbalancetop extends EssentialsCommand
 			{
 				lock.readLock().unlock();
 			}
-			ess.runTaskAsynchronously(new Calculator(new Viewer(sender, commandLabel, page, false), force));
+			ess.scheduleAsyncDelayedTask(new Calculator(new Viewer(sender, page, force), force));
 		}
 	}
 }

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

@@ -1,15 +1,13 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.CommandSource;
 import com.earth2me.essentials.Console;
-import static com.earth2me.essentials.I18n.tl;
+import 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.Bukkit;
 import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 
 public class Commandban extends EssentialsCommand
@@ -20,9 +18,8 @@ public class Commandban extends EssentialsCommand
 	}
 
 	@Override
-	public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
-		boolean nomatch = false;
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
@@ -30,51 +27,54 @@ public class Commandban extends EssentialsCommand
 		User user;
 		try
 		{
-			user = getPlayer(server, args, 0, true, true);
+			user = getPlayer(server, args, 0, true);
 		}
-		catch (PlayerNotFoundException e)
+		catch (NoSuchFieldException e)
 		{
-			nomatch = true;
-			user = ess.getUser(new OfflinePlayer(args[0], ess.getServer()));
+			user = ess.getUser(new OfflinePlayer(args[0], ess));
 		}
-		if (!user.getBase().isOnline())
+		if (!user.isOnline())
 		{
-			if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.ban.offline"))
+			if (sender instanceof Player
+				&& !ess.getUser(sender).isAuthorized("essentials.ban.offline"))
 			{
-				throw new Exception(tl("banExemptOffline"));
+				sender.sendMessage(_("banExempt"));
+				return;
 			}
 		}
 		else
 		{
-			if (user.isAuthorized("essentials.ban.exempt") && sender.isPlayer())
+			if (user.isAuthorized("essentials.ban.exempt"))
 			{
-				throw new Exception(tl("banExempt"));
+				sender.sendMessage(_("banExempt"));
+				return;
 			}
 		}
 
-		final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
+		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
 		String banReason;
 		if (args.length > 1)
 		{
-			banReason = FormatUtil.replaceFormat(getFinalArg(args, 1).replace("\\n", "\n").replace("|", "\n"));
+			banReason = _("banFormat", getFinalArg(args, 1), senderName);
 		}
 		else
 		{
-			banReason = tl("defaultBanReason");
+			banReason = _("banFormat", _("defaultBanReason"), senderName);
 		}
-		
-		ess.getServer().getBanList(BanList.Type.NAME).addBan(user.getName(), banReason, null, senderName);
 
-		String banDisplay = tl("banFormat",  banReason, senderName);
-		
-		user.getBase().kickPlayer(banDisplay);
-		server.getLogger().log(Level.INFO, tl("playerBanned", senderName, user.getName(), banDisplay));
+		user.setBanReason(banReason);
+		user.setBanned(true);
+		user.kickPlayer(banReason);
 
-		if (nomatch)
+		server.getLogger().log(Level.INFO, _("playerBanned", senderName, user.getName(), banReason));
+
+		for (Player onlinePlayer : server.getOnlinePlayers())
 		{
-			sender.sendMessage(tl("userUnknown", user.getName()));
+			final User player = ess.getUser(onlinePlayer);
+			if (player.isAuthorized("essentials.ban.notify"))
+			{
+				onlinePlayer.sendMessage(_("playerBanned", senderName, user.getName(), banReason));
+			}
 		}
-
-		ess.broadcastMessage("essentials.ban.notify", tl("playerBanned", senderName, user.getName(), banReason));
 	}
 }

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

@@ -1,17 +1,11 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.CommandSource;
-import com.earth2me.essentials.Console;
-import static com.earth2me.essentials.I18n.tl;
+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.Bukkit;
 import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
 
 
-//TODO: Add kick to online players matching ip ban.
 public class Commandbanip extends EssentialsCommand
 {
 	public Commandbanip()
@@ -20,51 +14,29 @@ public class Commandbanip extends EssentialsCommand
 	}
 
 	@Override
-	public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
 
-		final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
+		final User player = ess.getUser(args[0]);
 
-		String ipAddress;
-		if (FormatUtil.validIP(args[0]))
+		if (player == null)
 		{
-			ipAddress = args[0];
+			ess.getServer().banIP(args[0]);
+			sender.sendMessage(_("banIpAddress"));
 		}
 		else
 		{
-			try
+			final String ipAddress = player.getLastLoginAddress();
+			if (ipAddress.length() == 0)
 			{
-				User player = getPlayer(server, args, 0, true, true);
-				ipAddress = player.getLastLoginAddress();
-			}
-			catch (PlayerNotFoundException ex)
-			{
-				ipAddress = args[0];
+				throw new Exception(_("playerNotFound"));
 			}
+			ess.getServer().banIP(player.getLastLoginAddress());
+			sender.sendMessage(_("banIpAddress"));
 		}
-
-		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.ban.notify", tl("playerBanIpAddress", senderName, ipAddress, banReason));
 	}
 }

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

@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;
 
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.utils.LocationUtil;
+import com.earth2me.essentials.Util;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.TreeType;
@@ -36,16 +36,16 @@ public class Commandbigtree extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 
-		final Location loc = LocationUtil.getTarget(user.getBase());
-		final Location safeLocation = LocationUtil.getSafeDestination(loc);
+		final Location loc = Util.getTarget(user);
+		final Location safeLocation = Util.getSafeDestination(loc);
 		final boolean success = user.getWorld().generateTree(safeLocation, tree);
 		if (success)
 		{
-			user.sendMessage(tl("bigTreeSuccess"));
+			user.sendMessage(_("bigTreeSuccess"));
 		}
 		else
 		{
-			throw new Exception(tl("bigTreeFailure"));
+			throw new Exception(_("bigTreeFailure"));
 		}
 	}
 }

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

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

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

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.commands;
 
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import org.bukkit.Material;
 import org.bukkit.Server;
@@ -19,7 +19,7 @@ public class Commandbreak extends EssentialsCommand
 	@Override
 	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		final Block block = user.getBase().getTargetBlock(null, 20);
+		final Block block = user.getTargetBlock(null, 20);
 		if (block == null)
 		{
 			throw new NoChargeException();
@@ -30,7 +30,7 @@ public class Commandbreak extends EssentialsCommand
 		}
 		if (block.getType() == Material.BEDROCK && !user.isAuthorized("essentials.break.bedrock"))
 		{
-			throw new Exception(tl("noBreakBedrock"));
+			throw new Exception(_("noBreakBedrock"));
 		}
 		//final List<ItemStack> list = (List<ItemStack>)block.getDrops();		
 		//final BlockBreakEvent event = new BlockBreakEvent(block, user.getBase(), list);

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

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

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

@@ -1,9 +1,9 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n.tl;
-import com.earth2me.essentials.User;
+import static com.earth2me.essentials.I18n._;
 import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 
 public class Commandburn extends EssentialsCommand
@@ -14,20 +14,23 @@ public class Commandburn extends EssentialsCommand
 	}
 
 	@Override
-	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 2)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-
+		
+		//TODO: TL this
 		if (args[0].trim().length() < 2)
 		{
-			throw new NotEnoughArgumentsException();
+			throw new NotEnoughArgumentsException("You need to specify a player to burn.");
 		}
 
-		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])));
+		for (Player p : server.matchPlayer(args[0]))
+		{
+			p.setFireTicks(Integer.parseInt(args[1]) * 20);
+			sender.sendMessage(_("burnMsg", p.getDisplayName(), Integer.parseInt(args[1])));
+		}
 	}
 }

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

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

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

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.commands;
 
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import org.bukkit.Server;
 
@@ -53,6 +53,6 @@ public class Commandcompass extends EssentialsCommand
 		{
 			dir = "N";
 		}
-		user.sendMessage(tl("compassBearing", dir, bearing));
+		user.sendMessage(_("compassBearing", dir, bearing));
 	}
 }

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

@@ -1,221 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n.tl;
-import java.util.*;
-import org.bukkit.Material;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.Recipe;
-import org.bukkit.inventory.ShapedRecipe;
-import org.bukkit.inventory.ShapelessRecipe;
-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;
-
-
-public class Commandcondense extends EssentialsCommand
-{
-	public Commandcondense()
-	{
-		super("condense");
-	}
-	private Map<ItemStack, SimpleRecipe> condenseList = new HashMap<ItemStack, SimpleRecipe>();
-
-	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
-	{
-		List<ItemStack> is = new ArrayList<ItemStack>();
-
-		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();
-		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);
-				condenseList.put(stack, newRecipe);
-				return newRecipe;
-			}
-		}
-
-		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();
-		}
-	}
-}

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

@@ -1,45 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import com.earth2me.essentials.CommandSource;
-import com.earth2me.essentials.textreader.IText;
-import com.earth2me.essentials.textreader.KeywordReplacer;
-import com.earth2me.essentials.textreader.TextInput;
-import com.earth2me.essentials.textreader.TextPager;
-import com.earth2me.essentials.utils.NumberUtil;
-import org.bukkit.Server;
-
-
-public class Commandcustomtext extends EssentialsCommand
-{
-	public Commandcustomtext()
-	{
-		super("customtext");
-	}
-
-	@Override
-	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
-	{			
-		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);
-	}
-}

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

@@ -1,10 +1,10 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import java.util.Locale;
 import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
 
 
 public class Commanddelhome extends EssentialsCommand
@@ -15,14 +15,14 @@ public class Commanddelhome extends EssentialsCommand
 	}
 
 	@Override
-	public void run(final Server server, final CommandSource sender, final String commandLabel, String[] args) throws Exception
+	public void run(final Server server, final CommandSender sender, final String commandLabel, String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
 
-		User user = ess.getUser(sender.getPlayer());
+		User user = ess.getUser(sender);
 		String name;
 		String[] expandedArg;
 
@@ -39,7 +39,7 @@ public class Commanddelhome extends EssentialsCommand
 
 		if (expandedArg.length > 1 && (user == null || user.isAuthorized("essentials.delhome.others")))
 		{
-			user = getPlayer(server, expandedArg, 0, true, true);
+			user = getPlayer(server, expandedArg, 0, true);
 			name = expandedArg[1];
 		}
 		else if (user == null)
@@ -50,13 +50,11 @@ public class Commanddelhome extends EssentialsCommand
 		{
 			name = expandedArg[0];
 		}
-
-		if (name.equalsIgnoreCase("bed"))
-		{
-			throw new Exception(tl("invalidHomeName"));
-		}
-
+		//TODO: Think up a nice error message
+		/*
+		 * if (name.equalsIgnoreCase("bed")) { throw new Exception("You cannot remove the vanilla home point"); }
+		 */
 		user.delHome(name.toLowerCase(Locale.ENGLISH));
-		sender.sendMessage(tl("deleteHome", name));
+		sender.sendMessage(_("deleteHome", name));
 	}
 }

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

@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
 
 
 public class Commanddeljail extends EssentialsCommand
@@ -13,14 +13,13 @@ public class Commanddeljail extends EssentialsCommand
 	}
 
 	@Override
-	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		
 		ess.getJails().removeJail(args[0]);
-		sender.sendMessage(tl("deleteJail", args[0]));
+		sender.sendMessage(_("deleteJail", args[0]));
 	}
 }

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

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

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

@@ -1,6 +1,6 @@
 package com.earth2me.essentials.commands;
 
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import org.bukkit.Server;
 
@@ -18,15 +18,15 @@ public class Commanddepth extends EssentialsCommand
 		final int depth = user.getLocation().getBlockY() - 63;
 		if (depth > 0)
 		{
-			user.sendMessage(tl("depthAboveSea", depth));
+			user.sendMessage(_("depthAboveSea", depth));
 		}
 		else if (depth < 0)
 		{
-			user.sendMessage(tl("depthBelowSea", (-depth)));
+			user.sendMessage(_("depthBelowSea", (-depth)));
 		}
 		else
 		{
-			user.sendMessage(tl("depth"));
+			user.sendMessage(_("depth"));
 		}
 	}
 }

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

@@ -1,124 +1,115 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.ChargeException;
-import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n.tl;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.utils.NumberUtil;
-import java.math.BigDecimal;
 import java.util.Locale;
-import net.ess3.api.MaxMoneyException;
 import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 
-public class Commandeco extends EssentialsLoopCommand
+public class Commandeco extends EssentialsCommand
 {
-	Commandeco.EcoCommands cmd;
-	BigDecimal amount;
-
 	public Commandeco()
 	{
 		super("eco");
 	}
 
 	@Override
-	public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 2)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-
-		BigDecimal startingBalance = ess.getSettings().getStartingBalance();
-
+		EcoCommands cmd;
+		double amount;
 		try
 		{
-			cmd = Commandeco.EcoCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH));
-			amount = (cmd == Commandeco.EcoCommands.RESET) ? startingBalance : new BigDecimal(args[2].replaceAll("[^0-9\\.]", ""));
+			cmd = EcoCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH));
+			amount = Double.parseDouble(args[2].replaceAll("[^0-9\\.]", ""));
 		}
 		catch (Exception ex)
 		{
 			throw new NotEnoughArgumentsException(ex);
 		}
 
-		loopOfflinePlayers(server, sender, false, true, args[1], args);
-
-		if (cmd == Commandeco.EcoCommands.RESET || cmd == Commandeco.EcoCommands.SET)
+		if (args[1].contentEquals("**"))
 		{
-			if (args[1].contentEquals("**"))
+			for (String sUser : ess.getUserMap().getAllUniqueUsers())
 			{
-				server.broadcastMessage(tl("resetBalAll", NumberUtil.displayCurrency(amount, ess)));
-			}
-			else if (args[1].contentEquals("*"))
-			{
-				server.broadcastMessage(tl("resetBal", NumberUtil.displayCurrency(amount, ess)));
+				final User player = ess.getUser(sUser);
+				switch (cmd)
+				{
+				case GIVE:
+					player.giveMoney(amount);
+					break;
+
+				case TAKE:
+					if (player.canAfford(amount, false))
+					{
+						player.takeMoney(amount);
+					}					
+					break;
+
+				case RESET:
+					player.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
+					break;
+				}
 			}
 		}
-	}
-
-	@Override
-	protected void updatePlayer(final Server server, final CommandSource sender, final User player, final String[] args) throws NotEnoughArgumentsException, ChargeException, MaxMoneyException
-	{
-		switch (cmd)
+		else if (args[1].contentEquals("*"))
 		{
-		case GIVE:
-			player.giveMoney(amount, sender);
-			break;
-
-		case TAKE:
-			take(amount, player, sender);
-			break;
-
-		case RESET:
-		case SET:
-			set(amount, player, sender);
-			break;
-		}
-	}
-
-	private void take(BigDecimal amount, final User player, final CommandSource sender) throws ChargeException
-	{
-		BigDecimal money = player.getMoney();
-		BigDecimal minBalance = ess.getSettings().getMinMoney();
-		if (money.subtract(amount).compareTo(minBalance) > 0)
-		{
-			player.takeMoney(amount, sender);
-		}
-		else if (sender == null)
-		{
-			try
+			for (Player onlinePlayer : server.getOnlinePlayers())
 			{
-				player.setMoney(minBalance);
+				final User player = ess.getUser(onlinePlayer);
+				switch (cmd)
+				{
+				case GIVE:
+					player.giveMoney(amount);
+					break;
+
+				case TAKE:
+					if (!player.canAfford(amount, false))
+					{
+						throw new Exception(_("notEnoughMoney"));
+					}
+					player.takeMoney(amount);
+					break;
+
+				case RESET:
+					player.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
+					break;
+				}
 			}
-			catch (MaxMoneyException ex)
-			{
-				// Take shouldn't be able to throw a max money exception
-			}
-			player.sendMessage(tl("takenFromAccount", NumberUtil.displayCurrency(player.getMoney(), ess)));
 		}
 		else
 		{
-			throw new ChargeException(tl("insufficientFunds"));
-		}
-	}
+			final User player = getPlayer(server, args, 1, true);
+			switch (cmd)
+			{
+			case GIVE:
+				player.giveMoney(amount, sender);
+				break;
 
-	private void set(BigDecimal amount, final User player, final CommandSource sender) throws MaxMoneyException
-	{
-		BigDecimal minBalance = ess.getSettings().getMinMoney();
-		BigDecimal maxBalance = ess.getSettings().getMaxMoney();
-		boolean underMinimum = (amount.compareTo(minBalance) < 0);
-		boolean aboveMax = (amount.compareTo(maxBalance) > 0);
-		player.setMoney(underMinimum ? minBalance : aboveMax ? maxBalance : amount);
-		player.sendMessage(tl("setBal", NumberUtil.displayCurrency(player.getMoney(), ess)));
-		if (sender != null)
-		{
-			sender.sendMessage(tl("setBalOthers", player.getDisplayName(), NumberUtil.displayCurrency(player.getMoney(), ess)));
+			case TAKE:
+				if (!player.canAfford(amount, false))
+				{
+					throw new Exception(_("notEnoughMoney"));
+				}
+				player.takeMoney(amount, sender);
+				break;
+
+			case RESET:
+				player.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
+				break;
+			}
 		}
 	}
 
 
 	private enum EcoCommands
 	{
-		GIVE, TAKE, SET, RESET
+		GIVE, TAKE, RESET
 	}
-}
+}

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

@@ -1,15 +1,13 @@
 package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.Enchantments;
-import static com.earth2me.essentials.I18n.tl;
-import com.earth2me.essentials.MetaItemStack;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.utils.StringUtil;
+import com.earth2me.essentials.Util;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
@@ -26,10 +24,10 @@ public class Commandenchant extends EssentialsCommand
 	@Override
 	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		final ItemStack stack = user.getBase().getItemInHand();
-		if (stack == null || stack.getType() == Material.AIR)
+		final ItemStack stack = user.getItemInHand();
+		if (stack == null)
 		{
-			throw new Exception(tl("nothingInHand"));
+			throw new Exception(_("nothingInHand"));
 		}
 		if (args.length == 0)
 		{
@@ -37,15 +35,14 @@ public class Commandenchant extends EssentialsCommand
 			for (Map.Entry<String, Enchantment> entry : Enchantments.entrySet())
 			{
 				final String enchantmentName = entry.getValue().getName().toLowerCase(Locale.ENGLISH);
-				if (enchantmentslist.contains(enchantmentName) || (user.isAuthorized("essentials.enchantments." + enchantmentName) && entry.getValue().canEnchantItem(stack)))
+				if (enchantmentslist.contains(enchantmentName) || user.isAuthorized("essentials.enchant." + enchantmentName))
 				{
 					enchantmentslist.add(entry.getKey());
 					//enchantmentslist.add(enchantmentName);
 				}
 			}
-			throw new NotEnoughArgumentsException(tl("enchantments", StringUtil.joinList(enchantmentslist.toArray())));
+			throw new NotEnoughArgumentsException(_("enchantments", Util.joinList(enchantmentslist.toArray())));
 		}
-
 		int level = -1;
 		if (args.length > 1)
 		{
@@ -58,23 +55,45 @@ public class Commandenchant extends EssentialsCommand
 				level = -1;
 			}
 		}
-
-		final boolean allowUnsafe = ess.getSettings().allowUnsafeEnchantments() && user.isAuthorized("essentials.enchantments.allowunsafe");
-		
-		final MetaItemStack metaStack = new MetaItemStack(stack);
-		final Enchantment enchantment = metaStack.getEnchantment(user, args[0]);
-		metaStack.addEnchantment(user.getSource(), allowUnsafe, enchantment, level);
-		user.getBase().getInventory().setItemInHand(metaStack.getItemStack());
-		
-		user.getBase().updateInventory();
-		final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
+		final Enchantment enchantment = getEnchantment(args[0], user);
+		if (level < 0 || level > enchantment.getMaxLevel())
+		{
+			level = enchantment.getMaxLevel();
+		}
 		if (level == 0)
 		{
-			user.sendMessage(tl("enchantmentRemoved", enchantmentName.replace('_', ' ')));
+			stack.removeEnchantment(enchantment);
 		}
 		else
 		{
-			user.sendMessage(tl("enchantmentApplied", enchantmentName.replace('_', ' ')));
+			stack.addEnchantment(enchantment, level);
+		}
+		user.getInventory().setItemInHand(stack);
+		user.updateInventory();
+		final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
+		if (level == 0)
+		{
+			user.sendMessage(_("enchantmentRemoved", enchantmentName.replace('_', ' ')));
+		}
+		else
+		{
+			user.sendMessage(_("enchantmentApplied", enchantmentName.replace('_', ' ')));
 		}
 	}
+
+	public static Enchantment getEnchantment(final String name, final User user) throws Exception
+	{
+
+		final Enchantment enchantment = Enchantments.getByName(name);
+		if (enchantment == null)
+		{
+			throw new Exception(_("enchantmentNotFound"));
+		}
+		final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
+		if (user != null && !user.isAuthorized("essentials.enchant." + enchantmentName))
+		{
+			throw new Exception(_("enchantmentPerm", enchantmentName));
+		}
+		return enchantment;
+	}
 }

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

@@ -13,18 +13,16 @@ public class Commandenderchest extends EssentialsCommand
 
 	@Override
 	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
-	{
+	{		
 		if (args.length > 0 && user.isAuthorized("essentials.enderchest.others"))
 		{
-			final User invUser = getPlayer(server, user, args, 0);
-			user.getBase().closeInventory();
-			user.getBase().openInventory(invUser.getBase().getEnderChest());
+			final User invUser = getPlayer(server, args, 0);
+			user.openInventory(invUser.getEnderChest());
 			user.setEnderSee(true);
 		}
 		else
 		{
-			user.getBase().closeInventory();
-			user.getBase().openInventory(user.getBase().getEnderChest());
+			user.openInventory(user.getEnderChest());
 			user.setEnderSee(false);
 		}