Changed s to dropStack for verbosity, and organized imports.

Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>
ManagedFile was in the correct folder, but had the wrong package header.
2026-11-05 01:00:13 -05:00 · 2012-02-23 12:46:57 -05:00 · 2012-02-23 12:29:49 -05:00 · 2012-02-23 12:27:23 -05:00 · 2012-02-23 12:26:55 -05:00 · 2012-02-23 12:26:10 -05:00
1213 changed files with 92190 additions and 159101 deletions
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-        "https://checkstyle.org/dtds/configuration_1_3.dtd">
-
-<!-- based on https://github.com/KyoriPowered/adventure/blob/master/.checkstyle/checkstyle.xml -->
-
-<module name="Checker">
-    <property name="charset" value="UTF-8"/>
-    <property name="fileExtensions" value="java, properties, xml"/>
-    <property name="severity" value="error"/>
-
-    <!-- https://checkstyle.org/config_filefilters.html#BeforeExecutionExclusionFileFilter -->
-    <module name="BeforeExecutionExclusionFileFilter">
-        <property name="fileNamePattern" value="module\-info\.java$"/>
-    </module>
-
-    <!-- https://checkstyle.org/config_whitespace.html#FileTabCharacter -->
-    <module name="FileTabCharacter">
-        <property name="eachLine" value="true"/>
-    </module>
-
-    <!-- https://checkstyle.org/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
-
-    <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
-    <module name="SuppressionFilter">
-        <property name="file" value="${configDirectory}/suppressions.xml"/>
-    </module>
-
-    <!-- https://checkstyle.org/config_filters.html#SuppressWithPlainTextCommentFilter -->
-    <module name="SuppressWithPlainTextCommentFilter"/>
-
-    <module name="TreeWalker">
-        <!-- https://checkstyle.org/config_misc.html#ArrayTypeStyle -->
-        <module name="ArrayTypeStyle"/>
-
-        <!-- https://checkstyle.org/config_imports.html#AvoidStarImport -->
-        <module name="AvoidStarImport"/>
-
-        <!-- https://checkstyle.org/config_misc.html#AvoidEscapedUnicodeCharacters -->
-        <module name="AvoidEscapedUnicodeCharacters">
-            <property name="allowByTailComment" value="true"/>
-            <property name="allowEscapesForControlCharacters" value="true"/>
-            <property name="allowNonPrintableEscapes" value="true"/>
-            <property name="severity" value="info"/>
-        </module>
-
-        <!-- https://checkstyle.org/config_misc.html#CommentsIndentation -->
-        <module name="CommentsIndentation"/>
-
-        <!-- https://checkstyle.org/config_whitespace.html#EmptyForInitializerPad -->
-        <module name="EmptyForInitializerPad"/>
-
-        <!-- https://checkstyle.org/config_whitespace.html#EmptyForIteratorPad -->
-        <module name="EmptyForIteratorPad"/>
-
-        <!-- https://checkstyle.org/config_whitespace.html#EmptyLineSeparator -->
-        <module name="EmptyLineSeparator">
-            <property name="allowMultipleEmptyLines" value="false"/>
-            <property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/>
-            <property name="allowNoEmptyLineBetweenFields" value="true"/>
-            <property name="tokens"
-                      value="CLASS_DEF, CTOR_DEF, ENUM_DEF, IMPORT, INSTANCE_INIT, INTERFACE_DEF, METHOD_DEF, STATIC_IMPORT, STATIC_INIT, VARIABLE_DEF"/> <!-- remove PACKAGE_DEF, temporarily remove COMPACT_CTOR_DEF, RECORD_DEF -->
-        </module>
-
-        <!-- https://checkstyle.org/config_coding.html#FallThrough -->
-        <module name="FallThrough">
-            <property name="checkLastCaseGroup" value="true"/>
-        </module>
-
-        <!-- https://checkstyle.org/config_design.html#FinalClass -->
-        <module name="FinalClass"/>
-
-        <!-- https://checkstyle.org/config_coding.html#FinalLocalVariable -->
-        <module name="FinalLocalVariable"/>
-
-        <!-- https://checkstyle.org/config_whitespace.html#GenericWhitespace -->
-        <module name="GenericWhitespace"/>
-
-        <!-- https://checkstyle.org/config_design.html#HideUtilityClassConstructor -->
-        <module name="HideUtilityClassConstructor"/>
-
-        <!-- https://checkstyle.org/config_imports.html#IllegalImport -->
-        <module name="IllegalImport">
-            <property name="illegalPkgs" value="sun, jdk, com.sun"/>
-        </module>
-
-        <!-- https://checkstyle.org/config_coding.html#IllegalTokenText -->
-        <module name="IllegalTokenText">
-            <property name="format"
-                      value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
-            <property name="message"
-                      value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
-            <property name="tokens" value="CHAR_LITERAL, STRING_LITERAL"/>
-        </module>
-
-        <!-- https://checkstyle.org/config_misc.html#Indentation -->
-        <module name="Indentation"/>
-
-        <!-- https://checkstyle.org/config_blocks.html#LeftCurly -->
-        <module name="LeftCurly"/>
-
-        <!-- https://checkstyle.org/config_naming.html#MethodName -->
-        <module name="MethodName">
-            <property name="format" value="^[_]?[a-z][a-zA-Z0-9]*$"/>
-        </module>
-
-        <!-- https://checkstyle.org/config_whitespace.html#MethodParamPad -->
-        <module name="MethodParamPad"/>
-
-        <!-- https://checkstyle.org/config_javadoc.html#MissingJavadocMethod -->
-        <module name="MissingJavadocMethod">
-            <property name="allowMissingPropertyJavadoc" value="true"/>
-            <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/> <!-- remove CTOR_DEF, COMPACT_CTOR_DEF -->
-        </module>
-
-        <!-- https://checkstyle.org/config_javadoc.html#MissingJavadocType -->
-        <module name="MissingJavadocType"/>
-
-        <!-- https://checkstyle.org/config_coding.html#NoFinalizer -->
-        <module name="NoFinalizer"/>
-
-        <!-- https://checkstyle.org/config_whitespace.html#NoLineWrap -->
-        <module name="NoLineWrap"/>
-
-        <!-- https://checkstyle.org/config_whitespace.html#NoWhitespaceAfter -->
-        <module name="NoWhitespaceAfter">
-            <property name="allowLineBreaks" value="false"/>
-        </module>
-
-        <!-- https://checkstyle.org/config_whitespace.html#NoWhitespaceBefore -->
-        <module name="NoWhitespaceBefore">
-            <property name="allowLineBreaks" value="true"/>
-        </module>
-
-        <!-- https://checkstyle.org/config_coding.html#OneStatementPerLine -->
-        <module name="OneStatementPerLine"/>
-
-        <!-- https://checkstyle.org/config_misc.html#OuterTypeFilename -->
-        <module name="OuterTypeFilename"/>
-
-        <!-- https://checkstyle.org/config_imports.html#RedundantImport -->
-        <module name="RedundantImport"/>
-
-        <!-- https://checkstyle.org/config_modifier.html#RedundantModifier -->
-        <module name="RedundantModifier">
-            <property name="tokens"
-                      value="ANNOTATION_FIELD_DEF, CLASS_DEF, CTOR_DEF, ENUM_DEF, INTERFACE_DEF, VARIABLE_DEF"/> <!-- remove METHOD_DEF and RESOURCE -->
-        </module>
-
-        <!-- https://checkstyle.org/config_coding.html#RequireThis -->
-        <module name="RequireThis"/>
-
-        <!-- https://checkstyle.org/config_blocks.html#RightCurly -->
-        <module name="RightCurly">
-            <property name="id" value="RightCurlyAlone"/>
-            <property name="option" value="alone"/>
-            <property name="tokens"
-                      value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_DEF, INSTANCE_INIT, LITERAL_FOR, LITERAL_WHILE, METHOD_DEF, STATIC_INIT"/>
-        </module>
-        <module name="RightCurly">
-            <property name="id" value="RightCurlySame"/>
-            <property name="option" value="same"/>
-            <property name="tokens"
-                      value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF, LITERAL_TRY"/> <!-- add LITERAL_DO -->
-        </module>
-
-        <!-- https://checkstyle.org/config_whitespace.html#SingleSpaceSeparator -->
-        <module name="SingleSpaceSeparator">
-            <property name="validateComments" value="true"/>
-        </module>
-
-        <!-- https://checkstyle.org/config_whitespace.html#TypecastParenPad -->
-        <module name="TypecastParenPad"/>
-
-        <!-- https://checkstyle.org/config_coding.html#UnnecessaryParentheses -->
-        <module name="UnnecessaryParentheses"/>
-
-        <!-- https://checkstyle.org/config_imports.html#UnusedImports -->
-        <module name="UnusedImports"/>
-
-    </module>
-</module>
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suppressions PUBLIC "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "http://checkstyle.org/dtds/suppressions_1_2.dtd">
-<suppressions>
-    <suppress files=".*[\\/]test[\\/]java[\\/].*" checks="RequireExplicitVisibilityModifier"/>
-    <!-- TODO: don't suppress I-prefixed API interfaces under com.earth2me.essentials -->
-    <suppress files="(com[\\/]earth2me[\\/]essentials[\\/]|net[\\/]ess3[\\/]|net[\\/]essentialsx[\\/])(?:[^\\/]+$|(?!api)[^\\/]+[\\/])" checks="MissingJavadoc(Method|Type)"/>
-</suppressions>
@@ -0,0 +1,8 @@
+<?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>
@@ -1,13 +0,0 @@
-# Currently used
-patreon: EssentialsX
-ko_fi: essentialsx
-github: EssentialsX
-open_collective: EssentialsX
-
-# Currently not used
-#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-#liberapay: # Replace with a single Liberapay username
-#issuehunt: # Replace with a single IssueHunt username
-#otechie: # Replace with a single Otechie username
-#custom: # Replace with a single custom sponsorship URL
@@ -1,20 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: View common issues
-    url: https://github.com/EssentialsX/Essentials/issues/3956
-    about: Check the list of known common issues to see if it solves your problem.
-  - name: Check past help requests
-    url: https://github.com/EssentialsX/Essentials/discussions/categories/q-a
-    about: Visit the Q&A forum to search for previous help requests.
-  - name: Check past feature suggestions
-    url: https://github.com/EssentialsX/Essentials/discussions/categories/ideas-and-feature-suggestions
-    about: Visit the Feature Suggestions forum to view and discuss existing feature suggestions.
-  - name: Create help request
-    url: https://github.com/EssentialsX/Essentials/discussions/new?category=q-a
-    about: Create a support ticket to get help from developers.
-  - name: Suggest a feature
-    url: https://github.com/EssentialsX/Essentials/discussions/new?category=ideas-and-feature-suggestions
-    about: Suggest new features for EssentialsX!
-  - name: Get help from the community on Discord
-    url: https://discord.gg/casfFyh
-    about: Join the MOSS Discord for community-powered EssentialsX support!
@@ -1,79 +0,0 @@
-name: Report bug
-description: Report a bug in EssentialsX.
-labels: 'bug: unconfirmed'
-body:
- type: markdown
-  attributes:
-    value: |
-      Thanks for taking the time to report an EssentialsX bug! Fill out the form below to provide us with info to help fix the bug.
-      Only use this if you're 100% sure you've found a bug and can reproduce it. If you're looking for general help with EssentialsX, try the Q&A forum or MOSS Discord server.
- type: dropdown
-  attributes:
-    label: Type of bug
-    description: What type of bug is this? Choose all that apply.
-    multiple: true
-    options:
-      - Performance issue or memory leak
-      - Data loss
-      - Exploit
-      - Compatibility issue
-      - Error in console
-      - Other unexpected behaviour
-  validations:
-    required: true
-
- type: input
-  attributes:
-    label: "`/ess dump all` output"
-    description: Run `/ess dump all` in the console, then copy and paste the link from the output of the command into this box. (If this command doesn't work, you should [update EssentialsX](https://essentialsx.net/downloads.html) and try again.)
-  validations:
-    required: true
- type: input
-  attributes:
-    label: Error log (if applicable)
-    description: If you are reporting a console error, upload any relevant log excerpts to either https://paste.gg or https://gist.github.com, save and the paste the link in this box. If you included those files in the same paste as your startup log, paste the same link here.
-    placeholder: "Example: https://paste.gg/p/anonymous/109dd6a10a734a3aa430d5a351ea5210"
-
- type: textarea
-  attributes:
-    label: Bug description
-    description: Describe roughly what the bug is here.
-    placeholder: |
-      Example: "When running /nuke after putting everyone into adventure mode, there aren't any explosions..."
-  validations:
-    required: true
- type: textarea
-  attributes:
-    label: Steps to reproduce
-    description: Provide an example of how to trigger the bug.
-    placeholder: |
-      Example:
-      1. Have at least 3 people online
-      2. Run `/gma *` to put everyone into adventure mode
-      3. Run `/nuke`
-  validations:
-    required: true
- type: textarea
-  attributes:
-    label: Expected behaviour
-    description: Explain what you should expect to happen.
-    placeholder: |
-      Example: "Everything should explode!"
-  validations:
-    required: true
- type: textarea
-  attributes:
-    label: Actual behaviour
-    description: Explain what actually happens.
-    placeholder: |
-      Example: "Everything doesn't explode :("
-  validations:
-    required: true
-
- type: markdown
-  attributes:
-    value: |
-      In the text box below, you can attach any relevant screenshots, files and links to Timings/spark profiler reports.
-      You can also include a link to a heapdump if necessary, but please make sure you don't include any private player data in the heapdump.
-      If you suspect this issue is related to a prior issue/PR/commit, please mention it here.
-
@@ -1,94 +0,0 @@
-<!--
-
-EssentialsX bug fix submission guide
-====================================
-
-NOTE: Failure to fill out this template properly may result in your PR being
-      delayed or ignored without warning.
-
-NOTE: Don't type between any arrows in the template, as this text will be
-      hidden. This includes this header block and any other explanation text
-      blocks.
-
-Want to discuss your PR before submitting it? Join the EssentialsX Development
-server: https://discord.gg/CUN7qVb
-
-
-EssentialsX is GPL
------------------
-
-By contributing to EssentialsX, you agree to license your code under the
-GNU General Public License version 3, which can be found at the link below:
-https://github.com/EssentialsX/Essentials/blob/2.x/LICENSE
-
-
-Instructions
------------
-
-If you are submitting a bug fix, please follow the following steps:
-
-1.  Fill out the template in full.
-      This includes providing screenshots and a link to the original bug 
-      report. If there isn't an existing bug report, we recommend opening a new
-      detailed bug report BEFORE opening your PR to fix it, else your PR may be
-      delayed or rejected without warning.
-      
-      You can open a new bug report by following this link:
-      https://github.com/EssentialsX/Essentials/issues/new/choose 
-
-2.  When linking logs or config files, do not attach them to the post!
-      Copy and paste any logs into https://gist.github.com/, then paste a
-      link to them in the relevant parts of the template. Do not use Hastebin
-      or Pastebin, as this can cause issues with future reviews.
-      
-      DO NOT drag logs directly into this text box, as we cannot read these!
-
-3.  If you are fixing a performance issue, please include a link to a
-    Timings and/or profiler report, both before and after your PR.
-
-4.  If you are fixing a visual bug, such as in commands, please include
-    screenshots so that we can more easily review the proposed fix.
-    (You can drag screenshots into the bottom of the editor.)
-
-->
-
-### Information
-
-<!--
-    Replace #nnnn with the number of the original issue. If this PR fixes
-    multiple issues, you should repeat the phrase "fixes #nnnn" for each issue. 
-->
-
-This PR fixes #nnnn. 
-
-### Details
-
-**Proposed fix:**    
-<!-- Type a description of your proposed fix below this line. -->
-
-
-**Environments tested:**    
-
-<!-- Type the OS you have used below. -->
-OS: 
-
-<!-- Type the JDK version (from java -version) you have used below. -->
-Java version:  
-
-<!--
-    Put an "x" inside the boxes for the server software you have tested this 
-    bug fix on. If this feature does not apply to a server, strike through the server software using ~~strikethrough~~. If you have tested on other
-    environments, add a new line with relevant details.
-->
- [ ] Most recent Paper version (1.XX.Y, git-Paper-BUILD)
- [ ] CraftBukkit/Spigot/Paper 1.12.2
- [ ] CraftBukkit 1.8.8
-
-
-**Demonstration:**    
-<!--
-    Below this block, include screenshots/log snippets from before and after as
-    necessary. If you have created or used a test case plugin, please link to a
-    download of the plugin, source code and exact version used where possible.
-->
-
@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: MOSS Discord Server
-    url: https://discord.gg/casfFyh
-    about: Need help with using EssentialsX? Join the MOSS Discord server for help.
-  - name: EssentialsX Development Discord Server
-    url: https://discord.gg/CUN7qVb
-    about: Got questions or want to discuss changes before opening your PR? Join the EssentialsX Development Discord server. (Need help? Join MOSS instead.)
@@ -1,93 +0,0 @@
-<!--
-
-EssentialsX feature submission guide
-====================================
-
-NOTE: Failure to fill out this template properly may result in your PR being
-      delayed or ignored without warning.
-
-NOTE: Don't type between any arrows in the template, as this text will be
-      hidden. This includes this header block and any other explanation text
-      blocks.
-
-Want to discuss your PR before submitting it? Join the EssentialsX Development
-server: https://discord.gg/CUN7qVb
-
-
-EssentialsX is GPL
------------------
-
-By contributing to EssentialsX, you agree to license your code under the
-GNU General Public License version 3, which can be found at the link below:
-https://github.com/EssentialsX/Essentials/blob/2.x/LICENSE
-
-
-Instructions
------------
-
-If you are submitting a new feature, please follow the following steps:
-
-1.  Fill out the template in full.
-      This includes providing screenshots and a link to the original feature 
-      request. If there isn't an existing feature request, we strongly
-      recommend opening a new feature request BEFORE opening your PR to
-      implement it, as this allows us to review whether we're likely to accept
-      your feature in advance, and also allows us to discuss possible
-      implementations for the feature. If there is no associated feature
-      request, your PR may be delayed or rejected without warning.
-      
-      You can open a new feature request by following this link:
-      https://github.com/EssentialsX/Essentials/issues/new/choose
-
-2.  If you are fixing a performance issue, please use the "Bug fix" PR template
-      instead. The "bug fix" template is better suited to performance issues.
-
-3.  Include a demonstration.
-      If you are adding commands, please provide screenshots and/or a video
-      demonstration of the feature. Similarly, if you are adding a new API,
-      please include a link to example code that takes advantage of your
-      proposed API. This will aid us in reviewing PRs and speed up the process
-      significantly.
-
-->
-
-### Information
-
-<!--
-    Replace #nnnn with the number of the original issue. If this PR implements
-    features from multiple issues, you should repeat the phrase "closes #nnnn"
-    for each issue. 
-->
-
-This PR closes #nnnn. 
-
-### Details
-
-**Proposed feature:**  
-<!-- Type a description of your proposed feature below this line. -->
-
-
-**Environments tested:**    
-
-<!-- Type the OS you have used below. -->
-OS: 
-
-<!-- Type the JDK version (from java -version) you have used below. -->
-Java version:  
-
-<!--
-    Put an "x" inside the boxes for the server software you have tested this 
-    bug fix on. If this feature does not apply to a server, strike through the server software using ~~strikethrough~~. If you have tested on other
-    environments, add a new line with relevant details.
-->
- [ ] Most recent Paper version (1.XX.Y, git-Paper-BUILD)
- [ ] CraftBukkit/Spigot/Paper 1.12.2
- [ ] CraftBukkit 1.8.8
-
-
-**Demonstration:**  
-<!--
-    Below this block, include screenshots/log snippets from before and after as
-    necessary. If you have created or used a test case plugin, please link to a
-    download of the plugin, source code and exact version used where possible.
-->
@@ -1,10 +0,0 @@
-You need to select a pull request template!
-
-If you're adding a new feature, copy and paste the following parameter at the end of the URL:
-    ?template=new-feature.md
-
-If you're fixing a bug, copy and paste the following parameter at the end of the URL:
-    ?template=bug-fix.md
-
-For more information about contributing to EssentialsX, see CONTRIBUTING.md:
-    https://github.com/EssentialsX/Essentials/blob/2.x/CONTRIBUTING.md
@@ -1,75 +0,0 @@
-name: Build EssentialsX
-
-on:
-  push:
-    branches:
-    - 2.x
-    - dev/*
-
-jobs:
-  build:
-    name: Build and upload
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout Git repo
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Restore Gradle cache
-      uses: actions/cache@v2
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-
-
-    - name: Set up JDK 16
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'adopt'
-        java-version: 16
-
-    - name: Validate Gradle Wrapper
-      uses: gradle/wrapper-validation-action@v1
-
-    - name: Build with Gradle
-      run: |
-        chmod +x gradlew
-        ./gradlew build --stacktrace
-
-    - name: Archive plugin jars on GitHub
-      uses: actions/upload-artifact@master
-      with:
-        name: EssentialsX plugin jars
-        path: jars/
-
-    - name: Deploy to Maven repo
-      if: ${{ success() && github.event_name == 'push' && github.repository == 'EssentialsX/Essentials' && github.ref == 'refs/heads/2.x' }}
-      env:
-        ORG_GRADLE_PROJECT_essxUsername: ${{ secrets.ESSENTIALSX_DEPLOY_USERNAME }}
-        ORG_GRADLE_PROJECT_essxPassword: ${{ secrets.ESSENTIALSX_DEPLOY_PASSWORD }}
-      run: |
-        ./gradlew publish
-
-    - name: Prepare Javadocs
-      if: ${{ success() && github.event_name == 'push' && github.repository == 'EssentialsX/Essentials' && github.ref == 'refs/heads/2.x' }}
-      run: |
-        mv Essentials/build/docs/javadoc/ javadocs/
-        cp -r EssentialsAntiBuild/build/docs/javadoc/ javadocs/EssentialsAntiBuild/
-        cp -r EssentialsChat/build/docs/javadoc/ javadocs/EssentialsChat/
-        cp -r EssentialsDiscord/build/docs/javadoc/ javadocs/EssentialsDiscord/
-        cp -r EssentialsGeoIP/build/docs/javadoc/ javadocs/EssentialsGeoIP/
-        cp -r EssentialsProtect/build/docs/javadoc/ javadocs/EssentialsProtect/
-        cp -r EssentialsSpawn/build/docs/javadoc/ javadocs/EssentialsSpawn/
-        cp -r EssentialsXMPP/build/docs/javadoc/ javadocs/EssentialsXMPP/
-
-    - name: Deploy Javadocs
-      if: ${{ success() && github.event_name == 'push' && github.repository == 'EssentialsX/Essentials' && github.ref == 'refs/heads/2.x' }}
-      uses: netlify/actions/cli@master
-      with:
-        args: deploy --dir=javadocs/ --prod --message="GitHubActionsDeploy"
-      env:
-        NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_JD_AUTH_TOKEN }}
-        NETLIFY_SITE_ID: ${{ secrets.NETLIFY_JD_2X_SITE_ID }}
@@ -1,51 +0,0 @@
-name: Build Pull Request
-
-on:
-  push:
-    branches:
-    - mc/* # MC version updates
-    - pr/* # PR rebases
-  pull_request:
-    branches:
-    - 2.x
-    - mc/*
-    - dev/*
-
-jobs:
-  build:
-    name: Build and upload
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout Git repo
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Restore Gradle cache
-      uses: actions/cache@v2
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-
-
-    - name: Set up JDK 16
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'adopt'
-        java-version: 16
-
-    - name: Validate Gradle Wrapper
-      uses: gradle/wrapper-validation-action@v1
-
-    - name: Build with Gradle
-      run: |
-        chmod +x gradlew
-        ./gradlew build --stacktrace
-
-    - name: Archive plugin jars on GitHub
-      uses: actions/upload-artifact@master
-      with:
-        name: EssentialsX plugin jars
-        path: jars/
@@ -1,28 +1,47 @@
-# Other IDE files
-*.classpath
-*.project
-*.settings/
-.idea/*
-*.iml
 .DS_Store
-
-# Checkstyle-IDEA config
-!.idea/checkstyle-idea.xml
-
-# Essentials files
-/Essentials/userdata
-/Essentials/config.yml
-/Essentials/kits.yml
-/Essentials/userdata/testplayer1.yml
-/Essentials/usermap.csv
-
-# Build files
-.gradle/
-/jars/
-out/
-build/
-target/
-*.class
-
-# Run directory
-/run/
+/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
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CheckStyle-IDEA">
-    <option name="configuration">
-      <map>
-        <entry key="active-configuration" value="PROJECT_RELATIVE:$PROJECT_DIR$/.checkstyle/checkstyle.xml:EssentialsX" />
-        <entry key="checkstyle-version" value="8.36.2" />
-        <entry key="copy-libs" value="true" />
-        <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
-        <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
-        <entry key="location-2" value="PROJECT_RELATIVE:$PROJECT_DIR$/.checkstyle/checkstyle.xml:EssentialsX" />
-        <entry key="property-2.configDirectory" value=".checkstyle/" />
-        <entry key="scan-before-checkin" value="true" />
-        <entry key="scanscope" value="JavaOnly" />
-        <entry key="suppress-errors" value="false" />
-      </map>
-    </option>
-  </component>
-</project>
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Essentials</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="BuildAll" default="default" basedir=".">
+    <description>Builds, tests, and runs the project BuildAll.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="BuildAll-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>
@@ -0,0 +1,8 @@
+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
@@ -0,0 +1,129 @@
+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
@@ -0,0 +1,84 @@
+<?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>
@@ -1,31 +0,0 @@
-Contributing to EssentialsX
-===========================
-
-Want to help improve EssentialsX? There are several ways you can support and contribute to the project.
-
-If you'd like to make a financial contribution to the project, you can join our [Patreon](https://www.patreon.com/essentialsx/),
-or to make a one-off donation you can visit our [Ko-fi page](https://ko-fi.com/essentialsx). If you can't make a
-donation, don't worry! There are lots of other ways to contribute:
-
-* Do you run a server? Take a look at our ["help wanted"](https://github.com/EssentialsX/Essentials/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22help+wanted%22)
-  and ["bug: unconfirmed"](https://github.com/EssentialsX/Essentials/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22bug%3A+unconfirmed%22)
-  issues, where you can find issues that need extra testing and investigation.
-* Do you speak multiple languages? If so, we always welcome contributions to our [Crowdin project](https://crowdin.com/project/essentialsx-official).
-* Do you enjoy helping others? If so, why not contribute to the [EssentialsX documentation](https://github.com/EssentialsX/wiki)?
-  You can also join the [MOSS Discord community](https://discord.gg/casfFyh) and provide direct community support to
-  other EssentialsX users.
-* If you're a developer, you could look through our ["open to PR"](https://github.com/EssentialsX/Essentials/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22status%3A+open+to+PR%22)
-  issues. We're always happy to receive bug fixes and feature additions as pull requests.
-
-Submitting a PR
---------------
-
-EssentialsX has extensive templates for PRs that detail how to submit your PR. To find out more, see the PR templates for:
-* [Bug fixes](https://github.com/EssentialsX/Essentials/blob/2.x/.github/PULL_REQUEST_TEMPLATE/bug-fix.md) 
-* [New features](https://github.com/EssentialsX/Essentials/blob/2.x/.github/PULL_REQUEST_TEMPLATE/new-feature.md)
-
-Want to discuss a feature before opening a PR? Join the [EssentialsX Development Discord server](https://discord.gg/CUN7qVb). Note that this server is **not for end-users** - if you need support with EssentialsX, you should join [MOSS](https://discord.gg/casfFyh) instead.
-
-By contributing to EssentialsX, you agree to license your code under the [GNU General Public License version 3](https://github.com/EssentialsX/Essentials/blob/2.x/LICENSE).
-
-
@@ -1,58 +0,0 @@
-plugins {
-    id("essentials.shadow-module")
-}
-
-dependencies {
-    compileOnly('com.github.milkbowl:VaultAPI:1.7') {
-        exclude group: "org.bukkit", module: "bukkit"
-    }
-    compileOnly 'net.luckperms:api:5.0'
-
-    api 'io.papermc:paperlib:1.0.6'
-
-    api 'org.bstats:bstats-bukkit:2.2.1'
-
-    implementation 'org.spongepowered:configurate-yaml:4.1.2'
-    implementation 'org.checkerframework:checker-qual:3.14.0'
-
-    // Providers
-    api project(':providers:BaseProviders')
-    api project(':providers:PaperProvider')
-    api(project(':providers:NMSReflectionProvider')) {
-        exclude group: "org.bukkit", module: "bukkit"
-    }
-    api(project(':providers:1_8Provider')) {
-        exclude group: "org.spigotmc", module: "spigot"
-    }
-    api(project(':providers:1_12Provider')) {
-        exclude group: "org.bukkit", module: "bukkit"
-    }
-}
-
-shadowJar {
-    dependencies {
-        include (dependency('io.papermc:paperlib'))
-        include (dependency('org.bstats:bstats-bukkit'))
-        include (dependency('org.bstats:bstats-base'))
-        include (dependency('org.spongepowered:configurate-yaml'))
-        include (dependency('org.spongepowered:configurate-core'))
-        include (dependency('org.yaml:snakeyaml'))
-        include (dependency('io.leangen.geantyref:geantyref'))
-        include (dependency('org.checkerframework:checker-qual'))
-        include (project(':providers:BaseProviders'))
-        include (project(':providers:PaperProvider'))
-        include (project(':providers:NMSReflectionProvider'))
-        include (project(':providers:1_8Provider'))
-        include (project(':providers:1_12Provider'))
-    }
-    relocate 'io.papermc.lib', 'com.earth2me.essentials.paperlib'
-    relocate 'org.bstats', 'com.earth2me.essentials.libs.bstats'
-    relocate 'org.spongepowered.configurate', 'com.earth2me.essentials.libs.configurate'
-    relocate 'org.yaml.snakeyaml', 'com.earth2me.essentials.libs.snakeyaml'
-    relocate 'io.leangen.geantyref', 'com.earth2me.essentials.libs.geantyref'
-    relocate 'org.checkerframework', 'com.earth2me.essentials.libs.checkerframework'
-
-    minimize {
-        include(dependency('org.checkerframework:checker-qual'))
-    }
-}
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="Essentials" default="default" basedir=".">
+
+    <description>Builds, tests, and runs the project Essentials.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="Essentials-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+	<!--target name="-post-jar">
+	    <jar jarfile="${dist.dir}/Essentials.jar">
+	      <zipfileset src="${dist.jar}" excludes="META-INF/*" />
+	      <zipfileset src="${dist.dir}/lib/Register.jar" excludes="META-INF/*" />
+	      <manifest>
+	        <attribute name="Classpath" value="Essentials.jar"/>
+	      </manifest>
+	    </jar>
+	  </target-->
+</project>
@@ -0,0 +1,11 @@
+build.xml.data.CRC32=7d758acf
+build.xml.script.CRC32=3233ee78
+build.xml.stylesheet.CRC32=28e38971@1.38.2.45
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=a830bc14
+nbproject/build-impl.xml.script.CRC32=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
@@ -0,0 +1,3 @@
+DoNotUseThreads
+LongVariable
+SignatureDeclareThrowsException
@@ -0,0 +1,154 @@
+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
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>Essentials</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
+            <definitions>../lib/nblibraries.properties</definitions>
+        </libraries>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>EssentialsGroupManager</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+        </references>
+    </configuration>
+</project>
@@ -0,0 +1,153 @@
+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"));
+		}
+	}
+}
@@ -0,0 +1,33 @@
+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;
+	}
+}
@@ -0,0 +1,295 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+
+/**
+ * This utility class is used for converting between the ingame
+ * time in ticks to ingame time as a friendly string.
+ * Note that the time is INGAME.
+ * 
+ * http://www.minecraftwiki.net/wiki/Day/night_cycle
+ * 
+ * @author Olof Larsson
+ */
+public final class DescParseTickFormat
+{
+	public static final Map<String, Integer> nameToTicks = new LinkedHashMap<String, Integer>();
+	public static final Set<String> resetAliases = new HashSet<String>();
+	public static final int ticksAtMidnight = 18000;
+	public static final int ticksPerDay = 24000;
+	public static final int ticksPerHour = 1000;
+	public static final double ticksPerMinute = 1000d / 60d;
+	public static final double ticksPerSecond = 1000d / 60d / 60d;
+	private static final SimpleDateFormat SDFTwentyFour = new SimpleDateFormat("HH:mm", Locale.ENGLISH);
+	private static final SimpleDateFormat SDFTwelve = new SimpleDateFormat("h:mmaa", Locale.ENGLISH);
+
+	static
+	{
+		SDFTwentyFour.setTimeZone(TimeZone.getTimeZone("GMT"));
+		SDFTwelve.setTimeZone(TimeZone.getTimeZone("GMT"));
+
+		nameToTicks.put("sunrise", 23000);
+		nameToTicks.put("dawn", 23000);
+
+		nameToTicks.put("daystart", 0);
+		nameToTicks.put("day", 0);
+
+		nameToTicks.put("morning", 1000);
+
+		nameToTicks.put("midday", 6000);
+		nameToTicks.put("noon", 6000);
+
+		nameToTicks.put("afternoon", 9000);
+
+		nameToTicks.put("sunset", 12000);
+		nameToTicks.put("dusk", 12000);
+		nameToTicks.put("sundown", 12000);
+		nameToTicks.put("nightfall", 12000);
+
+		nameToTicks.put("nightstart", 14000);
+		nameToTicks.put("night", 14000);
+
+		nameToTicks.put("midnight", 18000);
+
+		resetAliases.add("reset");
+		resetAliases.add("normal");
+		resetAliases.add("default");
+	}
+
+	private DescParseTickFormat()
+	{
+	}
+
+	// ============================================
+	// PARSE. From describing String to int
+	// --------------------------------------------
+	public static long parse(String desc) throws NumberFormatException
+	{
+		// Only look at alphanumeric and lowercase and : for 24:00
+		desc = desc.toLowerCase(Locale.ENGLISH).replaceAll("[^A-Za-z0-9:]", "");
+
+		// Detect ticks format
+		try
+		{
+			return parseTicks(desc);
+		}
+		catch (Exception e)
+		{
+		}
+
+		// Detect 24-hour format
+		try
+		{
+			return parse24(desc);
+		}
+		catch (Exception e)
+		{
+		}
+
+		// Detect 12-hour format
+		try
+		{
+			return parse12(desc);
+		}
+		catch (Exception e)
+		{
+		}
+
+		// Detect aliases
+		try
+		{
+			return parseAlias(desc);
+		}
+		catch (Exception e)
+		{
+		}
+
+		// Well we failed to understand...
+		throw new NumberFormatException();
+	}
+
+	public static long parseTicks(String desc) throws NumberFormatException
+	{
+		if (!desc.matches("^[0-9]+ti?c?k?s?$"))
+		{
+			throw new NumberFormatException();
+		}
+
+		desc = desc.replaceAll("[^0-9]", "");
+
+		return Long.parseLong(desc) % 24000;
+	}
+
+	public static long parse24(String desc) throws NumberFormatException
+	{
+		if (!desc.matches("^[0-9]{2}[^0-9]?[0-9]{2}$"))
+		{
+			throw new NumberFormatException();
+		}
+
+		desc = desc.toLowerCase(Locale.ENGLISH).replaceAll("[^0-9]", "");
+
+		if (desc.length() != 4)
+		{
+			throw new NumberFormatException();
+		}
+
+		final int hours = Integer.parseInt(desc.substring(0, 2));
+		final int minutes = Integer.parseInt(desc.substring(2, 4));
+
+		return hoursMinutesToTicks(hours, minutes);
+	}
+
+	public static long parse12(String desc) throws NumberFormatException
+	{
+		if (!desc.matches("^[0-9]{1,2}([^0-9]?[0-9]{2})?(pm|am)$"))
+		{
+			throw new NumberFormatException();
+		}
+
+		int hours = 0;
+		int minutes = 0;
+
+		desc = desc.toLowerCase(Locale.ENGLISH).replaceAll("[^0-9]", "");
+
+		if (desc.length() > 4)
+		{
+			throw new NumberFormatException();
+		}
+
+		if (desc.length() == 4)
+		{
+			hours += Integer.parseInt(desc.substring(0, 2));
+			minutes += Integer.parseInt(desc.substring(2, 4));
+		}
+		else if (desc.length() == 3)
+		{
+			hours += Integer.parseInt(desc.substring(0, 1));
+			minutes += Integer.parseInt(desc.substring(1, 3));
+		}
+		else if (desc.length() == 2)
+		{
+			hours += Integer.parseInt(desc.substring(0, 2));
+		}
+		else if (desc.length() == 1)
+		{
+			hours += Integer.parseInt(desc.substring(0, 1));
+		}
+		else
+		{
+			throw new NumberFormatException();
+		}
+
+		if (desc.endsWith("pm") && hours != 12)
+		{
+			hours += 12;
+		}
+
+		if (desc.endsWith("am") && hours == 12)
+		{
+			hours -= 12;
+		}
+
+		return hoursMinutesToTicks(hours, minutes);
+	}
+
+	public static long hoursMinutesToTicks(final int hours, final int minutes)
+	{
+		long ret = ticksAtMidnight;
+		ret += (hours) * ticksPerHour;
+
+		ret += (minutes / 60.0) * ticksPerHour;
+
+		ret %= ticksPerDay;
+		return ret;
+	}
+
+	public static long parseAlias(final String desc) throws NumberFormatException
+	{
+		final Integer ret = nameToTicks.get(desc);
+		if (ret == null)
+		{
+			throw new NumberFormatException();
+		}
+
+		return ret;
+	}
+
+	public static boolean meansReset(final String desc)
+	{
+		return resetAliases.contains(desc);
+	}
+
+	// ============================================
+	// FORMAT. From int to describing String
+	// --------------------------------------------
+	public static String format(final long ticks)
+	{
+		return _("timeFormat", format24(ticks), format12(ticks), formatTicks(ticks));
+	}
+
+	public static String formatTicks(final long ticks)
+	{
+		return (ticks % ticksPerDay) + "ticks";
+	}
+
+	public static String format24(final long ticks)
+	{
+		synchronized (SDFTwentyFour)
+		{
+			return formatDateFormat(ticks, SDFTwentyFour);
+		}
+	}
+
+	public static String format12(final long ticks)
+	{
+		synchronized (SDFTwelve)
+		{
+			return formatDateFormat(ticks, SDFTwelve);
+		}
+	}
+
+	public static String formatDateFormat(final long ticks, final SimpleDateFormat format)
+	{
+		final Date date = ticksToDate(ticks);
+		return format.format(date);
+	}
+
+	public static Date ticksToDate(long ticks)
+	{
+		// Assume the server time starts at 0. It would start on a day.
+		// But we will simulate that the server started with 0 at midnight.
+		ticks = ticks - ticksAtMidnight + ticksPerDay;
+
+		// How many ingame days have passed since the server start?
+		final long days = ticks / ticksPerDay;
+		ticks = ticks - days * ticksPerDay;
+
+		// How many hours on the last day?
+		final long hours = ticks / ticksPerHour;
+		ticks = ticks - hours * ticksPerHour;
+
+		// How many minutes on the last day?
+		final long minutes = (long)Math.floor(ticks / ticksPerMinute);
+		final double dticks = ticks - minutes * ticksPerMinute;
+
+		// How many seconds on the last day?
+		final long seconds = (long)Math.floor(dticks / ticksPerSecond);
+
+		// Now we create an english GMT calendar (We wan't no daylight savings)
+		final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"), Locale.ENGLISH);
+		cal.setLenient(true);
+
+		// And we set the time to 0! And append the time that passed!
+		cal.set(0, Calendar.JANUARY, 1, 0, 0, 0);
+		cal.add(Calendar.DAY_OF_YEAR, (int)days);
+		cal.add(Calendar.HOUR_OF_DAY, (int)hours);
+		cal.add(Calendar.MINUTE, (int)minutes);
+		cal.add(Calendar.SECOND, (int)seconds + 1); // To solve rounding errors.
+
+		return cal.getTime();
+	}
+}
@@ -0,0 +1,207 @@
+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();
+		}
+	}
+}
@@ -0,0 +1,88 @@
+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();
+	}
+}
@@ -0,0 +1,436 @@
+/*
+ * 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;
+	}
+}
@@ -0,0 +1,316 @@
+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;
+	}
+}
@@ -0,0 +1,82 @@
+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);
+		}
+	}
+}
@@ -0,0 +1,89 @@
+package com.earth2me.essentials;
+
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+
+public class ExecuteTimer
+{
+	private final transient List<ExecuteRecord> times;
+	private final transient DecimalFormat decimalFormat = new DecimalFormat("#0.000", DecimalFormatSymbols.getInstance(Locale.US));
+
+
+	public ExecuteTimer()
+	{
+		times = new ArrayList<ExecuteRecord>();
+	}
+
+	public void start()
+	{
+		times.clear();
+		mark("start");
+
+	}
+
+	public void mark(final String label)
+	{
+		if (!times.isEmpty() || "start".equals(label))
+		{
+			times.add(new ExecuteRecord(label, System.nanoTime()));
+		}
+	}
+
+	public String end()
+	{
+		final StringBuilder output = new StringBuilder();
+		output.append("execution time: ");
+		String mark;
+		long time0 = 0;
+		long time1 = 0;
+		long time2 = 0;
+		double duration;
+
+		for (ExecuteRecord pair : times)
+		{
+			mark = (String)pair.getMark();
+			time2 = (Long)pair.getTime();
+			if (time1 > 0)
+			{
+				duration = (time2 - time1)/1000000.0;
+				output.append(mark).append(": ").append(decimalFormat.format(duration)).append("ms - ");
+			}
+			else
+			{
+				time0 = time2;
+			}
+			time1 = time2;
+		}
+		duration = (time1 - time0)/1000000.0;
+		output.append("Total: ").append(decimalFormat.format(duration)).append("ms");
+		times.clear();
+		return output.toString();
+	}
+
+
+	static private class ExecuteRecord
+	{
+		private final String mark;
+		private final long time;
+
+		public ExecuteRecord(final String mark, final long time)
+		{
+			this.mark = mark;
+			this.time = time;
+		}
+
+		public String getMark()
+		{
+			return mark;
+		}
+
+		public long getTime()
+		{
+			return time;
+		}
+	}
+}
@@ -0,0 +1,177 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.api.IEssentials;
+import com.earth2me.essentials.api.II18n;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.MessageFormat;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
+public class I18n implements II18n
+{
+	private static I18n instance;
+	private static final String MESSAGES = "messages";
+	private final transient Locale defaultLocale = Locale.getDefault();
+	private transient Locale currentLocale = defaultLocale;
+	private transient ResourceBundle customBundle;
+	private transient ResourceBundle localeBundle;
+	private final transient ResourceBundle defaultBundle;
+	private final transient Map<String, MessageFormat> messageFormatCache = new HashMap<String, MessageFormat>();
+	private final transient IEssentials ess;
+
+	public I18n(final IEssentials ess)
+	{
+		this.ess = ess;
+		customBundle = ResourceBundle.getBundle(MESSAGES, defaultLocale, new FileResClassLoader(I18n.class.getClassLoader(), ess));
+		localeBundle = ResourceBundle.getBundle(MESSAGES, defaultLocale);
+		defaultBundle = ResourceBundle.getBundle(MESSAGES, Locale.ENGLISH);
+	}
+
+	public void onEnable()
+	{
+		instance = this;
+	}
+
+	public void onDisable()
+	{
+		instance = null;
+	}
+
+	@Override
+	public Locale getCurrentLocale()
+	{
+		return currentLocale;
+	}
+
+	public String translate(final String string)
+	{
+		try
+		{
+			try
+			{
+				return customBundle.getString(string);
+			}
+			catch (MissingResourceException ex)
+			{
+				return localeBundle.getString(string);
+			}
+		}
+		catch (MissingResourceException ex)
+		{
+			Logger.getLogger("Minecraft").log(Level.WARNING, String.format("Missing translation key \"%s\" in translation file %s", ex.getKey(), localeBundle.getLocale().toString()), ex);
+			return defaultBundle.getString(string);
+		}
+	}
+
+	public static String _(final String string, final Object... objects)
+	{
+		if (instance == null) {
+			return "";
+		}
+		if (objects.length == 0)
+		{
+			return instance.translate(string);
+		}
+		else
+		{
+			return instance.format(string, objects);
+		}
+	}
+
+	public String format(final String string, final Object... objects)
+	{
+		final String format = translate(string);
+		MessageFormat messageFormat = messageFormatCache.get(format);
+		if (messageFormat == null)
+		{
+			messageFormat = new MessageFormat(format);
+			messageFormatCache.put(format, messageFormat);
+		}
+		return messageFormat.format(objects);
+	}
+
+	public void updateLocale(final String loc)
+	{
+		if (loc == null || loc.isEmpty())
+		{
+			return;
+		}
+		final String[] parts = loc.split("[_\\.]");
+		if (parts.length == 1)
+		{
+			currentLocale = new Locale(parts[0]);
+		}
+		if (parts.length == 2)
+		{
+			currentLocale = new Locale(parts[0], parts[1]);
+		}
+		if (parts.length == 3)
+		{
+			currentLocale = new Locale(parts[0], parts[1], parts[2]);
+		}
+		Logger.getLogger("Minecraft").log(Level.INFO, String.format("Using locale %s", currentLocale.toString()));
+		customBundle = ResourceBundle.getBundle(MESSAGES, currentLocale, new FileResClassLoader(I18n.class.getClassLoader(), ess));
+		localeBundle = ResourceBundle.getBundle(MESSAGES, currentLocale);
+	}
+
+	public static String capitalCase(final String input)
+	{
+		return input == null || input.length() == 0
+			   ? input
+			   : input.toUpperCase(Locale.ENGLISH).charAt(0)
+				 + input.toLowerCase(Locale.ENGLISH).substring(1);
+	}
+
+
+	private static class FileResClassLoader extends ClassLoader
+	{
+		private final transient File dataFolder;
+
+		public FileResClassLoader(final ClassLoader classLoader, final IEssentials ess)
+		{
+			super(classLoader);
+			this.dataFolder = ess.getDataFolder();
+		}
+
+		@Override
+		public URL getResource(final String string)
+		{
+			final File file = new File(dataFolder, string);
+			if (file.exists())
+			{
+				try
+				{
+					return file.toURI().toURL();
+				}
+				catch (MalformedURLException ex)
+				{
+				}
+			}
+			return super.getResource(string);
+		}
+
+		@Override
+		public InputStream getResourceAsStream(final String string)
+		{
+			final File file = new File(dataFolder, string);
+			if (file.exists())
+			{
+				try
+				{
+					return new FileInputStream(file);
+				}
+				catch (FileNotFoundException ex)
+				{
+				}
+			}
+			return super.getResourceAsStream(string);
+		}
+	}
+}
@@ -0,0 +1,153 @@
+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;
+	}
+}
@@ -0,0 +1,301 @@
+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"));
+		}
+	}
+}
@@ -0,0 +1,90 @@
+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();
+	}
+}
@@ -0,0 +1,117 @@
+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;
+	}
+}
@@ -0,0 +1,302 @@
+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);
+	}
+}
@@ -0,0 +1,337 @@
+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;
+		}
+	}
+}
@@ -0,0 +1,649 @@
+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");
+	}
+}
@@ -0,0 +1,152 @@
+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;
+		}
+	}
+}
@@ -0,0 +1,86 @@
+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");
+	}
+}
@@ -0,0 +1,15 @@
+package com.earth2me.essentials.api;
+
+
+public class ChargeException extends Exception
+{
+	public ChargeException(final String message)
+	{
+		super(message);
+	}
+
+	public ChargeException(final String message, final Throwable throwable)
+	{
+		super(message, throwable);
+	}
+}
@@ -0,0 +1,7 @@
+package com.earth2me.essentials.api;
+
+
+public interface IBackup extends Runnable
+{
+	public void startTask();
+}
@@ -0,0 +1,20 @@
+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);
+}
@@ -0,0 +1,21 @@
+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;
+}
@@ -0,0 +1,64 @@
+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();
+}
@@ -0,0 +1,6 @@
+package com.earth2me.essentials.api;
+
+
+public interface IEssentialsModule
+{
+}
@@ -0,0 +1,25 @@
+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);
+}
@@ -0,0 +1,9 @@
+package com.earth2me.essentials.api;
+
+import java.util.Locale;
+
+
+public interface II18n
+{
+	Locale getCurrentLocale();
+}
@@ -0,0 +1,13 @@
+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;
+}
@@ -0,0 +1,18 @@
+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;
+}
@@ -0,0 +1,18 @@
+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();
+}
@@ -0,0 +1,17 @@
+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();
+}
@@ -0,0 +1,7 @@
+package com.earth2me.essentials.api;
+
+
+public interface IReload
+{
+	void onReload();
+}
@@ -0,0 +1,11 @@
+package com.earth2me.essentials.api;
+
+import org.bukkit.command.CommandSender;
+
+
+public interface IReplyTo
+{
+	void setReplyTo(CommandSender user);
+
+	CommandSender getReplyTo();
+}
@@ -0,0 +1,14 @@
+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);
+}
@@ -0,0 +1,28 @@
+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;
+}
@@ -0,0 +1,104 @@
+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();
+}
@@ -0,0 +1,23 @@
+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;
+}
@@ -0,0 +1,9 @@
+package com.earth2me.essentials.api;
+
+import com.earth2me.essentials.settings.Warp;
+import com.earth2me.essentials.storage.IStorageObjectHolder;
+
+
+public interface IWarp extends IStorageObjectHolder<Warp>
+{
+}
@@ -0,0 +1,21 @@
+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;
+}
@@ -0,0 +1,11 @@
+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);
+}
@@ -0,0 +1,10 @@
+package com.earth2me.essentials.api;
+
+
+public class InvalidNameException extends Exception
+{
+	public InvalidNameException(Throwable thrwbl)
+	{
+		super(thrwbl);
+	}
+}
@@ -0,0 +1,12 @@
+package com.earth2me.essentials.api;
+
+import static com.earth2me.essentials.I18n._;
+
+
+public class NoLoanPermittedException extends Exception
+{
+	public NoLoanPermittedException()
+	{
+		super(_("negativeBalanceError"));
+	}
+}
@@ -0,0 +1,12 @@
+package com.earth2me.essentials.api;
+
+import static com.earth2me.essentials.I18n._;
+
+
+public class UserDoesNotExistException extends Exception
+{
+	public UserDoesNotExistException(String name)
+	{
+		super(_("userDoesNotExist", name));
+	}
+}
@@ -0,0 +1,55 @@
+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;
+	}
+}
@@ -0,0 +1,20 @@
+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);
+	}
+}
@@ -0,0 +1,19 @@
+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();
+	}
+}
@@ -0,0 +1,17 @@
+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"));
+	}
+}
@@ -0,0 +1,31 @@
+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)));
+	}
+}
@@ -0,0 +1,173 @@
+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));
+		}
+	}
+}
@@ -0,0 +1,66 @@
+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));
+			}
+		}
+	}
+}
@@ -0,0 +1,39 @@
+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"));
+		}
+	}
+}
@@ -0,0 +1,41 @@
+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"));
+		}
+	}
+}
@@ -0,0 +1,40 @@
+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);
+		}
+	}
+}
@@ -0,0 +1,19 @@
+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)));
+	}
+}
@@ -0,0 +1,24 @@
+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])));
+		}
+	}
+}
@@ -0,0 +1,93 @@
+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"));
+			}
+		}
+	}
+}
@@ -0,0 +1,52 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.IUser;
+
+
+public class Commandcompass extends EssentialsCommand
+{
+	@Override
+	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
+	{
+		final int bearing = (int)(user.getLocation().getYaw() + 180 + 360) % 360;
+		String dir;
+		if (bearing < 23)
+		{
+			dir = "N";
+		}
+		else if (bearing < 68)
+		{
+			dir = "NE";
+		}
+		else if (bearing < 113)
+		{
+			dir = "E";
+		}
+		else if (bearing < 158)
+		{
+			dir = "SE";
+		}
+		else if (bearing < 203)
+		{
+			dir = "S";
+		}
+		else if (bearing < 248)
+		{
+			dir = "SW";
+		}
+		else if (bearing < 293)
+		{
+			dir = "W";
+		}
+		else if (bearing < 338)
+		{
+			dir = "NW";
+		}
+		else
+		{
+			dir = "N";
+		}
+		user.sendMessage(_("compassBearing", dir, bearing));
+	}
+}
@@ -0,0 +1,59 @@
+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));
+	}
+}
@@ -0,0 +1,19 @@
+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]));
+	}
+}
@@ -0,0 +1,19 @@
+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]));
+	}
+}
@@ -0,0 +1,26 @@
+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"));
+		}
+	}
+}
@@ -0,0 +1,83 @@
+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
+	}
+}
@@ -0,0 +1,94 @@
+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;
+	}
+}
@@ -0,0 +1,159 @@
+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();
+	}
+}
@@ -0,0 +1,43 @@
+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()));
+		}
+	}
+}
@@ -0,0 +1,47 @@
+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()));
+		}
+	}
+}
@@ -0,0 +1,23 @@
+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());
+	}
+}
@@ -0,0 +1,52 @@
+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()));
+		}
+	}
+}
@@ -0,0 +1,25 @@
+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"));
+		}
+	}
+}
@@ -0,0 +1,50 @@
+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));
+		}
+	}
+}
@@ -0,0 +1,74 @@
+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() + ".");
+		
+	}
+}
@@ -0,0 +1,49 @@
+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())));
+		}
+	}
+}
Author	SHA1	Message	Date
Paul Buonopane	d06fc84e41	Changed s to dropStack for verbosity, and organized imports. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:46:57 -05:00
Paul Buonopane	1cbb6f1617	ManagedFile was in the correct folder, but had the wrong package header. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:29:49 -05:00
Paul Buonopane	0039f73fb3	Better use of logger. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:27:23 -05:00
Paul Buonopane	a865c9ad01	Formatting. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:26:55 -05:00
Paul Buonopane	8c5d4d83f1	Avoided shadowing. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:26:10 -05:00
Paul Buonopane	53c9265800	Formatting. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:24:46 -05:00
Paul Buonopane	9b25a25e91	Methods' applicable members are now static. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:21:26 -05:00
Paul Buonopane	a2fdf66de4	Renamed TNT explosion listener to be more consistent with naming scheme. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:18:29 -05:00
Paul Buonopane	224e5f129e	ChargeException was in the correct folder, but had the wrong package header. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:14:33 -05:00
Paul Buonopane	146599ae4b	Formatting. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:11:09 -05:00
Paul Buonopane	4203119e9a	Removed poor use of shadowing. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:02:55 -05:00
Paul Buonopane	aefe79bbe7	Added @Override annotation in I18n. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 12:00:27 -05:00
Paul Buonopane	5da1e9a220	Increased logger efficiency in Essentials. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 11:58:43 -05:00
Paul Buonopane	a0df79cc06	Removed unused imports in Essentials. Signed-off-by: Paul Buonopane <techsoftadvanced@gmail.com>	2012-02-23 11:56:48 -05:00
snowleo	32840e68f3	Sign settings	2012-02-21 19:17:22 +01:00
snowleo	4da3f52164	Merge branch 'refs/heads/master' into 3.0 Conflicts: .gitignore Essentials/src/com/earth2me/essentials/Essentials.java Essentials/src/com/earth2me/essentials/EssentialsTimer.java Essentials/src/com/earth2me/essentials/ISettings.java Essentials/src/com/earth2me/essentials/Jails.java Essentials/src/com/earth2me/essentials/OfflinePlayer.java Essentials/src/com/earth2me/essentials/Settings.java Essentials/src/com/earth2me/essentials/User.java Essentials/src/com/earth2me/essentials/UserData.java Essentials/src/com/earth2me/essentials/UserMap.java Essentials/src/com/earth2me/essentials/Util.java Essentials/src/com/earth2me/essentials/commands/Commandnear.java Essentials/src/com/earth2me/essentials/commands/Commandping.java Essentials/src/com/earth2me/essentials/commands/Commandspawner.java Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java Essentials/src/com/earth2me/essentials/commands/Commandwarp.java Essentials/src/messages_en.properties Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java EssentialsChat/src/plugin.yml EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java	2012-02-21 18:34:53 +01:00
snowleo	cae3c5a03e	We don't need to get OfflinePlayer again.	2012-02-13 11:22:49 +01:00
md_5	13206b3418	Its a good idea to remove imports when you remove a class	2012-02-13 18:11:01 +11:00
md_5	c713be8c82	No need for that CraftBukkit hack anymore	2012-02-13 18:05:59 +11:00
snowleo	a3c67e23c8	Organize Imports	2012-02-06 22:26:52 +01:00
snowleo	ffcdd99ad0	Cleanup	2012-02-06 22:22:05 +01:00
snowleo	539700cb21	New Groups code, supports groups.yml file, gm and vault, new economy api.	2012-02-06 22:13:39 +01:00
snowleo	1078b7b5f2	copy&paste fail	2012-02-05 18:29:37 +01:00
snowleo	f908eee76c	New permissions for signs	2012-02-05 18:26:21 +01:00
snowleo	b95c662ed5	Finally fix tests	2012-02-05 18:02:45 +01:00
snowleo	a60f280a1c	Fixing the Testcases	2012-02-05 17:35:47 +01:00
snowleo	8ab5bad988	Modified BetterLocation, and new Permission-System	2012-02-05 17:19:32 +01:00
KHobbits	8080abacd6	More general cleanup.	2012-01-28 14:17:27 +00:00
KHobbits	e960078e1a	Random Cleanup	2012-01-28 14:05:50 +00:00
KHobbits	f4413633b8	Clean more imports.	2012-01-28 13:48:30 +00:00
KHobbits	5c44877c4c	Organize Imports	2012-01-28 13:44:06 +00:00
KHobbits	36d7907987	Fix missing import.	2012-01-28 13:40:10 +00:00
KHobbits	047f373631	Merge branch 'master' into 3.0 Conflicts: Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java Essentials/src/com/earth2me/essentials/commands/Commandhome.java Essentials/src/com/earth2me/essentials/commands/Commandsethome.java Essentials/src/messages_fr.properties EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java	2012-01-28 13:33:09 +00:00
KHobbits	72ed86e0dd	Tidy chat.	2012-01-26 00:01:49 +00:00
KHobbits	c689b55c4d	Fix depends	2012-01-25 23:56:54 +00:00
ementalo	cbee61093e	Fix exception when getting displayname Fix exception if null values are in settings groups.yml	2012-01-25 01:09:32 +00:00
KHobbits	df061749dd	2nd sweep over Essentials Chat, to implement 2.8 changes. Formatting cache still needs reimplemented.	2012-01-24 23:20:00 +00:00
KHobbits	38a9327284	Merge branch '3.0' of github.com:essentials/Essentials into 3.0 Conflicts: Essentials/src/messages_en.properties	2012-01-24 22:56:53 +00:00
ementalo	307c6c7bf0	remove merge leftovers Don't try to spawn users who have disconnected before we have a chance to spawn them	2012-01-24 22:50:34 +00:00
KHobbits	bdc695c85b	First sweep over Essentials Chat, to implement 2.8 changes. Formatting cache still needs reimplemented.	2012-01-24 22:08:20 +00:00
KHobbits	8c54f37092	Fix messages file	2012-01-24 20:47:11 +00:00
snowleo	cc0e9aa84b	Merge branch 'refs/heads/master' into 3.0 The changes to EssChat have not been merged Conflicts: Essentials/src/com/earth2me/essentials/Essentials.java Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java Essentials/src/com/earth2me/essentials/ISettings.java Essentials/src/com/earth2me/essentials/OfflinePlayer.java Essentials/src/com/earth2me/essentials/Settings.java Essentials/src/com/earth2me/essentials/Util.java Essentials/src/com/earth2me/essentials/listener/EssentialsBlockListener.java Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java Essentials/src/com/earth2me/essentials/listener/EssentialsPluginListener.java Essentials/src/messages.properties Essentials/src/messages_da.properties Essentials/src/messages_de.properties Essentials/src/messages_en.properties Essentials/src/messages_es.properties Essentials/src/messages_fr.properties Essentials/src/messages_nl.properties EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPPPlayerListener.java	2012-01-24 00:52:08 +01:00
snowleo	6af054631f	More work on 3.0 branch	2012-01-24 00:01:31 +01:00
ementalo	01a37df700	Add new permission essentials.protect.alerts.notrigger If user has this permisson they do not trigger EssProtect block alerts Fix spawnmob sign command args	2012-01-23 16:00:23 +00:00
snowleo	f0dd81ee00	Merge branch 'refs/heads/master' into 3.0 Did some tweaks, so that it actually works. Conflicts: Essentials/src/com/earth2me/essentials/Essentials.java Essentials/src/com/earth2me/essentials/User.java Essentials/src/com/earth2me/essentials/Util.java Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java Essentials/src/com/earth2me/essentials/commands/Commandmail.java Essentials/src/com/earth2me/essentials/commands/Commandme.java Essentials/src/com/earth2me/essentials/commands/Commandmsg.java Essentials/src/com/earth2me/essentials/commands/Commandnick.java Essentials/src/com/earth2me/essentials/commands/Commandr.java Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java build.xml	2012-01-18 04:01:01 +01:00
KHobbits	27b0cc86de	Don't charge a user if warp already exists (and they can't set it).	2012-01-17 19:25:56 +00:00
KHobbits	ee88abafcf	Merge branch '3.0' of github.com:essentials/Essentials into 3.0	2012-01-17 17:41:16 +00:00
KHobbits	a1cf08d6ab	Auto update gm version.	2012-01-17 17:23:27 +00:00
ementalo	42e9e105cb	Adding permissions for overwriting exisitng warps essentials.warp.overwrite.[warpname] will allow overwrting of exsiting warps Adding WarpNotFoundException class For ticket #	2012-01-17 16:19:53 +00:00
KHobbits	ec0d6651b0	Removing 2 dead classes.	2012-01-17 03:13:44 +00:00
snowleo	348bb6d0a3	Merge branch 'refs/heads/master' into 3.0	2012-01-13 00:23:39 +01:00
snowleo	64904cdcfd	Create Files, if they don't exist	2012-01-12 16:34:52 +01:00
snowleo	69d57b04d9	ItemDb now loads in half the time, uses 72KB less memory.	2012-01-12 16:33:55 +01:00
snowleo	ef659d5f26	Better Location code for lazy loading worlds This fixes problems with worlds that are loaded after the Location object is created and should prevent memory leaks when a world is unloaded.	2012-01-11 04:36:57 +01:00
snowleo	703c5741bd	Essentials should run now...	2012-01-10 01:02:23 +01:00
snowleo	d64c73fc51	Finished Protect, Essentials should build now.	2012-01-10 00:36:09 +01:00
snowleo	92abba0f25	All tests should work now	2012-01-09 23:27:52 +01:00
snowleo	cc3cd5e89c	Cleanup of Console class	2012-01-06 01:55:41 +01:00
KHobbits	3513d72a7b	Fixing Warp, Spawnmob signs Fix Imports	2012-01-04 21:41:05 +00:00
KHobbits	8432e1fc7d	Fixing kit and protect signs (inGroup) Fix imports	2012-01-04 21:37:00 +00:00
KHobbits	a46f6fd73d	Revert "Possible sign refactor?" This reverts commit `897571db7d`.	2012-01-04 18:56:36 +00:00
KHobbits	897571db7d	Possible sign refactor?	2012-01-04 18:34:37 +00:00
KHobbits	de0a419476	Cleaning up item spawning and kits.	2012-01-04 17:51:14 +00:00
ementalo	6dd73f5247	ReadLock for realname Remove unneeded overrides Redo Khobbits messages_de changes	2012-01-04 15:53:59 +00:00
ementalo	a50cfb3efb	3.0 updates - Main jar should build now	2012-01-04 15:06:10 +00:00
ementalo	bbcf2ecce3	Fix a few things for 3.0 Test #843 - new config option added cancelTpRequestsOnWorldChange Test # 1255 - essentials.nogod.override permission added Test #1311 - added ban reason in /seen	2012-01-04 11:57:00 +00:00
snowleo	86ea654a5d	Cleanup of Backup class	2012-01-04 05:45:32 +01:00
KHobbits	d2bbbd14fc	Organize Imports	2012-01-04 03:45:26 +00:00
KHobbits	a5398e938c	final is cleaner.	2012-01-04 03:37:47 +00:00
KHobbits	7b01bc894d	Readlocks maybe...	2012-01-04 03:27:25 +00:00
KHobbits	2678be90e3	Fixing up kits.	2012-01-04 03:12:21 +00:00
snowleo	781f42fba1	More fixes for commands	2012-01-03 21:43:57 +01:00
snowleo	481749b119	New names	2012-01-03 02:57:44 +01:00
snowleo	a552b88172	I always forget these	2012-01-03 02:53:57 +01:00
snowleo	801562ac2c	More work on Protect	2012-01-03 02:51:19 +01:00
snowleo	869d79ae73	This feels so good D:	2012-01-03 01:53:38 +01:00
snowleo	7153676137	Starting to break Protect	2012-01-03 00:07:44 +01:00
snowleo	d2c1b24e4b	Prototype for grouping permissions into an enum	2012-01-02 23:45:50 +01:00
snowleo	b3de4276bc	Those are permission based now	2012-01-02 23:35:36 +01:00
snowleo	cb31939a7a	New Protect config	2012-01-02 23:25:17 +01:00
snowleo	41e0e64a5f	EssentialsSpawn and EssentialsChat should build now again	2012-01-02 22:38:47 +01:00
snowleo	a20e96af4e	Netbeans 7.1 RC2 project stuff	2012-01-02 22:37:44 +01:00
snowleo	cedf363557	Merge branch 'refs/heads/master' into 3.0	2012-01-02 20:29:00 +01:00
snowleo	9bb6d77bdb	More work done on the 3.0 branch	2011-12-23 12:57:26 +01:00
snowleo	03171616fa	Merge branch 'refs/heads/master' into 3.0 Conflicts: Essentials/src/com/earth2me/essentials/Essentials.java	2011-12-22 23:37:12 +01:00
KHobbits	087a594449	Removing duplicate messages file This causes confusion when trying to override messages in the ess folder.	2011-12-18 11:52:49 +00:00
KHobbits	c0b78cc3d5	Adding /join as alias to /tpa, and /come as alias to /tpahere	2011-12-18 04:30:00 +00:00
KHobbits	b05e4079d9	Essentials now throws a custom event, to handle local chat. (Changing event name, so we don't get custom event conflicts.)	2011-12-17 17:57:57 +00:00
KHobbits	556c990eff	EssentialsChat cleaning.	2011-12-17 17:40:47 +00:00
KHobbits	618f58c3f3	Merge branch 'master' into 3.0	2011-12-15 20:47:59 +00:00
snowleo	a7e71488c6	Merge branch 'refs/heads/master' into 3.0	2011-12-15 10:32:56 +01:00
snowleo	0155bcedb7	Updated all modules to new api, some settings are still missing	2011-12-14 16:31:08 +01:00
snowleo	9ab2fe54fc	Added EssentialsSigns to build.xml	2011-12-14 16:05:35 +01:00
snowleo	0f1eb9b4f9	Moved signs code to a new module	2011-12-14 16:04:15 +01:00
snowleo	503e837cfd	Fail merge :D	2011-12-14 15:22:29 +01:00
snowleo	0a98b8f662	Merge branch 'refs/heads/master' into 3.0 Conflicts: Essentials/src/com/earth2me/essentials/Essentials.java Essentials/src/com/earth2me/essentials/IUser.java Essentials/src/com/earth2me/essentials/Trade.java Essentials/src/com/earth2me/essentials/User.java	2011-12-14 15:20:22 +01:00
snowleo	6e79302908	More work done.	2011-12-12 22:31:19 +01:00
snowleo	ecf72e27bb	More work done	2011-12-11 13:16:36 +01:00
snowleo	d1aea7dd35	Merge branch 'refs/heads/master' into 3.0 Conflicts: Essentials/src/com/earth2me/essentials/Util.java	2011-12-11 09:25:33 +01:00
snowleo	b2a307ec23	Merge branch 'refs/heads/master' into 3.0	2011-12-11 08:56:53 +01:00
snowleo	f0dabdd4b1	Re-Implemented User class	2011-12-10 03:04:10 +01:00