Travis notifications for slack

Support aliases in rule and baltop output.

.classpath

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

.gitignore

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

.project

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

.travis.yml

@@ -0,0 +1,20 @@
+language: java
+jdk:
+  - oraclejdk7
+  - openjdk7
+  - openjdk6
+script: mvn compile test
+install: true
+notifications:
+  irc: 
+    channels: 
+      - "irc.esper.net#lain"
+    on_success: change
+    on_failure: always
+  email:
+    recipients:
+      - "khobbits@ess3.net"
+    on_success: change
+    on_failure: always
+  slack:
+    secure: Au+u0l79voEjTbkxpak2RMIBmVQqp0lJLOFje2wyYYlBOjbbuL71hduuvo0aayQ95IJZkt2Sz33m0ZxdVRhZaMaJ5/miVkqbRnWR6hJ/EeAnFFpTeEjQd8nSrxucJlfd0iXgDoVe76d2MzakLfGReluHLP3TgiAapZF+rH4NCIw=

BuildAll/build.xml

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

BuildAll/nbproject/genfiles.properties

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

BuildAll/nbproject/project.properties

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

BuildAll/nbproject/project.xml

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

Essentials/build.xml

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

Essentials/nbproject/genfiles.properties

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

Essentials/nbproject/pmd.settings

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

Essentials/nbproject/project.properties

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

Essentials/nbproject/project.xml

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

Essentials/pom.xml

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

Essentials/src/book.txt

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

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

@@ -1,153 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IBackup;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.ISettings;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import lombok.Cleanup;
-import org.bukkit.Bukkit;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Backup implements Runnable, IBackup
-{
-	private static final Logger LOGGER = Bukkit.getLogger();
-	private transient final Server server;
-	private transient final IEssentials ess;
-	private transient final AtomicBoolean running = new AtomicBoolean(false);
-	private transient int taskId = -1;
-	private transient final AtomicBoolean active = new AtomicBoolean(false);
-
-	public Backup(final IEssentials ess)
-	{
-		this.ess = ess;
-		server = ess.getServer();
-		if (server.getOnlinePlayers().length > 0)
-		{
-			startTask();
-		}
-	}
-
-	@Override
-	public final void startTask()
-	{
-		if (running.compareAndSet(false, true))
-		{
-			@Cleanup
-			final ISettings settings = ess.getSettings();
-			settings.acquireReadLock();
-			final long interval = settings.getData().getGeneral().getBackup().getInterval() * 1200; // minutes -> ticks
-			if (interval < 1200)
-			{
-				running.set(false);
-				return;
-			}
-			taskId = ess.scheduleSyncRepeatingTask(this, interval, interval);
-		}
-	}
-
-	@Override
-	public void run()
-	{
-		if (!active.compareAndSet(false, true))
-		{
-			return;
-		}
-		@Cleanup
-		final ISettings settings = ess.getSettings();
-		settings.acquireReadLock();
-		final String command = settings.getData().getGeneral().getBackup().getCommand();
-		if (command == null || command.isEmpty())
-		{
-			return;
-		}
-		LOGGER.log(Level.INFO, _("backupStarted"));
-		final CommandSender consoleSender = server.getConsoleSender();
-		server.dispatchCommand(consoleSender, "save-all");
-		server.dispatchCommand(consoleSender, "save-off");
-
-		ess.scheduleAsyncDelayedTask(new BackupRunner(command));
-	}
-
-
-	private class BackupRunner implements Runnable
-	{
-		private final transient String command;
-
-		public BackupRunner(final String command)
-		{
-			this.command = command;
-		}
-
-		@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 EnableSavingRunner());
-			}
-		}
-	}
-
-
-	private class EnableSavingRunner implements Runnable
-	{
-		@Override
-		public void run()
-		{
-			server.dispatchCommand(server.getConsoleSender(), "save-on");
-			if (server.getOnlinePlayers().length == 0)
-			{
-				running.set(false);
-				if (taskId != -1)
-				{
-					server.getScheduler().cancelTask(taskId);
-				}
-			}
-
-			active.set(false);
-			LOGGER.log(Level.INFO, _("backupFinished"));
-		}
-	}
-}

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

@@ -1,33 +0,0 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.api.IReplyTo;
-import org.bukkit.command.CommandSender;
-
-
-public final class Console implements IReplyTo
-{
-	private static Console instance = new Console();
-	private CommandSender replyTo;
-	public final static String NAME = "Console";
-
-	private Console()
-	{
-	}
-
-	@Override
-	public void setReplyTo(final CommandSender user)
-	{
-		replyTo = user;
-	}
-
-	@Override
-	public CommandSender getReplyTo()
-	{
-		return replyTo;
-	}
-
-	public static Console getConsoleReplyTo()
-	{
-		return instance;
-	}
-}

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

@@ -1,207 +0,0 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.api.*;
-import com.earth2me.essentials.perm.Permissions;
-import com.earth2me.essentials.settings.MoneyHolder;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-
-public class Economy implements IEconomy
-{
-	private final IEssentials ess;
-	private final MoneyHolder npcs;
-
-	public Economy(IEssentials ess)
-	{
-		this.ess = ess;
-		this.npcs = new MoneyHolder(ess);
-	}
-
-	private double getNPCBalance(String name) throws UserDoesNotExistException
-	{
-		npcs.acquireReadLock();
-		try
-		{
-			Map<String, Double> balances = npcs.getData().getBalances();
-			if (balances == null)
-			{
-				throw new UserDoesNotExistException(name);
-			}
-			Double balance = npcs.getData().getBalances().get(name.toLowerCase(Locale.ENGLISH));
-			if (balance == null)
-			{
-				throw new UserDoesNotExistException(name);
-			}
-			return balance;
-		}
-		finally
-		{
-			npcs.unlock();
-		}
-	}
-
-	private void setNPCBalance(String name, double balance, boolean checkExistance) throws UserDoesNotExistException
-	{
-		npcs.acquireWriteLock();
-		try
-		{
-			Map<String, Double> balances = npcs.getData().getBalances();
-			if (balances == null)
-			{
-				balances = new HashMap<String, Double>();
-				npcs.getData().setBalances(balances);
-			}
-			if (checkExistance && !balances.containsKey(name.toLowerCase(Locale.ENGLISH)))
-			{
-				throw new UserDoesNotExistException(name);
-			}
-			balances.put(name.toLowerCase(Locale.ENGLISH), balance);
-		}
-		finally
-		{
-			npcs.unlock();
-		}
-	}
-
-	private double getStartingBalance()
-	{
-		double startingBalance = 0;
-		ISettings settings = ess.getSettings();
-		settings.acquireReadLock();
-		try
-		{
-			startingBalance = settings.getData().getEconomy().getStartingBalance();
-		}
-		finally
-		{
-			settings.unlock();
-		}
-		return startingBalance;
-	}
-
-	@Override
-	public void onReload()
-	{
-		this.npcs.onReload(false);
-	}
-
-	@Override
-	public double getMoney(String name) throws UserDoesNotExistException
-	{
-		IUser user = ess.getUser(name);
-		if (user == null)
-		{
-			return getNPCBalance(name);
-		}
-		return user.getMoney();
-	}
-
-	@Override
-	public void setMoney(String name, double balance) throws NoLoanPermittedException, UserDoesNotExistException
-	{
-		IUser user = ess.getUser(name);
-		if (user == null)
-		{
-			setNPCBalance(name, balance, true);
-			return;
-		}
-		if (balance < 0.0 && !Permissions.ECO_LOAN.isAuthorized(user))
-		{
-			throw new NoLoanPermittedException();
-		}
-		user.setMoney(balance);
-	}
-
-	@Override
-	public void resetBalance(String name) throws NoLoanPermittedException, UserDoesNotExistException
-	{
-		setMoney(name, getStartingBalance());
-	}
-
-	@Override
-	public String format(double amount)
-	{
-		return Util.formatCurrency(amount, ess);
-	}
-
-	@Override
-	public boolean playerExists(String name)
-	{
-		try
-		{
-			getMoney(name);
-			return true;
-		}
-		catch (UserDoesNotExistException ex)
-		{
-			return false;
-		}
-	}
-
-	@Override
-	public boolean isNPC(String name) throws UserDoesNotExistException
-	{
-		boolean result = ess.getUser(name) == null;
-		if (result)
-		{
-			getNPCBalance(name);
-		}
-		return result;
-	}
-
-	@Override
-	public boolean createNPC(String name)
-	{
-		try
-		{
-			if (isNPC(name))
-			{
-
-				setNPCBalance(name, getStartingBalance(), false);
-				return true;
-			}
-		}
-		catch (UserDoesNotExistException ex)
-		{
-			try
-			{
-				setNPCBalance(name, getStartingBalance(), false);
-				return true;
-			}
-			catch (UserDoesNotExistException ex1)
-			{
-				//This should never happen!
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public void removeNPC(String name) throws UserDoesNotExistException
-	{
-		npcs.acquireWriteLock();
-		try
-		{
-			Map<String, Double> balances = npcs.getData().getBalances();
-			if (balances == null)
-			{
-				balances = new HashMap<String, Double>();
-				npcs.getData().setBalances(balances);
-			}
-			if (balances.containsKey(name.toLowerCase(Locale.ENGLISH)))
-			{
-				balances.remove(name.toLowerCase(Locale.ENGLISH));
-			}
-			else
-			{
-				throw new UserDoesNotExistException(name);
-			}
-		}
-		finally
-		{
-			npcs.unlock();
-		}
-	}
-}

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

@@ -1,88 +0,0 @@
-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 final class Enchantments
-{
-
-	private Enchantments()
-	{
-	}
-	
-	private static final transient Pattern NUMPATTERN = Pattern.compile("\\d+");
-	private static final Map<String, Enchantment> ENCHANTMENTS = new HashMap<String, Enchantment>();
-
-	static
-	{
-		ENCHANTMENTS.put("alldamage", Enchantment.DAMAGE_ALL);
-		ENCHANTMENTS.put("alldmg", Enchantment.DAMAGE_ALL);
-		ENCHANTMENTS.put("sharpness", Enchantment.DAMAGE_ALL);
-		ENCHANTMENTS.put("arthropodsdamage", Enchantment.DAMAGE_ARTHROPODS);
-		ENCHANTMENTS.put("ardmg", Enchantment.DAMAGE_ARTHROPODS);
-		ENCHANTMENTS.put("baneofarthropods", Enchantment.DAMAGE_ARTHROPODS);
-		ENCHANTMENTS.put("undeaddamage", Enchantment.DAMAGE_UNDEAD);
-		ENCHANTMENTS.put("smite", Enchantment.DAMAGE_UNDEAD);
-		ENCHANTMENTS.put("digspeed", Enchantment.DIG_SPEED);
-		ENCHANTMENTS.put("efficiency", Enchantment.DIG_SPEED);
-		ENCHANTMENTS.put("durability", Enchantment.DURABILITY);
-		ENCHANTMENTS.put("dura", Enchantment.DURABILITY);
-		ENCHANTMENTS.put("unbreaking", Enchantment.DURABILITY);
-		ENCHANTMENTS.put("fireaspect", Enchantment.FIRE_ASPECT);
-		ENCHANTMENTS.put("fire", Enchantment.FIRE_ASPECT);
-		ENCHANTMENTS.put("knockback", Enchantment.KNOCKBACK);
-		ENCHANTMENTS.put("blockslootbonus", Enchantment.LOOT_BONUS_BLOCKS);
-		ENCHANTMENTS.put("fortune", Enchantment.LOOT_BONUS_BLOCKS);
-		ENCHANTMENTS.put("mobslootbonus", Enchantment.LOOT_BONUS_MOBS);
-		ENCHANTMENTS.put("mobloot", Enchantment.LOOT_BONUS_MOBS);
-		ENCHANTMENTS.put("looting", Enchantment.LOOT_BONUS_MOBS);
-		ENCHANTMENTS.put("oxygen", Enchantment.OXYGEN);
-		ENCHANTMENTS.put("respiration", Enchantment.OXYGEN);
-		ENCHANTMENTS.put("protection", Enchantment.PROTECTION_ENVIRONMENTAL);
-		ENCHANTMENTS.put("prot", Enchantment.PROTECTION_ENVIRONMENTAL);
-		ENCHANTMENTS.put("explosionsprotection", Enchantment.PROTECTION_EXPLOSIONS);
-		ENCHANTMENTS.put("expprot", Enchantment.PROTECTION_EXPLOSIONS);
-		ENCHANTMENTS.put("blastprotection", Enchantment.PROTECTION_EXPLOSIONS);
-		ENCHANTMENTS.put("fallprotection", Enchantment.PROTECTION_FALL);
-		ENCHANTMENTS.put("fallprot", Enchantment.PROTECTION_FALL);
-		ENCHANTMENTS.put("featherfalling", Enchantment.PROTECTION_FALL);
-		ENCHANTMENTS.put("fireprotection", Enchantment.PROTECTION_FIRE);
-		ENCHANTMENTS.put("fireprot", Enchantment.PROTECTION_FIRE);
-		ENCHANTMENTS.put("projectileprotection", Enchantment.PROTECTION_PROJECTILE);
-		ENCHANTMENTS.put("projprot", Enchantment.PROTECTION_PROJECTILE);
-		ENCHANTMENTS.put("silktouch", Enchantment.SILK_TOUCH);
-		ENCHANTMENTS.put("waterworker", Enchantment.WATER_WORKER);
-		ENCHANTMENTS.put("aquaaffinity", Enchantment.WATER_WORKER);
-		ENCHANTMENTS.put("firearrow", Enchantment.ARROW_FIRE);
-		ENCHANTMENTS.put("arrowdamage", Enchantment.ARROW_DAMAGE);
-		ENCHANTMENTS.put("arrowknockback", Enchantment.ARROW_KNOCKBACK);
-		ENCHANTMENTS.put("arrowkb", Enchantment.ARROW_KNOCKBACK);
-		ENCHANTMENTS.put("infinitearrows", Enchantment.ARROW_INFINITE);
-		ENCHANTMENTS.put("infarrows", Enchantment.ARROW_INFINITE);
-	}
-	
-	public static Enchantment getByName(final 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));
-		}
-		return enchantment;
-	}
-
-	public static Set<Entry<String, Enchantment>> entrySet()
-	{
-		return ENCHANTMENTS.entrySet();
-	}
-}

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

@@ -1,436 +0,0 @@
-/*
- * 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.*;
-import com.earth2me.essentials.listener.*;
-import com.earth2me.essentials.register.payment.Methods;
-import com.earth2me.essentials.settings.GroupsHolder;
-import com.earth2me.essentials.settings.SettingsHolder;
-import com.earth2me.essentials.user.UserMap;
-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.Server;
-import org.bukkit.World;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-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.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.yaml.snakeyaml.error.YAMLException;
-
-
-public class Essentials extends JavaPlugin implements IEssentials
-{
-	public static final int BUKKIT_VERSION = 1952;
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private transient ISettings settings;
-	private final transient TntExplodeListener tntListener = new TntExplodeListener(this);
-	private transient IJails jails;
-	private transient IKits kits;
-	private transient IWarps warps;
-	private transient IWorth worth;
-	private transient List<IReload> reloadList;
-	private transient IBackup backup;
-	private transient IItemDb itemDb;
-	private transient IGroups groups;
-	private transient final Methods paymentMethod = new Methods();
-	//private transient PermissionsHandler permissionsHandler;
-	private transient IUserMap userMap;
-	private transient ExecuteTimer execTimer;
-	private transient I18n i18n;
-	private transient ICommandHandler commandHandler;
-	private transient Economy economy;
-	public transient boolean testing;
-
-	@Override
-	public ISettings getSettings()
-	{
-		return settings;
-	}
-
-	public void setupForTesting(final Server server) throws IOException, InvalidDescriptionException
-	{
-		testing = true;
-		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 SettingsHolder(this);
-		i18n.updateLocale("en");
-		userMap = new UserMap(this);
-		//permissionsHandler = new PermissionsHandler(this);
-		economy = new Economy(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()))
-			{
-				LOGGER.log(Level.WARNING, _("versionMismatch", plugin.getDescription().getName()));
-			}
-		}
-		final Matcher versionMatch = Pattern.compile("git-Bukkit-([0-9]+).([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(4));
-			if (versionNumber < BUKKIT_VERSION)
-			{
-				LOGGER.log(Level.SEVERE, _("notRecommendedBukkit"));
-				LOGGER.log(Level.SEVERE, _("requiredBukkit", Integer.toString(BUKKIT_VERSION)));
-				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");
-			reloadList = new ArrayList<IReload>();
-			settings = new SettingsHolder(this);
-			reloadList.add(settings);
-			execTimer.mark("Settings");
-			//upgrade.afterSettings();
-			//execTimer.mark("Upgrade2");
-			i18n.updateLocale(settings.getLocale());
-			userMap = new UserMap(this);
-			reloadList.add(userMap);
-			execTimer.mark("Init(Usermap)");
-			groups = new GroupsHolder(this);
-			reloadList.add((GroupsHolder)groups);
-			warps = new Warps(this);
-			reloadList.add(warps);
-			execTimer.mark("Init(Spawn/Warp)");
-			worth = new Worth(this);
-			reloadList.add(worth);
-			itemDb = new ItemDb(this);
-			reloadList.add(itemDb);
-			execTimer.mark("Init(Worth/ItemDB)");
-			kits = new Kits(this);
-			reloadList.add(kits);
-			commandHandler = new EssentialsCommandHandler(Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.", this);
-			reloadList.add(commandHandler);
-			economy = new Economy(this);
-			reloadList.add(economy);
-			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);
-		final EssentialsPluginListener serverListener = new EssentialsPluginListener(this);
-		pm.registerEvents(serverListener, this);
-		reloadList.add(serverListener);
-
-		final EssentialsPlayerListener playerListener = new EssentialsPlayerListener(this);
-		pm.registerEvents(playerListener, this);
-
-		final EssentialsBlockListener blockListener = new EssentialsBlockListener(this);
-		pm.registerEvents(blockListener, this);
-
-		final EssentialsEntityListener entityListener = new EssentialsEntityListener(this);
-		pm.registerEvents(entityListener, this);
-
-		jails = new Jails(this);
-		reloadList.add(jails);
-
-		pm.registerEvents(tntListener, this);
-
-
-		final EssentialsTimer timer = new EssentialsTimer(this);
-		getServer().getScheduler().scheduleSyncRepeatingTask(this, timer, 1, 100);
-		execTimer.mark("RegListeners");
-		final String timeroutput = execTimer.end();
-		if (getSettings().isDebug())
-		{
-			LOGGER.log(Level.INFO, "Essentials load {0}", timeroutput);
-		}
-	}
-
-	@Override
-	public void onDisable()
-	{
-		i18n.onDisable();
-		Trade.closeLog();
-	}
-
-	@Override
-	public void reload()
-	{
-		Trade.closeLog();
-
-		for (IReload iReload : reloadList)
-		{
-			iReload.onReload();
-			execTimer.mark("Reload(" + iReload.getClass().getSimpleName() + ")");
-		}
-
-		i18n.updateLocale(settings.getLocale());
-	}
-
-	@Override
-	public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args)
-	{
-		return commandHandler.handleCommand(sender, command, commandLabel, args);
-		//return onCommandEssentials(sender, command, commandLabel, args, Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.", null);
-	}
-
-	@Override
-	public IJails getJails()
-	{
-		return jails;
-	}
-
-	@Override
-	public IKits getKits()
-	{
-		return kits;
-	}
-
-	@Override
-	public IWarps getWarps()
-	{
-		return warps;
-	}
-
-	@Override
-	public IWorth getWorth()
-	{
-		return worth;
-	}
-
-	@Override
-	public IBackup getBackup()
-	{
-		return backup;
-	}
-
-	@Override
-	public IUser getUser(final Player player)
-	{
-		return userMap.getUser(player);
-	}
-
-	@Override
-	public IUser getUser(final String playerName)
-	{
-		return userMap.getUser(playerName);
-	}
-
-	@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 IReload listener)
-	{
-		reloadList.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 IUser user = getUser(player);
-			if (!user.isIgnoringPlayer(sender.getName()))
-			{
-				player.sendMessage(message);
-			}
-		}
-
-		return players.length;
-	}
-
-	@Override
-	public int scheduleAsyncDelayedTask(final Runnable run)
-	{
-		return this.getServer().getScheduler().scheduleAsyncDelayedTask(this, run);
-	}
-
-	@Override
-	public int scheduleSyncDelayedTask(final Runnable run)
-	{
-		return this.getServer().getScheduler().scheduleSyncDelayedTask(this, run);
-	}
-
-	@Override
-	public int scheduleSyncDelayedTask(final Runnable run, final long delay)
-	{
-		return this.getServer().getScheduler().scheduleSyncDelayedTask(this, run, delay);
-	}
-
-	@Override
-	public int scheduleSyncRepeatingTask(final Runnable run, final long delay, final long period)
-	{
-		return this.getServer().getScheduler().scheduleSyncRepeatingTask(this, run, delay, period);
-	}
-
-	@Override
-	public TntExplodeListener getTNTListener()
-	{
-		return tntListener;
-	}
-
-	/*@Override
-	public PermissionsHandler getPermissionsHandler()
-	{
-		return permissionsHandler;
-	}*/
-
-	@Override
-	public IItemDb getItemDb()
-	{
-		return itemDb;
-	}
-
-	@Override
-	public IUserMap getUserMap()
-	{
-		return userMap;
-	}
-
-	@Override
-	public I18n getI18n()
-	{
-		return i18n;
-	}
-
-	@Override
-	public IGroups getGroups()
-	{
-		return groups;
-	}
-
-	@Override
-	public ICommandHandler getCommandHandler()
-	{
-		return commandHandler;
-	}
-
-	@Override
-	public void setGroups(final IGroups groups)
-	{
-		this.groups = groups;
-	}
-
-	@Override
-	public void removeReloadListener(IReload groups)
-	{
-		this.reloadList.remove(groups);
-	}
-
-	@Override
-	public IEconomy getEconomy()
-	{
-		return economy;
-	}
-}

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

@@ -1,316 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.*;
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.IEssentialsCommand;
-import com.earth2me.essentials.commands.NoChargeException;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.command.PluginCommandYamlParser;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-
-public class EssentialsCommandHandler implements ICommandHandler
-{
-	private final transient ClassLoader classLoader;
-	private final transient String commandPath;
-	private final transient String permissionPrefix;
-	private final transient IEssentialsModule module;
-	private static final transient Logger LOGGER = Bukkit.getLogger();
-	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 Map<String, IEssentialsCommand> commands = new HashMap<String, IEssentialsCommand>();
-	private final transient IEssentials ess;
-
-	public EssentialsCommandHandler(ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentials ess)
-	{
-		this(classLoader, commandPath, permissionPrefix, null, ess);
-	}
-
-	public EssentialsCommandHandler(ClassLoader classLoader, String commandPath, String permissionPrefix, IEssentialsModule module, IEssentials ess)
-	{
-		this.classLoader = classLoader;
-		this.commandPath = commandPath;
-		this.permissionPrefix = permissionPrefix;
-		this.module = module;
-		this.ess = ess;
-		for (Plugin plugin : ess.getServer().getPluginManager().getPlugins())
-		{
-			if (plugin.isEnabled())
-			{
-				addPlugin(plugin);
-			}
-		}
-	}
-
-	@Override
-	public boolean handleCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args)
-	{
-		boolean disabled = false;
-		boolean overridden = false;
-		ISettings settings = ess.getSettings();
-		settings.acquireReadLock();
-		try
-		{
-			disabled = settings.getData().getCommands().isDisabled(command.getName());
-			overridden = !disabled || settings.getData().getCommands().isOverridden(command.getName());
-		}
-		finally
-		{
-			settings.unlock();
-		}
-		// Allow plugins to override the command via onCommand
-		if (!overridden && (!commandLabel.startsWith("e") || commandLabel.equalsIgnoreCase(command.getName())))
-		{
-			final PluginCommand pc = getAlternative(commandLabel);
-			if (pc != null)
-			{
-				
-				executed(commandLabel, pc.getLabel());
-				try
-				{
-					return pc.execute(sender, commandLabel, args);
-				}
-				catch (final Exception ex)
-				{
-					final ArrayList<StackTraceElement> elements = new ArrayList<StackTraceElement>(Arrays.asList(ex.getStackTrace()));
-					elements.remove(0);
-					final ArrayList<StackTraceElement> toRemove = new ArrayList<StackTraceElement>();
-					for (final StackTraceElement e : elements)
-					{
-						if (e.getClassName().equals("com.earth2me.essentials.Essentials"))
-						{
-							toRemove.add(e);
-						}
-					}
-					elements.removeAll(toRemove);
-					final StackTraceElement[] trace = elements.toArray(new StackTraceElement[elements.size()]);
-					ex.setStackTrace(trace);
-					ex.printStackTrace();
-					sender.sendMessage(ChatColor.RED + "An internal error occurred while attempting to perform this command");
-					return true;
-				}
-			}
-		}
-
-		try
-		{
-			IUser user = null;
-			if (sender instanceof Player)
-			{
-				user = ess.getUser((Player)sender);
-				LOGGER.log(Level.INFO, String.format("[PLAYER_COMMAND] %s: /%s %s ", ((Player)sender).getName(), commandLabel, EssentialsCommand.getFinalArg(args, 0)));
-			}
-
-			// Check for disabled commands
-			if (disabled)
-			{
-				return true;
-			}
-
-			final String commandName = command.getName().toLowerCase(Locale.ENGLISH);
-			IEssentialsCommand cmd = commands.get(commandName);
-			if (cmd == null)
-			{
-				try
-				{
-					cmd = (IEssentialsCommand)classLoader.loadClass(commandPath + commandName).newInstance();
-					cmd.init(ess, commandName);
-					cmd.setEssentialsModule(module);
-					commands.put(commandName, cmd);
-				}
-				catch (Exception ex)
-				{
-					sender.sendMessage(_("commandNotLoaded", commandName));
-					LOGGER.log(Level.SEVERE, _("commandNotLoaded", commandName), ex);
-					return true;
-				}
-			}
-
-			// Check authorization
-			if (sender != null && cmd.isAuthorized(sender))
-			{
-				LOGGER.log(Level.WARNING, _("deniedAccessCommand", user.getName()));
-				user.sendMessage(_("noAccessCommand"));
-				return true;
-			}
-
-			// Run the command
-			try
-			{
-				if (user == null)
-				{
-					cmd.run(sender, command, commandLabel, args);
-				}
-				else
-				{
-					user.acquireReadLock();
-					try
-					{
-						cmd.run(user, command, commandLabel, args);
-					}
-					finally
-					{
-						user.unlock();
-					}
-				}
-				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)
-			{
-				showCommandError(sender, commandLabel, ex);
-				return true;
-			}
-		}
-		catch (Throwable ex)
-		{
-			LOGGER.log(Level.SEVERE, _("commandFailed", commandLabel), ex);
-			return true;
-		}
-	}
-
-	@Override
-	public void showCommandError(final CommandSender sender, final String commandLabel, final Throwable exception)
-	{
-		sender.sendMessage(_("errorWithMessage", exception.getMessage()));
-		if (ess.getSettings().isDebug())
-		{
-			LOGGER.log(Level.WARNING, _("errorCallingCommand", commandLabel), exception);
-		}
-	}
-
-	@Override
-	public void onReload()
-	{
-	}
-
-	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/EssentialsTimer.java

@@ -1,82 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import com.earth2me.essentials.user.UserData.TimestampType;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-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<IUser> onlineUsers = new HashSet<IUser>();
-
-	EssentialsTimer(final IEssentials ess)
-	{
-		this.ess = ess;
-	}
-
-	@Override
-	public void run()
-	{
-		final long currentTime = System.currentTimeMillis();
-		for (Player player : ess.getServer().getOnlinePlayers())
-		{
-
-			try
-			{
-				final IUser user = ess.getUser(player);
-				onlineUsers.add(user);
-				user.setLastOnlineActivity(currentTime);
-				user.checkActivity();
-
-				boolean mailDisabled = false;
-				ISettings settings = ess.getSettings();
-				settings.acquireReadLock();
-				try
-				{
-					mailDisabled = settings.getData().getCommands().isDisabled("mail");
-				}
-				finally
-				{
-					settings.unlock();
-				}
-				// New mail notification
-				if (user != null && !mailDisabled && Permissions.MAIL.isAuthorized(user) && !user.gotMailInfo())
-				{
-					final List<String> mail = user.getMails();
-					if (mail != null && !mail.isEmpty())
-					{
-						user.sendMessage(_("youHaveNewMail", mail.size()));
-					}
-				}
-			}
-			catch (Exception e)
-			{
-				ess.getLogger().log(Level.WARNING, "EssentialsTimer Error:", e);
-			}
-		}
-
-		final Iterator<IUser> iterator = onlineUsers.iterator();
-		while (iterator.hasNext())
-		{
-			final IUser user = iterator.next();
-			if (user.getLastOnlineActivity() < currentTime && user.getLastOnlineActivity() > user.getTimestamp(TimestampType.LOGOUT))
-			{
-				user.setTimestamp(TimestampType.LOGOUT, user.getLastOnlineActivity());
-				iterator.remove();
-				continue;
-			}
-			user.checkMuteTimeout(currentTime);
-			user.checkJailTimeout(currentTime);
-		}
-	}
-}

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

@@ -1,153 +0,0 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.storage.ManagedFile;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IItemDb;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Pattern;
-import lombok.Cleanup;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-
-
-public class ItemDb implements 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, Long> items = new HashMap<String, Long>();
-	private final transient ManagedFile file;
-	private static final Pattern SPLIT = Pattern.compile("[^a-zA-Z0-9]");
-
-	@Override
-	public void onReload()
-	{
-		final List<String> lines = file.getLines();
-
-		if (lines.isEmpty())
-		{
-			return;
-		}
-
-		items.clear();
-
-		for (String line : lines)
-		{
-			line = line.trim();
-			if (line.length() > 0 && line.charAt(0) == '#')
-			{
-				continue;
-			}
-
-			final String[] parts = SPLIT.split(line);
-			if (parts.length < 2)
-			{
-				continue;
-			}
-
-			final long numeric = Integer.parseInt(parts[1]);
-
-			final long durability = parts.length > 2 && !(parts[2].length() == 1 && parts[2].charAt(0) == '0') ? Short.parseShort(parts[2]) : 0;
-			items.put(parts[0].toLowerCase(Locale.ENGLISH), numeric | (durability << 32));
-		}
-	}
-
-	public ItemStack get(final String id, final IUser user) throws Exception
-	{
-		final ItemStack stack = get(id.toLowerCase(Locale.ENGLISH));
-
-		@Cleanup
-		com.earth2me.essentials.api.ISettings settings = ess.getSettings();
-		settings.acquireReadLock();
-
-		final int defaultStackSize = settings.getData().getGeneral().getDefaultStacksize();
-
-		if (defaultStackSize > 0)
-		{
-			stack.setAmount(defaultStackSize);
-		}
-		else
-		{
-			final int oversizedStackSize = settings.getData().getGeneral().getOversizedStacksize();
-			if (oversizedStackSize > 0 && Permissions.OVERSIZEDSTACKS.isAuthorized(user))
-			{
-				stack.setAmount(oversizedStackSize);
-			}
-		}
-		return stack;
-	}
-
-	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))
-			{
-				long item = items.get(itemname);
-				itemid = (int)(item & 0xffffffffL);
-				if (metaData == 0)
-				{
-					metaData = (short)((item >> 32) & 0xffffL);
-				}
-			}
-			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;
-	}
-}

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

@@ -1,301 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IJails;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
-import java.io.File;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import lombok.Cleanup;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-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.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();
-
-	public Jails(final IEssentials ess)
-	{
-		super(ess, com.earth2me.essentials.settings.Jails.class);
-		onReload();
-		registerListeners();
-	}
-
-	private void registerListeners()
-	{
-		final PluginManager pluginManager = ess.getServer().getPluginManager();
-		final JailBlockListener blockListener = new JailBlockListener();
-		final JailPlayerListener playerListener = new JailPlayerListener();
-		pluginManager.registerEvents(blockListener, ess);
-		pluginManager.registerEvents(playerListener, ess);
-	}
-
-	@Override
-	public File getStorageFile()
-	{
-		return new File(ess.getDataFolder(), "jail.yml");
-	}
-
-	@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)).getBukkitLocation();
-			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.acquireWriteLock();
-			try
-			{
-				user.getData().setJail(jail);
-			}
-			finally
-			{
-				unlock();
-			}
-		}
-		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, com.earth2me.essentials.storage.Location>());
-			}
-			getData().getJails().put(jailName.toLowerCase(Locale.ENGLISH), new com.earth2me.essentials.storage.Location(loc));
-		}
-		finally
-		{
-			unlock();
-		}
-	}
-
-
-	private class JailBlockListener implements Listener
-	{
-		@EventHandler(priority = EventPriority.LOW)
-		public void onBlockBreak(final BlockBreakEvent event)
-		{
-			@Cleanup
-			final IUser user = ess.getUser(event.getPlayer());
-			user.acquireReadLock();
-			if (user.getData().isJailed())
-			{
-				event.setCancelled(true);
-			}
-		}
-
-		@EventHandler(priority = EventPriority.LOW)
-		public void onBlockPlace(final BlockPlaceEvent event)
-		{
-			@Cleanup
-			final IUser user = ess.getUser(event.getPlayer());
-			user.acquireReadLock();
-			if (user.getData().isJailed())
-			{
-				event.setCancelled(true);
-			}
-		}
-
-		@EventHandler(priority = EventPriority.LOW)
-		public void onBlockDamage(final BlockDamageEvent event)
-		{
-			@Cleanup
-			final IUser user = ess.getUser(event.getPlayer());
-			user.acquireReadLock();
-			if (user.getData().isJailed())
-			{
-				event.setCancelled(true);
-			}
-		}
-	}
-
-
-	private class JailPlayerListener implements Listener
-	{
-		@EventHandler(priority = EventPriority.LOW)
-		public void onPlayerInteract(final PlayerInteractEvent event)
-		{
-			@Cleanup
-			final IUser user = ess.getUser(event.getPlayer());
-			user.acquireReadLock();
-			if (user.getData().isJailed())
-			{
-				event.setCancelled(true);
-			}
-		}
-
-		@EventHandler(priority = EventPriority.HIGH)
-		public void onPlayerRespawn(final PlayerRespawnEvent event)
-		{
-			@Cleanup
-			final IUser user = ess.getUser(event.getPlayer());
-			user.acquireReadLock();
-			if (!user.getData().isJailed() || user.getData().getJail() == null || user.getData().getJail().isEmpty())
-			{
-				return;
-			}
-
-			try
-			{
-				event.setRespawnLocation(getJail(user.getData().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)
-		{
-			@Cleanup
-			final IUser user = ess.getUser(event.getPlayer());
-			user.acquireReadLock();
-			if (!user.getData().isJailed() || user.getData().getJail() == null || user.getData().getJail().isEmpty())
-			{
-				return;
-			}
-
-			try
-			{
-				event.setTo(getJail(user.getData().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.HIGH)
-		public void onPlayerJoin(final PlayerJoinEvent event)
-		{
-			@Cleanup
-			final IUser user = ess.getUser(event.getPlayer());
-			user.acquireReadLock();
-			if (!user.getData().isJailed() || user.getData().getJail() == null || user.getData().getJail().isEmpty())
-			{
-				return;
-			}
-
-			try
-			{
-				sendToJail(user, user.getData().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/Kits.java

@@ -1,90 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IKits;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.settings.Kit;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-import org.bukkit.inventory.ItemStack;
-
-
-public class Kits extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Kits> implements IKits
-{
-	public Kits(final IEssentials ess)
-	{
-		super(ess, com.earth2me.essentials.settings.Kits.class);
-		onReload();
-	}
-
-	@Override
-	public File getStorageFile() throws IOException
-	{
-		return new File(ess.getDataFolder(), "kits.yml");
-	}
-
-	@Override
-	public Kit getKit(String kitName) throws Exception
-	{
-		acquireReadLock();
-		try
-		{
-			if (getData().getKits() == null || kitName == null
-				|| !getData().getKits().containsKey(kitName.toLowerCase(Locale.ENGLISH)))
-			{
-				throw new Exception(_("kitError2"));
-			}
-			final Kit kit = getData().getKits().get(kitName.toLowerCase(Locale.ENGLISH));
-			if (kit == null)
-			{
-				throw new Exception(_("kitError2"));
-			}
-			return kit;
-		}
-		finally
-		{
-			unlock();
-		}
-	}
-
-	@Override
-	public void sendKit(IUser user, String kitName) throws Exception
-	{
-		final Kit kit = getKit(kitName);
-		sendKit(user, kit);
-	}
-
-	@Override
-	public void sendKit(IUser user, Kit kit) throws Exception
-	{
-		final List<ItemStack> itemList = kit.getItems();		
-		user.giveItems(itemList, true);					
-	}
-
-	@Override
-	public Collection<String> getList() throws Exception
-	{
-		acquireReadLock();
-		try
-		{
-			if (getData().getKits() == null)
-			{
-				return Collections.emptyList();
-			}
-			return new ArrayList<String>(getData().getKits().keySet());
-		}
-		finally
-		{
-			unlock();
-		}
-	}
-
-	@Override
-	public boolean isEmpty()
-	{
-		return getData().getKits().isEmpty();
-	}
-}

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

@@ -1,117 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.entity.CreatureType;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-
-
-public enum Mob
-{
-	CHICKEN("Chicken", Enemies.FRIENDLY, CreatureType.CHICKEN),
-	COW("Cow", Enemies.FRIENDLY, CreatureType.COW),
-	CREEPER("Creeper", Enemies.ENEMY, CreatureType.CREEPER),
-	GHAST("Ghast", Enemies.ENEMY, CreatureType.GHAST),
-	GIANT("Giant", Enemies.ENEMY, CreatureType.GIANT),
-	PIG("Pig", Enemies.FRIENDLY, CreatureType.PIG),
-	PIGZOMB("PigZombie", Enemies.NEUTRAL, CreatureType.PIG_ZOMBIE),
-	SHEEP("Sheep", Enemies.FRIENDLY, "", CreatureType.SHEEP),
-	SKELETON("Skeleton", Enemies.ENEMY, CreatureType.SKELETON),
-	SLIME("Slime", Enemies.ENEMY, CreatureType.SLIME),
-	SPIDER("Spider", Enemies.ENEMY, CreatureType.SPIDER),
-	SQUID("Squid", Enemies.FRIENDLY, CreatureType.SQUID),
-	ZOMBIE("Zombie", Enemies.ENEMY, CreatureType.ZOMBIE),
-	WOLF("Wolf", Enemies.NEUTRAL, CreatureType.WOLF),
-	CAVESPIDER("CaveSpider", Enemies.ENEMY, CreatureType.CAVE_SPIDER),
-	ENDERMAN("Enderman", Enemies.ENEMY, "", CreatureType.ENDERMAN),
-	SILVERFISH("Silverfish", Enemies.ENEMY, "", CreatureType.SILVERFISH),
-	ENDERDRAGON("EnderDragon", Enemies.ENEMY, CreatureType.ENDER_DRAGON),
-	VILLAGER("Villager", Enemies.FRIENDLY, CreatureType.VILLAGER),
-	BLAZE("Blaze", Enemies.ENEMY, CreatureType.BLAZE),
-	MUSHROOMCOW("MushroomCow", Enemies.FRIENDLY, CreatureType.MUSHROOM_COW),
-	MAGMACUBE("MagmaCube", Enemies.ENEMY, CreatureType.MAGMA_CUBE),
-	SNOWMAN("Snowman", Enemies.FRIENDLY, "", CreatureType.SNOWMAN);
-	
-	public static final Logger logger = Logger.getLogger("Minecraft");
-
-	private Mob(String n, Enemies en, String s, CreatureType type)
-	{
-		this.suffix = s;
-		this.name = n;
-		this.type = en;
-		this.bukkitType = type;
-	}
-
-	private Mob(String n, Enemies en, CreatureType type)
-	{
-		this.name = n;
-		this.type = en;
-		this.bukkitType = type;
-	}
-	public String suffix = "s";
-	final public String name;
-	final public Enemies type;
-	final private CreatureType 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 hashMap.keySet();
-	}
-
-	public LivingEntity spawn(final Player player, final Server server, final Location loc) throws MobException
-	{
-		final LivingEntity entity = player.getWorld().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 CreatureType 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/Teleport.java

@@ -1,302 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.ITeleport;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import com.earth2me.essentials.perm.Permissions;
-import com.earth2me.essentials.user.CooldownException;
-import com.earth2me.essentials.user.UserData.TimestampType;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.logging.Logger;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-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 static class Target
-	{
-		private final Location location;
-		private final Entity entity;
-
-		public Target(Location location)
-		{
-			this.location = location;
-			this.entity = null;
-		}
-
-		public Target(Entity entity)
-		{
-			this.entity = entity;
-			this.location = null;
-		}
-
-		public Location getLocation()
-		{
-			if (this.entity != null)
-			{
-				return this.entity.getLocation();
-			}
-			return location;
-		}
-	}
-	private IUser user;
-	private int teleTimer = -1;
-	private long started;	// time this task was initiated
-	private long delay;		// how long to delay the teleport
-	private int health;
-	// note that I initially stored a clone of the location for reference, but...
-	// when comparing locations, I got incorrect mismatches (rounding errors, looked like)
-	// so, the X/Y/Z values are stored instead and rounded off
-	private long initX;
-	private long initY;
-	private long initZ;
-	private Target teleportTarget;
-	private Trade chargeFor;
-	private final IEssentials ess;
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	private TeleportCause cause;
-
-	private void initTimer(long delay, Target target, Trade chargeFor, TeleportCause cause)
-	{
-		this.started = System.currentTimeMillis();
-		this.delay = delay;
-		this.health = user.getHealth();
-		this.initX = Math.round(user.getLocation().getX() * MOVE_CONSTANT);
-		this.initY = Math.round(user.getLocation().getY() * MOVE_CONSTANT);
-		this.initZ = Math.round(user.getLocation().getZ() * MOVE_CONSTANT);
-		this.teleportTarget = target;
-		this.chargeFor = chargeFor;
-		this.cause = cause;
-	}
-
-	@Override
-	public void run()
-	{
-
-		if (user == null || !user.isOnline() || user.getLocation() == null)
-		{
-			cancel();
-			return;
-		}
-		if (Math.round(user.getLocation().getX() * MOVE_CONSTANT) != initX
-			|| Math.round(user.getLocation().getY() * MOVE_CONSTANT) != initY
-			|| Math.round(user.getLocation().getZ() * MOVE_CONSTANT) != initZ
-			|| user.getHealth() < health)
-		{	// user moved, cancel teleport
-			cancel(true);
-			return;
-		}
-
-		health = user.getHealth();  // in case user healed, then later gets injured
-
-		long now = System.currentTimeMillis();
-		if (now > started + delay)
-		{
-			try
-			{
-				cooldown(false);
-				user.sendMessage(_("teleportationCommencing"));
-				try
-				{
-
-					now(teleportTarget, cause);
-					if (chargeFor != null)
-					{
-						chargeFor.charge(user);
-					}
-				}
-				catch (Throwable ex)
-				{
-					ess.getCommandHandler().showCommandError(user.getBase(), "teleport", ex);
-				}
-			}
-			catch (Exception ex)
-			{
-				user.sendMessage(_("cooldownWithMessage", ex.getMessage()));
-			}
-		}
-	}
-
-	public Teleport(IUser user, IEssentials ess)
-	{
-		this.user = user;
-		this.ess = ess;
-	}
-
-	public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		final Player player = user.getBase();
-		final Location bed = player.getBedSpawnLocation();
-		final PlayerRespawnEvent pre = new PlayerRespawnEvent(player, bed == null ? player.getWorld().getSpawnLocation() : bed, bed != null);
-		ess.getServer().getPluginManager().callEvent(pre);
-		teleport(new Target(pre.getRespawnLocation()), chargeFor, cause);
-	}
-
-	public void warp(String warp, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		final Location loc = ess.getWarps().getWarp(warp);
-		teleport(new Target(loc), chargeFor, cause);
-		user.sendMessage(_("warpingTo", warp));
-	}
-
-	public void cooldown(boolean check) throws Exception
-	{
-		try
-		{
-			user.checkCooldown(TimestampType.LASTTELEPORT, ess.getGroups().getTeleportCooldown(user), !check, Permissions.TELEPORT_COOLDOWN_BYPASS);
-		}
-		catch (CooldownException ex)
-		{
-			throw new Exception(_("timeBeforeTeleport", ex.getMessage()));
-
-		}
-	}
-
-	public void cancel(boolean notifyUser)
-	{
-		if (teleTimer == -1)
-		{
-			return;
-		}
-		try
-		{
-			ess.getServer().getScheduler().cancelTask(teleTimer);
-			if (notifyUser)
-			{
-				user.sendMessage(_("pendingTeleportCancelled"));
-			}
-		}
-		finally
-		{
-			teleTimer = -1;
-		}
-	}
-
-	public void cancel()
-	{
-		cancel(false);
-	}
-
-	public void teleport(Location loc, Trade chargeFor) throws Exception
-	{
-		teleport(new Target(loc), chargeFor, TeleportCause.PLUGIN);
-	}
-
-	public void teleport(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		teleport(new Target(loc), chargeFor, cause);
-	}
-
-	public void teleport(Entity 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.getGroups().getTeleportDelay(user);
-
-		if (chargeFor != null)
-		{
-			chargeFor.isAffordableFor(user);
-		}
-		cooldown(true);
-		if (delay <= 0 || Permissions.TELEPORT_TIMER_BYPASS.isAuthorized(user))
-		{
-			cooldown(false);
-			now(target, cause);
-			if (chargeFor != null)
-			{
-				chargeFor.charge(user);
-			}
-			return;
-		}
-
-		cancel();
-		Calendar c = new GregorianCalendar();
-		c.add(Calendar.SECOND, (int)delay);
-		c.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
-		user.sendMessage(_("dontMoveMessage", Util.formatDateDiff(c.getTimeInMillis())));
-		initTimer((long)(delay * 1000.0), target, chargeFor, cause);
-
-		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
-	}
-
-	private void now(Target target, TeleportCause cause) throws Exception
-	{
-		cancel();
-		user.setLastLocation();
-		user.getBase().teleport(Util.getSafeDestination(target.getLocation()), cause);
-	}
-
-	public void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception
-	{
-		if (cooldown)
-		{
-			cooldown(false);
-		}
-		now(new Target(loc), cause);
-	}
-
-	public void now(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		cooldown(false);
-		chargeFor.charge(user);
-		now(new Target(loc), cause);
-	}
-
-	public void now(Entity entity, boolean cooldown, TeleportCause cause) throws Exception
-	{
-		if (cooldown)
-		{
-			cooldown(false);
-		}
-		now(new Target(entity), cause);
-	}
-
-	public void back(Trade chargeFor) throws Exception
-	{
-		user.acquireReadLock();
-		try
-		{
-			teleport(new Target(user.getData().getLastLocation().getBukkitLocation()), chargeFor, TeleportCause.COMMAND);
-		}
-		finally
-		{
-			user.unlock();
-		}
-	}
-
-	public void back() throws Exception
-	{
-		user.acquireReadLock();
-		try
-		{
-			now(new Target(user.getData().getLastLocation().getBukkitLocation()), TeleportCause.COMMAND);
-		}
-		finally
-		{
-			user.unlock();
-		}
-	}
-
-	public void home(IUser user, String home, Trade chargeFor) throws Exception
-	{
-		final Location loc = user.getHome(home);
-		if (loc == null)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		teleport(new Target(loc), chargeFor, TeleportCause.COMMAND);
-	}
-}

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

@@ -1,337 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.ChargeException;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
-import com.earth2me.essentials.craftbukkit.SetExpFix;
-import com.earth2me.essentials.perm.NoCommandCostPermissions;
-import com.earth2me.essentials.perm.Permissions;
-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 lombok.Cleanup;
-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 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, ess);
-	}
-
-	public Trade(final double money, final IEssentials ess)
-	{
-		this(null, money, null, null, ess);
-	}
-
-	public Trade(final ItemStack items, final IEssentials ess)
-	{
-		this(null, null, items, null, ess);
-	}
-
-	public Trade(final int exp, final IEssentials ess)
-	{
-		this(null, null, null, exp, ess);
-	}
-
-	private Trade(final String command, final Double money, final ItemStack item, final Integer exp, final IEssentials ess)
-	{
-		this.command = command;
-		this.money = money;
-		this.itemStack = item;
-		this.exp = exp;
-		this.ess = ess;
-	}
-
-	public void isAffordableFor(final IUser user) throws ChargeException
-	{
-		final double mon = user.getMoney();
-		if (getMoney() != null
-			&& mon < getMoney()
-			&& getMoney() > 0
-			&& !Permissions.ECO_LOAN.isAuthorized(user))
-		{
-			throw new ChargeException(_("notEnoughMoney"));
-		}
-
-		if (getItemStack() != null
-			&& !InventoryWorkaround.containsItem(user.getInventory(), true, true, itemStack))
-		{
-			throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
-		}
-
-		@Cleanup
-		final ISettings settings = ess.getSettings();
-		settings.acquireReadLock();
-
-		if (command != null && !command.isEmpty()
-			&& !NoCommandCostPermissions.getPermission(command).isAuthorized(user)
-			&& mon < settings.getData().getEconomy().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
-			&& 0 < settings.getData().getEconomy().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
-			&& !Permissions.ECO_LOAN.isAuthorized(user))
-		{
-			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.addItem(user.getInventory(), true, getItemStack());
-				final Location loc = user.getLocation();
-				for (ItemStack dropStack : leftOver.values())
-				{
-					final int maxStackSize = dropStack.getType().getMaxStackSize();
-					final int stacks = dropStack.getAmount() / maxStackSize;
-					final int leftover = dropStack.getAmount() % maxStackSize;
-					final Item[] itemStacks = new Item[stacks + (leftover > 0 ? 1 : 0)];
-					for (int i = 0; i < stacks; i++)
-					{
-						final ItemStack stack = dropStack.clone();
-						stack.setAmount(maxStackSize);
-						itemStacks[i] = loc.getWorld().dropItem(loc, stack);
-					}
-					if (leftover > 0)
-					{
-						final ItemStack stack = dropStack.clone();
-						stack.setAmount(leftover);
-						itemStacks[stacks] = loc.getWorld().dropItem(loc, stack);
-					}
-				}
-			}
-			else
-			{
-				success = InventoryWorkaround.addAllItems(user.getInventory(), true, getItemStack());
-			}
-			user.updateInventory();
-		}
-		if (getExperience() != null)
-		{
-			SetExpFix.setTotalExperience(user, SetExpFix.getTotalExperience(user) + getExperience());
-		}
-		return success;
-	}
-
-	public void charge(final IUser user) throws ChargeException
-	{
-		if (getMoney() != null)
-		{
-			final double mon = user.getMoney();
-			if (mon < getMoney() && getMoney() > 0 && !Permissions.ECO_LOAN.isAuthorized(user))
-			{
-				throw new ChargeException(_("notEnoughMoney"));
-			}
-			user.takeMoney(getMoney());
-		}
-		if (getItemStack() != null)
-		{
-			if (!InventoryWorkaround.containsItem(user.getInventory(), true, true, itemStack))
-			{
-				throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
-			}
-			InventoryWorkaround.removeItem(user.getInventory(), true, true, getItemStack());
-			user.updateInventory();
-		}
-		if (command != null && !command.isEmpty()
-			&& !NoCommandCostPermissions.getPermission(command).isAuthorized(user))
-		{
-			@Cleanup
-			final ISettings settings = ess.getSettings();
-			settings.acquireReadLock();
-			final double mon = user.getMoney();
-			final double cost = settings.getData().getEconomy().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
-			if (mon < cost && cost > 0 && !Permissions.ECO_LOAN.isAuthorized(user))
-			{
-				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;
-	}
-	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)
-	{
-		@Cleanup
-		final ISettings settings = ess.getSettings();
-		settings.acquireReadLock();
-		if (!settings.getData().getEconomy().isLogEnabled())
-		{
-			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(settings.getData().getEconomy().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(settings.getData().getEconomy().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/Util.java

@@ -1,649 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.InvalidNameException;
-import com.earth2me.essentials.external.gnu.inet.encoding.Punycode;
-import com.earth2me.essentials.external.gnu.inet.encoding.PunycodeException;
-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 lombok.Cleanup;
-import org.bukkit.Bukkit;
-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;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionDefault;
-import org.bukkit.plugin.PluginManager;
-
-
-public final class Util
-{
-	private Util()
-	{
-	}
-	private final static Pattern INVALIDFILECHARS = Pattern.compile("[^\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]");
-	private final static Pattern INVALIDCHARS = Pattern.compile("[^\t\n\r\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]");
-
-	public static String sanitizeFileName(String name) throws InvalidNameException
-	{
-		try
-		{
-			String r = name.toLowerCase(Locale.ENGLISH);
-			r = r.replace('.', (char)('\ue200' + '.'));
-			r = r.replace('\\', (char)('\ue200' + '\\'));
-			r = r.replace('/', (char)('\ue200' + '/'));
-			r = r.replace('"', (char)('\ue200' + '"'));
-			r = r.replace('<', (char)('\ue200' + '<'));
-			r = r.replace('>', (char)('\ue200' + '>'));
-			r = r.replace('|', (char)('\ue200' + '|'));
-			r = r.replace('?', (char)('\ue200' + '?'));
-			r = r.replace('*', (char)('\ue200' + '*'));
-			r = r.replace(':', (char)('\ue200' + ':'));
-			r = r.replace('-', (char)('\ue200' + '-'));
-			r = INVALIDFILECHARS.matcher(r).replaceAll("");
-			return Punycode.encode(r);
-		}
-		catch (PunycodeException ex)
-		{
-			throw new InvalidNameException(ex);
-		}
-	}
-
-	public static String decodeFileName(String name) throws InvalidNameException
-	{
-		try
-		{
-			String r = Punycode.decode(name);
-			r = r.replace((char)('\ue200' + '.'), '.');
-			r = r.replace((char)('\ue200' + '\\'), '\\');
-			r = r.replace((char)('\ue200' + '/'), '/');
-			r = r.replace((char)('\ue200' + '"'), '"');
-			r = r.replace((char)('\ue200' + '<'), '<');
-			r = r.replace((char)('\ue200' + '>'), '>');
-			r = r.replace((char)('\ue200' + '|'), '|');
-			r = r.replace((char)('\ue200' + '?'), '?');
-			r = r.replace((char)('\ue200' + '*'), '*');
-			r = r.replace((char)('\ue200' + ':'), ':');
-			r = r.replace((char)('\ue200' + '-'), '-');
-			return r;
-		}
-		catch (PunycodeException ex)
-		{
-			throw new InvalidNameException(ex);
-		}
-	}
-
-	public static String sanitizeKey(String name)
-	{
-		return INVALIDCHARS.matcher(name.toLowerCase(Locale.ENGLISH)).replaceAll("_");
-	}
-
-	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")
-		};
-		for (int i = 0; i < types.length; i++)
-		{
-			int diff = dateDiff(types[i], fromDate, toDate, future);
-			if (diff > 0)
-			{
-				sb.append(" ").append(diff).append(" ").append(names[i * 2 + (diff > 1 ? 1 : 0)]);
-			}
-		}
-		if (sb.length() == 0)
-		{
-			return "now";
-		}
-		return sb.toString();
-	}
-
-	private static int dateDiff(int type, Calendar fromDate, Calendar toDate, boolean future)
-	{
-		int diff = 0;
-		long savedDate = fromDate.getTimeInMillis();
-		while ((future && !fromDate.after(toDate)) || (!future && !fromDate.before(toDate)))
-		{
-			savedDate = fromDate.getTimeInMillis();
-			fromDate.add(type, future ? 1 : -1);
-			diff++;
-		}
-		diff--;
-		fromDate.setTimeInMillis(savedDate);
-		return diff;
-	}
-
-	public static long parseDateDiff(String time, boolean future) throws Exception
-	{
-		Pattern timePattern = Pattern.compile(
-				"(?:([0-9]+)\\s*y[a-z]*[,\\s]*)?"
-				+ "(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?"
-				+ "(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?"
-				+ "(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?"
-				+ "(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?"
-				+ "(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?"
-				+ "(?:([0-9]+)\\s*(?:s[a-z]*)?)?", Pattern.CASE_INSENSITIVE);
-		Matcher m = timePattern.matcher(time);
-		int years = 0;
-		int months = 0;
-		int weeks = 0;
-		int days = 0;
-		int hours = 0;
-		int minutes = 0;
-		int seconds = 0;
-		boolean found = false;
-		while (m.find())
-		{
-			if (m.group() == null || m.group().isEmpty())
-			{
-				continue;
-			}
-			for (int i = 0; i < m.groupCount(); i++)
-			{
-				if (m.group(i) != null && !m.group(i).isEmpty())
-				{
-					found = true;
-					break;
-				}
-			}
-			if (found)
-			{
-				if (m.group(1) != null && !m.group(1).isEmpty())
-				{
-					years = Integer.parseInt(m.group(1));
-				}
-				if (m.group(2) != null && !m.group(2).isEmpty())
-				{
-					months = Integer.parseInt(m.group(2));
-				}
-				if (m.group(3) != null && !m.group(3).isEmpty())
-				{
-					weeks = Integer.parseInt(m.group(3));
-				}
-				if (m.group(4) != null && !m.group(4).isEmpty())
-				{
-					days = Integer.parseInt(m.group(4));
-				}
-				if (m.group(5) != null && !m.group(5).isEmpty())
-				{
-					hours = Integer.parseInt(m.group(5));
-				}
-				if (m.group(6) != null && !m.group(6).isEmpty())
-				{
-					minutes = Integer.parseInt(m.group(6));
-				}
-				if (m.group(7) != null && !m.group(7).isEmpty())
-				{
-					seconds = Integer.parseInt(m.group(7));
-				}
-				break;
-			}
-		}
-		if (!found)
-		{
-			throw new Exception(_("illegalDate"));
-		}
-		Calendar c = new GregorianCalendar();
-		if (years > 0)
-		{
-			c.add(Calendar.YEAR, years * (future ? 1 : -1));
-		}
-		if (months > 0)
-		{
-			c.add(Calendar.MONTH, months * (future ? 1 : -1));
-		}
-		if (weeks > 0)
-		{
-			c.add(Calendar.WEEK_OF_YEAR, weeks * (future ? 1 : -1));
-		}
-		if (days > 0)
-		{
-			c.add(Calendar.DAY_OF_MONTH, days * (future ? 1 : -1));
-		}
-		if (hours > 0)
-		{
-			c.add(Calendar.HOUR_OF_DAY, hours * (future ? 1 : -1));
-		}
-		if (minutes > 0)
-		{
-			c.add(Calendar.MINUTE, minutes * (future ? 1 : -1));
-		}
-		if (seconds > 0)
-		{
-			c.add(Calendar.SECOND, seconds * (future ? 1 : -1));
-		}
-		return c.getTimeInMillis();
-	}
-	// 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.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.NETHER_WARTS.getId());
-		AIR_MATERIALS.add(Material.WATER_LILY.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 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();
-
-		while (isBlockAboveAir(world, x, y, z))
-		{
-			y -= 1;
-			if (y < 0)
-			{
-				break;
-			}
-		}
-
-		while (isBlockUnsafe(world, x, y, z))
-		{
-			y += 1;
-			if (y >= 127)
-			{
-				x += 1;
-				break;
-			}
-		}
-		while (isBlockUnsafe(world, x, y, z))
-		{
-			y -= 1;
-			if (y <= 1)
-			{
-				y = 127;
-				x += 1;
-				if (x - 32 > 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)
-	{
-		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 ((!AIR_MATERIALS.contains(world.getBlockAt(x, y, z).getType().getId()))
-			|| (!AIR_MATERIALS.contains(world.getBlockAt(x, y + 1, z).getType().getId())))
-		{
-			return true;
-		}
-		return isBlockAboveAir(world, x, y, z);
-	}
-
-	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 df = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US));
-
-	public static String formatCurrency(final double value, final IEssentials ess)
-	{
-		@Cleanup
-		final ISettings settings = ess.getSettings();
-		settings.acquireReadLock();
-		String str = settings.getData().getEconomy().getCurrencySymbol() + df.format(value);
-		if (str.endsWith(".00"))
-		{
-			str = str.substring(0, str.length() - 3);
-		}
-		return str;
-	}
-
-	public static double roundDouble(final double d)
-	{
-		return Math.round(d * 100.0) / 100.0;
-	}
-
-	public static 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 void registerPermissions(String path, Collection<String> nodes, boolean hasDefault, IEssentials ess)
-	{
-		if (nodes == null || nodes.isEmpty())
-		{
-			return;
-		}
-		final PluginManager pluginManager = ess.getServer().getPluginManager();
-		Permission basePerm = pluginManager.getPermission(path + ".*");
-		if (basePerm != null && !basePerm.getChildren().isEmpty())
-		{
-			basePerm.getChildren().clear();
-		}
-		if (basePerm == null)
-		{
-			basePerm = new Permission(path + ".*", PermissionDefault.OP);
-			pluginManager.addPermission(basePerm);
-			Permission mainPerm = pluginManager.getPermission("essentials.*");
-			if (mainPerm == null)
-			{
-				mainPerm = new Permission("essentials.*", PermissionDefault.OP);
-				pluginManager.addPermission(mainPerm);
-			}
-			mainPerm.getChildren().put(basePerm.getName(), Boolean.TRUE);
-		}
-
-		for (String nodeName : nodes)
-		{
-			final String permissionName = path + "." + nodeName;
-			Permission perm = pluginManager.getPermission(permissionName);
-			if (perm == null)
-			{
-				final PermissionDefault defaultPerm = hasDefault && nodeName.equalsIgnoreCase("default") ? PermissionDefault.TRUE : PermissionDefault.OP;
-				perm = new Permission(permissionName, defaultPerm);
-				pluginManager.addPermission(perm);
-			}
-			basePerm.getChildren().put(permissionName, Boolean.TRUE);
-		}
-		basePerm.recalculatePermissibles();
-	}
-	private static transient final Pattern DOT_PATTERN = Pattern.compile("\\.");
-
-	public static Permission registerPermission(String permission, PermissionDefault defaultPerm)
-	{
-		final PluginManager pluginManager = Bukkit.getServer().getPluginManager();
-		final String[] parts = DOT_PATTERN.split(permission);
-		final StringBuilder builder = new StringBuilder(permission.length());
-		Permission parent = null;
-		for (int i = 0; i < parts.length - 1; i++)
-		{
-			builder.append(parts[i]).append(".*");
-			String permString = builder.toString();
-			Permission perm = pluginManager.getPermission(permString);
-			if (perm == null)
-			{
-				perm = new Permission(permString, PermissionDefault.FALSE);
-				pluginManager.addPermission(perm);
-				if (parent != null)
-				{
-					parent.getChildren().put(perm.getName(), Boolean.TRUE);
-				}
-				parent = perm;
-			}
-			builder.deleteCharAt(builder.length() - 1);
-		}
-		Permission perm = pluginManager.getPermission(permission);
-		if (perm == null)
-		{
-			perm = new Permission(permission, defaultPerm);
-			pluginManager.addPermission(perm);
-			if (parent != null)
-			{
-				parent.getChildren().put(perm.getName(), Boolean.TRUE);
-			}
-			parent = perm;
-		}
-		perm.recalculatePermissibles();
-		return perm;
-	}
-	private static transient final Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00A7+[0-9A-FKa-fk]");
-	private static transient final Pattern EASY_COLOR_PATTERN = Pattern.compile("&([0-9a-fk])");
-
-	public static String stripColor(final String input)
-	{
-		if (input == null)
-		{
-			return null;
-		}
-
-		return VANILLA_COLOR_PATTERN.matcher(input).replaceAll("");
-	}
-
-	public static String replaceColor(final String input)
-	{
-		if (input == null)
-		{
-			return null;
-		}
-
-		return EASY_COLOR_PATTERN.matcher(input).replaceAll("\u00a7$1");
-	}
-}

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

@@ -1,152 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IWarp;
-import com.earth2me.essentials.api.IWarps;
-import com.earth2me.essentials.api.InvalidNameException;
-import com.earth2me.essentials.commands.WarpNotFoundException;
-import com.earth2me.essentials.settings.WarpHolder;
-import com.earth2me.essentials.storage.StorageObjectMap;
-import java.io.File;
-import java.util.*;
-import java.util.logging.Logger;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-
-
-public class Warps extends StorageObjectMap<IWarp> implements IWarps
-{
-	private static final Logger logger = Bukkit.getLogger();
-
-	public Warps(IEssentials ess)
-	{
-		super(ess, "warps");
-	}
-
-	@Override
-	public boolean isEmpty()
-	{
-		return getKeySize() == 0;
-	}
-
-	@Override
-	public Collection<String> getList()
-	{
-		final List<String> names = new ArrayList<String>();
-		for (String key : getAllKeys())
-		{
-			IWarp warp = getObject(key);
-			if (warp == null)
-			{
-				continue;
-			}
-			warp.acquireReadLock();
-			try
-			{
-				names.add(warp.getData().getName());
-			}
-			finally
-			{
-				warp.unlock();
-			}
-		}
-		Collections.sort(names, String.CASE_INSENSITIVE_ORDER);
-		return names;
-	}
-
-	@Override
-	public Location getWarp(final String name) throws Exception
-	{
-		IWarp warp = getObject(name);
-		if (warp == null)
-		{
-			throw new WarpNotFoundException(_("warpNotExist"));
-		}
-		warp.acquireReadLock();
-		try
-		{
-			return warp.getData().getLocation().getBukkitLocation();
-		}
-		finally
-		{
-			warp.unlock();
-		}
-	}
-
-	@Override
-	public void setWarp(final String name, final Location loc) throws Exception
-	{
-		setWarp(name, new com.earth2me.essentials.storage.Location(loc));
-	}
-	
-	public void setWarp(final String name, final com.earth2me.essentials.storage.Location loc) throws Exception
-	{
-		IWarp warp = getObject(name);
-		if (warp == null)
-		{
-			warp = new WarpHolder(name, ess);
-		}
-		warp.acquireWriteLock();
-		try
-		{
-			warp.getData().setLocation(loc);
-		}
-		finally
-		{
-			warp.unlock();
-		}
-	}
-
-	@Override
-	public void removeWarp(final String name) throws Exception
-	{
-		removeObject(name);
-	}
-
-	@Override
-	public File getWarpFile(String name) throws InvalidNameException
-	{
-		return getStorageFile(name);
-	}
-
-	@Override
-	public IWarp load(String name) throws Exception
-	{
-		final IWarp warp = new WarpHolder(name, ess);
-		warp.onReload();
-		return warp;
-	}
-
-
-	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

@@ -1,86 +0,0 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.api.IEssentials;
-import com.earth2me.essentials.api.IWorth;
-import com.earth2me.essentials.storage.AsyncStorageObjectHolder;
-import com.earth2me.essentials.storage.EnchantmentLevel;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.material.MaterialData;
-
-
-public class Worth extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Worth> implements IWorth
-{
-	public Worth(final IEssentials ess)
-	{
-		super(ess, com.earth2me.essentials.settings.Worth.class);
-		onReload(false);
-	}
-
-	@Override
-	public double getPrice(final ItemStack itemStack)
-	{
-		this.acquireReadLock();
-		try
-		{
-			final Map<MaterialData, Double> prices = this.getData().getSell();
-			if (prices == null || itemStack == null)
-			{
-				return Double.NaN;
-			}
-			final Double basePrice = prices.get(itemStack.getData());
-			if (basePrice == null || Double.isNaN(basePrice))
-			{
-				return Double.NaN;
-			}
-			double multiplier = 1.0;
-			if (itemStack.getType().getMaxDurability() > 0) {
-				multiplier *= (double)itemStack.getDurability() / (double)itemStack.getType().getMaxDurability();
-			}
-			if (itemStack.getEnchantments() != null && !itemStack.getEnchantments().isEmpty())
-			{
-				final Map<EnchantmentLevel, Double> enchantmentMultipliers = this.getData().getEnchantmentMultiplier();
-				if (enchantmentMultipliers != null)
-				{
-					for (Map.Entry<Enchantment, Integer> entry : itemStack.getEnchantments().entrySet())
-					{
-						final Double enchMult = enchantmentMultipliers.get(new EnchantmentLevel(entry.getKey(), entry.getValue()));
-						if (enchMult != null)
-						{
-							multiplier *= enchMult;
-						}
-					}
-				}
-			}
-			return basePrice * multiplier;
-		}
-		finally
-		{
-			this.unlock();
-		}
-	}
-
-	@Override
-	public void setPrice(final ItemStack itemStack, final double price)
-	{
-		acquireWriteLock();
-		try {
-			if (getData().getSell() == null) {
-				getData().setSell(new HashMap<MaterialData, Double>());
-			}
-			getData().getSell().put(itemStack.getData(), price);
-		} finally {
-			unlock();
-		}
-	}
-
-	@Override
-	public File getStorageFile() throws IOException
-	{
-		return new File(ess.getDataFolder(), "worth.yml");
-	}
-}

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

@@ -1,7 +0,0 @@
-package com.earth2me.essentials.api;
-
-
-public interface IBackup extends Runnable
-{
-	public void startTask();
-}

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

@@ -1,20 +0,0 @@
-package com.earth2me.essentials.api;
-
-import java.util.Map;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
-
-
-public interface ICommandHandler extends IReload
-{
-	Map<String, String> disabledCommands();
-
-	public void removePlugin(Plugin plugin);
-
-	public void addPlugin(Plugin plugin);
-
-	boolean handleCommand(CommandSender sender, Command command, String commandLabel, String[] args);
-
-	void showCommandError(CommandSender sender, String commandLabel, Throwable exception);
-}

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

@@ -1,21 +0,0 @@
-package com.earth2me.essentials.api;
-
-
-public interface IEconomy extends IReload
-{
-	public double getMoney(String name) throws UserDoesNotExistException;
-
-	public void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException;
-
-	public void resetBalance(String name) throws UserDoesNotExistException, NoLoanPermittedException;
-
-	public String format(double amount);
-
-	public boolean playerExists(String name);
-
-	public boolean isNPC(String name) throws UserDoesNotExistException;
-
-	public boolean createNPC(String name);
-
-	public void removeNPC(String name) throws UserDoesNotExistException;
-}

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

@@ -1,64 +0,0 @@
-package com.earth2me.essentials.api;
-
-import com.earth2me.essentials.listener.TntExplodeListener;
-import com.earth2me.essentials.register.payment.Methods;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-
-public interface IEssentials extends Plugin
-{
-	void addReloadListener(IReload listener);
-
-	IUser getUser(Player player);
-
-	IUser getUser(String playerName);
-
-	int broadcastMessage(IUser sender, String message);
-
-	II18n getI18n();
-
-	ISettings getSettings();
-
-	IGroups getGroups();
-
-	IJails getJails();
-
-	IKits getKits();
-
-	IWarps getWarps();
-
-	IWorth getWorth();
-
-	IItemDb getItemDb();
-
-	IUserMap getUserMap();
-
-	IBackup getBackup();
-
-	ICommandHandler getCommandHandler();
-
-	World getWorld(String name);
-
-	Methods getPaymentMethod();
-
-	int scheduleAsyncDelayedTask(Runnable run);
-
-	int scheduleSyncDelayedTask(Runnable run);
-
-	int scheduleSyncDelayedTask(Runnable run, long delay);
-
-	int scheduleSyncRepeatingTask(Runnable run, long delay, long period);
-
-	//IPermissionsHandler getPermissionsHandler();
-	void reload();
-
-	TntExplodeListener getTNTListener();
-
-	void setGroups(IGroups groups);
-
-	void removeReloadListener(IReload groups);
-
-	IEconomy getEconomy();
-}

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

@@ -1,25 +0,0 @@
-package com.earth2me.essentials.api;
-
-import java.text.MessageFormat;
-
-
-public interface IGroups
-{
-	String getMainGroup(IUser player);
-
-	boolean inGroup(IUser player, String groupname);
-
-	double getHealCooldown(IUser player);
-
-	double getTeleportCooldown(IUser player);
-
-	double getTeleportDelay(IUser player);
-
-	String getPrefix(IUser player);
-
-	String getSuffix(IUser player);
-
-	int getHomeLimit(IUser player);
-
-	MessageFormat getChatFormat(IUser player);
-}

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

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

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

@@ -1,13 +0,0 @@
-package com.earth2me.essentials.api;
-
-import org.bukkit.inventory.ItemStack;
-
-
-public interface IItemDb extends IReload
-{
-	ItemStack get(final String name, final IUser user) throws Exception;
-
-	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

@@ -1,18 +0,0 @@
-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;
-
-	void removeJail(String jail) throws Exception;
-
-	void sendToJail(IUser user, String jail) throws Exception;
-
-	void setJail(String jailName, Location loc) throws Exception;
-}

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

@@ -1,18 +0,0 @@
-package com.earth2me.essentials.api;
-
-import com.earth2me.essentials.settings.Kit;
-import java.util.Collection;
-
-
-public interface IKits extends IReload
-{
-	Kit getKit(String kit) throws Exception;
-
-	void sendKit(IUser user, String kit) throws Exception;
-
-	void sendKit(IUser user, Kit kit) throws Exception;
-
-	Collection<String> getList() throws Exception;
-
-	boolean isEmpty();
-}

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

@@ -1,17 +0,0 @@
-package com.earth2me.essentials.api;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionDefault;
-
-
-public interface IPermission
-{
-	String getPermission();
-
-	boolean isAuthorized(CommandSender sender);
-
-	Permission getBukkitPermission();
-
-	PermissionDefault getPermissionDefault();
-}

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

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

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

@@ -1,14 +0,0 @@
-package com.earth2me.essentials.api;
-
-import com.earth2me.essentials.settings.Settings;
-import com.earth2me.essentials.storage.IStorageObjectHolder;
-
-
-public interface ISettings extends IStorageObjectHolder<Settings>
-{
-	public String getLocale();
-
-	public boolean isDebug();
-
-	public void setDebug(boolean b);
-}

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

@@ -1,28 +0,0 @@
-package com.earth2me.essentials.api;
-
-import com.earth2me.essentials.Trade;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-
-
-public interface ITeleport
-{
-	void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception;
-
-	void now(Entity entity, boolean cooldown, TeleportCause cause) throws Exception;
-
-	void back(Trade chargeFor) throws Exception;
-
-	void teleport(Location bed, Trade charge, TeleportCause teleportCause) throws Exception;
-
-	void teleport(Entity entity, Trade chargeFor, TeleportCause cause) throws Exception;
-
-	void home(IUser player, String toLowerCase, Trade charge) throws Exception;
-
-	void respawn(Trade charge, TeleportCause teleportCause) throws Exception;
-
-	void back() throws Exception;
-
-	public void warp(String name, Trade charge, TeleportCause teleportCause) throws Exception;
-}

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

@@ -1,104 +0,0 @@
-package com.earth2me.essentials.api;
-
-import com.earth2me.essentials.storage.IStorageObjectHolder;
-import com.earth2me.essentials.user.CooldownException;
-import com.earth2me.essentials.user.UserData;
-import java.util.List;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-
-public interface IUser extends Player, IStorageObjectHolder<UserData>, IReload, IReplyTo, Comparable<IUser>
-{
-	Player getBase();
-
-	double getMoney();
-
-	void takeMoney(double value);
-
-	void takeMoney(double value, CommandSender initiator);
-
-	void giveMoney(double value);
-
-	void giveMoney(double value, CommandSender initiator);
-
-	void giveItems(ItemStack itemStack, Boolean canSpew) throws ChargeException;
-
-	void giveItems(List<ItemStack> itemStacks, Boolean canSpew) throws ChargeException;
-
-	void setMoney(double value);
-
-	void payUser(final IUser reciever, final double value) throws Exception;
-
-	void setLastLocation();
-
-	Location getHome(String name) throws Exception;
-
-	Location getHome(Location loc);
-
-	boolean isHidden();
-
-	ITeleport getTeleport();
-
-	void checkCooldown(UserData.TimestampType cooldownType, double cooldown, boolean set, IPermission bypassPermission) throws CooldownException;
-
-	boolean toggleAfk();
-
-	void updateActivity(boolean broadcast);
-
-	void updateDisplayName();
-
-	boolean checkJailTimeout(long currentTime);
-
-	boolean checkMuteTimeout(long currentTime);
-
-	boolean checkBanTimeout(long currentTime);
-
-	long getTimestamp(UserData.TimestampType name);
-
-	void setTimestamp(UserData.TimestampType name, long value);
-
-	void setLastOnlineActivity(long currentTime);
-
-	void checkActivity();
-
-	long getLastOnlineActivity();
-
-	boolean isGodModeEnabled();
-
-	boolean isIgnoringPlayer(String name);
-
-	void setIgnoredPlayer(String name, boolean set);
-
-	Location getAfkPosition();
-
-	boolean toggleGodModeEnabled();
-
-	void dispose();
-
-	void updateCompass();
-
-	List<String> getHomes();
-
-	void addMail(String string);
-
-	boolean toggleMuted();
-
-	boolean toggleSocialSpy();
-
-	void requestTeleport(IUser user, boolean b);
-
-	boolean isTeleportRequestHere();
-
-	IUser getTeleportRequester();
-
-	boolean toggleTeleportEnabled();
-
-	long getTeleportRequestTime();
-
-	boolean gotMailInfo();
-
-	List<String> getMails();
-}

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

@@ -1,23 +0,0 @@
-package com.earth2me.essentials.api;
-
-import java.io.File;
-import java.util.Set;
-import org.bukkit.entity.Player;
-
-
-public interface IUserMap extends IReload
-{
-	boolean userExists(final String name);
-
-	IUser getUser(final Player player);
-
-	IUser getUser(final String playerName);
-
-	void removeUser(final String name) throws InvalidNameException;
-
-	Set<String> getAllUniqueUsers();
-
-	int getUniqueUsers();
-
-	File getUserFile(final String name) throws InvalidNameException;
-}

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

@@ -1,9 +0,0 @@
-package com.earth2me.essentials.api;
-
-import com.earth2me.essentials.settings.Warp;
-import com.earth2me.essentials.storage.IStorageObjectHolder;
-
-
-public interface IWarp extends IStorageObjectHolder<Warp>
-{
-}

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

@@ -1,21 +0,0 @@
-package com.earth2me.essentials.api;
-
-import java.io.File;
-import java.util.Collection;
-import org.bukkit.Location;
-
-
-public interface IWarps extends IReload
-{
-	Location getWarp(String warp) throws Exception;
-
-	Collection<String> getList();
-
-	void removeWarp(String name) throws Exception;
-
-	void setWarp(String name, Location loc) throws Exception;
-
-	public boolean isEmpty();
-
-	public File getWarpFile(String name) throws InvalidNameException;
-}

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

@@ -1,11 +0,0 @@
-package com.earth2me.essentials.api;
-
-import org.bukkit.inventory.ItemStack;
-
-
-public interface IWorth extends IReload
-{
-	double getPrice(ItemStack itemStack);
-
-	void setPrice(ItemStack itemStack, double price);
-}

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

@@ -1,10 +0,0 @@
-package com.earth2me.essentials.api;
-
-
-public class InvalidNameException extends Exception
-{
-	public InvalidNameException(Throwable thrwbl)
-	{
-		super(thrwbl);
-	}
-}

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

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

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

@@ -1,55 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionDefault;
-
-
-public class Commandafk extends EssentialsCommand
-{
-	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length > 0 && Permissions.AFK_OTHERS.isAuthorized(user))
-		{
-			IUser afkUser = ess.getUser((Player)ess.getServer().matchPlayer(args[0]));
-			if (afkUser != null)
-			{
-				toggleAfk(afkUser);
-			}
-		}
-		else
-		{
-			toggleAfk(user);
-		}
-	}
-
-	private void toggleAfk(IUser user)
-	{
-		if (!user.toggleAfk())
-		{
-			//user.sendMessage(_("markedAsNotAway"));
-			if (!user.isHidden())
-			{
-				ess.broadcastMessage(user, _("userIsNotAway", user.getDisplayName()));
-			}
-			user.updateActivity(false);
-		}
-		else
-		{
-			//user.sendMessage(_("markedAsAway"));
-			if (!user.isHidden())
-			{
-				ess.broadcastMessage(user, _("userIsAway", user.getDisplayName()));
-			}
-		}
-	}
-	
-	@Override
-	public PermissionDefault getPermissionDefault()
-	{
-		return PermissionDefault.TRUE;
-	}
-}

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

@@ -1,20 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
-import org.bukkit.Location;
-import org.bukkit.entity.TNTPrimed;
-
-
-public class Commandantioch extends EssentialsCommand
-{
-	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		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

@@ -1,19 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.api.IUser;
-
-
-public class Commandback extends EssentialsCommand
-{
-	@Override
-	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		final Trade charge = new Trade(commandName, ess);
-		charge.isAffordableFor(user);
-		user.sendMessage(_("backUsageMsg"));
-		user.getTeleport().back(charge);
-		throw new NoChargeException();
-	}
-}

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

@@ -1,17 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IBackup;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandbackup extends EssentialsCommand
-{
-	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		final IBackup backup = ess.getBackup();
-		backup.run();
-		sender.sendMessage(_("backupStarted"));
-	}
-}

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

@@ -1,31 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandbalance extends EssentialsCommand
-{
-	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		sender.sendMessage(_("balance", Util.formatCurrency(getPlayer(args, 0, true).getMoney(), ess)));
-	}
-
-	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		final double bal = (args.length < 1
-							|| !Permissions.BALANCE_OTHERS.isAuthorized(user)
-							? user
-							: getPlayer(args, 0, true)).getMoney();
-		user.sendMessage(_("balance", Util.formatCurrency(bal, ess)));
-	}
-}

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

@@ -1,173 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
-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 org.bukkit.command.CommandSender;
-
-
-public class Commandbalancetop extends EssentialsCommand
-{
-	private static final int CACHETIME = 2 * 60 * 1000;
-	public static final int MINUSERS = 50;
-	private static ArrayListInput cache = new ArrayListInput();
-	private static long cacheage = 0;
-	private static ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
-
-	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		int page = 0;
-		boolean force = false;
-		if (args.length > 0)
-		{
-			try
-			{
-				page = Integer.parseInt(args[0]);
-			}
-			catch (NumberFormatException ex)
-			{
-				if (args[0].equalsIgnoreCase("force") && sender.isOp())
-				{
-					force = true;
-				}
-			}
-		}
-
-		if (!force && lock.readLock().tryLock())
-		{
-			try
-			{
-				if (cacheage > System.currentTimeMillis() - CACHETIME)
-				{
-					outputCache(sender, page);
-					return;
-				}
-				if (ess.getUserMap().getUniqueUsers() > MINUSERS)
-				{
-					sender.sendMessage(_("orderBalances", ess.getUserMap().getUniqueUsers()));
-				}
-			}
-			finally
-			{
-				lock.readLock().unlock();
-			}
-			ess.scheduleAsyncDelayedTask(new Viewer(sender, page, force));
-		}
-		else
-		{
-			if (ess.getUserMap().getUniqueUsers() > MINUSERS)
-			{
-				sender.sendMessage(_("orderBalances", ess.getUserMap().getUniqueUsers()));
-			}
-			ess.scheduleAsyncDelayedTask(new Viewer(sender, page, force));
-		}
-
-	}
-
-	private static void outputCache(final CommandSender sender, int page)
-	{
-		final Calendar cal = Calendar.getInstance();
-		cal.setTimeInMillis(cacheage);
-		final DateFormat format = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-		sender.sendMessage(_("balanceTop", format.format(cal.getTime())));
-		new TextPager(cache).showPage(Integer.toString(page), "", "balancetop", sender);
-	}
-
-
-	private class Calculator implements Runnable
-	{
-		private final transient Viewer viewer;
-		private final boolean force;
-
-		public Calculator(final Viewer viewer, final boolean force)
-		{
-			this.viewer = viewer;
-			this.force = force;
-		}
-
-		@Override
-		public void run()
-		{
-			lock.writeLock().lock();
-			try
-			{
-				if (force || cacheage <= System.currentTimeMillis() - CACHETIME)
-				{
-					cache.getLines().clear();
-					final Map<String, Double> balances = new HashMap<String, Double>();
-					for (String u : ess.getUserMap().getAllUniqueUsers())
-					{
-						final IUser user = ess.getUserMap().getUser(u);
-						if (user != null)
-						{
-							balances.put(user.getDisplayName(), user.getMoney());
-						}
-					}
-
-					final List<Map.Entry<String, Double>> sortedEntries = new ArrayList<Map.Entry<String, Double>>(balances.entrySet());
-					Collections.sort(sortedEntries, new Comparator<Map.Entry<String, Double>>()
-					{
-						@Override
-						public int compare(final Entry<String, Double> entry1, final Entry<String, Double> entry2)
-						{
-							return -entry1.getValue().compareTo(entry2.getValue());
-						}
-					});
-					int pos = 1;
-					for (Map.Entry<String, Double> entry : sortedEntries)
-					{
-						cache.getLines().add(pos + ". " + entry.getKey() + ", " + Util.formatCurrency(entry.getValue(), ess));
-						pos++;
-					}
-					cacheage = System.currentTimeMillis();
-				}
-			}
-			finally
-			{
-				lock.writeLock().unlock();
-			}
-			ess.scheduleAsyncDelayedTask(viewer);
-		}
-	}
-
-
-	private class Viewer implements Runnable
-	{
-		private final transient CommandSender sender;
-		private final transient int page;
-		private final transient boolean force;
-
-		public Viewer(final CommandSender sender, final int page, final boolean force)
-		{
-			this.sender = sender;
-			this.page = page;
-			this.force = force;
-		}
-
-		@Override
-		public void run()
-		{
-			lock.readLock().lock();
-			try
-			{
-				if (!force && cacheage > System.currentTimeMillis() - CACHETIME)
-				{
-					outputCache(sender, page);
-					return;
-				}
-			}
-			finally
-			{
-				lock.readLock().unlock();
-			}
-			ess.scheduleAsyncDelayedTask(new Calculator(new Viewer(sender, page, force), force));
-		}
-	}
-}

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

@@ -1,66 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import com.earth2me.essentials.Console;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import com.earth2me.essentials.user.Ban;
-import lombok.Cleanup;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-
-public class Commandban extends EssentialsCommand
-{
-	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		@Cleanup
-		final IUser user = getPlayer(args, 0, true);
-		if (user.isOnline())
-		{
-			if (Permissions.BAN_EXEMPT.isAuthorized(user))
-			{
-				sender.sendMessage(_("banExempt"));
-				return;
-			}
-		}
-		else
-		{
-			if (Permissions.BAN_OFFLINE.isAuthorized(sender))
-			{
-				sender.sendMessage(_("banExempt"));
-				return;
-			}
-		}
-
-		user.acquireWriteLock();
-		String banReason;
-		user.getData().setBan(new Ban());
-		if (args.length > 1)
-		{
-			banReason = getFinalArg(args, 1);
-			user.getData().getBan().setReason(banReason);
-		}
-		else
-		{
-			banReason = _("defaultBanReason");
-		}
-		user.setBanned(true);
-		user.kickPlayer(banReason);
-		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
-
-		for (Player onlinePlayer : server.getOnlinePlayers())
-		{
-			final IUser player = ess.getUser(onlinePlayer);
-			if (Permissions.BAN_NOTIFY.isAuthorized(player))
-			{
-				onlinePlayer.sendMessage(_("playerBanned", senderName, user.getName(), banReason));
-			}
-		}
-	}
-}

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

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

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

@@ -1,41 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
-import org.bukkit.Location;
-import org.bukkit.TreeType;
-
-
-public class Commandbigtree extends EssentialsCommand
-{
-	@Override
-	public void run(final IUser 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
-		{
-			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,40 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.event.block.BlockBreakEvent;
-
-
-public class Commandbreak extends EssentialsCommand
-{
-	//TODO: Switch to use util class
-	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		final Block block = user.getTargetBlock(null, 20);
-		if (block == null)
-		{
-			throw new NoChargeException();
-		}
-		if (block.getType() == Material.AIR)
-		{
-			throw new NoChargeException();
-		}
-		if (block.getType() == Material.BEDROCK && !Permissions.BREAK_BEDROCK.isAuthorized(user))
-		{
-			throw new Exception("You are not allowed to destroy bedrock."); //TODO: Translation
-		}
-		final BlockBreakEvent event = new BlockBreakEvent(block, user.getBase());
-		server.getPluginManager().callEvent(event);
-		if (event.isCancelled())
-		{
-			throw new NoChargeException();
-		}
-		else
-		{
-			block.setType(Material.AIR);
-		}
-	}
-}

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

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

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

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

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

@@ -1,93 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import java.util.List;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-
-public class Commandclearinventory extends EssentialsCommand
-{
-	//TODO: Cleanup
-	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length > 0 && Permissions.CLEARINVENTORY_OTHERS.isAuthorized(user))
-		{
-			//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(final CommandSender sender, final String commandLabel, final 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/Commanddelhome.java

@@ -1,59 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import java.util.Locale;
-import lombok.Cleanup;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-
-public class Commanddelhome extends EssentialsCommand
-{
-	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-
-		@Cleanup
-		IUser user = sender instanceof Player ? ess.getUser((Player)sender) : null;
-		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 || Permissions.DELHOME_OTHERS.isAuthorized(user)))
-		{
-			user = getPlayer(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.acquireWriteLock();
-		user.getData().removeHome(name.toLowerCase(Locale.ENGLISH));
-		sender.sendMessage(_("deleteHome", name));
-	}
-}

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

@@ -1,19 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import org.bukkit.command.CommandSender;
-
-
-public class Commanddeljail extends EssentialsCommand
-{
-	@Override
-	protected void run(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

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

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

@@ -1,26 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-
-
-public class Commanddepth extends EssentialsCommand
-{
-	@Override
-	public void run(final IUser 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

@@ -1,83 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import java.util.Locale;
-import lombok.Cleanup;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-
-public class Commandeco extends EssentialsCommand
-{
-	@Override
-	public void run(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 (Player onlinePlayer : server.getOnlinePlayers())
-			{
-				final IUser player = ess.getUser(onlinePlayer);
-				switch (cmd)
-				{
-				case GIVE:
-					player.giveMoney(amount);
-					break;
-
-				case TAKE:
-					player.takeMoney(amount);
-					break;
-
-				case RESET:
-					@Cleanup 
-					ISettings settings = ess.getSettings();
-					settings.acquireReadLock();
-					player.setMoney(amount == 0 ? settings.getData().getEconomy().getStartingBalance() : amount);
-					break;
-				}
-			}
-		}
-		else
-		{
-			final IUser player = getPlayer(args, 1, true);
-			switch (cmd)
-			{
-			case GIVE:
-				player.giveMoney(amount, sender);
-				break;
-
-			case TAKE:
-				player.takeMoney(amount, sender);
-				break;
-
-			case RESET:
-				@Cleanup ISettings settings = ess.getSettings();
-				settings.acquireReadLock();
-				player.setMoney(amount == 0 ? settings.getData().getEconomy().getStartingBalance() : amount);
-				break;
-			}
-		}
-	}
-
-
-	private enum EcoCommands
-	{
-		GIVE, TAKE, RESET
-	}
-}

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

@@ -1,94 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import com.earth2me.essentials.Enchantments;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.EnchantPermissions;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
-
-
-public class Commandenchant extends EssentialsCommand
-{
-	//TODO: Implement charge costs: final Trade charge = new Trade("enchant-" + enchantmentName, ess);
-	@Override
-	protected void run(final IUser 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) || EnchantPermissions.getPermission(enchantmentName).isAuthorized(user))
-				{
-					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 IUser 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 && !EnchantPermissions.getPermission(enchantmentName).isAuthorized(user))
-		{
-			throw new Exception(_("enchantmentPerm", enchantmentName));
-		}
-		return enchantment;
-	}
-}

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

@@ -1,159 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import java.util.HashMap;
-import java.util.Map;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-
-public class Commandessentials extends EssentialsCommand
-{
-	private transient int taskid;
-	private final transient Map<Player, Block> noteBlocks = new HashMap<Player, Block>();
-
-	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length == 0)
-		{
-			run_disabled(sender, args);
-		}
-		else if (args[0].equalsIgnoreCase("debug"))
-		{
-			run_debug(sender, args);
-		}
-		else if (args[0].equalsIgnoreCase("nya"))
-		{
-			run_nya(sender, args);
-		}
-		else
-		{
-			run_reload(sender, args);
-		}
-	}
-
-	private void run_disabled(final CommandSender sender, final String[] args) throws Exception
-	{
-		sender.sendMessage("Essentials " + ess.getDescription().getVersion());
-		sender.sendMessage("/<command> <reload/debug>");
-		sender.sendMessage(_("blockList"));
-		final StringBuilder disabledCommands = new StringBuilder();
-		for (Map.Entry<String, String> entry : ess.getCommandHandler().disabledCommands().entrySet())
-		{
-			if (disabledCommands.length() > 0)
-			{
-				disabledCommands.append(", ");
-			}
-			disabledCommands.append(entry.getKey()).append(" => ").append(entry.getValue());
-		}
-		sender.sendMessage(disabledCommands.toString());
-	}
-
-	private void run_debug(final CommandSender sender, 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 CommandSender sender, final String[] args) throws Exception
-	{
-		ess.reload();
-		sender.sendMessage(_("essentialsReload", ess.getDescription().getVersion()));
-	}
-
-	private void run_nya(final CommandSender sender, 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);
-		return;
-	}
-
-	private void stopTune()
-	{
-		ess.getServer().getScheduler().cancelTask(taskid);
-		for (Block block : noteBlocks.values())
-		{
-			if (block.getType() == Material.NOTE_BLOCK)
-			{
-				block.setType(Material.AIR);
-			}
-		}
-		noteBlocks.clear();
-	}
-}

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

@@ -1,43 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-
-public class Commandext extends EssentialsCommand
-{
-	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-
-		extinguishPlayers(sender, args[0]);
-	}
-
-	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			user.setFireTicks(0);
-			user.sendMessage(_("extinguish"));
-			return;
-		}
-
-		extinguishPlayers(user, args[0]);
-	}
-
-	private void extinguishPlayers(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

@@ -1,47 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import java.util.List;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-
-public class Commandfeed extends EssentialsCommand
-{
-	@Override
-	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length > 0 && Permissions.FEED_OTHERS.isAuthorized(user))
-		{
-			feedOtherPlayers(user, args[0]);
-		}
-		else
-		{
-			user.setFoodLevel(20);
-			user.setSaturation(10);
-			user.sendMessage(_("feed"));
-		}
-	}
-
-	private void feedOtherPlayers(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

@@ -1,23 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import com.earth2me.essentials.api.IUser;
-import org.bukkit.entity.Fireball;
-import org.bukkit.entity.SmallFireball;
-import org.bukkit.util.Vector;
-
-
-public class Commandfireball extends EssentialsCommand
-{
-	@Override
-	protected void run(final IUser 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);
-		final 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/Commandgamemode.java

@@ -1,52 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import java.util.Locale;
-import org.bukkit.GameMode;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-
-public class Commandgamemode extends EssentialsCommand
-{
-	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-
-		gamemodeOtherPlayers(sender, args[0]);
-	}
-
-	@Override
-	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length > 0 && !args[0].trim().isEmpty() && Permissions.GAMEMODE_OTHERS.isAuthorized(user))
-		{
-			gamemodeOtherPlayers(user, args[0]);
-			return;
-		}
-
-		user.setGameMode(user.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : GameMode.SURVIVAL);
-		user.sendMessage(_("gameMode", _(user.getGameMode().toString().toLowerCase(Locale.ENGLISH)), user.getDisplayName()));
-	}
-
-	private void gamemodeOtherPlayers(final CommandSender sender, final String name)
-	{
-		for (Player matchPlayer : server.matchPlayer(name))
-		{
-			final IUser player = ess.getUser(matchPlayer);
-			if (player.isHidden())
-			{
-				continue;
-			}
-
-			player.setGameMode(player.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : GameMode.SURVIVAL);
-			sender.sendMessage(_("gameMode", _(player.getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getDisplayName()));
-		}
-	}
-}

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

@@ -1,25 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandgc extends EssentialsCommand
-{
-	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		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())
-		{
-			sender.sendMessage(
-					(w.getEnvironment() == World.Environment.NETHER ? "Nether" : "World") + " \"" + w.getName() + "\": "
-					+ w.getLoadedChunks().length + _("gcchunks")
-					+ w.getEntities().size() + _("gcentities"));
-		}
-	}
-}

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

@@ -1,50 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandgetpos extends EssentialsCommand
-{
-	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length > 0 && Permissions.GETPOS_OTHERS.isAuthorized(user))
-		{
-			final IUser otherUser = getPlayer(args, 0);
-			outputPosition(user, otherUser.getLocation(), user.getLocation());
-		}
-		else
-		{
-			outputPosition(user, user.getLocation(), null);
-		}
-	}
-
-	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final IUser user = getPlayer(args, 0);
-		outputPosition(sender, user.getLocation(), null);
-	}
-
-	//TODO: Translate
-	private void outputPosition(final CommandSender sender, final Location coords, final Location distance)
-	{
-		sender.sendMessage("§7World: " + coords.getWorld().getName());
-		sender.sendMessage("§7X: " + coords.getBlockX() + " (+East <-> -West)");
-		sender.sendMessage("§7Y: " + coords.getBlockY() + " (+Up <-> -Down)");
-		sender.sendMessage("§7Z: " + coords.getBlockZ() + " (+South <-> -North)");
-		sender.sendMessage("§7Yaw: " + (coords.getYaw() + 180 + 360) % 360 + " (Rotation)");
-		sender.sendMessage("§7Pitch: " + coords.getPitch() + " (Head angle)");
-		if (distance != null && coords.getWorld().equals(distance.getWorld()))
-		{
-			sender.sendMessage("§7Distance: " + coords.distance(distance));
-		}
-	}
-}

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

@@ -1,74 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.GivePermissions;
-import java.util.Locale;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-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
-{
-	//TODO: move these messages to message file
-	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 2)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		
-		final IUser giveTo = getPlayer(args, 0);
-
-		final ItemStack stack = ess.getItemDb().get(args[1], giveTo);
-
-		final String itemname = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
-		if (!GivePermissions.getPermission(stack.getType()).isAuthorized(sender))
-		{
-			throw new Exception(ChatColor.RED + "You are not allowed to spawn the item " + itemname);
-		}	
-
-		if (args.length > 2 && Integer.parseInt(args[2]) > 0)
-		{
-			stack.setAmount(Integer.parseInt(args[2]));
-		}		
-
-		if (args.length > 3)
-		{
-			for (int i = 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((Player)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(ChatColor.RED + "You can't give air.");
-		}
-		
-		giveTo.giveItems(stack, false);
-
-		final String itemName = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' ');
-		sender.sendMessage(ChatColor.BLUE + "Giving " + stack.getAmount() + " of " + itemName + " to " + giveTo.getDisplayName() + ".");
-		
-	}
-}

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

@@ -1,49 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-
-public class Commandgod extends EssentialsCommand
-{
-	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-
-		godOtherPlayers(sender, args[0]);
-	}
-
-	@Override
-	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length > 0 && !args[0].trim().isEmpty() && Permissions.GOD_OTHERS.isAuthorized(user))
-		{
-			godOtherPlayers(user, args[0]);
-			return;
-		}
-
-		user.sendMessage(_("godMode", (user.toggleGodModeEnabled() ? _("enabled") : _("disabled"))));
-	}
-
-	private void godOtherPlayers(final CommandSender sender, final String name)
-	{
-		for (Player matchPlayer : server.matchPlayer(name))
-		{
-			final IUser player = ess.getUser(matchPlayer);
-			if (player.isHidden())
-			{
-				continue;
-			}
-			final boolean enabled = player.toggleGodModeEnabled();
-			player.sendMessage(_("godMode", (enabled ? _("enabled") : _("disabled"))));
-			sender.sendMessage(_("godMode", _(enabled ? "godEnabledFor" : "godDisabledFor", matchPlayer.getDisplayName())));
-		}
-	}
-}

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

@@ -1,64 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import com.earth2me.essentials.user.UserData.TimestampType;
-import java.util.List;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-
-public class Commandheal extends EssentialsCommand
-{
-	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-
-		if (args.length > 0 && Permissions.HEAL_OTHERS.isAuthorized(user))
-		{
-			user.checkCooldown(TimestampType.LASTHEAL, ess.getGroups().getHealCooldown(user), true, Permissions.HEAL_COOLDOWN_BYPASS);
-
-			healOtherPlayers(user, args[0]);
-			return;
-		}
-
-		user.checkCooldown(TimestampType.LASTHEAL, ess.getGroups().getHealCooldown(user), true, Permissions.HEAL_COOLDOWN_BYPASS);
-
-		user.setHealth(20);
-		user.setFoodLevel(20);
-		user.sendMessage(_("heal"));
-	}
-
-	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-
-		healOtherPlayers(sender, args[0]);
-	}
-
-	private void healOtherPlayers(final CommandSender sender, final String name)
-	{
-		final List<Player> players = server.matchPlayer(name);
-		if (players.isEmpty())
-		{
-			sender.sendMessage(_("playerNotFound"));
-			return;
-		}
-		for (Player p : players)
-		{
-			if (ess.getUser(p).isHidden())
-			{
-				continue;
-			}
-			p.setHealth(20);
-			p.setFoodLevel(20);
-			p.sendMessage(_("heal"));
-			sender.sendMessage(_("healOther", p.getDisplayName()));
-		}
-	}
-}

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

@@ -1,46 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.textreader.*;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandhelp extends EssentialsCommand
-{
-	@Override
-	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		IText output;
-		String pageStr = args.length > 0 ? args[0] : null;
-		String chapterPageStr = args.length > 1 ? args[1] : null;
-		final IText input = new TextInput(user, "help", false, ess);
-
-		if (input.getLines().isEmpty())
-		{
-			if (Util.isInt(pageStr) || pageStr == null)
-			{
-				output = new HelpInput(user, "", ess);
-			}
-			else
-			{
-				output = new HelpInput(user, pageStr, ess);
-				pageStr = chapterPageStr;
-			}
-			chapterPageStr = null;
-		}
-		else
-		{
-			output = new KeywordReplacer(input, user, ess);
-		}
-		final TextPager pager = new TextPager(output);
-		pager.showPage(pageStr, chapterPageStr, commandLabel, user);
-	}
-
-	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		sender.sendMessage(_("helpConsole"));
-	}
-}

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

@@ -1,33 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import java.util.logging.Level;
-import org.bukkit.entity.Player;
-
-
-public class Commandhelpop extends EssentialsCommand
-{
-	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-
-		final String message = _("helpOp", user.getDisplayName(), Util.stripColor(getFinalArg(args, 0)));
-		logger.log(Level.INFO, message);
-		for (Player onlinePlayer : server.getOnlinePlayers())
-		{
-			final IUser player = ess.getUser(onlinePlayer);
-			if (!Permissions.HELPOP_RECEIVE.isAuthorized(player))
-			{
-				continue;
-			}
-			player.sendMessage(message);
-		}
-	}
-}

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

@@ -1,91 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import java.util.List;
-import java.util.Locale;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-
-
-public class Commandhome extends EssentialsCommand
-{
-	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		final Trade charge = new Trade(commandName, ess);
-		charge.isAffordableFor(user);
-		IUser player = user;
-		String homeName = "";
-		String[] nameParts;
-		if (args.length > 0)
-		{
-			nameParts = args[0].split(":");
-			if (nameParts[0].length() == args[0].length() || !Permissions.HOME_OTHERS.isAuthorized(user))
-			{
-				homeName = nameParts[0];
-			}
-			else
-			{
-				player = getPlayer(nameParts, 0, true);
-				if (nameParts.length > 1)
-				{
-					homeName = nameParts[1];
-				}
-			}
-		}
-		try
-		{
-			if ("bed".equalsIgnoreCase(homeName))
-			{
-				final Location bed = player.getBedSpawnLocation();
-				if (bed != null && bed.getBlock().getType() == Material.BED_BLOCK)
-				{
-					user.getTeleport().teleport(bed, charge, TeleportCause.COMMAND);
-					throw new NoChargeException();
-				}
-			}
-			user.getTeleport().home(player, homeName.toLowerCase(Locale.ENGLISH), charge);
-		}
-		catch (NotEnoughArgumentsException e)
-		{
-			Location bed = player.getBedSpawnLocation();
-			if (bed != null && bed.getBlock().getType() != Material.BED_BLOCK)
-			{
-				bed = null;
-			}
-			final List<String> homes = player.getHomes();
-			if (homes.isEmpty() && player.equals(user))
-			{
-				if (bed != null)
-				{
-					user.getTeleport().teleport(bed, charge, TeleportCause.COMMAND);
-					throw new NoChargeException();
-				}
-				user.getTeleport().respawn(charge, TeleportCause.COMMAND);
-
-			}
-			else if (homes.isEmpty())
-			{
-				throw new Exception(player == user ? _("noHomeSet") : _("noHomeSetPlayer"));
-			}
-			else if (homes.size() == 1 && player.equals(user))
-			{
-				user.getTeleport().home(player, homes.get(0), charge);
-			}
-			else
-			{
-				if (bed != null)
-				{
-					homes.add("bed");
-				}
-				user.sendMessage(_("homes", Util.joinList(homes)));
-			}
-		}
-		throw new NoChargeException();
-	}
-}

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

@@ -1,42 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-
-
-public class Commandignore extends EssentialsCommand
-{
-	@Override
-	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		IUser player;
-		try
-		{
-			player = getPlayer(args, 0);
-		}
-		catch (NoSuchFieldException ex)
-		{
-			player = ess.getUser(args[0]);
-		}
-		if (player == null)
-		{
-			throw new Exception(_("playerNotFound"));
-		}
-		final String name = player.getName();
-		user.acquireWriteLock();
-		if (user.isIgnoringPlayer(name))
-		{
-			user.setIgnoredPlayer(name, false);
-			user.sendMessage(_("unignorePlayer", player.getName()));
-		}
-		else
-		{
-			user.setIgnoredPlayer(name, true);
-			user.sendMessage(_("ignorePlayer", player.getName()));
-		}
-	}
-}

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

@@ -1,20 +0,0 @@
-package com.earth2me.essentials.commands;
-
-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 org.bukkit.command.CommandSender;
-
-
-public class Commandinfo extends EssentialsCommand
-{
-	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		final IText input = new TextInput(sender, "info", true, ess);
-		final IText output = new KeywordReplacer(input, sender, ess);
-		final TextPager pager = new TextPager(output);
-		pager.showPage(args.length > 0 ? args[0] : null, args.length > 1 ? args[1] : null, commandLabel, sender);
-	}
-}

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

@@ -1,52 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.user.Inventory;
-import java.util.Arrays;
-import org.bukkit.inventory.ItemStack;
-
-
-public class Commandinvsee extends EssentialsCommand
-{
-	@Override
-	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-
-		if (args.length < 1 && user.getData().getInventory() == null)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		IUser invUser = user;
-		if (args.length == 1)
-		{
-			invUser = getPlayer(args, 0);
-		}
-		user.acquireWriteLock();
-		if (invUser == user && user.getData().getInventory() != null)
-		{
-			invUser.getInventory().setContents(user.getData().getInventory().getBukkitInventory());
-			user.getData().setInventory(null);
-			user.sendMessage(_("invRestored"));
-			throw new NoChargeException();
-		}
-		if (user.getData().getInventory() == null)
-		{
-			user.getData().setInventory(new Inventory(user.getInventory().getContents()));
-		}
-		ItemStack[] invUserStack = invUser.getInventory().getContents();
-		final int userStackLength = user.getInventory().getContents().length;
-		if (invUserStack.length < userStackLength)
-		{
-			invUserStack = Arrays.copyOf(invUserStack, userStackLength);
-		}
-		if (invUserStack.length > userStackLength)
-		{
-			throw new Exception(_("invBigger"));
-		}
-		user.getInventory().setContents(invUserStack);
-		user.sendMessage(_("invSee", invUser.getDisplayName()));
-		user.sendMessage(_("invSeeHelp"));
-		throw new NoChargeException();
-	}
-}

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

@@ -1,67 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.ItemPermissions;
-import java.util.Locale;
-import org.bukkit.Material;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
-
-
-public class Commanditem extends EssentialsCommand
-{
-	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-		final ItemStack stack = ess.getItemDb().get(args[0], user);
-
-		final String itemname = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
-		if (!ItemPermissions.getPermission(stack.getType()).isAuthorized(user))
-		{
-			throw new Exception(_("cantSpawnItem", itemname));
-		}
-
-		if (args.length > 1 && Integer.parseInt(args[1]) > 0)
-		{
-			stack.setAmount(Integer.parseInt(args[1]));
-		}
-		
-		if (args.length > 2)
-		{
-			for (int i = 2; i < args.length; i++)
-			{
-				final String[] split = args[i].split("[:+',;.]", 2);
-				if (split.length < 1)
-				{
-					continue;
-				}
-				final Enchantment enchantment = Commandenchant.getEnchantment(split[0], user);
-				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"));
-		}
-
-		user.giveItems(stack, false);
-		
-		final String displayName = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' ');
-		user.sendMessage(_("itemSpawn", stack.getAmount(), displayName));	
-	}
-}

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

@@ -1,31 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-
-public class Commanditemdb extends EssentialsCommand
-{
-	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		ItemStack itemStack = null;
-		if (args.length < 1)
-		{
-			if (sender instanceof Player)
-			{
-				itemStack = ((Player)sender).getItemInHand();
-			}
-			if (itemStack == null)
-			{
-				throw new NotEnoughArgumentsException();
-			}
-		}
-		else
-		{
-			itemStack = ess.getItemDb().get(args[0]);
-		}
-		sender.sendMessage(itemStack.getType().toString() + "- " + itemStack.getTypeId() + ":" + Integer.toString(itemStack.getData().getData()));
-	}
-}

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

@@ -1,14 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import com.earth2me.essentials.Util;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandjails extends EssentialsCommand
-{
-	@Override
-	protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		sender.sendMessage("§7" + Util.joinList(" ", ess.getJails().getList()));
-	}
-}

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

@@ -1,35 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
-import org.bukkit.Location;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-
-
-public class Commandjump extends EssentialsCommand
-{
-	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		Location loc;
-		final Location cloc = user.getLocation();
-
-		try
-		{
-			loc = Util.getTarget(user);
-			loc.setYaw(cloc.getYaw());
-			loc.setPitch(cloc.getPitch());
-			loc.setY(loc.getY() + 1);
-		}
-		catch (NullPointerException ex)
-		{
-			throw new Exception(_("jumpError"), ex);
-		}
-
-		final Trade charge = new Trade(commandName, ess);
-		charge.isAffordableFor(user);
-		user.getTeleport().teleport(loc, charge, TeleportCause.COMMAND);
-	}
-}

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

@@ -1,39 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import com.earth2me.essentials.Console;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-
-public class Commandkick extends EssentialsCommand
-{
-	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-
-		final IUser user = getPlayer(args, 0);
-		if (Permissions.KICK_EXEMPT.isAuthorized(user))
-		{
-			throw new Exception(_("kickExempt"));
-		}
-		final String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("kickDefault");
-		user.kickPlayer(kickReason);
-		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
-
-		for (Player onlinePlayer : server.getOnlinePlayers())
-		{
-			final IUser player = ess.getUser(onlinePlayer);
-			if (Permissions.KICK_NOTIFY.isAuthorized(player))
-			{
-				onlinePlayer.sendMessage(_("playerKicked", senderName, user.getName(), kickReason));
-			}
-		}
-	}
-}

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

@@ -1,25 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-
-public class Commandkickall extends EssentialsCommand
-{
-	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		for (Player onlinePlayer : server.getOnlinePlayers())
-		{
-			if (sender instanceof Player && onlinePlayer.getName().equalsIgnoreCase(((Player)sender).getName()))
-			{
-				continue;
-			}
-			else
-			{
-				onlinePlayer.kickPlayer(args.length > 0 ? getFinalArg(args, 0) : _("kickDefault"));
-			}
-		}
-	}
-}

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

@@ -1,33 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.event.entity.EntityDamageEvent;
-
-
-public class Commandkill extends EssentialsCommand
-{
-	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-
-		for (Player matchPlayer : server.matchPlayer(args[0]))
-		{
-			final EntityDamageEvent ede = new EntityDamageEvent(matchPlayer, sender instanceof Player && ((Player)sender).getName().equals(matchPlayer.getName()) ? EntityDamageEvent.DamageCause.SUICIDE : EntityDamageEvent.DamageCause.CUSTOM, 1000);
-			server.getPluginManager().callEvent(ede);
-			if (ede.isCancelled() && !sender.hasPermission("essentials.kill.force"))
-			{
-				continue;
-			}
-
-			matchPlayer.damage(1000);
-			matchPlayer.setHealth(0);
-			sender.sendMessage(_("kill", matchPlayer.getDisplayName()));
-		}
-	}
-}

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

@@ -1,144 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Mob;
-import java.util.Collections;
-import java.util.Locale;
-import org.bukkit.Chunk;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.*;
-import org.bukkit.event.entity.EntityDeathEvent;
-
-
-public class Commandkillall extends EssentialsCommand
-{
-	//TODO: Tidy - missed this during command cleanup
-	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		String type = "all";
-		int radius = -1;
-		World world;
-		if (sender instanceof Player)
-		{
-			world = ((Player)sender).getWorld();
-			if (args.length == 1)
-			{
-				try
-				{
-					radius = Integer.parseInt(args[0]);
-				}
-				catch (NumberFormatException e1)
-				{
-					type = args[0];
-				}
-			}
-			else if (args.length > 1)
-			{
-				type = args[0];
-				try
-				{
-					radius = Integer.parseInt(args[1]);
-				}
-				catch (NumberFormatException e)
-				{
-					throw new Exception(_("numberRequired"));
-				}
-			}
-		}
-		else
-		{
-			if (args.length == 0)
-			{
-				throw new NotEnoughArgumentsException();
-			}
-			else if (args.length == 1)
-			{
-				world = ess.getWorld(args[0]);
-			}
-			else
-			{
-				type = args[0];
-				world = ess.getWorld(args[1]);
-			}
-		}
-		if (radius >= 0)
-		{
-			radius *= radius;
-		}
-		String killType = type.toLowerCase(Locale.ENGLISH);
-		boolean animals = killType.startsWith("animal");
-		boolean monster = killType.startsWith("monster") || killType.startsWith("mob");
-		boolean all = killType.equals("all");
-		Class<? extends Entity> entityClass = null;
-		if (!animals && !monster && !all)
-		{
-			if (Mob.fromName(killType) == null)
-			{
-				throw new Exception(_("invalidMob"));
-			}
-			entityClass = Mob.fromName(killType).getType().getEntityClass();
-		}
-		int numKills = 0;
-		for (Chunk chunk : world.getLoadedChunks())
-		{
-			for (Entity entity : chunk.getEntities())
-			{
-				if (sender instanceof Player)
-				{
-					if (radius >= 0 && ((Player)sender).getLocation().distanceSquared(entity.getLocation()) > radius)
-					{
-						continue;
-					}
-				}
-				if (entity instanceof LivingEntity == false || entity instanceof HumanEntity)
-				{
-					continue;
-				}
-				if (entity instanceof Wolf)
-				{
-					if (((Wolf)entity).isTamed())
-					{
-						continue;
-					}
-				}
-				if (animals)
-				{
-					if (entity instanceof Animals || entity instanceof NPC || entity instanceof Snowman || entity instanceof WaterMob)
-					{
-						EntityDeathEvent event = new EntityDeathEvent(entity, Collections.EMPTY_LIST);
-						ess.getServer().getPluginManager().callEvent(event);
-						entity.remove();
-						numKills++;
-					}
-				}
-				else if (monster)
-				{
-					if (entity instanceof Monster || entity instanceof ComplexLivingEntity || entity instanceof Flying || entity instanceof Slime)
-					{
-						EntityDeathEvent event = new EntityDeathEvent(entity, Collections.EMPTY_LIST);
-						ess.getServer().getPluginManager().callEvent(event);
-						entity.remove();
-						numKills++;
-					}
-				}
-				else if (all)
-				{
-					EntityDeathEvent event = new EntityDeathEvent(entity, Collections.EMPTY_LIST);
-					ess.getServer().getPluginManager().callEvent(event);
-					entity.remove();
-					numKills++;
-				}
-				else if (entityClass != null && entityClass.isAssignableFrom(entity.getClass()))
-				{
-					EntityDeathEvent event = new EntityDeathEvent(entity, Collections.EMPTY_LIST);
-					ess.getServer().getPluginManager().callEvent(event);
-					entity.remove();
-					numKills++;
-				}
-			}
-		}
-		sender.sendMessage(_("kill", numKills));
-	}
-}

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

@@ -1,60 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Trade;
-import com.earth2me.essentials.Util;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.KitPermissions;
-import com.earth2me.essentials.settings.Kit;
-import java.util.Collection;
-import java.util.Locale;
-
-
-public class Commandkit extends EssentialsCommand
-{
-	@Override
-	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			Collection<String> kitList = ess.getKits().getList();
-			if (kitList.isEmpty())
-			{
-				user.sendMessage(_("noKits"));
-			}
-			else
-			{
-				for (String kitName : kitList)
-				{
-					if (!KitPermissions.getPermission(kitName).isAuthorized(user))
-					{
-						kitList.remove(kitName);
-					}
-				}
-				user.sendMessage(_("kits", Util.joinList(kitList)));
-			}
-			throw new NoChargeException();
-		}
-		else
-		{
-			final String kitName = args[0].toLowerCase(Locale.ENGLISH);
-			final Kit kit = ess.getKits().getKit(kitName);
-
-			if (!KitPermissions.getPermission(kitName).isAuthorized(user))
-			{
-				throw new Exception(_("noKitPermission", "essentials.kit." + kitName));
-			}
-
-			//TODO: Check kit delay
-
-			final Trade charge = new Trade("kit-" + kitName, ess);
-			charge.isAffordableFor(user);
-
-			ess.getKits().sendKit(user, kit);
-
-			charge.charge(user);
-			user.sendMessage(_("kitGive", kitName));
-
-		}
-	}
-}

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

@@ -1,71 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import lombok.Cleanup;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.LightningStrike;
-import org.bukkit.entity.Player;
-
-
-public class Commandlightning extends EssentialsCommand
-{
-	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-
-		IUser user = null;
-		if (sender instanceof Player)
-		{
-			user = ess.getUser(((Player)sender));
-		}
-		if (args.length < 1 & user != null)
-		{
-			user.getWorld().strikeLightning(user.getTargetBlock(null, 600).getLocation());
-			return;
-		}
-
-		if (server.matchPlayer(args[0]).isEmpty())
-		{
-			throw new Exception(_("playerNotFound"));
-		}
-
-		int power = 1;
-		if (args.length > 1)
-		{
-			try
-			{
-				power = Integer.parseInt(args[1]);
-			}
-			catch (NumberFormatException ex)
-			{
-			}
-		}
-
-		for (Player matchPlayer : server.matchPlayer(args[0]))
-		{
-			sender.sendMessage(_("lightningUse", matchPlayer.getDisplayName()));
-			if (power <= 0)
-			{
-				matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation());
-			}
-			else
-			{
-				LightningStrike strike = matchPlayer.getWorld().strikeLightning(matchPlayer.getLocation());
-				matchPlayer.damage(power - 1, strike);
-			}
-			if (!ess.getUser(matchPlayer).isGodModeEnabled())
-			{
-				matchPlayer.setHealth(matchPlayer.getHealth() < 5 ? 0 : matchPlayer.getHealth() - 5);
-			}
-			@Cleanup
-			final ISettings settings = ess.getSettings();
-			settings.acquireReadLock();
-			if (settings.getData().getCommands().getLightning().isWarnPlayer())
-			{
-				matchPlayer.sendMessage(_("lightningSmited"));
-			}
-		}
-	}
-}

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

@@ -1,163 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.api.ISettings;
-import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.perm.Permissions;
-import java.util.*;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-
-public class Commandlist extends EssentialsCommand
-{
-	@Override
-	public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		boolean showhidden = false;
-		if (Permissions.LIST_HIDDEN.isAuthorized(sender))
-		{
-			showhidden = true;
-		}
-		int playerHidden = 0;
-		for (Player onlinePlayer : server.getOnlinePlayers())
-		{
-			if (ess.getUser(onlinePlayer).isHidden())
-			{
-				playerHidden++;
-			}
-		}
-
-		String online;
-		if (showhidden && playerHidden > 0)
-		{
-			online = _("listAmountHidden", server.getOnlinePlayers().length - playerHidden, playerHidden, server.getMaxPlayers());
-		}
-		else
-		{
-			online = _("listAmount", server.getOnlinePlayers().length - playerHidden, server.getMaxPlayers());
-		}
-		sender.sendMessage(online);
-
-		boolean sortListByGroups = false;
-		ISettings settings = ess.getSettings();
-		settings.acquireReadLock();
-		try
-		{
-			sortListByGroups = settings.getData().getCommands().getList().isSortByGroups();
-		}
-		finally
-		{
-			settings.unlock();
-		}
-
-		if (sortListByGroups)
-		{
-			Map<String, List<IUser>> sort = new HashMap<String, List<IUser>>();
-			for (Player OnlinePlayer : server.getOnlinePlayers())
-			{
-				final IUser player = ess.getUser(OnlinePlayer);
-				if (player.isHidden() && !showhidden)
-				{
-					continue;
-				}
-				final String group = ess.getGroups().getMainGroup(player);
-				List<IUser> list = sort.get(group);
-				if (list == null)
-				{
-					list = new ArrayList<IUser>();
-					sort.put(group, list);
-				}
-				list.add(player);
-			}
-			final String[] groups = sort.keySet().toArray(new String[0]);
-			Arrays.sort(groups, String.CASE_INSENSITIVE_ORDER);
-			for (String group : groups)
-			{
-				final StringBuilder groupString = new StringBuilder();
-				groupString.append(group).append(": ");
-				final List<IUser> users = sort.get(group);
-				Collections.sort(users);
-				boolean first = true;
-				for (IUser user : users)
-				{
-					if (!first)
-					{
-						groupString.append(", ");
-					}
-					else
-					{
-						first = false;
-					}
-					user.acquireReadLock();
-					try
-					{
-						if (user.getData().isAfk())
-						{
-							groupString.append(_("listAfkTag"));
-						}
-					}
-					finally
-					{
-						user.unlock();
-					}
-					if (user.isHidden())
-					{
-						groupString.append(_("listHiddenTag"));
-					}
-					groupString.append(user.getDisplayName());
-					groupString.append("§f");
-				}
-				sender.sendMessage(groupString.toString());
-			}
-		}
-		else
-		{
-			final List<IUser> users = new ArrayList<IUser>();
-			for (Player OnlinePlayer : server.getOnlinePlayers())
-			{
-				final IUser player = ess.getUser(OnlinePlayer);
-				if (player.isHidden() && !showhidden)
-				{
-					continue;
-				}
-				users.add(player);
-			}
-			Collections.sort(users);
-
-			final StringBuilder onlineUsers = new StringBuilder();
-			onlineUsers.append(_("connectedPlayers"));
-			boolean first = true;
-			for (IUser user : users)
-			{
-				if (!first)
-				{
-					onlineUsers.append(", ");
-				}
-				else
-				{
-					first = false;
-				}
-				user.acquireReadLock();
-				try
-				{
-					if (user.getData().isAfk())
-					{
-						onlineUsers.append(_("listAfkTag"));
-					}
-				}
-				finally
-				{
-					user.unlock();
-				}
-				if (user.isHidden())
-				{
-					onlineUsers.append(_("listHiddenTag"));
-				}
-				onlineUsers.append(user.getDisplayName());
-				onlineUsers.append("§f");
-			}
-			sender.sendMessage(onlineUsers.toString());
-		}
-	}
-}