Merge branch 'master' into release

Removed warning for an older bukkit version.

.gitignore

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

.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=2bd2dd75
+build.xml.script.CRC32=7a797370
+build.xml.stylesheet.CRC32=28e38971@1.43.1.45
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=2bd2dd75
+nbproject/build-impl.xml.script.CRC32=769e541b
+nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45

BuildAll/nbproject/project.properties

@@ -0,0 +1,99 @@
+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=Paul
+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=false
+javac.classpath=\
+    ${reference.Essentials.jar}:\
+    ${reference.EssentialsChat.jar}:\
+    ${reference.EssentialsProtect.jar}:\
+    ${reference.EssentialsPermissionsCommands.jar}:\
+    ${reference.EssentialsSpawn.jar}:\
+    ${reference.EssentialsGeoIP.jar}:\
+    ${reference.EssentialsXMPP.jar}:\
+    ${reference.EssentialsGroupBridge.jar}:\
+    ${reference.EssentialsGroupManager.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${libs.junit.classpath}:\
+    ${libs.junit_4.classpath}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+project.Essentials=../Essentials
+project.EssentialsChat=../EssentialsChat
+project.EssentialsGeoIP=../EssentialsGeoIP
+project.EssentialsGroupBridge=../EssentialsGroupBridge
+project.EssentialsGroupManager=../EssentialsGroupManager
+project.EssentialsPermissionsCommands=../EssentialsPermissionsCommands
+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.EssentialsPermissionsCommands.jar=${project.EssentialsPermissionsCommands}/dist/EssentialsPermissionsCommands.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>EssentialsPermissionsCommands</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/.gitignore

@@ -0,0 +1,7 @@
+# NetBeans cruft
+/build
+/dist
+/nbproject/private
+
+# Mac cruft
+.DS_Store

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=4b596d89
+nbproject/build-impl.xml.script.CRC32=4926001b
+nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
+nbproject/profiler-build-impl.xml.data.CRC32=ab78ce15
+nbproject/profiler-build-impl.xml.script.CRC32=abda56ed
+nbproject/profiler-build-impl.xml.stylesheet.CRC32=f10cf54c@1.11.1

Essentials/nbproject/pmd.settings

@@ -0,0 +1 @@
+DoNotUseThreads

Essentials/nbproject/project.properties

@@ -0,0 +1,84 @@
+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=Essentials
+application.vendor=Paul
+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.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
+file.reference.iCo4.jar=../lib/iCo4.jar
+file.reference.iCo5.jar=../lib/iCo5.jar
+file.reference.junit-4.5.jar=..\\lib\\junit_4\\junit-4.5.jar
+file.reference.Permissions3.jar=../lib/Permissions3.jar
+file.reference.PermissionsEx.jar=../lib/PermissionsEx.jar
+includes=**
+jar.compress=false
+javac.classpath=\
+    ${file.reference.Permissions3.jar}:\
+    ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\
+    ${file.reference.iCo4.jar}:\
+    ${file.reference.iCo5.jar}:\
+    ${file.reference.BOSEconomy7.jar}:\
+    ${file.reference.PermissionsEx.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${file.reference.junit-4.5.jar}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+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,19 @@
+<?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"/>
+    </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

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

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

@@ -1,64 +1,35 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import net.ess3.api.IEssentials;
-import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
+import org.bukkit.craftbukkit.CraftServer;
 
+public class Backup implements Runnable {
+	private static final Logger logger = Logger.getLogger("Minecraft");
+	private final CraftServer server;
+	private final IEssentials ess;
+	private boolean running = false;
+	private int taskId = -1;
+	private boolean active = false;
 
-public class Backup implements Runnable
-{
-	private static final Logger LOGGER = Logger.getLogger("Essentials");
-	private transient final Server server;
-	private transient final IEssentials ess;
-	private transient boolean running = false;
-	private transient int taskId = -1;
-	private transient boolean active = false;
-
-	public Backup(final IEssentials ess)
-	{
+	public Backup(IEssentials ess) {
 		this.ess = ess;
-		server = ess.getServer();
-		if (!ess.getOnlinePlayers().isEmpty())
-		{
-			ess.runTaskAsynchronously(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					startTask();
-				}
-			});
+		server = (CraftServer)ess.getServer();
+		if (server.getOnlinePlayers().length > 0) {
+			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()
-	{
-		if (!running)
-		{
-			final long interval = ess.getSettings().getBackupInterval() * 1200; // minutes -> ticks
-			if (interval < 1200)
-			{
+	
+	private void startTask() {
+		if (!running) {
+			long interval = ess.getSettings().getBackupInterval()*1200; // minutes -> ticks
+			if (interval < 1200) {
 				return;
 			}
 			taskId = ess.scheduleSyncRepeatingTask(this, interval, interval);
@@ -66,103 +37,48 @@ public class Backup implements Runnable
 		}
 	}
 
-	@Override
-	public void run()
-	{
-		if (active)
-		{
-			return;
-		}
+	public void run() {
+		if (active) return;
 		active = true;
 		final String command = ess.getSettings().getBackupCommand();
-		if (command == null || "".equals(command))
-		{
+		if (command == null || "".equals(command)) {
 			return;
 		}
-		if ("save-all".equalsIgnoreCase(command))
-		{
-			final CommandSender cs = server.getConsoleSender();
-			server.dispatchCommand(cs, "save-all");
-			active = false;
-			return;
-		}
-		LOGGER.log(Level.INFO, tl("backupStarted"));
-		final CommandSender cs = server.getConsoleSender();
+		logger.log(Level.INFO, Util.i18n("backupStarted"));
+		final CommandSender cs = server.getServer().console;
 		server.dispatchCommand(cs, "save-all");
 		server.dispatchCommand(cs, "save-off");
+		
+		ess.scheduleAsyncDelayedTask(
+			new Runnable() {
 
-		ess.runTaskAsynchronously(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				try
-				{
-					final ProcessBuilder childBuilder = new ProcessBuilder(command);
-					childBuilder.redirectErrorStream(true);
-					childBuilder.directory(ess.getDataFolder().getParentFile().getParentFile());
-					final Process child = childBuilder.start();
-					ess.runTaskAsynchronously(new Runnable()
-					{
-						@Override
-						public void run()
-						{
-							try
-							{
-								final BufferedReader reader = new BufferedReader(new InputStreamReader(child.getInputStream()));
-								try
-								{
-									String line;
-									do
-									{
-										line = reader.readLine();
-										if (line != null)
-										{
-											LOGGER.log(Level.INFO, line);
-										}
-									}
-									while (line != null);
-								}
-								finally
-								{
-									reader.close();
-								}
-							}
-							catch (IOException ex)
-							{
-								LOGGER.log(Level.SEVERE, null, ex);
-							}
-						}
-					});
+			public void run() {
+				try {
+					Process child = Runtime.getRuntime().exec(command);
 					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) {
+					logger.log(Level.SEVERE, null, ex);
+				} catch (IOException ex) {
+					logger.log(Level.SEVERE, null, ex);
+				} finally {
+					ess.scheduleSyncDelayedTask(
+						new Runnable() {
+
+						public void run() {
 							server.dispatchCommand(cs, "save-on");
-							if (ess.getOnlinePlayers().isEmpty())
-							{
-								stopTask();
+							if (server.getOnlinePlayers().length == 0) {
+								running = false;
+								if (taskId != -1) {
+									server.getScheduler().cancelTask(taskId);
+								}
 							}
 							active = false;
-							LOGGER.log(Level.INFO, tl("backupFinished"));
+							logger.log(Level.INFO, Util.i18n("backupFinished"));
 						}
-					}
-					ess.scheduleSyncDelayedTask(new BackupEnableSaveTask());
+					});
 				}
 			}
 		});
 	}
+
 }

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

@@ -0,0 +1,157 @@
+package com.earth2me.essentials;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import net.minecraft.server.ServerConfigurationManager;
+import org.bukkit.craftbukkit.CraftServer;
+
+
+public class BanWorkaround implements IConf
+{
+	private transient final IEssentials ess;
+	private transient final ServerConfigurationManager scm;
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+	private transient final Set<String> bans = new HashSet<String>();
+	private transient final Set<String> bannedIps = new HashSet<String>();
+
+	public BanWorkaround(final IEssentials ess)
+	{
+		this.ess = ess;
+		this.scm = ((CraftServer)ess.getServer()).getHandle();
+	}
+	
+	public void banByName(final String name)
+	{
+		scm.a(name);
+		reloadConfig();
+	}
+	
+	public void unbanByName(String name)
+	{
+		scm.b(name);
+		reloadConfig();
+	}
+	
+	public void banByIp(final String ip)
+	{
+		scm.c(ip);
+		reloadConfig();
+	}
+	
+	public void unbanByIp(final String ip)
+	{
+		scm.d(ip);
+		reloadConfig();
+	}
+	
+	public boolean isNameBanned(final String name)
+	{
+		return bans.contains(name.toLowerCase());
+	}
+	
+	public boolean isIpBanned(final String ip)
+	{
+		return bannedIps.contains(ip.toLowerCase());
+	}
+	
+	public void reloadConfig()
+	{
+		//I don't like this but it needs to be done until CB fixors
+		final File file = new File(ess.getDataFolder().getParentFile().getParentFile(), "banned-players.txt");
+		try
+		{
+			if (!file.exists())
+			{
+				throw new FileNotFoundException(Util.i18n("bannedPlayersFileNotFound"));
+			}
+
+			final BufferedReader bufferedReader = new BufferedReader(new FileReader(file));
+			try
+			{
+				bans.clear();
+				while (bufferedReader.ready())
+				{
+
+					final String line = bufferedReader.readLine().trim().toLowerCase();
+					if (line.length() > 0 && line.charAt(0) == '#')
+					{
+						continue;
+					}
+					bans.add(line);
+
+				}
+			}
+			catch (IOException io)
+			{
+				LOGGER.log(Level.SEVERE, Util.i18n("bannedPlayersFileError"), io);
+			}
+			finally
+			{
+				try
+				{
+					bufferedReader.close();
+				}
+				catch (IOException ex)
+				{
+					LOGGER.log(Level.SEVERE, Util.i18n("bannedPlayersFileError"), ex);
+				}
+			}
+		}
+		catch (FileNotFoundException ex)
+		{
+			LOGGER.log(Level.SEVERE, Util.i18n("bannedPlayersFileError"), ex);
+		}
+
+		final File ipFile = new File(ess.getDataFolder().getParentFile().getParentFile(), "banned-ips.txt");
+		try
+		{
+			if (!ipFile.exists())
+			{
+				throw new FileNotFoundException(Util.i18n("bannedIpsFileNotFound"));
+			}
+
+			final BufferedReader bufferedReader = new BufferedReader(new FileReader(ipFile));
+			try
+			{
+				bannedIps.clear();
+				while (bufferedReader.ready())
+				{
+
+					final String line = bufferedReader.readLine().trim().toLowerCase();
+					if (line.length() > 0 && line.charAt(0) == '#')
+					{
+						continue;
+					}
+					bannedIps.add(line);
+
+				}
+			}
+			catch (IOException io)
+			{
+				LOGGER.log(Level.SEVERE, Util.i18n("bannedIpsFileError"), io);
+			}
+			finally
+			{
+				try
+				{
+					bufferedReader.close();
+				}
+				catch (IOException ex)
+				{
+					LOGGER.log(Level.SEVERE, Util.i18n("bannedIpsFileError"), ex);
+				}
+			}
+		}
+		catch (FileNotFoundException ex)
+		{
+			LOGGER.log(Level.SEVERE, Util.i18n("bannedIpsFileError"), ex);
+		}
+	}
+}

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

@@ -0,0 +1,51 @@
+package com.earth2me.essentials;
+
+import org.bukkit.entity.Player;
+
+
+public class BukkitPermissionsHandler implements IPermissionsHandler
+{
+	public String getGroup(Player base)
+	{
+		return "default";
+	}
+
+	public boolean canBuild(Player base, String group)
+	{
+		return true;
+	}
+
+	public boolean inGroup(Player base, String group)
+	{
+		return false;
+	}
+
+	public boolean hasPermission(Player base, String node)
+	{
+		if (base.hasPermission("-" + node))
+		{
+			return false;
+		}
+		final String[] parts = node.split("\\.");
+		final StringBuilder sb = new StringBuilder();
+		for (String part : parts)
+		{
+			if (base.hasPermission(sb.toString() + "*"))
+			{
+				return true;
+			}
+			sb.append(part).append(".");
+		}
+		return base.hasPermission(node);
+	}
+
+	public String getPrefix(Player base)
+	{
+		return "";
+	}
+
+	public String getSuffix(Player base)
+	{
+		return "";
+	}
+}

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/ConfigPermissionsHandler.java

@@ -0,0 +1,46 @@
+package com.earth2me.essentials;
+
+import org.bukkit.entity.Player;
+
+
+public class ConfigPermissionsHandler implements IPermissionsHandler
+{
+	private final transient IEssentials ess;
+
+	public ConfigPermissionsHandler(final IEssentials ess)
+	{
+		this.ess = ess;
+	}
+
+	public String getGroup(final Player base)
+	{
+		return "default";
+	}
+
+	public boolean canBuild(final Player base, final String group)
+	{
+		return true;
+	}
+
+	public boolean inGroup(final Player base, final String group)
+	{
+		return false;
+	}
+
+	public boolean hasPermission(final Player base, final String node)
+	{
+		final String[] cmds = node.split("\\.", 2);
+		return !ess.getSettings().isCommandRestricted(cmds[cmds.length - 1]) 
+				&& ess.getSettings().isPlayerCommand(cmds[cmds.length - 1]);
+	}
+
+	public String getPrefix(final Player base)
+	{
+		return "";
+	}
+
+	public String getSuffix(final Player base)
+	{
+		return "";
+	}
+}

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

@@ -2,37 +2,33 @@ package com.earth2me.essentials;
 
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
+import org.bukkit.craftbukkit.CraftServer;
 
-
-public final class Console implements IReplyTo
-{
-	private static final Console instance = new Console();
-	private CommandSource replyTo;
+public final class Console implements IReplyTo {
+	private static Console instance = new Console();
+	private CommandSender replyTo;
 	public final static String NAME = "Console";
-
-	private Console()
-	{
+	
+	private Console() {
+		
+	}
+	
+	public static CommandSender getCommandSender(Server server) throws Exception {
+		if (! (server instanceof CraftServer)) {
+			throw new Exception(Util.i18n("invalidServer"));
+		}
+		return ((CraftServer)server).getServer().console;
 	}
 
-	public static CommandSender getCommandSender(Server server) throws Exception
-	{
-		return server.getConsoleSender();
-	}
-
-	@Override
-	public void setReplyTo(CommandSource user)
-	{
+	public void setReplyTo(CommandSender user) {
 		replyTo = user;
 	}
 
-	@Override
-	public CommandSource getReplyTo()
-	{
+	public CommandSender getReplyTo() {
 		return replyTo;
 	}
-
-	public static Console getConsoleReplyTo()
-	{
+	
+	public static Console getConsoleReplyTo() {
 		return instance;
 	}
 }

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

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

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

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

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

@@ -1,213 +1,78 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
-import com.google.common.io.Files;
-import java.io.*;
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CoderResult;
-import java.util.*;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
 import 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;
-import org.bukkit.configuration.InvalidConfigurationException;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.enchantments.Enchantment;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.World;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.util.Vector;
+import org.bukkit.util.config.Configuration;
 
 
-public class EssentialsConf extends YamlConfiguration
+public class EssentialsConf extends Configuration
 {
-	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 static final Logger logger = Logger.getLogger("Minecraft");
+	private File configFile;
+	private String templateName = null;
 	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);
 
-	public EssentialsConf(final File configFile)
+	public EssentialsConf(File configFile)
 	{
-		super();
-		this.configFile = configFile.getAbsoluteFile();
-	}
-	private final byte[] bytebuffer = new byte[1024];
-
-	public synchronized void load()
-	{
-		if (pendingDiskWrites.get() != 0)
+		super(configFile);
+		this.configFile = configFile;
+		if (this.root == null)
 		{
-			LOGGER.log(Level.INFO, "File {0} not read, because it''s not yet written to disk.", configFile);
-			return;
+			this.root = new HashMap<String, Object>();
 		}
+	}
+
+	@Override
+	public void load()
+	{
+		configFile = configFile.getAbsoluteFile();
 		if (!configFile.getParentFile().exists())
 		{
 			if (!configFile.getParentFile().mkdirs())
 			{
-				LOGGER.log(Level.SEVERE, tl("failedToCreateConfig", configFile.toString()));
+				logger.log(Level.SEVERE, Util.format("failedToCreateConfig", configFile.toString()));
 			}
 		}
-		// This will delete files where the first character is 0. In most cases they are broken.
-		if (configFile.exists() && configFile.length() != 0)
-		{
-			try
-			{
-				final InputStream input = new FileInputStream(configFile);
-				try
-				{
-					if (input.read() == 0)
-					{
-						input.close();
-						configFile.delete();
-					}
-				}
-				catch (IOException ex)
-				{
-					LOGGER.log(Level.SEVERE, null, ex);
-				}
-				finally
-				{
-					try
-					{
-						input.close();
-					}
-					catch (IOException ex)
-					{
-						LOGGER.log(Level.SEVERE, null, ex);
-					}
-				}
-			}
-			catch (FileNotFoundException ex)
-			{
-				LOGGER.log(Level.SEVERE, null, ex);
-			}
-		}
-
 		if (!configFile.exists())
 		{
-			if (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, Util.format("creatingConfigFromTemplate", configFile.toString()));
 				createFromTemplate();
 			}
 			else
 			{
-				return;
-			}
-		}
-
-
-		try
-		{
-			final FileInputStream inputStream = new FileInputStream(configFile);
-			try
-			{
-				long startSize = configFile.length();
-				if (startSize > Integer.MAX_VALUE)
+				try
 				{
-					throw new InvalidConfigurationException("File too big");
-				}
-				ByteBuffer buffer = ByteBuffer.allocate((int)startSize);
-				int length;
-				while ((length = inputStream.read(bytebuffer)) != -1)
-				{
-					if (length > buffer.remaining())
+					logger.log(Level.INFO, Util.format("creatingEmptyConfig", configFile.toString()));
+					if (!configFile.createNewFile())
 					{
-						ByteBuffer resize = ByteBuffer.allocate(buffer.capacity() + length - buffer.remaining());
-						int resizePosition = buffer.position();
-						buffer.rewind();
-						resize.put(buffer);
-						resize.position(resizePosition);
-						buffer = resize;
-					}
-					buffer.put(bytebuffer, 0, length);
-				}
-				buffer.rewind();
-				final CharBuffer data = CharBuffer.allocate(buffer.capacity());
-				CharsetDecoder decoder = UTF8.newDecoder();
-				CoderResult result = decoder.decode(buffer, data, true);
-				if (result.isError())
-				{
-					buffer.rewind();
-					data.clear();
-					LOGGER.log(Level.INFO, "File " + configFile.getAbsolutePath().toString() + " is not utf-8 encoded, trying " + Charset.defaultCharset().displayName());
-					decoder = Charset.defaultCharset().newDecoder();
-					result = decoder.decode(buffer, data, true);
-					if (result.isError())
-					{
-						throw new InvalidConfigurationException("Invalid Characters in file " + configFile.getAbsolutePath().toString());
-					}
-					else
-					{
-						decoder.flush(data);
+						logger.log(Level.SEVERE, Util.format("failedToCreateConfig", configFile.toString()));
 					}
 				}
-				else
+				catch (IOException ex)
 				{
-					decoder.flush(data);
+					logger.log(Level.SEVERE, Util.format("failedToCreateConfig", configFile.toString()), ex);
 				}
-				final int end = data.position();
-				data.rewind();
-				super.loadFromString(data.subSequence(0, end).toString());
-			}
-			finally
-			{
-				inputStream.close();
 			}
 		}
-		catch (IOException ex)
+		super.load();
+		if (this.root == null)
 		{
-			LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
+			this.root = new HashMap<String, Object>();
 		}
-		catch (InvalidConfigurationException ex)
-		{
-			File broken = new File(configFile.getAbsolutePath() + ".broken." + System.currentTimeMillis());
-			configFile.renameTo(broken);
-			LOGGER.log(Level.SEVERE, "The file " + configFile.toString() + " is broken, it has been renamed to " + broken.toString(), ex.getCause());
-		}
-	}
-
-	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()
@@ -219,7 +84,7 @@ public class EssentialsConf extends YamlConfiguration
 			istr = resourceClass.getResourceAsStream(templateName);
 			if (istr == null)
 			{
-				LOGGER.log(Level.SEVERE, tl("couldNotFindTemplate", templateName));
+				logger.log(Level.SEVERE, Util.format("couldNotFindTemplate", templateName));
 				return;
 			}
 			ostr = new FileOutputStream(configFile);
@@ -234,7 +99,8 @@ public class EssentialsConf extends YamlConfiguration
 		}
 		catch (IOException ex)
 		{
-			LOGGER.log(Level.SEVERE, tl("failedToWriteConfig", configFile.toString()), ex);
+			logger.log(Level.SEVERE, Util.format("failedToWriteConfig", configFile.toString()), ex);
+			return;
 		}
 		finally
 		{
@@ -258,12 +124,12 @@ public class EssentialsConf extends YamlConfiguration
 			}
 			catch (IOException ex)
 			{
-				LOGGER.log(Level.SEVERE, tl("failedToCloseConfig", configFile.toString()), ex);
+				logger.log(Level.SEVERE, Util.format("failedToCloseConfig", configFile.toString()), ex);
 			}
 		}
 	}
 
-	public void setTemplateName(final String templateName)
+	public void setTemplateName(String templateName)
 	{
 		this.templateName = templateName;
 	}
@@ -273,587 +139,101 @@ public class EssentialsConf extends YamlConfiguration
 		return configFile;
 	}
 
-	public void setTemplateName(final String templateName, final Class<?> resClass)
+	public void setTemplateName(String templateName, Class<?> resClass)
 	{
 		this.templateName = templateName;
 		this.resourceClass = resClass;
 	}
 
-	public void startTransaction()
+	public boolean hasProperty(String path)
 	{
-		transaction.set(true);
+		return getProperty(path) != null;
 	}
 
-	public void stopTransaction()
+	public Location getLocation(String path, Server server)
 	{
-		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
-	{
-		final String worldString = (path == null ? "" : path + ".") + "world";
-		final String worldName = getString(worldString);
+		String worldName = getString((path != null ? path + "." : "") + "world");
 		if (worldName == null || worldName.isEmpty())
 		{
 			return null;
 		}
-		final World world = server.getWorld(worldName);
+		World world = server.getWorld(worldName);
 		if (world == null)
 		{
-			throw new InvalidWorldException(worldName);
+			return null;
 		}
 		return new Location(world,
-							getDouble((path == null ? "" : path + ".") + "x", 0),
-							getDouble((path == null ? "" : path + ".") + "y", 0),
-							getDouble((path == null ? "" : path + ".") + "z", 0),
-							(float)getDouble((path == null ? "" : path + ".") + "yaw", 0),
-							(float)getDouble((path == null ? "" : path + ".") + "pitch", 0));
+							getDouble((path != null ? path + "." : "") + "x", 0),
+							getDouble((path != null ? path + "." : "") + "y", 0),
+							getDouble((path != null ? path + "." : "") + "z", 0),
+							(float)getDouble((path != null ? path + "." : "") + "yaw", 0),
+							(float)getDouble((path != null ? path + "." : "") + "pitch", 0));
 	}
 
-	public void setProperty(final String path, final Location loc)
+	public void setProperty(String path, Location loc)
 	{
-		set((path == null ? "" : path + ".") + "world", loc.getWorld().getName());
-		set((path == null ? "" : path + ".") + "x", loc.getX());
-		set((path == null ? "" : path + ".") + "y", loc.getY());
-		set((path == null ? "" : path + ".") + "z", loc.getZ());
-		set((path == null ? "" : path + ".") + "yaw", loc.getYaw());
-		set((path == null ? "" : path + ".") + "pitch", loc.getPitch());
+		setProperty((path != null ? path + "." : "") + "world", loc.getWorld().getName());
+		setProperty((path != null ? path + "." : "") + "x", loc.getX());
+		setProperty((path != null ? path + "." : "") + "y", loc.getY());
+		setProperty((path != null ? path + "." : "") + "z", loc.getZ());
+		setProperty((path != null ? path + "." : "") + "yaw", loc.getYaw());
+		setProperty((path != null ? path + "." : "") + "pitch", loc.getPitch());
 	}
 
-	@Override
-	public ItemStack getItemStack(final String path)
+	public ItemStack getItemStack(String path)
 	{
-		final ItemStack stack = new ItemStack(
+		return new ItemStack(
 				Material.valueOf(getString(path + ".type", "AIR")),
 				getInt(path + ".amount", 1),
-				(short)getInt(path + ".damage", 0));
-		final ConfigurationSection enchants = getConfigurationSection(path + ".enchant");
-		if (enchants != null)
-		{
-			for (String enchant : enchants.getKeys(false))
-			{
-				final Enchantment enchantment = Enchantment.getByName(enchant.toUpperCase(Locale.ENGLISH));
-				if (enchantment == null)
-				{
-					continue;
-				}
-				final int level = getInt(path + ".enchant." + enchant, enchantment.getStartLevel());
-				stack.addUnsafeEnchantment(enchantment, level);
-			}
-		}
-		return stack;
-		/*
-		 * ,
-		 * (byte)getInt(path + ".data", 0)
-		 */
+				(short)getInt(path + ".damage", 0)/*,
+				(byte)getInt(path + ".data", 0)*/);
 	}
 
-	public void setProperty(final String path, final ItemStack stack)
+	public void setProperty(String path, ItemStack stack)
 	{
-		final Map<String, Object> map = new HashMap<String, Object>();
+		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("type", stack.getType().toString());
 		map.put("amount", stack.getAmount());
 		map.put("damage", stack.getDurability());
-		Map<Enchantment, Integer> enchantments = stack.getEnchantments();
-		if (!enchantments.isEmpty())
-		{
-			Map<String, Integer> enchant = new HashMap<String, Integer>();
-			for (Map.Entry<Enchantment, Integer> entry : enchantments.entrySet())
-			{
-				enchant.put(entry.getKey().getName().toLowerCase(Locale.ENGLISH), entry.getValue());
-			}
-			map.put("enchant", enchant);
-		}
 		// getData().getData() is broken
 		//map.put("data", stack.getDurability());
-		set(path, map);
+		setProperty(path, map);
 	}
 
-	public void setProperty(String path, List object)
+	public long getLong(String path, long def)
 	{
-		set(path, new ArrayList(object));
-	}
-
-	public void setProperty(String path, Map object)
-	{
-		set(path, new LinkedHashMap(object));
-	}
-
-	public Object getProperty(String path)
-	{
-		return get(path);
-	}
-
-	public void setProperty(final String path, final BigDecimal bigDecimal)
-	{
-		set(path, bigDecimal.toString());
-	}
-
-	public void setProperty(String path, Object object)
-	{
-		set(path, object);
-	}
-
-	public void removeProperty(String path)
-	{
-		set(path, null);
-	}
-
-	@Override
-	public synchronized Object get(String path)
-	{
-		return super.get(path);
-	}
-
-	@Override
-	public synchronized Object get(String path, Object def)
-	{
-		return super.get(path, def);
-	}
-
-	public synchronized BigDecimal getBigDecimal(final String path, final BigDecimal def)
-	{
-		final String input = super.getString(path);
-		return toBigDecimal(input, def);
-	}
-
-	public static BigDecimal toBigDecimal(final String input, final BigDecimal def)
-	{
-		if (input == null || input.isEmpty())
+		Number num;
+		try
+		{
+			num = (Number)getProperty(path);
+		}
+		catch(ClassCastException ex)
 		{
 			return def;
 		}
-		else
+		if (num == null)
 		{
-			try
-			{
-				return new BigDecimal(input, MathContext.DECIMAL128);
-			}
-			catch (NumberFormatException e)
-			{
-				return def;
-			}
-			catch (ArithmeticException e)
-			{
-				return def;
-			}
+			return def;
 		}
+		return num.longValue();
 	}
 
 	@Override
-	public synchronized boolean getBoolean(String path)
+	public double getDouble(String path, double def)
 	{
-		return super.getBoolean(path);
-	}
-
-	@Override
-	public synchronized boolean getBoolean(String path, boolean def)
-	{
-		return super.getBoolean(path, def);
-	}
-
-	@Override
-	public synchronized List<Boolean> getBooleanList(String path)
-	{
-		return super.getBooleanList(path);
-	}
-
-	@Override
-	public synchronized List<Byte> getByteList(String path)
-	{
-		return super.getByteList(path);
-	}
-
-	@Override
-	public synchronized List<Character> getCharacterList(String path)
-	{
-		return super.getCharacterList(path);
-	}
-
-	@Override
-	public synchronized ConfigurationSection getConfigurationSection(String path)
-	{
-		return super.getConfigurationSection(path);
-	}
-
-	@Override
-	public synchronized double getDouble(String path)
-	{
-		return super.getDouble(path);
-	}
-
-	@Override
-	public synchronized double getDouble(final String path, final double def)
-	{
-		return super.getDouble(path, def);
-	}
-
-	@Override
-	public synchronized List<Double> getDoubleList(String path)
-	{
-		return super.getDoubleList(path);
-	}
-
-	@Override
-	public synchronized List<Float> getFloatList(String path)
-	{
-		return super.getFloatList(path);
-	}
-
-	@Override
-	public synchronized int getInt(String path)
-	{
-		return super.getInt(path);
-	}
-
-	@Override
-	public synchronized int getInt(String path, int def)
-	{
-		return super.getInt(path, def);
-	}
-
-	@Override
-	public synchronized List<Integer> getIntegerList(String path)
-	{
-		return super.getIntegerList(path);
-	}
-
-	@Override
-	public synchronized ItemStack getItemStack(String path, ItemStack def)
-	{
-		return super.getItemStack(path, def);
-	}
-
-	@Override
-	public synchronized Set<String> getKeys(boolean deep)
-	{
-		return super.getKeys(deep);
-	}
-
-	@Override
-	public synchronized List<?> getList(String path)
-	{
-		return super.getList(path);
-	}
-
-	@Override
-	public synchronized List<?> getList(String path, List<?> def)
-	{
-		return super.getList(path, def);
-	}
-
-	@Override
-	public synchronized long getLong(String path)
-	{
-		return super.getLong(path);
-	}
-
-	@Override
-	public synchronized long getLong(final String path, final long def)
-	{
-		return super.getLong(path, def);
-	}
-
-	@Override
-	public synchronized List<Long> getLongList(String path)
-	{
-		return super.getLongList(path);
-	}
-
-	public synchronized Map<String, Object> getMap()
-	{
-		return map;
-	}
-
-	@Override
-	public synchronized List<Map<?, ?>> getMapList(String path)
-	{
-		return super.getMapList(path);
-	}
-
-	@Override
-	public synchronized OfflinePlayer getOfflinePlayer(String path)
-	{
-		return super.getOfflinePlayer(path);
-	}
-
-	@Override
-	public synchronized OfflinePlayer getOfflinePlayer(String path, OfflinePlayer def)
-	{
-		return super.getOfflinePlayer(path, def);
-	}
-
-	@Override
-	public synchronized List<Short> getShortList(String path)
-	{
-		return super.getShortList(path);
-	}
-
-	@Override
-	public synchronized String getString(String path)
-	{
-		return super.getString(path);
-	}
-
-	@Override
-	public synchronized String getString(String path, String def)
-	{
-		return super.getString(path, def);
-	}
-
-	@Override
-	public synchronized List<String> getStringList(String path)
-	{
-		return super.getStringList(path);
-	}
-
-	@Override
-	public synchronized Map<String, Object> getValues(boolean deep)
-	{
-		return super.getValues(deep);
-	}
-
-	@Override
-	public synchronized Vector getVector(String path)
-	{
-		return super.getVector(path);
-	}
-
-	@Override
-	public synchronized Vector getVector(String path, Vector def)
-	{
-		return super.getVector(path, def);
-	}
-
-	@Override
-	public synchronized boolean isBoolean(String path)
-	{
-		return super.isBoolean(path);
-	}
-
-	@Override
-	public synchronized boolean isConfigurationSection(String path)
-	{
-		return super.isConfigurationSection(path);
-	}
-
-	@Override
-	public synchronized boolean isDouble(String path)
-	{
-		return super.isDouble(path);
-	}
-
-	@Override
-	public synchronized boolean isInt(String path)
-	{
-		return super.isInt(path);
-	}
-
-	@Override
-	public synchronized boolean isItemStack(String path)
-	{
-		return super.isItemStack(path);
-	}
-
-	@Override
-	public synchronized boolean isList(String path)
-	{
-		return super.isList(path);
-	}
-
-	@Override
-	public synchronized boolean isLong(String path)
-	{
-		return super.isLong(path);
-	}
-
-	@Override
-	public synchronized boolean isOfflinePlayer(String path)
-	{
-		return super.isOfflinePlayer(path);
-	}
-
-	@Override
-	public synchronized boolean isSet(String path)
-	{
-		return super.isSet(path);
-	}
-
-	@Override
-	public synchronized boolean isString(String path)
-	{
-		return super.isString(path);
-	}
-
-	@Override
-	public synchronized boolean isVector(String path)
-	{
-		return super.isVector(path);
-	}
-
-	@Override
-	public synchronized void set(String path, Object value)
-	{
-		super.set(path, value);
+		Number num;
+		try
+		{
+			num = (Number)getProperty(path);
+		}
+		catch(ClassCastException ex)
+		{
+			return def;
+		}
+		if (num == null)
+		{
+			return def;
+		}
+		return num.doubleValue();
 	}
 }

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

@@ -1,25 +1,20 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.regex.Pattern;
-import net.ess3.api.IEssentials;
-import org.bukkit.Material;
-import org.bukkit.entity.*;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.*;
-import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityCombustEvent;
+import org.bukkit.event.entity.EntityDamageByBlockEvent;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageByProjectileEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityDeathEvent;
+import org.bukkit.event.entity.EntityListener;
 import org.bukkit.inventory.ItemStack;
 
 
-public class EssentialsEntityListener implements Listener
+public class EssentialsEntityListener extends EntityListener
 {
-	private static final Logger LOGGER = Logger.getLogger("Essentials");
-	private static final transient Pattern powertoolPlayer = Pattern.compile("\\{player\\}");
 	private final IEssentials ess;
 
 	public EssentialsEntityListener(IEssentials ess)
@@ -27,199 +22,60 @@ 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)
+	@Override
+	public void onEntityDamage(EntityDamageEvent event)
 	{
-		final Entity eAttack = event.getDamager();
-		final Entity eDefend = event.getEntity();
-		if (eAttack instanceof Player)
+		if (event instanceof EntityDamageByEntityEvent)
 		{
-			final User attacker = ess.getUser((Player)eAttack);
-			if (eDefend instanceof Player)
+			EntityDamageByEntityEvent edEvent = (EntityDamageByEntityEvent)event;
+			Entity eAttack = edEvent.getDamager();
+			Entity eDefend = edEvent.getEntity();
+			if (eDefend instanceof Player && eAttack instanceof Player)
 			{
-				onPlayerVsPlayerDamage(event, (Player)eDefend, attacker);
-			}
-			else if (eDefend instanceof Ageable)
-			{
-				final ItemStack hand = attacker.getBase().getItemInHand();
-				if (hand != null && hand.getType() == Material.MILK_BUCKET)
+				User defender = ess.getUser(eDefend);
+				User attacker = ess.getUser(eAttack);
+				ItemStack is = attacker.getItemInHand();
+				String command = attacker.getPowertool(is);
+				if (command != null && !command.isEmpty())
 				{
-					((Ageable)eDefend).setBaby();
-					hand.setType(Material.BUCKET);
-					attacker.getBase().setItemInHand(hand);
-					attacker.getBase().updateInventory();
-					event.setCancelled(true);
-				}
-			}
-			attacker.updateActivity(true);
-		}
-		else if (eAttack instanceof Projectile && eDefend instanceof Player)
-		{
-			final Projectile projectile = (Projectile)event.getDamager();
-			//This should return a ProjectileSource on 1.7.3 beta +
-			final Object shooter = projectile.getShooter();
-			if (shooter instanceof Player)
-			{
-				final User attacker = ess.getUser((Player)shooter);
-				onPlayerVsPlayerDamage(event, (Player)eDefend, attacker);
-				attacker.updateActivity(true);
-			}
-		}
-	}
-
-	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());
-
+					attacker.getServer().dispatchCommand(attacker, command.replaceAll("\\{player\\}", defender.getName()));
 					event.setCancelled(true);
 					return;
 				}
 			}
 		}
-	}
+		if (event instanceof EntityDamageEvent || event instanceof EntityDamageByBlockEvent || event instanceof EntityDamageByProjectileEvent)
+		{
 
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onEntityDamage(final EntityDamageEvent event)
-	{
-		if (event.getEntity() instanceof Player && ess.getUser((Player)event.getEntity()).isGodModeEnabled())
-		{
-			final Player player = (Player)event.getEntity();
-			player.setFireTicks(0);
-			player.setRemainingAir(player.getMaximumAir());
-			event.setCancelled(true);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onEntityCombust(final EntityCombustEvent event)
-	{
-		if (event.getEntity() instanceof Player && ess.getUser((Player)event.getEntity()).isGodModeEnabled())
-		{
-			event.setCancelled(true);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onPlayerDeathEvent(final PlayerDeathEvent event)
-	{
-		final User user = ess.getUser(event.getEntity());
-		if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back"))
-		{
-			user.setLastLocation();
-			user.sendMessage(tl("backAfterDeath"));
-		}
-		if (!ess.getSettings().areDeathMessagesEnabled())
-		{
-			event.setDeathMessage("");
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW)
-	public void onPlayerDeathExpEvent(final PlayerDeathEvent event)
-	{
-		final User user = ess.getUser(event.getEntity());
-		if (user.isAuthorized("essentials.keepxp"))
-		{
-			event.setKeepLevel(true);
-			event.setDroppedExp(0);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onFoodLevelChange(final FoodLevelChangeEvent event)
-	{
-		if (event.getEntity() instanceof Player)
-		{
-			final User user = ess.getUser((Player)event.getEntity());
-			if (user.isGodModeEnabled())
+			if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
 			{
-				if (user.isGodModeEnabledRaw())
-				{
-					user.getBase().setFoodLevel(20);
-					user.getBase().setSaturation(10);
-				}
+				CraftPlayer player = (CraftPlayer)event.getEntity();
+				player.getHandle().fireTicks = 0;
+				player.setRemainingAir(player.getMaximumAir());
 				event.setCancelled(true);
 			}
 		}
 	}
 
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onEntityRegainHealth(final EntityRegainHealthEvent event)
+	@Override
+	public void onEntityCombust(EntityCombustEvent event)
 	{
-		if (event.getRegainReason() == RegainReason.SATIATED && event.getEntity() instanceof Player
-			&& ess.getUser((Player)event.getEntity()).isAfk() && ess.getSettings().getFreezeAfkPlayers())
+		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
 		{
 			event.setCancelled(true);
 		}
 	}
 
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onPotionSplashEvent(final PotionSplashEvent event)
-	{
-		for (LivingEntity entity : event.getAffectedEntities())
-		{
-			if (entity instanceof Player && ess.getUser((Player)entity).isGodModeEnabled())
-			{
-				event.setIntensity(entity, 0d);
-			}
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onEntityShootBow(EntityShootBowEvent event)
+	@Override
+	public void onEntityDeath(EntityDeathEvent event)
 	{
 		if (event.getEntity() instanceof Player)
 		{
-			final User user = ess.getUser((Player)event.getEntity());
-			if (user.isAfk())
+			User user = ess.getUser(event.getEntity());
+			if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back"))
 			{
-				user.updateActivity(true);
+				user.setLastLocation();
+				user.sendMessage(Util.i18n("backAfterDeath"));
 			}
 		}
 	}

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

@@ -0,0 +1,128 @@
+package com.earth2me.essentials;
+
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+
+class EssentialsErrorHandler extends Handler
+{
+	private final Map<BigInteger, String> errors = new HashMap<BigInteger, String>();
+	private final List<LogRecord> records = new LinkedList<LogRecord>();
+
+	public EssentialsErrorHandler()
+	{
+	}
+
+	@Override
+	public void publish(LogRecord lr)
+	{
+		if (lr.getThrown() == null || lr.getLevel().intValue() < Level.WARNING.intValue())
+		{
+			return;
+		}
+		synchronized (records)
+		{
+			records.add(lr);
+		}
+	}
+
+	@Override
+	public void flush()
+	{
+		synchronized (records)
+		{
+			sortRecords();
+		}
+	}
+
+	@Override
+	public void close() throws SecurityException
+	{
+		synchronized (records)
+		{
+			sortRecords();
+		}
+	}
+
+	private void sortRecords()
+	{
+		for (LogRecord lr : records)
+		{
+			try
+			{
+				if (lr.getThrown() == null)
+				{
+					return;
+				}
+				Throwable tr = lr.getThrown();
+				StackTraceElement[] elements = tr.getStackTrace();
+				if (elements == null || elements.length <= 0)
+				{
+					return;
+				}
+				boolean essentialsFound = false;
+				for (StackTraceElement stackTraceElement : elements)
+				{
+					if (stackTraceElement.getClassName().contains("com.earth2me.essentials"))
+					{
+						essentialsFound = true;
+						break;
+					}
+				}
+				if (!essentialsFound && tr.getCause() != null)
+				{
+					Throwable cause = tr.getCause();
+					StackTraceElement[] elements2 = cause.getStackTrace();
+					if (elements2 != null)
+					{
+						for (StackTraceElement stackTraceElement : elements2)
+						{
+							if (stackTraceElement.getClassName().contains("com.earth2me.essentials"))
+							{
+								essentialsFound = true;
+								break;
+							}
+						}
+					}
+				}
+				StringBuilder sb = new StringBuilder();
+				sb.append("[").append(lr.getLevel().getName()).append("] ").append(lr.getMessage()).append("\n");
+				sb.append(tr.getMessage()).append("\n");
+				for (StackTraceElement stackTraceElement : tr.getStackTrace())
+				{
+					sb.append(stackTraceElement.toString()).append("\n");
+				}
+				if (tr.getCause() != null && tr.getCause().getStackTrace() != null)
+				{
+					sb.append(tr.getCause().getMessage()).append("\n");
+					for (StackTraceElement stackTraceElement : tr.getCause().getStackTrace())
+					{
+						sb.append(stackTraceElement.toString()).append("\n");
+					}
+				}
+				String errorReport = sb.toString();
+				byte[] bytesOfMessage = errorReport.getBytes("UTF-8");
+				MessageDigest md = MessageDigest.getInstance("MD5");
+				BigInteger bi = new BigInteger(md.digest(bytesOfMessage));
+				errors.put(bi, errorReport);
+			}
+			catch (Throwable t)
+			{
+				//Ignore all exceptions inside the exception handler
+			}
+		}
+		records.clear();
+	}
+
+	Map<BigInteger, String> getErrors()
+	{
+		return errors;
+	}
+}

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

@@ -1,65 +1,81 @@
 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;
+import java.util.logging.Logger;
 import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.event.server.PluginEnableEvent;
+import org.bukkit.event.server.ServerListener;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginManager;
 
 
-public class EssentialsPluginListener implements Listener, IConf
+public class EssentialsPluginListener extends ServerListener
 {
 	private final transient IEssentials ess;
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 
 	public EssentialsPluginListener(final IEssentials ess)
 	{
 		this.ess = ess;
 	}
 
-	@EventHandler(priority = EventPriority.MONITOR)
+	@Override
 	public void onPluginEnable(final PluginEnableEvent event)
 	{
-		if (event.getPlugin().getName().equals("EssentialsChat"))
+		checkPermissions();
+		if (!ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().setMethod(event.getPlugin()))
 		{
-			ess.getSettings().setEssentialsChatActive(true);
-		}
-		ess.getPermissionsHandler().checkPermissions();
-		ess.getAlternativeCommandsHandler().addPlugin(event.getPlugin());
-		if (!Methods.hasMethod() && Methods.setMethod(ess.getServer().getPluginManager()))
-		{
-			ess.getLogger().log(Level.INFO, "Payment method found (" + Methods.getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
-		}
-	}
+			LOGGER.log(Level.INFO, "[Essentials] Payment method found (" + ess.getPaymentMethod().getMethod().getName() + " 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.getAlternativeCommandsHandler().removePlugin(event.getPlugin());
-		// Check to see if the plugin thats being disabled is the one we are using
-		if (ess.getPaymentMethod() != null && Methods.hasMethod() && Methods.checkDisabled(event.getPlugin()))
-		{
-			ess.getPaymentMethod().reset();
-			ess.getLogger().log(Level.INFO, "Payment method was disabled. No longer accepting payments.");
 		}
 	}
 
 	@Override
-	public void reloadConfig()
+	public void onPluginDisable(PluginDisableEvent event)
 	{
-		ess.getPermissionsHandler().setUseSuperperms(ess.getSettings().useBukkitPermissions());
-		ess.getPermissionsHandler().checkPermissions();
+		checkPermissions();
+		// Check to see if the plugin thats being disabled is the one we are using
+		if (ess.getPaymentMethod() != null && ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().checkDisabled(event.getPlugin()))
+		{
+			LOGGER.log(Level.INFO, "[Essentials] Payment method was disabled. No longer accepting payments.");
+		}
+	}
+	
+	private void checkPermissions()
+	{
+		final PluginManager pm = ess.getServer().getPluginManager();
+		final Plugin permissionsExPlugin = pm.getPlugin("PermissionsEx");
+
+		if (permissionsExPlugin == null || !permissionsExPlugin.isEnabled())
+		{
+			final Plugin permissionsPlugin = pm.getPlugin("Permissions");
+			if (permissionsPlugin == null || !permissionsPlugin.isEnabled())
+			{
+				if (ess.getSettings().useBukkitPermissions())
+				{
+					ess.setPermissionsHandler(new BukkitPermissionsHandler());
+				}
+				else
+				{
+					ess.setPermissionsHandler(new ConfigPermissionsHandler(ess));
+				}
+			}
+			else
+			{
+				if (permissionsPlugin.getDescription().getVersion().charAt(0) == '3')
+				{
+					ess.setPermissionsHandler(new Permissions3Handler(permissionsPlugin));
+				}
+				else
+				{
+					ess.setPermissionsHandler(new Permissions2Handler(permissionsPlugin));
+				}
+			}
+		}
+		else
+		{
+			ess.setPermissionsHandler(new PermissionsExHandler());
+		}
 	}
 }

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

@@ -1,125 +1,79 @@
 package com.earth2me.essentials;
 
+import java.io.File;
 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
+public class EssentialsTimer implements Runnable, IConf
 {
-	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 IEssentials ess;
+	private final Set<User> allUsers = new HashSet<User>(); 
 	
-	EssentialsTimer(final IEssentials ess)
+	EssentialsTimer(IEssentials ess)
 	{
 		this.ess = ess;
-		history.add(20d);
+		File userdir = new File(ess.getDataFolder(), "userdata");
+		if (!userdir.exists()) {
+			return;
+		}
+		for (String string : userdir.list())
+		{
+			if (!string.endsWith(".yml")) {
+				continue;
+			}
+			String name = string.substring(0, string.length()-4);
+			User u = ess.getUser(new OfflinePlayer(name, ess));
+			allUsers.add(u);
+		}
 	}
-	
-	@Override
+
 	public void run()
 	{
-		final long startTime = System.nanoTime();
-		final long currentTime = System.currentTimeMillis();
-		long timeSpent = (startTime - lastPoll) / 1000;
-		if (timeSpent == 0)
+		long currentTime = System.currentTimeMillis();
+		for (Player player : ess.getServer().getOnlinePlayers())
 		{
-			timeSpent = 1;
-		}
-		if (history.size() > 10)
-		{
-			history.remove();
-		}
-		double tps = tickInterval * 1000000.0 / timeSpent;
-		if (tps <= 21)
-		{
-			history.add(tps);
-		}
-		lastPoll = startTime;
-		int count = 0;
-		for (Player player : ess.getOnlinePlayers())
-		{
-			count++;
-			if (skip1 > 0)
-			{
-				skip1--;
-				continue;
-			}
-			if (count % 10 == 0)
-			{
-				if (System.nanoTime() - startTime > maxTime / 2)
-				{
-					skip1 = count - 1;
-					break;
-				}
-			}
-			try
-			{
-				final User user = ess.getUser(player);
-				onlineUsers.add(user.getBase().getUniqueId());
-				user.setLastOnlineActivity(currentTime);
-				user.checkActivity();
-			}
-			catch (Exception e)
-			{
-				ess.getLogger().log(Level.WARNING, "EssentialsTimer Error:", e);
-			}
+			User u = ess.getUser(player);
+			allUsers.add(u);
+			u.setLastActivity(currentTime);
 		}
 		
-		count = 0;
-		final Iterator<UUID> iterator = onlineUsers.iterator();
-		while (iterator.hasNext())
-		{
-			count++;
-			if (skip2 > 0)
-			{
-				skip2--;
-				continue;
+		for (User user: allUsers) {
+			if (user.getBanTimeout() > 0 && user.getBanTimeout() < currentTime) {
+				user.setBanTimeout(0);
+				ess.getBans().unbanByName(user.getName());
 			}
-			if (count % 10 == 0)
-			{
-				if (System.nanoTime() - startTime > maxTime)
+			if (user.getMuteTimeout() > 0 && user.getMuteTimeout() < currentTime && user.isMuted()) {
+				user.setMuteTimeout(0);
+				user.sendMessage(Util.i18n("canTalkAgain"));
+				user.setMuted(false);
+			}
+			if (user.getJailTimeout() > 0 && user.getJailTimeout() < currentTime && user.isJailed()) {
+				user.setJailTimeout(0);
+				user.setJailed(false);
+				user.sendMessage(Util.i18n("haveBeenReleased"));
+				user.setJail(null);
+				try
+				{
+					user.getTeleport().back();
+				}
+				catch (Exception ex)
 				{
-					skip2 = count - 1;
-					break;
 				}
 			}
-			final User user = ess.getUser(iterator.next());
-			if (user.getLastOnlineActivity() < currentTime && user.getLastOnlineActivity() > user.getLastLogout())
-			{
-				if (!user.isHidden()) {
-					user.setLastLogout(user.getLastOnlineActivity());
-				}
-				iterator.remove();
-				continue;
+			
+			if (user.getLastActivity() < currentTime && user.getLastActivity() > user.getLastLogout()) {
+				user.setLastLogout(user.getLastActivity());
 			}
-			user.checkMuteTimeout(currentTime);
-			user.checkJailTimeout(currentTime);
-			user.resetInvulnerabilityAfterTeleport();
 		}
 	}
-	
-	public double getAverageTPS()
+
+	public void reloadConfig()
 	{
-		double avg = 0;
-		for (Double f : history)
+		for (User user : allUsers)
 		{
-			if (f != null)
-			{
-				avg += f;
-			}
-		}		
-		return avg / history.size();
+			user.reloadConfig();
+		}
 	}
 }

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

@@ -0,0 +1,68 @@
+package com.earth2me.essentials;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.math.BigInteger;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+class EssentialsUpdateTimer implements Runnable
+{
+	private URL url;
+	private final Essentials ess;
+	private static final Logger logger = Logger.getLogger("Minecraft");
+	
+	public EssentialsUpdateTimer(Essentials ess)
+	{
+		this.ess = ess;
+		try
+		{
+			url = new URL("http://127.0.0.1:8080/check");
+		}
+		catch (MalformedURLException ex)
+		{
+			logger.log(Level.SEVERE, "Invalid url!", ex);
+		}
+	}
+
+	public void run()
+	{
+		try
+		{
+			StringBuilder sb = new StringBuilder();
+			sb.append("v=").append(URLEncoder.encode(ess.getDescription().getVersion(),"UTF-8"));
+			sb.append("&b=").append(URLEncoder.encode(ess.getServer().getVersion(),"UTF-8"));
+			sb.append("&jv=").append(URLEncoder.encode(System.getProperty("java.version"),"UTF-8"));
+			sb.append("&l=").append(URLEncoder.encode(Util.getCurrentLocale().toString(),"UTF-8"));
+			sb.append("&on=").append(URLEncoder.encode(System.getProperty("os.name"),"UTF-8"));
+			sb.append("&ov=").append(URLEncoder.encode(System.getProperty("os.version"),"UTF-8"));
+			for (BigInteger bigInteger : ess.getErrors().keySet())
+			{
+				sb.append("&e[]=").append(bigInteger.toString(36));
+			}
+			URLConnection conn = url.openConnection();
+			conn.setConnectTimeout(10000);
+			conn.setDoOutput(true);
+			conn.connect();
+			OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
+			wr.write(sb.toString());
+			wr.flush();
+			BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+			String ret = br.readLine();
+			wr.close();
+			br.close();
+			logger.log(Level.INFO, ret);
+		}
+		catch (IOException ex)
+		{
+			logger.log(Level.SEVERE, "Failed to open connection", ex);
+		}
+	}	
+}

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

@@ -1,89 +0,0 @@
-package com.earth2me.essentials;
-
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-
-public class ExecuteTimer
-{
-	private final transient List<ExecuteRecord> times;
-	private final transient DecimalFormat decimalFormat = new DecimalFormat("#0.000", DecimalFormatSymbols.getInstance(Locale.US));
-
-
-	public ExecuteTimer()
-	{
-		times = new ArrayList<ExecuteRecord>();
-	}
-
-	public void start()
-	{
-		times.clear();
-		mark("start");
-
-	}
-
-	public void mark(final String label)
-	{
-		if (!times.isEmpty() || "start".equals(label))
-		{
-			times.add(new ExecuteRecord(label, System.nanoTime()));
-		}
-	}
-
-	public String end()
-	{
-		final StringBuilder output = new StringBuilder();
-		output.append("execution time: ");
-		String mark;
-		long time0 = 0;
-		long time1 = 0;
-		long time2 = 0;
-		double duration;
-
-		for (ExecuteRecord pair : times)
-		{
-			mark = (String)pair.getMark();
-			time2 = (Long)pair.getTime();
-			if (time1 > 0)
-			{
-				duration = (time2 - time1)/1000000.0;
-				output.append(mark).append(": ").append(decimalFormat.format(duration)).append("ms - ");
-			}
-			else
-			{
-				time0 = time2;
-			}
-			time1 = time2;
-		}
-		duration = (time1 - time0)/1000000.0;
-		output.append("Total: ").append(decimalFormat.format(duration)).append("ms");
-		times.clear();
-		return output.toString();
-	}
-
-
-	private static class ExecuteRecord
-	{
-		private final String mark;
-		private final long time;
-
-		public ExecuteRecord(final String mark, final long time)
-		{
-			this.mark = mark;
-			this.time = time;
-		}
-
-		public String getMark()
-		{
-			return mark;
-		}
-
-		public long getTime()
-		{
-			return time;
-		}
-	}
-}

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

@@ -1,744 +1,408 @@
-package com.earth2me.essentials.craftbukkit;
+package com.earth2me.essentials;
 
-import java.io.File;
-import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 import java.util.UUID;
-import org.bukkit.*;
+import org.bukkit.BlockChangeDelegate;
+import org.bukkit.Chunk;
+import org.bukkit.ChunkSnapshot;
+import org.bukkit.Effect;
+import org.bukkit.Location;
+import org.bukkit.TreeType;
+import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
-import org.bukkit.entity.*;
+import org.bukkit.entity.Arrow;
+import org.bukkit.entity.Boat;
+import org.bukkit.entity.CreatureType;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.LightningStrike;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Minecart;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.PoweredMinecart;
+import org.bukkit.entity.StorageMinecart;
 import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.metadata.MetadataValue;
-import org.bukkit.plugin.Plugin;
 import org.bukkit.util.Vector;
 
 
 public class FakeWorld implements World
 {
+
 	private final String name;
 	private final Environment env;
-
-	public FakeWorld(String string, Environment environment)
+	FakeWorld(String string, Environment environment)
 	{
 		this.name = string;
 		this.env = environment;
 	}
 
-	@Override
 	public Block getBlockAt(int i, int i1, int i2)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public Block getBlockAt(Location lctn)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public int getBlockTypeIdAt(int i, int i1, int i2)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public int getBlockTypeIdAt(Location lctn)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public int getHighestBlockYAt(int i, int i1)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public int getHighestBlockYAt(Location lctn)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public Chunk getChunkAt(int i, int i1)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public Chunk getChunkAt(Location lctn)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public Chunk getChunkAt(Block block)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean isChunkLoaded(Chunk chunk)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public Chunk[] getLoadedChunks()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public void loadChunk(Chunk chunk)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean isChunkLoaded(int i, int i1)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public void loadChunk(int i, int i1)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean loadChunk(int i, int i1, boolean bln)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean unloadChunk(int i, int i1)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean unloadChunk(int i, int i1, boolean bln)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean unloadChunk(int i, int i1, boolean bln, boolean bln1)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean unloadChunkRequest(int i, int i1)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean unloadChunkRequest(int i, int i1, boolean bln)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean regenerateChunk(int i, int i1)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean refreshChunk(int i, int i1)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public Item dropItem(Location lctn, ItemStack is)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public Item dropItemNaturally(Location lctn, ItemStack is)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public Arrow spawnArrow(Location lctn, Vector vector, float f, float f1)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean generateTree(Location lctn, TreeType tt)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean generateTree(Location lctn, TreeType tt, BlockChangeDelegate bcd)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public LivingEntity spawnCreature(Location lctn, CreatureType ct)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public LightningStrike strikeLightning(Location lctn)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public LightningStrike strikeLightningEffect(Location lctn)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public List<Entity> getEntities()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public List<LivingEntity> getLivingEntities()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public List<Player> getPlayers()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public String getName()
 	{
 		return name;
 	}
 
-	@Override
+	public long getId()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
 	public Location getSpawnLocation()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean setSpawnLocation(int i, int i1, int i2)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public long getTime()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public void setTime(long l)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public long getFullTime()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public void setFullTime(long l)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean hasStorm()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public void setStorm(boolean bln)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public int getWeatherDuration()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public void setWeatherDuration(int i)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean isThundering()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public void setThundering(boolean bln)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public int getThunderDuration()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public void setThunderDuration(int i)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public Environment getEnvironment()
 	{
 		return env;
 	}
 
-	@Override
 	public long getSeed()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean getPVP()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public void setPVP(boolean bln)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public void save()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean createExplosion(double d, double d1, double d2, float f)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean createExplosion(Location lctn, float f)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public ChunkGenerator getGenerator()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public List<BlockPopulator> getPopulators()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public void playEffect(Location lctn, Effect effect, int i)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public void playEffect(Location lctn, Effect effect, int i, int i1)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean createExplosion(double d, double d1, double d2, float f, boolean bln)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean createExplosion(Location lctn, float f, boolean bln)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public <T extends Entity> T spawn(Location lctn, Class<T> type) throws IllegalArgumentException
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public ChunkSnapshot getEmptyChunkSnapshot(int i, int i1, boolean bln, boolean bln1)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public void setSpawnFlags(boolean bln, boolean bln1)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean getAllowAnimals()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public boolean getAllowMonsters()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public UUID getUID()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public Block getHighestBlockAt(int i, int i1)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public Block getHighestBlockAt(Location lctn)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
+
 	public Biome getBiome(int i, int i1)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public double getTemperature(int i, int i1)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
 	public double getHumidity(int i, int i1)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
-
-	@Override
-	public boolean unloadChunk(Chunk chunk)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public int getMaxHeight()
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public boolean getKeepSpawnInMemory()
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public void setKeepSpawnInMemory(boolean bln)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public boolean isAutoSave()
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public void setAutoSave(boolean bln)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public Difficulty getDifficulty()
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public void setDifficulty(Difficulty difficulty)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public int getSeaLevel()
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public File getWorldFolder()
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public <T extends Entity> Collection<T> getEntitiesByClass(Class<T>... types)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public WorldType getWorldType()
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public void sendPluginMessage(Plugin plugin, String string, byte[] bytes)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public Set<String> getListeningPluginChannels()
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public boolean canGenerateStructures()
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public long getTicksPerAnimalSpawns()
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public void setTicksPerAnimalSpawns(int i)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public long getTicksPerMonsterSpawns()
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public void setTicksPerMonsterSpawns(int i)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public <T extends Entity> Collection<T> getEntitiesByClass(Class<T> type)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public Collection<Entity> getEntitiesByClasses(Class<?>... types)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public LivingEntity spawnCreature(Location arg0, EntityType arg1)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public <T> void playEffect(Location lctn, Effect effect, T t)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public <T> void playEffect(Location lctn, Effect effect, T t, int i)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public void setMetadata(String string, MetadataValue mv)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public List<MetadataValue> getMetadata(String string)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public boolean hasMetadata(String string)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public void removeMetadata(String string, Plugin plugin)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public void setBiome(int arg0, int arg1, Biome arg2)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public int getMonsterSpawnLimit()
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public void setMonsterSpawnLimit(int arg0)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public int getAnimalSpawnLimit()
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public void setAnimalSpawnLimit(int arg0)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public int getWaterAnimalSpawnLimit()
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public void setWaterAnimalSpawnLimit(int arg0)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public Entity spawnEntity(Location lctn, EntityType et)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public boolean isChunkInUse(int x, int z)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public FallingBlock spawnFallingBlock(Location location, Material material, byte data) throws IllegalArgumentException
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public FallingBlock spawnFallingBlock(Location location, int blockId, byte blockData) throws IllegalArgumentException
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public void playSound(Location arg0, Sound arg1, float arg2, float arg3)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public int getAmbientSpawnLimit()
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public void setAmbientSpawnLimit(int i)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public String[] getGameRules()
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public String getGameRuleValue(String string)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public boolean setGameRuleValue(String string, String string1)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public boolean isGameRule(String string)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
-	public boolean createExplosion(double d, double d1, double d2, float f, boolean bln, boolean bln1)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
+	
 }

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

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

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,12 @@
 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 java.util.Map;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
+import org.bukkit.craftbukkit.scheduler.CraftScheduler;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scheduler.BukkitTask;
 
 
 public interface IEssentials extends Plugin
@@ -24,76 +15,55 @@ public interface IEssentials extends Plugin
 
 	void reload();
 
-	boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentialsModule module);
+	boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath, String permissionPrefix);
 
-	@Deprecated
 	User getUser(Object base);
-	
-	User getUser(UUID base);
-	
-	User getUser(String base);
-	
-	User getUser(Player base);
-
-	I18n getI18n();
 
 	User getOfflineUser(String name);
 
 	World getWorld(String name);
 
-	int broadcastMessage(String message);
-
-	int broadcastMessage(IUser sender, String message);
-
-	int broadcastMessage(String permission, String message);
+	int broadcastMessage(String name, String message);
 
 	ISettings getSettings();
 
-	BukkitScheduler getScheduler();
+	CraftScheduler getScheduler();
 
-	IJails getJails();
+	String[] getMotd(CommandSender sender, String def);
 
-	IWarps getWarps();
+	String[] getLines(CommandSender sender, String node, String def);
+
+	Jail getJail();
+
+	Warps getWarps();
 
 	Worth getWorth();
 
 	Backup getBackup();
 
+	Spawn getSpawn();
+
 	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);
+
+	BanWorkaround getBans();
 
 	TNTExplodeListener getTNTListener();
 
-	PermissionsHandler getPermissionsHandler();
+	IPermissionsHandler getPermissionsHandler();
 
-	AlternativeCommandsHandler getAlternativeCommandsHandler();
+	void setPermissionsHandler(IPermissionsHandler handler);
 
-	void showError(CommandSource sender, Throwable exception, String commandLabel);
+	void showError(final CommandSender sender, final Throwable exception, final String commandLabel);
 
-	IItemDb getItemDb();
+	Map<String, User> getAllUsers();
 
-	UserMap getUserMap();
-
-	Metrics getMetrics();
-
-	void setMetrics(Metrics metrics);
-
-	EssentialsTimer getTimer();
-
-	List<String> getVanishedPlayers();
-
-	Collection<Player> getOnlinePlayers();
-
-	Iterable<User> getOnlineUsers();
+	ItemDb getItemDb();
 }

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

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

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

@@ -1,14 +1,12 @@
-package com.earth2me.essentials.perm;
+package com.earth2me.essentials;
 
-import java.util.List;
 import org.bukkit.entity.Player;
 
 
 public interface IPermissionsHandler
 {
-	String getGroup(Player base);
 
-	List<String> getGroups(Player base);
+	String getGroup(Player base);
 
 	boolean canBuild(Player base, String group);
 
@@ -19,4 +17,5 @@ public interface IPermissionsHandler
 	String getPrefix(Player base);
 
 	String getSuffix(Player base);
+	
 }

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

@@ -1,59 +1,56 @@
 package com.earth2me.essentials;
 
 import com.earth2me.essentials.commands.IEssentialsCommand;
-import com.earth2me.essentials.signs.EssentialsSign;
-import com.earth2me.essentials.textreader.IText;
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import org.bukkit.ChatColor;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.event.EventPriority;
 
 
 public interface ISettings extends IConf
 {
+
 	boolean areSignsDisabled();
 
-	IText getAnnounceNewPlayerFormat();
+	String format(String format, IUser user);
+
+	String getAnnounceNewPlayerFormat(IUser user);
 
 	boolean getAnnounceNewPlayers();
 
-	String getNewPlayerKit();
-
 	String getBackupCommand();
 
 	long getBackupInterval();
 
+	boolean getBedSetsHome();
+
 	String 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();
 
-	int getOversizedStackSize();
-
 	int getDefaultStackSize();
 
+	boolean getGenerateExitPortals();
+
 	double getHealCooldown();
 
-	Set<String> getSocialSpyCommands();
+	Object getKit(String name);
 
-	Map<String, Object> getKit(String name);
-
-	ConfigurationSection getKits();
+	Map<String, Object> getKits();
 
 	String getLocale();
 
+	String getNetherName();
+
+	boolean getNetherPortalsEnabled();
+
+	double getNetherRatio();
+
 	String getNewbieSpawn();
 
 	String getNicknamePrefix();
@@ -72,19 +69,15 @@ public interface ISettings extends IConf
 
 	String getProtectString(final String configName);
 
+	boolean getReclaimSetting();
+
 	boolean getRespawnAtHome();
 
-	Set getMultipleHomes();
-
-	int getHomeLimit(String set);
-
-	int getHomeLimit(User user);
+	boolean getSortListByGroups();
 
 	int getSpawnMobLimit();
 
-	BigDecimal getStartingBalance();
-
-	boolean isTeleportSafetyEnabled();
+	int getStartingBalance();
 
 	double getTeleportCooldown();
 
@@ -98,121 +91,45 @@ public interface ISettings extends IConf
 
 	boolean isCommandOverridden(String name);
 
+	boolean isCommandRestricted(IEssentialsCommand cmd);
+
+	boolean isCommandRestricted(String label);
+
 	boolean isDebug();
 
 	boolean isEcoDisabled();
 
+	boolean isNetherEnabled();
+
 	boolean isTradeInStacks(int id);
 
 	List<Integer> itemSpawnBlacklist();
 
-	List<EssentialsSign> enabledSigns();
-
 	boolean permissionBasedItemSpawn();
 
+	void reloadConfig();
+
 	boolean showNonEssCommandsInHelp();
 
+	boolean spawnIfNoHome();
+
+	boolean use1to1RatioInNether();
+
 	boolean warnOnBuildDisallow();
 
 	boolean warnOnSmite();
-
-	BigDecimal getMaxMoney();
-
-	BigDecimal getMinMoney();
+	
+	double getMaxMoney();
 
 	boolean isEcoLogEnabled();
-
-	boolean isEcoLogUpdateEnabled();
-
+	
 	boolean removeGodOnDisconnect();
 
 	boolean changeDisplayName();
 
-	boolean changePlayerListName();
-
 	boolean isPlayerCommand(String string);
 
-	boolean useBukkitPermissions();
+	public boolean useBukkitPermissions();
 
-	boolean addPrefixSuffix();
-
-	boolean disablePrefix();
-
-	boolean disableSuffix();
-
-	long getAutoAfk();
-
-	long getAutoAfkKick();
-
-	boolean getFreezeAfkPlayers();
-
-	boolean cancelAfkOnMove();
-
-	boolean cancelAfkOnInteract();
-
-	boolean areDeathMessagesEnabled();
-
-	void setDebug(boolean debug);
-
-	Set<String> getNoGodWorlds();
-
-	boolean getUpdateBedAtDaytime();
-
-	boolean allowUnsafeEnchantments();
-
-	boolean getRepairEnchanted();
-
-	boolean isWorldTeleportPermissions();
-
-	boolean isWorldHomePermissions();
-
-	boolean registerBackInListener();
-
-	boolean getDisableItemPickupWhileAfk();
-
-	EventPriority getRespawnPriority();
-
-	long getTpaAcceptCancellation();
-
-	boolean isMetricsEnabled();
-
-	void setMetricsEnabled(boolean metricsEnabled);
-
-	long getTeleportInvulnerability();
-
-	boolean isTeleportInvulnerability();
-
-	long getLoginAttackDelay();
-
-	int getSignUsePerSecond();
-
-	double getMaxFlySpeed();
-
-	double getMaxWalkSpeed();
-
-	int getMailsPerMinute();
-
-	long getEconomyLagWarning();
-	
-	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();
+	public boolean addPrefixSuffix();
 }

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,55 @@
 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 java.net.InetSocketAddress;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.PlayerInventory;
 
 
 public interface IUser
 {
-	boolean isAuthorized(String node);
+	int getHealth();
 
-	boolean isAuthorized(IEssentialsCommand cmd);
+	Location getLocation();
 
-	boolean isAuthorized(IEssentialsCommand cmd, String permissionPrefix);
+	boolean isOnline();
 
-	void healCooldown() throws Exception;
-
-	void giveMoney(BigDecimal value) throws MaxMoneyException;
-
-	void giveMoney(final BigDecimal value, final CommandSource initiator) throws MaxMoneyException;
-	
-	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();
-
-	String getGroup();
-
-	boolean inGroup(final String group);
-
-	boolean canBuild();
-
-	long getTeleportRequestTime();
-
-	void enableInvulnerabilityAfterTeleport();
-
-	void resetInvulnerabilityAfterTeleport();
-
-	boolean hasInvulnerabilityAfterTeleport();
-
-	/**
-	 * 'Vanished' Represents when a player is hidden from others by Essentials. This status does NOT include when the
-	 * player is hidden via other plugins. Use isHidden() if you want to check if a user is vanished by any supported
-	 * plugin.
-	 *
-	 * @return If the user is vanished or not
-	 * @see isHidden
-	 */
-	boolean isVanished();
-
-	void setVanished(boolean vanish);
-
-	boolean isIgnoreExempt();
-
-	public void sendMessage(String message);
-
-	/*
-	 * UserData
-	 */
-	Location getHome(String name) throws Exception;
-
-	Location getHome(Location loc) throws Exception;
-
-	List<String> getHomes();
-
-	void setHome(String name, Location loc);
-
-	void delHome(String name) throws Exception;
-
-	boolean hasHome();
-
-	Location getLastLocation();
-
-	Location getLogoutLocation();
+	void sendMessage(String string);
 
 	long getLastTeleportTimestamp();
 
+	boolean isAuthorized(String node);
+
+	boolean isAuthorized(IEssentialsCommand cmd);
+	
+	boolean isAuthorized(IEssentialsCommand cmd, String permissionPrefix);
+
 	void setLastTeleportTimestamp(long time);
 
-	String getJail();
+	Location getLastLocation();
 
-	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();
+	double getMoney();
 
-	public String getName();
+	void takeMoney(double value);
+
+	void giveMoney(double value);
+
+	PlayerInventory getInventory();
+
+	void updateInventory();
+
+	String getGroup();
+
+	void setLastLocation();
+
+	Location getHome(Location location);
+
+	String getName();
+
+	InetSocketAddress getAddress();
+
+	String getDisplayName();
 }

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

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

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

@@ -1,125 +1,159 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
-import com.earth2me.essentials.utils.NumberUtil;
-import com.earth2me.essentials.utils.StringUtil;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import net.ess3.api.IEssentials;
-import org.bukkit.Bukkit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
 
-public class ItemDb implements IConf, net.ess3.api.IItemDb
+public class ItemDb implements IConf
 {
 	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)
+	public ItemDb(IEssentials ess)
 	{
 		this.ess = ess;
-		file = new ManagedFile("items.csv", ess);
 	}
+	private final static Logger LOGGER = Logger.getLogger("Minecraft");
+	private final transient Map<String, Integer> items = new HashMap<String, Integer>();
+	private final transient Map<String, Short> durabilities = new HashMap<String, Short>();
 
-	@Override
 	public void reloadConfig()
 	{
-		final List<String> lines = file.getLines();
+		final File file = new File(ess.getDataFolder(), "items.csv");
 
-		if (lines.isEmpty())
+		if (!file.exists())
 		{
-			return;
+			final InputStream res = ItemDb.class.getResourceAsStream("/items.csv");
+			FileWriter tx = null;
+			try
+			{
+				tx = new FileWriter(file);
+				for (int i = 0; (i = res.read()) > 0;)
+				{
+					tx.write(i);
+				}
+				tx.flush();
+			}
+			catch (IOException ex)
+			{
+				LOGGER.log(Level.SEVERE, Util.i18n("itemsCsvNotLoaded"), ex);
+				return;
+			}
+			finally
+			{
+				try
+				{
+					res.close();
+				}
+				catch (Exception ex)
+				{
+				}
+				try
+				{
+					if (tx != null)
+					{
+						tx.close();
+					}
+				}
+				catch (Exception ex)
+				{
+				}
+			}
 		}
 
-		durabilities.clear();
-		items.clear();
-		names.clear();
-		primaryName.clear();
-
-		for (String line : lines)
+		BufferedReader rx = null;
+		try
 		{
-			line = line.trim().toLowerCase(Locale.ENGLISH);
-			if (line.length() > 0 && line.charAt(0) == '#')
+			rx = new BufferedReader(new FileReader(file));
+			durabilities.clear();
+			items.clear();
+
+			for (int i = 0; rx.ready(); i++)
 			{
-				continue;
+				try
+				{
+					final String line = rx.readLine().trim().toLowerCase();
+					if (line.startsWith("#"))
+					{
+						continue;
+					}
+
+					final String[] parts = line.split("[^a-z0-9]");
+					if (parts.length < 2)
+					{
+						continue;
+					}
+
+					final int numeric = Integer.parseInt(parts[1]);
+
+					durabilities.put(parts[0].toLowerCase(), parts.length > 2 && !parts[2].equals("0") ? Short.parseShort(parts[2]) : 0);
+					items.put(parts[0].toLowerCase(), numeric);
+				}
+				catch (Exception ex)
+				{
+					LOGGER.warning(Util.format("parseError", "items.csv", i));
+				}
 			}
-
-			final String[] parts = line.split("[^a-z0-9]");
-			if (parts.length < 2)
-			{
-				continue;
-			}
-
-			final int numeric = Integer.parseInt(parts[1]);
-			final short data = parts.length > 2 && !parts[2].equals("0") ? Short.parseShort(parts[2]) : 0;
-			String itemName = parts[0].toLowerCase(Locale.ENGLISH);
-
-			durabilities.put(itemName, data);
-			items.put(itemName, numeric);
-
-			ItemData itemData = new ItemData(numeric, data);
-			if (names.containsKey(itemData))
-			{
-				List<String> nameList = names.get(itemData);
-				nameList.add(itemName);
-				Collections.sort(nameList, new LengthCompare());
-			}
-			else
-			{
-				List<String> nameList = new ArrayList<String>();
-				nameList.add(itemName);
-				names.put(itemData, nameList);
-				primaryName.put(itemData, itemName);
+		}
+		catch (IOException ex)
+		{
+			LOGGER.log(Level.SEVERE, Util.i18n("itemsCsvNotLoaded"), ex);
+		}
+		finally
+		{
+			if (rx != null) {
+				try
+				{
+					rx.close();
+				}
+				catch (IOException ex)
+				{
+					LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
+				}
 			}
 		}
 	}
 
-	@Override
 	public ItemStack get(final String id, final int quantity) throws Exception
 	{
-		final ItemStack retval = get(id.toLowerCase(Locale.ENGLISH));
+		final ItemStack retval = get(id.toLowerCase());
 		retval.setAmount(quantity);
 		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();
+			metaData = Short.parseShort(id.split("[:+',;.]")[1]);
+		}
 		else
 		{
-			itemname = itemname.toLowerCase(Locale.ENGLISH);
+			itemname = id.toLowerCase();
 		}
 
-		if (itemid < 1)
+		if (itemname != null)
 		{
 			if (items.containsKey(itemname))
 			{
@@ -129,185 +163,20 @@ public class ItemDb implements IConf, net.ess3.api.IItemDb
 					metaData = durabilities.get(itemname);
 				}
 			}
-			else if (Material.getMaterial(itemname.toUpperCase(Locale.ENGLISH)) != null)
-			{
-				Material bMaterial = Material.getMaterial(itemname.toUpperCase(Locale.ENGLISH));
-				itemid = bMaterial.getId();
-			}
 			else
 			{
-				try
-				{
-					Material bMaterial = Bukkit.getUnsafe().getMaterialFromInternalName(itemname.toLowerCase(Locale.ENGLISH));
-					itemid = bMaterial.getId();
-				}
-				catch (Throwable throwable)
-				{
-					throw new Exception(tl("unknownItemName", itemname), throwable);
-				}
+				throw new Exception(Util.format("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(Util.format("unknownItemId", itemid));
 		}
 		final ItemStack retval = new ItemStack(mat);
-		retval.setAmount(mat.getMaxStackSize());
+		retval.setAmount(ess.getSettings().getDefaultStackSize());
 		retval.setDurability(metaData);
 		return retval;
 	}
-
-	@Override
-	public List<ItemStack> getMatching(User user, String[] args) throws Exception
-	{
-		List<ItemStack> is = new ArrayList<ItemStack>();
-
-		if (args.length < 1)
-		{
-			is.add(user.getBase().getItemInHand());
-		}
-		else if (args[0].equalsIgnoreCase("hand"))
-		{
-			is.add(user.getBase().getItemInHand());
-		}
-		else if (args[0].equalsIgnoreCase("inventory") || args[0].equalsIgnoreCase("invent") || args[0].equalsIgnoreCase("all"))
-		{
-			for (ItemStack stack : user.getBase().getInventory().getContents())
-			{
-				if (stack == null || stack.getType() == Material.AIR)
-				{
-					continue;
-				}
-				is.add(stack);
-			}
-		}
-		else if (args[0].equalsIgnoreCase("blocks"))
-		{
-			for (ItemStack stack : user.getBase().getInventory().getContents())
-			{
-				if (stack == null || stack.getTypeId() > 255 || stack.getType() == Material.AIR)
-				{
-					continue;
-				}
-				is.add(stack);
-			}
-		}
-		else
-		{
-			is.add(get(args[0]));
-		}
-
-		if (is.isEmpty() || is.get(0).getType() == Material.AIR)
-		{
-			throw new Exception(tl("itemSellAir"));
-		}
-
-		return is;
-	}
-
-	@Override
-	public String names(ItemStack item)
-	{
-		ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
-		List<String> nameList = names.get(itemData);
-		if (nameList == null)
-		{
-			itemData = new ItemData(item.getTypeId(), (short)0);
-			nameList = names.get(itemData);
-			if (nameList == null)
-			{
-				return null;
-			}
-		}
-
-		if (nameList.size() > 15)
-		{
-			nameList = nameList.subList(0, 14);
-		}
-		return StringUtil.joinList(", ", nameList);
-	}
-
-	@Override
-	public String name(ItemStack item)
-	{
-		ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
-		String name = primaryName.get(itemData);
-		if (name == null)
-		{
-			itemData = new ItemData(item.getTypeId(), (short)0);
-			name = primaryName.get(itemData);
-			if (name == null)
-			{
-				return null;
-			}
-		}
-		return name;
-	}
-
-
-	static class ItemData
-	{
-		final private int itemNo;
-		final private short itemData;
-
-		ItemData(final int itemNo, final short itemData)
-		{
-			this.itemNo = itemNo;
-			this.itemData = itemData;
-		}
-
-		public int getItemNo()
-		{
-			return itemNo;
-		}
-
-		public short getItemData()
-		{
-			return itemData;
-		}
-
-		@Override
-		public int hashCode()
-		{
-			return (31 * itemNo) ^ itemData;
-		}
-
-		@Override
-		public boolean equals(Object o)
-		{
-			if (o == null)
-			{
-				return false;
-			}
-			if (!(o instanceof ItemData))
-			{
-				return false;
-			}
-			ItemData pairo = (ItemData)o;
-			return this.itemNo == pairo.getItemNo()
-				   && this.itemData == pairo.getItemData();
-		}
-	}
-
-
-	class LengthCompare implements java.util.Comparator<String>
-	{
-		public LengthCompare()
-		{
-			super();
-		}
-
-		@Override
-		public int compare(String s1, String s2)
-		{
-			return s1.length() - s2.length();
-		}
-	}
 }

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

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

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

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

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

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

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

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

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

@@ -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,228 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n.tl;
-import java.io.*;
-import java.math.BigInteger;
-import java.security.DigestInputStream;
-import java.security.DigestOutputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-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 transient File file;
-
-	public ManagedFile(final String filename, final IEssentials ess)
-	{
-		file = new File(ess.getDataFolder(), filename);
-
-		if (file.exists())
-		{
-			try
-			{
-				if (checkForVersion(file, ess.getDescription().getVersion()) && !file.delete())
-				{
-					throw new IOException("Could not delete file " + file.toString());
-				}
-			}
-			catch (IOException ex)
-			{
-				Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
-			}
-		}
-
-		if (!file.exists())
-		{
-			try
-			{
-				copyResourceAscii("/" + filename, file);
-			}
-			catch (IOException ex)
-			{
-				Bukkit.getLogger().log(Level.SEVERE, tl("itemsCsvNotLoaded"), ex);
-			}
-		}
-	}
-
-	public static void copyResourceAscii(final String resourceName, final File file) throws IOException
-	{
-		final InputStreamReader reader = new InputStreamReader(ManagedFile.class.getResourceAsStream(resourceName));
-		try
-		{
-			final MessageDigest digest = getDigest();
-			final DigestOutputStream digestStream = new DigestOutputStream(new FileOutputStream(file), digest);
-			try
-			{
-				final OutputStreamWriter writer = new OutputStreamWriter(digestStream);
-				try
-				{
-					final char[] buffer = new char[BUFFERSIZE];
-					do
-					{
-						final int length = reader.read(buffer);
-						if (length >= 0)
-						{
-							writer.write(buffer, 0, length);
-						}
-						else
-						{
-							break;
-						}
-					}
-					while (true);
-					writer.write("\n");
-					writer.flush();
-					final BigInteger hashInt = new BigInteger(1, digest.digest());
-					digestStream.on(false);
-					digestStream.write('#');
-					digestStream.write(hashInt.toString(16).getBytes());
-				}
-				finally
-				{
-					writer.close();
-				}
-			}
-			finally
-			{
-				digestStream.close();
-			}
-		}
-		finally
-		{
-			reader.close();
-		}
-	}
-
-	public static boolean checkForVersion(final File file, final String version) throws IOException
-	{
-		if (file.length() < 33)
-		{
-			return false;
-		}
-		final BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
-		try
-		{
-			final byte[] buffer = new byte[(int)file.length()];
-			int position = 0;
-			do
-			{
-				final int length = bis.read(buffer, position, Math.min((int)file.length() - position, BUFFERSIZE));
-				if (length < 0)
-				{
-					break;
-				}
-				position += length;
-			}
-			while (position < file.length());
-			final ByteArrayInputStream bais = new ByteArrayInputStream(buffer);
-			if (bais.skip(file.length() - 33) != file.length() - 33)
-			{
-				return false;
-			}
-			final BufferedReader reader = new BufferedReader(new InputStreamReader(bais));
-			try
-			{
-				String hash = reader.readLine();
-				if (hash != null && hash.matches("#[a-f0-9]{32}"))
-				{
-					hash = hash.substring(1);
-					bais.reset();
-					final String versionline = reader.readLine();
-					if (versionline != null && versionline.matches("#version: .+"))
-					{
-						final String versioncheck = versionline.substring(10);
-						if (!versioncheck.equalsIgnoreCase(version))
-						{
-							bais.reset();
-							final MessageDigest digest = getDigest();
-							final DigestInputStream digestStream = new DigestInputStream(bais, digest);
-							try
-							{
-								final byte[] bytes = new byte[(int)file.length() - 33];
-								digestStream.read(bytes);
-								final BigInteger correct = new BigInteger(hash, 16);
-								final BigInteger test = new BigInteger(1, digest.digest());
-								if (correct.equals(test))
-								{
-									return true;
-								}
-								else
-								{
-									Bukkit.getLogger().warning("File " + file.toString() + " has been modified by user and file version differs, please update the file manually.");
-								}
-							}
-							finally
-							{
-								digestStream.close();
-							}
-						}
-					}
-				}
-			}
-			finally
-			{
-				reader.close();
-			}
-		}
-		finally
-		{
-			bis.close();
-		}
-		return false;
-	}
-
-	public static MessageDigest getDigest() throws IOException
-	{
-		try
-		{
-			return MessageDigest.getInstance("MD5");
-		}
-		catch (NoSuchAlgorithmException ex)
-		{
-			throw new IOException(ex);
-		}
-	}
-
-	public List<String> getLines()
-	{
-		try
-		{
-			final BufferedReader reader = new BufferedReader(new FileReader(file));
-			try
-			{
-				final List<String> lines = new ArrayList<String>();
-				do
-				{
-					final String line = reader.readLine();
-					if (line == null)
-					{
-						break;
-					}
-					else
-					{
-						lines.add(line);
-					}
-				}
-				while (true);
-				return lines;
-			}
-			finally
-			{
-				reader.close();
-			}
-		}
-		catch (IOException ex)
-		{
-			Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
-			return Collections.emptyList();
-		}
-	}
-}

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

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

@@ -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/NetherPortal.java

@@ -0,0 +1,167 @@
+/**
+ * @author SpaceManiac
+ * @licent MIT
+ * @origin https://github.com/SpaceManiac/Nether/blob/master/org/innectis/Nether/NetherPortal.java
+ */
+package com.earth2me.essentials;
+
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import java.util.ArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+public class NetherPortal
+{
+	private Block block;
+
+	public NetherPortal(Block b)
+	{
+		block = b;
+	}
+
+	public Block getBlock()
+	{
+		return block;
+	}
+
+	public void setBlock(Block b)
+	{
+		block = b;
+	}
+
+	// Return a random spawnable location
+	public Location getSpawn()
+	{
+		if (block.getWorld().getBlockAt(block.getX() + 1, block.getY(), block.getZ()).getType().equals(Material.PORTAL)
+			|| block.getWorld().getBlockAt(block.getX() - 1, block.getY(), block.getZ()).getType().equals(Material.PORTAL))
+		{
+		// portal is in X direction
+			return new Location(block.getWorld(), block.getX() + 1,
+								block.getY(), block.getZ() + 1 - 2 * Math.round(Math.random()));
+		}
+		else
+		{
+		// portal is in Z direction
+			return new Location(block.getWorld(), block.getX() + 1 - 2 * Math.round(Math.random()),
+								block.getY(), block.getZ() + 1);
+		}
+	}
+
+	// ==============================
+	// Find a nearby portal within 16 blocks of the given block
+	// Not guaranteed to be the nearest
+	public static NetherPortal findPortal(Block dest)
+	{
+		World world = dest.getWorld();
+
+		// Get list of columns in a circle around the block
+		ArrayList<Block> columns = new ArrayList<Block>();
+		for (int x = dest.getX() - 16; x <= dest.getX() + 16; ++x)
+		{
+			for (int z = dest.getZ() - 16; z <= dest.getZ() + 16; ++z)
+			{
+				int dx = dest.getX() - x, dz = dest.getZ() - z;
+				if (dx * dx + dz * dz <= 256)
+				{
+					columns.add(world.getBlockAt(x, 0, z));
+				}
+			}
+		}
+
+		// For each column try to find a portal block
+		for (Block col : columns)
+		{
+			for (int y = 127; y >= 0; --y)
+			{
+				Block b = world.getBlockAt(col.getX(), y, col.getZ());
+				if (b.getType().equals(Material.PORTAL) && Math.abs(dest.getY() - y) <= 16)
+				{
+					// Huzzah!
+					return new NetherPortal(b);
+				}
+			}
+		}
+
+		// Nope!
+		return null;
+	}
+
+	// Create a new portal at the specified block, fudging position if needed
+	// Will occasionally end up making portals in bad places, but let's hope not
+	public static NetherPortal createPortal(Block dest)
+	{
+		World world = dest.getWorld();
+
+		// Try not to spawn within water or lava
+		Material m = dest.getType();
+		while (((m.equals(Material.LAVA) || m.equals(Material.WATER) || m.equals(Material.STATIONARY_LAVA) 
+			|| m.equals(Material.STATIONARY_WATER) || m.equals(Material.SAND) || m.equals(Material.GRAVEL))) &&
+			dest.getY() < 120)
+		{
+			dest = world.getBlockAt(dest.getX(), dest.getY() + 4, dest.getZ());
+			m = dest.getType();
+		}
+
+		// Not too high or too low overall
+		if (dest.getY() > 120)
+		{
+			dest = world.getBlockAt(dest.getX(), 120, dest.getZ());
+		}
+		else if (dest.getY() < 8)
+		{
+			dest = world.getBlockAt(dest.getX(), 8, dest.getZ());
+		}
+
+		// Create the physical portal
+		// For now, don't worry about direction
+
+		int x = dest.getX(), y = dest.getY(), z = dest.getZ();
+		Logger.getLogger("Minecraft").log(Level.INFO, Util.format("creatingPortal", x, y, z)); 
+
+		// Clear area around portal
+		ArrayList<Block> columns = new ArrayList<Block>();
+		for (int x2 = x - 4; x2 <= x + 4; ++x2)
+		{
+			for (int z2 = z - 4; z2 <= z + 4; ++z2)
+			{
+				double dx = x + 0.5f - x2, dz = z - z2;
+				if (dx * dx + dz * dz <= 13)
+				{
+					columns.add(world.getBlockAt(x2, 0, z2));
+				}
+			}
+		}
+
+		// Clear area around portal
+		for (Block col : columns)
+		{
+			// Stone platform
+			world.getBlockAt(col.getX(), y - 1, col.getZ()).setType(Material.STONE);
+			for (int yd = 0; yd < 4; ++yd)
+			{
+				world.getBlockAt(col.getX(), y + yd, col.getZ()).setType(Material.AIR);
+			}
+		}
+
+		// Build obsidian frame
+		for (int xd = -1; xd < 3; ++xd)
+		{
+			for (int yd = -1; yd < 4; ++yd)
+			{
+				if (xd == -1 || yd == -1 || xd == 2 || yd == 3)
+				{
+					world.getBlockAt(x + xd, y + yd, z).setType(Material.OBSIDIAN);
+				}
+			}
+		}
+
+		// Set it alight!
+		dest.setType(Material.FIRE);
+
+		return new NetherPortal(dest);
+	}
+}

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

@@ -0,0 +1,50 @@
+package com.earth2me.essentials;
+
+import com.nijiko.permissions.PermissionHandler;
+import com.nijikokun.bukkit.Permissions.Permissions;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+
+public class Permissions2Handler implements IPermissionsHandler
+{
+	private final transient PermissionHandler permissionHandler;
+
+	Permissions2Handler(final Plugin permissionsPlugin)
+	{
+		permissionHandler = ((Permissions)permissionsPlugin).getHandler();
+	}
+
+	public String getGroup(final Player base)
+	{
+		final String group = permissionHandler.getGroup(base.getWorld().getName(), base.getName());
+		return group == null ? "default" : group;
+	}
+
+	public boolean canBuild(final Player base, final String group)
+	{
+		return permissionHandler.canGroupBuild(base.getWorld().getName(), getGroup(base));
+	}
+
+	public boolean inGroup(final Player base, final String group)
+	{
+		return permissionHandler.inGroup(base.getWorld().getName(), base.getName(), group);
+	}
+
+	public boolean hasPermission(final Player base, final String node)
+	{
+		return permissionHandler.permission(base, node);
+	}
+
+	public String getPrefix(final Player base)
+	{
+		final String prefix = permissionHandler.getGroupPrefix(base.getWorld().getName(), getGroup(base));
+		return prefix == null ? "" : prefix;
+	}
+
+	public String getSuffix(final Player base)
+	{
+		final String suffix = permissionHandler.getGroupSuffix(base.getWorld().getName(), getGroup(base));
+		return suffix == null ? "" : suffix;
+	}
+}

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

@@ -0,0 +1,48 @@
+package com.earth2me.essentials;
+
+import com.nijiko.permissions.PermissionHandler;
+import com.nijikokun.bukkit.Permissions.Permissions;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+
+public class Permissions3Handler implements IPermissionsHandler
+{
+	private final transient PermissionHandler permissionHandler;
+	
+	Permissions3Handler(final Plugin permissionsPlugin)
+	{
+		permissionHandler = ((Permissions)permissionsPlugin).getHandler();
+	}
+
+	public String getGroup(final Player base)
+	{
+		return permissionHandler.getPrimaryGroup(base.getWorld().getName(), base.getName());
+	}
+
+	public boolean canBuild(final Player base, final String group)
+	{
+		return permissionHandler.canUserBuild(base.getWorld().getName(), base.getName());
+	}
+
+	public boolean inGroup(final Player base, final String group)
+	{
+		return permissionHandler.inGroup(base.getWorld().getName(), base.getName(), group);
+	}
+
+	public boolean hasPermission(final Player base, final String node)
+	{
+		return permissionHandler.has(base, node);
+	}
+
+	public String getPrefix(final Player base)
+	{
+		return permissionHandler.getUserPrefix(base.getWorld().getName(), base.getName());
+	}
+
+	public String getSuffix(final Player base)
+	{
+		return permissionHandler.getUserSuffix(base.getWorld().getName(), base.getName());
+	}
+	
+}

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

@@ -0,0 +1,74 @@
+package com.earth2me.essentials;
+
+import org.bukkit.entity.Player;
+import ru.tehkode.permissions.PermissionManager;
+import ru.tehkode.permissions.PermissionUser;
+import ru.tehkode.permissions.bukkit.PermissionsEx;
+
+
+class PermissionsExHandler implements IPermissionsHandler
+{
+	private final transient PermissionManager manager;
+
+	public PermissionsExHandler()
+	{
+		manager = PermissionsEx.getPermissionManager();
+	}
+
+	public String getGroup(Player base)
+	{
+		final PermissionUser user = manager.getUser(base.getName());
+		if (user == null)
+		{
+			return "default";
+		}
+		return user.getGroupsNames()[0];
+	}
+
+	public boolean canBuild(Player base, String group)
+	{
+		final PermissionUser user = manager.getUser(base.getName());
+		if (user == null)
+		{
+			return true;
+		}
+
+		return user.getOptionBoolean("build", base.getWorld().getName(), true);
+	}
+
+	public boolean inGroup(Player base, String group)
+	{
+		final PermissionUser user = manager.getUser(base.getName());
+		if (user == null)
+		{
+			return false;
+		}
+
+		return user.inGroup(group);
+	}
+
+	public boolean hasPermission(Player base, String node)
+	{
+		return manager.has(base.getName(), node, base.getWorld().getName());
+	}
+
+	public String getPrefix(Player base)
+	{
+		final PermissionUser user = manager.getUser(base.getName());
+		if (user == null)
+		{
+			return "";
+		}
+		return user.getPrefix();
+	}
+
+	public String getSuffix(Player base)
+	{
+		final PermissionUser user = manager.getUser(base.getName());
+		if (user == null)
+		{
+			return "";
+		}
+		return user.getSuffix();
+	}
+}

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

@@ -1,48 +1,78 @@
 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;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.LivingEntity;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import net.minecraft.server.EntityPlayer;
+import net.minecraft.server.IInventory;
+import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer;
 import org.bukkit.entity.Player;
-import org.bukkit.permissions.Permissible;
-import org.bukkit.permissions.ServerOperator;
 
 
-public class PlayerExtension
+public class PlayerExtension extends PlayerWrapper
 {
-	protected Player base;
-
-	public PlayerExtension(final Player base)
+	protected final IEssentials ess;
+	
+	public PlayerExtension(Player base, IEssentials ess)
 	{
-		this.base = base;
+		super(base);
+		this.ess = ess;
 	}
 
-	public final Player getBase()
+	public boolean isBanned()
 	{
-		return base;
+		return ess.getBans().isNameBanned(this.getName());
 	}
 
-	public final Player setBase(final Player base)
+	public boolean isIpBanned()
 	{
-		return this.base = base;
+		return ess.getBans().isIpBanned(getAddress().getAddress().getHostAddress());
 	}
-	
-	public Server getServer()
+
+	public float getCorrectedYaw()
 	{
-		return base.getServer();
+		float angle = (getLocation().getYaw() - 90.0f) % 360.0f;
+		if (angle < 0) {
+			angle += 360.0f;
+		}
+		return angle;
 	}
 	
-	public World getWorld() {
-		return base.getWorld();
+	public void showInventory(IInventory inventory)
+	{
+		getHandle().a(inventory);
+	}
+
+	public void showInventory(CraftInventoryPlayer inventory)
+	{
+		showInventory((IInventory)inventory.getInventory());
+	}
+
+	public TargetBlock getTarget()
+	{
+		return new TargetBlock(getBase());
+	}
+
+	public String getGroup()
+	{
+		return ess.getPermissionsHandler().getGroup(base);
 	}
 	
-	public Location getLocation() {
-		return base.getLocation();
+	public boolean inGroup(String group)
+	{
+		return ess.getPermissionsHandler().inGroup(base, group);
+	}
+
+	public boolean canBuild()
+	{
+		return ess.getPermissionsHandler().canBuild(base, getGroup());
+	}
+
+	public EntityPlayer getHandle()
+	{
+		return getCraftPlayer().getHandle();
+	}
+
+	public CraftPlayer getCraftPlayer()
+	{
+		return (CraftPlayer)base;
 	}
 }

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/PlayerWrapper.java

@@ -0,0 +1,627 @@
+package com.earth2me.essentials;
+
+import java.net.InetSocketAddress;
+import java.util.*;
+import org.bukkit.*;
+import org.bukkit.block.Block;
+import org.bukkit.entity.*;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.inventory.*;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionAttachment;
+import org.bukkit.permissions.PermissionAttachmentInfo;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.util.Vector;
+
+public class PlayerWrapper implements Player
+{
+	protected Player base;
+	
+	public PlayerWrapper(Player base)
+	{
+		this.base = base;
+	}
+	
+	public final Player getBase()
+	{
+		return base;
+	}
+	
+	public final Player setBase(Player base)
+	{
+		return this.base = base;
+	}
+
+	@Override
+	public void setDisplayName(String string)
+	{
+		base.setDisplayName(string);
+	}
+
+	@Override
+	public void setCompassTarget(Location lctn)
+	{
+		base.setCompassTarget(lctn);
+	}
+
+	@Override
+	public InetSocketAddress getAddress()
+	{
+		return base.getAddress();
+	}
+
+	@Override
+	public void kickPlayer(String string)
+	{
+		base.kickPlayer(string);
+	}
+
+	@Override
+	public String getName()
+	{
+		return base.getName();
+	}
+
+	@Override
+	public PlayerInventory getInventory()
+	{
+		return base.getInventory();
+	}
+
+	@Override
+	public ItemStack getItemInHand()
+	{
+		return base.getItemInHand();
+	}
+
+	@Override
+	public void setItemInHand(ItemStack is)
+	{
+		base.setItemInHand(is);
+	}
+
+	@Override
+	public int getHealth()
+	{
+		return base.getHealth();
+	}
+
+	@Override
+	public void setHealth(int i)
+	{
+		base.setHealth(i);
+	}
+
+	@Override
+	public Egg throwEgg()
+	{
+		return base.throwEgg();
+	}
+
+	@Override
+	public Snowball throwSnowball()
+	{
+		return base.throwSnowball();
+	}
+
+	@Override
+	public Arrow shootArrow()
+	{
+		return base.shootArrow();
+	}
+
+	@Override
+	public boolean isInsideVehicle()
+	{
+		return base.isInsideVehicle();
+	}
+
+	@Override
+	public boolean leaveVehicle()
+	{
+		return base.leaveVehicle();
+	}
+
+	@Override
+	public Vehicle getVehicle()
+	{
+		return base.getVehicle();
+	}
+
+	@Override
+	public Location getLocation()
+	{
+		return base.getLocation();
+	}
+
+	@Override
+	public World getWorld()
+	{
+		return base.getWorld();
+	}
+
+	@Override
+	public Server getServer()
+	{
+		return base.getServer();
+	}
+
+	@Override
+	public boolean isOnline()
+	{
+		return base.isOnline();
+	}
+
+	@Override
+	public boolean isOp()
+	{
+		return base.isOp();
+	}
+	
+	@Override
+	public boolean teleport(Location lctn)
+	{
+		return base.teleport(lctn);
+	}
+	
+	@Override
+	public boolean teleport(Entity entity)
+	{
+		return base.teleport(entity);
+	}
+
+	@Override
+	public void sendMessage(String string)
+	{
+		base.sendMessage(string);
+	}
+
+	@Override
+	public void setVelocity(Vector vector)
+	{
+		base.setVelocity(vector);
+	}
+
+	@Override
+	public Vector getVelocity()
+	{
+		return base.getVelocity();
+	}
+
+	@Override
+	public double getEyeHeight()
+	{
+		return base.getEyeHeight();
+	}
+
+	@Override
+	public double getEyeHeight(boolean bln)
+	{
+		return base.getEyeHeight(bln);
+	}
+
+	@Override
+	public List<Block> getLineOfSight(HashSet<Byte> hs, int i)
+	{
+		return base.getLineOfSight(hs, i);
+	}
+
+	@Override
+	public Block getTargetBlock(HashSet<Byte> hs, int i)
+	{
+		return base.getTargetBlock(hs, i);
+	}
+
+	@Override
+	public List<Block> getLastTwoTargetBlocks(HashSet<Byte> hs, int i)
+	{
+		return base.getLastTwoTargetBlocks(hs, i);
+	}
+
+	@Override
+	public int getFireTicks()
+	{
+		return base.getFireTicks();
+	}
+
+	@Override
+	public int getMaxFireTicks()
+	{
+		return base.getMaxFireTicks();
+	}
+
+	@Override
+	public void setFireTicks(int i)
+	{
+		base.setFireTicks(i);
+	}
+
+	@Override
+	public void remove()
+	{
+		base.remove();
+	}
+	
+	/**
+	 * This is not deprecated because the underlying method isn't really deprecated; rather, it's just "imperfect".  By
+	 * We will continue to use this method even after the underlying CraftBukkit method is changed, so do not deprecate
+	 * it.  Chances are Bukkit will also choose to un-deprecate this method at some point.
+	 */
+	@Override
+	public void updateInventory()
+	{
+		base.updateInventory();
+	}
+
+	@Override
+	public void chat(String string)
+	{
+		base.chat(string);
+	}
+
+	@Override
+	public boolean isSneaking()
+	{
+		return base.isSneaking();
+	}
+
+	@Override
+	public void setSneaking(boolean bln)
+	{
+		base.setSneaking(bln);
+	}
+
+	@Override
+	public int getEntityId()
+	{
+		return base.getEntityId();
+	}
+
+	@Override
+	public boolean performCommand(String string)
+	{
+		return base.performCommand(string);
+	}
+
+	@Override
+	public int getRemainingAir()
+	{
+		return base.getRemainingAir();
+	}
+
+	@Override
+	public void setRemainingAir(int i)
+	{
+		base.setRemainingAir(i);
+	}
+
+	@Override
+	public int getMaximumAir()
+	{
+		return base.getMaximumAir();
+	}
+
+	@Override
+	public void setMaximumAir(int i)
+	{
+		base.setMaximumAir(i);
+	}
+
+	@Override
+	public String getDisplayName()
+	{
+		if (base.getDisplayName() != null)
+			return base.getDisplayName();
+		else
+			return base.getName();
+	}
+
+	@Override
+	public void damage(int i)
+	{
+		base.damage(i);
+	}
+
+	@Override
+	public void damage(int i, Entity entity)
+	{
+		base.damage(i, entity);
+	}
+
+	@Override
+	public Location getEyeLocation()
+	{
+		return base.getEyeLocation();
+	}
+
+	@Override
+	public void sendRawMessage(String string) {
+		base.sendRawMessage(string);
+	}
+
+	@Override
+	public Location getCompassTarget()
+	{
+		return base.getCompassTarget();
+	}
+
+	@Override
+	public int getMaximumNoDamageTicks()
+	{
+		return base.getMaximumNoDamageTicks();
+	}
+
+	@Override
+	public void setMaximumNoDamageTicks(int i)
+	{
+		base.setMaximumNoDamageTicks(i);
+	}
+
+	@Override
+	public int getLastDamage()
+	{
+		return base.getLastDamage();
+	}
+
+	@Override
+	public void setLastDamage(int i)
+	{
+		base.setLastDamage(i);
+	}
+
+	@Override
+	public int getNoDamageTicks()
+	{
+		return base.getNoDamageTicks();
+	}
+
+	@Override
+	public void setNoDamageTicks(int i)
+	{
+		base.setNoDamageTicks(i);
+	}
+
+	@Override
+	public Entity getPassenger()
+	{
+		return base.getPassenger();
+	}
+
+	@Override
+	public boolean setPassenger(Entity entity)
+	{
+		return base.setPassenger(entity);
+	}
+
+	@Override
+	public boolean isEmpty()
+	{
+		return base.isEmpty();
+	}
+
+	@Override
+	public boolean eject()
+	{
+		return base.eject();
+	}
+
+	@Override
+	@Deprecated
+	public void teleportTo(Location lctn)
+	{
+		base.teleportTo(lctn);
+	}
+
+	@Override
+	@Deprecated
+	public void teleportTo(Entity entity)
+	{
+		base.teleportTo(entity);
+	}
+
+	public void saveData()
+	{
+		base.saveData();
+	}
+
+	public void loadData()
+	{
+		base.loadData();
+	}
+
+	public boolean isSleeping()
+	{
+		return base.isSleeping();
+	}
+
+	public int getSleepTicks()
+	{
+		return base.getSleepTicks();
+	}
+
+	public List<Entity> getNearbyEntities(double d, double d1, double d2)
+	{
+		return base.getNearbyEntities(d, d1, d2);
+	}
+
+	public boolean isDead()
+	{
+		return base.isDead();
+	}
+
+	public float getFallDistance()
+	{
+		return base.getFallDistance();
+	}
+
+	public void setFallDistance(float f)
+	{
+		base.setFallDistance(f);
+	}
+
+	public void setSleepingIgnored(boolean bln)
+	{
+		base.setSleepingIgnored(bln);
+	}
+
+	public boolean isSleepingIgnored()
+	{
+		return base.isSleepingIgnored();
+	}
+
+	public void awardAchievement(Achievement a)
+	{
+		base.awardAchievement(a);
+	}
+
+	public void incrementStatistic(Statistic ststc)
+	{
+		base.incrementStatistic(ststc);
+	}
+
+	public void incrementStatistic(Statistic ststc, int i)
+	{
+		base.incrementStatistic(ststc, i);
+	}
+
+	public void incrementStatistic(Statistic ststc, Material mtrl)
+	{
+		base.incrementStatistic(ststc, mtrl);
+	}
+
+	public void incrementStatistic(Statistic ststc, Material mtrl, int i)
+	{
+		base.incrementStatistic(ststc, mtrl, i);
+	}
+
+	public void playNote(Location lctn, byte b, byte b1)
+	{
+		base.playNote(lctn, b, b1);
+	}
+
+	public void sendBlockChange(Location lctn, Material mtrl, byte b)
+	{
+		base.sendBlockChange(lctn, mtrl, b);
+	}
+
+	public void sendBlockChange(Location lctn, int i, byte b)
+	{
+		base.sendBlockChange(lctn, i, b);
+	}
+
+	public void setLastDamageCause(EntityDamageEvent ede)
+	{
+		base.setLastDamageCause(ede);
+		
+	}
+
+	public EntityDamageEvent getLastDamageCause()
+	{
+		return base.getLastDamageCause();
+	}
+
+	public void playEffect(Location lctn, Effect effect, int i)
+	{
+		base.playEffect(lctn, effect, i);
+	}
+
+	public boolean sendChunkChange(Location lctn, int i, int i1, int i2, byte[] bytes)
+	{
+		return base.sendChunkChange(lctn, i, i1, i2, bytes);
+	}
+
+	public UUID getUniqueId()
+	{
+		return base.getUniqueId();
+	}
+
+	public void playNote(Location lctn, Instrument i, Note note)
+	{
+		base.playNote(lctn, i, note);
+	}
+
+	public void setPlayerTime(long l, boolean bln)
+	{
+		base.setPlayerTime(l, bln);
+	}
+
+	public long getPlayerTime()
+	{
+		return base.getPlayerTime();
+	}
+
+	public long getPlayerTimeOffset()
+	{
+		return base.getPlayerTimeOffset();
+	}
+
+	public boolean isPlayerTimeRelative()
+	{
+		return base.isPlayerTimeRelative();
+	}
+
+	public void resetPlayerTime()
+	{
+		base.resetPlayerTime();
+	}
+
+	public boolean isPermissionSet(String string)
+	{
+		return base.isPermissionSet(string);
+	}
+
+	public boolean isPermissionSet(Permission prmsn)
+	{
+		return base.isPermissionSet(prmsn);
+	}
+
+	public boolean hasPermission(String string)
+	{
+		return base.hasPermission(string);
+	}
+
+	public boolean hasPermission(Permission prmsn)
+	{
+		return base.hasPermission(prmsn);
+	}
+
+	public PermissionAttachment addAttachment(Plugin plugin, String string, boolean bln)
+	{
+		return base.addAttachment(plugin, string, bln);
+	}
+
+	public PermissionAttachment addAttachment(Plugin plugin)
+	{
+		return base.addAttachment(plugin);
+	}
+	
+	public PermissionAttachment addAttachment(Plugin plugin, String string, boolean bln, int i)
+	{
+		return base.addAttachment(plugin, string, bln, i);
+	}
+
+	public PermissionAttachment addAttachment(Plugin plugin, int i)
+	{
+		return base.addAttachment(plugin, i);
+	}
+
+	public void removeAttachment(PermissionAttachment pa)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void recalculatePermissions()
+	{
+		base.recalculatePermissions();
+	}
+
+	public Set<PermissionAttachmentInfo> getEffectivePermissions()
+	{
+		return base.getEffectivePermissions();
+	}
+
+	public void setOp(boolean bln)
+	{
+		base.setOp(bln);
+	}
+}

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/Spawn.java

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

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

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

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

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

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

@@ -1,296 +1,280 @@
 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 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;
+import org.bukkit.entity.Entity;
 
 
-public class Teleport implements net.ess3.api.ITeleport
+public class Teleport implements Runnable
 {
-	private final IUser teleportOwner;
+	private static final double MOVE_CONSTANT = 0.3;
+	private static class Target
+	{
+		private final Location location;
+		private final Entity entity;
+
+		public Target(Location location)
+		{
+			this.location = location;
+			this.entity = null;
+		}
+
+		public Target(Entity entity)
+		{
+			this.entity = entity;
+			this.location = null;
+		}
+
+		public Location getLocation()
+		{
+			if (this.entity != null)
+			{
+				return this.entity.getLocation();
+			}
+			return location;
+		}
+	}
+	private IUser user;
+	private int teleTimer = -1;
+	private long started;	// time this task was initiated
+	private long delay;		// how long to delay the teleport
+	private int health;
+	// note that I initially stored a clone of the location for reference, but...
+	// when comparing locations, I got incorrect mismatches (rounding errors, looked like)
+	// so, the X/Y/Z values are stored instead and rounded off
+	private long initX;
+	private long initY;
+	private long initZ;
+	private Target teleportTarget;
+	private Trade chargeFor;
 	private final IEssentials ess;
-	private TimedTeleport timedTeleport;
+	private static final Logger logger = Logger.getLogger("Minecraft");
+
+	private void initTimer(long delay, Target target, Trade chargeFor)
+	{
+		this.started = System.currentTimeMillis();
+		this.delay = delay;
+		this.health = user.getHealth();
+		this.initX = Math.round(user.getLocation().getX()*MOVE_CONSTANT);
+		this.initY = Math.round(user.getLocation().getY()*MOVE_CONSTANT);
+		this.initZ = Math.round(user.getLocation().getZ()*MOVE_CONSTANT);
+		this.teleportTarget = target;
+		this.chargeFor = chargeFor;
+	}
+
+	public void run()
+	{
+
+		if (user == null || !user.isOnline() || user.getLocation() == null)
+		{
+			cancel();
+			return;
+		}
+		if (Math.round(user.getLocation().getX()*MOVE_CONSTANT) != initX
+			|| Math.round(user.getLocation().getY()*MOVE_CONSTANT) != initY
+			|| Math.round(user.getLocation().getZ()*MOVE_CONSTANT) != initZ
+			|| user.getHealth() < health)
+		{	// user moved, cancel teleport
+			cancel(true);
+			return;
+		}
+
+		health = user.getHealth();  // in case user healed, then later gets injured
+
+		long now = System.currentTimeMillis();
+		if (now > started + delay)
+		{
+			try
+			{
+				cooldown(false);
+				user.sendMessage(Util.i18n("teleportationCommencing"));
+				try
+				{
+					
+					now(teleportTarget);
+					if (chargeFor != null)
+					{
+						chargeFor.charge(user);
+					}
+				}
+				catch (Throwable ex)
+				{
+					ess.showError(user.getBase(), ex, "teleport");
+				}
+				return;
+			}
+			catch (Exception ex)
+			{
+				user.sendMessage(Util.format("cooldownWithMessage", ex.getMessage()));
+			}
+		}
+	}
 
 	public Teleport(IUser user, IEssentials ess)
 	{
-		this.teleportOwner = user;
+		this.user = user;
 		this.ess = ess;
 	}
 
+	public void respawn(Spawn spawn, Trade chargeFor) throws Exception
+	{
+		teleport(new Target(spawn.getSpawn(user.getGroup())), chargeFor);
+	}
+
+	public void warp(String warp, Trade chargeFor) throws Exception
+	{
+		Location loc = ess.getWarps().getWarp(warp);
+		teleport(new Target(loc), chargeFor);
+		user.sendMessage(Util.format("warpingTo", warp));
+	}
+
 	public void cooldown(boolean check) throws Exception
 	{
-		final Calendar time = new GregorianCalendar();
-		if (teleportOwner.getLastTeleportTimestamp() > 0)
+		Calendar now = new GregorianCalendar();
+		if (user.getLastTeleportTimestamp() > 0)
 		{
-			// Take the current time, and remove the delay from it.
-			final double cooldown = ess.getSettings().getTeleportCooldown();
-			final Calendar earliestTime = new GregorianCalendar();
-			earliestTime.add(Calendar.SECOND, -(int)cooldown);
-			earliestTime.add(Calendar.MILLISECOND, -(int)((cooldown * 1000.0) % 1000.0));
-			// This value contains the most recent time a teleportPlayer could have been used that would allow another use.
-			final long earliestLong = earliestTime.getTimeInMillis();
-
-			// When was the last teleportPlayer used?
-			final Long lastTime = teleportOwner.getLastTeleportTimestamp();
-
-			if (lastTime > time.getTimeInMillis())
+			double cooldown = ess.getSettings().getTeleportCooldown();
+			Calendar cooldownTime = new GregorianCalendar();
+			cooldownTime.setTimeInMillis(user.getLastTeleportTimestamp());
+			cooldownTime.add(Calendar.SECOND, (int)cooldown);
+			cooldownTime.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
+			if (cooldownTime.after(now) && !user.isAuthorized("essentials.teleport.cooldown.bypass"))
 			{
-				// This is to make sure time didn't get messed up on last teleportPlayer use.
-				// If this happens, let's give the user the benifit of the doubt.
-				teleportOwner.setLastTeleportTimestamp(time.getTimeInMillis());
-				return;
-			}
-			else if (lastTime > earliestLong && !teleportOwner.isAuthorized("essentials.teleport.cooldown.bypass"))
-			{
-				time.setTimeInMillis(lastTime);
-				time.add(Calendar.SECOND, (int)cooldown);
-				time.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
-				throw new Exception(tl("timeBeforeTeleport", DateUtil.formatDateDiff(time.getTimeInMillis())));
+				throw new Exception(Util.format("timeBeforeTeleport", Util.formatDateDiff(cooldownTime.getTimeInMillis())));
 			}
 		}
 		// if justCheck is set, don't update lastTeleport; we're just checking
 		if (!check)
 		{
-			teleportOwner.setLastTeleportTimestamp(time.getTimeInMillis());
+			user.setLastTeleportTimestamp(now.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(Util.i18n("pendingTeleportCancelled"));
+			}
+		}
+		finally
+		{
+			teleTimer = -1;
+		}
+	}
+
+	public void cancel()
+	{
+		cancel(false);
+	}
+
+	public void teleport(Location loc, Trade chargeFor) throws Exception
+	{
+		teleport(new Target(loc), chargeFor);
+	}
+
+	public void teleport(Entity entity, Trade chargeFor) throws Exception
+	{
+		teleport(new Target(entity), chargeFor);
+	}
+
+	private void teleport(Target target, Trade chargeFor) throws Exception
+	{
+		double delay = ess.getSettings().getTeleportDelay();
+
+		if (chargeFor != null)
+		{
+			chargeFor.isAffordableFor(user);
+		}
+		cooldown(true);
+		if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
+		{
+			cooldown(false);
+			now(target);
+			if (chargeFor != null)
+			{
+				chargeFor.charge(user);
+			}
+			return;
+		}
+
+		cancel();
 		Calendar c = new GregorianCalendar();
 		c.add(Calendar.SECOND, (int)delay);
 		c.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
-		user.sendMessage(tl("dontMoveMessage", DateUtil.formatDateDiff(c.getTimeInMillis())));
+		user.sendMessage(Util.format("dontMoveMessage", Util.formatDateDiff(c.getTimeInMillis())));
+		initTimer((long)(delay * 1000.0), target, chargeFor);
+
+		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
 	}
 
-	//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
+	private void now(Target target) throws Exception
+	{
+		cancel();
+		user.setLastLocation();
+		user.getBase().teleport(Util.getSafeDestination(target.getLocation()));
+	}
+
+	public void now(Location loc) throws Exception
+	{
+		cooldown(false);
+		now(new Target(loc));
+	}
+	
+	public void now(Location loc, Trade chargeFor) throws Exception
+	{
+		cooldown(false);
+		chargeFor.charge(user);
+		now(new Target(loc));
+	}
+
+	public void now(Entity entity, boolean cooldown) throws Exception
 	{
 		if (cooldown)
 		{
 			cooldown(false);
 		}
-		final ITarget target = new LocationTarget(loc);
-		now(teleportOwner, target, cause);
+		now(new Target(entity));
 	}
 
-	@Override
-	public void now(Player entity, boolean cooldown, TeleportCause cause) throws Exception
+	public void back(Trade chargeFor) 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()));
+		teleport(new Target(user.getLastLocation()), chargeFor);
 	}
 
-	protected void now(IUser teleportee, ITarget target, TeleportCause cause) throws Exception
+	public void back() throws Exception
 	{
-		cancel(false);
-		teleportee.setLastLocation();
-		final Location loc = target.getLocation();
+		back(null);
+	}
 
-		if (LocationUtil.isBlockUnsafeForUser(teleportee, loc.getWorld(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()))
+	public void home(Trade chargeFor) throws Exception
+	{
+		home(user, chargeFor);
+	}
+
+	public void home(IUser user, Trade chargeFor) throws Exception
+	{
+		Location loc = user.getHome(this.user.getLocation());
+		if (loc == null)
 		{
-			if (ess.getSettings().isTeleportSafetyEnabled())
+			if (ess.getSettings().spawnIfNoHome())
 			{
-				if (teleportee.getBase().isInsideVehicle())
-				{
-					teleportee.getBase().leaveVehicle();
-				}
-				teleportee.getBase().teleport(LocationUtil.getSafeDestination(teleportee, loc), cause);
+				respawn(ess.getSpawn(), chargeFor);
 			}
 			else
 			{
-				throw new Exception(tl("unsafeTeleportDestination", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+				throw new Exception(user == this.user ? Util.i18n("noHomeSet") : Util.i18n("noHomeSetPlayer"));
 			}
 		}
-		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);
-	}
-
-	//This function is used to throw a user back after a jail sentence
-	@Override
-	public void back() throws Exception
-	{
-		now(teleportOwner, new LocationTarget(teleportOwner.getLastLocation()), TeleportCause.COMMAND);
-	}
-
-	//If we need to cancelTimer a pending teleportPlayer call this method
-	private void cancel(boolean notifyUser)
-	{
-		if (timedTeleport != null)
-		{
-			timedTeleport.cancelTimer(notifyUser);
-			timedTeleport = null;
-		}
-	}
-
-	private void initTimer(long delay, IUser teleportUser, ITarget target, Trade chargeFor, TeleportCause cause, boolean respawn)
-	{
-		timedTeleport = new TimedTeleport(teleportOwner, ess, this, delay, teleportUser, target, chargeFor, cause, respawn);
+		teleport(new Target(loc), chargeFor);
 	}
 }

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,275 +1,127 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
-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;
 
 
 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);
+		this(command, null, null, ess);
 	}
 
-	public Trade(final String command, final Trade fallback, final IEssentials ess)
+	public Trade(final double money, final IEssentials ess)
 	{
-		this(command, fallback, null, null, null, ess);
-	}
-
-	@Deprecated
-	public Trade(final double money, final com.earth2me.essentials.IEssentials ess)
-	{
-		this(null, null, BigDecimal.valueOf(money), null, null, (IEssentials)ess);
-	}
-
-	public Trade(final BigDecimal money, final IEssentials ess)
-	{
-		this(null, null, money, null, null, ess);
+		this(null, money, null, ess);
 	}
 
 	public Trade(final ItemStack items, final IEssentials ess)
 	{
-		this(null, null, null, items, null, ess);
+		this(null, null, items, ess);
 	}
 
-	public Trade(final int exp, final IEssentials ess)
-	{
-		this(null, null, null, null, exp, ess);
-	}
-
-	private Trade(final String command, final Trade fallback, final BigDecimal money, final ItemStack item, final Integer exp, final IEssentials ess)
+	private Trade(final String command, final Double money, final ItemStack item, final IEssentials ess)
 	{
 		this.command = command;
-		this.fallbackTrade = fallback;
 		this.money = money;
 		this.itemStack = item;
-		this.exp = exp;
 		this.ess = ess;
 	}
 
 	public void isAffordableFor(final IUser user) throws ChargeException
 	{
-
-		if (ess.getSettings().isDebug())
-		{
-			ess.getLogger().log(Level.INFO, "checking if " + user.getName() + " can afford charge.");
-		}
-
+		final double mon = user.getMoney();
 		if (getMoney() != null
-			&& getMoney().signum() > 0
-			&& !user.canAfford(getMoney()))
+			&& mon < getMoney()
+			&& getMoney() > 0
+			&& !user.isAuthorized("essentials.eco.loan"))
 		{
-			throw new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(getMoney(), ess)));
+			throw new ChargeException(Util.i18n("notEnoughMoney"));
 		}
 
 		if (getItemStack() != null
-			&& !user.getBase().getInventory().containsAtLeast(itemStack, itemStack.getAmount()))
+			&& !InventoryWorkaround.containsItem(user.getInventory(), true, itemStack))
 		{
-			throw new ChargeException(tl("missingItems", getItemStack().getAmount(), ess.getItemDb().name(getItemStack())));
+			throw new ChargeException(Util.format("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase().replace("_", " ")));
 		}
 
-		BigDecimal money;
 		if (command != null && !command.isEmpty()
-			&& (money = getCommandCost(user)).signum() > 0
-			&& !user.canAfford(money))
+			&& !user.isAuthorized("essentials.nocommandcost.all")
+			&& !user.isAuthorized("essentials.nocommandcost." + command)
+			&& mon < ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
+			&& 0 < ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
+			&& !user.isAuthorized("essentials.eco.loan"))
 		{
-			throw new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(money, ess)));
-		}
-
-		if (exp != null && exp > 0
-			&& SetExpFix.getTotalExperience(user.getBase()) < exp)
-		{
-			throw new ChargeException(tl("notEnoughExperience"));
+			throw new ChargeException(Util.i18n("notEnoughMoney"));
 		}
 	}
 
-	public boolean pay(final IUser user) throws MaxMoneyException
+	public void pay(final IUser user)
 	{
-		return pay(user, OverflowType.ABORT) == null;
-	}
-
-	public Map<Integer, ItemStack> pay(final IUser user, final OverflowType type) throws MaxMoneyException
-	{
-		if (getMoney() != null && getMoney().signum() > 0)
+		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)
+			final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItem(user.getInventory(), true, getItemStack());
+			for (ItemStack itemStack : leftOver.values())
 			{
-				switch (type)
-				{
-				case ABORT:
-					if (ess.getSettings().isDebug())
-					{
-						ess.getLogger().log(Level.INFO, "abort paying " + user.getName() + " itemstack " + getItemStack().toString() + " due to lack of inventory space ");
-					}
-
-					return overFlow;
-
-				case RETURN:
-					// Pay the user the items, and return overflow
-					final Map<Integer, ItemStack> returnStack = InventoryWorkaround.addItems(user.getBase().getInventory(), getItemStack());
-					user.getBase().updateInventory();
-
-					if (ess.getSettings().isDebug())
-					{
-						ess.getLogger().log(Level.INFO, "paying " + user.getName() + " partial itemstack " + getItemStack().toString() + " with overflow " + returnStack.get(0).toString());
-					}
-
-					return returnStack;
-
-				case DROP:
-					// Pay the users the items directly, and drop the rest, will always return no overflow.
-					final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItems(user.getBase().getInventory(), getItemStack());
-					final Location loc = user.getBase().getLocation();
-					for (ItemStack loStack : leftOver.values())
-					{
-						final int maxStackSize = loStack.getType().getMaxStackSize();
-						final int stacks = loStack.getAmount() / maxStackSize;
-						final int leftover = loStack.getAmount() % maxStackSize;
-						final Item[] itemStacks = new Item[stacks + (leftover > 0 ? 1 : 0)];
-						for (int i = 0; i < stacks; i++)
-						{
-							final ItemStack stack = loStack.clone();
-							stack.setAmount(maxStackSize);
-							itemStacks[i] = loc.getWorld().dropItem(loc, stack);
-						}
-						if (leftover > 0)
-						{
-							final ItemStack stack = loStack.clone();
-							stack.setAmount(leftover);
-							itemStacks[stacks] = loc.getWorld().dropItem(loc, stack);
-						}
-					}
-					if (ess.getSettings().isDebug())
-					{
-						ess.getLogger().log(Level.INFO, "paying " + user.getName() + " partial itemstack " + getItemStack().toString() + " and dropping overflow " + leftOver.get(0).toString());
-					}
-				}
+				InventoryWorkaround.dropItem(user.getLocation(), itemStack);
 			}
-			else if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().log(Level.INFO, "paying " + user.getName() + " itemstack " + getItemStack().toString());
-			}
-			user.getBase().updateInventory();
+			user.updateInventory();
 		}
-		if (getExperience() != null)
-		{
-			SetExpFix.setTotalExperience(user.getBase(), SetExpFix.getTotalExperience(user.getBase()) + getExperience());
-		}
-		return null;
 	}
 
 	public void charge(final IUser user) throws ChargeException
 	{
-		if (ess.getSettings().isDebug())
-		{
-			ess.getLogger().log(Level.INFO, "attempting to charge user " + user.getName());
-		}
 		if (getMoney() != null)
 		{
-			if (ess.getSettings().isDebug())
+			final double mon = user.getMoney();
+			if (mon < getMoney() && getMoney() > 0 && !user.isAuthorized("essentials.eco.loan"))
 			{
-				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(Util.i18n("notEnoughMoney"));
 			}
 			user.takeMoney(getMoney());
 		}
 		if (getItemStack() != null)
 		{
-			if (ess.getSettings().isDebug())
+			if (!InventoryWorkaround.containsItem(user.getInventory(), true, itemStack))
 			{
-				ess.getLogger().log(Level.INFO, "charging user " + user.getName() + " itemstack " + getItemStack().toString());
+				throw new ChargeException(Util.format("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase().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, getItemStack());
+			user.updateInventory();
 		}
-		if (command != null)
+		if (command != null && !command.isEmpty()
+			&& !user.isAuthorized("essentials.nocommandcost.all")
+			&& !user.isAuthorized("essentials.nocommandcost." + command))
 		{
-			final BigDecimal cost = getCommandCost(user);
-			if (!user.canAfford(cost) && cost.signum() > 0)
+			final double mon = user.getMoney();
+			final double cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
+			if (mon < cost && cost > 0 && !user.isAuthorized("essentials.eco.loan"))
 			{
-				throw new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(cost, ess)));
+				throw new ChargeException(Util.i18n("notEnoughMoney"));
 			}
 			user.takeMoney(cost);
 		}
-		if (getExperience() != null)
-		{
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().log(Level.INFO, "charging user " + user.getName() + " exp " + getExperience());
-			}
-			final int experience = SetExpFix.getTotalExperience(user.getBase());
-			if (experience < getExperience() && getExperience() > 0)
-			{
-				throw new ChargeException(tl("notEnoughExperience"));
-			}
-			SetExpFix.setTotalExperience(user.getBase(), experience - getExperience());
-		}
-		if (ess.getSettings().isDebug())
-		{
-			ess.getLogger().log(Level.INFO, "charge user " + user.getName() + " completed");
-		}
 	}
 
-	public BigDecimal getMoney()
+	public Double getMoney()
 	{
 		return money;
 	}
@@ -278,59 +130,11 @@ public class Trade
 	{
 		return itemStack;
 	}
-
-	public Integer getExperience()
-	{
-		return exp;
-	}
-
-	public TradeType getType()
-	{
-		if (getExperience() != null)
-		{
-			return TradeType.EXP;
-		}
-
-		if (getItemStack() != null)
-		{
-			return TradeType.ITEM;
-		}
-
-		return TradeType.MONEY;
-	}
-
-	public BigDecimal getCommandCost(final IUser user)
-	{
-		BigDecimal cost = BigDecimal.ZERO;
-		if (command != null && !command.isEmpty())
-		{
-			cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
-			if (cost.signum() == 0 && fallbackTrade != null)
-			{
-				cost = fallbackTrade.getCommandCost(user);
-			}
-
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().log(Level.INFO, "calculated command (" + command + ") cost for " + user.getName() + " as " + cost);
-			}
-		}
-		if (cost.signum() != 0 && (user.isAuthorized("essentials.nocommandcost.all")
-								   || user.isAuthorized("essentials.nocommandcost." + command)))
-		{
-			return BigDecimal.ZERO;
-		}
-		return cost;
-	}
 	private static FileWriter fw = null;
 
 	public static void log(String type, String subtype, String event, String sender, Trade charge, String receiver, Trade pay, Location loc, IEssentials ess)
 	{
-		//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()))
+		if (!ess.getSettings().isEcoLogEnabled())
 		{
 			return;
 		}
@@ -342,7 +146,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();
@@ -372,12 +176,6 @@ public class Trade
 				sb.append("money").append(",");
 				sb.append(ess.getSettings().getCurrencySymbol());
 			}
-			if (charge.getExperience() != null)
-			{
-				sb.append(charge.getExperience()).append(",");
-				sb.append("exp").append(",");
-				sb.append("\"\"");
-			}
 		}
 		sb.append(",\"");
 		if (receiver != null)
@@ -403,12 +201,6 @@ public class Trade
 				sb.append("money").append(",");
 				sb.append(ess.getSettings().getCurrencySymbol());
 			}
-			if (pay.getExperience() != null)
-			{
-				sb.append(pay.getExperience()).append(",");
-				sb.append("exp").append(",");
-				sb.append("\"\"");
-			}
 		}
 		if (loc == null)
 		{
@@ -430,21 +222,20 @@ public class Trade
 		}
 		catch (IOException ex)
 		{
-			Logger.getLogger("Essentials").log(Level.SEVERE, null, ex);
+			Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
 		}
 	}
 
 	public static void closeLog()
 	{
-		if (fw != null)
-		{
+		if (fw != null) {
 			try
 			{
 				fw.close();
 			}
 			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/UserData.java

@@ -1,245 +1,95 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
-import com.earth2me.essentials.utils.NumberUtil;
-import com.earth2me.essentials.utils.StringUtil;
 import java.io.File;
-import java.math.BigDecimal;
-import java.util.*;
-import net.ess3.api.IEssentials;
-import net.ess3.api.InvalidWorldException;
-import net.ess3.api.MaxMoneyException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.bukkit.Location;
-import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.Material;
+import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 
 public abstract class UserData extends PlayerExtension implements IConf
 {
-	protected final transient IEssentials ess;
-	private final EssentialsUserConf config;
-	private final File folder;
+	private final EssentialsConf config;
+	private static final Logger logger = Logger.getLogger("Minecraft");
 
 	protected UserData(Player base, IEssentials ess)
 	{
-		super(base);
-		this.ess = ess;
-		folder = new File(ess.getDataFolder(), "userdata");
+		super(base, ess);
+		File folder = new File(ess.getDataFolder(), "userdata");
 		if (!folder.exists())
 		{
 			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();
-	}
-
-	@Override
 	public final void reloadConfig()
 	{
 		config.load();
 		money = _getMoney();
 		unlimited = _getUnlimited();
-		powertools = _getPowertools();
-		homes = _getHomes();
+		powertools = getPowertools();
 		lastLocation = _getLastLocation();
 		lastTeleportTimestamp = _getLastTeleportTimestamp();
 		lastHealTimestamp = _getLastHealTimestamp();
 		jail = _getJail();
 		mails = _getMails();
-		teleportEnabled = _getTeleportEnabled();
-		godmode = _getGodModeEnabled();
-		muted = _getMuted();
+		savedInventory = _getSavedInventory();
+		teleportEnabled = getTeleportEnabled();
+		ignoredPlayers = getIgnoredPlayers();
+		godmode = getGodModeEnabled();
+		muted = getMuted();
 		muteTimeout = _getMuteTimeout();
-		jailed = _getJailed();
+		jailed = getJailed();
 		jailTimeout = _getJailTimeout();
 		lastLogin = _getLastLogin();
 		lastLogout = _getLastLogout();
-		lastLoginAddress = _getLastLoginAddress();
-		afk = _getAfk();
+		afk = getAfk();
+		newplayer = getNew();
 		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();
-	}
-	private Map<String, Object> homes;
-
-	private Map<String, Object> _getHomes()
-	{
-		if (config.isConfigurationSection("homes"))
-		{
-			return config.getConfigurationSection("homes").getValues(false);
-		}
-		return new HashMap<String, Object>();
-	}
-
-	private String getHomeName(String search)
-	{
-		if (NumberUtil.isInt(search))
-		{
-			try
-			{
-				search = getHomes().get(Integer.parseInt(search) - 1);
-			}
-			catch (NumberFormatException e)
-			{
-			}
-			catch (IndexOutOfBoundsException e)
-			{
-			}
-		}
-		return search;
-	}
-
-	public Location getHome(String name) throws Exception
-	{
-		String search = getHomeName(name);
-		return config.getLocation("homes." + search, this.getBase().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());
-				if (world.getWorld() == loc.getWorld())
-				{
-					return loc;
-				}
-
-			}
-			loc = config.getLocation("homes." + getHomes().get(0), this.getBase().getServer());
-			return loc;
-		}
-		catch (InvalidWorldException ex)
-		{
-			return null;
-		}
-	}
-
-	public List<String> getHomes()
-	{
-		return new ArrayList<String>(homes.keySet());
-	}
-
-	public void setHome(String name, Location loc)
-	{
-		//Invalid names will corrupt the yaml
-		name = StringUtil.safeString(name);
-		homes.put(name, loc);
-		config.setProperty("homes." + name, loc);
+		config.setProperty("money", value);
 		config.save();
 	}
 
-	public void delHome(String name) throws Exception
-	{
-		String search = getHomeName(name);
-		if (!homes.containsKey(search))
-		{
-			search = StringUtil.safeString(search);
-		}
-		if (homes.containsKey(search))
-		{
-			homes.remove(search);
-			config.removeProperty("homes." + search);
-			config.save();
-		}
-		else
-		{
-			throw new Exception(tl("invalidHome", search));
-		}
-	}
-
 	public boolean hasHome()
 	{
 		if (config.hasProperty("home"))
@@ -248,21 +98,48 @@ public abstract class UserData extends PlayerExtension implements IConf
 		}
 		return false;
 	}
-	private String nickname;
 
-	public String _getNickname()
+	public Location getHome(Location location)
 	{
-		return config.getString("nickname");
+		if (!hasHome())
+		{
+			return null;
+		}
+		World world = location.getWorld();
+		String worldHome = "home.worlds." + world.getName().toLowerCase();
+		if (!config.hasProperty(worldHome))
+		{
+			String defaultWorld = config.getString("home.default");
+			worldHome = "home.worlds." + defaultWorld;
+		}
+		Location loc = config.getLocation(worldHome, getServer());
+		return loc;
+	}
+
+	public void setHome(Location loc, boolean b)
+	{
+		String worldName = loc.getWorld().getName().toLowerCase();
+		if (worldName == null || worldName.isEmpty())
+		{
+			logger.log(Level.WARNING, Util.i18n("emptyWorldName"));
+			return;
+		}
+		if (b || !config.hasProperty("home.default"))
+		{
+			config.setProperty("home.default", worldName);
+		}
+
+		config.setProperty("home.worlds." + worldName, loc);
+		config.save();
 	}
 
 	public String getNickname()
 	{
-		return nickname;
+		return config.getString("nickname");
 	}
 
 	public void setNickname(String nick)
 	{
-		nickname = nick;
 		config.setProperty("nickname", nick);
 		config.save();
 	}
@@ -270,7 +147,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 
 	private List<Integer> _getUnlimited()
 	{
-		return config.getIntegerList("unlimited");
+		return config.getIntList("unlimited", new ArrayList<Integer>());
 	}
 
 	public List<Integer> getUnlimited()
@@ -296,66 +173,46 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("unlimited", unlimited);
 		config.save();
 	}
-	private Map<String, Object> powertools;
-
-	private Map<String, Object> _getPowertools()
-	{
-		if (config.isConfigurationSection("powertools"))
-		{
-			return config.getConfigurationSection("powertools").getValues(false);
-		}
-		return new HashMap<String, Object>();
-	}
-
-	public void clearAllPowertools()
-	{
-		powertools.clear();
-		config.setProperty("powertools", powertools);
-		config.save();
-	}
+	private Map<Integer, String> powertools;
 
 	@SuppressWarnings("unchecked")
-	public List<String> getPowertool(ItemStack stack)
+	private Map<Integer, String> getPowertools()
 	{
-		return (List<String>)powertools.get("" + stack.getTypeId());
-	}
-
-	@SuppressWarnings("unchecked")
-	public List<String> getPowertool(int id)
-	{
-		return (List<String>)powertools.get("" + id);
-	}
-
-	public void setPowertool(ItemStack stack, List<String> commandList)
-	{
-		if (commandList == null || commandList.isEmpty())
+		Object o = config.getProperty("powertools");
+		if (o instanceof Map)
 		{
-			powertools.remove("" + stack.getTypeId());
+			return (Map<Integer, String>)o;
 		}
 		else
 		{
-			powertools.put("" + stack.getTypeId(), commandList);
+			return new HashMap<Integer, String>();
+		}
+
+	}
+
+	public String getPowertool(ItemStack stack)
+	{
+		return powertools.get(stack.getTypeId());
+	}
+
+	public void setPowertool(ItemStack stack, String command)
+	{
+		if (command == null || command.isEmpty())
+		{
+			powertools.remove(stack.getTypeId());
+		}
+		else
+		{
+			powertools.put(stack.getTypeId(), command);
 		}
 		config.setProperty("powertools", powertools);
 		config.save();
 	}
-
-	public boolean hasPowerTools()
-	{
-		return !powertools.isEmpty();
-	}
 	private Location lastLocation;
 
 	private Location _getLastLocation()
 	{
-		try
-		{
-			return config.getLocation("lastlocation", this.getBase().getServer());
-		}
-		catch (InvalidWorldException e)
-		{
-			return null;
-		}
+		return config.getLocation("lastlocation", getServer());
 	}
 
 	public Location getLastLocation()
@@ -365,43 +222,10 @@ public abstract class UserData extends PlayerExtension implements IConf
 
 	public void setLastLocation(Location loc)
 	{
-		if (loc == null || loc.getWorld() == null)
-		{
-			return;
-		}
 		lastLocation = loc;
 		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()
@@ -468,7 +292,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 
 	private List<String> _getMails()
 	{
-		return config.getStringList("mail");
+		return config.getStringList("mail", new ArrayList<String>());
 	}
 
 	public List<String> getMails()
@@ -496,9 +320,53 @@ public abstract class UserData extends PlayerExtension implements IConf
 		mails.add(mail);
 		setMails(mails);
 	}
+	private ItemStack[] savedInventory;
+
+	public ItemStack[] getSavedInventory()
+	{
+		return savedInventory;
+	}
+
+	private ItemStack[] _getSavedInventory()
+	{
+		int size = config.getInt("inventory.size", 0);
+		if (size < 1 || (getInventory() != null && size > getInventory().getSize()))
+		{
+			return null;
+		}
+		ItemStack[] is = new ItemStack[size];
+		for (int i = 0; i < size; i++)
+		{
+			is[i] = config.getItemStack("inventory." + i);
+		}
+		return is;
+	}
+
+	public void setSavedInventory(ItemStack[] is)
+	{
+		if (is == null || is.length == 0)
+		{
+			savedInventory = null;
+			config.removeProperty("inventory");
+		}
+		else
+		{
+			savedInventory = is;
+			config.setProperty("inventory.size", is.length);
+			for (int i = 0; i < is.length; i++)
+			{
+				if (is[i] == null || is[i].getType() == Material.AIR)
+				{
+					continue;
+				}
+				config.setProperty("inventory." + i, is[i]);
+			}
+		}
+		config.save();
+	}
 	private boolean teleportEnabled;
 
-	private boolean _getTeleportEnabled()
+	private boolean getTeleportEnabled()
 	{
 		return config.getBoolean("teleportenabled", true);
 	}
@@ -514,18 +382,32 @@ 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"));
+		return config.getStringList("ignore", new ArrayList<String>());
 	}
 
 	public void setIgnoredPlayers(List<String> players)
 	{
 		if (players == null || players.isEmpty())
 		{
-			ignoredPlayers = Collections.synchronizedList(new ArrayList<String>());
+			ignoredPlayers = new ArrayList<String>();
 			config.removeProperty("ignore");
 		}
 		else
@@ -536,37 +418,26 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.save();
 	}
 
-	@Deprecated
-	public boolean isIgnoredPlayer(final String userName)
+	public boolean isIgnoredPlayer(String name)
 	{
-		final IUser user = ess.getUser(userName);
-		if (user == null || !user.getBase().isOnline())
-		{
-			return false;
-		}
-		return isIgnoredPlayer(user);
+		return ignoredPlayers.contains(name.toLowerCase());
 	}
 
-	public boolean isIgnoredPlayer(IUser user)
-	{
-		return (ignoredPlayers.contains(user.getName().toLowerCase(Locale.ENGLISH)) && !user.isIgnoreExempt());
-	}
-
-	public void setIgnoredPlayer(IUser user, boolean set)
+	public void setIgnoredPlayer(String name, boolean set)
 	{
 		if (set)
 		{
-			ignoredPlayers.add(user.getName().toLowerCase(Locale.ENGLISH));
+			ignoredPlayers.add(name.toLowerCase());
 		}
 		else
 		{
-			ignoredPlayers.remove(user.getName().toLowerCase(Locale.ENGLISH));
+			ignoredPlayers.remove(name.toLowerCase());
 		}
 		setIgnoredPlayers(ignoredPlayers);
 	}
 	private boolean godmode;
 
-	private boolean _getGodModeEnabled()
+	private boolean getGodModeEnabled()
 	{
 		return config.getBoolean("godmode", false);
 	}
@@ -582,18 +453,20 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("godmode", set);
 		config.save();
 	}
+
+	public boolean toggleGodModeEnabled()
+	{
+		boolean ret = !isGodModeEnabled();
+		setGodModeEnabled(ret);
+		return ret;
+	}
 	private boolean muted;
 
-	public boolean _getMuted()
+	private boolean getMuted()
 	{
 		return config.getBoolean("muted", false);
 	}
 
-	public boolean getMuted()
-	{
-		return muted;
-	}
-
 	public boolean isMuted()
 	{
 		return muted;
@@ -605,6 +478,13 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("muted", set);
 		config.save();
 	}
+
+	public boolean toggleMuted()
+	{
+		boolean ret = !isMuted();
+		setMuted(ret);
+		return ret;
+	}
 	private long muteTimeout;
 
 	private long _getMuteTimeout()
@@ -625,7 +505,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 +547,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", 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()
@@ -679,19 +580,10 @@ public abstract class UserData extends PlayerExtension implements IConf
 		return lastLogin;
 	}
 
-	private void _setLastLogin(long time)
+	public void setLastLogin(long time)
 	{
 		lastLogin = time;
 		config.setProperty("timestamps.login", time);
-	}
-
-	public void setLastLogin(long time)
-	{
-		_setLastLogin(time);
-		if (base.getAddress() != null && base.getAddress().getAddress() != null)
-		{
-			_setLastLoginAddress(base.getAddress().getAddress().getHostAddress());
-		}
 		config.save();
 	}
 	private long lastLogout;
@@ -712,26 +604,9 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("timestamps.logout", time);
 		config.save();
 	}
-	private String lastLoginAddress;
-
-	private String _getLastLoginAddress()
-	{
-		return config.getString("ipAddress", "");
-	}
-
-	public String getLastLoginAddress()
-	{
-		return lastLoginAddress;
-	}
-
-	private void _setLastLoginAddress(String address)
-	{
-		lastLoginAddress = address;
-		config.setProperty("ipAddress", address);
-	}
 	private boolean afk;
 
-	private boolean _getAfk()
+	private boolean getAfk()
 	{
 		return config.getBoolean("afk", false);
 	}
@@ -741,13 +616,37 @@ public abstract class UserData extends PlayerExtension implements IConf
 		return afk;
 	}
 
-	public void _setAfk(boolean set)
+	public void setAfk(boolean set)
 	{
 		afk = set;
 		config.setProperty("afk", set);
 		config.save();
 	}
+
+	public boolean toggleAfk()
+	{
+		boolean ret = !isAfk();
+		setAfk(ret);
+		return ret;
+	}
 	private boolean newplayer;
+
+	private boolean getNew()
+	{
+		return config.getBoolean("newplayer", true);
+	}
+
+	public boolean isNew()
+	{
+		return newplayer;
+	}
+
+	public void setNew(boolean set)
+	{
+		newplayer = set;
+		config.setProperty("newplayer", set);
+		config.save();
+	}
 	private String geolocation;
 
 	private String _getGeoLocation()
@@ -803,25 +702,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)
 	{
@@ -829,144 +709,4 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("npc", set);
 		config.save();
 	}
-	private boolean arePowerToolsEnabled;
-
-	public boolean arePowerToolsEnabled()
-	{
-		return arePowerToolsEnabled;
-	}
-
-	public void setPowerToolsEnabled(boolean set)
-	{
-		arePowerToolsEnabled = set;
-		config.setProperty("powertoolsenabled", set);
-		config.save();
-	}
-
-	public boolean togglePowerToolsEnabled()
-	{
-		boolean ret = !arePowerToolsEnabled();
-		setPowerToolsEnabled(ret);
-		return ret;
-	}
-
-	private boolean _arePowerToolsEnabled()
-	{
-		return config.getBoolean("powertoolsenabled", true);
-	}
-	private Map<String, Long> kitTimestamps;
-
-	private Map<String, Long> _getKitTimestamps()
-	{
-
-		if (config.isConfigurationSection("timestamps.kits"))
-		{
-			final ConfigurationSection section = config.getConfigurationSection("timestamps.kits");
-			final Map<String, Long> timestamps = new HashMap<String, Long>();
-			for (String command : section.getKeys(false))
-			{
-				if (section.isLong(command))
-				{
-					timestamps.put(command.toLowerCase(Locale.ENGLISH), section.getLong(command));
-				}
-				else if (section.isInt(command))
-				{
-					timestamps.put(command.toLowerCase(Locale.ENGLISH), (long)section.getInt(command));
-				}
-			}
-			return timestamps;
-		}
-		return new HashMap<String, Long>();
-	}
-
-	public long getKitTimestamp(String name)
-	{
-		name = name.replace('.', '_').replace('/', '_');
-		if (kitTimestamps != null && kitTimestamps.containsKey(name))
-		{
-			return kitTimestamps.get(name);
-		}
-		return 0l;
-	}
-
-	public void setKitTimestamp(final String name, final long time)
-	{
-		kitTimestamps.put(name.toLowerCase(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,270 +0,0 @@
-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;
-
-	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);
-	}
-
-	private void loadAllUsersAsync(final IEssentials ess)
-	{
-		ess.runTaskAsynchronously(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				synchronized (users)
-				{
-					final File userdir = new File(ess.getDataFolder(), "userdata");
-					if (!userdir.exists())
-					{
-						return;
-					}
-					keys.clear();
-					users.invalidateAll();
-					for (String string : userdir.list())
-					{
-						if (!string.endsWith(".yml"))
-						{
-							continue;
-						}
-						final String name = string.substring(0, string.length() - 4);
-						try
-						{
-							keys.add(UUID.fromString(name));
-						}
-						catch (IllegalArgumentException ex)
-						{
-							//Ignore these users till they rejoin.
-						}
-					}
-					uuidMap.loadAllUsers(names, history);
-				}
-			}
-		});
-	}
-
-	public boolean userExists(final UUID uuid)
-	{
-		return keys.contains(uuid);
-	}
-
-	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());
-		}
-		catch (ExecutionException ex)
-		{
-			return null;
-		}
-		catch (UncheckedExecutionException ex)
-		{
-			return null;
-		}
-	}
-
-	public void trackUUID(final UUID uuid, final String name, boolean replace)
-	{
-		if (uuid != null)
-		{
-			keys.add(uuid);
-			if (name != null && name.length() > 0)
-			{
-				final String keyName = StringUtil.safeString(name);
-				if (!names.containsKey(keyName))
-				{
-					names.put(keyName, uuid);
-					uuidMap.writeUUIDMap();
-				}
-				else if (!names.get(keyName).equals(uuid))
-				{
-					if (replace)
-					{
-						ess.getLogger().info("Found new UUID for " + name + ". Replacing " + names.get(keyName).toString() + " with " + uuid.toString());
-						names.put(keyName, uuid);
-						uuidMap.writeUUIDMap();
-					}
-					else
-					{
-						if (ess.getSettings().isDebug())
-						{
-							ess.getLogger().info("Found old UUID for " + name + " (" + uuid.toString() + "). Not adding to usermap.");
-						}
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	public User load(final String stringUUID) throws Exception
-	{
-		UUID uuid = UUID.fromString(stringUUID);
-		Player player = ess.getServer().getPlayer(uuid);
-		if (player != null)
-		{
-			final User user = new User(player, ess);
-			trackUUID(uuid, user.getName(), true);
-			return user;
-		}
-
-		final File userFile = getUserFileFromID(uuid);
-
-		if (userFile.exists())
-		{
-			player = new OfflinePlayer(uuid, ess.getServer());
-			final User user = new User(player, ess);
-			((OfflinePlayer)player).setName(user.getLastAccountName());
-			trackUUID(uuid, user.getName(), false);
-			return user;
-		}
-
-		throw new Exception("User not found!");
-	}
-
-	@Override
-	public void reloadConfig()
-	{
-		getUUIDMap().forceWriteUUIDMap();
-		loadAllUsersAsync(ess);
-	}
-
-	public void invalidateAll()
-	{
-		users.invalidateAll();
-	}
-
-	public void removeUser(final String name)
-	{
-		if (names == null)
-		{
-			ess.getLogger().warning("Name collection is null, cannot remove user.");
-			return;
-		}
-		UUID uuid = names.get(name);
-		if (uuid != null)
-		{
-			keys.remove(uuid);
-			users.invalidate(uuid);
-		}
-		names.remove(name);
-		names.remove(StringUtil.safeString(name));
-	}
-
-	public Set<UUID> getAllUniqueUsers()
-	{
-		return Collections.unmodifiableSet(keys.clone());
-	}
-
-	public int getUniqueUsers()
-	{
-		return keys.size();
-	}
-
-	protected ConcurrentSkipListMap<String, UUID> getNames()
-	{
-		return names;
-	}
-
-	protected ConcurrentSkipListMap<UUID, ArrayList<String>> getHistory()
-	{
-		return history;
-	}
-
-	public List<String> getUserHistory(final UUID uuid)
-	{
-		return history.get(uuid);
-	}
-
-	public UUIDMap getUUIDMap()
-	{
-		return uuidMap;
-	}
-
-	private File getUserFileFromID(final UUID uuid)
-	{
-		final File userFolder = new File(ess.getDataFolder(), "userdata");
-		return new File(userFolder, uuid.toString() + ".yml");
-	}
-
-	public File getUserFileFromString(final String name)
-	{
-		final File userFolder = new File(ess.getDataFolder(), "userdata");
-		return new File(userFolder, StringUtil.sanitizeFileName(name) + ".yml");
-	}
-//	class UserMapRemovalListener implements RemovalListener
-//	{
-//		@Override
-//		public void onRemoval(final RemovalNotification notification)
-//		{
-//			Object value = notification.getValue();
-//			if (value != null)
-//			{
-//				((User)value).cleanup();
-//			}
-//		}
-//	}
-}

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

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

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

@@ -1,22 +1,20 @@
 package com.earth2me.essentials;
 
-import static com.earth2me.essentials.I18n.tl;
-import com.earth2me.essentials.commands.WarpNotFoundException;
-import com.earth2me.essentials.utils.StringUtil;
 import java.io.File;
-import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 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,16 +30,14 @@ public class Warps implements IConf, net.ess3.api.IWarps
 		reloadConfig();
 	}
 
-	@Override
 	public boolean isEmpty()
 	{
 		return warpPoints.isEmpty();
 	}
 
-	@Override
-	public Collection<String> getList()
+	public Iterable<String> getWarpNames()
 	{
-		final List<String> keys = new ArrayList<String>();
+		List<String> keys = new ArrayList<String>();
 		for (StringIgnoreCase stringIgnoreCase : warpPoints.keySet())
 		{
 			keys.add(stringIgnoreCase.getString());
@@ -50,60 +46,49 @@ 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)
 		{
-			throw new WarpNotFoundException();
+			throw new Exception(Util.i18n("warpNotExist"));
 		}
 		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(Util.i18n("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(Util.i18n("warpNotExist"));
 		}
 		if (!conf.getFile().delete())
 		{
-			throw new Exception(tl("warpDeleteError"));
+			throw new Exception(Util.i18n("warpDeleteError"));
 		}
 		warpPoints.remove(new StringIgnoreCase(name));
 	}
 
-	@Override
 	public final void reloadConfig()
 	{
 		warpPoints.clear();
@@ -127,25 +112,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, Util.format("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
 	{
@@ -159,7 +132,7 @@ public class Warps implements IConf, net.ess3.api.IWarps
 		@Override
 		public int hashCode()
 		{
-			return getString().toLowerCase(Locale.ENGLISH).hashCode();
+			return getString().toLowerCase().hashCode();
 		}
 
 		@Override

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

@@ -1,18 +1,13 @@
 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,155 +17,38 @@ 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)
-		{
-			final ConfigurationSection itemNameMatch = config.getConfigurationSection("worth." + itemname);
-			if (itemNameMatch != null && itemNameMatch.getKeys(false).size() == 1)
-			{
-				result = config.getBigDecimal("worth." + itemname + ".0", BigDecimal.ONE.negate());
-			}
+		String itemname = itemStack.getType().toString().toLowerCase().replace("_", "");
+		double result;
+		result = config.getDouble("worth."+itemname+"."+itemStack.getDurability(), Double.NaN);
+		if (Double.isNaN(result)) {
+			result = config.getDouble("worth."+itemname+".0", Double.NaN);
 		}
-		if (result.signum() < 0)
-		{
-			result = config.getBigDecimal("worth." + itemname + ".*", BigDecimal.ONE.negate());
+		if (Double.isNaN(result)) {
+			result = config.getDouble("worth."+itemname, Double.NaN);
 		}
-		if (result.signum() < 0)
-		{
-			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;
+		if (Double.isNaN(result)) {
+			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)
-		{
-			config.setProperty("worth." + itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), price);
-		}
-		else
-		{
+		if (itemStack.getType().getData() == null) {
+			config.setProperty("worth." + itemStack.getType().toString().toLowerCase().replace("_", ""), price);
+		} else {
 			// Bukkit-bug: getDurability still contains the correct value, while getData().getData() is 0.
-			config.setProperty("worth." + itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "") + "." + itemStack.getDurability(), price);
+			config.setProperty("worth." + itemStack.getType().toString().toLowerCase().replace("_", "")+"."+itemStack.getDurability(), price);
 		}
-		config.removeProperty("worth-" + itemStack.getTypeId());
+		config.removeProperty("worth-"+itemStack.getTypeId());
 		config.save();
 	}
 
-	@Override
 	public void reloadConfig()
 	{
 		config.load();
 	}
+
 }

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

@@ -1,45 +1,26 @@
 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 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,54 +33,59 @@ 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, Util.format("deleteFileError", config));
+			}
+			ess.getAllUsers().remove(name.toLowerCase());
+		}
 	}
 
 	private static User getUserByName(String name)
 	{
-		if (ess == null)
+		User user;
+		Player player = ess.getServer().getPlayer(name);
+		if (player != null)
 		{
-			throw new RuntimeException(noCallBeforeLoad);
+			user = ess.getUser(player);
 		}
-		if (name == null)
+		else
 		{
-			throw new RuntimeException("Economy username cannot be null");
+			user = ess.getOfflineUser(name);
 		}
-		return ess.getUser(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,178 +97,86 @@ 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 < 0.0 && !user.isAuthorized("essentials.eco.loan"))
 		{
 			throw new NoLoanPermittedException();
 		}
-		if (balance.signum() < 0 && !user.isAuthorized("essentials.eco.loan"))
-		{
-			throw new NoLoanPermittedException();
-		}
-		try
-		{
-			user.setMoney(balance);
-		}
-		catch (MaxMoneyException ex)
-		{
-			//TODO: Update API to show max balance errors
-		}
-		Trade.log("API", "Set", "API", name, new Trade(balance, ess), null, null, null, ess);
+		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
 	 */
 	public static void resetBalance(String name) throws UserDoesNotExistException, NoLoanPermittedException
 	{
-		if (ess == null)
-		{
-			throw new RuntimeException(noCallBeforeLoad);
-		}
 		setMoney(name, ess.getSettings().getStartingBalance());
-		Trade.log("API", "Reset", "API", name, new Trade(BigDecimal.ZERO, ess), null, null, null, ess);
 	}
 
 	/**
@@ -291,23 +185,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 +196,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 +207,35 @@ 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.formatCurrency(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 +246,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 +262,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 +277,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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,9 +1,8 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n.tl;
-import com.earth2me.essentials.User;
 import org.bukkit.Server;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
 
 
 public class Commandafk extends EssentialsCommand
@@ -16,56 +15,33 @@ public class Commandafk extends EssentialsCommand
 	@Override
 	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
 	{
+		charge(user);
+
 		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)
+	private final void toggleAfk(User user)
 	{
-		user.setDisplayNick();
-		String msg = "";
 		if (!user.toggleAfk())
 		{
-			//user.sendMessage(_("markedAsNotAway"));
-			if (!user.isHidden())
-			{
-				msg = tl("userIsNotAway", user.getDisplayName());
-			}
-			user.updateActivity(false);
+			user.sendMessage(Util.i18n("markedAsNotAway"));
+			ess.broadcastMessage(user.getName(), Util.format("userIsNotAway", user.getDisplayName()));
 		}
 		else
 		{
-			//user.sendMessage(_("markedAsAway"));
-			if (!user.isHidden())
-			{
-				msg = tl("userIsAway", user.getDisplayName());
-			}
-		}
-		if (!msg.isEmpty())
-		{
-			ess.broadcastMessage(user, msg);
+			user.sendMessage(Util.i18n("markedAsAway"));
+			ess.broadcastMessage(user.getName(), Util.format("userIsAway", user.getDisplayName()));
 		}
 	}
 }
-

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

@@ -1,12 +1,12 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.utils.LocationUtil;
 import org.bukkit.Location;
 import org.bukkit.Server;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.TargetBlock;
 import org.bukkit.entity.TNTPrimed;
 
-// This command has a in theme message that only shows if you supply a parameter #EasterEgg
+
 public class Commandantioch extends EssentialsCommand
 {
 	public Commandantioch()
@@ -17,13 +17,11 @@ public class Commandantioch extends EssentialsCommand
 	@Override
 	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		if (args.length > 0)
-		{
-			ess.broadcastMessage(user, "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,");
-			ess.broadcastMessage(user, "who being naughty in My sight, shall snuff it.");
-		}
+		charge(user);
+		ess.broadcastMessage(user.getName(), "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,");
+		ess.broadcastMessage(user.getName(), "who being naughty in My sight, shall snuff it.");
 
-		final Location loc = LocationUtil.getTarget(user.getBase());
+		final Location loc = new TargetBlock(user).getTargetBlock().getLocation();
 		loc.getWorld().spawn(loc, TNTPrimed.class);
 	}
 }

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

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

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

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

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

@@ -1,11 +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.NumberUtil;
-import java.math.BigDecimal;
 import org.bukkit.Server;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandbalance extends EssentialsCommand
@@ -16,34 +14,24 @@ 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(Server server, CommandSender sender, String commandLabel, 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(Util.format("balance", Util.formatCurrency(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
+	public void run(Server server, User user, String commandLabel, 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();
-		}
+		charge(user);
+		double bal = (args.length < 1
+					  || !(user.isAuthorized("essentials.balance.others")
+						   || user.isAuthorized("essentials.balance.other"))
+					  ? user
+					  : getPlayer(server, args, 0, true)).getMoney();
+		user.sendMessage(Util.format("balance", Util.formatCurrency(bal, ess)));
 	}
 }

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

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

@@ -1,15 +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 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 com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import org.bukkit.entity.Player;
 
 
 public class Commandban extends EssentialsCommand
@@ -20,61 +16,50 @@ 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();
 		}
-		User user;
-		try
+		final User player = getPlayer(server, args, 0, true);
+		if (player.getBase() instanceof OfflinePlayer)
 		{
-			user = getPlayer(server, args, 0, true, true);
-		}
-		catch (PlayerNotFoundException e)
-		{
-			nomatch = true;
-			user = ess.getUser(new OfflinePlayer(args[0], ess.getServer()));
-		}
-		if (!user.getBase().isOnline())
-		{
-			if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.ban.offline"))
+			if (sender instanceof Player
+				&& !ess.getUser(sender).isAuthorized("essentials.ban.offline"))
 			{
-				throw new Exception(tl("banExemptOffline"));
+				sender.sendMessage(Util.i18n("banExempt"));
+				return;
 			}
 		}
 		else
 		{
-			if (user.isAuthorized("essentials.ban.exempt") && sender.isPlayer())
+			if (player.isAuthorized("essentials.ban.exempt"))
 			{
-				throw new Exception(tl("banExempt"));
+				sender.sendMessage(Util.i18n("banExempt"));
+				return;
 			}
 		}
 
-		final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
 		String banReason;
 		if (args.length > 1)
 		{
-			banReason = FormatUtil.replaceFormat(getFinalArg(args, 1).replace("\\n", "\n").replace("|", "\n"));
+			banReason = getFinalArg(args, 1);
+			player.setBanReason(commandLabel);
 		}
 		else
 		{
-			banReason = tl("defaultBanReason");
+			banReason = Util.i18n("defaultBanReason");
 		}
-		
-		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));
-
-		if (nomatch)
+		player.kickPlayer(banReason);
+		ess.getBans().banByName(player.getName());
+		for(Player p : server.getOnlinePlayers())
 		{
-			sender.sendMessage(tl("userUnknown", user.getName()));
+			User u = ess.getUser(p);
+			if(u.isAuthorized("essentials.ban.notify"))
+			{
+			p.sendMessage(Util.format("playerBanned", player.getName(), banReason));
+			}
 		}
-
-		ess.broadcastMessage("essentials.ban.notify", tl("playerBanned", senderName, user.getName(), banReason));
 	}
 }