Add a little bit of extra information to /seen, this will show when user is online.

Still bugged in CB: maxAmount of items

.classpath

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/bukkit-0.0.1-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/Permissions3.jar"/>
+</classpath>

.gitignore

@@ -1,37 +1,47 @@
-# Eclipse stuff
+.DS_Store
-.classpath
+/BuildAll/nbproject/private/
-.project
+/EssentialsProtect/nbproject/private/
-.settings
+/EssentialsChat/nbproject/private/
-
+/EssentialsGroupBridge/nbproject/private/
-# netbeans
+/EssentialsGeoIP/nbproject/private/
-nbproject
+/EssentialsSpawn/nbproject/private/
-
+/EssentialsXMPP/nbproject/private/
-# we use maven!
+/EssentialsGroupManager/nbproject/private/
-build.xml
+/BuildAll/build/
-
+/EssentialsGroupBridge/dist/
-# maven
+/EssentialsGroupBridge/build/
-target
+/EssentialsGeoIP/dist/
-jars
+/EssentialsGeoIP/build/
-dependency-reduced-pom.xml
+/EssentialsGroupManager/build/
-
+/EssentialsGroupManager/dist/
-# vim
+/BuildAll/dist/
-.*.sw[a-p]
+/EssentialsChat/build/
-
+/EssentialsChat/dist/
-# various other potential build files
+/EssentialsSpawn/build/
-build
+/EssentialsSpawn/dist/
-bin
+/EssentialsXMPP/dist/
-dist
+/EssentialsXMPP/build/
-manifest.mf
+/EssentialsProtect/dist/
-
+/EssentialsProtect/build/
-# Mac filesystem dust
+/EssentialsPermissionsCommands/nbproject/private/
-.DS_Store
+/EssentialsPermissionsCommands/build/
-
+/EssentialsPermissionsCommands/dist/
-# intellij
+/Essentials/nbproject/private/
-*.iml
+/Essentials/dist/
-*.ipr
+/Essentials/build/
-*.iws
+/YamlAnnotations/
-.idea/
+/EssentialsUpdate/nbproject/private/
-
+/EssentialsRelease/
-/EssentialsRelease/
+/EssentialsUpdate/dist/
-*.mo
+/EssentialsUpdate/build/
-*.po.~*~
+/WebPush/apikey.php
+/WebPush/nbproject/private
+/.idea
+*.iml
+/EssentialsGroupManager/bin
+/EssentialsGroupManager/.externalToolBuilders
+/EssentialsAntiBuild/nbproject/private/
+/EssentialsAntiBuild/dist/
+/EssentialsAntiBuild/build/
+/jars
+/out

.project

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

.travis.yml

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

BuildAll/build.xml

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

BuildAll/nbproject/genfiles.properties

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

BuildAll/nbproject/project.properties

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

BuildAll/nbproject/project.xml

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

Essentials/build.xml

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

Essentials/nb-configuration.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-  <!--
-  This file contains additional configuration written by modules in the NetBeans IDE.
-  The configuration is intended to be shared among all the users of project and
-  therefore it is assumed to be part of version control checkout.
-  Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-  -->
-  <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-    <!--
-    Properties that influence various parts of the IDE, especially code formatting and the like. 
-    You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-    That way multiple projects can share the same settings (useful for formatting rules for example).
-    Any value defined here will override the pom.xml file value but is only applicable to the current project.
-    -->
-    <netbeans.compile.on.save>all</netbeans.compile.on.save>
-  </properties>
-</project-shared-configuration>

Essentials/nbproject/genfiles.properties

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

Essentials/nbproject/pmd.settings

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

Essentials/nbproject/project.properties

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

Essentials/nbproject/project.xml

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

Essentials/pom.xml

@@ -1,119 +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.essentials3</groupId>
-    <artifactId>EssentialsParent</artifactId>
-    <version>3.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>Essentials</artifactId>
-  <dependencies>
-    <!-- Internal Depends -->
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>EssentialsGroupManager</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-      <version>0.11.6</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.4.1</version>
-    </dependency>
-    <!-- Test Depends -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.10</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- External Plugin Depends -->
-    <dependency>
-      <groupId>cosine</groupId>
-      <artifactId>BOSEconomy</artifactId>
-      <version>0.7</version>
-    </dependency>
-    <dependency>
-      <groupId>com.iConomy</groupId>
-      <artifactId>iConomy</artifactId>
-      <version>5.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.iCo6</groupId>
-      <artifactId>iConomy</artifactId>
-      <version>6.0</version>
-    </dependency>
-    <dependency>
-      <groupId>me.ashtheking</groupId>
-      <artifactId>MultiCurrency</artifactId>
-      <version>0.05</version>
-    </dependency>
-    <dependency>
-      <groupId>net.milkbowl</groupId>
-      <artifactId>Vault</artifactId>
-      <version>1.2</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.0</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>commons-io:*</include>
-                  <include>org.apache.commons:commons-compress</include>
-                </includes>
-              </artifactSet>
-              <minimizeJar>true</minimizeJar>
-              <relocations>
-                <relocation>
-                  <pattern>org.apache.commons</pattern>
-                  <shadedPattern>net.ess3.commons</shadedPattern>
-                </relocation>
-              </relocations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.xnap.commons</groupId>
-        <artifactId>maven-gettext-plugin</artifactId>
-        <configuration>
-          <poDirectory>${basedir}/po/</poDirectory>
-          <targetBundle>messages2</targetBundle>
-          <keywords>-k_ -kComment -k -s --package-name=Essentials --package-version=${project.version} --copyright-holder="Essentials Team"</keywords>
-          <outputFormat>properties</outputFormat>
-          <sourceDirectory>${basedir}/../</sourceDirectory>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</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

@@ -0,0 +1,137 @@
+package com.earth2me.essentials;
+
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+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("Minecraft");
+	private final transient Map<String, List<PluginCommand>> altcommands = new HashMap<String, List<PluginCommand>>();
+	private final transient Map<String, String> disabledList = new HashMap<String, String>();
+	private final transient IEssentials ess;
+
+	public AlternativeCommandsHandler(final IEssentials ess)
+	{
+		this.ess = ess;
+		for (Plugin plugin : ess.getServer().getPluginManager().getPlugins())
+		{
+			if (plugin.isEnabled())
+			{
+				addPlugin(plugin);
+			}
+		}
+	}
+
+	public 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 String otherLabel)
+	{
+		if (ess.getSettings().isDebug())
+		{
+			LOGGER.log(Level.INFO, "Essentials: Alternative command " + label + " found, using " + otherLabel);
+		}
+		disabledList.put(label, otherLabel);
+	}
+
+	public Map<String, String> disabledCommands()
+	{
+		return disabledList;
+	}
+}

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

@@ -0,0 +1,140 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+
+
+public class Backup implements Runnable
+{
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+	private transient final Server server;
+	private transient final IEssentials ess;
+	private transient boolean running = false;
+	private transient int taskId = -1;
+	private transient boolean active = false;
+
+	public Backup(final IEssentials ess)
+	{
+		this.ess = ess;
+		server = ess.getServer();
+		if (server.getOnlinePlayers().length > 0)
+		{
+			startTask();
+		}
+	}
+
+	void onPlayerJoin()
+	{
+		startTask();
+	}
+
+	private void startTask()
+	{
+		if (!running)
+		{
+			final long interval = ess.getSettings().getBackupInterval() * 1200; // minutes -> ticks
+			if (interval < 1200)
+			{
+				return;
+			}
+			taskId = ess.scheduleSyncRepeatingTask(this, interval, interval);
+			running = true;
+		}
+	}
+
+	@Override
+	public void run()
+	{
+		if (active)
+		{
+			return;
+		}
+		active = true;
+		final String command = ess.getSettings().getBackupCommand();
+		if (command == null || "".equals(command))
+		{
+			return;
+		}
+		if ("save-all".equalsIgnoreCase(command)) {
+			final CommandSender cs = server.getConsoleSender();
+			server.dispatchCommand(cs, "save-all");
+			active = false;
+			return;
+		}
+		LOGGER.log(Level.INFO, _("backupStarted"));
+		final CommandSender cs = server.getConsoleSender();
+		server.dispatchCommand(cs, "save-all");
+		server.dispatchCommand(cs, "save-off");
+
+		ess.scheduleAsyncDelayedTask(
+				new Runnable()
+				{
+					@Override
+					public void run()
+					{
+						try
+						{
+							final ProcessBuilder childBuilder = new ProcessBuilder(command);
+							childBuilder.redirectErrorStream(true);
+							childBuilder.directory(ess.getDataFolder().getParentFile().getParentFile());
+							final Process child = childBuilder.start();
+							final BufferedReader reader = new BufferedReader(new InputStreamReader(child.getInputStream()));
+							try
+							{
+								child.waitFor();
+								String line;
+								do
+								{
+									line = reader.readLine();
+									if (line != null)
+									{
+										LOGGER.log(Level.INFO, line);
+									}
+								}
+								while (line != null);
+							}
+							finally
+							{
+								reader.close();
+							}
+						}
+						catch (InterruptedException ex)
+						{
+							LOGGER.log(Level.SEVERE, null, ex);
+						}
+						catch (IOException ex)
+						{
+							LOGGER.log(Level.SEVERE, null, ex);
+						}
+						finally
+						{
+							ess.scheduleSyncDelayedTask(
+									new Runnable()
+									{
+										@Override
+										public void run()
+										{
+											server.dispatchCommand(cs, "save-on");
+											if (server.getOnlinePlayers().length == 0)
+											{
+												running = false;
+												if (taskId != -1)
+												{
+													server.getScheduler().cancelTask(taskId);
+												}
+											}
+											active = false;
+											LOGGER.log(Level.INFO, _("backupFinished"));
+										}
+									});
+						}
+					}
+				});
+	}
+}

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

@@ -0,0 +1,15 @@
+package com.earth2me.essentials;
+
+
+public class ChargeException extends Exception
+{
+	public ChargeException(final String message)
+	{
+		super(message);
+	}
+
+	public ChargeException(final String message, final Throwable throwable)
+	{
+		super(message, throwable);
+	}
+}

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

@@ -1,6 +1,6 @@
-package net.ess3;
+package com.earth2me.essentials;
 
-import net.ess3.api.IReplyTo;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
 
@@ -14,8 +14,13 @@ public final class Console implements IReplyTo
 	{
 	}
 
+	public static CommandSender getCommandSender(Server server) throws Exception
+	{
+		return server.getConsoleSender();
+	}
+
 	@Override
-	public void setReplyTo(final CommandSender user)
+	public void setReplyTo(CommandSender user)
 	{
 		replyTo = user;
 	}

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

@@ -1,20 +1,23 @@
-package net.ess3.utils;
+package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n._;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import static net.ess3.I18n._;
 
 
 /**
  * This utility class is used for converting between the ingame time in ticks to ingame time as a friendly string. Note
  * that the time is INGAME.
- * <p/>
+ *
  * http://www.minecraftwiki.net/wiki/Day/night_cycle
  *
  * @author Olof Larsson
  */
 public final class DescParseTickFormat
 {
+	// ============================================
+	// First some information vars. TODO: Should this be in a config file?
+	// --------------------------------------------
 	public static final Map<String, Integer> nameToTicks = new LinkedHashMap<String, Integer>();
 	public static final Set<String> resetAliases = new HashSet<String>();
 	public static final int ticksAtMidnight = 18000;
@@ -228,7 +231,7 @@ public final class DescParseTickFormat
 	// --------------------------------------------
 	public static String format(final long ticks)
 	{
-		return _("§c{0}§6 or §c{1}§6 or §c{2}§6.", format24(ticks), format12(ticks), formatTicks(ticks));
+		return _("timeFormat", format24(ticks), format12(ticks), formatTicks(ticks));
 	}
 
 	public static String formatTicks(final long ticks)
@@ -266,11 +269,11 @@ public final class DescParseTickFormat
 
 		// How many ingame days have passed since the server start?
 		final long days = ticks / ticksPerDay;
-		ticks -= ticks * ticksPerDay;
+		ticks -= days * ticksPerDay;
 
 		// How many hours on the last day?
 		final long hours = ticks / ticksPerHour;
-		ticks -= ticks * ticksPerHour;
+		ticks -= hours * ticksPerHour;
 
 		// How many minutes on the last day?
 		final long minutes = (long)Math.floor(ticks / ticksPerMinute);
@@ -279,7 +282,7 @@ public final class DescParseTickFormat
 		// How many seconds on the last day?
 		final long seconds = (long)Math.floor(dticks / ticksPerSecond);
 
-		// Now we create an english GMT calendar (We want no daylight savings)
+		// Now we create an english GMT calendar (We wan't no daylight savings)
 		final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"), Locale.ENGLISH);
 		cal.setLenient(true);
 

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

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

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

@@ -0,0 +1,684 @@
+/*
+ * Essentials - a bukkit plugin
+ * Copyright (C) 2011  Essentials Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.Economy;
+import com.earth2me.essentials.api.IJails;
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import com.earth2me.essentials.commands.NoChargeException;
+import com.earth2me.essentials.commands.NotEnoughArgumentsException;
+import com.earth2me.essentials.metrics.Metrics;
+import com.earth2me.essentials.metrics.MetricsListener;
+import com.earth2me.essentials.metrics.MetricsStarter;
+import com.earth2me.essentials.perm.PermissionsHandler;
+import com.earth2me.essentials.register.payment.Methods;
+import com.earth2me.essentials.signs.SignBlockListener;
+import com.earth2me.essentials.signs.SignEntityListener;
+import com.earth2me.essentials.signs.SignPlayerListener;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.PluginCommand;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.world.WorldLoadEvent;
+import org.bukkit.event.world.WorldUnloadEvent;
+import org.bukkit.plugin.InvalidDescriptionException;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.yaml.snakeyaml.error.YAMLException;
+
+
+public class Essentials extends JavaPlugin implements IEssentials
+{
+	public static final int BUKKIT_VERSION = 2543;
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+	private transient ISettings settings;
+	private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this);
+	private transient Jails jails;
+	private transient Warps warps;
+	private transient Worth worth;
+	private transient List<IConf> confList;
+	private transient Backup backup;
+	private transient ItemDb itemDb;
+	private transient final Methods paymentMethod = new Methods();
+	private transient PermissionsHandler permissionsHandler;
+	private transient AlternativeCommandsHandler alternativeCommandsHandler;
+	private transient UserMap userMap;
+	private transient ExecuteTimer execTimer;
+	private transient I18n i18n;
+	private transient Metrics metrics;
+	private transient EssentialsTimer timer;
+	private transient List<String> vanishedPlayers = new ArrayList<String>();
+
+	@Override
+	public ISettings getSettings()
+	{
+		return settings;
+	}
+
+	public void setupForTesting(final Server server) throws IOException, InvalidDescriptionException
+	{
+		final File dataFolder = File.createTempFile("essentialstest", "");
+		if (!dataFolder.delete())
+		{
+			throw new IOException();
+		}
+		if (!dataFolder.mkdir())
+		{
+			throw new IOException();
+		}
+		i18n = new I18n(this);
+		i18n.onEnable();
+		LOGGER.log(Level.INFO, _("usingTempFolderForTesting"));
+		LOGGER.log(Level.INFO, dataFolder.toString());
+		this.initialize(null, server, new PluginDescriptionFile(new FileReader(new File("src" + File.separator + "plugin.yml"))), dataFolder, null, null);
+		settings = new Settings(this);
+		i18n.updateLocale("en");
+		userMap = new UserMap(this);
+		permissionsHandler = new PermissionsHandler(this, false);
+		Economy.setEss(this);
+	}
+
+	@Override
+	public void onEnable()
+	{
+		execTimer = new ExecuteTimer();
+		execTimer.start();
+		i18n = new I18n(this);
+		i18n.onEnable();
+		execTimer.mark("I18n1");
+		final PluginManager pm = getServer().getPluginManager();
+		for (Plugin plugin : pm.getPlugins())
+		{
+			if (plugin.getDescription().getName().startsWith("Essentials")
+				&& !plugin.getDescription().getVersion().equals(this.getDescription().getVersion())
+				&& !plugin.getDescription().getName().equals("EssentialsAntiCheat"))
+			{
+				LOGGER.log(Level.WARNING, _("versionMismatch", plugin.getDescription().getName()));
+			}
+		}
+		final Matcher versionMatch = Pattern.compile("git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*").matcher(getServer().getVersion());
+		if (versionMatch.matches())
+		{
+			final int versionNumber = Integer.parseInt(versionMatch.group(1));
+			if (versionNumber < BUKKIT_VERSION && versionNumber > 100)
+			{
+				LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
+				LOGGER.log(Level.SEVERE, _("notRecommendedBukkit"));
+				LOGGER.log(Level.SEVERE, _("requiredBukkit", Integer.toString(BUKKIT_VERSION)));
+				LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
+				this.setEnabled(false);
+				return;
+			}
+		}
+		else
+		{
+			LOGGER.log(Level.INFO, _("bukkitFormatChanged"));
+			LOGGER.log(Level.INFO, getServer().getVersion());
+			LOGGER.log(Level.INFO, getServer().getBukkitVersion());
+		}
+		execTimer.mark("BukkitCheck");
+		try
+		{
+			final EssentialsUpgrade upgrade = new EssentialsUpgrade(this);
+			upgrade.beforeSettings();
+			execTimer.mark("Upgrade");
+			confList = new ArrayList<IConf>();
+			settings = new Settings(this);
+			confList.add(settings);
+			execTimer.mark("Settings");
+			upgrade.afterSettings();
+			execTimer.mark("Upgrade2");
+			i18n.updateLocale(settings.getLocale());
+			userMap = new UserMap(this);
+			confList.add(userMap);
+			execTimer.mark("Init(Usermap)");
+			warps = new Warps(getServer(), this.getDataFolder());
+			confList.add(warps);
+			execTimer.mark("Init(Spawn/Warp)");
+			worth = new Worth(this.getDataFolder());
+			confList.add(worth);
+			itemDb = new ItemDb(this);
+			confList.add(itemDb);
+			execTimer.mark("Init(Worth/ItemDB)");
+			reload();
+		}
+		catch (YAMLException exception)
+		{
+			if (pm.getPlugin("EssentialsUpdate") != null)
+			{
+				LOGGER.log(Level.SEVERE, _("essentialsHelp2"));
+			}
+			else
+			{
+				LOGGER.log(Level.SEVERE, _("essentialsHelp1"));
+			}
+			LOGGER.log(Level.SEVERE, exception.toString());
+			pm.registerEvents(new Listener()
+			{
+				@EventHandler(priority = EventPriority.LOW)
+				public void onPlayerJoin(final PlayerJoinEvent event)
+				{
+					event.getPlayer().sendMessage("Essentials failed to load, read the log file.");
+				}
+			}, this);
+			for (Player player : getServer().getOnlinePlayers())
+			{
+				player.sendMessage("Essentials failed to load, read the log file.");
+			}
+			this.setEnabled(false);
+			return;
+		}
+		backup = new Backup(this);
+		permissionsHandler = new PermissionsHandler(this, settings.useBukkitPermissions());
+		alternativeCommandsHandler = new AlternativeCommandsHandler(this);
+		final EssentialsPluginListener serverListener = new EssentialsPluginListener(this);
+		pm.registerEvents(serverListener, this);
+		confList.add(serverListener);
+
+		final EssentialsPlayerListener playerListener = new EssentialsPlayerListener(this);
+		pm.registerEvents(playerListener, this);
+
+		final EssentialsBlockListener blockListener = new EssentialsBlockListener(this);
+		pm.registerEvents(blockListener, this);
+
+		final SignBlockListener signBlockListener = new SignBlockListener(this);
+		pm.registerEvents(signBlockListener, this);
+
+		final SignPlayerListener signPlayerListener = new SignPlayerListener(this);
+		pm.registerEvents(signPlayerListener, this);
+
+		final SignEntityListener signEntityListener = new SignEntityListener(this);
+		pm.registerEvents(signEntityListener, this);
+
+		final EssentialsEntityListener entityListener = new EssentialsEntityListener(this);
+		pm.registerEvents(entityListener, this);
+
+		final EssentialsWorldListener worldListener = new EssentialsWorldListener(this);
+		pm.registerEvents(worldListener, this);
+
+		//TODO: Check if this should be here, and not above before reload()
+		jails = new Jails(this);
+		confList.add(jails);
+
+		pm.registerEvents(tntListener, this);
+
+		timer = new EssentialsTimer(this);
+		getScheduler().scheduleSyncRepeatingTask(this, timer, 100, 100);
+
+		Economy.setEss(this);
+		execTimer.mark("RegListeners");
+
+		final MetricsStarter metricsStarter = new MetricsStarter(this);
+		if (metricsStarter.getStart() != null && metricsStarter.getStart() == true)
+		{
+			getScheduler().scheduleAsyncDelayedTask(this, metricsStarter, 1);
+		}
+		else if (metricsStarter.getStart() != null && metricsStarter.getStart() == false)
+		{
+			final MetricsListener metricsListener = new MetricsListener(this, metricsStarter);
+			pm.registerEvents(metricsListener, this);
+		}
+
+		final String timeroutput = execTimer.end();
+		if (getSettings().isDebug())
+		{
+			LOGGER.log(Level.INFO, "Essentials load " + timeroutput);
+		}
+	}
+
+	@Override
+	public void onDisable()
+	{
+		for (Player p : getServer().getOnlinePlayers())
+		{
+			User user = getUser(p);
+			if (user.isVanished())
+			{
+				user.toggleVanished();
+				p.sendMessage(_("unvanishedReload"));
+			}
+		}
+		i18n.onDisable();
+		Economy.setEss(null);
+		Trade.closeLog();
+	}
+
+	@Override
+	public void reload()
+	{
+		Trade.closeLog();
+
+		for (IConf iConf : confList)
+		{
+			iConf.reloadConfig();
+			execTimer.mark("Reload(" + iConf.getClass().getSimpleName() + ")");
+		}
+
+		i18n.updateLocale(settings.getLocale());
+	}
+
+	@Override
+	public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args)
+	{
+		return onCommandEssentials(sender, command, commandLabel, args, Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.", null);
+	}
+
+	@Override
+	public boolean onCommandEssentials(final CommandSender sender, final Command command, final String commandLabel, final String[] args, final ClassLoader classLoader, final String commandPath, final String permissionPrefix, final IEssentialsModule module)
+	{
+		// Allow plugins to override the command via onCommand
+		if (!getSettings().isCommandOverridden(command.getName()) && (!commandLabel.startsWith("e") || commandLabel.equalsIgnoreCase(command.getName())))
+		{
+			final PluginCommand pc = alternativeCommandsHandler.getAlternative(commandLabel);
+			if (pc != null)
+			{
+				alternativeCommandsHandler.executed(commandLabel, pc.getLabel());
+				try
+				{
+					return pc.execute(sender, commandLabel, args);
+				}
+				catch (final Exception ex)
+				{
+					Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+					sender.sendMessage(ChatColor.RED + "An internal error occurred while attempting to perform this command");
+					return true;
+				}
+			}
+		}
+
+		try
+		{
+			User user = null;
+			if (sender instanceof Player)
+			{
+				user = getUser(sender);
+			}
+
+			// New mail notification
+			if (user != null && !getSettings().isCommandDisabled("mail") && !commandLabel.equals("mail") && user.isAuthorized("essentials.mail"))
+			{
+				final List<String> mail = user.getMails();
+				if (mail != null && !mail.isEmpty())
+				{
+					user.sendMessage(_("youHaveNewMail", mail.size()));
+				}
+			}
+
+			// Check for disabled commands
+			if (getSettings().isCommandDisabled(commandLabel))
+			{
+				return true;
+			}
+
+			IEssentialsCommand cmd;
+			try
+			{
+				cmd = (IEssentialsCommand)classLoader.loadClass(commandPath + command.getName()).newInstance();
+				cmd.setEssentials(this);
+				cmd.setEssentialsModule(module);
+			}
+			catch (Exception ex)
+			{
+				sender.sendMessage(_("commandNotLoaded", commandLabel));
+				LOGGER.log(Level.SEVERE, _("commandNotLoaded", commandLabel), ex);
+				return true;
+			}
+
+			// Check authorization
+			if (user != null && !user.isAuthorized(cmd, permissionPrefix))
+			{
+				LOGGER.log(Level.WARNING, _("deniedAccessCommand", user.getName()));
+				user.sendMessage(_("noAccessCommand"));
+				return true;
+			}
+
+			// Run the command
+			try
+			{
+				if (user == null)
+				{
+					cmd.run(getServer(), sender, commandLabel, command, args);
+				}
+				else
+				{
+					cmd.run(getServer(), user, commandLabel, command, args);
+				}
+				return true;
+			}
+			catch (NoChargeException ex)
+			{
+				return true;
+			}
+			catch (NotEnoughArgumentsException ex)
+			{
+				sender.sendMessage(command.getDescription());
+				sender.sendMessage(command.getUsage().replaceAll("<command>", commandLabel));
+				if (!ex.getMessage().isEmpty())
+				{
+					sender.sendMessage(ex.getMessage());
+				}
+				return true;
+			}
+			catch (Throwable ex)
+			{
+				showError(sender, ex, commandLabel);
+				return true;
+			}
+		}
+		catch (Throwable ex)
+		{
+			LOGGER.log(Level.SEVERE, _("commandFailed", commandLabel), ex);
+			return true;
+		}
+	}
+
+	@Override
+	public void showError(final CommandSender sender, final Throwable exception, final String commandLabel)
+	{
+		sender.sendMessage(_("errorWithMessage", exception.getMessage()));
+		if (getSettings().isDebug())
+		{
+			LOGGER.log(Level.WARNING, _("errorCallingCommand", commandLabel), exception);
+		}
+	}
+
+	@Override
+	public BukkitScheduler getScheduler()
+	{
+		return this.getServer().getScheduler();
+	}
+
+	@Override
+	public IJails getJails()
+	{
+		return jails;
+	}
+
+	@Override
+	public Warps getWarps()
+	{
+		return warps;
+	}
+
+	@Override
+	public Worth getWorth()
+	{
+		return worth;
+	}
+
+	@Override
+	public Backup getBackup()
+	{
+		return backup;
+	}
+
+	public Metrics getMetrics()
+	{
+		return metrics;
+	}
+
+	public void setMetrics(Metrics metrics)
+	{
+		this.metrics = metrics;
+	}
+
+	@Override
+	public User getUser(final Object base)
+	{
+		if (base instanceof Player)
+		{
+			return getUser((Player)base);
+		}
+		if (base instanceof String)
+		{
+			return getOfflineUser((String)base);
+		}
+		return null;
+	}
+	
+	@Override
+	public User getOfflineUser(final String name)
+	{
+		final User user = userMap.getUser(name);
+		if (user != null && user.getBase() instanceof OfflinePlayer)
+		{
+			((OfflinePlayer)user.getBase()).setName(name);
+		}
+		return user;
+	}
+
+	private <T extends Player> User getUser(final T base)
+	{
+		if (base == null)
+		{
+			return null;
+		}
+
+		if (base instanceof User)
+		{
+			return (User)base;
+		}
+
+		if (userMap == null)
+		{
+			LOGGER.log(Level.WARNING, "Essentials userMap not initialized");
+			return null;
+		}
+
+		User user = userMap.getUser(base.getName());
+
+		if (user == null)
+		{
+			user = new User(base, this);
+		}
+		else
+		{
+			user.update(base);
+		}
+		return user;
+	}
+
+	@Override
+	public World getWorld(final String name)
+	{
+		if (name.matches("[0-9]+"))
+		{
+			final int worldId = Integer.parseInt(name);
+			if (worldId < getServer().getWorlds().size())
+			{
+				return getServer().getWorlds().get(worldId);
+			}
+		}
+		return getServer().getWorld(name);
+	}
+
+	@Override
+	public void addReloadListener(final IConf listener)
+	{
+		confList.add(listener);
+	}
+
+	@Override
+	public Methods getPaymentMethod()
+	{
+		return paymentMethod;
+	}
+
+	@Override
+	public int broadcastMessage(final IUser sender, final String message)
+	{
+		if (sender == null)
+		{
+			return getServer().broadcastMessage(message);
+		}
+		if (sender.isHidden())
+		{
+			return 0;
+		}
+		final Player[] players = getServer().getOnlinePlayers();
+
+		for (Player player : players)
+		{
+			final User user = getUser(player);
+			if (!user.isIgnoredPlayer(sender))
+			{
+				player.sendMessage(message);
+			}
+		}
+
+		return players.length;
+	}
+
+	@Override
+	public int scheduleAsyncDelayedTask(final Runnable run)
+	{
+		return this.getScheduler().scheduleAsyncDelayedTask(this, run);
+	}
+
+	@Override
+	public int scheduleSyncDelayedTask(final Runnable run)
+	{
+		return this.getScheduler().scheduleSyncDelayedTask(this, run);
+	}
+
+	@Override
+	public int scheduleSyncDelayedTask(final Runnable run, final long delay)
+	{
+		return this.getScheduler().scheduleSyncDelayedTask(this, run, delay);
+	}
+
+	@Override
+	public int scheduleSyncRepeatingTask(final Runnable run, final long delay, final long period)
+	{
+		return this.getScheduler().scheduleSyncRepeatingTask(this, run, delay, period);
+	}
+
+	@Override
+	public TNTExplodeListener getTNTListener()
+	{
+		return tntListener;
+	}
+
+	@Override
+	public PermissionsHandler getPermissionsHandler()
+	{
+		return permissionsHandler;
+	}
+
+	@Override
+	public AlternativeCommandsHandler getAlternativeCommandsHandler()
+	{
+		return alternativeCommandsHandler;
+	}
+
+	@Override
+	public ItemDb getItemDb()
+	{
+		return itemDb;
+	}
+
+	@Override
+	public UserMap getUserMap()
+	{
+		return userMap;
+	}
+
+	@Override
+	public I18n getI18n()
+	{
+		return i18n;
+	}
+
+	@Override
+	public EssentialsTimer getTimer()
+	{
+		return timer;
+	}
+
+	@Override
+	public List<String> getVanishedPlayers()
+	{
+		return vanishedPlayers;
+	}
+
+
+	private static class EssentialsWorldListener implements Listener, Runnable
+	{
+		private transient final IEssentials ess;
+
+		public EssentialsWorldListener(final IEssentials ess)
+		{
+			this.ess = ess;
+		}
+
+		@EventHandler(priority = EventPriority.LOW)
+		public void onWorldLoad(final WorldLoadEvent event)
+		{
+			ess.getJails().onReload();
+			ess.getWarps().reloadConfig();
+			for (IConf iConf : ((Essentials)ess).confList)
+			{
+				if (iConf instanceof IEssentialsModule)
+				{
+					iConf.reloadConfig();
+				}
+			}
+		}
+
+		@EventHandler(priority = EventPriority.LOW)
+		public void onWorldUnload(final WorldUnloadEvent event)
+		{
+			ess.getJails().onReload();
+			ess.getWarps().reloadConfig();
+			for (IConf iConf : ((Essentials)ess).confList)
+			{
+				if (iConf instanceof IEssentialsModule)
+				{
+					iConf.reloadConfig();
+				}
+			}
+		}
+
+		@Override
+		public void run()
+		{
+			ess.reload();
+		}
+	}
+}

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

@@ -0,0 +1,46 @@
+package com.earth2me.essentials;
+
+import org.bukkit.GameMode;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.inventory.ItemStack;
+
+
+public class EssentialsBlockListener implements Listener
+{
+	private final transient IEssentials ess;
+
+	public EssentialsBlockListener(final IEssentials ess)
+	{
+		this.ess = ess;
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onBlockPlace(final BlockPlaceEvent event)
+	{
+		// Do not rely on getItemInHand();
+		// http://leaky.bukkit.org/issues/663		
+		final ItemStack is = Util.convertBlockToItem(event.getBlockPlaced());
+		if (is == null)
+		{
+			return;
+		}
+		final User user = ess.getUser(event.getPlayer());
+		final boolean unlimitedForUser = user.hasUnlimited(is);
+		if (unlimitedForUser && user.getGameMode() == GameMode.SURVIVAL)
+		{
+			ess.scheduleSyncDelayedTask(
+					new Runnable()
+					{
+						@Override
+						public void run()
+						{
+							user.getInventory().addItem(is);
+							user.updateInventory();
+						}
+					});
+		}
+	}
+}

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

@@ -1,37 +1,32 @@
 package com.earth2me.essentials;
 
-import static net.ess3.I18n._;
+import static com.earth2me.essentials.I18n._;
+import com.google.common.io.Files;
 import java.io.*;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
-import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CoderResult;
-import java.util.HashMap;
+import java.util.*;
-import java.util.Locale;
-import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.bukkit.Location;
+import org.bukkit.*;
-import org.bukkit.Material;
+import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
-import com.google.common.io.Files;
+import org.bukkit.util.Vector;
-import net.ess3.storage.StoredLocation;
 
 
-@Deprecated
 public class EssentialsConf extends YamlConfiguration
 {
 	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private File configFile;
+	private transient File configFile;
-	private String templateName = null;
+	private transient String templateName = null;
-	private Class<?> resourceClass = EssentialsConf.class;
+	private transient Class<?> resourceClass = EssentialsConf.class;
 	private static final Charset UTF8 = Charset.forName("UTF-8");
 
 	public EssentialsConf(final File configFile)
@@ -39,6 +34,7 @@ public class EssentialsConf extends YamlConfiguration
 		super();
 		this.configFile = configFile;
 	}
+	private final byte[] bytebuffer = new byte[1024];
 
 	public synchronized void load()
 	{
@@ -47,7 +43,7 @@ public class EssentialsConf extends YamlConfiguration
 		{
 			if (!configFile.getParentFile().mkdirs())
 			{
-				LOGGER.log(Level.SEVERE, _("Failed to create config {0}.", configFile.toString()));
+				LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()));
 			}
 		}
 		// This will delete files where the first character is 0. In most cases they are broken.
@@ -90,23 +86,12 @@ public class EssentialsConf extends YamlConfiguration
 		{
 			if (templateName != null)
 			{
-				LOGGER.log(Level.INFO, _("Creating config from template: {0}", configFile.toString()));
+				LOGGER.log(Level.INFO, _("creatingConfigFromTemplate", configFile.toString()));
 				createFromTemplate();
 			}
 			else
 			{
-				try
+				return;
-				{
-					LOGGER.log(Level.INFO, _("Creating empty config: {0}", configFile.toString()));
-					if (!configFile.createNewFile())
-					{
-						LOGGER.log(Level.SEVERE, _("Failed to create config {0}.", configFile.toString()));
-					}
-				}
-				catch (IOException ex)
-				{
-					LOGGER.log(Level.SEVERE, _("Failed to create config {0}.", configFile.toString()), ex);
-				}
 			}
 		}
 
@@ -116,9 +101,12 @@ public class EssentialsConf extends YamlConfiguration
 			final FileInputStream inputStream = new FileInputStream(configFile);
 			try
 			{
-				final FileChannel channel = inputStream.getChannel();
 				final ByteBuffer buffer = ByteBuffer.allocate((int)configFile.length());
-				channel.read(buffer);
+				int length;
+				while ((length = inputStream.read(bytebuffer)) != -1)
+				{
+					buffer.put(bytebuffer, 0, length);
+				}
 				buffer.rewind();
 				final CharBuffer data = CharBuffer.allocate((int)configFile.length());
 				CharsetDecoder decoder = UTF8.newDecoder();
@@ -127,9 +115,7 @@ public class EssentialsConf extends YamlConfiguration
 				{
 					buffer.rewind();
 					data.clear();
-					LOGGER.log(
+					LOGGER.log(Level.INFO, "File " + configFile.getAbsolutePath().toString() + " is not utf-8 encoded, trying " + Charset.defaultCharset().displayName());
-							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())
@@ -175,7 +161,7 @@ public class EssentialsConf extends YamlConfiguration
 			istr = resourceClass.getResourceAsStream(templateName);
 			if (istr == null)
 			{
-				LOGGER.log(Level.SEVERE, _("§4Could not find template {0}", templateName));
+				LOGGER.log(Level.SEVERE, _("couldNotFindTemplate", templateName));
 				return;
 			}
 			ostr = new FileOutputStream(configFile);
@@ -190,7 +176,7 @@ public class EssentialsConf extends YamlConfiguration
 		}
 		catch (IOException ex)
 		{
-			LOGGER.log(Level.SEVERE, _("Failed to write config {0}.", configFile.toString()), ex);
+			LOGGER.log(Level.SEVERE, _("failedToWriteConfig", configFile.toString()), ex);
 		}
 		finally
 		{
@@ -214,7 +200,7 @@ public class EssentialsConf extends YamlConfiguration
 			}
 			catch (IOException ex)
 			{
-				LOGGER.log(Level.SEVERE, _("Failed to close config {0}.", configFile.toString()), ex);
+				LOGGER.log(Level.SEVERE, _("failedToCloseConfig", configFile.toString()), ex);
 			}
 		}
 	}
@@ -240,17 +226,24 @@ public class EssentialsConf extends YamlConfiguration
 		return isSet(path);
 	}
 
-	public StoredLocation getLocation(final String path, final Server server) throws Exception
+	public Location getLocation(final String path, final Server server) throws Exception
 	{
 		final String worldName = getString((path == null ? "" : path + ".") + "world");
 		if (worldName == null || worldName.isEmpty())
 		{
 			return null;
 		}
-		return new StoredLocation(
+		final World world = server.getWorld(worldName);
-				worldName, getDouble((path == null ? "" : path + ".") + "x", 0), getDouble((path == null ? "" : path + ".") + "y", 0),
+		if (world == null)
-				getDouble((path == null ? "" : path + ".") + "z", 0), (float)getDouble((path == null ? "" : path + ".") + "yaw", 0),
+		{
-				(float)getDouble((path == null ? "" : path + ".") + "pitch", 0));
+			throw new Exception(_("invalidWorld"));
+		}
+		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));
 	}
 
 	public void setProperty(final String path, final Location loc)
@@ -267,7 +260,9 @@ public class EssentialsConf extends YamlConfiguration
 	public ItemStack getItemStack(final String path)
 	{
 		final ItemStack stack = new ItemStack(
-				Material.valueOf(getString(path + ".type", "AIR")), getInt(path + ".amount", 1), (short)getInt(path + ".damage", 0));
+				Material.valueOf(getString(path + ".type", "AIR")),
+				getInt(path + ".amount", 1),
+				(short)getInt(path + ".damage", 0));
 		final ConfigurationSection enchants = getConfigurationSection(path + ".enchant");
 		if (enchants != null)
 		{
@@ -310,7 +305,6 @@ public class EssentialsConf extends YamlConfiguration
 		set(path, map);
 	}
 
-	@Override
 	public long getLong(final String path, final long def)
 	{
 		try
@@ -350,6 +344,11 @@ public class EssentialsConf extends YamlConfiguration
 		}
 	}
 
+	public void saveWithError() throws IOException
+	{
+		save(configFile);
+	}
+
 	@Override
 	public synchronized void save(final File file) throws IOException
 	{
@@ -362,6 +361,28 @@ public class EssentialsConf extends YamlConfiguration
 
 		final String data = saveToString();
 
+		if (data.length() == 0)
+		{
+			return;
+		}
+
+		if (!configFile.exists())
+		{
+			try
+			{
+				LOGGER.log(Level.INFO, _("creatingEmptyConfig", configFile.toString()));
+				if (!configFile.createNewFile())
+				{
+					LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()));
+				}
+			}
+			catch (IOException ex)
+			{
+				LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()), ex);
+			}
+		}
+
+
 		final OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(file), UTF8);
 
 		try
@@ -388,4 +409,261 @@ public class EssentialsConf extends YamlConfiguration
 	{
 		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);
+	}
+
+	@Override
+	public synchronized boolean getBoolean(String path)
+	{
+		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 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 List<Long> getLongList(String path)
+	{
+		return super.getLongList(path);
+	}
+
+	public synchronized Map<String, Object> getMap()
+	{
+		return map;
+	}
+
+	@Override
+	public synchronized List<Map<?, ?>> getMapList(String path)
+	{
+		return super.getMapList(path);
+	}
+
+	@Override
+	public synchronized OfflinePlayer getOfflinePlayer(String path)
+	{
+		return super.getOfflinePlayer(path);
+	}
+
+	@Override
+	public synchronized OfflinePlayer getOfflinePlayer(String path, OfflinePlayer def)
+	{
+		return super.getOfflinePlayer(path, def);
+	}
+
+	@Override
+	public synchronized List<Short> getShortList(String path)
+	{
+		return super.getShortList(path);
+	}
+
+	@Override
+	public synchronized String getString(String path)
+	{
+		return super.getString(path);
+	}
+
+	@Override
+	public synchronized String getString(String path, String def)
+	{
+		return super.getString(path, def);
+	}
+
+	@Override
+	public synchronized List<String> getStringList(String path)
+	{
+		return super.getStringList(path);
+	}
+
+	@Override
+	public synchronized Map<String, Object> getValues(boolean deep)
+	{
+		return super.getValues(deep);
+	}
+
+	@Override
+	public synchronized Vector getVector(String path)
+	{
+		return super.getVector(path);
+	}
+
+	@Override
+	public synchronized Vector getVector(String path, Vector def)
+	{
+		return super.getVector(path, def);
+	}
+
+	@Override
+	public synchronized boolean isBoolean(String path)
+	{
+		return super.isBoolean(path);
+	}
+
+	@Override
+	public synchronized boolean isConfigurationSection(String path)
+	{
+		return super.isConfigurationSection(path);
+	}
+
+	@Override
+	public synchronized boolean isDouble(String path)
+	{
+		return super.isDouble(path);
+	}
+
+	@Override
+	public synchronized boolean isInt(String path)
+	{
+		return super.isInt(path);
+	}
+
+	@Override
+	public synchronized boolean isItemStack(String path)
+	{
+		return super.isItemStack(path);
+	}
+
+	@Override
+	public synchronized boolean isList(String path)
+	{
+		return super.isList(path);
+	}
+
+	@Override
+	public synchronized boolean isLong(String path)
+	{
+		return super.isLong(path);
+	}
+
+	@Override
+	public synchronized boolean isOfflinePlayer(String path)
+	{
+		return super.isOfflinePlayer(path);
+	}
+
+	@Override
+	public synchronized boolean isSet(String path)
+	{
+		return super.isSet(path);
+	}
+
+	@Override
+	public synchronized boolean isString(String path)
+	{
+		return super.isString(path);
+	}
+
+	@Override
+	public synchronized boolean isVector(String path)
+	{
+		return super.isVector(path);
+	}
+
+	@Override
+	public synchronized void set(String path, Object value)
+	{
+		super.set(path, value);
+	}
 }

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

@@ -0,0 +1,200 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Material;
+import org.bukkit.entity.*;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
+import org.bukkit.event.entity.*;
+import org.bukkit.inventory.ItemStack;
+
+
+public class EssentialsEntityListener implements Listener
+{
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+	private final IEssentials ess;
+
+	public EssentialsEntityListener(IEssentials ess)
+	{
+		this.ess = ess;
+	}
+
+	// This method does something undocumented reguarding certain bucket types #EasterEgg
+	@EventHandler(priority = EventPriority.LOW)
+	public void onEntityDamage(final EntityDamageByEntityEvent event)
+	{
+		final Entity eAttack = event.getDamager();
+		final Entity eDefend = event.getEntity();
+		if (eDefend instanceof Player && eAttack instanceof Player)
+		{
+			final User defender = ess.getUser(eDefend);
+			final User attacker = ess.getUser(eAttack);
+			onPlayerVsPlayerDamage(event, defender, attacker);
+			onPlayerVsPlayerPowertool(event, defender, attacker);
+		}
+		else if (eDefend instanceof Player && eAttack instanceof Projectile)
+		{
+			Entity shooter = ((Projectile)event.getDamager()).getShooter();
+			if (shooter instanceof Player)
+			{
+				final User defender = ess.getUser(eDefend);
+				final User attacker = ess.getUser(shooter);
+				onPlayerVsPlayerDamage(event, defender, attacker);
+				onPlayerVsPlayerPowertool(event, defender, attacker);
+			}
+		}
+		else if (eAttack instanceof Player)
+		{
+			final User player = ess.getUser(eAttack);
+			player.updateActivity(true);
+			if (eDefend instanceof Ageable)
+			{
+				final ItemStack hand = player.getItemInHand();
+				if (hand != null && hand.getType() == Material.MILK_BUCKET)
+				{
+					((Ageable)eDefend).setBaby();
+					hand.setType(Material.BUCKET);
+					player.setItemInHand(hand);
+					player.updateInventory();
+					event.setCancelled(true);
+				}
+			}
+		}
+	}
+
+	private void onPlayerVsPlayerDamage(final EntityDamageByEntityEvent event, final User defender, final User attacker)
+	{
+		if (ess.getSettings().getLoginAttackDelay() > 0 && !attacker.isAuthorized("essentials.pvpdelay.exempt")
+			&& (System.currentTimeMillis() < (attacker.getLastLogin() + ess.getSettings().getLoginAttackDelay())))
+		{
+			event.setCancelled(true);
+		}
+
+		if (attacker.hasInvulnerabilityAfterTeleport() || 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);
+		}
+
+		attacker.updateActivity(true);
+	}
+
+	private void onPlayerVsPlayerPowertool(final EntityDamageByEntityEvent event, final User defender, final User attacker)
+	{
+		final List<String> commandList = attacker.getPowertool(attacker.getItemInHand());
+		if (commandList != null && !commandList.isEmpty())
+		{
+			for (final String command : commandList)
+			{
+				if (command != null && !command.isEmpty())
+				{
+					ess.scheduleSyncDelayedTask(
+							new Runnable()
+							{
+								@Override
+								public void run()
+								{
+									attacker.getServer().dispatchCommand(attacker.getBase(), command.replaceAll("\\{player\\}", defender.getName()));
+									LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", attacker.getName(), command));
+								}
+							});
+
+					event.setCancelled(true);
+					return;
+				}
+			}
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onEntityDamage(final EntityDamageEvent event)
+	{
+		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
+		{
+			final Player player = (Player)event.getEntity();
+			player.setFireTicks(0);
+			player.setRemainingAir(player.getMaximumAir());
+			event.setCancelled(true);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onEntityCombust(final EntityCombustEvent event)
+	{
+		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
+		{
+			event.setCancelled(true);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void onPlayerDeathEvent(final PlayerDeathEvent event)
+	{
+		final User user = ess.getUser(event.getEntity());
+		if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back"))
+		{
+			user.setLastLocation();
+			user.sendMessage(_("backAfterDeath"));
+		}
+		if (!ess.getSettings().areDeathMessagesEnabled())
+		{
+			event.setDeathMessage("");
+		}
+	}
+
+	@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 && ess.getUser(event.getEntity()).isGodModeEnabled())
+		{
+			event.setCancelled(true);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onEntityRegainHealth(final EntityRegainHealthEvent event)
+	{
+		if (event.getRegainReason() == RegainReason.SATIATED && event.getEntity() instanceof Player
+			&& ess.getUser(event.getEntity()).isAfk() && ess.getSettings().getFreezeAfkPlayers())
+		{
+			event.setCancelled(true);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onPotionSplashEvent(final PotionSplashEvent event)
+	{
+		for (LivingEntity entity : event.getAffectedEntities())
+		{
+			if (entity instanceof Player && ess.getUser(entity).isGodModeEnabled())
+			{
+				event.setIntensity(entity, 0d);
+			}
+		}
+	}
+}

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

@@ -0,0 +1,564 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.textreader.IText;
+import com.earth2me.essentials.textreader.KeywordReplacer;
+import com.earth2me.essentials.textreader.TextInput;
+import com.earth2me.essentials.textreader.TextPager;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.event.player.*;
+import org.bukkit.event.player.PlayerLoginEvent.Result;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.inventory.ItemStack;
+
+
+public class EssentialsPlayerListener implements Listener
+{
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+	private final transient IEssentials ess;
+	private static final int AIR = Material.AIR.getId();
+	private static final int BED = Material.BED_BLOCK.getId();
+
+	public EssentialsPlayerListener(final IEssentials parent)
+	{
+		this.ess = parent;
+	}
+
+	@EventHandler(priority = EventPriority.NORMAL)
+	public void onPlayerRespawn(final PlayerRespawnEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		updateCompass(user);
+		user.setDisplayNick();
+	}
+
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void onPlayerChat(final AsyncPlayerChatEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		if (user.isMuted())
+		{
+			event.setCancelled(true);
+			user.sendMessage(_("playerMuted"));
+			LOGGER.info(_("mutedUserSpeaks", user.getName()));
+		}
+		final Iterator<Player> it = event.getRecipients().iterator();
+		while (it.hasNext())
+		{
+			final User u = ess.getUser(it.next());
+			if (u.isIgnoredPlayer(user))
+			{
+				it.remove();
+			}
+		}
+		user.updateActivity(true);
+		user.setDisplayNick();
+	}
+
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+	public void onPlayerMove(final PlayerMoveEvent event)
+	{
+		if ((!ess.getSettings().cancelAfkOnMove() && !ess.getSettings().getFreezeAfkPlayers())
+			|| event.getFrom().getBlockX() == event.getTo().getBlockX()
+			   && event.getFrom().getBlockZ() == event.getTo().getBlockZ()
+			   && event.getFrom().getBlockY() == event.getTo().getBlockY())
+		{
+			return;
+		}
+
+		final User user = ess.getUser(event.getPlayer());
+		if (user.isAfk() && ess.getSettings().getFreezeAfkPlayers())
+		{
+			final Location from = event.getFrom();
+			final Location origTo = event.getTo();
+			final Location to = origTo.clone();
+			if (ess.getSettings().cancelAfkOnMove() && origTo.getY() >= from.getBlockY() + 1)
+			{
+				user.updateActivity(true);
+				return;
+			}
+			to.setX(from.getX());
+			to.setY(from.getY());
+			to.setZ(from.getZ());
+			try
+			{
+				event.setTo(Util.getSafeDestination(to));
+			}
+			catch (Exception ex)
+			{
+				event.setTo(to);
+			}
+			return;
+		}
+		final Location afk = user.getAfkPosition();
+		if (afk == null || !event.getTo().getWorld().equals(afk.getWorld()) || afk.distanceSquared(event.getTo()) > 9)
+		{
+			user.updateActivity(true);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onPlayerQuit(final PlayerQuitEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		if (ess.getSettings().removeGodOnDisconnect() && user.isGodModeEnabled())
+		{
+			user.setGodModeEnabled(false);
+		}
+		if (user.isVanished())
+		{
+			user.toggleVanished();
+		}
+		if (!user.isJailed())
+		{
+			user.setLastLocation();
+		}
+		user.updateActivity(false);
+		user.dispose();
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onPlayerJoin(final PlayerJoinEvent event)
+	{
+		ess.scheduleAsyncDelayedTask(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				delayedJoin(event.getPlayer());
+			}
+		});
+	}
+
+	public void delayedJoin(final Player player)
+	{
+		if (!player.isOnline())
+		{
+			return;
+		}
+		ess.getBackup().onPlayerJoin();
+		final User user = ess.getUser(player);
+		user.setDisplayNick();
+		updateCompass(user);
+		user.setLastLogin(System.currentTimeMillis());
+		user.updateActivity(false);
+
+		if (!ess.getVanishedPlayers().isEmpty() && !user.isAuthorized("essentials.vanish.see"))
+		{
+			for (String p : ess.getVanishedPlayers())
+			{
+				Player toVanish = ess.getUser(p).getBase();
+				if (toVanish.isOnline())
+				{
+					user.hidePlayer(toVanish);
+				}
+			}
+		}
+
+		if (user.isAuthorized("essentials.sleepingignored"))
+		{
+			ess.scheduleSyncDelayedTask(new Runnable()
+			{
+				@Override
+				public void run()
+				{
+					user.setSleepingIgnored(true);
+				}
+			});
+		}
+
+		if (!ess.getSettings().isCommandDisabled("motd") && user.isAuthorized("essentials.motd"))
+		{
+			try
+			{
+				final IText input = new TextInput(user, "motd", true, ess);
+				final IText output = new KeywordReplacer(input, user, ess);
+				final TextPager pager = new TextPager(output, true);
+				pager.showPage("1", null, "motd", user);
+			}
+			catch (IOException ex)
+			{
+				if (ess.getSettings().isDebug())
+				{
+					LOGGER.log(Level.WARNING, ex.getMessage(), ex);
+				}
+				else
+				{
+					LOGGER.log(Level.WARNING, ex.getMessage());
+				}
+			}
+		}
+
+		if (!ess.getSettings().isCommandDisabled("mail") && user.isAuthorized("essentials.mail"))
+		{
+			final List<String> mail = user.getMails();
+			if (mail.isEmpty())
+			{
+				final String msg = _("noNewMail");
+				if (!msg.isEmpty())
+				{
+					user.sendMessage(msg);
+				}
+			}
+			else
+			{
+				user.sendMessage(_("youHaveNewMail", mail.size()));
+			}
+		}
+	}
+
+	// Makes the compass item ingame always point to the first essentials home.  #EasterEgg
+	private void updateCompass(final User user)
+	{
+		Location loc = user.getHome(user.getLocation());
+		if (loc == null)
+		{
+			loc = user.getBedSpawnLocation();
+		}
+		if (loc != null)
+		{
+			final Location updateLoc = loc;
+			ess.scheduleSyncDelayedTask(new Runnable()
+			{
+				@Override
+				public void run()
+				{
+					user.setCompassTarget(updateLoc);
+				}
+			});
+		}
+	}
+
+	@EventHandler(priority = EventPriority.HIGH)
+	public void onPlayerLogin(final PlayerLoginEvent event)
+	{
+		switch (event.getResult())
+		{
+		case ALLOWED:
+		case KICK_FULL:
+		case KICK_BANNED:
+			break;
+		default:
+			return;
+		}
+
+		final User user = ess.getUser(event.getPlayer());
+		if (user.isNPC())
+		{
+			user.setNPC(false);
+		}
+
+		final long currentTime = System.currentTimeMillis();
+		final boolean banExpired = user.checkBanTimeout(currentTime);
+		user.checkMuteTimeout(currentTime);
+		user.checkJailTimeout(currentTime);
+
+		if (!banExpired && (user.isBanned() || event.getResult() == Result.KICK_BANNED))
+		{
+			final String banReason = user.getBanReason();
+			event.disallow(Result.KICK_BANNED, banReason != null && !banReason.isEmpty() && !banReason.equalsIgnoreCase("ban") ? banReason : _("defaultBanReason"));
+			return;
+		}
+
+		if (event.getResult() == Result.KICK_FULL && !user.isAuthorized("essentials.joinfullserver"))
+		{
+			event.disallow(Result.KICK_FULL, _("serverFull"));
+			return;
+		}
+		event.allow();
+	}
+
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+	public void onPlayerTeleport(final PlayerTeleportEvent event)
+	{
+		final boolean backListener = ess.getSettings().registerBackInListener();
+		final boolean teleportInvulnerability = ess.getSettings().isTeleportInvulnerability();
+		if (backListener || teleportInvulnerability)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			//There is TeleportCause.COMMMAND but plugins have to actively pass the cause in on their teleports.
+			if (backListener && (event.getCause() == TeleportCause.PLUGIN || event.getCause() == TeleportCause.COMMAND))
+			{
+				user.setLastLocation();
+			}
+			if (teleportInvulnerability)
+			{
+				user.enableInvulnerabilityAfterTeleport();
+			}
+		}
+	}
+
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+	public void onPlayerEggThrow(final PlayerEggThrowEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		final ItemStack stack = new ItemStack(Material.EGG, 1);
+		if (user.hasUnlimited(stack))
+		{
+			user.getInventory().addItem(stack);
+			user.updateInventory();
+		}
+	}
+
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+	public void onPlayerBucketEmpty(final PlayerBucketEmptyEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		if (user.hasUnlimited(new ItemStack(event.getBucket())))
+		{
+			event.getItemStack().setType(event.getBucket());
+			ess.scheduleSyncDelayedTask(new Runnable()
+			{
+				@Override
+				public void run()
+				{
+					user.updateInventory();
+				}
+			});
+		}
+	}
+	private final static List<String> COMMANDS = Arrays.asList("msg", "w", "r", "mail", "m", "t", "whisper", "emsg", "tell", "er", "reply", "ereply", "email", "action", "describe", "eme", "eaction", "edescribe", "etell", "ewhisper", "pm");
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event)
+	{
+		final Player player = event.getPlayer();
+		final String cmd = event.getMessage().toLowerCase(Locale.ENGLISH).split(" ")[0].replace("/", "").toLowerCase(Locale.ENGLISH);
+		if (COMMANDS.contains(cmd))
+		{
+			for (Player onlinePlayer : ess.getServer().getOnlinePlayers())
+			{
+				final User spyer = ess.getUser(onlinePlayer);
+				if (spyer.isSocialSpyEnabled() && !player.equals(onlinePlayer))
+				{
+					onlinePlayer.sendMessage(player.getDisplayName() + " : " + event.getMessage());
+				}
+			}
+		}
+		else if (!cmd.equalsIgnoreCase("afk"))
+		{
+			final User user = ess.getUser(player);
+			user.updateActivity(true);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOW)
+	public void onPlayerChangedWorldHack(final PlayerChangedWorldEvent event)
+	{
+		final Player user = event.getPlayer();
+		if (user.getGameMode() != GameMode.CREATIVE)
+		{
+			user.setAllowFlight(false);
+		}
+		user.setFlySpeed(0.1f);
+		user.setWalkSpeed(0.2f);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onPlayerChangedWorld(final PlayerChangedWorldEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		final String newWorld = event.getPlayer().getLocation().getWorld().getName();
+		user.setDisplayNick();
+		updateCompass(user);
+		if (ess.getSettings().getNoGodWorlds().contains(newWorld) && user.isGodModeEnabledRaw())
+		{
+			user.sendMessage(_("noGodWorldWarning"));
+		}
+
+		if (!event.getPlayer().getWorld().getName().equals(newWorld))
+		{
+			user.sendMessage(_("currentWorld", newWorld));
+		}
+	}
+
+	@EventHandler(priority = EventPriority.NORMAL)
+	public void onPlayerInteract(final PlayerInteractEvent event)
+	{
+		switch (event.getAction())
+		{
+		case RIGHT_CLICK_BLOCK:
+			if (!event.isCancelled() && event.getClickedBlock().getTypeId() == BED && ess.getSettings().getUpdateBedAtDaytime())
+			{
+				Player player = event.getPlayer();
+				player.setBedSpawnLocation(event.getClickedBlock().getLocation());
+				player.sendMessage(_("homeSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
+			}
+			break;
+		case LEFT_CLICK_AIR:
+			if (event.getPlayer().isFlying())
+			{
+				final User user = ess.getUser(event.getPlayer());
+				if (user.isFlyClickJump())
+				{
+					useFlyClickJump(user);
+					return;
+				}
+			}
+		case LEFT_CLICK_BLOCK:
+			if (event.getItem() != null && event.getItem().getTypeId() != AIR)
+			{
+				final User user = ess.getUser(event.getPlayer());
+				user.updateActivity(true);
+				if (user.hasPowerTools() && user.arePowerToolsEnabled() && usePowertools(user, event.getItem().getTypeId()))
+				{
+					event.setCancelled(true);
+				}
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
+	// This method allows the /jump lock feature to work, allows teleporting while flying #EasterEgg
+	private void useFlyClickJump(final User user)
+	{
+		try
+		{
+			final Location otarget = Util.getTarget(user);
+
+			ess.scheduleSyncDelayedTask(
+					new Runnable()
+					{
+						@Override
+						public void run()
+						{
+							Location loc = user.getLocation();
+							loc.setX(otarget.getX());
+							loc.setZ(otarget.getZ());
+							while (Util.isBlockDamaging(loc.getWorld(), loc.getBlockX(), loc.getBlockY() - 1, loc.getBlockZ()))
+							{
+								loc.setY(loc.getY() + 1d);
+							}
+							user.getBase().teleport(loc, TeleportCause.PLUGIN);
+						}
+					});
+		}
+		catch (Exception ex)
+		{
+			if (ess.getSettings().isDebug())
+			{
+				LOGGER.log(Level.WARNING, ex.getMessage(), ex);
+			}
+		}
+	}
+
+	private boolean usePowertools(final User user, final int id)
+	{
+		final List<String> commandList = user.getPowertool(id);
+		if (commandList == null || commandList.isEmpty())
+		{
+			return false;
+		}
+		boolean used = false;
+		// We need to loop through each command and execute
+		for (final String command : commandList)
+		{
+			if (command.contains("{player}"))
+			{
+				continue;
+			}
+			else if (command.startsWith("c:"))
+			{
+				used = true;
+				user.chat(command.substring(2));
+			}
+			else
+			{
+				used = true;
+				ess.scheduleSyncDelayedTask(
+						new Runnable()
+						{
+							@Override
+							public void run()
+							{
+								user.getServer().dispatchCommand(user.getBase(), command);
+								LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", user.getName(), command));
+							}
+						});
+			}
+		}
+		return used;
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onPlayerPickupItem(final PlayerPickupItemEvent event)
+	{
+		if (ess.getSettings().getDisableItemPickupWhileAfk())
+		{
+			if (ess.getUser(event.getPlayer()).isAfk())
+			{
+				event.setCancelled(true);
+			}
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onInventoryClickEvent(final InventoryClickEvent event)
+	{
+		if (event.getView().getTopInventory().getType() == InventoryType.PLAYER)
+		{
+			final User user = ess.getUser(event.getWhoClicked());
+			final InventoryHolder invHolder = event.getView().getTopInventory().getHolder();
+			if (invHolder != null && invHolder instanceof HumanEntity)
+			{
+				final User invOwner = ess.getUser((HumanEntity)invHolder);
+				if (user.isInvSee() && (!user.isAuthorized("essentials.invsee.modify")
+										|| invOwner.isAuthorized("essentials.invsee.preventmodify")
+										|| !invOwner.isOnline()))
+				{
+					event.setCancelled(true);
+				}
+			}
+		}
+		else if (event.getView().getTopInventory().getType() == InventoryType.ENDER_CHEST)
+		{
+			final User user = ess.getUser(event.getWhoClicked());
+			if (user.isEnderSee() && (!user.isAuthorized("essentials.enderchest.modify")))
+			{
+				event.setCancelled(true);
+			}
+		}
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onInventoryCloseEvent(final InventoryCloseEvent event)
+	{
+		if (event.getView().getTopInventory().getType() == InventoryType.PLAYER)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			user.setInvSee(false);
+		}
+		else if (event.getView().getTopInventory().getType() == InventoryType.ENDER_CHEST)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			user.setEnderSee(false);
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onPlayerFishEvent(final PlayerFishEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		user.updateActivity(true);
+	}
+}

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

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

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

@@ -0,0 +1,85 @@
+package com.earth2me.essentials;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Set;
+import java.util.logging.Level;
+import org.bukkit.entity.Player;
+
+
+public class EssentialsTimer implements Runnable
+{
+	private final transient IEssentials ess;
+	private final transient Set<User> onlineUsers = new HashSet<User>();
+	private transient long lastPoll = System.currentTimeMillis();
+	private final transient LinkedList<Float> history = new LinkedList<Float>();
+
+	EssentialsTimer(final IEssentials ess)
+	{
+		this.ess = ess;
+	}
+
+	@Override
+	public void run()
+	{
+		final long currentTime = System.currentTimeMillis();
+		long timeSpent = (currentTime - lastPoll) / 1000;
+		if (timeSpent == 0)
+		{
+			timeSpent = 1;
+		}
+		if (history.size() > 10)
+		{
+			history.remove();
+		}
+		float tps = 100f / timeSpent;
+		if (tps <= 20)
+		{
+			history.add(tps);
+		}
+		lastPoll = currentTime;
+		for (Player player : ess.getServer().getOnlinePlayers())
+		{
+			try
+			{
+				final User user = ess.getUser(player);
+				onlineUsers.add(user);
+				user.setLastOnlineActivity(currentTime);
+				user.checkActivity();
+			}
+			catch (Exception e)
+			{
+				ess.getLogger().log(Level.WARNING, "EssentialsTimer Error:", e);
+			}
+		}
+
+		final Iterator<User> iterator = onlineUsers.iterator();
+		while (iterator.hasNext())
+		{
+			final User user = iterator.next();
+			if (user.getLastOnlineActivity() < currentTime && user.getLastOnlineActivity() > user.getLastLogout())
+			{
+				user.setLastLogout(user.getLastOnlineActivity());
+				iterator.remove();
+				continue;
+			}
+			user.checkMuteTimeout(currentTime);
+			user.checkJailTimeout(currentTime);
+			user.resetInvulnerabilityAfterTeleport();
+		}
+	}
+
+	public float getAverageTPS()
+	{
+		float avg = 0;
+		for (Float f : history)
+		{
+			if (f != null)
+			{
+				avg += f;
+			}
+		}
+		return avg / history.size();
+	}
+}

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

@@ -0,0 +1,816 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.craftbukkit.FakeWorld;
+import com.earth2me.essentials.settings.Spawns;
+import com.earth2me.essentials.storage.YamlStorageWriter;
+import java.io.*;
+import java.math.BigInteger;
+import java.security.DigestInputStream;
+import java.security.MessageDigest;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.inventory.ItemStack;
+
+
+public class EssentialsUpgrade
+{
+	private final static Logger LOGGER = Logger.getLogger("Minecraft");
+	private final transient IEssentials ess;
+	private final transient EssentialsConf doneFile;
+
+	EssentialsUpgrade(final IEssentials essentials)
+	{
+		ess = essentials;
+		if (!ess.getDataFolder().exists())
+		{
+			ess.getDataFolder().mkdirs();
+		}
+		doneFile = new EssentialsConf(new File(ess.getDataFolder(), "upgrades-done.yml"));
+		doneFile.load();
+	}
+
+	private void moveWorthValuesToWorthYml()
+	{
+		if (doneFile.getBoolean("moveWorthValuesToWorthYml", false))
+		{
+			return;
+		}
+		try
+		{
+			final File configFile = new File(ess.getDataFolder(), "config.yml");
+			if (!configFile.exists())
+			{
+				return;
+			}
+			final EssentialsConf conf = new EssentialsConf(configFile);
+			conf.load();
+			final Worth worth = new Worth(ess.getDataFolder());
+			boolean found = false;
+			for (Material mat : Material.values())
+			{
+				final int id = mat.getId();
+				final double value = conf.getDouble("worth-" + id, Double.NaN);
+				if (!Double.isNaN(value))
+				{
+					found = true;
+					worth.setPrice(new ItemStack(mat, 1, (short)0, (byte)0), value);
+				}
+			}
+			if (found)
+			{
+				removeLinesFromConfig(configFile, "\\s*#?\\s*worth-[0-9]+.*", "# Worth values have been moved to worth.yml");
+			}
+			doneFile.setProperty("moveWorthValuesToWorthYml", true);
+			doneFile.save();
+		}
+		catch (Throwable e)
+		{
+			LOGGER.log(Level.SEVERE, _("upgradingFilesError"), e);
+		}
+	}
+
+	private void moveMotdRulesToFile(String name)
+	{
+		if (doneFile.getBoolean("move" + name + "ToFile", false))
+		{
+			return;
+		}
+		try
+		{
+			final File file = new File(ess.getDataFolder(), name + ".txt");
+			if (file.exists())
+			{
+				return;
+			}
+			final File configFile = new File(ess.getDataFolder(), "config.yml");
+			if (!configFile.exists())
+			{
+				return;
+			}
+			final EssentialsConf conf = new EssentialsConf(configFile);
+			conf.load();
+			List<String> lines = conf.getStringList(name);
+			if (lines != null && !lines.isEmpty())
+			{
+				if (!file.createNewFile())
+				{
+					throw new IOException("Failed to create file " + file);
+				}
+				PrintWriter writer = new PrintWriter(file);
+
+				for (String line : lines)
+				{
+					writer.println(line);
+				}
+				writer.close();
+			}
+			doneFile.setProperty("move" + name + "ToFile", true);
+			doneFile.save();
+		}
+		catch (Throwable e)
+		{
+			LOGGER.log(Level.SEVERE, _("upgradingFilesError"), e);
+		}
+	}
+
+	private void removeLinesFromConfig(File file, String regex, String info) throws Exception
+	{
+		boolean needUpdate = false;
+		final BufferedReader bReader = new BufferedReader(new FileReader(file));
+		final File tempFile = File.createTempFile("essentialsupgrade", ".tmp.yml", ess.getDataFolder());
+		final BufferedWriter bWriter = new BufferedWriter(new FileWriter(tempFile));
+		do
+		{
+			final String line = bReader.readLine();
+			if (line == null)
+			{
+				break;
+			}
+			if (line.matches(regex))
+			{
+				if (!needUpdate && info != null)
+				{
+					bWriter.write(info, 0, info.length());
+					bWriter.newLine();
+				}
+				needUpdate = true;
+			}
+			else
+			{
+				if (line.endsWith("\r\n"))
+				{
+					bWriter.write(line, 0, line.length() - 2);
+				}
+				else if (line.endsWith("\r") || line.endsWith("\n"))
+				{
+					bWriter.write(line, 0, line.length() - 1);
+				}
+				else
+				{
+					bWriter.write(line, 0, line.length());
+				}
+				bWriter.newLine();
+			}
+		}
+		while (true);
+		bReader.close();
+		bWriter.close();
+		if (needUpdate)
+		{
+			if (!file.renameTo(new File(file.getParentFile(), file.getName().concat("." + System.currentTimeMillis() + ".upgradebackup"))))
+			{
+				throw new Exception(_("configFileMoveError"));
+			}
+			if (!tempFile.renameTo(file))
+			{
+				throw new Exception(_("configFileRenameError"));
+			}
+		}
+		else
+		{
+			tempFile.delete();
+		}
+	}
+
+	private void updateUsersToNewDefaultHome()
+	{
+		if (doneFile.getBoolean("updateUsersToNewDefaultHome", false))
+		{
+			return;
+		}
+		final File userdataFolder = new File(ess.getDataFolder(), "userdata");
+		if (!userdataFolder.exists() || !userdataFolder.isDirectory())
+		{
+			return;
+		}
+		final File[] userFiles = userdataFolder.listFiles();
+
+		for (File file : userFiles)
+		{
+			if (!file.isFile() || !file.getName().endsWith(".yml"))
+			{
+				continue;
+			}
+			final EssentialsConf config = new EssentialsConf(file);
+			try
+			{
+				config.load();
+				if (config.hasProperty("home") && !config.hasProperty("home.default"))
+				{
+					@SuppressWarnings("unchecked")
+					final List<Object> vals = (List<Object>)config.getProperty("home");
+					if (vals == null)
+					{
+						continue;
+					}
+					World world = ess.getServer().getWorlds().get(0);
+					if (vals.size() > 5)
+					{
+						world = ess.getServer().getWorld((String)vals.get(5));
+					}
+					if (world != null)
+					{
+						final Location loc = new Location(
+								world,
+								((Number)vals.get(0)).doubleValue(),
+								((Number)vals.get(1)).doubleValue(),
+								((Number)vals.get(2)).doubleValue(),
+								((Number)vals.get(3)).floatValue(),
+								((Number)vals.get(4)).floatValue());
+
+						final String worldName = world.getName().toLowerCase(Locale.ENGLISH);
+						if (worldName != null && !worldName.isEmpty())
+						{
+							config.removeProperty("home");
+							config.setProperty("home.default", worldName);
+							config.setProperty("home.worlds." + worldName, loc);
+							config.save();
+						}
+					}
+				}
+			}
+			catch (RuntimeException ex)
+			{
+				LOGGER.log(Level.INFO, "File: " + file.toString());
+				throw ex;
+			}
+		}
+		doneFile.setProperty("updateUsersToNewDefaultHome", true);
+		doneFile.save();
+	}
+
+	private void updateUsersPowerToolsFormat()
+	{
+		if (doneFile.getBoolean("updateUsersPowerToolsFormat", false))
+		{
+			return;
+		}
+		final File userdataFolder = new File(ess.getDataFolder(), "userdata");
+		if (!userdataFolder.exists() || !userdataFolder.isDirectory())
+		{
+			return;
+		}
+		final File[] userFiles = userdataFolder.listFiles();
+
+		for (File file : userFiles)
+		{
+			if (!file.isFile() || !file.getName().endsWith(".yml"))
+			{
+				continue;
+			}
+			final EssentialsConf config = new EssentialsConf(file);
+			try
+			{
+				config.load();
+				if (config.hasProperty("powertools"))
+				{
+					@SuppressWarnings("unchecked")
+					final Map<String, Object> powertools = config.getConfigurationSection("powertools").getValues(false);
+					if (powertools == null)
+					{
+						continue;
+					}
+					for (Map.Entry<String, Object> entry : powertools.entrySet())
+					{
+						if (entry.getValue() instanceof String)
+						{
+							List<String> temp = new ArrayList<String>();
+							temp.add((String)entry.getValue());
+							((Map<String, Object>)powertools).put(entry.getKey(), temp);
+						}
+					}
+					config.save();
+				}
+			}
+			catch (RuntimeException ex)
+			{
+				LOGGER.log(Level.INFO, "File: " + file.toString());
+				throw ex;
+			}
+		}
+		doneFile.setProperty("updateUsersPowerToolsFormat", true);
+		doneFile.save();
+	}
+
+	private void updateUsersHomesFormat()
+	{
+		if (doneFile.getBoolean("updateUsersHomesFormat", false))
+		{
+			return;
+		}
+		final File userdataFolder = new File(ess.getDataFolder(), "userdata");
+		if (!userdataFolder.exists() || !userdataFolder.isDirectory())
+		{
+			return;
+		}
+		final File[] userFiles = userdataFolder.listFiles();
+
+		for (File file : userFiles)
+		{
+			if (!file.isFile() || !file.getName().endsWith(".yml"))
+			{
+				continue;
+			}
+			final EssentialsConf config = new EssentialsConf(file);
+			try
+			{
+
+				config.load();
+				if (config.hasProperty("home") && config.hasProperty("home.default"))
+				{
+					@SuppressWarnings("unchecked")
+					final String defworld = (String)config.getProperty("home.default");
+					final Location defloc = getFakeLocation(config, "home.worlds." + defworld);
+					if (defloc != null)
+					{
+						config.setProperty("homes.home", defloc);
+					}
+
+					Set<String> worlds = config.getConfigurationSection("home.worlds").getKeys(false);
+					Location loc;
+					String worldName;
+
+					if (worlds == null)
+					{
+						continue;
+					}
+					for (String world : worlds)
+					{
+						if (defworld.equalsIgnoreCase(world))
+						{
+							continue;
+						}
+						loc = getFakeLocation(config, "home.worlds." + world);
+						if (loc == null)
+						{
+							continue;
+						}
+						worldName = loc.getWorld().getName().toLowerCase(Locale.ENGLISH);
+						if (worldName != null && !worldName.isEmpty())
+						{
+							config.setProperty("homes." + worldName, loc);
+						}
+					}
+					config.removeProperty("home");
+					config.save();
+				}
+
+			}
+			catch (RuntimeException ex)
+			{
+				LOGGER.log(Level.INFO, "File: " + file.toString());
+				throw ex;
+			}
+		}
+		doneFile.setProperty("updateUsersHomesFormat", true);
+		doneFile.save();
+	}
+
+	private void moveUsersDataToUserdataFolder()
+	{
+		final File usersFile = new File(ess.getDataFolder(), "users.yml");
+		if (!usersFile.exists())
+		{
+			return;
+		}
+		final EssentialsConf usersConfig = new EssentialsConf(usersFile);
+		usersConfig.load();
+		for (String username : usersConfig.getKeys(false))
+		{
+			final User user = new User(new OfflinePlayer(username, ess), ess);
+			final String nickname = usersConfig.getString(username + ".nickname");
+			if (nickname != null && !nickname.isEmpty() && !nickname.equals(username))
+			{
+				user.setNickname(nickname);
+			}
+			final List<String> mails = usersConfig.getStringList(username + ".mail");
+			if (mails != null && !mails.isEmpty())
+			{
+				user.setMails(mails);
+			}
+			if (!user.hasHome())
+			{
+				@SuppressWarnings("unchecked")
+				final List<Object> vals = (List<Object>)usersConfig.getProperty(username + ".home");
+				if (vals != null)
+				{
+					World world = ess.getServer().getWorlds().get(0);
+					if (vals.size() > 5)
+					{
+						world = getFakeWorld((String)vals.get(5));
+					}
+					if (world != null)
+					{
+						user.setHome("home", new Location(world,
+														  ((Number)vals.get(0)).doubleValue(),
+														  ((Number)vals.get(1)).doubleValue(),
+														  ((Number)vals.get(2)).doubleValue(),
+														  ((Number)vals.get(3)).floatValue(),
+														  ((Number)vals.get(4)).floatValue()));
+					}
+				}
+			}
+		}
+		usersFile.renameTo(new File(usersFile.getAbsolutePath() + ".old"));
+	}
+
+	private void convertWarps()
+	{
+		final File warpsFolder = new File(ess.getDataFolder(), "warps");
+		if (!warpsFolder.exists())
+		{
+			warpsFolder.mkdirs();
+		}
+		final File[] listOfFiles = warpsFolder.listFiles();
+		if (listOfFiles.length >= 1)
+		{
+			for (int i = 0; i < listOfFiles.length; i++)
+			{
+				final String filename = listOfFiles[i].getName();
+				if (listOfFiles[i].isFile() && filename.endsWith(".dat"))
+				{
+					try
+					{
+						final BufferedReader rx = new BufferedReader(new FileReader(listOfFiles[i]));
+						double x, y, z;
+						float yaw, pitch;
+						String worldName;
+						try
+						{
+							if (!rx.ready())
+							{
+								continue;
+							}
+							x = Double.parseDouble(rx.readLine().trim());
+							if (!rx.ready())
+							{
+								continue;
+							}
+							y = Double.parseDouble(rx.readLine().trim());
+							if (!rx.ready())
+							{
+								continue;
+							}
+							z = Double.parseDouble(rx.readLine().trim());
+							if (!rx.ready())
+							{
+								continue;
+							}
+							yaw = Float.parseFloat(rx.readLine().trim());
+							if (!rx.ready())
+							{
+								continue;
+							}
+							pitch = Float.parseFloat(rx.readLine().trim());
+							worldName = rx.readLine();
+						}
+						finally
+						{
+							rx.close();
+						}
+						World w = null;
+						for (World world : ess.getServer().getWorlds())
+						{
+							if (world.getEnvironment() != World.Environment.NETHER)
+							{
+								w = world;
+								break;
+							}
+						}
+						if (worldName != null)
+						{
+							worldName = worldName.trim();
+							World w1 = null;
+							w1 = getFakeWorld(worldName);
+							if (w1 != null)
+							{
+								w = w1;
+							}
+						}
+						final Location loc = new Location(w, x, y, z, yaw, pitch);
+						ess.getWarps().setWarp(filename.substring(0, filename.length() - 4), loc);
+						if (!listOfFiles[i].renameTo(new File(warpsFolder, filename + ".old")))
+						{
+							throw new Exception(_("fileRenameError", filename));
+						}
+					}
+					catch (Exception ex)
+					{
+						LOGGER.log(Level.SEVERE, null, ex);
+					}
+				}
+			}
+
+		}
+		final File warpFile = new File(ess.getDataFolder(), "warps.txt");
+		if (warpFile.exists())
+		{
+			try
+			{
+				final BufferedReader rx = new BufferedReader(new FileReader(warpFile));
+				try
+				{
+					for (String[] parts = new String[0]; rx.ready(); parts = rx.readLine().split(":"))
+					{
+						if (parts.length < 6)
+						{
+							continue;
+						}
+						final String name = parts[0];
+						final double x = Double.parseDouble(parts[1].trim());
+						final double y = Double.parseDouble(parts[2].trim());
+						final double z = Double.parseDouble(parts[3].trim());
+						final float yaw = Float.parseFloat(parts[4].trim());
+						final float pitch = Float.parseFloat(parts[5].trim());
+						if (name.isEmpty())
+						{
+							continue;
+						}
+						World w = null;
+						for (World world : ess.getServer().getWorlds())
+						{
+							if (world.getEnvironment() != World.Environment.NETHER)
+							{
+								w = world;
+								break;
+							}
+						}
+						final Location loc = new Location(w, x, y, z, yaw, pitch);
+						ess.getWarps().setWarp(name, loc);
+						if (!warpFile.renameTo(new File(ess.getDataFolder(), "warps.txt.old")))
+						{
+							throw new Exception(_("fileRenameError", "warps.txt"));
+						}
+					}
+				}
+				finally
+				{
+					rx.close();
+				}
+			}
+			catch (Exception ex)
+			{
+				LOGGER.log(Level.SEVERE, null, ex);
+			}
+		}
+	}
+
+	private void sanitizeAllUserFilenames()
+	{
+		if (doneFile.getBoolean("sanitizeAllUserFilenames", false))
+		{
+			return;
+		}
+		final File usersFolder = new File(ess.getDataFolder(), "userdata");
+		if (!usersFolder.exists())
+		{
+			return;
+		}
+		final File[] listOfFiles = usersFolder.listFiles();
+		for (int i = 0; i < listOfFiles.length; i++)
+		{
+			final String filename = listOfFiles[i].getName();
+			if (!listOfFiles[i].isFile() || !filename.endsWith(".yml"))
+			{
+				continue;
+			}
+			final String sanitizedFilename = Util.sanitizeFileName(filename.substring(0, filename.length() - 4)) + ".yml";
+			if (sanitizedFilename.equals(filename))
+			{
+				continue;
+			}
+			final File tmpFile = new File(listOfFiles[i].getParentFile(), sanitizedFilename + ".tmp");
+			final File newFile = new File(listOfFiles[i].getParentFile(), sanitizedFilename);
+			if (!listOfFiles[i].renameTo(tmpFile))
+			{
+				LOGGER.log(Level.WARNING, _("userdataMoveError", filename, sanitizedFilename));
+				continue;
+			}
+			if (newFile.exists())
+			{
+				LOGGER.log(Level.WARNING, _("duplicatedUserdata", filename, sanitizedFilename));
+				continue;
+			}
+			if (!tmpFile.renameTo(newFile))
+			{
+				LOGGER.log(Level.WARNING, _("userdataMoveBackError", sanitizedFilename, sanitizedFilename));
+			}
+		}
+		doneFile.setProperty("sanitizeAllUserFilenames", true);
+		doneFile.save();
+	}
+
+	private World getFakeWorld(final String name)
+	{
+		final File bukkitDirectory = ess.getDataFolder().getParentFile().getParentFile();
+		final File worldDirectory = new File(bukkitDirectory, name);
+		if (worldDirectory.exists() && worldDirectory.isDirectory())
+		{
+			return new FakeWorld(worldDirectory.getName(), World.Environment.NORMAL);
+		}
+		return null;
+	}
+
+	public Location getFakeLocation(EssentialsConf config, String path)
+	{
+		String worldName = config.getString((path != null ? path + "." : "") + "world");
+		if (worldName == null || worldName.isEmpty())
+		{
+			return null;
+		}
+		World world = getFakeWorld(worldName);
+		if (world == null)
+		{
+			return null;
+		}
+		return new Location(world,
+							config.getDouble((path != null ? path + "." : "") + "x", 0),
+							config.getDouble((path != null ? path + "." : "") + "y", 0),
+							config.getDouble((path != null ? path + "." : "") + "z", 0),
+							(float)config.getDouble((path != null ? path + "." : "") + "yaw", 0),
+							(float)config.getDouble((path != null ? path + "." : "") + "pitch", 0));
+	}
+
+	private void deleteOldItemsCsv()
+	{
+		if (doneFile.getBoolean("deleteOldItemsCsv", false))
+		{
+			return;
+		}
+		final File file = new File(ess.getDataFolder(), "items.csv");
+		if (file.exists())
+		{
+			try
+			{
+				final Set<BigInteger> oldconfigs = new HashSet<BigInteger>();
+				oldconfigs.add(new BigInteger("66ec40b09ac167079f558d1099e39f10", 16)); // sep 1
+				oldconfigs.add(new BigInteger("34284de1ead43b0bee2aae85e75c041d", 16)); // crlf
+				oldconfigs.add(new BigInteger("c33bc9b8ee003861611bbc2f48eb6f4f", 16)); // jul 24
+				oldconfigs.add(new BigInteger("6ff17925430735129fc2a02f830c1daa", 16)); // crlf
+
+				MessageDigest digest = ManagedFile.getDigest();
+				final BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
+				final DigestInputStream dis = new DigestInputStream(bis, digest);
+				final byte[] buffer = new byte[1024];
+				try
+				{
+					while (dis.read(buffer) != -1)
+					{
+					}
+				}
+				finally
+				{
+					dis.close();
+				}
+
+				BigInteger hash = new BigInteger(1, digest.digest());
+				if (oldconfigs.contains(hash) && !file.delete())
+				{
+					throw new IOException("Could not delete file " + file.toString());
+				}
+				doneFile.setProperty("deleteOldItemsCsv", true);
+				doneFile.save();
+			}
+			catch (IOException ex)
+			{
+				Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+			}
+		}
+	}
+
+	private void updateSpawnsToNewSpawnsConfig()
+	{
+		if (doneFile.getBoolean("updateSpawnsToNewSpawnsConfig", false))
+		{
+			return;
+		}
+		final File configFile = new File(ess.getDataFolder(), "spawn.yml");
+		if (configFile.exists())
+		{
+
+			final EssentialsConf config = new EssentialsConf(configFile);
+			try
+			{
+				config.load();
+				if (!config.hasProperty("spawns"))
+				{
+					final Spawns spawns = new Spawns();
+					Set<String> keys = config.getKeys(false);
+					for (String group : keys)
+					{
+						Location loc = getFakeLocation(config, group);
+						spawns.getSpawns().put(group.toLowerCase(Locale.ENGLISH), loc);
+					}
+					if (!configFile.renameTo(new File(ess.getDataFolder(), "spawn.yml.old")))
+					{
+						throw new Exception(_("fileRenameError", "spawn.yml"));
+					}
+					PrintWriter writer = new PrintWriter(configFile);
+					try
+					{
+						new YamlStorageWriter(writer).save(spawns);
+					}
+					finally
+					{
+						writer.close();
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+			}
+		}
+		doneFile.setProperty("updateSpawnsToNewSpawnsConfig", true);
+		doneFile.save();
+	}
+
+	private void updateJailsToNewJailsConfig()
+	{
+		if (doneFile.getBoolean("updateJailsToNewJailsConfig", false))
+		{
+			return;
+		}
+		final File configFile = new File(ess.getDataFolder(), "jail.yml");
+		if (configFile.exists())
+		{
+
+			final EssentialsConf config = new EssentialsConf(configFile);
+			try
+			{
+				config.load();
+				if (!config.hasProperty("jails"))
+				{
+					final com.earth2me.essentials.settings.Jails jails = new com.earth2me.essentials.settings.Jails();
+					Set<String> keys = config.getKeys(false);
+					for (String jailName : keys)
+					{
+						Location loc = getFakeLocation(config, jailName);
+						jails.getJails().put(jailName.toLowerCase(Locale.ENGLISH), loc);
+					}
+					if (!configFile.renameTo(new File(ess.getDataFolder(), "jail.yml.old")))
+					{
+						throw new Exception(_("fileRenameError", "jail.yml"));
+					}
+					PrintWriter writer = new PrintWriter(configFile);
+					try
+					{
+						new YamlStorageWriter(writer).save(jails);
+					}
+					finally
+					{
+						writer.close();
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+			}
+		}
+		doneFile.setProperty("updateJailsToNewJailsConfig", true);
+		doneFile.save();
+	}
+
+	private void warnMetrics()
+	{
+		if (doneFile.getBoolean("warnMetrics", false))
+		{
+			return;
+		}
+		ess.getSettings().setMetricsEnabled(false);
+		doneFile.setProperty("warnMetrics", true);
+		doneFile.save();
+	}
+
+	public void beforeSettings()
+	{
+		if (!ess.getDataFolder().exists())
+		{
+			ess.getDataFolder().mkdirs();
+		}
+		moveWorthValuesToWorthYml();
+		moveMotdRulesToFile("motd");
+		moveMotdRulesToFile("rules");
+	}
+
+	public void afterSettings()
+	{
+		sanitizeAllUserFilenames();
+		updateUsersToNewDefaultHome();
+		moveUsersDataToUserdataFolder();
+		convertWarps();
+		updateUsersPowerToolsFormat();
+		updateUsersHomesFormat();
+		deleteOldItemsCsv();
+		updateSpawnsToNewSpawnsConfig();
+		updateJailsToNewJailsConfig();
+		warnMetrics();
+	}
+}

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

@@ -1,4 +1,4 @@
-package net.ess3.utils;
+package com.earth2me.essentials;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -9,8 +9,9 @@ import java.util.Locale;
 
 public class ExecuteTimer
 {
-	private final List<ExecuteRecord> times;
+	private final transient List<ExecuteRecord> times;
-	private final DecimalFormat decimalFormat = new DecimalFormat("#0.000", DecimalFormatSymbols.getInstance(Locale.US));
+	private final transient DecimalFormat decimalFormat = new DecimalFormat("#0.000", DecimalFormatSymbols.getInstance(Locale.US));
+
 
 	public ExecuteTimer()
 	{
@@ -48,7 +49,7 @@ public class ExecuteTimer
 			time2 = (Long)pair.getTime();
 			if (time1 > 0)
 			{
-				duration = (time2 - time1) / 1000000.0;
+				duration = (time2 - time1)/1000000.0;
 				output.append(mark).append(": ").append(decimalFormat.format(duration)).append("ms - ");
 			}
 			else
@@ -57,7 +58,7 @@ public class ExecuteTimer
 			}
 			time1 = time2;
 		}
-		duration = (time1 - time0) / 1000000.0;
+		duration = (time1 - time0)/1000000.0;
 		output.append("Total: ").append(decimalFormat.format(duration)).append("ms");
 		times.clear();
 		return output.toString();
@@ -85,4 +86,4 @@ public class ExecuteTimer
 			return time;
 		}
 	}
-}
+}

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

@@ -1,5 +1,6 @@
-package net.ess3;
+package com.earth2me.essentials;
 
+import com.earth2me.essentials.api.II18n;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -9,27 +10,27 @@ import java.net.URL;
 import java.text.MessageFormat;
 import java.util.*;
 import java.util.logging.Level;
-import java.util.regex.Pattern;
+import java.util.logging.Logger;
-import net.ess3.api.IEssentials;
-import net.ess3.api.II18n;
 
 
 public class I18n implements II18n
 {
 	private static I18n instance;
 	private static final String MESSAGES = "messages";
-	private final Locale defaultLocale = Locale.getDefault();
+	private final transient Locale defaultLocale = Locale.getDefault();
-	private Locale currentLocale = defaultLocale;
+	private transient Locale currentLocale = defaultLocale;
-	private ResourceBundle customBundle;
+	private transient ResourceBundle customBundle;
-	private ResourceBundle localeBundle;
+	private transient ResourceBundle localeBundle;
-	private final Map<String, MessageFormat> messageFormatCache = new HashMap<String, MessageFormat>();
+	private final transient ResourceBundle defaultBundle;
-	private final IEssentials ess;
+	private final transient Map<String, MessageFormat> messageFormatCache = new HashMap<String, MessageFormat>();
+	private final transient IEssentials ess;
 
 	public I18n(final IEssentials ess)
 	{
 		this.ess = ess;
 		customBundle = ResourceBundle.getBundle(MESSAGES, defaultLocale, new FileResClassLoader(I18n.class.getClassLoader(), ess));
 		localeBundle = ResourceBundle.getBundle(MESSAGES, defaultLocale);
+		defaultBundle = ResourceBundle.getBundle(MESSAGES, Locale.ENGLISH);
 	}
 
 	public void onEnable()
@@ -42,7 +43,6 @@ public class I18n implements II18n
 		instance = null;
 	}
 
-	@Override
 	public Locale getCurrentLocale()
 	{
 		return currentLocale;
@@ -63,19 +63,11 @@ public class I18n implements II18n
 		}
 		catch (MissingResourceException ex)
 		{
-			return string;
+			Logger.getLogger("Minecraft").log(Level.WARNING, String.format("Missing translation key \"%s\" in translation file %s", ex.getKey(), localeBundle.getLocale().toString()), ex);
+			return defaultBundle.getString(string);
 		}
 	}
 
-	public static String _(final String string)
-	{
-		if (instance == null)
-		{
-			return "";
-		}
-		return instance.translate(string);
-	}
-
 	public static String _(final String string, final Object... objects)
 	{
 		if (instance == null)
@@ -94,16 +86,24 @@ public class I18n implements II18n
 
 	public String format(final String string, final Object... objects)
 	{
-		final String format = translate(string);
+		String format = translate(string);
 		MessageFormat messageFormat = messageFormatCache.get(format);
 		if (messageFormat == null)
 		{
-			messageFormat = new MessageFormat(format.replace("'", "''"));
+			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);
 	}
-	private final Pattern partSplit = Pattern.compile("[_\\.]");
 
 	public void updateLocale(final String loc)
 	{
@@ -111,7 +111,7 @@ public class I18n implements II18n
 		{
 			return;
 		}
-		final String[] parts = partSplit.split(loc);
+		final String[] parts = loc.split("[_\\.]");
 		if (parts.length == 1)
 		{
 			currentLocale = new Locale(parts[0]);
@@ -125,25 +125,28 @@ public class I18n implements II18n
 			currentLocale = new Locale(parts[0], parts[1], parts[2]);
 		}
 		ResourceBundle.clearCache();
-		ess.getLogger().log(Level.INFO, String.format("Using locale %s", currentLocale.toString()));
+		Logger.getLogger("Minecraft").log(Level.INFO, String.format("Using locale %s", currentLocale.toString()));
 		customBundle = ResourceBundle.getBundle(MESSAGES, currentLocale, new FileResClassLoader(I18n.class.getClassLoader(), ess));
 		localeBundle = ResourceBundle.getBundle(MESSAGES, currentLocale);
 	}
 
 	public static String capitalCase(final String input)
 	{
-		return input == null || input.length() == 0 ? input : input.toUpperCase(Locale.ENGLISH).charAt(0) + input.toLowerCase(Locale.ENGLISH).substring(1);
+		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 File dataFolder;
+		private final transient File dataFolder;
 
-		public FileResClassLoader(final ClassLoader classLoader, final IEssentials ess)
+		FileResClassLoader(final ClassLoader classLoader, final IEssentials ess)
 		{
 			super(classLoader);
-			this.dataFolder = ess.getPlugin().getDataFolder();
+			this.dataFolder = ess.getDataFolder();
 		}
 
 		@Override

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

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

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

@@ -0,0 +1,74 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.api.IJails;
+import com.earth2me.essentials.metrics.Metrics;
+import com.earth2me.essentials.perm.PermissionsHandler;
+import com.earth2me.essentials.register.payment.Methods;
+import java.util.List;
+import org.bukkit.World;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitScheduler;
+
+
+public interface IEssentials extends Plugin
+{
+	void addReloadListener(IConf listener);
+
+	void reload();
+
+	boolean onCommandEssentials(CommandSender sender, Command command, String commandLabel, String[] args, ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentialsModule module);
+
+	User getUser(Object base);
+
+	I18n getI18n();
+
+	User getOfflineUser(String name);
+
+	World getWorld(String name);
+
+	int broadcastMessage(IUser sender, String message);
+
+	ISettings getSettings();
+
+	BukkitScheduler getScheduler();
+
+	IJails getJails();
+
+	Warps getWarps();
+
+	Worth getWorth();
+
+	Backup getBackup();
+
+	Methods getPaymentMethod();
+
+	int scheduleAsyncDelayedTask(Runnable run);
+
+	int scheduleSyncDelayedTask(Runnable run);
+
+	int scheduleSyncDelayedTask(Runnable run, long delay);
+
+	int scheduleSyncRepeatingTask(final Runnable run, long delay, long period);
+
+	TNTExplodeListener getTNTListener();
+
+	PermissionsHandler getPermissionsHandler();
+
+	AlternativeCommandsHandler getAlternativeCommandsHandler();
+
+	void showError(final CommandSender sender, final Throwable exception, final String commandLabel);
+
+	ItemDb getItemDb();
+
+	UserMap getUserMap();
+	
+	Metrics getMetrics();
+	
+	void setMetrics(Metrics metrics);
+	
+	EssentialsTimer getTimer();
+	
+	List<String> getVanishedPlayers();
+}

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

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

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

@@ -0,0 +1,9 @@
+package com.earth2me.essentials;
+
+import org.bukkit.command.CommandSender;
+
+public interface IReplyTo {
+	public void setReplyTo(CommandSender user);
+
+	public CommandSender getReplyTo();
+}

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

@@ -1,5 +1,9 @@
 package com.earth2me.essentials;
 
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import com.earth2me.essentials.signs.EssentialsSign;
+import com.earth2me.essentials.textreader.IText;
+import java.text.MessageFormat;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -8,11 +12,11 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.event.EventPriority;
 
 
-public interface ISettings
+public interface ISettings extends IConf
 {
 	boolean areSignsDisabled();
 
-	String getAnnounceNewPlayerFormat();
+	IText getAnnounceNewPlayerFormat();
 
 	boolean getAnnounceNewPlayers();
 
@@ -22,9 +26,12 @@ public interface ISettings
 
 	long getBackupInterval();
 
-	//MessageFormat getChatFormat(String group);
+	MessageFormat getChatFormat(String group);
+
 	int getChatRadius();
 
+	double getCommandCost(IEssentialsCommand cmd);
+
 	double getCommandCost(String label);
 
 	String getCurrencySymbol();
@@ -65,6 +72,8 @@ public interface ISettings
 
 	int getHomeLimit(String set);
 
+	int getHomeLimit(User user);
+
 	boolean getSortListByGroups();
 
 	int getSpawnMobLimit();
@@ -77,6 +86,8 @@ public interface ISettings
 
 	boolean hidePermissionlessHelp();
 
+	boolean isCommandDisabled(final IEssentialsCommand cmd);
+
 	boolean isCommandDisabled(String label);
 
 	boolean isCommandOverridden(String name);
@@ -89,7 +100,7 @@ public interface ISettings
 
 	List<Integer> itemSpawnBlacklist();
 
-	List<String> enabledSigns();
+	List<EssentialsSign> enabledSigns();
 
 	boolean permissionBasedItemSpawn();
 

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

@@ -0,0 +1,47 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+
+public interface IUser extends Player
+{
+	long getLastTeleportTimestamp();
+
+	boolean isAuthorized(String node);
+
+	boolean isAuthorized(IEssentialsCommand cmd);
+
+	boolean isAuthorized(IEssentialsCommand cmd, String permissionPrefix);
+
+	void setLastTeleportTimestamp(long time);
+
+	Location getLastLocation();
+
+	Player getBase();
+
+	double getMoney();
+
+	void takeMoney(double value);
+
+	void giveMoney(double value);
+	
+	boolean canAfford(double value);
+
+	String getGroup();
+
+	void setLastLocation();
+
+	Location getHome(String name) throws Exception;
+
+	Location getHome(Location loc) throws Exception;
+
+	boolean isHidden();
+
+	Teleport getTeleport();
+
+	void setJail(String jail);
+	
+	boolean isIgnoreExempt();
+}

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

@@ -0,0 +1,214 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.IItemDb;
+import java.util.*;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+
+public class ItemDb implements IConf, IItemDb
+{
+	private final transient IEssentials ess;
+
+	public ItemDb(final IEssentials ess)
+	{
+		this.ess = ess;
+		file = new ManagedFile("items.csv", ess);
+	}
+	private final transient Map<String, Integer> items = new HashMap<String, Integer>();
+	private final transient Map<ItemData, List<String>> names = new HashMap<ItemData, List<String>>();
+	private final transient Map<String, Short> durabilities = new HashMap<String, Short>();
+	private final transient ManagedFile file;
+
+	@Override
+	public void reloadConfig()
+	{
+		final List<String> lines = file.getLines();
+
+		if (lines.isEmpty())
+		{
+			return;
+		}
+
+		durabilities.clear();
+		items.clear();
+		names.clear();
+
+		for (String line : lines)
+		{
+			line = line.trim().toLowerCase(Locale.ENGLISH);
+			if (line.length() > 0 && line.charAt(0) == '#')
+			{
+				continue;
+			}
+
+			final String[] parts = line.split("[^a-z0-9]");
+			if (parts.length < 2)
+			{
+				continue;
+			}
+
+			final int numeric = Integer.parseInt(parts[1]);
+			final short data = parts.length > 2 && !parts[2].equals("0") ? Short.parseShort(parts[2]) : 0;
+			String itemName = parts[0].toLowerCase(Locale.ENGLISH);
+
+			durabilities.put(itemName, data);
+			items.put(itemName, numeric);
+
+			ItemData itemData = new ItemData(numeric, data);
+			if (names.containsKey(itemData))
+			{
+				List<String> nameList = names.get(itemData);
+				nameList.add(itemName);
+				Collections.sort(nameList, new LengthCompare());
+			}
+			else
+			{
+				List<String> nameList = new ArrayList<String>();
+				nameList.add(itemName);
+				names.put(itemData, nameList);
+			}
+		}
+	}
+
+	public ItemStack get(final String id, final int quantity) throws Exception
+	{
+		final ItemStack retval = get(id.toLowerCase(Locale.ENGLISH));
+		retval.setAmount(quantity);
+		return retval;
+	}
+
+	public ItemStack get(final String id) throws Exception
+	{
+		int itemid = 0;
+		String itemname = null;
+		short metaData = 0;
+		if (id.matches("^\\d+[:+',;.]\\d+$"))
+		{
+			itemid = Integer.parseInt(id.split("[:+',;.]")[0]);
+			metaData = Short.parseShort(id.split("[:+',;.]")[1]);
+		}
+		else if (id.matches("^\\d+$"))
+		{
+			itemid = Integer.parseInt(id);
+		}
+		else if (id.matches("^[^:+',;.]+[:+',;.]\\d+$"))
+		{
+			itemname = id.split("[:+',;.]")[0].toLowerCase(Locale.ENGLISH);
+			metaData = Short.parseShort(id.split("[:+',;.]")[1]);
+		}
+		else
+		{
+			itemname = id.toLowerCase(Locale.ENGLISH);
+		}
+
+		if (itemname != null)
+		{
+			if (items.containsKey(itemname))
+			{
+				itemid = items.get(itemname);
+				if (durabilities.containsKey(itemname) && metaData == 0)
+				{
+					metaData = durabilities.get(itemname);
+				}
+			}
+			else if (Material.getMaterial(itemname) != null)
+			{
+				itemid = Material.getMaterial(itemname).getId();
+				metaData = 0;
+			}
+			else
+			{
+				throw new Exception(_("unknownItemName", id));
+			}
+		}
+
+		final Material mat = Material.getMaterial(itemid);
+		if (mat == null)
+		{
+			throw new Exception(_("unknownItemId", itemid));
+		}
+		final ItemStack retval = new ItemStack(mat);
+		retval.setAmount(mat.getMaxStackSize());
+		retval.setDurability(metaData);
+		return retval;
+	}
+
+	public String names(ItemStack item)
+	{
+		ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
+		List<String> nameList = names.get(itemData);
+		if (nameList == null) {
+			itemData = new ItemData(item.getTypeId(), (short) 0);
+			nameList = names.get(itemData);
+			if (nameList == null) {
+				return null;
+			}
+		}
+		
+		if (nameList.size() > 15)
+		{
+			nameList = nameList.subList(0, 14);
+		}
+		return Util.joinList(", ", nameList);
+	}
+
+	class ItemData
+	{
+		final private int itemNo;
+		final private short itemData;
+
+		ItemData(final int itemNo, final short itemData)
+		{
+			this.itemNo = itemNo;
+			this.itemData = itemData;
+		}
+
+		public int getItemNo()
+		{
+			return itemNo;
+		}
+
+		public short getItemData()
+		{
+			return itemData;
+		}
+
+		@Override
+		public int hashCode()
+		{
+			return (31 * itemNo) ^ itemData;
+		}
+
+		@Override
+		public boolean equals(Object o)
+		{
+			if (o == null)
+			{
+				return false;
+			}
+			if (!(o instanceof ItemData))
+			{
+				return false;
+			}
+			ItemData pairo = (ItemData)o;
+			return this.itemNo == pairo.getItemNo()
+				   && this.itemData == pairo.getItemData();
+		}
+	}
+
+	class LengthCompare implements java.util.Comparator<String>
+	{
+		public LengthCompare()
+		{
+			super();
+		}
+
+		@Override
+		public int compare(String s1, String s2)
+		{
+			return s1.length() - s2.length();
+		}
+	}
+}

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

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

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

@@ -0,0 +1,193 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import static com.earth2me.essentials.I18n.capitalCase;
+import com.earth2me.essentials.commands.NoChargeException;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import java.util.*;
+import java.util.logging.Level;
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.ItemStack;
+
+
+public class Kit
+{
+	//TODO: Convert this to use one of the new text classes?
+	public static String listKits(final IEssentials ess, final User user) throws Exception
+	{
+		try
+		{
+			final ConfigurationSection kits = ess.getSettings().getKits();
+			final StringBuilder list = new StringBuilder();
+			for (String kiteItem : kits.getKeys(false))
+			{
+				if (user == null || user.isAuthorized("essentials.kits." + kiteItem.toLowerCase(Locale.ENGLISH)))
+				{
+					list.append(" ").append(capitalCase(kiteItem));
+				}
+			}
+			return list.toString().trim();
+		}
+		catch (Exception ex)
+		{
+			throw new Exception(_("kitError"), ex);
+		}
+
+	}
+
+	public static void checkTime(final User user, final String kitName, final Map<String, Object> els) throws Exception
+	{
+		if (user.isAuthorized("essentials.kit.exemptdelay")) {
+			return;
+		}
+		
+		final Calendar time = new GregorianCalendar();
+
+		// Take the current time, and remove the delay from it.
+		final double delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0.0d;
+		final Calendar earliestTime = new GregorianCalendar();
+		earliestTime.add(Calendar.SECOND, -(int)delay);
+		earliestTime.add(Calendar.MILLISECOND, -(int)((delay * 1000.0) % 1000.0));
+		// This value contains the most recent time a kit could have been used that would allow another use.
+		final long earliestLong = earliestTime.getTimeInMillis();
+
+		// When was the last kit used?
+		final long lastTime = user.getKitTimestamp(kitName);
+
+		if (lastTime < earliestLong || lastTime == 0L)
+		{
+			user.setKitTimestamp(kitName, time.getTimeInMillis());
+		}
+		else if (lastTime > time.getTimeInMillis())
+		{
+			// This is to make sure time didn't get messed up on last kit use.
+			// If this happens, let's give the user the benifit of the doubt.
+			user.setKitTimestamp(kitName, time.getTimeInMillis());
+		}
+		else if (earliestLong < 0L)
+		{
+			user.sendMessage(_("kitOnce"));
+			throw new NoChargeException();
+		}
+		else
+		{
+			time.setTimeInMillis(lastTime);
+			time.add(Calendar.SECOND, (int)delay);
+			time.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
+			user.sendMessage(_("kitTimed", Util.formatDateDiff(time.getTimeInMillis())));
+			throw new NoChargeException();
+		}
+	}
+
+	public static List<String> getItems(final User user, final Map<String, Object> kit) throws Exception
+	{
+		if (kit == null)
+		{
+			throw new Exception(_("kitError2"));
+		}
+	
+
+		try
+		{
+			return (List<String>)kit.get("items");
+		}
+		catch (Exception e)
+		{
+			user.sendMessage(_("kitError2"));
+			throw new Exception(_("kitErrorHelp"), e);
+		}
+	}
+
+	public static void expandItems(final IEssentials ess, final User user, final List<String> items) throws Exception
+	{
+		try
+		{
+			boolean spew = false;
+			for (String d : items)
+			{
+				if (d.startsWith(ess.getSettings().getCurrencySymbol())) 
+				{
+					Double value = Double.parseDouble(d.substring(ess.getSettings().getCurrencySymbol().length()).trim());
+					Trade t = new Trade(value, ess);
+					t.pay(user);
+					continue;
+				}
+				final String[] parts = d.split(" ");
+				final String[] item = parts[0].split("[:+',;.]", 2);
+				final int id = Material.getMaterial(Integer.parseInt(item[0])).getId();
+				final short data = item.length > 1 ? Short.parseShort(item[1]) : 0;
+				final int amount = parts.length > 1 ? Integer.parseInt(parts[1]) : 1;
+
+				final ItemStack stack = new ItemStack(id, amount, data);
+				if (parts.length > 2)
+				{
+					for (int i = 2; i < parts.length; i++)
+					{
+						final String[] split = parts[i].split("[:+',;.]", 2);
+						if (split.length < 1)
+						{
+							continue;
+						}
+						final Enchantment enchantment = Enchantments.getByName(split[0]);
+						if (enchantment == null)
+						{
+							throw new Exception("Enchantment not found: " + split[0]);
+						}
+						int level;
+						if (split.length > 1)
+						{
+							level = Integer.parseInt(split[1]);
+						}
+						else
+						{
+							level = enchantment.getMaxLevel();
+						}
+						try
+						{
+							stack.addEnchantment(enchantment, level);
+						}
+						catch (Exception ex)
+						{
+							throw new Exception("Enchantment " + enchantment.getName() + ": " + ex.getMessage(), ex);
+						}
+					}
+				}
+
+				final Map<Integer, ItemStack> overfilled;
+				if (user.isAuthorized("essentials.oversizedstacks"))
+				{
+					overfilled = InventoryWorkaround.addOversizedItems(user.getInventory(), ess.getSettings().getOversizedStackSize(), stack);
+				}
+				else
+				{
+					overfilled = InventoryWorkaround.addItems(user.getInventory(), stack);
+				}
+				for (ItemStack itemStack : overfilled.values())
+				{
+					user.getWorld().dropItemNaturally(user.getLocation(), itemStack);
+					spew = true;
+				}
+			}
+			user.updateInventory();
+			if (spew)
+			{
+				user.sendMessage(_("kitInvFull"));
+			}
+		}
+		catch (Exception e)
+		{
+			user.updateInventory();
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.WARNING, e.getMessage());
+			}
+			else
+			{
+				ess.getLogger().log(Level.WARNING, e.getMessage());
+			}
+			throw new Exception(_("kitError2"), e);
+		}
+	}
+}

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

@@ -1,5 +1,6 @@
-package net.ess3.storage;
+package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n._;
 import java.io.*;
 import java.math.BigInteger;
 import java.security.DigestInputStream;
@@ -10,34 +11,30 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
-import static net.ess3.I18n._;
-import net.ess3.api.IEssentials;
 import org.bukkit.Bukkit;
 
 
 public class ManagedFile
 {
 	private final static int BUFFERSIZE = 1024 * 8;
-	private final File file;
+	private final transient File file;
-	protected final IEssentials ess;
 
 	public ManagedFile(final String filename, final IEssentials ess)
 	{
-		this.ess = ess;
+		file = new File(ess.getDataFolder(), filename);
-		file = new File(ess.getPlugin().getDataFolder(), filename);
 
 		if (file.exists())
 		{
 			try
 			{
-				if (checkForVersion(file, ess.getPlugin().getVersion()) && !file.delete())
+				if (checkForVersion(file, ess.getDescription().getVersion()) && !file.delete())
 				{
 					throw new IOException("Could not delete file " + file.toString());
 				}
 			}
 			catch (IOException ex)
 			{
-				ess.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+				Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
 			}
 		}
 
@@ -49,7 +46,7 @@ public class ManagedFile
 			}
 			catch (IOException ex)
 			{
-				ess.getLogger().log(Level.SEVERE, _("Could not load items.csv!"), ex);
+				Bukkit.getLogger().log(Level.SEVERE, _("itemsCsvNotLoaded"), ex);
 			}
 		}
 	}
@@ -158,8 +155,7 @@ public class ManagedFile
 								}
 								else
 								{
-									Bukkit.getLogger().warning(
+									Bukkit.getLogger().warning("File " + file.toString() + " has been modified by user and file version differs, please update the file manually.");
-											"File " + file.toString() + " has been modified by user and file version differs, please update the file manually.");
 								}
 							}
 							finally
@@ -224,7 +220,7 @@ public class ManagedFile
 		}
 		catch (IOException ex)
 		{
-			ess.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+			Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
 			return Collections.emptyList();
 		}
 	}

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

@@ -0,0 +1,127 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+
+
+// Suffixes can be appended on the end of a mob name to make it plural
+// Entities without a suffix, will default to 's'
+public enum Mob
+{
+	CHICKEN("Chicken", Enemies.FRIENDLY, EntityType.CHICKEN),
+	COW("Cow", Enemies.FRIENDLY, EntityType.COW),
+	CREEPER("Creeper", Enemies.ENEMY, EntityType.CREEPER),
+	GHAST("Ghast", Enemies.ENEMY, EntityType.GHAST),
+	GIANT("Giant", Enemies.ENEMY, EntityType.GIANT),
+	PIG("Pig", Enemies.FRIENDLY, EntityType.PIG),
+	PIGZOMB("PigZombie", Enemies.NEUTRAL, EntityType.PIG_ZOMBIE),
+	SHEEP("Sheep", Enemies.FRIENDLY, "", EntityType.SHEEP),
+	SKELETON("Skeleton", Enemies.ENEMY, EntityType.SKELETON),
+	SLIME("Slime", Enemies.ENEMY, EntityType.SLIME),
+	SPIDER("Spider", Enemies.ENEMY, EntityType.SPIDER),
+	SQUID("Squid", Enemies.FRIENDLY, EntityType.SQUID),
+	ZOMBIE("Zombie", Enemies.ENEMY, EntityType.ZOMBIE),
+	WOLF("Wolf", Enemies.NEUTRAL, EntityType.WOLF),
+	CAVESPIDER("CaveSpider", Enemies.ENEMY, EntityType.CAVE_SPIDER),
+	ENDERMAN("Enderman", Enemies.ENEMY, "", EntityType.ENDERMAN),
+	SILVERFISH("Silverfish", Enemies.ENEMY, "", EntityType.SILVERFISH),
+	ENDERDRAGON("EnderDragon", Enemies.ENEMY, EntityType.ENDER_DRAGON),
+	VILLAGER("Villager", Enemies.FRIENDLY, EntityType.VILLAGER),
+	BLAZE("Blaze", Enemies.ENEMY, EntityType.BLAZE),
+	MUSHROOMCOW("MushroomCow", Enemies.FRIENDLY, EntityType.MUSHROOM_COW),
+	MAGMACUBE("MagmaCube", Enemies.ENEMY, EntityType.MAGMA_CUBE),
+	SNOWMAN("Snowman", Enemies.FRIENDLY, "", EntityType.SNOWMAN),
+	OCELOT("Ocelot", Enemies.NEUTRAL, EntityType.OCELOT),
+	IRONGOLEM("IronGolem", Enemies.NEUTRAL, EntityType.IRON_GOLEM),
+	WITHER("Wither", Enemies.ENEMY, EntityType.WITHER),
+	BAT("Bat", Enemies.FRIENDLY, EntityType.BAT),
+	WITCH("Witch", Enemies.ENEMY, EntityType.WITCH);
+	
+	public static final Logger logger = Logger.getLogger("Minecraft");
+
+	private Mob(String n, Enemies en, String s, EntityType type)
+	{
+		this.suffix = s;
+		this.name = n;
+		this.type = en;
+		this.bukkitType = type;
+	}
+
+	private Mob(String n, Enemies en, EntityType type)
+	{
+		this.name = n;
+		this.type = en;
+		this.bukkitType = type;
+	}
+	public String suffix = "s";
+	final public String name;
+	final public Enemies type;
+	final private EntityType bukkitType;
+	private static final Map<String, Mob> hashMap = new HashMap<String, Mob>();
+
+	static
+	{
+		for (Mob mob : Mob.values())
+		{
+			hashMap.put(mob.name.toLowerCase(Locale.ENGLISH), mob);
+		}
+	}
+
+	public static Set<String> getMobList() {
+		return Collections.unmodifiableSet(hashMap.keySet());
+	}
+
+	public LivingEntity spawn(final Player player, final Server server, final Location loc) throws MobException
+	{
+		return spawn(player.getWorld(), server, loc);
+	}
+	
+	public LivingEntity spawn(final World world, final Server server, final Location loc) throws MobException
+	{
+		final LivingEntity entity = world.spawn(loc, (Class<? extends LivingEntity>)this.bukkitType.getEntityClass());
+		if (entity == null)
+		{
+			logger.log(Level.WARNING, _("unableToSpawnMob"));
+			throw new MobException();
+		}
+		return entity;
+	}
+
+
+	public enum Enemies
+	{
+		FRIENDLY("friendly"),
+		NEUTRAL("neutral"),
+		ENEMY("enemy");
+
+		private Enemies(final String type)
+		{
+			this.type = type;
+		}
+		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 class MobException extends Exception
+	{
+		private static final long serialVersionUID = 1L;
+	}
+}

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

@@ -0,0 +1,38 @@
+package com.earth2me.essentials;
+
+import lombok.Delegate;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.serialization.ConfigurationSerializable;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permissible;
+import org.bukkit.permissions.ServerOperator;
+
+
+public class PlayerExtension implements Player
+{
+	@Delegate(types =
+	{
+		Player.class, Entity.class, CommandSender.class, ServerOperator.class,
+		HumanEntity.class, ConfigurationSerializable.class, LivingEntity.class,
+		Permissible.class
+	})
+	protected Player base;
+
+	public PlayerExtension(final Player base)
+	{
+		this.base = base;
+	}
+
+	public final Player getBase()
+	{
+		return base;
+	}
+
+	public final Player setBase(final Player base)
+	{
+		return this.base = base;
+	}
+}

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

@@ -1,30 +1,36 @@
 package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import com.earth2me.essentials.signs.EssentialsSign;
+import com.earth2me.essentials.signs.Signs;
+import com.earth2me.essentials.textreader.IText;
+import com.earth2me.essentials.textreader.SimpleTextInput;
 import java.io.File;
 import java.text.MessageFormat;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import static net.ess3.I18n._;
-import net.ess3.api.IEssentials;
 import org.bukkit.ChatColor;
+import org.bukkit.command.PluginCommand;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.MemoryConfiguration;
 import org.bukkit.event.EventPriority;
 import org.bukkit.inventory.ItemStack;
 
 
-public final class Settings implements ISettings
+public class Settings implements ISettings
 {
-	private final EssentialsConf config;
+	private final transient EssentialsConf config;
-	private final IEssentials ess;
+	private final static Logger logger = Logger.getLogger("Minecraft");
+	private final transient IEssentials ess;
 	private boolean metricsEnabled = true;
 
-	public Settings(IEssentials ess, File file)
+	public Settings(IEssentials ess)
 	{
 		this.ess = ess;
-		config = new EssentialsConf(file);
+		config = new EssentialsConf(new File(ess.getDataFolder(), "config.yml"));
-		//config.setTemplateName("/config.yml");
+		config.setTemplateName("/config.yml");
 		reloadConfig();
 	}
 
@@ -46,6 +52,29 @@ public final class Settings implements ISettings
 		return config.getConfigurationSection("sethome-multiple").getKeys(false);
 	}
 
+	@Override
+	public int getHomeLimit(final User user)
+	{
+		int limit = 1;
+		if (user.isAuthorized("essentials.sethome.multiple"))
+		{
+			limit = getHomeLimit("default");
+		}
+
+		final Set<String> homeList = getMultipleHomes();
+		if (homeList != null)
+		{
+			for (String set : homeList)
+			{
+				if (user.isAuthorized("essentials.sethome.multiple." + set) && (limit < getHomeLimit(set)))
+				{
+					limit = getHomeLimit(set);
+				}
+			}
+		}
+		return limit;
+	}
+
 	@Override
 	public int getHomeLimit(final String set)
 	{
@@ -87,6 +116,12 @@ public final class Settings implements ISettings
 	{
 		return config.getInt("starting-balance", 0);
 	}
+
+	@Override
+	public boolean isCommandDisabled(final IEssentialsCommand cmd)
+	{
+		return isCommandDisabled(cmd.getName());
+	}
 	private Set<String> disabledCommands = new HashSet<String>();
 
 	@Override
@@ -141,6 +176,12 @@ public final class Settings implements ISettings
 	}
 	private ConfigurationSection commandCosts;
 
+	@Override
+	public double getCommandCost(IEssentialsCommand cmd)
+	{
+		return getCommandCost(cmd.getName());
+	}
+
 	public ConfigurationSection _getCommandCosts()
 	{
 		if (config.isConfigurationSection("command-costs"))
@@ -149,6 +190,11 @@ public final class Settings implements ISettings
 			final ConfigurationSection newSection = new MemoryConfiguration();
 			for (String command : section.getKeys(false))
 			{
+				PluginCommand cmd = ess.getServer().getPluginCommand(command);
+				if (command.charAt(0) == '/')
+				{
+					ess.getLogger().warning("Invalid command cost. '" + command + "' should not start with '/'.");
+				}
 				if (section.isDouble(command))
 				{
 					newSection.set(command.toLowerCase(Locale.ENGLISH), section.getDouble(command));
@@ -157,6 +203,24 @@ public final class Settings implements ISettings
 				{
 					newSection.set(command.toLowerCase(Locale.ENGLISH), (double)section.getInt(command));
 				}
+				else if (section.isString(command))
+				{
+					String costString = section.getString(command);
+					try
+					{
+						double cost = Double.parseDouble(costString.trim().replace(getCurrencySymbol(), "").replaceAll("\\W", ""));
+						newSection.set(command.toLowerCase(Locale.ENGLISH), cost);
+					}
+					catch (NumberFormatException ex)
+					{
+						ess.getLogger().warning("Invalid command cost for: " + command + " (" + costString + ")");
+					}
+
+				}
+				else
+				{
+					ess.getLogger().warning("Invalid command cost for: " + command);
+				}
 			}
 			return newSection;
 		}
@@ -312,30 +376,26 @@ public final class Settings implements ISettings
 	}
 	private Map<String, MessageFormat> chatFormats = Collections.synchronizedMap(new HashMap<String, MessageFormat>());
 
-	/*@Override //TODO: implement this
+	@Override
-	 public MessageFormat getChatFormat(String group)
+	public MessageFormat getChatFormat(String group)
-	 {
-	 MessageFormat mFormat = chatFormats.get(group);
-	 if (mFormat == null)
-	 {
-	 String format = config.getString("chat.group-formats." + (group == null ? "Default" : group),
-	 config.getString("chat.format", "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}"));
-	 format = Util.replaceFormat(format);
-	 format = format.replace("{DISPLAYNAME}", "%1$s");
-	 format = format.replace("{GROUP}", "{0}");
-	 format = format.replace("{MESSAGE}", "%2$s");
-	 format = format.replace("{WORLDNAME}", "{1}");
-	 format = format.replace("{SHORTWORLDNAME}", "{2}");
-	 format = format.replaceAll("\\{(\\D*?)\\}", "\\[$1\\]");
-	 format = "§r".concat(format);
-	 mFormat = new MessageFormat(format);
-	 chatFormats.put(group, mFormat);
-	 }
-	 return mFormat;
-	 }*/
-	public String getDefaultChatformat()
 	{
-		return config.getString("chat.format", "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}");
+		MessageFormat mFormat = chatFormats.get(group);
+		if (mFormat == null)
+		{
+			String format = config.getString("chat.group-formats." + (group == null ? "Default" : group),
+											 config.getString("chat.format", "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}"));
+			format = Util.replaceFormat(format);
+			format = format.replace("{DISPLAYNAME}", "%1$s");
+			format = format.replace("{GROUP}", "{0}");
+			format = format.replace("{MESSAGE}", "%2$s");
+			format = format.replace("{WORLDNAME}", "{1}");
+			format = format.replace("{SHORTWORLDNAME}", "{2}");
+			format = format.replaceAll("\\{(\\D*?)\\}", "\\[$1\\]");
+			format = "§r".concat(format);
+			mFormat = new MessageFormat(format);
+			chatFormats.put(group, mFormat);
+		}
+		return mFormat;
 	}
 
 	@Override
@@ -345,9 +405,9 @@ public final class Settings implements ISettings
 	}
 
 	@Override
-	public String getAnnounceNewPlayerFormat()
+	public IText getAnnounceNewPlayerFormat()
 	{
-		return config.getString("newbies.announce-format", "&dWelcome {DISPLAYNAME} to the server!");
+		return new SimpleTextInput(Util.replaceFormat(config.getString("newbies.announce-format", "&dWelcome {DISPLAYNAME} to the server!")));
 	}
 
 	@Override
@@ -374,6 +434,7 @@ public final class Settings implements ISettings
 		return config.getBoolean("sort-list-by-groups", true);
 	}
 
+	@Override
 	public void reloadConfig()
 	{
 		config.load();
@@ -417,7 +478,7 @@ public final class Settings implements ISettings
 		final List<Integer> epItemSpwn = new ArrayList<Integer>();
 		if (ess.getItemDb() == null)
 		{
-			ess.getLogger().log(Level.FINE, "Aborting ItemSpawnBL read, itemDB not yet loaded.");
+			logger.log(Level.FINE, "Aborting ItemSpawnBL read, itemDB not yet loaded.");
 			return epItemSpwn;
 		}
 		for (String itemName : config.getString("item-spawn-blacklist", "").split(","))
@@ -434,23 +495,23 @@ public final class Settings implements ISettings
 			}
 			catch (Exception ex)
 			{
-				ess.getLogger().log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", itemName, "item-spawn-blacklist"));
+				logger.log(Level.SEVERE, _("unknownItemInList", itemName, "item-spawn-blacklist"));
 			}
 		}
 		return epItemSpwn;
 	}
-	private List<String> enabledSigns = new ArrayList<String>();
+	private List<EssentialsSign> enabledSigns = new ArrayList<EssentialsSign>();
 	private boolean signsEnabled = false;
 
 	@Override
-	public List<String> enabledSigns()
+	public List<EssentialsSign> enabledSigns()
 	{
 		return enabledSigns;
 	}
 
-	private List<String> _getEnabledSigns()
+	private List<EssentialsSign> _getEnabledSigns()
 	{
-		List<String> newSigns = new ArrayList<String>();
+		List<EssentialsSign> newSigns = new ArrayList<EssentialsSign>();
 
 		for (String signName : config.getStringList("enabledSigns"))
 		{
@@ -466,11 +527,11 @@ public final class Settings implements ISettings
 			}
 			try
 			{
-				newSigns.add(signName);
+				newSigns.add(Signs.valueOf(signName).getSign());
 			}
 			catch (Exception ex)
 			{
-				ess.getLogger().log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", signName, "enabledSigns"));
+				logger.log(Level.SEVERE, _("unknownItemInList", signName, "enabledSigns"));
 				continue;
 			}
 			signsEnabled = true;
@@ -521,6 +582,8 @@ public final class Settings implements ISettings
 		return config.getString("locale", "");
 	}
 
+	//This method should always only return one character due to the implementation of the calling methods
+	//If you need to use a string currency, for example "coins", use the translation key 'currency'.
 	@Override
 	public String getCurrencySymbol()
 	{
@@ -564,7 +627,7 @@ public final class Settings implements ISettings
 			}
 			catch (Exception ex)
 			{
-				ess.getLogger().log(Level.SEVERE, _("§4Unknown item {0} in {1} list.", itemName, configName));
+				logger.log(Level.SEVERE, _("unknownItemInList", itemName, configName));
 			}
 		}
 		return list;

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

@@ -0,0 +1,287 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.Mob.MobException;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Random;
+import java.util.Set;
+import org.bukkit.DyeColor;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.block.Block;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.*;
+import org.bukkit.entity.Skeleton.SkeletonType;
+import org.bukkit.material.Colorable;
+
+
+public class SpawnMob
+{
+	public static String mobList(final User user)
+	{
+		final Set<String> mobList = Mob.getMobList();
+		final Set<String> availableList = new HashSet<String>();
+		for (String mob : mobList)
+		{
+			if (user.isAuthorized("essentials.spawnmob." + mob.toLowerCase()))
+			{
+				availableList.add(mob);
+			}
+		}
+		if (availableList.isEmpty())
+		{
+			availableList.add(_("none"));
+		}
+		return Util.joinList(availableList);
+	}
+
+	public static String[] mobData(final String mobString)
+	{
+		String[] returnString = new String[4];
+
+		final String[] parts = mobString.split(",");
+		String[] mobParts = parts[0].split(":");
+
+		returnString[0] = mobParts[0];
+		if (mobParts.length == 2)
+		{
+			returnString[1] = mobParts[1];
+		}
+
+		if (parts.length > 1)
+		{
+			String[] mountParts = parts[1].split(":");
+			returnString[2] = mountParts[0];
+			if (mountParts.length == 2)
+			{
+				returnString[3] = mountParts[1];
+			}
+		}
+
+		return returnString;
+	}
+
+	// This method spawns a mob where the user is looking, owned by user
+	public static void spawnmob(final IEssentials ess, final Server server, final User user, final String[] Data, int mobCount) throws Exception
+	{
+		final Block block = Util.getTarget(user).getBlock();
+		if (block == null)
+		{
+			throw new Exception(_("unableToSpawnMob"));
+		}
+		spawnmob(ess, server, user, user, block.getLocation(), Data, mobCount);
+	}
+
+	// This method spawns a mob at loc, owned by noone
+	public static void spawnmob(final IEssentials ess, final Server server, final CommandSender sender, final Location loc, final String[] Data, int mobCount) throws Exception
+	{
+		spawnmob(ess, server, sender, null, loc, Data, mobCount);
+	}
+
+	// This method spawns a mob at target, owned by target
+	public static void spawnmob(final IEssentials ess, final Server server, final CommandSender sender, final User target, final String[] Data, int mobCount) throws Exception
+	{
+		spawnmob(ess, server, sender, target, target.getLocation(), Data, mobCount);
+	}
+
+	// This method spawns a mob at loc, owned by target
+	public static void spawnmob(final IEssentials ess, final Server server, final CommandSender sender, final User target, final Location loc, final String[] Data, int mobCount) throws Exception
+	{
+		final Location sloc = Util.getSafeDestination(loc);
+		final String mobType = Data[0];
+		final String mobData = Data[1];
+		final String mountType = Data[2];
+		final String mountData = Data[3];
+
+		Mob mob = Mob.fromName(mobType);
+		Mob mobMount = null;
+
+		checkSpawnable(ess, sender, mob);
+
+		if (mountType != null)
+		{
+			mobMount = Mob.fromName(mountType);
+			checkSpawnable(ess, sender, mobMount);
+		}
+
+		int serverLimit = ess.getSettings().getSpawnMobLimit();
+		if (mobCount > serverLimit)
+		{
+			mobCount = serverLimit;
+			sender.sendMessage(_("mobSpawnLimit"));
+		}
+
+		try
+		{
+			for (int i = 0; i < mobCount; i++)
+			{
+				spawnMob(ess, server, sender, target, sloc, mob, mobData, mobMount, mountData);
+			}
+			sender.sendMessage(mobCount + " " + mob.name.toLowerCase(Locale.ENGLISH) + mob.suffix + " " + _("spawned"));
+		}
+		catch (MobException e1)
+		{
+			throw new Exception(_("unableToSpawnMob"), e1);
+		}
+		catch (NumberFormatException e2)
+		{
+			throw new Exception(_("numberRequired"), e2);
+		}
+		catch (NullPointerException np)
+		{
+			throw new Exception(_("soloMob"), np);
+		}
+	}
+
+	private static void spawnMob(final IEssentials ess, final Server server, final CommandSender sender, final User target, final Location sloc, Mob mob, String mobData, Mob mobMount, String mountData) throws Exception
+	{
+		Entity spawnedMob = mob.spawn(sloc.getWorld(), server, sloc);
+		Entity spawnedMount = null;
+
+		if (mobMount != null)
+		{
+			spawnedMount = mobMount.spawn(sloc.getWorld(), server, sloc);
+			spawnedMob.setPassenger(spawnedMount);
+		}
+		if (mobData != null)
+		{
+			changeMobData(mob.getType(), spawnedMob, mobData, target);
+		}
+		if (spawnedMount != null && mountData != null)
+		{
+			changeMobData(mobMount.getType(), spawnedMount, mountData, target);
+		}
+	}
+
+	private static void checkSpawnable(IEssentials ess, CommandSender sender, Mob mob) throws Exception
+	{
+		if (mob == null)
+		{
+			throw new Exception(_("invalidMob"));
+		}
+
+		if (ess.getSettings().getProtectPreventSpawn(mob.getType().toString().toLowerCase(Locale.ENGLISH)))
+		{
+			throw new Exception(_("disabledToSpawnMob"));
+		}
+
+		if (sender instanceof User && !((User)sender).isAuthorized("essentials.spawnmob." + mob.name.toLowerCase()))
+		{
+			throw new Exception(_("noPermToSpawnMob"));
+		}
+	}
+
+	private static void changeMobData(final EntityType type, final Entity spawned, String data, final User target) throws Exception
+	{
+		data = data.toLowerCase(Locale.ENGLISH);
+
+		if (spawned instanceof Slime)
+		{
+			try
+			{
+				((Slime)spawned).setSize(Integer.parseInt(data));
+			}
+			catch (Exception e)
+			{
+				throw new Exception(_("slimeMalformedSize"), e);
+			}
+		}
+
+		if ((spawned instanceof Ageable) && data.contains("baby"))
+		{
+			((Ageable)spawned).setBaby();
+			data = data.replace("baby", "");
+		}
+
+		if (spawned instanceof Colorable)
+		{
+			final String color = data.toUpperCase(Locale.ENGLISH);
+			try
+			{
+				if (color.equals("RANDOM"))
+				{
+					final Random rand = new Random();
+					((Colorable)spawned).setColor(DyeColor.values()[rand.nextInt(DyeColor.values().length)]);
+				}
+				else if (color.length() > 1)
+				{
+					((Colorable)spawned).setColor(DyeColor.valueOf(color));
+				}
+			}
+			catch (Exception e)
+			{
+				throw new Exception(_("sheepMalformedColor"), e);
+			}
+		}
+
+		if (spawned instanceof Tameable && data.contains("tamed") && target != null)
+		{
+			final Tameable tameable = ((Tameable)spawned);
+			tameable.setTamed(true);
+			tameable.setOwner(target.getBase());
+			data = data.replace("tamed", "");
+		}
+
+		if (type == EntityType.WOLF)
+		{
+			if (data.contains("angry"))
+			{
+				((Wolf)spawned).setAngry(true);
+			}
+		}
+
+		if (type == EntityType.CREEPER && data.contains("powered"))
+		{
+			((Creeper)spawned).setPowered(true);
+		}
+
+		if (type == EntityType.OCELOT)
+		{
+			if (data.contains("siamese"))
+			{
+				((Ocelot)spawned).setCatType(Ocelot.Type.SIAMESE_CAT);
+			}
+			else if (data.contains("red"))
+			{
+				((Ocelot)spawned).setCatType(Ocelot.Type.RED_CAT);
+			}
+			else if (data.contains("black"))
+			{
+				((Ocelot)spawned).setCatType(Ocelot.Type.BLACK_CAT);
+			}
+		}
+
+		if (type == EntityType.VILLAGER)
+		{
+			for (Villager.Profession prof : Villager.Profession.values())
+			{
+				if (data.contains(prof.toString().toLowerCase(Locale.ENGLISH)))
+				{
+					((Villager)spawned).setProfession(prof);
+				}
+			}
+		}
+
+		if (spawned instanceof Zombie)
+		{
+			if (data.contains("villager"))
+			{
+				((Zombie)spawned).setVillager(true);
+			}
+			if (data.contains("baby"))
+			{
+				((Zombie)spawned).setBaby(true);
+			}
+		}
+
+		if (type == EntityType.SKELETON)
+		{
+			if (data.contains("wither"))
+			{
+				((Skeleton)spawned).setSkeletonType(SkeletonType.WITHER);
+			}
+		}
+
+	}
+}

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

@@ -0,0 +1,61 @@
+package com.earth2me.essentials;
+
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityExplodeEvent;
+
+
+public class TNTExplodeListener implements Listener, Runnable
+{
+	private final transient IEssentials ess;
+	private transient boolean enabled = false;
+	private transient int timer = -1;
+
+	public TNTExplodeListener(final IEssentials ess)
+	{
+		super();
+		this.ess = ess;
+	}
+
+	public void enable()
+	{
+		if (!enabled)
+		{
+			enabled = true;
+			timer = ess.scheduleSyncDelayedTask(this, 200);
+			return;
+		}
+		if (timer != -1)
+		{
+			ess.getScheduler().cancelTask(timer);
+			timer = ess.scheduleSyncDelayedTask(this, 200);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOW)
+	public void onEntityExplode(final EntityExplodeEvent event)
+	{
+		if (!enabled)
+		{
+			return;
+		}
+		if (event.getEntity() instanceof LivingEntity)
+		{
+			return;
+		}
+		if (event.blockList().size() < 1)
+		{
+			return;
+		}
+		event.setCancelled(true);
+		event.getLocation().getWorld().createExplosion(event.getLocation(), 0F);
+	}
+
+	@Override
+	public void run()
+	{
+		enabled = false;
+	}
+}

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

@@ -0,0 +1,392 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.ITeleport;
+import com.earth2me.essentials.commands.NoChargeException;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.logging.Logger;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+
+
+public class Teleport implements Runnable, ITeleport
+{
+	private static final double MOVE_CONSTANT = 0.3;
+
+
+	private class Target
+	{
+		private final Location location;
+		private final String name;
+
+		Target(Location location)
+		{
+			this.location = location;
+			this.name = null;
+		}
+
+		Target(Player entity)
+		{
+			this.name = entity.getName();
+			this.location = null;
+		}
+
+		public Location getLocation()
+		{
+			if (this.name != null)
+			{
+
+				return ess.getServer().getPlayerExact(name).getLocation();
+			}
+			return location;
+		}
+	}
+	private IUser user;
+	private IUser teleportUser;
+	private int teleTimer = -1;
+	private long started;	// time this task was initiated
+	private long tpdelay;		// how long to delay the teleport
+	private int health;
+	// note that I initially stored a clone of the location for reference, but...
+	// when comparing locations, I got incorrect mismatches (rounding errors, looked like)
+	// so, the X/Y/Z values are stored instead and rounded off
+	private long initX;
+	private long initY;
+	private long initZ;
+	private Target teleportTarget;
+	private boolean respawn;
+	private Trade chargeFor;
+	private final IEssentials ess;
+	private static final Logger logger = Logger.getLogger("Minecraft");
+	private TeleportCause cause;
+
+	private void initTimer(long delay, Target target, Trade chargeFor, TeleportCause cause)
+	{
+		initTimer(delay, user, target, chargeFor, cause, false);
+	}
+
+	private void initTimer(long delay, IUser teleportUser, Target target, Trade chargeFor, TeleportCause cause, boolean respawn)
+	{
+		this.started = System.currentTimeMillis();
+		this.tpdelay = delay;
+		this.health = teleportUser.getHealth();
+		this.initX = Math.round(teleportUser.getLocation().getX() * MOVE_CONSTANT);
+		this.initY = Math.round(teleportUser.getLocation().getY() * MOVE_CONSTANT);
+		this.initZ = Math.round(teleportUser.getLocation().getZ() * MOVE_CONSTANT);
+		this.teleportUser = teleportUser;
+		this.teleportTarget = target;
+		this.chargeFor = chargeFor;
+		this.cause = cause;
+		this.respawn = respawn;
+	}
+
+	@Override
+	public void run()
+	{
+
+		if (user == null || !user.isOnline() || user.getLocation() == null)
+		{
+			cancel(false);
+			return;
+		}
+		if (teleportUser == null || !teleportUser.isOnline() || teleportUser.getLocation() == null)
+		{
+			cancel(false);
+			return;
+		}
+
+		if (!user.isAuthorized("essentials.teleport.timer.move")
+			&& (Math.round(teleportUser.getLocation().getX() * MOVE_CONSTANT) != initX
+				|| Math.round(teleportUser.getLocation().getY() * MOVE_CONSTANT) != initY
+				|| Math.round(teleportUser.getLocation().getZ() * MOVE_CONSTANT) != initZ
+				|| teleportUser.getHealth() < health))
+		{
+			// user moved, cancel teleport
+			cancel(true);
+			return;
+		}
+		health = teleportUser.getHealth();  // in case user healed, then later gets injured
+		long now = System.currentTimeMillis();
+		if (now > started + tpdelay)
+		{
+			try
+			{
+				cooldown(false);
+				teleportUser.sendMessage(_("teleportationCommencing"));
+				try
+				{
+					if (respawn) {
+						teleportUser.getTeleport().respawn(cause);
+					}
+					else {
+						teleportUser.getTeleport().now(teleportTarget, cause);
+					}
+					cancel(false);
+					if (chargeFor != null)
+					{
+						chargeFor.charge(user);
+					}
+				}
+				catch (Throwable ex)
+				{
+					ess.showError(user.getBase(), ex, "teleport");
+				}
+			}
+			catch (Exception ex)
+			{
+				user.sendMessage(_("cooldownWithMessage", ex.getMessage()));
+				if (user != teleportUser)
+				{
+					teleportUser.sendMessage(_("cooldownWithMessage", ex.getMessage()));
+				}
+			}
+		}
+	}
+
+	public Teleport(IUser user, IEssentials ess)
+	{
+		this.user = user;
+		this.ess = ess;
+	}
+
+	public void cooldown(boolean check) throws Exception
+	{
+		final Calendar time = new GregorianCalendar();
+		if (user.getLastTeleportTimestamp() > 0)
+		{
+			// Take the current time, and remove the delay from it.
+			final double cooldown = ess.getSettings().getTeleportCooldown();
+			final Calendar earliestTime = new GregorianCalendar();
+			earliestTime.add(Calendar.SECOND, -(int)cooldown);
+			earliestTime.add(Calendar.MILLISECOND, -(int)((cooldown * 1000.0) % 1000.0));
+			// This value contains the most recent time a teleport could have been used that would allow another use.
+			final long earliestLong = earliestTime.getTimeInMillis();
+
+			// When was the last teleport used?
+			final Long lastTime = user.getLastTeleportTimestamp();
+
+			if (lastTime > time.getTimeInMillis())
+			{
+				// This is to make sure time didn't get messed up on last kit use.
+				// If this happens, let's give the user the benifit of the doubt.
+				user.setLastTeleportTimestamp(time.getTimeInMillis());
+				return;
+			}
+			else if (lastTime > earliestLong && !user.isAuthorized("essentials.teleport.cooldown.bypass"))
+			{
+				time.setTimeInMillis(lastTime);
+				time.add(Calendar.SECOND, (int)cooldown);
+				time.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
+				throw new Exception(_("timeBeforeTeleport", Util.formatDateDiff(time.getTimeInMillis())));
+			}
+		}
+		// if justCheck is set, don't update lastTeleport; we're just checking
+		if (!check)
+		{
+			user.setLastTeleportTimestamp(time.getTimeInMillis());
+		}
+	}
+
+	//If we need to cancel a pending teleport call this method
+	public void cancel(boolean notifyUser)
+	{
+		if (teleTimer == -1)
+		{
+			return;
+		}
+		try
+		{
+			ess.getServer().getScheduler().cancelTask(teleTimer);
+			if (notifyUser)
+			{
+				user.sendMessage(_("pendingTeleportCancelled"));
+				if (teleportUser != user)
+				{
+					teleportUser.sendMessage(_("pendingTeleportCancelled"));
+				}
+			}
+		}
+		finally
+		{
+			teleTimer = -1;
+		}
+	}
+
+	//The now function is used when you want to skip tp delay when teleporting someone to a location or player.
+	public void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception
+	{
+		if (cooldown)
+		{
+			cooldown(false);
+		}
+		now(new Target(loc), cause);
+	}
+
+	public void now(Player entity, boolean cooldown, TeleportCause cause) throws Exception
+	{
+		if (cooldown)
+		{
+			cooldown(false);
+		}
+		now(new Target(entity), cause);
+	}
+
+	private void now(Target target, TeleportCause cause) throws Exception
+	{
+		cancel(false);
+		user.setLastLocation();
+		user.getBase().teleport(Util.getSafeDestination(target.getLocation()), cause);
+	}
+
+	//The teleport function is used when you want to normally teleport someone to a location or player.
+	//This method is nolonger used internally and will be removed.
+	@Deprecated
+	public void teleport(Location loc, Trade chargeFor) throws Exception
+	{
+		teleport(loc, chargeFor, TeleportCause.PLUGIN);
+	}
+
+	public void teleport(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		teleport(new Target(loc), chargeFor, cause);
+	}
+
+	public void teleport(Player entity, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		teleport(new Target(entity), chargeFor, cause);
+	}
+
+	private void teleport(Target target, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		double delay = ess.getSettings().getTeleportDelay();
+
+		if (chargeFor != null)
+		{
+			chargeFor.isAffordableFor(user);
+		}
+		cooldown(true);
+		if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
+		{
+			cooldown(false);
+			now(target, cause);
+			if (chargeFor != null)
+			{
+				chargeFor.charge(user);
+			}
+			return;
+		}
+
+		cancel(false);
+		warnUser(user, delay);
+		initTimer((long)(delay * 1000.0), target, chargeFor, cause);
+
+		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
+	}
+
+	//The teleportToMe function is a wrapper used to handle teleporting players to them, like /tphere
+	public void teleportToMe(User otherUser, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		Target target = new Target(user);
+		double delay = ess.getSettings().getTeleportDelay();
+
+		if (chargeFor != null)
+		{
+			chargeFor.isAffordableFor(user);
+		}
+		cooldown(true);
+		if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
+		{
+			cooldown(false);
+			otherUser.getTeleport().now(target, cause);
+			if (chargeFor != null)
+			{
+				chargeFor.charge(user);
+			}
+			return;
+		}
+
+		cancel(false);
+		warnUser(otherUser, delay);
+		initTimer((long)(delay * 1000.0), otherUser, target, chargeFor, cause, false);
+		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
+	}
+
+	private void warnUser(final IUser user, final double delay)
+	{
+		Calendar c = new GregorianCalendar();
+		c.add(Calendar.SECOND, (int)delay);
+		c.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
+		user.sendMessage(_("dontMoveMessage", Util.formatDateDiff(c.getTimeInMillis())));
+	}
+
+	//The respawn function is a wrapper used to handle tp fallback, on /jail and /home
+	public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		double delay = ess.getSettings().getTeleportDelay();
+		if (chargeFor != null)
+		{
+			chargeFor.isAffordableFor(user);
+		}
+		cooldown(true);
+		if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
+		{
+			cooldown(false);
+			respawn(cause);
+			if (chargeFor != null)
+			{
+				chargeFor.charge(user);
+			}
+			return;
+		}
+
+		cancel(false);
+		initTimer((long)(delay * 1000.0), user, null, chargeFor, cause, true);
+		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
+	}
+		
+	public void respawn(TeleportCause cause) throws Exception
+	{
+		final Player player = user.getBase();
+		Location bed = player.getBedSpawnLocation();
+		if (bed != null && bed.getBlock().getType() != Material.BED_BLOCK)
+		{
+			now(new Target(bed), cause);
+		}
+		else
+		{
+			final PlayerRespawnEvent pre = new PlayerRespawnEvent(player, player.getWorld().getSpawnLocation(), false);
+			ess.getServer().getPluginManager().callEvent(pre);
+			now(new Target(pre.getRespawnLocation()), cause);
+		}
+	}
+
+	//The warp function is a wrapper used to teleport a player to a /warp
+	public void warp(String warp, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		Location loc = ess.getWarps().getWarp(warp);
+		user.sendMessage(_("warpingTo", warp));
+		teleport(new Target(loc), chargeFor, cause);
+	}
+
+	//The back function is a wrapper used to teleport a player /back to their previous location.	
+	public void back(Trade chargeFor) throws Exception
+	{
+		teleport(new Target(user.getLastLocation()), chargeFor, TeleportCause.COMMAND);
+	}
+
+	//This function is used to throw a user back after a jail sentence
+	public void back() throws Exception
+	{
+		now(new Target(user.getLastLocation()), TeleportCause.COMMAND);
+	}
+
+	//This function handles teleporting to /home
+	public void home(Location loc, Trade chargeFor) throws Exception
+	{
+		teleport(new Target(loc), chargeFor, TeleportCause.COMMAND);
+	}
+}

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

@@ -0,0 +1,360 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import com.earth2me.essentials.craftbukkit.SetExpFix;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Location;
+import org.bukkit.entity.Item;
+import org.bukkit.inventory.ItemStack;
+
+
+public class Trade
+{
+	private final transient String command;
+	private final transient Trade fallbackTrade;
+	private final transient Double money;
+	private final transient ItemStack itemStack;
+	private final transient Integer exp;
+	private final transient IEssentials ess;
+
+	public Trade(final String command, final IEssentials ess)
+	{
+		this(command, null, null, null, null, ess);
+	}
+
+	public Trade(final String command, final Trade fallback, final IEssentials ess)
+	{
+		this(command, fallback, null, null, null, ess);
+	}
+
+	public Trade(final double money, final IEssentials ess)
+	{
+		this(null, null, money, null, null, ess);
+	}
+
+	public Trade(final ItemStack items, final IEssentials ess)
+	{
+		this(null, null, null, items, null, ess);
+	}
+
+	public Trade(final int exp, final IEssentials ess)
+	{
+		this(null, null, null, null, exp, ess);
+	}
+
+	private Trade(final String command, final Trade fallback, final Double money, final ItemStack item, final Integer exp, final IEssentials ess)
+	{
+		this.command = command;
+		this.fallbackTrade = fallback;
+		this.money = money;
+		this.itemStack = item;
+		this.exp = exp;
+		this.ess = ess;
+	}
+
+	public void isAffordableFor(final IUser user) throws ChargeException
+	{
+
+		if (ess.getSettings().isDebug())
+		{
+			ess.getLogger().log(Level.INFO, "checking if " + user.getName() + " can afford charge.");
+		}
+
+		if (getMoney() != null
+			&& getMoney() > 0
+			&& !user.canAfford(getMoney()))
+		{
+			throw new ChargeException(_("notEnoughMoney"));
+		}
+
+		if (getItemStack() != null
+			&& !user.getInventory().containsAtLeast(itemStack, itemStack.getAmount()))
+		{
+			throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
+		}
+
+		double money;
+		if (command != null && !command.isEmpty()
+			&& 0 < (money = getCommandCost(user))
+			&& !user.canAfford(money))
+		{
+			throw new ChargeException(_("notEnoughMoney"));
+		}
+
+		if (exp != null && exp > 0
+			&& SetExpFix.getTotalExperience(user) < exp)
+		{
+			throw new ChargeException(_("notEnoughExperience"));
+		}
+	}
+
+	public void pay(final IUser user)
+	{
+		pay(user, true);
+	}
+
+	public boolean pay(final IUser user, final boolean dropItems)
+	{
+		boolean success = true;
+		if (getMoney() != null && getMoney() > 0)
+		{
+			user.giveMoney(getMoney());
+		}
+		if (getItemStack() != null)
+		{
+			if (dropItems)
+			{
+				final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItems(user.getInventory(), getItemStack());
+				final Location loc = user.getLocation();
+				for (ItemStack itemStack : leftOver.values())
+				{
+					final int maxStackSize = itemStack.getType().getMaxStackSize();
+					final int stacks = itemStack.getAmount() / maxStackSize;
+					final int leftover = itemStack.getAmount() % maxStackSize;
+					final Item[] itemStacks = new Item[stacks + (leftover > 0 ? 1 : 0)];
+					for (int i = 0; i < stacks; i++)
+					{
+						final ItemStack stack = itemStack.clone();
+						stack.setAmount(maxStackSize);
+						itemStacks[i] = loc.getWorld().dropItem(loc, stack);
+					}
+					if (leftover > 0)
+					{
+						final ItemStack stack = itemStack.clone();
+						stack.setAmount(leftover);
+						itemStacks[stacks] = loc.getWorld().dropItem(loc, stack);
+					}
+				}
+			}
+			else
+			{
+				success = InventoryWorkaround.addAllItems(user.getInventory(), getItemStack());
+			}
+			user.updateInventory();
+		}
+		if (getExperience() != null)
+		{
+			SetExpFix.setTotalExperience(user, SetExpFix.getTotalExperience(user) + getExperience());
+		}
+		return success;
+	}
+
+	public void charge(final IUser user) throws ChargeException
+	{
+		if (ess.getSettings().isDebug())
+		{
+			ess.getLogger().log(Level.INFO, "charging user " + user.getName());
+		}
+
+		if (getMoney() != null)
+		{
+			if (!user.canAfford(getMoney()) && getMoney() > 0.0d)
+			{
+				throw new ChargeException(_("notEnoughMoney"));
+			}
+			user.takeMoney(getMoney());
+		}
+		if (getItemStack() != null)
+		{
+			if (!user.getInventory().containsAtLeast(itemStack, itemStack.getAmount()))
+			{
+				throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
+			}
+			user.getInventory().removeItem(getItemStack());
+			user.updateInventory();
+		}
+		if (command != null)
+		{
+			final double cost = getCommandCost(user);
+			if (!user.canAfford(cost) && cost > 0.0d)
+			{
+				throw new ChargeException(_("notEnoughMoney"));
+			}
+			user.takeMoney(cost);
+		}
+		if (getExperience() != null)
+		{
+			final int experience = SetExpFix.getTotalExperience(user);
+			if (experience < getExperience() && getExperience() > 0)
+			{
+				throw new ChargeException(_("notEnoughExperience"));
+			}
+			SetExpFix.setTotalExperience(user, experience - getExperience());
+		}
+	}
+
+	public Double getMoney()
+	{
+		return money;
+	}
+
+	public ItemStack getItemStack()
+	{
+		return itemStack;
+	}
+
+	public Integer getExperience()
+	{
+		return exp;
+	}
+
+	public Double getCommandCost(final IUser user)
+	{
+		double cost = 0.0d;
+		if (command != null && !command.isEmpty())
+		{
+			cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
+			if (cost == 0.0d && fallbackTrade != null)
+			{
+				cost = fallbackTrade.getCommandCost(user);
+			}
+
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.INFO, "calculated command (" + command + ") cost for " + user.getName() + " as " + cost);
+			}
+		}
+		if (cost != 0.0d && (user.isAuthorized("essentials.nocommandcost.all")
+							 || user.isAuthorized("essentials.nocommandcost." + command)))
+		{
+			return 0.0d;
+		}
+		return cost;
+	}
+	private static FileWriter fw = null;
+
+	public static void log(String type, String subtype, String event, String sender, Trade charge, String receiver, Trade pay, Location loc, IEssentials ess)
+	{
+		//isEcoLogUpdateEnabled() - This refers to log entries with no location, ie API updates #EasterEgg
+		//isEcoLogEnabled() - This refers to log entries with with location, ie /pay /sell and eco signs.
+		
+		if ((loc == null && !ess.getSettings().isEcoLogUpdateEnabled())
+			|| (loc != null && !ess.getSettings().isEcoLogEnabled()))
+		{
+			return;
+		}
+		if (fw == null)
+		{
+			try
+			{
+				fw = new FileWriter(new File(ess.getDataFolder(), "trade.log"), true);
+			}
+			catch (IOException ex)
+			{
+				Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
+			}
+		}
+		StringBuilder sb = new StringBuilder();
+		sb.append(type).append(",").append(subtype).append(",").append(event).append(",\"");
+		sb.append(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).format(new Date()));
+		sb.append("\",\"");
+		if (sender != null)
+		{
+			sb.append(sender);
+		}
+		sb.append("\",");
+		if (charge == null)
+		{
+			sb.append("\"\",\"\",\"\"");
+		}
+		else
+		{
+			if (charge.getItemStack() != null)
+			{
+				sb.append(charge.getItemStack().getAmount()).append(",");
+				sb.append(charge.getItemStack().getType().toString()).append(",");
+				sb.append(charge.getItemStack().getDurability());
+			}
+			if (charge.getMoney() != null)
+			{
+				sb.append(charge.getMoney()).append(",");
+				sb.append("money").append(",");
+				sb.append(ess.getSettings().getCurrencySymbol());
+			}
+			if (charge.getExperience() != null)
+			{
+				sb.append(charge.getExperience()).append(",");
+				sb.append("exp").append(",");
+				sb.append("\"\"");
+			}
+		}
+		sb.append(",\"");
+		if (receiver != null)
+		{
+			sb.append(receiver);
+		}
+		sb.append("\",");
+		if (pay == null)
+		{
+			sb.append("\"\",\"\",\"\"");
+		}
+		else
+		{
+			if (pay.getItemStack() != null)
+			{
+				sb.append(pay.getItemStack().getAmount()).append(",");
+				sb.append(pay.getItemStack().getType().toString()).append(",");
+				sb.append(pay.getItemStack().getDurability());
+			}
+			if (pay.getMoney() != null)
+			{
+				sb.append(pay.getMoney()).append(",");
+				sb.append("money").append(",");
+				sb.append(ess.getSettings().getCurrencySymbol());
+			}
+			if (pay.getExperience() != null)
+			{
+				sb.append(pay.getExperience()).append(",");
+				sb.append("exp").append(",");
+				sb.append("\"\"");
+			}
+		}
+		if (loc == null)
+		{
+			sb.append(",\"\",\"\",\"\",\"\"");
+		}
+		else
+		{
+			sb.append(",\"");
+			sb.append(loc.getWorld().getName()).append("\",");
+			sb.append(loc.getBlockX()).append(",");
+			sb.append(loc.getBlockY()).append(",");
+			sb.append(loc.getBlockZ()).append(",");
+		}
+		sb.append("\n");
+		try
+		{
+			fw.write(sb.toString());
+			fw.flush();
+		}
+		catch (IOException ex)
+		{
+			Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
+		}
+	}
+
+	public static void closeLog()
+	{
+		if (fw != null)
+		{
+			try
+			{
+				fw.close();
+			}
+			catch (IOException ex)
+			{
+				Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
+			}
+			fw = null;
+		}
+	}
+}

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

@@ -0,0 +1,746 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.commands.IEssentialsCommand;
+import com.earth2me.essentials.register.payment.Method;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+
+
+public class User extends UserData implements Comparable<User>, IReplyTo, IUser
+{
+	private CommandSender replyTo = null;
+	private transient User teleportRequester;
+	private transient boolean teleportRequestHere;
+	private transient boolean vanished;
+	private transient final Teleport teleport;
+	private transient long teleportRequestTime;
+	private transient long lastOnlineActivity;
+	private transient long lastThrottledAction;
+	private transient long lastActivity = System.currentTimeMillis();
+	private boolean hidden = false;
+	private boolean rightClickJump = false;
+	private transient Location afkPosition = null;
+	private boolean invSee = false;
+	private boolean enderSee = false;
+	private static final Logger logger = Logger.getLogger("Minecraft");
+
+	User(final Player base, final IEssentials ess)
+	{
+		super(base, ess);
+		teleport = new Teleport(this, ess);
+		if (isAfk())
+		{
+			afkPosition = getLocation();
+		}
+	}
+
+	User update(final Player base)
+	{
+		setBase(base);
+		return this;
+	}
+
+	@Override
+	public boolean isAuthorized(final IEssentialsCommand cmd)
+	{
+		return isAuthorized(cmd, "essentials.");
+	}
+
+	@Override
+	public boolean isAuthorized(final IEssentialsCommand cmd, final String permissionPrefix)
+	{
+		return isAuthorized(permissionPrefix + (cmd.getName().equals("r") ? "msg" : cmd.getName()));
+	}
+
+	@Override
+	public boolean isAuthorized(final String node)
+	{
+		final boolean result = isAuthorizedCheck(node);
+		if (ess.getSettings().isDebug())
+		{
+			ess.getLogger().log(Level.INFO, "checking if " + base.getName() + " has " + node + " - " + result);
+		}
+		return result;
+	}
+
+	private boolean isAuthorizedCheck(final String node)
+	{
+
+		if (base instanceof OfflinePlayer)
+		{
+			return false;
+		}
+
+		if (isJailed())
+		{
+			return false;
+		}
+
+		try
+		{
+			return ess.getPermissionsHandler().hasPermission(base, node);
+		}
+		catch (Exception ex)
+		{
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.SEVERE, "Permission System Error: " + ess.getPermissionsHandler().getName() + " returned: " + ex.getMessage(), ex);
+			}
+			else
+			{
+				ess.getLogger().log(Level.SEVERE, "Permission System Error: " + ess.getPermissionsHandler().getName() + " returned: " + ex.getMessage());
+			}
+
+			return false;
+		}
+	}
+
+	public void healCooldown() throws Exception
+	{
+		final Calendar now = new GregorianCalendar();
+		if (getLastHealTimestamp() > 0)
+		{
+			final double cooldown = ess.getSettings().getHealCooldown();
+			final Calendar cooldownTime = new GregorianCalendar();
+			cooldownTime.setTimeInMillis(getLastHealTimestamp());
+			cooldownTime.add(Calendar.SECOND, (int)cooldown);
+			cooldownTime.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
+			if (cooldownTime.after(now) && !isAuthorized("essentials.heal.cooldown.bypass"))
+			{
+				throw new Exception(_("timeBeforeHeal", Util.formatDateDiff(cooldownTime.getTimeInMillis())));
+			}
+		}
+		setLastHealTimestamp(now.getTimeInMillis());
+	}
+
+	@Override
+	public void giveMoney(final double value)
+	{
+		giveMoney(value, null);
+	}
+
+	public void giveMoney(final double value, final CommandSender initiator)
+	{
+		if (value == 0.0d)
+		{
+			return;
+		}
+		setMoney(getMoney() + value);
+		sendMessage(_("addedToAccount", Util.displayCurrency(value, ess)));
+		if (initiator != null)
+		{
+			initiator.sendMessage(_("addedToOthersAccount", Util.displayCurrency(value, ess), this.getDisplayName(), Util.displayCurrency(getMoney(), ess)));
+		}
+	}
+
+	public void payUser(final User reciever, final double value) throws Exception
+	{
+		if (value == 0.0d)
+		{
+			return;
+		}
+		if (canAfford(value))
+		{
+			setMoney(getMoney() - value);
+			reciever.setMoney(reciever.getMoney() + value);
+			sendMessage(_("moneySentTo", Util.displayCurrency(value, ess), reciever.getDisplayName()));
+			reciever.sendMessage(_("moneyRecievedFrom", Util.displayCurrency(value, ess), getDisplayName()));
+		}
+		else
+		{
+			throw new Exception(_("notEnoughMoney"));
+		}
+	}
+
+	@Override
+	public void takeMoney(final double value)
+	{
+		takeMoney(value, null);
+	}
+
+	public void takeMoney(final double value, final CommandSender initiator)
+	{
+		if (value == 0.0d)
+		{
+			return;
+		}
+		setMoney(getMoney() - value);
+		sendMessage(_("takenFromAccount", Util.displayCurrency(value, ess)));
+		if (initiator != null)
+		{
+			initiator.sendMessage(_("takenFromOthersAccount", Util.displayCurrency(value, ess), this.getDisplayName(), Util.displayCurrency(getMoney(), ess)));
+		}
+	}
+
+	@Override
+	public boolean canAfford(final double cost)
+	{
+		return canAfford(cost, true);
+	}
+
+	public boolean canAfford(final double cost, final boolean permcheck)
+	{
+		if (cost <= 0.0d)
+		{
+			return true;
+		}
+		final double mon = getMoney();
+		if (!permcheck || isAuthorized("essentials.eco.loan"))
+		{
+			return (mon - cost) >= ess.getSettings().getMinMoney();
+		}
+		return cost <= mon;
+	}
+
+	public void dispose()
+	{
+		this.base = new OfflinePlayer(getName(), ess);
+	}
+
+	@Override
+	public void setReplyTo(final CommandSender user)
+	{
+		replyTo = user;
+	}
+
+	@Override
+	public CommandSender getReplyTo()
+	{
+		return replyTo;
+	}
+
+	@Override
+	public int compareTo(final User other)
+	{
+		return Util.stripFormat(this.getDisplayName()).compareToIgnoreCase(Util.stripFormat(other.getDisplayName()));
+	}
+
+	@Override
+	public boolean equals(final Object object)
+	{
+		if (!(object instanceof User))
+		{
+			return false;
+		}
+		return this.getName().equalsIgnoreCase(((User)object).getName());
+
+	}
+
+	@Override
+	public int hashCode()
+	{
+		return this.getName().hashCode();
+	}
+
+	public Boolean canSpawnItem(final int itemId)
+	{
+		return !ess.getSettings().itemSpawnBlacklist().contains(itemId);
+	}
+
+	public Location getHome() throws Exception
+	{
+		return getHome(getHomes().get(0));
+	}
+
+	@Override
+	public void setLastLocation()
+	{
+		setLastLocation(getLocation());
+	}
+
+	public void requestTeleport(final User player, final boolean here)
+	{
+		teleportRequestTime = System.currentTimeMillis();
+		teleportRequester = player;
+		teleportRequestHere = here;
+	}
+
+	public User getTeleportRequest()
+	{
+		return teleportRequester;
+	}
+
+	public boolean isTpRequestHere()
+	{
+		return teleportRequestHere;
+	}
+
+	public String getNick(final boolean longnick)
+	{
+		final StringBuilder prefix = new StringBuilder();
+		String nickname;
+		String suffix = "";
+		final String nick = getNickname();
+		if (ess.getSettings().isCommandDisabled("nick") || nick == null || nick.isEmpty() || nick.equals(getName()))
+		{
+			nickname = getName();
+		}
+		else
+		{
+			nickname = ess.getSettings().getNicknamePrefix() + nick;
+		}
+
+		if (isOp())
+		{
+			try
+			{
+				final ChatColor opPrefix = ess.getSettings().getOperatorColor();
+				if (opPrefix != null && opPrefix.toString().length() > 0)
+				{
+					prefix.insert(0, opPrefix.toString());
+					suffix = "§r";
+				}
+			}
+			catch (Exception e)
+			{
+			}
+		}
+
+		if (ess.getSettings().addPrefixSuffix())
+		{
+			//These two extra toggles are not documented, because they are mostly redundant #EasterEgg
+			if (!ess.getSettings().disablePrefix())
+			{
+				final String ptext = ess.getPermissionsHandler().getPrefix(base).replace('&', '§');
+				prefix.insert(0, ptext);
+				suffix = "§r";
+			}
+			if (!ess.getSettings().disableSuffix())
+			{
+				final String stext = ess.getPermissionsHandler().getSuffix(base).replace('&', '§');
+				suffix = stext + "§r";
+				suffix = suffix.replace("§f§f", "§f").replace("§f§r", "§r").replace("§r§r", "§r");
+			}
+		}
+		final String strPrefix = prefix.toString();
+		String output = strPrefix + nickname + suffix;
+		if (!longnick && output.length() > 16)
+		{
+			output = strPrefix + nickname;
+		}
+		if (!longnick && output.length() > 16)
+		{
+			output = Util.lastCode(strPrefix) + nickname;
+		}
+		if (!longnick && output.length() > 16)
+		{
+			output = Util.lastCode(strPrefix) + nickname.substring(0, 14);
+		}
+		if (output.charAt(output.length() - 1) == '§')
+		{
+			output = output.substring(0, output.length() - 1);
+		}
+		return output;
+	}
+
+	public void setDisplayNick()
+	{
+		if (base.isOnline() && ess.getSettings().changeDisplayName())
+		{
+			setDisplayName(getNick(true));
+			if (ess.getSettings().changePlayerListName())
+			{
+				String name = getNick(false);
+				try
+				{
+					setPlayerListName(name);
+				}
+				catch (IllegalArgumentException e)
+				{
+					if (ess.getSettings().isDebug())
+					{
+						logger.log(Level.INFO, "Playerlist for " + name + " was not updated. Name clashed with another online player.");
+					}
+				}
+			}
+		}
+	}
+
+	@Override
+	public String getDisplayName()
+	{
+		return super.getDisplayName() == null ? super.getName() : super.getDisplayName();
+	}
+
+	@Override
+	public Teleport getTeleport()
+	{
+		return teleport;
+	}
+
+	public long getLastOnlineActivity()
+	{
+		return lastOnlineActivity;
+	}
+
+	public void setLastOnlineActivity(final long timestamp)
+	{
+		lastOnlineActivity = timestamp;
+	}
+
+	@Override
+	public double getMoney()
+	{
+		if (ess.getPaymentMethod().hasMethod())
+		{
+			try
+			{
+				final Method method = ess.getPaymentMethod().getMethod();
+				if (!method.hasAccount(this.getName()))
+				{
+					throw new Exception();
+				}
+				final Method.MethodAccount account = ess.getPaymentMethod().getMethod().getAccount(this.getName());
+				return account.balance();
+			}
+			catch (Throwable ex)
+			{
+			}
+		}
+		return super.getMoney();
+	}
+
+	@Override
+	public void setMoney(final double value)
+	{
+		if (ess.getPaymentMethod().hasMethod())
+		{
+			try
+			{
+				final Method method = ess.getPaymentMethod().getMethod();
+				if (!method.hasAccount(this.getName()))
+				{
+					throw new Exception();
+				}
+				final Method.MethodAccount account = ess.getPaymentMethod().getMethod().getAccount(this.getName());
+				account.set(value);
+			}
+			catch (Throwable ex)
+			{
+			}
+		}
+		super.setMoney(value);
+		Trade.log("Update", "Set", "API", getName(), new Trade(value, ess), null, null, null, ess);
+	}
+
+	public void updateMoneyCache(final double value)
+	{
+		if (ess.getPaymentMethod().hasMethod() && super.getMoney() != value)
+		{
+			super.setMoney(value);
+		}
+	}
+
+	@Override
+	public void setAfk(final boolean set)
+	{
+		this.setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : set);
+		if (set && !isAfk())
+		{
+			afkPosition = getLocation();
+		}
+		else if (!set && isAfk())
+		{
+			afkPosition = null;
+		}
+		super.setAfk(set);
+	}
+
+	@Override
+	public boolean toggleAfk()
+	{
+		final boolean now = super.toggleAfk();
+		this.setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : now);
+		return now;
+	}
+
+	@Override
+	public boolean isHidden()
+	{
+		return hidden;
+	}
+
+	public void setHidden(final boolean hidden)
+	{
+		this.hidden = hidden;
+		if (hidden == true)
+		{
+			setLastLogout(getLastOnlineActivity());
+		}
+	}
+
+	//Returns true if status expired during this check
+	public boolean checkJailTimeout(final long currentTime)
+	{
+		if (getJailTimeout() > 0 && getJailTimeout() < currentTime && isJailed())
+		{
+			setJailTimeout(0);
+			setJailed(false);
+			sendMessage(_("haveBeenReleased"));
+			setJail(null);
+			try
+			{
+				getTeleport().back();
+			}
+			catch (Exception ex)
+			{
+				try
+				{
+					getTeleport().respawn(null, TeleportCause.PLUGIN);
+				}
+				catch (Exception ex1)
+				{
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+
+	//Returns true if status expired during this check
+	public boolean checkMuteTimeout(final long currentTime)
+	{
+		if (getMuteTimeout() > 0 && getMuteTimeout() < currentTime && isMuted())
+		{
+			setMuteTimeout(0);
+			sendMessage(_("canTalkAgain"));
+			setMuted(false);
+			return true;
+		}
+		return false;
+	}
+
+	//Returns true if status expired during this check
+	public boolean checkBanTimeout(final long currentTime)
+	{
+		if (getBanTimeout() > 0 && getBanTimeout() < currentTime && isBanned())
+		{
+			setBanTimeout(0);
+			setBanned(false);
+			return true;
+		}
+		return false;
+	}
+
+	public void updateActivity(final boolean broadcast)
+	{
+		if (isAfk())
+		{
+			setAfk(false);
+			if (broadcast && !isHidden())
+			{
+				setDisplayNick();
+				final String msg = _("userIsNotAway", getDisplayName());
+				if (!msg.isEmpty())
+				{					
+					ess.broadcastMessage(this, msg);
+				}
+			}
+		}
+		lastActivity = System.currentTimeMillis();
+	}
+
+	public void checkActivity()
+	{
+		final long autoafkkick = ess.getSettings().getAutoAfkKick();
+		if (autoafkkick > 0 && lastActivity > 0 && (lastActivity + (autoafkkick * 1000)) < System.currentTimeMillis()
+			&& !isHidden() && !isAuthorized("essentials.kick.exempt") && !isAuthorized("essentials.afk.kickexempt"))
+		{
+			final String kickReason = _("autoAfkKickReason", autoafkkick / 60.0);
+			lastActivity = 0;
+			kickPlayer(kickReason);
+
+
+			for (Player player : ess.getServer().getOnlinePlayers())
+			{
+				final User user = ess.getUser(player);
+				if (user.isAuthorized("essentials.kick.notify"))
+				{
+					player.sendMessage(_("playerKicked", Console.NAME, getName(), kickReason));
+				}
+			}
+		}
+		final long autoafk = ess.getSettings().getAutoAfk();
+		if (!isAfk() && autoafk > 0 && lastActivity + autoafk * 1000 < System.currentTimeMillis() && isAuthorized("essentials.afk.auto"))
+		{
+			setAfk(true);
+			if (!isHidden())
+			{
+				setDisplayNick();
+				final String msg = _("userIsAway", getDisplayName());
+				if (!msg.isEmpty())
+				{					
+					ess.broadcastMessage(this, msg);
+				}
+			}
+		}
+	}
+
+	public Location getAfkPosition()
+	{
+		return afkPosition;
+	}
+
+	@Override
+	public boolean isGodModeEnabled()
+	{
+		return (super.isGodModeEnabled() && !ess.getSettings().getNoGodWorlds().contains(getLocation().getWorld().getName()))
+			   || (isAfk() && ess.getSettings().getFreezeAfkPlayers());
+	}
+
+	public boolean isGodModeEnabledRaw()
+	{
+		return super.isGodModeEnabled();
+	}
+
+	@Override
+	public String getGroup()
+	{
+		return ess.getPermissionsHandler().getGroup(base);
+	}
+
+	public boolean inGroup(final String group)
+	{
+		return ess.getPermissionsHandler().inGroup(base, group);
+	}
+
+	public boolean canBuild()
+	{
+		if (isOp())
+		{
+			return true;
+		}
+		return ess.getPermissionsHandler().canBuild(base, getGroup());
+	}
+
+	public long getTeleportRequestTime()
+	{
+		return teleportRequestTime;
+	}
+
+	public boolean isInvSee()
+	{
+		return invSee;
+	}
+
+	public void setInvSee(final boolean set)
+	{
+		invSee = set;
+	}
+
+	public boolean isEnderSee()
+	{
+		return enderSee;
+	}
+
+	public void setEnderSee(final boolean set)
+	{
+		enderSee = set;
+	}
+	private transient long teleportInvulnerabilityTimestamp = 0;
+
+	public void enableInvulnerabilityAfterTeleport()
+	{
+		final long time = ess.getSettings().getTeleportInvulnerability();
+		if (time > 0)
+		{
+			teleportInvulnerabilityTimestamp = System.currentTimeMillis() + time;
+		}
+	}
+
+	public void resetInvulnerabilityAfterTeleport()
+	{
+		if (teleportInvulnerabilityTimestamp != 0
+			&& teleportInvulnerabilityTimestamp < System.currentTimeMillis())
+		{
+			teleportInvulnerabilityTimestamp = 0;
+		}
+	}
+
+	public boolean hasInvulnerabilityAfterTeleport()
+	{
+		return teleportInvulnerabilityTimestamp != 0 && teleportInvulnerabilityTimestamp >= System.currentTimeMillis();
+	}
+
+	public boolean isVanished()
+	{
+		return vanished;
+	}
+
+	public void setVanished(final boolean set)
+	{
+		vanished = set;
+		if (set)
+		{
+			for (Player p : ess.getServer().getOnlinePlayers())
+			{
+				if (!ess.getUser(p).isAuthorized("essentials.vanish.see"))
+				{
+					p.hidePlayer(getBase());
+				}
+			}
+			setHidden(true);
+			ess.getVanishedPlayers().add(getName());
+		}
+		else
+		{
+			for (Player p : ess.getServer().getOnlinePlayers())
+			{
+				p.showPlayer(getBase());
+			}
+			setHidden(false);
+			ess.getVanishedPlayers().remove(getName());
+		}
+	}
+
+	public void toggleVanished()
+	{
+		final boolean set = !vanished;
+		this.setVanished(set);
+	}
+
+	public boolean checkSignThrottle()
+	{
+		if (isSignThrottled())
+		{
+			return true;
+		}
+		updateThrottle();
+		return false;
+	}
+
+	public boolean isSignThrottled()
+	{
+		final long minTime = lastThrottledAction + (1000 / ess.getSettings().getSignUsePerSecond());
+		return (System.currentTimeMillis() < minTime);
+	}
+
+	public void updateThrottle()
+	{
+		lastThrottledAction = System.currentTimeMillis();;
+	}
+
+	public boolean isFlyClickJump()
+	{
+		return rightClickJump;
+	}
+
+	public void setRightClickJump(boolean rightClickJump)
+	{
+		this.rightClickJump = rightClickJump;
+	}
+
+	@Override
+	public boolean isIgnoreExempt()
+	{
+		return this.isAuthorized("essentials.chat.ignoreexempt");		
+	}
+}

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

@@ -1,33 +1,42 @@
 package com.earth2me.essentials;
 
+import static com.earth2me.essentials.I18n._;
 import java.io.File;
 import java.util.*;
-import net.ess3.api.IEssentials;
-import net.ess3.storage.StoredLocation;
 import org.bukkit.Location;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.MemoryConfiguration;
+import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 
-public class UserData
+public abstract class UserData extends PlayerExtension implements IConf
 {
-	protected final IEssentials ess;
+	protected final transient IEssentials ess;
 	private EssentialsConf config;
 	private final File folder;
 
-	protected UserData(IEssentials ess, File file)
+	protected UserData(Player base, IEssentials ess)
 	{
+		super(base);
 		this.ess = ess;
-		folder = new File(ess.getPlugin().getDataFolder(), "userdata");
+		folder = new File(ess.getDataFolder(), "userdata");
 		if (!folder.exists())
 		{
 			folder.mkdirs();
 		}
-		config = new EssentialsConf(file);
+		config = new EssentialsConf(new File(folder, Util.sanitizeFileName(base.getName()) + ".yml"));
 		reloadConfig();
 	}
 
+	public final void reset()
+	{
+		config.getFile().delete();
+		config = new EssentialsConf(new File(folder, Util.sanitizeFileName(base.getName()) + ".yml"));
+		reloadConfig();
+	}
+
+	@Override
 	public final void reloadConfig()
 	{
 		config.load();
@@ -40,36 +49,36 @@ public class UserData
 		lastHealTimestamp = _getLastHealTimestamp();
 		jail = _getJail();
 		mails = _getMails();
-		teleportEnabled = getTeleportEnabled();
+		teleportEnabled = _getTeleportEnabled();
-		ignoredPlayers = getIgnoredPlayers();
 		godmode = _getGodModeEnabled();
-		muted = getMuted();
+		muted = _getMuted();
 		muteTimeout = _getMuteTimeout();
-		jailed = getJailed();
+		jailed = _getJailed();
 		jailTimeout = _getJailTimeout();
 		lastLogin = _getLastLogin();
 		lastLogout = _getLastLogout();
 		lastLoginAddress = _getLastLoginAddress();
-		afk = getAfk();
+		afk = _getAfk();
 		geolocation = _getGeoLocation();
 		isSocialSpyEnabled = _isSocialSpyEnabled();
 		isNPC = _isNPC();
 		arePowerToolsEnabled = _arePowerToolsEnabled();
 		kitTimestamps = _getKitTimestamps();
 		nickname = _getNickname();
+		setIgnoredPlayers(_getIgnoredPlayers());
 	}
 	private double money;
 
 	private double _getMoney()
 	{
-		double money = ess.getSettings().getData().getEconomy().getStartingBalance();
+		double money = ess.getSettings().getStartingBalance();
 		if (config.hasProperty("money"))
 		{
 			money = config.getDouble("money", money);
 		}
-		if (Math.abs(money) > ess.getSettings().getData().getEconomy().getMaxMoney())
+		if (Math.abs(money) > ess.getSettings().getMaxMoney())
 		{
-			money = money < 0 ? -ess.getSettings().getData().getEconomy().getMaxMoney() : ess.getSettings().getData().getEconomy().getMaxMoney();
+			money = money < 0 ? -ess.getSettings().getMaxMoney() : ess.getSettings().getMaxMoney();
 		}
 		return money;
 	}
@@ -82,9 +91,9 @@ public class UserData
 	public void setMoney(double value)
 	{
 		money = value;
-		if (Math.abs(money) > ess.getSettings().getData().getEconomy().getMaxMoney())
+		if (Math.abs(money) > ess.getSettings().getMaxMoney())
 		{
-			money = money < 0 ? -ess.getSettings().getData().getEconomy().getMaxMoney() : ess.getSettings().getData().getEconomy().getMaxMoney();
+			money = money < 0 ? -ess.getSettings().getMaxMoney() : ess.getSettings().getMaxMoney();
 		}
 		config.setProperty("money", value);
 		config.save();
@@ -114,11 +123,34 @@ public class UserData
 		}
 		return search;
 	}
-
+		
-	public StoredLocation getHome(String name) throws Exception
+	public Location getHome(String name) throws Exception
 	{
 		String search = getHomeName(name);
-		return config.getLocation("homes." + search, ess.getServer());
+		return config.getLocation("homes." + search, getServer());	
+	}
+
+	public Location getHome(final Location world)
+	{
+		try
+		{
+			Location loc;
+			for (String home : getHomes())
+			{
+				loc = config.getLocation("homes." + home, getServer());
+				if (world.getWorld() == loc.getWorld())
+				{
+					return loc;
+				}
+
+			}
+			loc = config.getLocation("homes." + getHomes().get(0), getServer());
+			return loc;
+		}
+		catch (Exception ex)
+		{
+			return null;
+		}
 	}
 
 	public List<String> getHomes()
@@ -150,7 +182,7 @@ public class UserData
 		}
 		else
 		{
-			throw new Exception("invalidHome");
+			throw new Exception(_("invalidHome", search));
 		}
 	}
 
@@ -221,11 +253,6 @@ public class UserData
 		return new HashMap<String, Object>();
 	}
 
-	public Set<String> getPowertools()
-	{
-		return powertools.keySet();
-	}
-
 	public void clearAllPowertools()
 	{
 		powertools.clear();
@@ -263,13 +290,13 @@ public class UserData
 	{
 		return !powertools.isEmpty();
 	}
-	private StoredLocation lastLocation;
+	private Location lastLocation;
 
-	private StoredLocation _getLastLocation()
+	private Location _getLastLocation()
 	{
 		try
 		{
-			return config.getLocation("lastlocation", ess.getServer());
+			return config.getLocation("lastlocation", getServer());
 		}
 		catch (Exception e)
 		{
@@ -277,10 +304,21 @@ public class UserData
 		}
 	}
 
-	public StoredLocation getLastLocation()
+	public Location getLastLocation()
 	{
 		return lastLocation;
 	}
+
+	public void setLastLocation(Location loc)
+	{
+		if (loc == null || loc.getWorld() == null)
+		{
+			return;
+		}
+		lastLocation = loc;
+		config.setProperty("lastlocation", loc);
+		config.save();
+	}
 	private long lastTeleportTimestamp;
 
 	private long _getLastTeleportTimestamp()
@@ -377,7 +415,7 @@ public class UserData
 	}
 	private boolean teleportEnabled;
 
-	private boolean getTeleportEnabled()
+	private boolean _getTeleportEnabled()
 	{
 		return config.getBoolean("teleportenabled", true);
 	}
@@ -409,7 +447,7 @@ public class UserData
 	}
 	private List<String> ignoredPlayers;
 
-	public List<String> getIgnoredPlayers()
+	public List<String> _getIgnoredPlayers()
 	{
 		return Collections.synchronizedList(config.getStringList("ignore"));
 	}
@@ -428,6 +466,35 @@ public class UserData
 		}
 		config.save();
 	}
+
+	@Deprecated
+	public boolean isIgnoredPlayer(final String userName)
+	{
+		final IUser user = ess.getUser(userName);
+		if (user == null || !user.isOnline())
+		{
+			return false;
+		}
+		return isIgnoredPlayer(user);
+	}
+
+	public boolean isIgnoredPlayer(IUser user)
+	{
+		return (ignoredPlayers.contains(user.getName().toLowerCase(Locale.ENGLISH)) && !user.isIgnoreExempt());
+	}
+
+	public void setIgnoredPlayer(IUser user, boolean set)
+	{
+		if (set)
+		{
+			ignoredPlayers.add(user.getName().toLowerCase(Locale.ENGLISH));
+		}
+		else
+		{
+			ignoredPlayers.remove(user.getName().toLowerCase(Locale.ENGLISH));
+		}
+		setIgnoredPlayers(ignoredPlayers);
+	}
 	private boolean godmode;
 
 	private boolean _getGodModeEnabled()
@@ -448,10 +515,15 @@ public class UserData
 	}
 	private boolean muted;
 
-	public boolean getMuted()
+	public boolean _getMuted()
 	{
 		return config.getBoolean("muted", false);
 	}
+	
+	public boolean getMuted()
+	{
+		return muted;
+	}
 
 	public boolean isMuted()
 	{
@@ -484,7 +556,7 @@ public class UserData
 	}
 	private boolean jailed;
 
-	private boolean getJailed()
+	private boolean _getJailed()
 	{
 		return config.getBoolean("jailed", false);
 	}
@@ -559,11 +631,21 @@ public class UserData
 		return lastLogin;
 	}
 
-	private void _setLastLogin(long time) //unused method
+	private void _setLastLogin(long time)
 	{
 		lastLogin = time;
 		config.setProperty("timestamps.login", time);
 	}
+
+	public void setLastLogin(long time)
+	{
+		_setLastLogin(time);
+		if (base.getAddress() != null && base.getAddress().getAddress() != null)
+		{
+			_setLastLoginAddress(base.getAddress().getAddress().getHostAddress());
+		}
+		config.save();
+	}
 	private long lastLogout;
 
 	private long _getLastLogout()
@@ -594,14 +676,14 @@ public class UserData
 		return lastLoginAddress;
 	}
 
-	private void _setLastLoginAddress(String address) //TODO: unused method?
+	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);
 	}
@@ -624,7 +706,7 @@ public class UserData
 		setAfk(ret);
 		return ret;
 	}
-	private boolean newplayer; //TODO: unused variable?
+	private boolean newplayer;
 	private String geolocation;
 
 	private String _getGeoLocation()
@@ -737,11 +819,6 @@ public class UserData
 		return new MemoryConfiguration();
 	}
 
-	public Set<String> getKitTimestamps()
-	{
-		return kitTimestamps.getKeys(false);
-	}
-
 	public long getKitTimestamp(String name)
 	{
 		name = name.replace('.', '_').replace('/', '_');

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

@@ -0,0 +1,142 @@
+package com.earth2me.essentials;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+import java.io.File;
+import java.util.Collections;
+import java.util.Set;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.ExecutionException;
+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 = CacheBuilder.newBuilder().softValues().build(this);
+	private final transient ConcurrentSkipListSet<String> keys = new ConcurrentSkipListSet<String>();
+
+	public UserMap(final IEssentials ess)
+	{
+		super();
+		this.ess = ess;
+		loadAllUsersAsync(ess);
+	}
+
+	private void loadAllUsersAsync(final IEssentials ess)
+	{
+		ess.scheduleAsyncDelayedTask(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				final File userdir = new File(ess.getDataFolder(), "userdata");
+				if (!userdir.exists())
+				{
+					return;
+				}
+				keys.clear();
+				users.invalidateAll();
+				for (String string : userdir.list())
+				{
+					if (!string.endsWith(".yml"))
+					{
+						continue;
+					}
+					final String name = string.substring(0, string.length() - 4);
+					keys.add(Util.sanitizeFileName(name));
+				}
+			}
+		});
+	}
+
+	public boolean userExists(final String name)
+	{
+		return keys.contains(Util.sanitizeFileName(name));
+	}
+
+	public User getUser(final String name)
+	{
+		try
+		{
+			return users.get(name);
+		}
+		catch (ExecutionException ex)
+		{
+			return null;
+		}
+		catch (UncheckedExecutionException ex)
+		{
+			return null;
+		}
+	}
+
+	@Override
+	public User load(final String name) throws Exception
+	{
+		String sanitizedName = Util.sanitizeFileName(name);
+		if (!sanitizedName.equals(name))
+		{
+			User user = getUser(sanitizedName);
+			if (user == null)
+			{
+				throw new Exception("User not found!");
+			}
+			else
+			{
+				return user;
+			}
+		}
+		for (Player player : ess.getServer().getOnlinePlayers())
+		{
+			if (player.getName().equalsIgnoreCase(name))
+			{
+				keys.add(sanitizedName);
+				return new User(player, ess);
+			}
+		}
+		final File userFile = getUserFile2(sanitizedName);
+		if (userFile.exists())
+		{
+			keys.add(sanitizedName);
+			return new User(new OfflinePlayer(name, ess), ess);
+		}
+		throw new Exception("User not found!");
+	}
+
+	@Override
+	public void reloadConfig()
+	{
+		loadAllUsersAsync(ess);
+	}
+
+	public void removeUser(final String name)
+	{
+		keys.remove(Util.sanitizeFileName(name));
+		users.invalidate(Util.sanitizeFileName(name));
+		users.invalidate(name);
+	}
+
+	public Set<String> getAllUniqueUsers()
+	{
+		return Collections.unmodifiableSet(keys);
+	}
+
+	public int getUniqueUsers()
+	{
+		return keys.size();
+	}
+
+	public File getUserFile(final String name)
+	{
+		return getUserFile2(Util.sanitizeFileName(name));
+	}
+
+	private File getUserFile2(final String name)
+	{
+		final File userFolder = new File(ess.getDataFolder(), "userdata");
+		return new File(userFolder, name + ".yml");
+	}
+}

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

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

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

@@ -0,0 +1,160 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.commands.WarpNotFoundException;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.Location;
+import org.bukkit.Server;
+
+
+public class Warps implements IConf
+{
+	private static final Logger logger = Logger.getLogger("Minecraft");
+	private final Map<StringIgnoreCase, EssentialsConf> warpPoints = new HashMap<StringIgnoreCase, EssentialsConf>();
+	private final File warpsFolder;
+	private final Server server;
+
+	public Warps(Server server, File dataFolder)
+	{
+		this.server = server;
+		warpsFolder = new File(dataFolder, "warps");
+		if (!warpsFolder.exists())
+		{
+			warpsFolder.mkdirs();
+		}
+		reloadConfig();
+	}
+
+	public boolean isEmpty()
+	{
+		return warpPoints.isEmpty();
+	}
+
+	public Collection<String> getWarpNames()
+	{
+		final List<String> keys = new ArrayList<String>();
+		for (StringIgnoreCase stringIgnoreCase : warpPoints.keySet())
+		{
+			keys.add(stringIgnoreCase.getString());
+		}
+		Collections.sort(keys, String.CASE_INSENSITIVE_ORDER);
+		return keys;
+	}
+
+	public Location getWarp(String warp) throws Exception
+	{
+		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(warp));
+		if (conf == null)
+		{
+			throw new WarpNotFoundException();
+		}
+		return conf.getLocation(null, server);
+	}
+
+	public void setWarp(String name, Location loc) throws Exception
+	{
+		String filename = Util.sanitizeFileName(name);
+		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
+		if (conf == null)
+		{
+			File confFile = new File(warpsFolder, filename + ".yml");
+			if (confFile.exists())
+			{
+				throw new Exception(_("similarWarpExist"));
+			}
+			conf = new EssentialsConf(confFile);
+			warpPoints.put(new StringIgnoreCase(name), conf);
+		}
+		conf.setProperty(null, loc);
+		conf.setProperty("name", name);
+		try
+		{
+			conf.saveWithError();
+		}
+		catch (IOException ex)
+		{
+			throw new IOException(_("invalidWarpName"));
+		}
+	}
+
+	public void delWarp(String name) throws Exception
+	{
+		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(name));
+		if (conf == null)
+		{
+			throw new Exception(_("warpNotExist"));
+		}
+		if (!conf.getFile().delete())
+		{
+			throw new Exception(_("warpDeleteError"));
+		}
+		warpPoints.remove(new StringIgnoreCase(name));
+	}
+
+	@Override
+	public final void reloadConfig()
+	{
+		warpPoints.clear();
+		File[] listOfFiles = warpsFolder.listFiles();
+		if (listOfFiles.length >= 1)
+		{
+			for (int i = 0; i < listOfFiles.length; i++)
+			{
+				String filename = listOfFiles[i].getName();
+				if (listOfFiles[i].isFile() && filename.endsWith(".yml"))
+				{
+					try
+					{
+						EssentialsConf conf = new EssentialsConf(listOfFiles[i]);
+						conf.load();
+						String name = conf.getString("name");
+						if (name != null)
+						{
+							warpPoints.put(new StringIgnoreCase(name), conf);
+						}
+					}
+					catch (Exception ex)
+					{
+						logger.log(Level.WARNING, _("loadWarpError", filename), ex);
+					}
+				}
+			}
+		}
+	}
+
+
+	private static class StringIgnoreCase
+	{
+		private final String string;
+
+		public StringIgnoreCase(String string)
+		{
+			this.string = string;
+		}
+
+		@Override
+		public int hashCode()
+		{
+			return getString().toLowerCase(Locale.ENGLISH).hashCode();
+		}
+
+		@Override
+		public boolean equals(Object o)
+		{
+			if (o instanceof StringIgnoreCase)
+			{
+				return getString().equalsIgnoreCase(((StringIgnoreCase)o).getString());
+			}
+			return false;
+		}
+
+		public String getString()
+		{
+			return string;
+		}
+	}
+}

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

@@ -0,0 +1,61 @@
+package com.earth2me.essentials;
+
+import java.io.File;
+import java.util.Locale;
+import java.util.logging.Logger;
+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)
+	{
+		config = new EssentialsConf(new File(dataFolder, "worth.yml"));
+		config.setTemplateName("/worth.yml");
+		config.load();
+	}
+
+	public double getPrice(ItemStack itemStack)
+	{
+		String itemname = itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
+		double result;
+		result = config.getDouble("worth." + itemname + "." + itemStack.getDurability(), Double.NaN);
+		if (Double.isNaN(result))
+		{
+			result = config.getDouble("worth." + itemname + ".0", Double.NaN);
+		}
+		if (Double.isNaN(result))
+		{
+			result = config.getDouble("worth." + itemname, Double.NaN);
+		}
+		if (Double.isNaN(result))
+		{
+			result = config.getDouble("worth-" + itemStack.getTypeId(), Double.NaN);
+		}
+		return result;
+	}
+
+	public void setPrice(ItemStack itemStack, double price)
+	{
+		if (itemStack.getType().getData() == null)
+		{
+			config.setProperty("worth." + itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), price);
+		}
+		else
+		{
+			// Bukkit-bug: getDurability still contains the correct value, while getData().getData() is 0.
+			config.setProperty("worth." + itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "") + "." + itemStack.getDurability(), price);
+		}
+		config.removeProperty("worth-" + itemStack.getTypeId());
+		config.save();
+	}
+
+	@Override
+	public void reloadConfig()
+	{
+		config.load();
+	}
+}

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

@@ -1,38 +1,97 @@
-package net.ess3.api;
+package com.earth2me.essentials.api;
 
-import net.ess3.utils.FormatUtil;
+import com.earth2me.essentials.EssentialsConf;
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.IEssentials;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import java.io.File;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 
 /**
- * Instead of using this api directly, we recommend to use Vault
+ * Instead of using this api directly, we recommend to use the register plugin:
+ * http://bit.ly/RegisterMethod
  */
 public final class Economy
 {
 	private Economy()
 	{
 	}
+	private static final Logger logger = Logger.getLogger("Minecraft");
 	private static IEssentials ess;
 	private static final String noCallBeforeLoad = "Essentials API is called before Essentials is loaded.";
 
 	/**
-	 * Returns the balance of a user
+	 * @param aEss the ess to set
-	 *
-	 * @param name Name of the user
-	 * @return balance
-	 * @throws UserDoesNotExistException
 	 */
-	public static double getMoney(String name) throws UserDoesNotExistException
+	public static void setEss(IEssentials aEss)
+	{
+		ess = aEss;
+	}
+
+	private static void createNPCFile(String name)
+	{
+		File folder = new File(ess.getDataFolder(), "userdata");
+		if (!folder.exists())
+		{
+			folder.mkdirs();
+		}
+		EssentialsConf npcConfig = new EssentialsConf(new File(folder, Util.sanitizeFileName(name) + ".yml"));
+		npcConfig.load();
+		npcConfig.setProperty("npc", true);
+		npcConfig.setProperty("money", ess.getSettings().getStartingBalance());
+		npcConfig.save();
+	}
+
+	private static void deleteNPC(String name)
+	{
+		File folder = new File(ess.getDataFolder(), "userdata");
+		if (!folder.exists())
+		{
+			folder.mkdirs();
+		}
+		File config = new File(folder, Util.sanitizeFileName(name) + ".yml");
+		EssentialsConf npcConfig = new EssentialsConf(config);
+		npcConfig.load();
+		if (npcConfig.hasProperty("npc") && npcConfig.getBoolean("npc", false))
+		{
+			if (!config.delete())
+			{
+				logger.log(Level.WARNING, _("deleteFileError", config));
+			}
+			ess.getUserMap().removeUser(name);
+		}
+	}
+
+	private static User getUserByName(String name)
 	{
 		if (ess == null)
 		{
 			throw new RuntimeException(noCallBeforeLoad);
 		}
-		return ess.getEconomy().getMoney(name);
+		return ess.getUser(name);
+	}
+
+	/**
+	 * Returns the balance of a user
+	 * @param name Name of the user
+	 * @return balance
+	 * @throws UserDoesNotExistException 
+	 */
+	public static double getMoney(String name) throws UserDoesNotExistException
+	{
+		User user = getUserByName(name);
+		if (user == null)
+		{
+			throw new UserDoesNotExistException(name);
+		}
+		return user.getMoney();
 	}
 
 	/**
 	 * 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
@@ -40,16 +99,24 @@ public final class Economy
 	 */
 	public static void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException
 	{
-		if (ess == null)
+		User user = getUserByName(name);
+		if (user == null)
 		{
-			throw new RuntimeException(noCallBeforeLoad);
+			throw new UserDoesNotExistException(name);
 		}
-		ess.getEconomy().setMoney(name, balance);
+		if (balance < ess.getSettings().getMinMoney())
+		{
+			throw new NoLoanPermittedException();
+		}
+		if (balance < 0.0 && !user.isAuthorized("essentials.eco.loan"))
+		{
+			throw new NoLoanPermittedException();
+		}
+		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
@@ -62,10 +129,9 @@ public final class Economy
 	}
 
 	/**
-	 * Subtracts money from the balance of a user
+	 * Substracts money from the balance of a user
-	 *
 	 * @param name Name of the user
-	 * @param amount The money you want to subtract
+	 * @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
 	 */
@@ -77,7 +143,6 @@ public final class Economy
 
 	/**
 	 * 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
@@ -91,7 +156,6 @@ public final class Economy
 
 	/**
 	 * 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
@@ -105,7 +169,6 @@ public final class Economy
 
 	/**
 	 * 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
@@ -116,7 +179,7 @@ public final class Economy
 		{
 			throw new RuntimeException(noCallBeforeLoad);
 		}
-		ess.getEconomy().resetBalance(name);
+		setMoney(name, ess.getSettings().getStartingBalance());
 	}
 
 	/**
@@ -154,7 +217,6 @@ public final class Economy
 
 	/**
 	 * 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
@@ -165,8 +227,8 @@ public final class Economy
 	}
 
 	/**
-	 * 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
 	 */
@@ -176,67 +238,63 @@ public final class Economy
 		{
 			throw new RuntimeException(noCallBeforeLoad);
 		}
-		return FormatUtil.displayCurrency(amount, ess);
+		return Util.displayCurrency(amount, ess);
 	}
 
 	/**
 	 * Test if a player exists to avoid the UserDoesNotExistException
-	 *
 	 * @param name Name of the user
 	 * @return true, if the user exists
 	 */
 	public static boolean playerExists(String name)
 	{
-		if (ess == null)
+		return getUserByName(name) != null;
-		{
-			throw new RuntimeException(noCallBeforeLoad);
-		}
-		return ess.getEconomy().playerExists(name);
 	}
 
 	/**
 	 * 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
 	{
-		if (ess == null)
+		User user = getUserByName(name);
+		if (user == null)
 		{
-			throw new RuntimeException(noCallBeforeLoad);
+			throw new UserDoesNotExistException(name);
 		}
-		return ess.getEconomy().isNPC(name);
+		return user.isNPC();
 	}
 
 	/**
 	 * Creates dummy files for a npc, if there is no player yet with that name.
-	 *
 	 * @param name Name of the player
 	 * @return true, if a new npc was created
 	 */
 	public static boolean createNPC(String name)
 	{
-		if (ess == null)
+		User user = getUserByName(name);
+		if (user == null)
 		{
-			throw new RuntimeException(noCallBeforeLoad);
+			createNPCFile(name);
+			return true;
 		}
-		return ess.getEconomy().createNPC(name);
+		return false;
 	}
 
 	/**
-	 * 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
 	{
-		if (ess == null)
+		User user = getUserByName(name);
+		if (user == null)
 		{
-			throw new RuntimeException(noCallBeforeLoad);
+			throw new UserDoesNotExistException(name);
 		}
-		ess.getEconomy().removeNPC(name);
+		deleteNPC(name);
 	}
 }

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

@@ -0,0 +1,9 @@
+package com.earth2me.essentials.api;
+
+import java.util.Locale;
+
+
+public interface II18n
+{
+	Locale getCurrentLocale();
+}

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

@@ -0,0 +1,11 @@
+package com.earth2me.essentials.api;
+
+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;
+}

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

@@ -0,0 +1,20 @@
+package com.earth2me.essentials.api;
+
+import java.util.Collection;
+import org.bukkit.Location;
+
+
+public interface IJails extends IReload
+{
+	Location getJail(String jailName) throws Exception;
+
+	Collection<String> getList() throws Exception;
+
+	int getCount();
+
+	void removeJail(String jail) throws Exception;
+
+	void sendToJail(com.earth2me.essentials.IUser user, String jail) throws Exception;
+
+	void setJail(String jailName, Location loc) throws Exception;
+}

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

@@ -1,10 +1,7 @@
-package net.ess3.api;
+package com.earth2me.essentials.api;
 
 
 public interface IReload
 {
-	/**
-	 *
-	 */
 	void onReload();
 }

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

@@ -0,0 +1,10 @@
+package com.earth2me.essentials.api;
+
+import org.bukkit.Location;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+
+
+public interface ITeleport
+{
+	void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception;
+}

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

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

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

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

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

@@ -0,0 +1,58 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+
+
+public class Commandafk extends EssentialsCommand
+{
+	public Commandafk()
+	{
+		super("afk");
+	}
+
+	@Override
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length > 0 && user.isAuthorized("essentials.afk.others"))
+		{
+			User afkUser = ess.getUser(ess.getServer().matchPlayer(args[0]));
+			if (afkUser != null)
+			{
+				toggleAfk(afkUser);
+			}
+		}
+		else
+		{
+			toggleAfk(user);
+		}
+	}
+
+	private void toggleAfk(User user)
+	{
+		user.setDisplayNick();
+		String msg = "";
+		if (!user.toggleAfk())
+		{
+			//user.sendMessage(_("markedAsNotAway"));
+			if (!user.isHidden())
+			{
+				msg = _("userIsNotAway", user.getDisplayName());
+			}
+			user.updateActivity(false);
+		}
+		else
+		{
+			//user.sendMessage(_("markedAsAway"));
+			if (!user.isHidden())
+			{
+				msg = _("userIsAway", user.getDisplayName());
+			}
+		}
+		if (!msg.isEmpty())
+		{
+			ess.broadcastMessage(user, msg);
+		}
+	}
+}

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

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

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

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

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

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

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

@@ -0,0 +1,38 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+
+
+public class Commandbalance extends EssentialsCommand
+{
+	public Commandbalance()
+	{
+		super("balance");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		sender.sendMessage(_("balance", Util.displayCurrency(getPlayer(server, args, 0, true).getMoney(), ess)));
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		//TODO: Remove 'other' perm
+		final double bal = (args.length < 1
+							|| !(user.isAuthorized("essentials.balance.others")
+								 || user.isAuthorized("essentials.balance.other"))
+							? user
+							: getPlayer(server, args, 0, true)).getMoney();
+		user.sendMessage(_("balance", Util.displayCurrency(bal, ess)));
+	}
+}

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

@@ -1,21 +1,24 @@
-package net.ess3.commands;
+package com.earth2me.essentials.commands;
 
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import com.earth2me.essentials.textreader.ArrayListInput;
+import com.earth2me.essentials.textreader.TextPager;
 import java.text.DateFormat;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
-import static net.ess3.I18n._;
+import org.bukkit.Server;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
-import net.ess3.user.UserData;
-import net.ess3.utils.FormatUtil;
-import net.ess3.utils.textreader.ArrayListInput;
-import net.ess3.utils.textreader.TextPager;
 import org.bukkit.command.CommandSender;
 
 
 public class Commandbalancetop extends EssentialsCommand
 {
+	public Commandbalancetop()
+	{
+		super("balancetop");
+	}
 	private static final int CACHETIME = 2 * 60 * 1000;
 	public static final int MINUSERS = 50;
 	private static ArrayListInput cache = new ArrayListInput();
@@ -23,7 +26,7 @@ public class Commandbalancetop extends EssentialsCommand
 	private static ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
 
 	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		int page = 0;
 		boolean force = false;
@@ -35,31 +38,7 @@ public class Commandbalancetop extends EssentialsCommand
 			}
 			catch (NumberFormatException ex)
 			{
-				if (args[0].equalsIgnoreCase("hide"))
+				if (args[0].equalsIgnoreCase("force") && sender.isOp())
-				{
-					if (args.length == 1 && isUser(sender) && Permissions.BALANCETOP_HIDE.isAuthorized(sender))
-					{
-						final IUser user = getUser(sender);
-						user.getData().setBalancetopHide(!user.getData().isBalancetopHide());
-						user.queueSave();
-						sender.sendMessage(
-								user.getData().isBalancetopHide() ? _("baltopHidden") : _("baltopShown"));
-					}
-					else if (args.length == 2 && Permissions.BALANCETOP_HIDE_OTHERS.isAuthorized(sender))
-					{
-						final IUser user = ess.getUserMap().matchUser(args[1], true);
-						final UserData userData = user.getData();
-						userData.setBalancetopHide(!userData.isBalancetopHide());
-						user.queueSave();
-						sender.sendMessage(
-								userData.isBalancetopHide() ? user.getName() + _("userBaltopHidden") : user.getName() + _("userBaltopShown"));
-					}
-					else
-					{
-						throw new NotEnoughArgumentsException();
-					}
-				}
-				if (args[0].equalsIgnoreCase("force") && Permissions.BALANCETOP_FORCE.isAuthorized(sender))
 				{
 					force = true;
 				}
@@ -77,22 +56,22 @@ public class Commandbalancetop extends EssentialsCommand
 				}
 				if (ess.getUserMap().getUniqueUsers() > MINUSERS)
 				{
-					sender.sendMessage(_("§6Ordering balances of§c {0} §6users, please wait...", ess.getUserMap().getUniqueUsers()));
+					sender.sendMessage(_("orderBalances", ess.getUserMap().getUniqueUsers()));
 				}
 			}
 			finally
 			{
 				lock.readLock().unlock();
 			}
-			ess.getPlugin().runTaskAsynchronously(new Viewer(sender, page, force));
+			ess.scheduleAsyncDelayedTask(new Viewer(sender, page, force));
 		}
 		else
 		{
 			if (ess.getUserMap().getUniqueUsers() > MINUSERS)
 			{
-				sender.sendMessage(_("§6Ordering balances of§c {0} §6users, please wait...", ess.getUserMap().getUniqueUsers()));
+				sender.sendMessage(_("orderBalances", ess.getUserMap().getUniqueUsers()));
 			}
-			ess.getPlugin().runTaskAsynchronously(new Viewer(sender, page, force));
+			ess.scheduleAsyncDelayedTask(new Viewer(sender, page, force));
 		}
 
 	}
@@ -102,14 +81,14 @@ public class Commandbalancetop extends EssentialsCommand
 		final Calendar cal = Calendar.getInstance();
 		cal.setTimeInMillis(cacheage);
 		final DateFormat format = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-		sender.sendMessage(_("§6Top balances ({0})", format.format(cal.getTime())));
+		sender.sendMessage(_("balanceTop", format.format(cal.getTime())));
 		new TextPager(cache).showPage(Integer.toString(page), "", "balancetop", sender);
 	}
 
 
 	private class Calculator implements Runnable
 	{
-		private final Viewer viewer;
+		private final transient Viewer viewer;
 		private final boolean force;
 
 		public Calculator(final Viewer viewer, final boolean force)
@@ -126,27 +105,23 @@ public class Commandbalancetop extends EssentialsCommand
 			{
 				if (force || cacheage <= System.currentTimeMillis() - CACHETIME)
 				{
-					cache.getLines().clear();
+					cache.getLines().clear();					
 					final Map<String, Double> balances = new HashMap<String, Double>();
 					double totalMoney = 0d;
 					for (String u : ess.getUserMap().getAllUniqueUsers())
 					{
-						final IUser user = ess.getUserMap().getUser(u);
+						final User user = ess.getUserMap().getUser(u);
 						if (user != null)
 						{
 							final double userMoney = user.getMoney();
 							user.updateMoneyCache(userMoney);
-							if (!user.getData().isBalancetopHide())
+							totalMoney += userMoney;
-							{
+							balances.put(user.getDisplayName(), userMoney);
-								totalMoney += userMoney;
-								balances.put(user.getName() /* TODO: Can use 'u' var? */, userMoney);
-							}
 						}
 					}
 
 					final List<Map.Entry<String, Double>> sortedEntries = new ArrayList<Map.Entry<String, Double>>(balances.entrySet());
-					Collections.sort(
+					Collections.sort(sortedEntries, new Comparator<Map.Entry<String, Double>>()
-							sortedEntries, new Comparator<Map.Entry<String, Double>>()
 					{
 						@Override
 						public int compare(final Entry<String, Double> entry1, final Entry<String, Double> entry2)
@@ -154,12 +129,12 @@ public class Commandbalancetop extends EssentialsCommand
 							return -entry1.getValue().compareTo(entry2.getValue());
 						}
 					});
-
+					
-					cache.getLines().add(_("§6Server Total:§c {0}", FormatUtil.displayCurrency(totalMoney, ess)));
+					cache.getLines().add(_("serverTotal", Util.displayCurrency(totalMoney, ess)));
 					int pos = 1;
 					for (Map.Entry<String, Double> entry : sortedEntries)
 					{
-						cache.getLines().add(pos + ". " + entry.getKey() + ", " + FormatUtil.displayCurrency(entry.getValue(), ess));
+						cache.getLines().add(pos + ". " + entry.getKey() + ", " + Util.displayCurrency(entry.getValue(), ess));
 						pos++;
 					}
 					cacheage = System.currentTimeMillis();
@@ -169,16 +144,16 @@ public class Commandbalancetop extends EssentialsCommand
 			{
 				lock.writeLock().unlock();
 			}
-			ess.getPlugin().runTaskAsynchronously(viewer);
+			ess.scheduleAsyncDelayedTask(viewer);
 		}
 	}
 
 
 	private class Viewer implements Runnable
 	{
-		private final CommandSender sender;
+		private final transient CommandSender sender;
-		private final int page;
+		private final transient int page;
-		private final boolean force;
+		private final transient boolean force;
 
 		public Viewer(final CommandSender sender, final int page, final boolean force)
 		{
@@ -203,7 +178,7 @@ public class Commandbalancetop extends EssentialsCommand
 			{
 				lock.readLock().unlock();
 			}
-			ess.getPlugin().runTaskAsynchronously(new Calculator(new Viewer(sender, page, force), force));
+			ess.scheduleAsyncDelayedTask(new Calculator(new Viewer(sender, page, force), force));
 		}
 	}
 }

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

@@ -0,0 +1,86 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.Console;
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.OfflinePlayer;
+import com.earth2me.essentials.User;
+import java.util.logging.Level;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandban extends EssentialsCommand
+{
+	public Commandban()
+	{
+		super("ban");
+	}
+
+	@Override
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		boolean nomatch = false;
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		User user;
+		try
+		{
+			user = getPlayer(server, args, 0, true);
+		}
+		catch (NoSuchFieldException e)
+		{
+			nomatch = true;
+			user = ess.getUser(new OfflinePlayer(args[0], ess));
+		}
+		if (!user.isOnline())
+		{
+			if (sender instanceof Player
+				&& !ess.getUser(sender).isAuthorized("essentials.ban.offline"))
+			{
+				sender.sendMessage(_("banExempt"));
+				return;
+			}
+		}
+		else
+		{
+			if (user.isAuthorized("essentials.ban.exempt") && sender instanceof Player)
+			{
+				sender.sendMessage(_("banExempt"));
+				return;
+			}
+		}
+
+		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
+		String banReason;
+		if (args.length > 1)
+		{
+			banReason = _("banFormat", getFinalArg(args, 1), senderName);
+		}
+		else
+		{
+			banReason = _("banFormat", _("defaultBanReason"), senderName);
+		}
+
+		user.setBanReason(banReason);
+		user.setBanned(true);
+		user.kickPlayer(banReason);
+		
+		server.getLogger().log(Level.INFO, _("playerBanned", senderName, user.getName(), banReason));
+		
+		if (nomatch) {
+			sender.sendMessage(_("userUnknown", user.getName()));
+		}
+
+		for (Player onlinePlayer : server.getOnlinePlayers())
+		{
+			final User player = ess.getUser(onlinePlayer);
+			if (onlinePlayer == sender || player.isAuthorized("essentials.ban.notify"))
+			{
+				onlinePlayer.sendMessage(_("playerBanned", senderName, user.getName(), banReason));
+			}
+		}
+	}
+}

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

@@ -0,0 +1,42 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+
+
+public class Commandbanip extends EssentialsCommand
+{
+	public Commandbanip()
+	{
+		super("banip");
+	}
+
+	@Override
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		final User player = ess.getUser(args[0]);
+
+		if (player == null)
+		{
+			ess.getServer().banIP(args[0]);
+			sender.sendMessage(_("banIpAddress"));
+		}
+		else
+		{
+			final String ipAddress = player.getLastLoginAddress();
+			if (ipAddress.length() == 0)
+			{
+				throw new Exception(_("playerNotFound"));
+			}
+			ess.getServer().banIP(player.getLastLoginAddress());
+			sender.sendMessage(_("banIpAddress"));
+		}
+	}
+}

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

@@ -0,0 +1,51 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.TreeType;
+
+
+public class Commandbigtree extends EssentialsCommand
+{
+	public Commandbigtree()
+	{
+		super("bigtree");
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		TreeType tree;
+		if (args.length > 0 && args[0].equalsIgnoreCase("redwood"))
+		{
+			tree = TreeType.TALL_REDWOOD;
+		}
+		else if (args.length > 0 && args[0].equalsIgnoreCase("tree"))
+		{
+			tree = TreeType.BIG_TREE;
+		}
+		else if (args.length > 0 && args[0].equalsIgnoreCase("jungle"))
+		{
+			tree = TreeType.JUNGLE;
+		}
+		else
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		final Location loc = Util.getTarget(user);
+		final Location safeLocation = Util.getSafeDestination(loc);
+		final boolean success = user.getWorld().generateTree(safeLocation, tree);
+		if (success)
+		{
+			user.sendMessage(_("bigTreeSuccess"));
+		}
+		else
+		{
+			throw new Exception(_("bigTreeFailure"));
+		}
+	}
+}

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

@@ -1,20 +1,25 @@
-package net.ess3.commands;
+package com.earth2me.essentials.commands;
 
-import static net.ess3.I18n._;
+import static com.earth2me.essentials.I18n._;
-import net.ess3.api.IUser;
+import com.earth2me.essentials.User;
-import net.ess3.permissions.Permissions;
 import org.bukkit.Material;
+import org.bukkit.Server;
 import org.bukkit.block.Block;
 import org.bukkit.event.block.BlockBreakEvent;
 
 
 public class Commandbreak extends EssentialsCommand
 {
+	public Commandbreak()
+	{
+		super("break");
+	}
+
 	//TODO: Switch to use util class
 	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		final Block block = user.getPlayer().getTargetBlock(null, 20);
+		final Block block = user.getTargetBlock(null, 20);
 		if (block == null)
 		{
 			throw new NoChargeException();
@@ -23,13 +28,13 @@ public class Commandbreak extends EssentialsCommand
 		{
 			throw new NoChargeException();
 		}
-		if (block.getType() == Material.BEDROCK && !Permissions.BREAK_BEDROCK.isAuthorized(user))
+		if (block.getType() == Material.BEDROCK && !user.isAuthorized("essentials.break.bedrock"))
 		{
-			throw new Exception(_("§4You are not allowed to destroy bedrock."));
+			throw new Exception(_("noBreakBedrock"));
 		}
 		//final List<ItemStack> list = (List<ItemStack>)block.getDrops();		
 		//final BlockBreakEvent event = new BlockBreakEvent(block, user.getBase(), list);
-		final BlockBreakEvent event = new BlockBreakEvent(block, user.getPlayer());
+		final BlockBreakEvent event = new BlockBreakEvent(block, user.getBase());
 		server.getPluginManager().callEvent(event);
 		if (event.isCancelled())
 		{
@@ -40,4 +45,4 @@ public class Commandbreak extends EssentialsCommand
 			block.setType(Material.AIR);
 		}
 	}
-}
+}

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

@@ -0,0 +1,26 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.Util;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+
+
+public class Commandbroadcast extends EssentialsCommand
+{
+	public Commandbroadcast()
+	{
+		super("broadcast");
+	}
+
+	@Override
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		ess.broadcastMessage(null, _("broadcast", Util.replaceFormat(getFinalArg(args, 0))));
+	}
+}

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

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

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

@@ -0,0 +1,98 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import java.util.List;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandclearinventory extends EssentialsCommand
+{
+	public Commandclearinventory()
+	{
+		super("clearinventory");
+	}
+
+	//TODO: Cleanup
+	@Override
+	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length > 0 && user.isAuthorized("essentials.clearinventory.others"))
+		{
+			//TODO: Fix fringe user match case.
+			if (args[0].length() >= 3)
+			{
+				List<Player> online = server.matchPlayer(args[0]);
+
+				if (!online.isEmpty())
+				{
+					for (Player p : online)
+					{
+						p.getInventory().clear();
+						user.sendMessage(_("inventoryClearedOthers", p.getDisplayName()));
+					}
+					return;
+				}
+				throw new Exception(_("playerNotFound"));
+			}
+			else
+			{
+				Player p = server.getPlayer(args[0]);
+				if (p != null)
+				{
+					p.getInventory().clear();
+					user.sendMessage(_("inventoryClearedOthers", p.getDisplayName()));
+				}
+				else
+				{
+					throw new Exception(_("playerNotFound"));
+				}
+			}
+		}
+		else
+		{
+			user.getInventory().clear();
+			user.sendMessage(_("inventoryCleared"));
+		}
+	}
+
+	@Override
+	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		if (args[0].length() >= 3)
+		{
+			List<Player> online = server.matchPlayer(args[0]);
+
+			if (!online.isEmpty())
+			{
+				for (Player p : online)
+				{
+					p.getInventory().clear();
+					sender.sendMessage(_("inventoryClearedOthers", p.getDisplayName()));
+				}
+				return;
+			}
+			throw new Exception(_("playerNotFound"));
+		}
+		else
+		{
+			Player u = server.getPlayer(args[0]);
+			if (u != null)
+			{
+				u.getInventory().clear();
+				sender.sendMessage(_("inventoryClearedOthers", u.getDisplayName()));
+			}
+			else
+			{
+				throw new Exception(_("playerNotFound"));
+			}
+		}
+	}
+}

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

@@ -1,16 +1,22 @@
-package net.ess3.commands;
+package com.earth2me.essentials.commands;
 
-import static net.ess3.I18n._;
+import static com.earth2me.essentials.I18n._;
-import net.ess3.api.IUser;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
 
 
 public class Commandcompass extends EssentialsCommand
 {
-	@Override
+	public Commandcompass()
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
-		final int bearing = (int)(user.getPlayer().getLocation().getYaw() + 180 + 360) % 360;
+		super("compass");
-		final String dir;
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		final int bearing = (int)(user.getLocation().getYaw() + 180 + 360) % 360;
+		String dir;
 		if (bearing < 23)
 		{
 			dir = "N";
@@ -47,6 +53,6 @@ public class Commandcompass extends EssentialsCommand
 		{
 			dir = "N";
 		}
-		user.sendMessage(_("§6Bearing:  {0} ({1} degrees).", dir, bearing));
+		user.sendMessage(_("compassBearing", dir, bearing));
 	}
 }

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

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

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

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

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

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

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

@@ -0,0 +1,32 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+
+
+public class Commanddepth extends EssentialsCommand
+{
+	public Commanddepth()
+	{
+		super("depth");
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		final int depth = user.getLocation().getBlockY() - 63;
+		if (depth > 0)
+		{
+			user.sendMessage(_("depthAboveSea", depth));
+		}
+		else if (depth < 0)
+		{
+			user.sendMessage(_("depthBelowSea", (-depth)));
+		}
+		else
+		{
+			user.sendMessage(_("depth"));
+		}
+	}
+}

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

@@ -0,0 +1,115 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import java.util.Locale;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandeco extends EssentialsCommand
+{
+	public Commandeco()
+	{
+		super("eco");
+	}
+
+	@Override
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 2)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		EcoCommands cmd;
+		double amount;
+		try
+		{
+			cmd = EcoCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH));
+			amount = Double.parseDouble(args[2].replaceAll("[^0-9\\.]", ""));
+		}
+		catch (Exception ex)
+		{
+			throw new NotEnoughArgumentsException(ex);
+		}
+
+		if (args[1].contentEquals("**"))
+		{
+			for (String sUser : ess.getUserMap().getAllUniqueUsers())
+			{
+				final User player = ess.getUser(sUser);
+				switch (cmd)
+				{
+				case GIVE:
+					player.giveMoney(amount);
+					break;
+
+				case TAKE:
+					if (player.canAfford(amount, false))
+					{
+						player.takeMoney(amount);
+					}					
+					break;
+
+				case RESET:
+					player.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
+					break;
+				}
+			}
+		}
+		else if (args[1].contentEquals("*"))
+		{
+			for (Player onlinePlayer : server.getOnlinePlayers())
+			{
+				final User player = ess.getUser(onlinePlayer);
+				switch (cmd)
+				{
+				case GIVE:
+					player.giveMoney(amount);
+					break;
+
+				case TAKE:
+					if (!player.canAfford(amount, false))
+					{
+						throw new Exception(_("notEnoughMoney"));
+					}
+					player.takeMoney(amount);
+					break;
+
+				case RESET:
+					player.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
+					break;
+				}
+			}
+		}
+		else
+		{
+			final User player = getPlayer(server, args, 1, true);
+			switch (cmd)
+			{
+			case GIVE:
+				player.giveMoney(amount, sender);
+				break;
+
+			case TAKE:
+				if (!player.canAfford(amount, false))
+				{
+					throw new Exception(_("notEnoughMoney"));
+				}
+				player.takeMoney(amount, sender);
+				break;
+
+			case RESET:
+				player.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
+				break;
+			}
+		}
+	}
+
+
+	private enum EcoCommands
+	{
+		GIVE, TAKE, RESET
+	}
+}

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

@@ -0,0 +1,99 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.Enchantments;
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import org.bukkit.Server;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.ItemStack;
+
+
+public class Commandenchant extends EssentialsCommand
+{
+	public Commandenchant()
+	{
+		super("enchant");
+	}
+
+	//TODO: Implement charge costs: final Trade charge = new Trade("enchant-" + enchantmentName, ess);
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		final ItemStack stack = user.getItemInHand();
+		if (stack == null)
+		{
+			throw new Exception(_("nothingInHand"));
+		}
+		if (args.length == 0)
+		{
+			final Set<String> enchantmentslist = new TreeSet<String>();
+			for (Map.Entry<String, Enchantment> entry : Enchantments.entrySet())
+			{
+				final String enchantmentName = entry.getValue().getName().toLowerCase(Locale.ENGLISH);
+				if (enchantmentslist.contains(enchantmentName) || user.isAuthorized("essentials.enchant." + enchantmentName))
+				{
+					enchantmentslist.add(entry.getKey());
+					//enchantmentslist.add(enchantmentName);
+				}
+			}
+			throw new NotEnoughArgumentsException(_("enchantments", Util.joinList(enchantmentslist.toArray())));
+		}
+		int level = -1;
+		if (args.length > 1)
+		{
+			try
+			{
+				level = Integer.parseInt(args[1]);
+			}
+			catch (NumberFormatException ex)
+			{
+				level = -1;
+			}
+		}
+		final Enchantment enchantment = getEnchantment(args[0], user);
+		if (level < 0 || level > enchantment.getMaxLevel())
+		{
+			level = enchantment.getMaxLevel();
+		}
+		if (level == 0)
+		{
+			stack.removeEnchantment(enchantment);
+		}
+		else
+		{
+			stack.addEnchantment(enchantment, level);
+		}
+		user.getInventory().setItemInHand(stack);
+		user.updateInventory();
+		final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
+		if (level == 0)
+		{
+			user.sendMessage(_("enchantmentRemoved", enchantmentName.replace('_', ' ')));
+		}
+		else
+		{
+			user.sendMessage(_("enchantmentApplied", enchantmentName.replace('_', ' ')));
+		}
+	}
+
+	public static Enchantment getEnchantment(final String name, final User user) throws Exception
+	{
+
+		final Enchantment enchantment = Enchantments.getByName(name);
+		if (enchantment == null)
+		{
+			throw new Exception(_("enchantmentNotFound"));
+		}
+		final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
+		if (user != null && !user.isAuthorized("essentials.enchant." + enchantmentName))
+		{
+			throw new Exception(_("enchantmentPerm", enchantmentName));
+		}
+		return enchantment;
+	}
+}

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

@@ -0,0 +1,30 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+
+
+public class Commandenderchest extends EssentialsCommand
+{
+	public Commandenderchest()
+	{
+		super("enderchest");
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{		
+		if (args.length > 0 && user.isAuthorized("essentials.enderchest.others"))
+		{
+			final User invUser = getPlayer(server, args, 0);
+			user.openInventory(invUser.getEnderChest());
+			user.setEnderSee(true);
+		}
+		else
+		{
+			user.openInventory(user.getEnderChest());
+			user.setEnderSee(false);
+		}
+
+	}
+}

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

@@ -0,0 +1,218 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.metrics.Metrics;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.block.Block;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.entity.Player;
+
+// This command has 4 undocumented behaviours #EasterEgg
+public class Commandessentials extends EssentialsCommand
+{
+	public Commandessentials()
+	{
+		super("essentials");
+	}
+	private transient int taskid;
+	private final transient Map<Player, Block> noteBlocks = new HashMap<Player, Block>();
+
+	@Override
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length == 0) {
+			run_disabled(server, sender, commandLabel, args);
+		}
+		else if (args[0].equalsIgnoreCase("debug"))
+		{
+			run_debug(server, sender, commandLabel, args);
+		}
+		else if (args[0].equalsIgnoreCase("nya"))
+		{
+			run_nya(server, sender, commandLabel, args);
+		}
+		else if (args[0].equalsIgnoreCase("moo"))
+		{
+			run_moo(server, sender, commandLabel, args);
+		}
+		else if (args[0].equalsIgnoreCase("reset"))
+		{
+			run_reset(server, sender, commandLabel, args);
+		}
+		else if (args[0].equalsIgnoreCase("opt-out"))
+		{
+			run_optout(server, sender, commandLabel, args);
+		}
+		else {
+			run_reload(server, sender, commandLabel, args);
+		}
+	}
+	
+	//If you do not supply an argument this command will list 'overridden' commands.
+	private void run_disabled(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		sender.sendMessage("Essentials " + ess.getDescription().getVersion());
+		sender.sendMessage("/<command> <reload/debug>");
+		
+		final StringBuilder disabledCommands = new StringBuilder();
+		for (Map.Entry<String, String> entry : ess.getAlternativeCommandsHandler().disabledCommands().entrySet())
+		{
+			if (disabledCommands.length() > 0) {
+				disabledCommands.append(", ");
+			}
+			disabledCommands.append(entry.getKey()).append(" => ").append(entry.getValue());
+		}
+		if (disabledCommands.length() > 0) {
+			sender.sendMessage(_("blockList"));
+			sender.sendMessage(disabledCommands.toString());
+		}
+	}
+	
+	private void run_reset(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 2)
+		{
+			throw new NotEnoughArgumentsException("/<command> reset <player>");
+		}
+		final User user = getPlayer(server, args, 1, true);
+		user.reset();
+		sender.sendMessage("Reset Essentials userdata for player: " + user.getDisplayName());
+	}
+	
+	private void run_debug(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		ess.getSettings().setDebug(!ess.getSettings().isDebug());
+		sender.sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
+	}
+	
+	private void run_reload(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		ess.reload();
+		sender.sendMessage(_("essentialsReload", ess.getDescription().getVersion()));
+	}
+	
+	private void run_nya(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		final Map<String, Byte> noteMap = new HashMap<String, Byte>();
+		noteMap.put("1F#", (byte)0x0);
+		noteMap.put("1G", (byte)0x1);
+		noteMap.put("1G#", (byte)0x2);
+		noteMap.put("1A", (byte)0x3);
+		noteMap.put("1A#", (byte)0x4);
+		noteMap.put("1B", (byte)0x5);
+		noteMap.put("1C", (byte)0x6);
+		noteMap.put("1C#", (byte)0x7);
+		noteMap.put("1D", (byte)0x8);
+		noteMap.put("1D#", (byte)0x9);
+		noteMap.put("1E", (byte)0xA);
+		noteMap.put("1F", (byte)0xB);
+		noteMap.put("2F#", (byte)(0x0 + 0xC));
+		noteMap.put("2G", (byte)(0x1 + 0xC));
+		noteMap.put("2G#", (byte)(0x2 + 0xC));
+		noteMap.put("2A", (byte)(0x3 + 0xC));
+		noteMap.put("2A#", (byte)(0x4 + 0xC));
+		noteMap.put("2B", (byte)(0x5 + 0xC));
+		noteMap.put("2C", (byte)(0x6 + 0xC));
+		noteMap.put("2C#", (byte)(0x7 + 0xC));
+		noteMap.put("2D", (byte)(0x8 + 0xC));
+		noteMap.put("2D#", (byte)(0x9 + 0xC));
+		noteMap.put("2E", (byte)(0xA + 0xC));
+		noteMap.put("2F", (byte)(0xB + 0xC));
+			if (!noteBlocks.isEmpty())
+			{
+				return;
+			}
+			final String tuneStr = "1D#,1E,2F#,,2A#,1E,1D#,1E,2F#,2B,2D#,2E,2D#,2A#,2B,,2F#,,1D#,1E,2F#,2B,2C#,2A#,2B,2C#,2E,2D#,2E,2C#,,2F#,,2G#,,1D,1D#,,1C#,1D,1C#,1B,,1B,,1C#,,1D,,1D,1C#,1B,1C#,1D#,2F#,2G#,1D#,2F#,1C#,1D#,1B,1C#,1B,1D#,,2F#,,2G#,1D#,2F#,1C#,1D#,1B,1D,1D#,1D,1C#,1B,1C#,1D,,1B,1C#,1D#,2F#,1C#,1D,1C#,1B,1C#,,1B,,1C#,,2F#,,2G#,,1D,1D#,,1C#,1D,1C#,1B,,1B,,1C#,,1D,,1D,1C#,1B,1C#,1D#,2F#,2G#,1D#,2F#,1C#,1D#,1B,1C#,1B,1D#,,2F#,,2G#,1D#,2F#,1C#,1D#,1B,1D,1D#,1D,1C#,1B,1C#,1D,,1B,1C#,1D#,2F#,1C#,1D,1C#,1B,1C#,,1B,,1B,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1B,,";
+			final String[] tune = tuneStr.split(",");
+			for (Player player : server.getOnlinePlayers())
+			{
+				final Location loc = player.getLocation();
+				loc.add(0, 3, 0);
+				while (loc.getBlockY() < player.getLocation().getBlockY() + 10 && loc.getBlock().getTypeId() != 0)
+				{
+					loc.add(0, 1, 0);
+				}
+				if (loc.getBlock().getTypeId() == 0)
+				{
+					noteBlocks.put(player, loc.getBlock());
+					loc.getBlock().setType(Material.NOTE_BLOCK);
+				}
+			}
+			taskid = ess.scheduleSyncRepeatingTask(new Runnable()
+			{
+				int i = 0;
+
+				@Override
+				public void run()
+				{
+					final String note = tune[i];
+					i++;
+					if (i >= tune.length)
+					{
+						Commandessentials.this.stopTune();
+					}
+					if (note.isEmpty())
+					{
+						return;
+					}
+					Map<Player, Block> noteBlocks = Commandessentials.this.noteBlocks;
+					for (Player onlinePlayer : server.getOnlinePlayers())
+					{
+						final Block block = noteBlocks.get(onlinePlayer);
+						if (block == null || block.getType() != Material.NOTE_BLOCK)
+						{
+							continue;
+						}
+						onlinePlayer.playNote(block.getLocation(), (byte)0, noteMap.get(note));
+					}
+				}
+			}, 20, 2);
+	}
+
+	private void stopTune()
+	{
+		ess.getScheduler().cancelTask(taskid);
+		for (Block block : noteBlocks.values())
+		{
+			if (block.getType() == Material.NOTE_BLOCK)
+			{
+				block.setType(Material.AIR);
+			}
+		}
+		noteBlocks.clear();
+	}
+	
+	private void run_moo(final Server server, final CommandSender sender, final String command, final String args[])
+	{
+		if(sender instanceof ConsoleCommandSender)
+			sender.sendMessage(new String[]{"         (__)", "         (oo)", "   /------\\/", "  / |    ||", " *  /\\---/\\", "    ~~   ~~", "....\"Have you mooed today?\"..." } );
+		else
+			sender.sendMessage(new String[]{"            (__)", "            (oo)", "   /------\\/", "  /  |      | |", " *  /\\---/\\", "    ~~    ~~", "....\"Have you mooed today?\"..." } );
+	}
+	
+	private void run_optout(final Server server, final CommandSender sender, final String command, final String args[])
+	{
+		final Metrics metrics = ess.getMetrics();
+		try
+		{
+			sender.sendMessage("Essentials collects simple metrics to highlight which features to concentrate work on in the future.");
+			if (metrics.isOptOut()) {
+				metrics.enable();		
+			} else {
+				metrics.disable();
+			}
+			sender.sendMessage("Anonymous Metrics are now: " + (metrics.isOptOut() ? "disabled" : "enabled"));
+		}
+		catch (IOException ex)
+		{
+			sender.sendMessage("Unable to modify 'plugins/PluginMetrics/config.yml': " + ex.getMessage());
+		}
+	}
+}

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

@@ -0,0 +1,162 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.craftbukkit.SetExpFix;
+import java.util.Locale;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandexp extends EssentialsCommand
+{
+	public Commandexp()
+	{
+		super("exp");
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length == 0)
+		{
+			showExp(user, user);
+		}
+		else if (args[0].equalsIgnoreCase("set") && user.isAuthorized("essentials.exp.set"))
+		{
+			if (args.length == 3 && user.isAuthorized("essentials.exp.set.others"))
+			{
+				expMatch(server, user, args[1], args[2], false);
+			}
+			else
+			{
+				setExp(user, user, args[1], false);
+			}
+		}
+		else if (args[0].equalsIgnoreCase("give") && user.isAuthorized("essentials.exp.give"))
+		{
+			if (args.length == 3 && user.isAuthorized("essentials.exp.give.others"))
+			{
+				expMatch(server, user, args[1], args[2], true);
+			}
+			else
+			{
+				setExp(user, user, args[1], true);
+			}
+		}
+		else
+		{
+			String match = args[0].trim();
+			if (args.length == 2)
+			{
+				match = args[1].trim();
+			}
+			if (match.equalsIgnoreCase("show") || !user.isAuthorized("essentials.exp.others"))
+			{
+				showExp(user, user);
+			}
+			else
+			{
+				showMatch(server, user, match);
+			}
+		}
+	}
+
+	@Override
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		else if (args.length > 2 && args[0].equalsIgnoreCase("set"))
+		{
+			expMatch(server, sender, args[1], args[2], false);
+		}
+		else if (args.length > 2 && args[0].equalsIgnoreCase("give"))
+		{
+			expMatch(server, sender, args[1], args[2], true);
+		}
+		else
+		{
+			String match = args[0].trim();
+			if (args.length == 2)
+			{
+				match = args[1].trim();
+			}
+			showMatch(server, sender, match);
+		}
+	}
+
+	private void showMatch(final Server server, final CommandSender sender, final String match) throws NotEnoughArgumentsException
+	{
+		boolean foundUser = false;
+		for (Player matchPlayer : server.matchPlayer(match))
+		{
+			foundUser = true;
+			final User target = ess.getUser(matchPlayer);
+			showExp(sender, target);
+		}
+		if (!foundUser)
+		{
+			throw new NotEnoughArgumentsException(_("playerNotFound"));
+		}
+	}
+
+	private void expMatch(final Server server, final CommandSender sender, final String match, String amount, final boolean toggle) throws NotEnoughArgumentsException
+	{
+		boolean foundUser = false;
+		for (Player matchPlayer : server.matchPlayer(match))
+		{
+			final User target = ess.getUser(matchPlayer);
+			setExp(sender, target, amount, toggle);
+			foundUser = true;
+		}
+		if (!foundUser)
+		{
+			throw new NotEnoughArgumentsException(_("playerNotFound"));
+		}
+	}
+
+	private void showExp(final CommandSender sender, final User target)
+	{
+		final int totalExp = SetExpFix.getTotalExperience(target);
+		sender.sendMessage(_("exp", target.getDisplayName(), SetExpFix.getTotalExperience(target), target.getLevel(), SetExpFix.getExpUntilNextLevel(target)));
+	}
+
+	private void setExp(final CommandSender sender, final User target, String strAmount, final boolean give) throws NotEnoughArgumentsException 
+	{
+		Long amount;
+		strAmount = strAmount.toLowerCase(Locale.ENGLISH);
+		if (strAmount.startsWith("l") || strAmount.endsWith("l"))
+		{
+			strAmount = strAmount.replaceAll("l","");			
+			int neededLevel = Integer.parseInt(strAmount);
+			if (give)
+			{
+				neededLevel += target.getLevel();
+			}
+			amount = (long)SetExpFix.getExpToLevel(neededLevel);
+			SetExpFix.setTotalExperience(target, 0);
+		}
+		else {
+			amount = Long.parseLong(strAmount);
+			if (amount < 0 || amount > Integer.MAX_VALUE)
+			{
+				throw new NotEnoughArgumentsException();	
+			}
+		}
+
+		if (give)
+		{
+			amount += SetExpFix.getTotalExperience(target);
+		}
+		if (amount > Integer.MAX_VALUE)
+		{
+			amount = (long)Integer.MAX_VALUE;
+		}
+		SetExpFix.setTotalExperience(target, amount.intValue());
+		sender.sendMessage(_("expSet", target.getDisplayName(), amount));
+	}
+}

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

@@ -0,0 +1,49 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandext extends EssentialsCommand
+{
+	public Commandext()
+	{
+		super("ext");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		extinguishPlayers(server, sender, args[0]);
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			user.setFireTicks(0);
+			user.sendMessage(_("extinguish"));
+			return;
+		}
+
+		extinguishPlayers(server, user, commandLabel);
+	}
+
+	private void extinguishPlayers(final Server server, final CommandSender sender, final String name) throws Exception
+	{
+		for (Player matchPlayer : server.matchPlayer(name))
+		{
+			matchPlayer.setFireTicks(0);
+			sender.sendMessage(_("extinguishOthers", matchPlayer.getDisplayName()));
+		}
+	}
+}

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

@@ -0,0 +1,52 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import java.util.List;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandfeed extends EssentialsCommand
+{
+	public Commandfeed()
+	{
+		super("feed");
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length > 0 && user.isAuthorized("essentials.feed.others"))
+		{
+			feedOtherPlayers(server,user,args[0]);
+		}
+		else
+		{
+			user.setFoodLevel(20);
+			user.setSaturation(10);
+			user.sendMessage(_("feed"));
+		}
+	}
+	
+		private void feedOtherPlayers(final Server server, final CommandSender sender, final String name)
+	{
+		final List<Player> players = server.matchPlayer(name);
+		if (players.isEmpty())
+		{
+			sender.sendMessage(_("playerNotFound"));
+			return;
+		}
+		for (Player player : players)
+		{
+			if (ess.getUser(player).isHidden())
+			{
+				continue;
+			}
+			player.setFoodLevel(20);
+			player.setSaturation(10);
+			sender.sendMessage(_("feedOther", player.getDisplayName()));
+		}
+	}
+}

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

@@ -0,0 +1,29 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+import org.bukkit.entity.Fireball;
+import org.bukkit.entity.SmallFireball;
+import org.bukkit.util.Vector;
+
+
+public class Commandfireball extends EssentialsCommand
+{
+	public Commandfireball()
+	{
+		super("fireball");
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		boolean small = false;
+		if (args.length > 0 && args[0].equalsIgnoreCase("small"))
+		{
+			small = true;
+		}
+		final Vector direction = user.getEyeLocation().getDirection().multiply(2);
+		Fireball fireball = user.getWorld().spawn(user.getEyeLocation().add(direction.getX(), direction.getY(), direction.getZ()), small ? SmallFireball.class : Fireball.class);
+		fireball.setShooter(user.getBase());
+	}
+}

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

@@ -0,0 +1,96 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandfly extends EssentialsCommand
+{
+	public Commandfly()
+	{
+		super("fly");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		flyOtherPlayers(server, sender, args);
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length == 1)
+		{
+			if (args[0].equalsIgnoreCase("on") || args[0].startsWith("ena") || args[0].equalsIgnoreCase("1"))
+			{
+				user.setAllowFlight(true);
+			}
+			else if (args[0].equalsIgnoreCase("off") || args[0].startsWith("dis") || args[0].equalsIgnoreCase("0"))
+			{
+				user.setAllowFlight(false);
+			}
+			else if (user.isAuthorized("essentials.fly.others"))
+			{
+				flyOtherPlayers(server, user, args);
+				return;
+			}
+		}
+		else if (args.length == 2 && user.isAuthorized("essentials.fly.others"))
+		{
+			flyOtherPlayers(server, user, args);
+			return;
+		}
+		else
+		{
+			user.setAllowFlight(!user.getAllowFlight());
+			if (!user.getAllowFlight())
+			{
+				user.setFlying(false);
+			}
+		}
+		user.sendMessage(_("flyMode", _(user.getAllowFlight() ? "enabled" : "disabled"), user.getDisplayName()));
+	}
+
+	private void flyOtherPlayers(final Server server, final CommandSender sender, final String[] args)
+	{
+		for (Player matchPlayer : server.matchPlayer(args[0]))
+		{
+			final User player = ess.getUser(matchPlayer);
+			if (player.isHidden())
+			{
+				continue;
+			}
+
+			if (args.length > 1)
+			{
+				if (args[1].contains("on") || args[1].contains("ena") || args[1].equalsIgnoreCase("1"))
+				{
+					player.setAllowFlight(true);
+				}
+				else
+				{
+					player.setAllowFlight(false);
+				}
+			}
+			else
+			{
+				player.setAllowFlight(!player.getAllowFlight());
+			}
+
+			if (!player.getAllowFlight())
+			{
+				player.setFlying(false);
+			}
+			sender.sendMessage(_("flyMode", _(player.getAllowFlight() ? "enabled" : "disabled"), player.getDisplayName()));
+		}
+	}
+}

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

@@ -0,0 +1,134 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import java.util.Locale;
+import org.bukkit.GameMode;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandgamemode extends EssentialsCommand
+{
+	public Commandgamemode()
+	{
+		super("gamemode");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		GameMode gameMode;
+		if (args.length == 0)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		else if (args.length == 1)
+		{
+			gameMode = matchGameMode(commandLabel);
+			gamemodeOtherPlayers(server, sender, gameMode, args[0]);
+		}
+		else if (args.length == 2)
+		{
+			gameMode = matchGameMode(args[0].toLowerCase(Locale.ENGLISH));
+			gamemodeOtherPlayers(server, sender, gameMode, args[1]);
+		}
+
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		GameMode gameMode;
+		if (args.length == 0)
+		{
+			gameMode = matchGameMode(commandLabel);
+		}
+		else if (args.length > 1 && args[1].trim().length() > 2 && user.isAuthorized("essentials.gamemode.others"))
+		{
+			gameMode = matchGameMode(args[0].toLowerCase(Locale.ENGLISH));
+			gamemodeOtherPlayers(server, user, gameMode, args[1]);
+			return;
+		}
+		else
+		{
+			try
+			{
+				gameMode = matchGameMode(args[0].toLowerCase(Locale.ENGLISH));
+			}
+			catch (NotEnoughArgumentsException e)
+			{
+				if (user.isAuthorized("essentials.gamemode.others"))
+				{
+					gameMode = matchGameMode(commandLabel);
+					gamemodeOtherPlayers(server, user, gameMode, args[0]);
+					return;
+				}
+				throw new NotEnoughArgumentsException();
+			}
+		}
+		if (gameMode == null)
+		{
+			gameMode = user.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : user.getGameMode() == GameMode.CREATIVE ? GameMode.ADVENTURE : GameMode.SURVIVAL;
+		}
+		user.setGameMode(gameMode);
+		user.sendMessage(_("gameMode", _(user.getGameMode().toString().toLowerCase(Locale.ENGLISH)), user.getDisplayName()));
+	}
+
+	private void gamemodeOtherPlayers(final Server server, final CommandSender sender, final GameMode gameMode, final String player) throws NotEnoughArgumentsException
+	{
+		//TODO: TL this
+		if (player.trim().length() < 2 || gameMode == null)
+		{
+			throw new NotEnoughArgumentsException("You need to specify a valid player/mode.");
+		}
+
+		boolean foundUser = false;
+		for (Player matchPlayer : server.matchPlayer(player))
+		{
+			final User user = ess.getUser(matchPlayer);
+			if (user.isHidden())
+			{
+				continue;
+			}
+			user.setGameMode(gameMode);
+			sender.sendMessage(_("gameMode", _(user.getGameMode().toString().toLowerCase(Locale.ENGLISH)), user.getDisplayName()));
+			foundUser = true;
+		}
+		if (!foundUser)
+		{
+			throw new NotEnoughArgumentsException(_("playerNotFound"));
+		}
+	}
+
+	private GameMode matchGameMode(String modeString) throws NotEnoughArgumentsException
+	{
+		GameMode mode = null;
+		if (modeString.equalsIgnoreCase("gmc") || modeString.equalsIgnoreCase("egmc")
+			|| modeString.contains("creat") || modeString.equalsIgnoreCase("1") || modeString.equalsIgnoreCase("c"))
+		{
+			mode = GameMode.CREATIVE;
+		}
+		else if (modeString.equalsIgnoreCase("gms") || modeString.equalsIgnoreCase("egms")
+				 || modeString.contains("survi") || modeString.equalsIgnoreCase("0") || modeString.equalsIgnoreCase("s"))
+		{
+			mode = GameMode.SURVIVAL;
+		}
+		else if (modeString.equalsIgnoreCase("gma") || modeString.equalsIgnoreCase("egma")
+				 || modeString.contains("advent") || modeString.equalsIgnoreCase("2") || modeString.equalsIgnoreCase("a"))
+		{
+			mode = GameMode.ADVENTURE;
+		}
+		else if (modeString.equalsIgnoreCase("gmt") || modeString.equalsIgnoreCase("egmt")
+				 || modeString.contains("toggle") || modeString.contains("cycle") || modeString.equalsIgnoreCase("t"))
+		{
+			mode = null;
+		}
+		else
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		return mode;
+	}
+}

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

@@ -0,0 +1,60 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.Util;
+import java.lang.management.ManagementFactory;
+import org.bukkit.ChatColor;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+
+
+public class Commandgc extends EssentialsCommand
+{
+	public Commandgc()
+	{
+		super("gc");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		float tps = ess.getTimer().getAverageTPS();
+		ChatColor color;
+		if (tps >= 18)
+		{
+			color = ChatColor.GREEN;
+		}
+		else if (tps >= 15)
+		{
+			color = ChatColor.YELLOW;
+		}
+		else
+		{
+			color = ChatColor.RED;
+		}
+		
+		sender.sendMessage(_("uptime", Util.formatDateDiff(ManagementFactory.getRuntimeMXBean().getStartTime())));
+		sender.sendMessage(_("tps", "" + color + tps));
+		sender.sendMessage(_("gcmax", (Runtime.getRuntime().maxMemory() / 1024 / 1024)));
+		sender.sendMessage(_("gctotal", (Runtime.getRuntime().totalMemory() / 1024 / 1024)));
+		sender.sendMessage(_("gcfree", (Runtime.getRuntime().freeMemory() / 1024 / 1024)));		
+
+		for (World w : server.getWorlds())
+		{
+			String worldType = "World";
+			switch (w.getEnvironment())
+			{
+			case NETHER:
+				worldType = "Nether";
+				break;
+			case THE_END:
+				worldType = "The End";
+				break;
+			}
+
+			sender.sendMessage(_("gcWorld", worldType, w.getName(), w.getLoadedChunks().length, w.getEntities().size()));
+		}
+		
+	}
+}

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

@@ -0,0 +1,57 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+
+
+public class Commandgetpos extends EssentialsCommand
+{
+	public Commandgetpos()
+	{
+		super("getpos");
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length > 0 && user.isAuthorized("essentials.getpos.others"))
+		{
+			final User otherUser = getPlayer(server, args, 0);
+			if (!otherUser.isHidden() || user.isAuthorized("essentials.list.hidden"))
+			{
+				outputPosition(user, otherUser.getLocation(), user.getLocation());
+				return;
+			}
+
+		}
+		outputPosition(user, user.getLocation(), null);
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		final User user = getPlayer(server, args, 0);
+		outputPosition(sender, user.getLocation(), null);
+	}
+
+	private void outputPosition(final CommandSender sender, final Location coords, final Location distance)
+	{
+		sender.sendMessage(_("currentWorld", coords.getWorld().getName()));
+		sender.sendMessage(_("posX", coords.getBlockX()));
+		sender.sendMessage(_("posY", coords.getBlockY()));
+		sender.sendMessage(_("posZ", coords.getBlockZ()));
+		sender.sendMessage(_("posYaw", (coords.getYaw() + 180 + 360) % 360));
+		sender.sendMessage(_("posPitch", coords.getPitch()));
+		if (distance != null && coords.getWorld().equals(distance.getWorld()))
+		{
+			sender.sendMessage(_("distance", coords.distance(distance)));
+		}
+	}
+}

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

@@ -0,0 +1,105 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import java.util.Locale;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+
+public class Commandgive extends EssentialsCommand
+{
+	public Commandgive()
+	{
+		super("give");
+	}
+
+	@Override
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 2)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		final ItemStack stack = ess.getItemDb().get(args[1]);
+
+		final String itemname = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
+		if (sender instanceof Player
+			&& (ess.getSettings().permissionBasedItemSpawn()
+				? (!ess.getUser(sender).isAuthorized("essentials.give.item-all")
+				   && !ess.getUser(sender).isAuthorized("essentials.give.item-" + itemname)
+				   && !ess.getUser(sender).isAuthorized("essentials.give.item-" + stack.getTypeId()))
+				: (!ess.getUser(sender).isAuthorized("essentials.itemspawn.exempt")
+				   && !ess.getUser(sender).canSpawnItem(stack.getTypeId()))))
+		{
+			throw new Exception(_("cantSpawnItem", itemname));
+		}
+
+		final User giveTo = getPlayer(server, args, 0);
+
+		if (args.length > 3 && Util.isInt(args[2]) && Util.isInt(args[3]))
+		{
+			stack.setAmount(Integer.parseInt(args[2]));
+			stack.setDurability(Short.parseShort(args[3]));
+		}
+		else if (args.length > 2 && Integer.parseInt(args[2]) > 0)
+		{
+			stack.setAmount(Integer.parseInt(args[2]));
+		}
+		else if (ess.getSettings().getDefaultStackSize() > 0)
+		{
+			stack.setAmount(ess.getSettings().getDefaultStackSize());
+		}
+		else if (ess.getSettings().getOversizedStackSize() > 0 && giveTo.isAuthorized("essentials.oversizedstacks"))
+		{
+			stack.setAmount(ess.getSettings().getOversizedStackSize());
+		}
+
+		if (args.length > 3)
+		{
+			for (int i = Util.isInt(args[3]) ? 4 : 3; i < args.length; i++)
+			{
+				final String[] split = args[i].split("[:+',;.]", 2);
+				if (split.length < 1)
+				{
+					continue;
+				}
+				final Enchantment enchantment = Commandenchant.getEnchantment(split[0], sender instanceof Player ? ess.getUser(sender) : null);
+				int level;
+				if (split.length > 1)
+				{
+					level = Integer.parseInt(split[1]);
+				}
+				else
+				{
+					level = enchantment.getMaxLevel();
+				}
+				stack.addEnchantment(enchantment, level);
+			}
+		}
+
+		if (stack.getType() == Material.AIR)
+		{
+			throw new Exception(_("cantSpawnItem", "Air"));
+		}
+
+		final String itemName = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' ');
+		sender.sendMessage(_("giveSpawn", stack.getAmount(), itemName, giveTo.getDisplayName()));
+		if (giveTo.isAuthorized("essentials.oversizedstacks"))
+		{
+			InventoryWorkaround.addOversizedItems(giveTo.getInventory(), ess.getSettings().getOversizedStackSize(), stack);
+		}
+		else
+		{
+			InventoryWorkaround.addItems(giveTo.getInventory(), stack);
+		}
+		giveTo.updateInventory();
+	}
+}

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

@@ -0,0 +1,76 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandgod extends EssentialsCommand
+{
+	public Commandgod()
+	{
+		super("god");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		godOtherPlayers(server, sender, args);
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length > 0 && args[0].trim().length() > 2 && user.isAuthorized("essentials.god.others"))
+		{
+			godOtherPlayers(server, user, args);
+			return;
+		}
+		user.setGodModeEnabled(!user.isGodModeEnabled());
+		user.sendMessage(_("godMode", (user.isGodModeEnabled() ? _("enabled") : _("disabled"))));
+	}
+
+	private void godOtherPlayers(final Server server, final CommandSender sender, final String[] args)
+	{
+		for (Player matchPlayer : server.matchPlayer(args[0]))
+		{
+			final User player = ess.getUser(matchPlayer);
+			if (player.isHidden())
+			{
+				continue;
+			}
+
+			if (args.length > 1)
+			{
+				if (args[1].contains("on") || args[1].contains("ena") || args[1].equalsIgnoreCase("1"))
+				{
+					player.setGodModeEnabled(true);
+				}
+				else
+				{
+					player.setGodModeEnabled(false);
+				}
+			}
+			else
+			{
+				player.setGodModeEnabled(!player.isGodModeEnabled());
+			}
+
+			final boolean enabled = player.isGodModeEnabled();
+			if (enabled)
+			{
+				player.setFoodLevel(20);
+			}
+
+			player.sendMessage(_("godMode", (enabled ? _("enabled") : _("disabled"))));
+			sender.sendMessage(_("godMode", _(enabled ? "godEnabledFor" : "godDisabledFor", matchPlayer.getDisplayName())));
+		}
+	}
+}