Release 2.19.3

Fixes #4809.

.checkstyle/checkstyle.xml

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

.checkstyle/suppressions.xml

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

.classpath

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

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/report-a-bug.yml

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

.github/PULL_REQUEST_TEMPLATE/bug-fix.md

@@ -0,0 +1,94 @@
+<!--
+
+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.
+-->
+

.github/PULL_REQUEST_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+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.)

.github/PULL_REQUEST_TEMPLATE/new-feature.md

@@ -0,0 +1,93 @@
+<!--
+
+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.
+-->

.github/pull_request_template.md

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

.github/workflows/build-master.yml

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

.github/workflows/build-pr.yml

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

.gitignore

@@ -1,49 +1,28 @@
-.DS_Store
-/BuildAll/nbproject/private/
-/EssentialsProtect/nbproject/private/
-/EssentialsChat/nbproject/private/
-/EssentialsGroupBridge/nbproject/private/
-/EssentialsGeoIP/nbproject/private/
-/EssentialsSpawn/nbproject/private/
-/EssentialsXMPP/nbproject/private/
-/EssentialsGroupManager/nbproject/private/
-/BuildAll/build/
-/EssentialsGroupBridge/dist/
-/EssentialsGroupBridge/build/
-/EssentialsGeoIP/dist/
-/EssentialsGeoIP/build/
-/EssentialsGroupManager/build/
-/EssentialsGroupManager/dist/
-/BuildAll/dist/
-/EssentialsChat/build/
-/EssentialsChat/dist/
-/EssentialsSpawn/build/
-/EssentialsSpawn/dist/
-/EssentialsXMPP/dist/
-/EssentialsXMPP/build/
-/EssentialsProtect/dist/
-/EssentialsProtect/build/
-/EssentialsPermissionsCommands/nbproject/private/
-/EssentialsPermissionsCommands/build/
-/EssentialsPermissionsCommands/dist/
-/Essentials/nbproject/private/
-/Essentials/dist/
-/Essentials/build/
-/YamlAnnotations/
-/EssentialsUpdate/nbproject/private/
-/EssentialsRelease/
-/EssentialsUpdate/dist/
-/EssentialsUpdate/build/
-/WebPush/apikey.php
-/WebPush/nbproject/private
-/EssentialsGroupManager/bin
-/EssentialsGroupManager/.externalToolBuilders
-/EssentialsAntiBuild/nbproject/private/
-/EssentialsAntiBuild/dist/
-/EssentialsAntiBuild/build/
-/jars
-/out
-.idea/
-*.iml
-target/
-dependency-reduced-pom.xml
+# 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/

.idea/checkstyle-idea.xml

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

.project

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

.travis.yml

@@ -1,18 +0,0 @@
-language: java
-jdk:
-  - oraclejdk7
-  - openjdk7
-  - openjdk6
-script: ant collect
-install: true
-notifications:
-  irc: 
-    channels: 
-      - "irc.esper.net#lain"
-    on_success: change
-    on_failure: always
-  email:
-    recipients:
-      - "khobbits@ess3.net"
-    on_success: change
-    on_failure: always

BuildAll/build.xml

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

BuildAll/nbproject/genfiles.properties

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

BuildAll/nbproject/project.properties

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

BuildAll/nbproject/project.xml

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

CONTRIBUTING.md

@@ -0,0 +1,31 @@
+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).
+
+

Essentials/build.gradle

@@ -0,0 +1,58 @@
+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'))
+    }
+}

Essentials/build.xml

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

Essentials/nbproject/genfiles.properties

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

Essentials/nbproject/pmd.settings

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

Essentials/nbproject/project.properties

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

Essentials/nbproject/project.xml

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

Essentials/pom.xml

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,895 +0,0 @@
-/*
- * Essentials - a bukkit plugin
- * Copyright (C) 2011  Essentials Team
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.commands.EssentialsCommand;
-import com.earth2me.essentials.commands.IEssentialsCommand;
-import com.earth2me.essentials.commands.NoChargeException;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import com.earth2me.essentials.commands.QuietAbortException;
-import com.earth2me.essentials.metrics.Metrics;
-import com.earth2me.essentials.metrics.MetricsListener;
-import com.earth2me.essentials.metrics.MetricsStarter;
-import com.earth2me.essentials.perm.PermissionsHandler;
-import com.earth2me.essentials.register.payment.Methods;
-import com.earth2me.essentials.signs.SignBlockListener;
-import com.earth2me.essentials.signs.SignEntityListener;
-import com.earth2me.essentials.signs.SignPlayerListener;
-import com.earth2me.essentials.textreader.IText;
-import com.earth2me.essentials.textreader.KeywordReplacer;
-import com.earth2me.essentials.textreader.SimpleTextInput;
-import com.earth2me.essentials.utils.DateUtil;
-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 net.ess3.api.Economy;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IItemDb;
-import net.ess3.api.IJails;
-import net.ess3.api.ISettings;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.command.BlockCommandSender;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.command.SimpleCommandMap;
-import org.bukkit.command.TabCompleter;
-import org.bukkit.command.defaults.VanillaCommand;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.world.WorldLoadEvent;
-import org.bukkit.event.world.WorldUnloadEvent;
-import org.bukkit.plugin.InvalidDescriptionException;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scheduler.BukkitTask;
-import org.yaml.snakeyaml.error.YAMLException;
-
-
-public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
-{
-	public static final int BUKKIT_VERSION = 2882;
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private transient ISettings settings;
-	private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this);
-	private transient Jails jails;
-	private transient Warps warps;
-	private transient Worth worth;
-	private transient List<IConf> confList;
-	private transient Backup backup;
-	private transient ItemDb itemDb;
-	private transient final Methods paymentMethod = new Methods();
-	private transient PermissionsHandler permissionsHandler;
-	private transient AlternativeCommandsHandler alternativeCommandsHandler;
-	private transient UserMap userMap;
-	private transient ExecuteTimer execTimer;
-	private transient I18n i18n;
-	private transient Metrics metrics;
-	private transient EssentialsTimer timer;
-	private transient List<String> vanishedPlayers = new ArrayList<String>();
-	private transient SimpleCommandMap scm;
-
-	@Override
-	public ISettings getSettings()
-	{
-		return settings;
-	}
-
-	public void setupForTesting(final Server server) throws IOException, InvalidDescriptionException
-	{
-		final File dataFolder = File.createTempFile("essentialstest", "");
-		if (!dataFolder.delete())
-		{
-			throw new IOException();
-		}
-		if (!dataFolder.mkdir())
-		{
-			throw new IOException();
-		}
-		i18n = new I18n(this);
-		i18n.onEnable();
-		LOGGER.log(Level.INFO, _("usingTempFolderForTesting"));
-		LOGGER.log(Level.INFO, dataFolder.toString());
-		this.initialize(null, server, new PluginDescriptionFile(new FileReader(new File("src" + File.separator + "plugin.yml"))), dataFolder, null, null);
-		settings = new Settings(this);
-		i18n.updateLocale("en");
-		userMap = new UserMap(this);
-		permissionsHandler = new PermissionsHandler(this, false);
-		Economy.setEss(this);
-	}
-
-	@Override
-	public void onEnable()
-	{
-		try
-		{
-			execTimer = new ExecuteTimer();
-			execTimer.start();
-			i18n = new I18n(this);
-			i18n.onEnable();
-			execTimer.mark("I18n1");
-			scm = new SimpleCommandMap(this.getServer());
-			final PluginManager pm = getServer().getPluginManager();
-			for (Plugin plugin : pm.getPlugins())
-			{
-				if (plugin.getDescription().getName().startsWith("Essentials")
-					&& !plugin.getDescription().getVersion().equals(this.getDescription().getVersion())
-					&& !plugin.getDescription().getName().equals("EssentialsAntiCheat"))
-				{
-					LOGGER.log(Level.WARNING, _("versionMismatch", plugin.getDescription().getName()));
-				}
-			}
-			final Matcher versionMatch = Pattern.compile("git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*").matcher(getServer().getVersion());
-			if (versionMatch.matches())
-			{
-				final int versionNumber = Integer.parseInt(versionMatch.group(1));
-				if (versionNumber < BUKKIT_VERSION && versionNumber > 100)
-				{
-					wrongVersion();
-					this.setEnabled(false);
-					return;
-				}
-			}
-			else
-			{
-				LOGGER.log(Level.INFO, _("bukkitFormatChanged"));
-				LOGGER.log(Level.INFO, getServer().getVersion());
-				LOGGER.log(Level.INFO, getServer().getBukkitVersion());
-			}
-			execTimer.mark("BukkitCheck");
-			try
-			{
-				final EssentialsUpgrade upgrade = new EssentialsUpgrade(this);
-				upgrade.beforeSettings();
-				execTimer.mark("Upgrade");
-				confList = new ArrayList<IConf>();
-				settings = new Settings(this);
-				confList.add(settings);
-				execTimer.mark("Settings");
-				upgrade.afterSettings();
-				execTimer.mark("Upgrade2");
-				i18n.updateLocale(settings.getLocale());
-				userMap = new UserMap(this);
-				confList.add(userMap);
-				execTimer.mark("Init(Usermap)");
-				warps = new Warps(getServer(), this.getDataFolder());
-				confList.add(warps);
-				execTimer.mark("Init(Spawn/Warp)");
-				worth = new Worth(this.getDataFolder());
-				confList.add(worth);
-				itemDb = new ItemDb(this);
-				confList.add(itemDb);
-				execTimer.mark("Init(Worth/ItemDB)");
-				jails = new Jails(this);
-				confList.add(jails);
-				reload();
-			}
-			catch (YAMLException exception)
-			{
-				if (pm.getPlugin("EssentialsUpdate") != null)
-				{
-					LOGGER.log(Level.SEVERE, _("essentialsHelp2"));
-				}
-				else
-				{
-					LOGGER.log(Level.SEVERE, _("essentialsHelp1"));
-				}
-				handleCrash(exception);
-				return;
-			}
-			backup = new Backup(this);
-			permissionsHandler = new PermissionsHandler(this, settings.useBukkitPermissions());
-			alternativeCommandsHandler = new AlternativeCommandsHandler(this);
-
-			timer = new EssentialsTimer(this);
-			scheduleSyncRepeatingTask(timer, 1000, 50);
-
-			Economy.setEss(this);
-			execTimer.mark("RegHandler");
-
-			final MetricsStarter metricsStarter = new MetricsStarter(this);
-			if (metricsStarter.getStart() != null && metricsStarter.getStart() == true)
-			{
-				runTaskLaterAsynchronously(metricsStarter, 1);
-			}
-			else if (metricsStarter.getStart() != null && metricsStarter.getStart() == false)
-			{
-				final MetricsListener metricsListener = new MetricsListener(this, metricsStarter);
-				pm.registerEvents(metricsListener, this);
-			}
-
-			final String timeroutput = execTimer.end();
-			if (getSettings().isDebug())
-			{
-				LOGGER.log(Level.INFO, "Essentials load " + timeroutput);
-			}
-		}
-		catch (NumberFormatException ex)
-		{
-			handleCrash(ex);
-		}
-		catch (Error ex)
-		{
-			handleCrash(ex);
-			throw ex;
-		}
-	}
-
-	@Override
-	public void saveConfig()
-	{
-		// We don't use any of the bukkit config writing, as this breaks our config file formatting.
-	}
-
-	private void registerListeners(PluginManager pm)
-	{
-		HandlerList.unregisterAll(this);
-
-		if (getSettings().isDebug())
-		{
-			LOGGER.log(Level.INFO, "Registering Listeners");
-		}
-
-		final EssentialsPluginListener serverListener = new EssentialsPluginListener(this);
-		pm.registerEvents(serverListener, this);
-		confList.add(serverListener);
-
-		final EssentialsPlayerListener playerListener = new EssentialsPlayerListener(this);
-		pm.registerEvents(playerListener, this);
-
-		final EssentialsBlockListener blockListener = new EssentialsBlockListener(this);
-		pm.registerEvents(blockListener, this);
-
-		final SignBlockListener signBlockListener = new SignBlockListener(this);
-		pm.registerEvents(signBlockListener, this);
-
-		final SignPlayerListener signPlayerListener = new SignPlayerListener(this);
-		pm.registerEvents(signPlayerListener, this);
-
-		final SignEntityListener signEntityListener = new SignEntityListener(this);
-		pm.registerEvents(signEntityListener, this);
-
-		final EssentialsEntityListener entityListener = new EssentialsEntityListener(this);
-		pm.registerEvents(entityListener, this);
-
-		final EssentialsWorldListener worldListener = new EssentialsWorldListener(this);
-		pm.registerEvents(worldListener, this);
-
-		pm.registerEvents(tntListener, this);
-
-		jails.resetListener();
-	}
-
-	@Override
-	public void onDisable()
-	{
-		for (Player p : getServer().getOnlinePlayers())
-		{
-			User user = getUser(p);
-			if (user.isVanished())
-			{
-				user.setVanished(false);
-				user.sendMessage(_("unvanishedReload"));
-			}
-		}
-		cleanupOpenInventories();
-		if (i18n != null)
-		{
-			i18n.onDisable();
-		}
-		if (backup != null)
-		{
-			backup.stopTask();
-		}
-		Economy.setEss(null);
-		Trade.closeLog();
-	}
-
-	@Override
-	public void reload()
-	{
-		Trade.closeLog();
-
-		for (IConf iConf : confList)
-		{
-			iConf.reloadConfig();
-			execTimer.mark("Reload(" + iConf.getClass().getSimpleName() + ")");
-		}
-
-		i18n.updateLocale(settings.getLocale());
-
-		final PluginManager pm = getServer().getPluginManager();
-		registerListeners(pm);
-	}
-
-	@Override
-	public List<String> onTabComplete(CommandSender sender,
-									  Command command,
-									  String commandLabel,
-									  String[] args)
-	{
-		// Allow plugins to override the command via onCommand
-		if (!getSettings().isCommandOverridden(command.getName()) && (!commandLabel.startsWith("e") || commandLabel.equalsIgnoreCase(command.getName())))
-		{
-			final PluginCommand pc = alternativeCommandsHandler.getAlternative(commandLabel);
-			if (pc != null)
-			{
-				try
-				{
-					TabCompleter completer = pc.getTabCompleter();
-					if (completer != null)
-					{
-						return completer.onTabComplete(sender, command, commandLabel, args);
-					}
-				}
-				catch (final Exception ex)
-				{
-					Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
-				}
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args)
-	{
-		return onCommandEssentials(sender, command, commandLabel, args, Essentials.class.getClassLoader(), "com.earth2me.essentials.commands.Command", "essentials.", null);
-	}
-
-	@Override
-	public boolean onCommandEssentials(final CommandSender cSender, final Command command, final String commandLabel, final String[] args, final ClassLoader classLoader, final String commandPath, final String permissionPrefix, final IEssentialsModule module)
-	{
-		// Allow plugins to override the command via onCommand
-		if (!getSettings().isCommandOverridden(command.getName()) && (!commandLabel.startsWith("e") || commandLabel.equalsIgnoreCase(command.getName())))
-		{
-			final PluginCommand pc = alternativeCommandsHandler.getAlternative(commandLabel);
-			if (pc != null)
-			{
-				alternativeCommandsHandler.executed(commandLabel, pc);
-				try
-				{
-					return pc.execute(cSender, commandLabel, args);
-				}
-				catch (final Exception ex)
-				{
-					Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
-					cSender.sendMessage(ChatColor.RED + "An internal error occurred while attempting to perform this command");
-					return true;
-				}
-			}
-		}
-
-		try
-		{
-
-			User user = null;
-			Block bSenderBlock = null;
-			if (cSender instanceof Player)
-			{
-				user = getUser((Player)cSender);
-			}
-			else if (cSender instanceof BlockCommandSender)
-			{
-				BlockCommandSender bsender = (BlockCommandSender)cSender;
-				bSenderBlock = bsender.getBlock();
-			}
-
-			if (bSenderBlock != null)
-			{
-				Bukkit.getLogger().log(Level.INFO, "CommandBlock at {0},{1},{2} issued server command: /{3} {4}", new Object[]
-				{
-					bSenderBlock.getX(), bSenderBlock.getY(), bSenderBlock.getZ(), commandLabel, EssentialsCommand.getFinalArg(args, 0)
-				});
-			}
-			else if (user == null)
-			{
-				Bukkit.getLogger().log(Level.INFO, "{0} issued server command: /{1} {2}", new Object[]
-				{
-					cSender.getName(), commandLabel, EssentialsCommand.getFinalArg(args, 0)
-				});
-			}
-
-			CommandSource sender = new CommandSource(cSender);
-
-			// New mail notification
-			if (user != null && !getSettings().isCommandDisabled("mail") && !command.getName().equals("mail") && user.isAuthorized("essentials.mail"))
-			{
-				final List<String> mail = user.getMails();
-				if (mail != null && !mail.isEmpty())
-				{
-					user.sendMessage(_("youHaveNewMail", mail.size()));
-				}
-			}
-
-			//Print version even if admin command is not available #easteregg
-			if (commandLabel.equalsIgnoreCase("essversion"))
-			{
-				sender.sendMessage("This server is running Essentials " + getDescription().getVersion());
-				return true;
-			}
-
-			// Check for disabled commands
-			if (getSettings().isCommandDisabled(commandLabel))
-			{
-				if (scm != null)
-				{
-					for (VanillaCommand cmd : scm.getFallbackCommands())
-					{
-						if (cmd.matches(commandLabel))
-						{
-							cmd.execute(cSender, commandLabel, args);
-						}
-					}
-				}
-				return true;
-			}
-
-			IEssentialsCommand cmd;
-			try
-			{
-				cmd = (IEssentialsCommand)classLoader.loadClass(commandPath + command.getName()).newInstance();
-				cmd.setEssentials(this);
-				cmd.setEssentialsModule(module);
-			}
-			catch (Exception ex)
-			{
-				sender.sendMessage(_("commandNotLoaded", commandLabel));
-				LOGGER.log(Level.SEVERE, _("commandNotLoaded", commandLabel), ex);
-				return true;
-			}
-
-			// Check authorization
-			if (user != null && !user.isAuthorized(cmd, permissionPrefix))
-			{
-				LOGGER.log(Level.INFO, _("deniedAccessCommand", user.getName()));
-				user.sendMessage(_("noAccessCommand"));
-				return true;
-			}
-
-			if (user != null && user.isJailed() && !user.isAuthorized(cmd, "essentials.jail.allow."))
-			{
-				if (user.getJailTimeout() > 0)
-				{
-					user.sendMessage(_("playerJailedFor", user.getName(), DateUtil.formatDateDiff(user.getJailTimeout())));
-				}
-				else
-				{
-					user.sendMessage(_("jailMessage"));
-				}
-				return true;
-			}
-
-			// Run the command
-			try
-			{
-				if (user == null)
-				{
-					cmd.run(getServer(), sender, commandLabel, command, args);
-				}
-				else
-				{
-					cmd.run(getServer(), user, commandLabel, command, args);
-				}
-				return true;
-			}
-			catch (NoChargeException ex)
-			{
-				return true;
-			}
-			catch (QuietAbortException 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 (Exception ex)
-			{
-				showError(sender, ex, commandLabel);
-				return true;
-			}
-		}
-		catch (Throwable ex)
-		{
-			LOGGER.log(Level.SEVERE, _("commandFailed", commandLabel), ex);
-			return true;
-		}
-	}
-
-	public void cleanupOpenInventories()
-	{
-		for (Player player : getServer().getOnlinePlayers())
-		{
-			User user = getUser(player);
-			if (user.isRecipeSee())
-			{
-				user.getBase().getOpenInventory().getTopInventory().clear();
-				user.getBase().getOpenInventory().close();
-				user.setRecipeSee(false);
-			}
-			if (user.isInvSee() || user.isEnderSee())
-			{
-				user.getBase().getOpenInventory().close();
-				user.setInvSee(false);
-				user.setEnderSee(false);
-			}
-		}
-	}
-
-	@Override
-	public void showError(final CommandSource sender, final Throwable exception, final String commandLabel)
-	{
-		sender.sendMessage(_("errorWithMessage", exception.getMessage()));
-		if (getSettings().isDebug())
-		{
-			LOGGER.log(Level.WARNING, _("errorCallingCommand", commandLabel), exception);
-		}
-	}
-
-	static public void wrongVersion()
-	{
-		LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
-		LOGGER.log(Level.SEVERE, _("notRecommendedBukkit"));
-		LOGGER.log(Level.SEVERE, _("requiredBukkit", Integer.toString(BUKKIT_VERSION)));
-		LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
-	}
-
-	@Override
-	public BukkitScheduler getScheduler()
-	{
-		return this.getServer().getScheduler();
-	}
-
-	@Override
-	public IJails getJails()
-	{
-		return jails;
-	}
-
-	@Override
-	public Warps getWarps()
-	{
-		return warps;
-	}
-
-	@Override
-	public Worth getWorth()
-	{
-		return worth;
-	}
-
-	@Override
-	public Backup getBackup()
-	{
-		return backup;
-	}
-
-	@Override
-	public Metrics getMetrics()
-	{
-		return metrics;
-	}
-
-	@Override
-	public void setMetrics(Metrics metrics)
-	{
-		this.metrics = metrics;
-	}
-
-	@Deprecated
-	@Override
-	public User getUser(final Object base)
-	{
-		if (base instanceof Player)
-		{
-			return getUser((Player)base);
-		}
-		if (base instanceof String)
-		{
-			return getOfflineUser((String)base);
-		}
-		return null;
-	}
-
-	@Override
-	public User getUser(final String base)
-	{
-		return getOfflineUser((String)base);
-	}
-
-	@Override
-	public User getOfflineUser(final String name)
-	{
-		final User user = userMap.getUser(name);
-		if (user != null && user.getBase() instanceof OfflinePlayer)
-		{
-			((OfflinePlayer)user.getBase()).setName(name);
-		}
-		return user;
-	}
-
-	@Override
-	public User getUser(final Player base)
-	{
-		if (base == null)
-		{
-			return null;
-		}
-
-		if (userMap == null)
-		{
-			LOGGER.log(Level.WARNING, "Essentials userMap not initialized");
-			return null;
-		}
-
-		User user = userMap.getUser(base.getName());
-
-		if (user == null)
-		{
-			user = new User(base, this);
-		}
-		else
-		{
-			user.update(base);
-		}
-		return user;
-	}
-
-	private void handleCrash(Throwable exception)
-	{
-		final PluginManager pm = getServer().getPluginManager();
-		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);
-	}
-
-	@Override
-	public World getWorld(final String name)
-	{
-		if (name.matches("[0-9]+"))
-		{
-			final int worldId = Integer.parseInt(name);
-			if (worldId < getServer().getWorlds().size())
-			{
-				return getServer().getWorlds().get(worldId);
-			}
-		}
-		return getServer().getWorld(name);
-	}
-
-	@Override
-	public void addReloadListener(final IConf listener)
-	{
-		confList.add(listener);
-	}
-
-	@Override
-	public Methods getPaymentMethod()
-	{
-		return paymentMethod;
-	}
-
-	@Override
-	public int broadcastMessage(final String message)
-	{
-		return broadcastMessage(null, null, message, true);
-	}
-
-	@Override
-	public int broadcastMessage(final IUser sender, final String message)
-	{
-		return broadcastMessage(sender, null, message, false);
-	}
-
-	@Override
-	public int broadcastMessage(final String permission, final String message)
-	{
-		return broadcastMessage(null, permission, message, false);
-	}
-
-	private int broadcastMessage(final IUser sender, final String permission, final String message, final boolean keywords)
-	{
-		if (sender != null && sender.isHidden())
-		{
-			return 0;
-		}
-
-		IText broadcast = new SimpleTextInput(message);
-
-		final Player[] players = getServer().getOnlinePlayers();
-
-		for (Player player : players)
-		{
-			final User user = getUser(player);
-			if ((permission == null && (sender == null || !user.isIgnoredPlayer(sender)))
-				|| (permission != null && user.isAuthorized(permission)))
-			{
-				if (keywords)
-				{
-					broadcast = new KeywordReplacer(broadcast, new CommandSource(player), this, false);
-				}
-				for (String messageText : broadcast.getLines())
-				{
-					user.sendMessage(messageText);
-				}
-			}
-		}
-
-		return players.length;
-	}
-
-	@Override
-	public BukkitTask runTaskAsynchronously(final Runnable run)
-	{
-		return this.getScheduler().runTaskAsynchronously(this, run);
-	}
-
-	@Override
-	public BukkitTask runTaskLaterAsynchronously(final Runnable run, final long delay)
-	{
-		return this.getScheduler().runTaskLaterAsynchronously(this, run, delay);
-	}
-
-	@Override
-	public int scheduleSyncDelayedTask(final Runnable run)
-	{
-		return this.getScheduler().scheduleSyncDelayedTask(this, run);
-	}
-
-	@Override
-	public int scheduleSyncDelayedTask(final Runnable run, final long delay)
-	{
-		return this.getScheduler().scheduleSyncDelayedTask(this, run, delay);
-	}
-
-	@Override
-	public int scheduleSyncRepeatingTask(final Runnable run, final long delay, final long period)
-	{
-		return this.getScheduler().scheduleSyncRepeatingTask(this, run, delay, period);
-	}
-
-	@Override
-	public TNTExplodeListener getTNTListener()
-	{
-		return tntListener;
-	}
-
-	@Override
-	public PermissionsHandler getPermissionsHandler()
-	{
-		return permissionsHandler;
-	}
-
-	@Override
-	public AlternativeCommandsHandler getAlternativeCommandsHandler()
-	{
-		return alternativeCommandsHandler;
-	}
-
-	@Override
-	public IItemDb getItemDb()
-	{
-		return itemDb;
-	}
-
-	@Override
-	public UserMap getUserMap()
-	{
-		return userMap;
-	}
-
-	@Override
-	public I18n getI18n()
-	{
-		return i18n;
-	}
-
-	@Override
-	public EssentialsTimer getTimer()
-	{
-		return timer;
-	}
-
-	@Override
-	public List<String> getVanishedPlayers()
-	{
-		return vanishedPlayers;
-	}
-
-
-	private static class EssentialsWorldListener implements Listener, Runnable
-	{
-		private transient final IEssentials ess;
-
-		public EssentialsWorldListener(final IEssentials ess)
-		{
-			this.ess = ess;
-		}
-
-		@EventHandler(priority = EventPriority.LOW)
-		public void onWorldLoad(final WorldLoadEvent event)
-		{
-			ess.getJails().onReload();
-			ess.getWarps().reloadConfig();
-			for (IConf iConf : ((Essentials)ess).confList)
-			{
-				if (iConf instanceof IEssentialsModule)
-				{
-					iConf.reloadConfig();
-				}
-			}
-		}
-
-		@EventHandler(priority = EventPriority.LOW)
-		public void onWorldUnload(final WorldUnloadEvent event)
-		{
-			ess.getJails().onReload();
-			ess.getWarps().reloadConfig();
-			for (IConf iConf : ((Essentials)ess).confList)
-			{
-				if (iConf instanceof IEssentialsModule)
-				{
-					iConf.reloadConfig();
-				}
-			}
-		}
-
-		@Override
-		public void run()
-		{
-			ess.reload();
-		}
-	}
-}

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

@@ -1,71 +0,0 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.utils.LocationUtil;
-import java.util.Locale;
-import net.ess3.api.IEssentials;
-import org.bukkit.GameMode;
-import org.bukkit.Material;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.CreatureSpawner;
-import org.bukkit.entity.EntityType;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.inventory.ItemStack;
-
-
-public class EssentialsBlockListener implements Listener
-{
-	private final transient IEssentials ess;
-
-	public EssentialsBlockListener(final IEssentials ess)
-	{
-		this.ess = ess;
-	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onBlockPlace(final BlockPlaceEvent event)
-	{
-		// Do not rely on getItemInHand();
-		// http://leaky.bukkit.org/issues/663
-		final ItemStack is = LocationUtil.convertBlockToItem(event.getBlockPlaced());
-		if (is == null)
-		{
-			return;
-		}
-
-		if (is.getType() == Material.MOB_SPAWNER && event.getItemInHand() != null && event.getPlayer() != null
-			&& event.getItemInHand().getType() == Material.MOB_SPAWNER)
-		{
-			final BlockState blockState = event.getBlockPlaced().getState();
-			if (blockState instanceof CreatureSpawner)
-			{
-				final CreatureSpawner spawner = (CreatureSpawner)blockState;
-				final EntityType type = EntityType.fromId(event.getItemInHand().getData().getData());
-				if (type != null && Mob.fromBukkitType(type) != null)
-				{
-					if (ess.getUser(event.getPlayer()).isAuthorized("essentials.spawnerconvert." + Mob.fromBukkitType(type).name().toLowerCase(Locale.ENGLISH)))
-					{
-						spawner.setSpawnedType(type);
-					}
-				}
-			}
-		}
-
-		final User user = ess.getUser(event.getPlayer());
-		if (user.hasUnlimited(is) && user.getGameMode() == GameMode.SURVIVAL)
-		{
-			ess.scheduleSyncDelayedTask(
-					new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					user.getBase().getInventory().addItem(is);
-					user.getBase().updateInventory();
-				}
-			});
-		}
-	}
-}

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

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

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

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

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

@@ -1,692 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.textreader.IText;
-import com.earth2me.essentials.textreader.KeywordReplacer;
-import com.earth2me.essentials.textreader.TextInput;
-import com.earth2me.essentials.textreader.TextPager;
-import com.earth2me.essentials.utils.DateUtil;
-import com.earth2me.essentials.utils.LocationUtil;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import net.ess3.api.IEssentials;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.event.player.*;
-import org.bukkit.event.player.PlayerLoginEvent.Result;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.inventory.ItemStack;
-
-
-public class EssentialsPlayerListener implements Listener
-{
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private final transient IEssentials ess;
-
-	public EssentialsPlayerListener(final IEssentials parent)
-	{
-		this.ess = parent;
-	}
-
-	@EventHandler(priority = EventPriority.NORMAL)
-	public void onPlayerRespawn(final PlayerRespawnEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		updateCompass(user);
-		user.setDisplayNick();
-
-		if (ess.getSettings().isTeleportInvulnerability())
-		{
-			user.enableInvulnerabilityAfterTeleport();
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onPlayerChat(final AsyncPlayerChatEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		if (user.isMuted())
-		{
-			event.setCancelled(true);
-			user.sendMessage(_("voiceSilenced"));
-			LOGGER.info(_("mutedUserSpeaks", user.getName()));
-		}
-		try
-		{
-			final Iterator<Player> it = event.getRecipients().iterator();
-			while (it.hasNext())
-			{
-				final User u = ess.getUser(it.next());
-				if (u.isIgnoredPlayer(user))
-				{
-					it.remove();
-				}
-			}
-		}
-		catch (UnsupportedOperationException ex)
-		{
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().log(Level.INFO, "Ignore could not block chat due to custom chat plugin event.", ex);
-			}
-			else
-			{
-				ess.getLogger().info("Ignore could not block chat due to custom chat plugin event.");
-			}
-		}
-
-		user.updateActivity(true);
-		user.setDisplayNick();
-	}
-
-	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-	public void onPlayerMove(final PlayerMoveEvent event)
-	{
-		if (event.getFrom().getBlockX() == event.getTo().getBlockX()
-			&& event.getFrom().getBlockZ() == event.getTo().getBlockZ()
-			&& event.getFrom().getBlockY() == event.getTo().getBlockY())
-		{
-			return;
-		}
-
-		if (!ess.getSettings().cancelAfkOnMove() && !ess.getSettings().getFreezeAfkPlayers())
-		{
-			event.getHandlers().unregister(this);
-
-			if (ess.getSettings().isDebug())
-			{
-				LOGGER.log(Level.INFO, "Unregistering move listener");
-			}
-
-			return;
-		}
-
-		final User user = ess.getUser(event.getPlayer());
-		if (user.isAfk() && ess.getSettings().getFreezeAfkPlayers())
-		{
-			final Location from = event.getFrom();
-			final Location origTo = event.getTo();
-			final Location to = origTo.clone();
-			if (ess.getSettings().cancelAfkOnMove() && origTo.getY() >= from.getBlockY() + 1)
-			{
-				user.updateActivity(true);
-				return;
-			}
-			to.setX(from.getX());
-			to.setY(from.getY());
-			to.setZ(from.getZ());
-			try
-			{
-				event.setTo(LocationUtil.getSafeDestination(to));
-			}
-			catch (Exception ex)
-			{
-				event.setTo(to);
-			}
-			return;
-		}
-		final Location afk = user.getAfkPosition();
-		if (afk == null || !event.getTo().getWorld().equals(afk.getWorld()) || afk.distanceSquared(event.getTo()) > 9)
-		{
-			user.updateActivity(true);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerQuit(final PlayerQuitEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		if (ess.getSettings().removeGodOnDisconnect() && user.isGodModeEnabled())
-		{
-			user.setGodModeEnabled(false);
-		}
-		if (user.isVanished())
-		{
-			user.setVanished(false);
-		}
-		user.setLogoutLocation();
-		if (user.isRecipeSee())
-		{
-			user.getBase().getOpenInventory().getTopInventory().clear();
-		}
-		if (user.hasPermission("essentials.silentquit"))
-		{
-			event.setQuitMessage(null);
-		}
-		user.updateActivity(false);
-		user.dispose();
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerJoin(final PlayerJoinEvent event)
-	{
-		if (event.getPlayer().hasPermission("essentials.silentjoin"))
-		{
-			event.setJoinMessage(null);
-		}
-		ess.runTaskAsynchronously(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				delayedJoin(event.getPlayer());
-			}
-		});
-	}
-
-	public void delayedJoin(final Player player)
-	{
-		if (!player.isOnline())
-		{
-			return;
-		}
-
-		ess.getBackup().onPlayerJoin();
-		final User user = ess.getUser(player);
-
-		if (user.isNPC())
-		{
-			user.setNPC(false);
-		}
-
-		final long currentTime = System.currentTimeMillis();
-		user.checkMuteTimeout(currentTime);
-		user.updateActivity(false);
-
-		ess.scheduleSyncDelayedTask(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				if (!user.isOnline())
-				{
-					return;
-				}
-
-				user.setLastLogin(currentTime);
-				user.setDisplayNick();
-				updateCompass(user);
-
-				if (!ess.getVanishedPlayers().isEmpty() && !user.isAuthorized("essentials.vanish.see"))
-				{
-					for (String p : ess.getVanishedPlayers())
-					{
-						Player toVanish = ess.getServer().getPlayerExact(p);
-						if (toVanish != null && toVanish.isOnline())
-						{
-							user.hidePlayer(toVanish);
-						}
-					}
-				}
-
-				if (user.isAuthorized("essentials.sleepingignored"))
-				{
-					user.setSleepingIgnored(true);
-				}
-
-				if (!ess.getSettings().isCommandDisabled("motd") && user.isAuthorized("essentials.motd"))
-				{
-					try
-					{
-						final IText input = new TextInput(user.getSource(), "motd", true, ess);
-						final IText output = new KeywordReplacer(input, user.getSource(), ess);
-						final TextPager pager = new TextPager(output, true);
-						pager.showPage("1", null, "motd", user.getSource());
-					}
-					catch (IOException ex)
-					{
-						if (ess.getSettings().isDebug())
-						{
-							LOGGER.log(Level.WARNING, ex.getMessage(), ex);
-						}
-						else
-						{
-							LOGGER.log(Level.WARNING, ex.getMessage());
-						}
-					}
-				}
-
-				if (!ess.getSettings().isCommandDisabled("mail") && user.isAuthorized("essentials.mail"))
-				{
-					final List<String> mail = user.getMails();
-					if (mail.isEmpty())
-					{
-						user.sendMessage(_("noNewMail"));
-					}
-					else
-					{
-						user.sendMessage(_("youHaveNewMail", mail.size()));
-					}
-				}
-
-				if (user.isAuthorized("essentials.fly.safelogin"))
-				{
-					if (LocationUtil.shouldFly(user.getLocation()))
-					{
-						user.setAllowFlight(true);
-						user.setFlying(true);
-						user.sendMessage(_("flyMode", _("enabled"), user.getDisplayName()));
-					}
-				}
-				user.setFlySpeed(0.1f);
-				user.setWalkSpeed(0.2f);
-
-			}
-		});
-	}
-
-	// Makes the compass item ingame always point to the first essentials home.  #EasterEgg
-	private void updateCompass(final User user)
-	{
-		Location loc = user.getHome(user.getLocation());
-		if (loc == null)
-		{
-			loc = user.getBedSpawnLocation();
-		}
-		if (loc != null)
-		{
-			final Location updateLoc = loc;
-			user.setCompassTarget(updateLoc);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onPlayerLogin2(final PlayerLoginEvent event)
-	{
-		switch (event.getResult())
-		{
-		case KICK_BANNED:
-			break;
-		default:
-			return;
-		}
-
-		final String banReason = _("banFormat", _("defaultBanReason"), "Console");
-		event.disallow(Result.KICK_BANNED, banReason);
-	}
-
-	@EventHandler(priority = EventPriority.HIGH)
-	public void onPlayerLogin(final PlayerLoginEvent event)
-	{
-		switch (event.getResult())
-		{
-		case KICK_FULL:
-		case KICK_BANNED:
-			break;
-		default:
-			return;
-		}
-
-		final User user = ess.getUser(event.getPlayer());
-
-		if (event.getResult() == Result.KICK_BANNED || user.isBanned())
-		{
-			final boolean banExpired = user.checkBanTimeout(System.currentTimeMillis());
-			if (!banExpired)
-			{
-				String banReason = user.getBanReason();
-				if (banReason == null || banReason.isEmpty() || banReason.equalsIgnoreCase("ban"))
-				{
-					banReason = event.getKickMessage();
-				}
-				if (user.getBanTimeout() > 0)
-				{
-					//TODO: TL This
-					banReason += "\n\n" + "Expires in " + DateUtil.formatDateDiff(user.getBanTimeout());
-				}
-				event.disallow(Result.KICK_BANNED, banReason);
-				return;
-			}
-		}
-
-		if (event.getResult() == Result.KICK_FULL && !user.isAuthorized("essentials.joinfullserver"))
-		{
-			event.disallow(Result.KICK_FULL, _("serverFull"));
-			return;
-		}
-		event.allow();
-	}
-
-	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-	public void onPlayerTeleport(final PlayerTeleportEvent event)
-	{
-		final boolean backListener = ess.getSettings().registerBackInListener();
-		final boolean teleportInvulnerability = ess.getSettings().isTeleportInvulnerability();
-		if (backListener || teleportInvulnerability)
-		{
-			final User user = ess.getUser(event.getPlayer());
-			//There is TeleportCause.COMMMAND but plugins have to actively pass the cause in on their teleports.
-			if (backListener && (event.getCause() == TeleportCause.PLUGIN || event.getCause() == TeleportCause.COMMAND))
-			{
-				user.setLastLocation();
-			}
-			if (teleportInvulnerability)
-			{
-				user.enableInvulnerabilityAfterTeleport();
-			}
-		}
-	}
-
-	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-	public void onPlayerEggThrow(final PlayerEggThrowEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		final ItemStack stack = new ItemStack(Material.EGG, 1);
-		if (user.hasUnlimited(stack))
-		{
-			user.getInventory().addItem(stack);
-			user.updateInventory();
-		}
-	}
-
-	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-	public void onPlayerBucketEmpty(final PlayerBucketEmptyEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		if (user.hasUnlimited(new ItemStack(event.getBucket())))
-		{
-			event.getItemStack().setType(event.getBucket());
-			ess.scheduleSyncDelayedTask(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					user.updateInventory();
-				}
-			});
-		}
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-	public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event)
-	{
-		final Player player = event.getPlayer();
-		final String cmd = event.getMessage().toLowerCase(Locale.ENGLISH).split(" ")[0].replace("/", "").toLowerCase(Locale.ENGLISH);
-		if (ess.getSettings().getSocialSpyCommands().contains(cmd))
-		{
-			for (Player onlinePlayer : ess.getServer().getOnlinePlayers())
-			{
-				final User spyer = ess.getUser(onlinePlayer);
-				if (spyer.isSocialSpyEnabled() && !player.equals(onlinePlayer))
-				{
-					spyer.sendMessage(player.getDisplayName() + " : " + event.getMessage());
-				}
-			}
-		}
-		else if (!cmd.equalsIgnoreCase("afk"))
-		{
-			final User user = ess.getUser(player);
-			user.updateActivity(true);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.NORMAL)
-	public void onPlayerChangedWorldFlyReset(final PlayerChangedWorldEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		if (user.getGameMode() != GameMode.CREATIVE && !user.isAuthorized("essentials.fly"))
-		{
-			user.setFallDistance(0f);
-			user.setAllowFlight(false);
-		}
-		user.setFlySpeed(0.1f);
-		user.setWalkSpeed(0.2f);
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerChangedWorld(final PlayerChangedWorldEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		final String newWorld = event.getPlayer().getLocation().getWorld().getName();
-		user.setDisplayNick();
-		updateCompass(user);
-		if (ess.getSettings().getNoGodWorlds().contains(newWorld) && user.isGodModeEnabledRaw())
-		{
-			user.sendMessage(_("noGodWorldWarning"));
-		}
-
-		if (!user.getWorld().getName().equals(newWorld))
-		{
-			user.sendMessage(_("currentWorld", newWorld));
-		}
-		if (user.isVanished())
-		{
-			user.setVanished(user.isAuthorized("essentials.vanish"));
-		}
-	}
-
-	@EventHandler(priority = EventPriority.NORMAL)
-	public void onPlayerInteract(final PlayerInteractEvent event)
-	{
-		switch (event.getAction())
-		{
-		case RIGHT_CLICK_BLOCK:
-			if (!event.isCancelled() && event.getClickedBlock().getType() == Material.BED_BLOCK && ess.getSettings().getUpdateBedAtDaytime())
-			{
-				User player = ess.getUser(event.getPlayer());
-				if (player.isAuthorized("essentials.sethome.bed"))
-				{
-					player.setBedSpawnLocation(event.getClickedBlock().getLocation());
-					player.sendMessage(_("bedSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
-				}
-			}
-			break;
-		case LEFT_CLICK_AIR:
-			if (event.getPlayer().isFlying())
-			{
-				final User user = ess.getUser(event.getPlayer());
-				if (user.isFlyClickJump())
-				{
-					useFlyClickJump(user);
-					return;
-				}
-			}
-		case LEFT_CLICK_BLOCK:
-			if (event.getItem() != null && event.getItem().getType() != Material.AIR)
-			{
-				final User user = ess.getUser(event.getPlayer());
-				user.updateActivity(true);
-				if (user.hasPowerTools() && user.arePowerToolsEnabled() && usePowertools(user, event.getItem().getTypeId()))
-				{
-					event.setCancelled(true);
-				}
-			}
-			break;
-		default:
-			break;
-		}
-	}
-
-	// This method allows the /jump lock feature to work, allows teleporting while flying #EasterEgg
-	private void useFlyClickJump(final User user)
-	{
-		try
-		{
-			final Location otarget = LocationUtil.getTarget(user.getBase());
-
-			ess.scheduleSyncDelayedTask(
-					new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					Location loc = user.getLocation();
-					loc.setX(otarget.getX());
-					loc.setZ(otarget.getZ());
-					while (LocationUtil.isBlockDamaging(loc.getWorld(), loc.getBlockX(), loc.getBlockY() - 1, loc.getBlockZ()))
-					{
-						loc.setY(loc.getY() + 1d);
-					}
-					user.getBase().teleport(loc, TeleportCause.PLUGIN);
-				}
-			});
-		}
-		catch (Exception ex)
-		{
-			if (ess.getSettings().isDebug())
-			{
-				LOGGER.log(Level.WARNING, ex.getMessage(), ex);
-			}
-		}
-	}
-
-	private boolean usePowertools(final User user, final int id)
-	{
-		final List<String> commandList = user.getPowertool(id);
-		if (commandList == null || commandList.isEmpty())
-		{
-			return false;
-		}
-		boolean used = false;
-		// We need to loop through each command and execute
-		for (final String command : commandList)
-		{
-			if (command.contains("{player}"))
-			{
-				continue;
-			}
-			else if (command.startsWith("c:"))
-			{
-				used = true;
-				user.chat(command.substring(2));
-			}
-			else
-			{
-				used = true;
-				ess.scheduleSyncDelayedTask(
-						new Runnable()
-				{
-					@Override
-					public void run()
-					{
-						user.getServer().dispatchCommand(user.getBase(), command);
-						LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", user.getName(), command));
-					}
-				});
-			}
-		}
-		return used;
-	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onPlayerPickupItem(final PlayerPickupItemEvent event)
-	{
-		if (ess.getSettings().getDisableItemPickupWhileAfk())
-		{
-			if (ess.getUser(event.getPlayer()).isAfk())
-			{
-				event.setCancelled(true);
-			}
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-	public void onInventoryClickEvent(final InventoryClickEvent event)
-	{
-		final Inventory top = event.getView().getTopInventory();
-		final InventoryType type = top.getType();
-
-		if (type == InventoryType.PLAYER)
-		{
-			final User user = ess.getUser((Player)event.getWhoClicked());
-			final InventoryHolder invHolder = top.getHolder();
-			if (invHolder != null && invHolder instanceof HumanEntity)
-			{
-				final User invOwner = ess.getUser((Player)invHolder);
-				if (user.isInvSee() && (!user.isAuthorized("essentials.invsee.modify")
-										|| invOwner.isAuthorized("essentials.invsee.preventmodify")
-										|| !invOwner.isOnline()))
-				{
-					event.setCancelled(true);
-					user.updateInventory();
-				}
-			}
-		}
-		else if (type == InventoryType.ENDER_CHEST)
-		{
-			final User user = ess.getUser((Player)event.getWhoClicked());
-			if (user.isEnderSee() && (!user.isAuthorized("essentials.enderchest.modify")))
-			{
-				event.setCancelled(true);
-			}
-		}
-		else if (type == InventoryType.WORKBENCH)
-		{
-			User user = ess.getUser((Player)event.getWhoClicked());
-			if (user.isRecipeSee())
-			{
-				event.setCancelled(true);
-			}
-		}
-		else if (type == InventoryType.CHEST && top.getSize() == 9)
-		{
-			final User user = ess.getUser((Player)event.getWhoClicked());
-			final InventoryHolder invHolder = top.getHolder();
-			if (invHolder != null && invHolder instanceof HumanEntity && user.isInvSee())
-			{
-				event.setCancelled(true);
-			}
-		}
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onInventoryCloseEvent(final InventoryCloseEvent event)
-	{
-		final Inventory top = event.getView().getTopInventory();
-		final InventoryType type = top.getType();
-		if (type == InventoryType.PLAYER)
-		{
-			final User user = ess.getUser((Player)event.getPlayer());
-			user.setInvSee(false);
-			user.updateInventory();
-		}
-		else if (type == InventoryType.ENDER_CHEST)
-		{
-			final User user = ess.getUser((Player)event.getPlayer());
-			user.setEnderSee(false);
-			user.updateInventory();
-		}
-		else if (type == InventoryType.WORKBENCH)
-		{
-			final User user = ess.getUser((Player)event.getPlayer());
-			if (user.isRecipeSee())
-			{
-				user.setRecipeSee(false);
-				event.getView().getTopInventory().clear();
-				user.updateInventory();
-			}
-		}
-		else if (type == InventoryType.CHEST && top.getSize() == 9)
-		{
-			final InventoryHolder invHolder = top.getHolder();
-			if (invHolder != null && invHolder instanceof HumanEntity)
-			{
-				final User user = ess.getUser((Player)event.getPlayer());
-				user.setInvSee(false);
-				user.updateInventory();
-			}
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onPlayerFishEvent(final PlayerFishEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		user.updateActivity(true);
-	}
-}

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

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

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

@@ -1,124 +0,0 @@
-package com.earth2me.essentials;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Set;
-import java.util.logging.Level;
-import net.ess3.api.IEssentials;
-import org.bukkit.entity.Player;
-
-
-public class EssentialsTimer implements Runnable
-{
-	private final transient IEssentials ess;
-	private final transient Set<String> onlineUsers = new HashSet<String>();
-	private transient long lastPoll = System.nanoTime();
-	private final LinkedList<Double> history = new LinkedList<Double>();
-	private int skip1 = 0;
-	private int skip2 = 0;
-	private final long maxTime = 10 * 1000000;
-	private final long tickInterval = 50;
-	
-	EssentialsTimer(final IEssentials ess)
-	{
-		this.ess = ess;
-		history.add(20d);
-	}
-	
-	@Override
-	public void run()
-	{
-		final long startTime = System.nanoTime();
-		final long currentTime = System.currentTimeMillis();
-		long timeSpent = (startTime - lastPoll) / 1000;
-		if (timeSpent == 0)
-		{
-			timeSpent = 1;
-		}
-		if (history.size() > 10)
-		{
-			history.remove();
-		}
-		double tps = tickInterval * 1000000.0 / timeSpent;
-		if (tps <= 21)
-		{
-			history.add(tps);
-		}
-		lastPoll = startTime;
-		int count = 0;
-		for (Player player : ess.getServer().getOnlinePlayers())
-		{
-			count++;
-			if (skip1 > 0)
-			{
-				skip1--;
-				continue;
-			}
-			if (count % 10 == 0)
-			{
-				if (System.nanoTime() - startTime > maxTime / 2)
-				{
-					skip1 = count - 1;
-					break;
-				}
-			}
-			try
-			{
-				final User user = ess.getUser(player);
-				onlineUsers.add(user.getName());
-				user.setLastOnlineActivity(currentTime);
-				user.checkActivity();
-			}
-			catch (Exception e)
-			{
-				ess.getLogger().log(Level.WARNING, "EssentialsTimer Error:", e);
-			}
-		}
-		
-		count = 0;
-		final Iterator<String> iterator = onlineUsers.iterator();
-		while (iterator.hasNext())
-		{
-			count++;
-			if (skip2 > 0)
-			{
-				skip2--;
-				continue;
-			}
-			if (count % 10 == 0)
-			{
-				if (System.nanoTime() - startTime > maxTime)
-				{
-					skip2 = count - 1;
-					break;
-				}
-			}
-			final User user = ess.getUser(iterator.next());
-			if (user.getLastOnlineActivity() < currentTime && user.getLastOnlineActivity() > user.getLastLogout())
-			{
-				if (!user.isHidden()) {
-					user.setLastLogout(user.getLastOnlineActivity());
-				}
-				iterator.remove();
-				continue;
-			}
-			user.checkMuteTimeout(currentTime);
-			user.checkJailTimeout(currentTime);
-			user.resetInvulnerabilityAfterTeleport();
-		}
-	}
-	
-	public double getAverageTPS()
-	{
-		double avg = 0;
-		for (Double f : history)
-		{
-			if (f != null)
-			{
-				avg += f;
-			}
-		}		
-		return avg / history.size();
-	}
-}

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

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

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

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

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

@@ -1,189 +0,0 @@
-package com.earth2me.essentials;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.regex.Pattern;
-import net.ess3.api.IEssentials;
-
-
-public class I18n implements net.ess3.api.II18n
-{
-	private static I18n instance;
-	private static final String MESSAGES = "messages";
-	private final transient Locale defaultLocale = Locale.getDefault();
-	private transient Locale currentLocale = defaultLocale;
-	private transient ResourceBundle customBundle;
-	private transient ResourceBundle localeBundle;
-	private final transient ResourceBundle defaultBundle;
-	private final transient Map<String, MessageFormat> messageFormatCache = new HashMap<String, MessageFormat>();
-	private final transient IEssentials ess;
-	private final static Pattern NODOUBLEMARK = Pattern.compile("''");
-
-	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;
-	}
-
-	private 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 NODOUBLEMARK.matcher(instance.translate(string)).replaceAll("'");
-		}
-		else
-		{
-			return instance.format(string, objects);
-		}
-	}
-
-	public String format(final String string, final Object... objects)
-	{
-		String format = translate(string);
-		MessageFormat messageFormat = messageFormatCache.get(format);
-		if (messageFormat == null)
-		{
-			try
-			{
-				messageFormat = new MessageFormat(format);
-			}
-			catch (IllegalArgumentException e)
-			{
-				ess.getLogger().log(Level.SEVERE, "Invalid Translation key for '" + string + "': " + e.getMessage());
-				format = format.replaceAll("\\{(\\D*?)\\}", "\\[$1\\]");
-				messageFormat = new MessageFormat(format);
-			}
-			messageFormatCache.put(format, messageFormat);
-		}
-		return messageFormat.format(objects);
-	}
-
-	public void updateLocale(final String loc)
-	{
-		if (loc == null || loc.isEmpty())
-		{
-			return;
-		}
-		final String[] parts = loc.split("[_\\.]");
-		if (parts.length == 1)
-		{
-			currentLocale = new Locale(parts[0]);
-		}
-		if (parts.length == 2)
-		{
-			currentLocale = new Locale(parts[0], parts[1]);
-		}
-		if (parts.length == 3)
-		{
-			currentLocale = new Locale(parts[0], parts[1], parts[2]);
-		}
-		ResourceBundle.clearCache();
-		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;
-
-		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);
-		}
-	}
-}

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

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

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

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

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

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

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

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

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

@@ -1,200 +0,0 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.commands.IEssentialsCommand;
-import com.earth2me.essentials.signs.EssentialsSign;
-import com.earth2me.essentials.textreader.IText;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.bukkit.ChatColor;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.event.EventPriority;
-
-
-public interface ISettings extends IConf
-{
-	boolean areSignsDisabled();
-
-	IText getAnnounceNewPlayerFormat();
-
-	boolean getAnnounceNewPlayers();
-
-	String getNewPlayerKit();
-
-	String getBackupCommand();
-
-	long getBackupInterval();
-
-	String getChatFormat(String group);
-
-	int getChatRadius();
-
-	BigDecimal getCommandCost(IEssentialsCommand cmd);
-
-	BigDecimal getCommandCost(String label);
-
-	String getCurrencySymbol();
-
-	int getOversizedStackSize();
-
-	int getDefaultStackSize();
-
-	double getHealCooldown();
-
-	Set<String> getSocialSpyCommands();
-
-	Map<String, Object> getKit(String name);
-
-	ConfigurationSection getKits();
-
-	String getLocale();
-
-	String getNewbieSpawn();
-
-	String getNicknamePrefix();
-
-	ChatColor getOperatorColor() throws Exception;
-
-	boolean getPerWarpPermission();
-
-	boolean getProtectBoolean(final String configName, boolean def);
-
-	int getProtectCreeperMaxHeight();
-
-	List<Integer> getProtectList(final String configName);
-
-	boolean getProtectPreventSpawn(final String creatureName);
-
-	String getProtectString(final String configName);
-
-	boolean getRespawnAtHome();
-
-	Set getMultipleHomes();
-
-	int getHomeLimit(String set);
-
-	int getHomeLimit(User user);
-
-	int getSpawnMobLimit();
-
-	BigDecimal getStartingBalance();
-
-	double getTeleportCooldown();
-
-	double getTeleportDelay();
-
-	boolean hidePermissionlessHelp();
-
-	boolean isCommandDisabled(final IEssentialsCommand cmd);
-
-	boolean isCommandDisabled(String label);
-
-	boolean isCommandOverridden(String name);
-
-	boolean isDebug();
-
-	boolean isEcoDisabled();
-
-	boolean isTradeInStacks(int id);
-
-	List<Integer> itemSpawnBlacklist();
-
-	List<EssentialsSign> enabledSigns();
-
-	boolean permissionBasedItemSpawn();
-
-	boolean showNonEssCommandsInHelp();
-
-	boolean warnOnBuildDisallow();
-
-	boolean warnOnSmite();
-
-	BigDecimal getMaxMoney();
-
-	BigDecimal getMinMoney();
-
-	boolean isEcoLogEnabled();
-
-	boolean isEcoLogUpdateEnabled();
-
-	boolean removeGodOnDisconnect();
-
-	boolean changeDisplayName();
-
-	boolean changePlayerListName();
-
-	boolean isPlayerCommand(String string);
-
-	boolean useBukkitPermissions();
-
-	boolean addPrefixSuffix();
-
-	boolean disablePrefix();
-
-	boolean disableSuffix();
-
-	long getAutoAfk();
-
-	long getAutoAfkKick();
-
-	boolean getFreezeAfkPlayers();
-
-	boolean cancelAfkOnMove();
-
-	boolean cancelAfkOnInteract();
-
-	boolean areDeathMessagesEnabled();
-
-	void setDebug(boolean debug);
-
-	Set<String> getNoGodWorlds();
-
-	boolean getUpdateBedAtDaytime();
-
-	boolean allowUnsafeEnchantments();
-
-	boolean getRepairEnchanted();
-
-	boolean isWorldTeleportPermissions();
-
-	boolean isWorldHomePermissions();
-
-	boolean registerBackInListener();
-
-	boolean getDisableItemPickupWhileAfk();
-
-	EventPriority getRespawnPriority();
-
-	long getTpaAcceptCancellation();
-
-	boolean isMetricsEnabled();
-
-	void setMetricsEnabled(boolean metricsEnabled);
-
-	long getTeleportInvulnerability();
-
-	boolean isTeleportInvulnerability();
-
-	long getLoginAttackDelay();
-
-	int getSignUsePerSecond();
-
-	double getMaxFlySpeed();
-
-	double getMaxWalkSpeed();
-
-	int getMailsPerMinute();
-
-	long getEconomyLagWarning();
-
-	void setEssentialsChatActive(boolean b);
-
-	long getMaxTempban();
-
-	Map<String, Object> getListGroupConfig();
-
-	int getMaxNickLength();
-	
-	int getMaxUserCacheCount();
-}

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

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

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

@@ -1,293 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.NumberUtil;
-import com.earth2me.essentials.utils.StringUtil;
-import java.util.*;
-import java.util.regex.Pattern;
-import net.ess3.api.IEssentials;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-
-
-public class ItemDb implements IConf, net.ess3.api.IItemDb
-{
-	private final transient IEssentials ess;
-	private final transient Map<String, Integer> items = new HashMap<String, Integer>();
-	private final transient Map<ItemData, List<String>> names = new HashMap<ItemData, List<String>>();
-	private final transient Map<ItemData, String> primaryName = new HashMap<ItemData, String>();
-	private final transient Map<String, Short> durabilities = new HashMap<String, Short>();
-	private final transient ManagedFile file;
-	private final transient Pattern splitPattern = Pattern.compile("[:+',;.]");
-
-		public ItemDb(final IEssentials ess)
-		{
-			this.ess = ess;
-			file = new ManagedFile("items.csv", ess);
-		}
-
-	@Override
-	public void reloadConfig()
-	{
-		final List<String> lines = file.getLines();
-
-		if (lines.isEmpty())
-		{
-			return;
-		}
-
-		durabilities.clear();
-		items.clear();
-		names.clear();
-		primaryName.clear();
-
-		for (String line : lines)
-		{
-			line = line.trim().toLowerCase(Locale.ENGLISH);
-			if (line.length() > 0 && line.charAt(0) == '#')
-			{
-				continue;
-			}
-
-			final String[] parts = line.split("[^a-z0-9]");
-			if (parts.length < 2)
-			{
-				continue;
-			}
-
-			final int numeric = Integer.parseInt(parts[1]);
-			final short data = parts.length > 2 && !parts[2].equals("0") ? Short.parseShort(parts[2]) : 0;
-			String itemName = parts[0].toLowerCase(Locale.ENGLISH);
-
-			durabilities.put(itemName, data);
-			items.put(itemName, numeric);
-
-			ItemData itemData = new ItemData(numeric, data);
-			if (names.containsKey(itemData))
-			{
-				List<String> nameList = names.get(itemData);
-				nameList.add(itemName);
-				Collections.sort(nameList, new LengthCompare());
-			}
-			else
-			{
-				List<String> nameList = new ArrayList<String>();
-				nameList.add(itemName);
-				names.put(itemData, nameList);
-				primaryName.put(itemData, itemName);
-			}
-		}
-	}
-
-	@Override
-	public ItemStack get(final String id, final int quantity) throws Exception
-	{
-		final ItemStack retval = get(id.toLowerCase(Locale.ENGLISH));
-		retval.setAmount(quantity);
-		return retval;
-	}
-
-	@Override
-	public ItemStack get(final String id) throws Exception
-	{
-		int itemid = 0;
-		String itemname = null;
-		short metaData = 0;
-		String[] parts = splitPattern.split(id);
-		if (id.matches("^\\d+[:+',;.]\\d+$"))
-		{
-			itemid = Integer.parseInt(parts[0]);
-			metaData = Short.parseShort(parts[1]);
-		}
-		else if (NumberUtil.isInt(id))
-		{
-			itemid = Integer.parseInt(id);
-		}
-		else if (id.matches("^[^:+',;.]+[:+',;.]\\d+$"))
-		{
-			itemname = parts[0].toLowerCase(Locale.ENGLISH);
-			metaData = Short.parseShort(parts[1]);
-		}
-		else
-		{
-			itemname = id.toLowerCase(Locale.ENGLISH);
-		}
-
-		if (itemname != null)
-		{
-			if (items.containsKey(itemname))
-			{
-				itemid = items.get(itemname);
-				if (durabilities.containsKey(itemname) && metaData == 0)
-				{
-					metaData = durabilities.get(itemname);
-				}
-			}
-			else if (Material.getMaterial(itemname.toUpperCase(Locale.ENGLISH)) != null)
-			{
-				itemid = Material.getMaterial(itemname.toUpperCase(Locale.ENGLISH)).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;
-	}
-
-	@Override
-	public List<ItemStack> getMatching(User user, String[] args) throws Exception
-	{
-		List<ItemStack> is = new ArrayList<ItemStack>();
-
-		if (args.length < 1)
-		{
-			is.add(user.getItemInHand());
-		}
-		else if (args[0].equalsIgnoreCase("hand"))
-		{
-			is.add(user.getItemInHand());
-		}
-		else if (args[0].equalsIgnoreCase("inventory") || args[0].equalsIgnoreCase("invent") || args[0].equalsIgnoreCase("all"))
-		{
-			for (ItemStack stack : user.getInventory().getContents())
-			{
-				if (stack == null || stack.getType() == Material.AIR)
-				{
-					continue;
-				}
-				is.add(stack);
-			}
-		}
-		else if (args[0].equalsIgnoreCase("blocks"))
-		{
-			for (ItemStack stack : user.getInventory().getContents())
-			{
-				if (stack == null || stack.getTypeId() > 255 || stack.getType() == Material.AIR)
-				{
-					continue;
-				}
-				is.add(stack);
-			}
-		}
-		else
-		{
-			is.add(get(args[0]));
-		}
-
-		if (is.isEmpty() || is.get(0).getType() == Material.AIR)
-		{
-			throw new Exception(_("itemSellAir"));
-		}
-
-		return is;
-	}
-
-@Override
-	public String names(ItemStack item)
-	{
-		ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
-		List<String> nameList = names.get(itemData);
-		if (nameList == null)
-		{
-			itemData = new ItemData(item.getTypeId(), (short)0);
-			nameList = names.get(itemData);
-			if (nameList == null)
-			{
-				return null;
-			}
-		}
-
-		if (nameList.size() > 15)
-		{
-			nameList = nameList.subList(0, 14);
-		}
-		return StringUtil.joinList(", ", nameList);
-	}
-
-@Override
-	public String name(ItemStack item)
-	{
-		ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
-		String name = primaryName.get(itemData);
-		if (name == null)
-		{
-			itemData = new ItemData(item.getTypeId(), (short)0);
-			name = primaryName.get(itemData);
-			if (name == null)
-			{
-				return null;
-			}
-		}
-		return name;
-	}
-
-	static class ItemData
-	{
-		final private int itemNo;
-		final private short itemData;
-
-		ItemData(final int itemNo, final short itemData)
-		{
-			this.itemNo = itemNo;
-			this.itemData = itemData;
-		}
-
-		public int getItemNo()
-		{
-			return itemNo;
-		}
-
-		public short getItemData()
-		{
-			return itemData;
-		}
-
-		@Override
-		public int hashCode()
-		{
-			return (31 * itemNo) ^ itemData;
-		}
-
-		@Override
-		public boolean equals(Object o)
-		{
-			if (o == null)
-			{
-				return false;
-			}
-			if (!(o instanceof ItemData))
-			{
-				return false;
-			}
-			ItemData pairo = (ItemData)o;
-			return this.itemNo == pairo.getItemNo()
-				   && this.itemData == pairo.getItemData();
-		}
-	}
-
-
-	class LengthCompare implements java.util.Comparator<String>
-	{
-		public LengthCompare()
-		{
-			super();
-		}
-
-		@Override
-		public int compare(String s1, String s2)
-		{
-			return s1.length() - s2.length();
-		}
-	}
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,336 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.StringUtil;
-import java.util.*;
-import java.util.logging.Logger;
-import org.bukkit.DyeColor;
-import org.bukkit.Material;
-import org.bukkit.entity.Ageable;
-import org.bukkit.entity.Creeper;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.ExperienceOrb;
-import org.bukkit.entity.Horse;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Ocelot;
-import org.bukkit.entity.Pig;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Skeleton;
-import org.bukkit.entity.Slime;
-import org.bukkit.entity.Tameable;
-import org.bukkit.entity.Villager;
-import org.bukkit.entity.Wolf;
-import org.bukkit.entity.Zombie;
-import org.bukkit.inventory.EntityEquipment;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.material.Colorable;
-
-
-public enum MobData
-{
-	BABY_AGEABLE("baby", Ageable.class, Data.BABY, true),
-	BABY_PIG("piglet", EntityType.PIG, Data.BABY, false),
-	BABY_WOLF("puppy", EntityType.WOLF, Data.BABY, false),
-	BABY_CHICKEN("chick", EntityType.CHICKEN, Data.BABY, false),
-	BABY_HORSE("colt", EntityType.HORSE, Data.BABY, false),
-	BABY_OCELOT("kitten", EntityType.OCELOT, Data.BABY, false),
-	BABY_SHEEP("lamb", EntityType.SHEEP, Data.BABY, false),
-	BABY_COW("calf", EntityType.COW.getEntityClass(), Data.BABY, false),
-	BABY_VILLAGER("child", EntityType.VILLAGER, Data.BABY, false),
-	TAMED_TAMEABLE("tamed", Tameable.class, Data.TAMED, true),
-	TAME_TAMEABLE("tame", Tameable.class, Data.TAMED, false),
-	RANDOM_SHEEP("random", EntityType.SHEEP, Data.COLORABLE, true),
-	COLORABLE_SHEEP("", StringUtil.joinList(DyeColor.values()).toLowerCase(Locale.ENGLISH), EntityType.SHEEP, Data.COLORABLE, true),
-	DONKEY_HORSE("donkey", EntityType.HORSE, Horse.Variant.DONKEY, true),
-	MULE_HORSE("mule", EntityType.HORSE, Horse.Variant.MULE, true),
-	SKELETON_HORSE("skeleton", EntityType.HORSE, Horse.Variant.SKELETON_HORSE, true),
-	UNDEAD_HORSE("undead", EntityType.HORSE, Horse.Variant.UNDEAD_HORSE, true),
-	ZOMBIE_HORSE("zombie", EntityType.HORSE, Horse.Variant.UNDEAD_HORSE, false),
-	POLKA_HORSE("polka", EntityType.HORSE, Horse.Style.BLACK_DOTS, true),
-	SOOTY_HORSE("sooty", EntityType.HORSE, Horse.Style.BLACK_DOTS, false),
-	BLAZE_HORSE("blaze", EntityType.HORSE, Horse.Style.WHITE, true),
-	SOCKS_HORSE("socks", EntityType.HORSE, Horse.Style.WHITE, false),
-	LEOPARD_HORSE("leopard", EntityType.HORSE, Horse.Style.WHITE_DOTS, true),
-	APPALOOSA_HORSE("appaloosa", EntityType.HORSE, Horse.Style.WHITE_DOTS, false),
-	PAINT_HORSE("paint", EntityType.HORSE, Horse.Style.WHITEFIELD, true),
-	MILKY_HORSE("milky", EntityType.HORSE, Horse.Style.WHITEFIELD, false),
-	SPLOTCHY_HORSE("splotchy", EntityType.HORSE, Horse.Style.WHITEFIELD, false),
-	BLACK_HORSE("black", EntityType.HORSE, Horse.Color.BLACK, true),
-	CHESTNUT_HORSE("chestnut", EntityType.HORSE, Horse.Color.CHESTNUT, true),
-	LIVER_HORSE("liver", EntityType.HORSE, Horse.Color.CHESTNUT, false),
-	CREAMY_HORSE("creamy", EntityType.HORSE, Horse.Color.CREAMY, true),
-	FLAXEN_HORSE("flaxen", EntityType.HORSE, Horse.Color.CREAMY, false),
-	GRAY_HORSE("gray", EntityType.HORSE, Horse.Color.GRAY, true),
-	DAPPLE_HORSE("dapple", EntityType.HORSE, Horse.Color.GRAY, false),
-	BUCKSKIN_HORSE("buckskin", EntityType.HORSE, Horse.Color.DARK_BROWN, true),
-	DARKBROWN_HORSE("darkbrown", EntityType.HORSE, Horse.Color.DARK_BROWN, false),
-	DARK_HORSE("dark", EntityType.HORSE, Horse.Color.DARK_BROWN, false),
-	DBROWN_HORSE("dbrown", EntityType.HORSE, Horse.Color.DARK_BROWN, false),
-	BAY_HORSE("bay", EntityType.HORSE, Horse.Color.BROWN, true),
-	BROWN_HORSE("brown", EntityType.HORSE, Horse.Color.BROWN, false),
-	CHEST_HORSE("chest", EntityType.HORSE, Data.CHEST, true),
-	SADDLE_HORSE("saddle", EntityType.HORSE, Data.HORSESADDLE, true),
-	GOLD_ARMOR_HORSE("goldarmor", EntityType.HORSE, Material.GOLD_BARDING, true),
-	DIAMOND_ARMOR_HORSE("diamondarmor", EntityType.HORSE, Material.DIAMOND_BARDING, true),
-	ARMOR_HORSE("armor", EntityType.HORSE, Material.IRON_BARDING, true),
-	SIAMESE_CAT("siamese", EntityType.OCELOT, Ocelot.Type.SIAMESE_CAT, true),
-	WHITE_CAT("white", EntityType.OCELOT, Ocelot.Type.SIAMESE_CAT, false),
-	RED_CAT("red", EntityType.OCELOT, Ocelot.Type.RED_CAT, true),
-	ORANGE_CAT("orange", EntityType.OCELOT, Ocelot.Type.RED_CAT, false),
-	TABBY_CAT("tabby", EntityType.OCELOT, Ocelot.Type.RED_CAT, false),
-	BLACK_CAT("black", EntityType.OCELOT, Ocelot.Type.BLACK_CAT, true),
-	TUXEDO_CAT("tuxedo", EntityType.OCELOT, Ocelot.Type.BLACK_CAT, false),
-	VILLAGER_ZOMBIE("villager", EntityType.ZOMBIE.getEntityClass(), Data.VILLAGER, true),
-	BABY_ZOMBIE("baby", EntityType.ZOMBIE.getEntityClass(), Data.BABYZOMBIE, true),
-	DIAMOND_SWORD_ZOMBIE("diamondsword", EntityType.ZOMBIE.getEntityClass(), Material.DIAMOND_SWORD, true),
-	GOLD_SWORD_ZOMBIE("goldsword", EntityType.ZOMBIE.getEntityClass(), Material.GOLD_SWORD, true),
-	IRON_SWORD_ZOMBIE("ironsword", EntityType.ZOMBIE.getEntityClass(), Material.IRON_SWORD, true),
-	STONE_SWORD_ZOMBIE("stonesword", EntityType.ZOMBIE.getEntityClass(), Material.STONE_SWORD, false),
-	SWORD_ZOMBIE("sword", EntityType.ZOMBIE.getEntityClass(), Material.STONE_SWORD, true),
-	DIAMOND_SWORD_SKELETON("diamondsword", EntityType.SKELETON, Material.DIAMOND_SWORD, true),
-	GOLD_SWORD_SKELETON("goldsword", EntityType.SKELETON, Material.GOLD_SWORD, true),
-	IRON_SWORD_SKELETON("ironsword", EntityType.SKELETON, Material.IRON_SWORD, true),
-	STONE_SWORD_SKELETON("stonesword", EntityType.SKELETON, Material.STONE_SWORD, false),
-	SWORD_SKELETON("sword", EntityType.SKELETON, Material.STONE_SWORD, true),
-	WHITHER_SKELETON("wither", EntityType.SKELETON, Data.WITHER, true),
-	POWERED_CREEPER("powered", EntityType.CREEPER, Data.ELECTRIFIED, true),
-	ELECTRIC_CREEPER("electric", EntityType.CREEPER, Data.ELECTRIFIED, false),
-	CHARGED_CREEPER("charged", EntityType.CREEPER, Data.ELECTRIFIED, false),
-	SADDLE_PIG("saddle", EntityType.PIG, Data.PIGSADDLE, true),
-	ANGRY_WOLF("angry", EntityType.WOLF, Data.ANGRY, true),
-	RABID_WOLF("rabid", EntityType.WOLF, Data.ANGRY, false),
-	FARMER_VILLAGER("farmer", EntityType.VILLAGER, Villager.Profession.FARMER, true),
-	LIBRARIAN_VILLAGER("librarian", EntityType.VILLAGER, Villager.Profession.LIBRARIAN, true),
-	PRIEST_VILLAGER("priest", EntityType.VILLAGER, Villager.Profession.PRIEST, true),
-	FATHER_VILLAGER("father", EntityType.VILLAGER, Villager.Profession.PRIEST, false),
-	SMITH_VILLAGER("smith", EntityType.VILLAGER, Villager.Profession.BLACKSMITH, true),
-	BUTCHER_VILLAGER("butcher", EntityType.VILLAGER, Villager.Profession.BUTCHER, true),
-	SIZE_SLIME("", "<1-100>", EntityType.SLIME.getEntityClass(), Data.SIZE, true),
-	NUM_EXPERIENCE_ORB("", "<1-2000000000>", EntityType.EXPERIENCE_ORB, Data.EXP, true);
-
-
-	public enum Data
-	{
-		BABY,
-		CHEST,
-		BABYZOMBIE,
-		VILLAGER,
-		HORSESADDLE,
-		PIGSADDLE,
-		ELECTRIFIED,
-		WITHER,
-		ANGRY,
-		TAMED,
-		COLORABLE,
-		EXP,
-		SIZE;
-	}
-	public static final Logger logger = Logger.getLogger("Minecraft");
-
-	private MobData(String n, Object type, Object value, boolean isPublic)
-	{
-		this.nickname = n;
-		this.matched = n;
-		this.helpMessage = n;
-		this.type = type;
-		this.value = value;
-		this.isPublic = isPublic;
-	}
-
-	private MobData(String n, String h, Object type, Object value, boolean isPublic)
-	{
-		this.nickname = n;
-		this.matched = n;
-		this.helpMessage = h;
-		this.type = type;
-		this.value = value;
-		this.isPublic = isPublic;
-	}
-	final private String nickname;
-	final private String helpMessage;
-	final private Object type;
-	final private Object value;
-	final private boolean isPublic;
-	private String matched;
-
-	public static LinkedHashMap<String, MobData> getPossibleData(final Entity spawned, boolean publicOnly)
-	{
-		LinkedHashMap<String, MobData> mobList = new LinkedHashMap<String, MobData>();
-		for (MobData data : MobData.values())
-		{
-			if (data.type instanceof EntityType && spawned.getType().equals(data.type) && ((publicOnly && data.isPublic) || !publicOnly))
-			{
-				mobList.put(data.nickname.toLowerCase(Locale.ENGLISH), data);
-			}
-			else if (data.type instanceof Class && ((Class)data.type).isAssignableFrom(spawned.getClass()) && ((publicOnly && data.isPublic) || !publicOnly))
-			{
-				mobList.put(data.nickname.toLowerCase(Locale.ENGLISH), data);
-			}
-		}
-
-		return mobList;
-	}
-
-	public static List<String> getValidHelp(final Entity spawned)
-	{
-		List<String> output = new ArrayList<String>();
-		LinkedHashMap<String, MobData> posData = getPossibleData(spawned, true);
-
-		for (MobData data : posData.values())
-		{
-			output.add(data.helpMessage);
-		}
-		return output;
-	}
-
-	public static MobData fromData(final Entity spawned, final String name)
-	{
-		if (name.isEmpty())
-		{
-			return null;
-		}
-
-		LinkedHashMap<String, MobData> posData = getPossibleData(spawned, false);
-		for (String data : posData.keySet())
-		{
-			if (name.contains(data))
-			{
-				return posData.get(data);
-			}
-		}
-		return null;
-	}
-
-	public String getMatched()
-	{
-		return this.matched;
-	}
-
-	public void setData(final Entity spawned, final Player target, final String rawData) throws Exception
-	{
-		if (this.value.equals(Data.ANGRY))
-		{
-			((Wolf)spawned).setAngry(true);
-		}
-		else if (this.value.equals(Data.BABY))
-		{
-			((Ageable)spawned).setBaby();
-		}
-		else if (this.value.equals(Data.BABYZOMBIE))
-		{
-			((Zombie)spawned).setBaby(true);
-		}
-		else if (this.value.equals(Data.CHEST))
-		{
-			((Horse)spawned).setTamed(true);
-			((Horse)spawned).setCarryingChest(true);
-		}
-		else if (this.value.equals(Data.ELECTRIFIED))
-		{
-			((Creeper)spawned).setPowered(true);
-		}
-		else if (this.value.equals(Data.HORSESADDLE))
-		{
-			((Horse)spawned).setTamed(true);
-			((Horse)spawned).getInventory().setSaddle(new ItemStack(Material.SADDLE, 1));
-		}
-		else if (this.value.equals(Data.PIGSADDLE))
-		{
-			((Pig)spawned).setSaddle(true);
-		}
-		else if (this.value.equals(Data.TAMED))
-		{
-			final Tameable tameable = ((Tameable)spawned);
-			tameable.setTamed(true);
-			tameable.setOwner(target);
-		}
-		else if (this.value.equals(Data.VILLAGER))
-		{
-			((Zombie)spawned).setVillager(this.value.equals(Data.VILLAGER));
-		}
-		else if (this.value.equals(Data.WITHER))
-		{
-			((Skeleton)spawned).setSkeletonType(Skeleton.SkeletonType.WITHER);
-		}
-		else if (this.value.equals(Data.COLORABLE))
-		{
-			final String color = rawData.toUpperCase(Locale.ENGLISH);
-			try
-			{
-				if (color.equals("RANDOM"))
-				{
-					final Random rand = new Random();
-					((Colorable)spawned).setColor(DyeColor.values()[rand.nextInt(DyeColor.values().length)]);
-				}
-				else if (!color.isEmpty())
-				{
-					((Colorable)spawned).setColor(DyeColor.valueOf(color));
-				}
-				this.matched = rawData;
-			}
-			catch (Exception e)
-			{
-				throw new Exception(_("sheepMalformedColor"), e);
-			}
-		}
-		else if (this.value.equals(Data.EXP))
-		{
-			try
-			{
-				((ExperienceOrb)spawned).setExperience(Integer.parseInt(rawData));
-				this.matched = rawData;
-			}
-			catch (NumberFormatException e)
-			{
-				throw new Exception(_("invalidNumber"), e);
-			}
-		}
-		else if (this.value.equals(Data.SIZE))
-		{
-			try
-			{
-				((Slime)spawned).setSize(Integer.parseInt(rawData));
-				this.matched = rawData;
-			}
-			catch (NumberFormatException e)
-			{
-				throw new Exception(_("slimeMalformedSize"), e);
-			}
-		}
-		else if (this.value instanceof Horse.Color)
-		{
-			((Horse)spawned).setColor((Horse.Color)this.value);
-		}
-		else if (this.value instanceof Horse.Style)
-		{
-			((Horse)spawned).setStyle((Horse.Style)this.value);
-		}
-		else if (this.value instanceof Horse.Variant)
-		{
-			((Horse)spawned).setVariant((Horse.Variant)this.value);
-		}
-		else if (this.value instanceof Ocelot.Type)
-		{
-			((Ocelot)spawned).setCatType((Ocelot.Type)this.value);
-		}
-		else if (this.value instanceof Villager.Profession)
-		{
-			((Villager)spawned).setProfession((Villager.Profession)this.value);
-		}
-		else if (this.value instanceof Material)
-		{
-			if (this.type.equals(EntityType.HORSE))
-			{
-				((Horse)spawned).setTamed(true);
-				((Horse)spawned).getInventory().setArmor(new ItemStack((Material)this.value, 1));
-			}
-			else if (this.type.equals(EntityType.ZOMBIE.getEntityClass()) || this.type.equals(EntityType.SKELETON))
-			{
-				final EntityEquipment invent = ((LivingEntity)spawned).getEquipment();
-				invent.setItemInHand(new ItemStack((Material)this.value, 1));
-				invent.setItemInHandDropChance(0.1f);
-			}
-		}
-	}
-}

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

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

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

@@ -1,151 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.FormatUtil;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-
-
-public class PlayerList
-{
-	// Cosmetic list formatting
-	static public String listUsers(final IEssentials ess, final List<User> users, final String seperator)
-	{
-		final StringBuilder groupString = new StringBuilder();
-		Collections.sort(users);
-		boolean needComma = false;
-		for (User user : users)
-		{
-			if (needComma)
-			{
-				groupString.append(seperator);
-			}
-			needComma = true;
-			if (user.isAfk())
-			{
-				groupString.append(_("listAfkTag"));
-			}
-			if (user.isHidden())
-			{
-				groupString.append(_("listHiddenTag"));
-			}
-			user.setDisplayNick();
-			groupString.append(user.getDisplayName());
-			groupString.append("\u00a7f");
-		}
-		return groupString.toString();
-	}
-
-	// Produce a user summary: There are 5 out of maximum 10 players online.
-	static public String listSummary(final IEssentials ess, final boolean showHidden)
-	{
-		Server server = ess.getServer();
-		int playerHidden = 0;
-		for (Player onlinePlayer : server.getOnlinePlayers())
-		{
-			if (ess.getUser(onlinePlayer).isHidden())
-			{
-				playerHidden++;
-			}
-		}
-		String online;
-		if (showHidden && playerHidden > 0)
-		{
-			online = _("listAmountHidden", server.getOnlinePlayers().length - playerHidden, playerHidden, server.getMaxPlayers());
-		}
-		else
-		{
-			online = _("listAmount", server.getOnlinePlayers().length - playerHidden, server.getMaxPlayers());
-		}
-		return online;
-	}
-
-	// Build the basic player list, divided by groups.
-	static public Map<String, List<User>> getPlayerLists(final IEssentials ess, final boolean showHidden)
-	{
-		Server server = ess.getServer();
-		final Map<String, List<User>> playerList = new HashMap<String, List<User>>();
-		for (Player onlinePlayer : server.getOnlinePlayers())
-		{
-			final User onlineUser = ess.getUser(onlinePlayer);
-			if (onlineUser.isHidden() && !showHidden)
-			{
-				continue;
-			}
-			final String group = FormatUtil.stripFormat(FormatUtil.stripEssentialsFormat(onlineUser.getGroup().toLowerCase()));
-			List<User> list = playerList.get(group);
-			if (list == null)
-			{
-				list = new ArrayList<User>();
-				playerList.put(group, list);
-			}
-			list.add(onlineUser);
-		}
-		return playerList;
-	}
-
-	// Handle the merging of groups
-	static public List<User> getMergedList(final IEssentials ess, final Map<String, List<User>> playerList, final String groupName)
-	{
-		final Set<String> configGroups = ess.getSettings().getListGroupConfig().keySet();
-		final List<User> users = new ArrayList<User>();
-		for (String configGroup : configGroups)
-		{
-			if (configGroup.equalsIgnoreCase(groupName))
-			{
-				String[] groupValues = ess.getSettings().getListGroupConfig().get(configGroup).toString().trim().split(" ");
-				for (String groupValue : groupValues)
-				{
-					groupValue = groupValue.toLowerCase(Locale.ENGLISH);
-					if (groupValue == null || groupValue.isEmpty())
-					{
-						continue;
-					}
-					List<User> u = playerList.get(groupValue.trim());
-					if (u == null || u.isEmpty())
-					{
-						continue;
-					}
-					playerList.remove(groupValue);
-					users.addAll(u);
-				}
-			}
-		}
-		return users;
-	}
-
-	// Output a playerlist of just a single group, /list <groupname>
-	static public String listGroupUsers(final IEssentials ess, final Map<String, List<User>> playerList, final String groupName) throws Exception
-	{
-		final List<User> users = getMergedList(ess, playerList, groupName);
-		final List<User> groupUsers = playerList.get(groupName);
-		if (groupUsers != null && !groupUsers.isEmpty())
-		{
-			users.addAll(groupUsers);
-		}
-		if (users == null || users.isEmpty())
-		{
-			throw new Exception(_("groupDoesNotExist"));
-		}
-		final StringBuilder displayGroupName = new StringBuilder();
-		displayGroupName.append(Character.toTitleCase(groupName.charAt(0)));
-		displayGroupName.append(groupName.substring(1));
-		return outputFormat(displayGroupName.toString(), listUsers(ess, users, ", "));
-	}
-
-	// Build the output string
-	static public String outputFormat(final String group, final String message)
-	{
-		final StringBuilder outputString = new StringBuilder();
-		outputString.append(_("listGroupTag", FormatUtil.replaceFormat(group)));
-		outputString.append(message);
-		return outputString.toString();
-	}
-}

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

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

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

@@ -1,147 +0,0 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.utils.NumberUtil;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import org.bukkit.potion.PotionEffectType;
-
-
-public class Potions
-{
-	private static final Map<String, PotionEffectType> POTIONS = new HashMap<String, PotionEffectType>();
-	private static final Map<String, PotionEffectType> ALIASPOTIONS = new HashMap<String, PotionEffectType>();
-
-	static
-	{
-
-		POTIONS.put("speed", PotionEffectType.SPEED);
-		ALIASPOTIONS.put("fast", PotionEffectType.SPEED);
-		ALIASPOTIONS.put("runfast", PotionEffectType.SPEED);
-		ALIASPOTIONS.put("sprint", PotionEffectType.SPEED);
-		ALIASPOTIONS.put("swift", PotionEffectType.SPEED);
-
-		POTIONS.put("slowness", PotionEffectType.SLOW);
-		ALIASPOTIONS.put("slow", PotionEffectType.SLOW);
-		ALIASPOTIONS.put("sluggish", PotionEffectType.SLOW);
-
-		POTIONS.put("haste", PotionEffectType.FAST_DIGGING);
-		ALIASPOTIONS.put("superpick", PotionEffectType.FAST_DIGGING);
-		ALIASPOTIONS.put("quickmine", PotionEffectType.FAST_DIGGING);
-		ALIASPOTIONS.put("digspeed", PotionEffectType.FAST_DIGGING);
-		ALIASPOTIONS.put("digfast", PotionEffectType.FAST_DIGGING);
-		ALIASPOTIONS.put("sharp", PotionEffectType.FAST_DIGGING);
-
-		POTIONS.put("fatigue", PotionEffectType.SLOW_DIGGING);
-		ALIASPOTIONS.put("slow", PotionEffectType.SLOW_DIGGING);
-		ALIASPOTIONS.put("dull", PotionEffectType.SLOW_DIGGING);
-
-		POTIONS.put("strength", PotionEffectType.INCREASE_DAMAGE);
-		ALIASPOTIONS.put("strong", PotionEffectType.INCREASE_DAMAGE);
-		ALIASPOTIONS.put("bull", PotionEffectType.INCREASE_DAMAGE);
-		ALIASPOTIONS.put("attack", PotionEffectType.INCREASE_DAMAGE);
-
-		POTIONS.put("heal", PotionEffectType.HEAL);
-		ALIASPOTIONS.put("healthy", PotionEffectType.HEAL);
-		ALIASPOTIONS.put("instaheal", PotionEffectType.HEAL);
-
-		POTIONS.put("harm", PotionEffectType.HARM);
-		ALIASPOTIONS.put("harming", PotionEffectType.HARM);
-		ALIASPOTIONS.put("injure", PotionEffectType.HARM);
-		ALIASPOTIONS.put("damage", PotionEffectType.HARM);
-		ALIASPOTIONS.put("inflict", PotionEffectType.HARM);
-
-		POTIONS.put("jump", PotionEffectType.JUMP);
-		ALIASPOTIONS.put("leap", PotionEffectType.JUMP);
-
-		POTIONS.put("nausea", PotionEffectType.CONFUSION);
-		ALIASPOTIONS.put("sick", PotionEffectType.CONFUSION);
-		ALIASPOTIONS.put("sickness", PotionEffectType.CONFUSION);
-		ALIASPOTIONS.put("confusion", PotionEffectType.CONFUSION);
-
-		POTIONS.put("regeneration", PotionEffectType.REGENERATION);
-		ALIASPOTIONS.put("regen", PotionEffectType.REGENERATION);
-
-		POTIONS.put("resistance", PotionEffectType.DAMAGE_RESISTANCE);
-		ALIASPOTIONS.put("dmgresist", PotionEffectType.DAMAGE_RESISTANCE);
-		ALIASPOTIONS.put("armor", PotionEffectType.DAMAGE_RESISTANCE);
-
-		POTIONS.put("fireresist", PotionEffectType.FIRE_RESISTANCE);
-		ALIASPOTIONS.put("fireresistance", PotionEffectType.FIRE_RESISTANCE);
-		ALIASPOTIONS.put("resistfire", PotionEffectType.FIRE_RESISTANCE);
-
-		POTIONS.put("waterbreath", PotionEffectType.WATER_BREATHING);
-		ALIASPOTIONS.put("waterbreathing", PotionEffectType.WATER_BREATHING);
-
-		POTIONS.put("invisibility", PotionEffectType.INVISIBILITY);
-		ALIASPOTIONS.put("invisible", PotionEffectType.INVISIBILITY);
-		ALIASPOTIONS.put("invis", PotionEffectType.INVISIBILITY);
-		ALIASPOTIONS.put("vanish", PotionEffectType.INVISIBILITY);
-		ALIASPOTIONS.put("disappear", PotionEffectType.INVISIBILITY);
-
-		POTIONS.put("blindness", PotionEffectType.BLINDNESS);
-		ALIASPOTIONS.put("blind", PotionEffectType.BLINDNESS);
-
-		POTIONS.put("nightvision", PotionEffectType.NIGHT_VISION);
-		ALIASPOTIONS.put("vision", PotionEffectType.NIGHT_VISION);
-
-		POTIONS.put("hunger", PotionEffectType.HUNGER);
-		ALIASPOTIONS.put("hungry", PotionEffectType.HUNGER);
-		ALIASPOTIONS.put("starve", PotionEffectType.HUNGER);
-
-		POTIONS.put("weakness", PotionEffectType.WEAKNESS);
-		ALIASPOTIONS.put("weak", PotionEffectType.WEAKNESS);
-
-		POTIONS.put("poison", PotionEffectType.POISON);
-		ALIASPOTIONS.put("venom", PotionEffectType.POISON);
-
-		POTIONS.put("wither", PotionEffectType.WITHER);
-		ALIASPOTIONS.put("decay", PotionEffectType.WITHER);
-
-
-		try // 1.6 update
-		{
-			POTIONS.put("healthboost", PotionEffectType.HEALTH_BOOST);
-			ALIASPOTIONS.put("boost", PotionEffectType.HEALTH_BOOST);
-
-			POTIONS.put("absorption", PotionEffectType.ABSORPTION);
-			ALIASPOTIONS.put("absorb", PotionEffectType.ABSORPTION);
-
-			POTIONS.put("saturation", PotionEffectType.SATURATION);
-			ALIASPOTIONS.put("food", PotionEffectType.SATURATION);
-		}
-		catch (java.lang.NoSuchFieldError e)
-		{
-			Essentials.wrongVersion();
-		}
-	}
-
-	public static PotionEffectType getByName(String name)
-	{
-		PotionEffectType peffect;
-		if (NumberUtil.isInt(name))
-		{
-			peffect = PotionEffectType.getById(Integer.parseInt(name));
-		}
-		else
-		{
-			peffect = PotionEffectType.getByName(name.toUpperCase(Locale.ENGLISH));
-		}
-		if (peffect == null)
-		{
-			peffect = POTIONS.get(name.toLowerCase(Locale.ENGLISH));
-		}
-		if (peffect == null)
-		{
-			peffect = ALIASPOTIONS.get(name.toLowerCase(Locale.ENGLISH));
-		}
-		return peffect;
-	}
-
-	public static Set<Entry<String, PotionEffectType>> entrySet()
-	{
-		return POTIONS.entrySet();
-	}
-}

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

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

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

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

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

@@ -1,244 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.DateUtil;
-import com.earth2me.essentials.utils.LocationUtil;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerRespawnEvent;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-
-
-public class Teleport implements net.ess3.api.ITeleport
-{
-	private final IUser teleportOwner;
-	private final IEssentials ess;
-	private TimedTeleport timedTeleport;
-
-	public Teleport(IUser user, IEssentials ess)
-	{
-		this.teleportOwner = user;
-		this.ess = ess;
-	}
-
-	public void cooldown(boolean check) throws Exception
-	{
-		final Calendar time = new GregorianCalendar();
-		if (teleportOwner.getLastTeleportTimestamp() > 0)
-		{
-			// Take the current time, and remove the delay from it.
-			final double cooldown = ess.getSettings().getTeleportCooldown();
-			final Calendar earliestTime = new GregorianCalendar();
-			earliestTime.add(Calendar.SECOND, -(int)cooldown);
-			earliestTime.add(Calendar.MILLISECOND, -(int)((cooldown * 1000.0) % 1000.0));
-			// This value contains the most recent time a teleportPlayer could have been used that would allow another use.
-			final long earliestLong = earliestTime.getTimeInMillis();
-
-			// When was the last teleportPlayer used?
-			final Long lastTime = teleportOwner.getLastTeleportTimestamp();
-
-			if (lastTime > time.getTimeInMillis())
-			{
-				// This is to make sure time didn't get messed up on last teleportPlayer use.
-				// If this happens, let's give the user the benifit of the doubt.
-				teleportOwner.setLastTeleportTimestamp(time.getTimeInMillis());
-				return;
-			}
-			else if (lastTime > earliestLong && !teleportOwner.isAuthorized("essentials.teleport.cooldown.bypass"))
-			{
-				time.setTimeInMillis(lastTime);
-				time.add(Calendar.SECOND, (int)cooldown);
-				time.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
-				throw new Exception(_("timeBeforeTeleport", DateUtil.formatDateDiff(time.getTimeInMillis())));
-			}
-		}
-		// if justCheck is set, don't update lastTeleport; we're just checking
-		if (!check)
-		{
-			teleportOwner.setLastTeleportTimestamp(time.getTimeInMillis());
-		}
-	}
-
-	private void warnUser(final IUser user, final double delay)
-	{
-		Calendar c = new GregorianCalendar();
-		c.add(Calendar.SECOND, (int)delay);
-		c.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
-		user.sendMessage(_("dontMoveMessage", DateUtil.formatDateDiff(c.getTimeInMillis())));
-	}
-
-	//The now function is used when you want to skip tp delay when teleporting someone to a location or player.
-	@Override
-	public void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception
-	{
-		if (cooldown)
-		{
-			cooldown(false);
-		}
-		now(teleportOwner, new LocationTarget(loc), cause);
-	}
-
-	@Override
-	public void now(Player entity, boolean cooldown, TeleportCause cause) throws Exception
-	{
-		if (cooldown)
-		{
-			cooldown(false);
-		}
-		now(teleportOwner, new PlayerTarget(entity), cause);
-	}
-
-	protected void now(IUser teleportee, ITarget target, TeleportCause cause) throws Exception
-	{
-		cancel(false);
-		teleportee.setLastLocation();
-		teleportee.getBase().teleport(LocationUtil.getSafeDestination(teleportee, target.getLocation()), cause);
-	}
-
-	//The teleportPlayer function is used when you want to normally teleportPlayer someone to a location or player.
-	//This method is nolonger used internally and will be removed.
-	@Deprecated
-	@Override
-	public void teleport(Location loc, Trade chargeFor) throws Exception
-	{
-		teleport(loc, chargeFor, TeleportCause.PLUGIN);
-	}
-
-	@Override
-	public void teleport(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		teleport(teleportOwner, new LocationTarget(loc), chargeFor, cause);
-	}
-
-	@Override
-	public void teleport(Player entity, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		teleport(teleportOwner, new PlayerTarget(entity), chargeFor, cause);
-	}
-
-	@Override
-	public void teleportPlayer(IUser teleportee, Location loc, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		teleport(teleportee, new LocationTarget(loc), chargeFor, cause);
-	}
-
-	@Override
-	public void teleportPlayer(IUser teleportee, Player entity, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		teleport(teleportee, new PlayerTarget(entity), chargeFor, cause);
-	}
-
-	private void teleport(IUser teleportee, ITarget target, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		double delay = ess.getSettings().getTeleportDelay();
-
-		if (chargeFor != null)
-		{
-			chargeFor.isAffordableFor(teleportOwner);
-		}
-		cooldown(true);
-		if (delay <= 0 || teleportOwner.isAuthorized("essentials.teleport.timer.bypass")
-			|| teleportee.isAuthorized("essentials.teleport.timer.bypass"))
-		{
-			cooldown(false);
-			now(teleportee, target, cause);
-			if (chargeFor != null)
-			{
-				chargeFor.charge(teleportOwner);
-			}
-			return;
-		}
-
-		cancel(false);
-		warnUser(teleportee, delay);
-		initTimer((long)(delay * 1000.0), teleportee, target, chargeFor, cause, false);
-	}
-
-	//The respawn function is a wrapper used to handle tp fallback, on /jail and /home
-	@Override
-	public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		double delay = ess.getSettings().getTeleportDelay();
-		if (chargeFor != null)
-		{
-			chargeFor.isAffordableFor(teleportOwner);
-		}
-		cooldown(true);
-		if (delay <= 0 || teleportOwner.isAuthorized("essentials.teleport.timer.bypass"))
-		{
-			cooldown(false);
-			respawnNow(teleportOwner, cause);
-			if (chargeFor != null)
-			{
-				chargeFor.charge(teleportOwner);
-			}
-			return;
-		}
-
-		cancel(false);
-		warnUser(teleportOwner, delay);
-		initTimer((long)(delay * 1000.0), teleportOwner, null, chargeFor, cause, true);
-	}
-
-	protected void respawnNow(IUser teleportee, TeleportCause cause) throws Exception
-	{
-		final Player player = teleportee.getBase();
-		Location bed = player.getBedSpawnLocation();
-		if (bed != null)
-		{
-			now(teleportee, new LocationTarget(bed), cause);
-		}
-		else
-		{
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().info("Could not find bed spawn, forcing respawn event.");
-			}
-			final PlayerRespawnEvent pre = new PlayerRespawnEvent(player, player.getWorld().getSpawnLocation(), false);
-			ess.getServer().getPluginManager().callEvent(pre);
-			now(teleportee, new LocationTarget(pre.getRespawnLocation()), cause);
-		}
-	}
-
-	//The warp function is a wrapper used to teleportPlayer a player to a /warp
-	@Override
-	public void warp(IUser teleportee, String warp, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		Location loc = ess.getWarps().getWarp(warp);
-		teleportee.sendMessage(_("warpingTo", warp));
-		teleport(teleportee, new LocationTarget(loc), chargeFor, cause);
-	}
-
-	//The back function is a wrapper used to teleportPlayer a player /back to their previous location.
-	@Override
-	public void back(Trade chargeFor) throws Exception
-	{
-		teleport(teleportOwner, new LocationTarget(teleportOwner.getLastLocation()), chargeFor, TeleportCause.COMMAND);
-	}
-
-	//This function is used to throw a user back after a jail sentence
-	@Override
-	public void back() throws Exception
-	{
-		now(teleportOwner, new LocationTarget(teleportOwner.getLastLocation()), TeleportCause.COMMAND);
-	}
-
-	//If we need to cancelTimer a pending teleportPlayer call this method
-	private void cancel(boolean notifyUser)
-	{
-		if (timedTeleport != null)
-		{
-			timedTeleport.cancelTimer(notifyUser);
-			timedTeleport = null;
-		}
-	}
-
-	private void initTimer(long delay, IUser teleportUser, ITarget target, Trade chargeFor, TeleportCause cause, boolean respawn)
-	{
-		timedTeleport = new TimedTeleport(teleportOwner, ess, this, delay, teleportUser, target, chargeFor, cause, respawn);
-	}
-}

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

@@ -1,155 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
-import org.bukkit.Location;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-
-
-public class TimedTeleport implements Runnable
-{
-	private static final double MOVE_CONSTANT = 0.3;
-	private final IUser teleportOwner;
-	private final IEssentials ess;
-	private final Teleport teleport;
-	private final String timer_teleportee;
-	private int timer_task = -1;
-	private final long timer_started;	// time this task was initiated
-	private final long timer_delay;		// how long to delay the teleportPlayer
-	private double timer_health;
-	// note that I initially stored a clone of the location for reference, but...
-	// when comparing locations, I got incorrect mismatches (rounding errors, looked like)
-	// so, the X/Y/Z values are stored instead and rounded off
-	private final long timer_initX;
-	private final long timer_initY;
-	private final long timer_initZ;
-	private final ITarget timer_teleportTarget;
-	private final boolean timer_respawn;
-	private final boolean timer_canMove;
-	private final Trade timer_chargeFor;
-	private final TeleportCause timer_cause;
-
-	public TimedTeleport(IUser user, IEssentials ess, Teleport teleport, long delay, IUser teleportUser, ITarget target, Trade chargeFor, TeleportCause cause, boolean respawn)
-	{
-
-		this.teleportOwner = user;
-		this.ess = ess;
-		this.teleport = teleport;
-		this.timer_started = System.currentTimeMillis();
-		this.timer_delay = delay;
-		this.timer_health = teleportUser.getBase().getHealth();
-		this.timer_initX = Math.round(teleportUser.getBase().getLocation().getX() * MOVE_CONSTANT);
-		this.timer_initY = Math.round(teleportUser.getBase().getLocation().getY() * MOVE_CONSTANT);
-		this.timer_initZ = Math.round(teleportUser.getBase().getLocation().getZ() * MOVE_CONSTANT);
-		this.timer_teleportee = teleportUser.getName();
-		this.timer_teleportTarget = target;
-		this.timer_chargeFor = chargeFor;
-		this.timer_cause = cause;
-		this.timer_respawn = respawn;
-		this.timer_canMove = user.isAuthorized("essentials.teleport.timer.move");
-
-		timer_task = ess.scheduleSyncRepeatingTask(this, 20, 20);
-	}
-
-	@Override
-	public void run()
-	{
-
-		if (teleportOwner == null || !teleportOwner.getBase().isOnline() || teleportOwner.getBase().getLocation() == null)
-		{
-			cancelTimer(false);
-			return;
-		}
-
-		IUser teleportUser = ess.getUser(this.timer_teleportee);
-
-		if (teleportUser == null || !teleportUser.getBase().isOnline())
-		{
-			cancelTimer(false);
-			return;
-		}
-
-		final Location currLocation = teleportUser.getBase().getLocation();
-		if (currLocation == null)
-		{
-			cancelTimer(false);
-			return;
-		}
-
-		if (!timer_canMove
-			&& (Math.round(currLocation.getX() * MOVE_CONSTANT) != timer_initX
-				|| Math.round(currLocation.getY() * MOVE_CONSTANT) != timer_initY
-				|| Math.round(currLocation.getZ() * MOVE_CONSTANT) != timer_initZ
-				|| teleportUser.getBase().getHealth() < timer_health))
-		{
-			// user moved, cancelTimer teleportPlayer
-			cancelTimer(true);
-			return;
-		}
-
-		timer_health = teleportUser.getBase().getHealth();  // in case user healed, then later gets injured
-		final long now = System.currentTimeMillis();
-		if (now > timer_started + timer_delay)
-		{
-			try
-			{
-				teleport.cooldown(false);
-				teleportUser.sendMessage(_("teleportationCommencing"));
-				try
-				{
-					if (timer_respawn)
-					{
-						teleport.respawnNow(teleportUser, timer_cause);
-					}
-					else
-					{
-						teleport.now(teleportUser, timer_teleportTarget, timer_cause);
-					}
-					cancelTimer(false);
-					if (timer_chargeFor != null)
-					{
-						timer_chargeFor.charge(teleportOwner);
-					}
-				}
-				catch (Exception ex)
-				{
-					ess.showError(teleportOwner.getSource(), ex, "teleport");
-				}
-			}
-			catch (Exception ex)
-			{
-				teleportOwner.sendMessage(_("cooldownWithMessage", ex.getMessage()));
-				if (teleportOwner != teleportUser)
-				{
-					teleportUser.sendMessage(_("cooldownWithMessage", ex.getMessage()));
-				}
-			}
-		}
-	}
-
-	//If we need to cancelTimer a pending teleportPlayer call this method
-	public void cancelTimer(boolean notifyUser)
-	{
-		if (timer_task == -1)
-		{
-			return;
-		}
-		try
-		{
-			ess.getServer().getScheduler().cancelTask(timer_task);
-			if (notifyUser)
-			{
-				teleportOwner.sendMessage(_("pendingTeleportCancelled"));
-				if (timer_teleportee != null && !timer_teleportee.equals(teleportOwner.getName()))
-				{
-					ess.getUser(timer_teleportee).sendMessage(_("pendingTeleportCancelled"));
-				}
-			}
-		}
-		finally
-		{
-			timer_task = -1;
-		}
-	}
-}

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

@@ -1,450 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
-import com.earth2me.essentials.craftbukkit.SetExpFix;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
-import org.bukkit.Location;
-import org.bukkit.entity.Item;
-import org.bukkit.inventory.ItemStack;
-
-
-public class Trade
-{
-	private final transient String command;
-	private final transient Trade fallbackTrade;
-	private final transient BigDecimal money;
-	private final transient ItemStack itemStack;
-	private final transient Integer exp;
-	private final transient com.earth2me.essentials.IEssentials ess;
-
-
-	public enum TradeType
-	{
-		MONEY,
-		EXP,
-		ITEM
-	}
-
-
-	public enum OverflowType
-	{
-		ABORT,
-		DROP,
-		RETURN
-	}
-
-	public Trade(final String command, final IEssentials ess)
-	{
-		this(command, null, null, null, null, ess);
-	}
-
-	public Trade(final String command, final Trade fallback, final IEssentials ess)
-	{
-		this(command, fallback, null, null, null, ess);
-	}
-
-	@Deprecated
-	public Trade(final double money, final com.earth2me.essentials.IEssentials ess)
-	{
-		this(null, null, BigDecimal.valueOf(money), null, null, ess);
-	}
-
-	public Trade(final BigDecimal money, final IEssentials ess)
-	{
-		this(null, null, money, null, null, ess);
-	}
-
-	public Trade(final ItemStack items, final IEssentials ess)
-	{
-		this(null, null, null, items, null, ess);
-	}
-
-	public Trade(final int exp, final IEssentials ess)
-	{
-		this(null, null, null, null, exp, ess);
-	}
-
-	private Trade(final String command, final Trade fallback, final BigDecimal money, final ItemStack item, final Integer exp, final com.earth2me.essentials.IEssentials ess)
-	{
-		this.command = command;
-		this.fallbackTrade = fallback;
-		this.money = money;
-		this.itemStack = item;
-		this.exp = exp;
-		this.ess = ess;
-	}
-
-	public void isAffordableFor(final IUser user) throws ChargeException
-	{
-
-		if (ess.getSettings().isDebug())
-		{
-			ess.getLogger().log(Level.INFO, "checking if " + user.getName() + " can afford charge.");
-		}
-
-		if (getMoney() != null
-			&& getMoney().signum() > 0
-			&& !user.canAfford(getMoney()))
-		{
-			throw new ChargeException(_("notEnoughMoney"));
-		}
-
-		if (getItemStack() != null
-			&& !user.getBase().getInventory().containsAtLeast(itemStack, itemStack.getAmount()))
-		{
-			throw new ChargeException(_("missingItems", getItemStack().getAmount(), ess.getItemDb().name(getItemStack())));
-		}
-
-		BigDecimal money;
-		if (command != null && !command.isEmpty()
-			&& (money = getCommandCost(user)).signum() > 0
-			&& !user.canAfford(money))
-		{
-			throw new ChargeException(_("notEnoughMoney"));
-		}
-
-		if (exp != null && exp > 0
-			&& SetExpFix.getTotalExperience(user.getBase()) < exp)
-		{
-			throw new ChargeException(_("notEnoughExperience"));
-		}
-	}
-
-	public boolean pay(final IUser user)
-	{
-		return pay(user, OverflowType.ABORT) == null;
-	}
-
-	public Map<Integer, ItemStack> pay(final IUser user, final OverflowType type)
-	{
-		if (getMoney() != null && getMoney().signum() > 0)
-		{
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().log(Level.INFO, "paying user " + user.getName() + " via trade " + getMoney().toPlainString());
-			}
-			user.giveMoney(getMoney());
-		}
-		if (getItemStack() != null)
-		{
-			// This stores the would be overflow
-			Map<Integer, ItemStack> overFlow = InventoryWorkaround.addAllItems(user.getBase().getInventory(), getItemStack());
-
-			if (overFlow != null)
-			{
-				switch (type)
-				{
-				case ABORT:
-					if (ess.getSettings().isDebug())
-					{
-						ess.getLogger().log(Level.INFO, "abort paying " + user.getName() + " itemstack " + getItemStack().toString() + " due to lack of inventory space ");
-					}
-
-					return overFlow;
-
-				case RETURN:
-					// Pay the user the items, and return overflow
-					final Map<Integer, ItemStack> returnStack = InventoryWorkaround.addItems(user.getBase().getInventory(), getItemStack());
-					user.getBase().updateInventory();
-
-					if (ess.getSettings().isDebug())
-					{
-						ess.getLogger().log(Level.INFO, "paying " + user.getName() + " partial itemstack " + getItemStack().toString() + " with overflow " + returnStack.get(0).toString());
-					}
-
-					return returnStack;
-
-				case DROP:
-					// Pay the users the items directly, and drop the rest, will always return no overflow.
-					final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItems(user.getBase().getInventory(), getItemStack());
-					final Location loc = user.getBase().getLocation();
-					for (ItemStack loStack : leftOver.values())
-					{
-						final int maxStackSize = loStack.getType().getMaxStackSize();
-						final int stacks = loStack.getAmount() / maxStackSize;
-						final int leftover = loStack.getAmount() % maxStackSize;
-						final Item[] itemStacks = new Item[stacks + (leftover > 0 ? 1 : 0)];
-						for (int i = 0; i < stacks; i++)
-						{
-							final ItemStack stack = loStack.clone();
-							stack.setAmount(maxStackSize);
-							itemStacks[i] = loc.getWorld().dropItem(loc, stack);
-						}
-						if (leftover > 0)
-						{
-							final ItemStack stack = loStack.clone();
-							stack.setAmount(leftover);
-							itemStacks[stacks] = loc.getWorld().dropItem(loc, stack);
-						}
-					}
-					if (ess.getSettings().isDebug())
-					{
-						ess.getLogger().log(Level.INFO, "paying " + user.getName() + " partial itemstack " + getItemStack().toString() + " and dropping overflow " + leftOver.get(0).toString());
-					}
-				}
-			}
-			else if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().log(Level.INFO, "paying " + user.getName() + " itemstack " + getItemStack().toString());
-			}
-			user.getBase().updateInventory();
-		}
-		if (getExperience() != null)
-		{
-			SetExpFix.setTotalExperience(user.getBase(), SetExpFix.getTotalExperience(user.getBase()) + getExperience());
-		}
-		return null;
-	}
-
-	public void charge(final IUser user) throws ChargeException
-	{
-		if (ess.getSettings().isDebug())
-		{
-			ess.getLogger().log(Level.INFO, "attempting to charge user " + user.getName());
-		}
-		if (getMoney() != null)
-		{
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().log(Level.INFO, "charging user " + user.getName() + " money " + getMoney().toPlainString());
-			}
-			if (!user.canAfford(getMoney()) && getMoney().signum() > 0)
-			{
-				throw new ChargeException(_("notEnoughMoney"));
-			}
-			user.takeMoney(getMoney());
-		}
-		if (getItemStack() != null)
-		{
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().log(Level.INFO, "charging user " + user.getName() + " itemstack " + getItemStack().toString());
-			}
-			if (!user.getBase().getInventory().containsAtLeast(getItemStack(), getItemStack().getAmount()))
-			{
-				throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
-			}
-			user.getBase().getInventory().removeItem(getItemStack());
-			user.getBase().updateInventory();
-		}
-		if (command != null)
-		{
-			final BigDecimal cost = getCommandCost(user);
-			if (!user.canAfford(cost) && cost.signum() > 0)
-			{
-				throw new ChargeException(_("notEnoughMoney"));
-			}
-			user.takeMoney(cost);
-		}
-		if (getExperience() != null)
-		{
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().log(Level.INFO, "charging user " + user.getName() + " exp " + getExperience());
-			}
-			final int experience = SetExpFix.getTotalExperience(user.getBase());
-			if (experience < getExperience() && getExperience() > 0)
-			{
-				throw new ChargeException(_("notEnoughExperience"));
-			}
-			SetExpFix.setTotalExperience(user.getBase(), experience - getExperience());
-		}
-		if (ess.getSettings().isDebug())
-		{
-			ess.getLogger().log(Level.INFO, "charge user " + user.getName() + " completed");
-		}
-	}
-
-	public BigDecimal getMoney()
-	{
-		return money;
-	}
-
-	public ItemStack getItemStack()
-	{
-		return itemStack;
-	}
-
-	public Integer getExperience()
-	{
-		return exp;
-	}
-
-	public TradeType getType()
-	{
-		if (getExperience() != null)
-		{
-			return TradeType.EXP;
-		}
-
-		if (getItemStack() != null)
-		{
-			return TradeType.ITEM;
-		}
-
-		return TradeType.MONEY;
-	}
-
-	public BigDecimal getCommandCost(final IUser user)
-	{
-		BigDecimal cost = BigDecimal.ZERO;
-		if (command != null && !command.isEmpty())
-		{
-			cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
-			if (cost.signum() == 0 && fallbackTrade != null)
-			{
-				cost = fallbackTrade.getCommandCost(user);
-			}
-
-			if (ess.getSettings().isDebug())
-			{
-				ess.getLogger().log(Level.INFO, "calculated command (" + command + ") cost for " + user.getName() + " as " + cost);
-			}
-		}
-		if (cost.signum() != 0 && (user.isAuthorized("essentials.nocommandcost.all")
-								   || user.isAuthorized("essentials.nocommandcost." + command)))
-		{
-			return BigDecimal.ZERO;
-		}
-		return cost;
-	}
-	private static FileWriter fw = null;
-
-	public static void log(String type, String subtype, String event, String sender, Trade charge, String receiver, Trade pay, Location loc, IEssentials ess)
-	{
-		//isEcoLogUpdateEnabled() - This refers to log entries with no location, ie API updates #EasterEgg
-		//isEcoLogEnabled() - This refers to log entries with with location, ie /pay /sell and eco signs.
-
-		if ((loc == null && !ess.getSettings().isEcoLogUpdateEnabled())
-			|| (loc != null && !ess.getSettings().isEcoLogEnabled()))
-		{
-			return;
-		}
-		if (fw == null)
-		{
-			try
-			{
-				fw = new FileWriter(new File(ess.getDataFolder(), "trade.log"), true);
-			}
-			catch (IOException ex)
-			{
-				Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
-			}
-		}
-		StringBuilder sb = new StringBuilder();
-		sb.append(type).append(",").append(subtype).append(",").append(event).append(",\"");
-		sb.append(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).format(new Date()));
-		sb.append("\",\"");
-		if (sender != null)
-		{
-			sb.append(sender);
-		}
-		sb.append("\",");
-		if (charge == null)
-		{
-			sb.append("\"\",\"\",\"\"");
-		}
-		else
-		{
-			if (charge.getItemStack() != null)
-			{
-				sb.append(charge.getItemStack().getAmount()).append(",");
-				sb.append(charge.getItemStack().getType().toString()).append(",");
-				sb.append(charge.getItemStack().getDurability());
-			}
-			if (charge.getMoney() != null)
-			{
-				sb.append(charge.getMoney()).append(",");
-				sb.append("money").append(",");
-				sb.append(ess.getSettings().getCurrencySymbol());
-			}
-			if (charge.getExperience() != null)
-			{
-				sb.append(charge.getExperience()).append(",");
-				sb.append("exp").append(",");
-				sb.append("\"\"");
-			}
-		}
-		sb.append(",\"");
-		if (receiver != null)
-		{
-			sb.append(receiver);
-		}
-		sb.append("\",");
-		if (pay == null)
-		{
-			sb.append("\"\",\"\",\"\"");
-		}
-		else
-		{
-			if (pay.getItemStack() != null)
-			{
-				sb.append(pay.getItemStack().getAmount()).append(",");
-				sb.append(pay.getItemStack().getType().toString()).append(",");
-				sb.append(pay.getItemStack().getDurability());
-			}
-			if (pay.getMoney() != null)
-			{
-				sb.append(pay.getMoney()).append(",");
-				sb.append("money").append(",");
-				sb.append(ess.getSettings().getCurrencySymbol());
-			}
-			if (pay.getExperience() != null)
-			{
-				sb.append(pay.getExperience()).append(",");
-				sb.append("exp").append(",");
-				sb.append("\"\"");
-			}
-		}
-		if (loc == null)
-		{
-			sb.append(",\"\",\"\",\"\",\"\"");
-		}
-		else
-		{
-			sb.append(",\"");
-			sb.append(loc.getWorld().getName()).append("\",");
-			sb.append(loc.getBlockX()).append(",");
-			sb.append(loc.getBlockY()).append(",");
-			sb.append(loc.getBlockZ()).append(",");
-		}
-		sb.append("\n");
-		try
-		{
-			fw.write(sb.toString());
-			fw.flush();
-		}
-		catch (IOException ex)
-		{
-			Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
-		}
-	}
-
-	public static void closeLog()
-	{
-		if (fw != null)
-		{
-			try
-			{
-				fw.close();
-			}
-			catch (IOException ex)
-			{
-				Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
-			}
-			fw = null;
-		}
-	}
-}

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

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

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

@@ -1,933 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.utils.NumberUtil;
-import com.earth2me.essentials.utils.StringUtil;
-import java.io.File;
-import java.math.BigDecimal;
-import java.util.*;
-import net.ess3.api.IEssentials;
-import net.ess3.api.InvalidWorldException;
-import org.bukkit.Location;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-
-public abstract class UserData extends PlayerExtension implements IConf
-{
-	protected final transient IEssentials ess;
-	private final EssentialsConf config;
-	private final File folder;
-
-	protected UserData(Player base, IEssentials ess)
-	{
-		super(base);
-		this.ess = ess;
-		folder = new File(ess.getDataFolder(), "userdata");
-		if (!folder.exists())
-		{
-			folder.mkdirs();
-		}
-		config = new EssentialsConf(new File(folder, StringUtil.sanitizeFileName(base.getName()) + ".yml"));
-		reloadConfig();
-	}
-
-	public final void reset()
-	{
-		config.getFile().delete();
-		ess.getUserMap().removeUser(this.getName());
-	}
-
-	@Override
-	public final void reloadConfig()
-	{
-		config.load();
-		money = _getMoney();
-		unlimited = _getUnlimited();
-		powertools = _getPowertools();
-		homes = _getHomes();
-		lastLocation = _getLastLocation();
-		lastTeleportTimestamp = _getLastTeleportTimestamp();
-		lastHealTimestamp = _getLastHealTimestamp();
-		jail = _getJail();
-		mails = _getMails();
-		teleportEnabled = _getTeleportEnabled();
-		godmode = _getGodModeEnabled();
-		muted = _getMuted();
-		muteTimeout = _getMuteTimeout();
-		jailed = _getJailed();
-		jailTimeout = _getJailTimeout();
-		lastLogin = _getLastLogin();
-		lastLogout = _getLastLogout();
-		lastLoginAddress = _getLastLoginAddress();
-		afk = _getAfk();
-		geolocation = _getGeoLocation();
-		isSocialSpyEnabled = _isSocialSpyEnabled();
-		isNPC = _isNPC();
-		arePowerToolsEnabled = _arePowerToolsEnabled();
-		kitTimestamps = _getKitTimestamps();
-		nickname = _getNickname();
-		ignoredPlayers = _getIgnoredPlayers();
-		logoutLocation = _getLogoutLocation();
-	}
-	private BigDecimal money;
-
-	private BigDecimal _getMoney()
-	{
-		BigDecimal result = ess.getSettings().getStartingBalance();
-		BigDecimal maxMoney = ess.getSettings().getMaxMoney();
-		BigDecimal minMoney = ess.getSettings().getMinMoney();
-
-		if (config.hasProperty("money"))
-		{
-			result = config.getBigDecimal("money", result);
-		}
-		if (result.compareTo(maxMoney) > 0)
-		{
-			result = maxMoney;
-		}
-		if (result.compareTo(minMoney) < 0)
-		{
-			result = minMoney;
-		}
-		return result;
-	}
-
-	public BigDecimal getMoney()
-	{
-		return money;
-	}
-
-	public void setMoney(BigDecimal value)
-	{
-		money = value;
-		BigDecimal maxMoney = ess.getSettings().getMaxMoney();
-		BigDecimal minMoney = ess.getSettings().getMinMoney();
-		if (money.compareTo(maxMoney) > 0)
-		{
-			money = maxMoney;
-		}
-		if (money.compareTo(minMoney) < 0)
-		{
-			money = minMoney;
-		}
-		config.setProperty("money", money);
-		config.save();
-	}
-	private Map<String, Object> homes;
-
-	private Map<String, Object> _getHomes()
-	{
-		if (config.isConfigurationSection("homes"))
-		{
-			return config.getConfigurationSection("homes").getValues(false);
-		}
-		return new HashMap<String, Object>();
-	}
-
-	private String getHomeName(String search)
-	{
-		if (NumberUtil.isInt(search))
-		{
-			try
-			{
-				search = getHomes().get(Integer.parseInt(search) - 1);
-			}
-			catch (NumberFormatException e)
-			{
-			}
-		}
-		return search;
-	}
-
-	public Location getHome(String name) throws Exception
-	{
-		String search = getHomeName(name);
-		return config.getLocation("homes." + search, getServer());
-	}
-
-	public Location getHome(final Location world)
-	{
-		try
-		{
-			if (getHomes().isEmpty())
-			{
-				return null;
-			}
-			Location loc;
-			for (String home : getHomes())
-			{
-				loc = config.getLocation("homes." + home, getServer());
-				if (world.getWorld() == loc.getWorld())
-				{
-					return loc;
-				}
-
-			}
-			loc = config.getLocation("homes." + getHomes().get(0), getServer());
-			return loc;
-		}
-		catch (InvalidWorldException ex)
-		{
-			return null;
-		}
-	}
-
-	public List<String> getHomes()
-	{
-		return new ArrayList<String>(homes.keySet());
-	}
-
-	public void setHome(String name, Location loc)
-	{
-		//Invalid names will corrupt the yaml
-		name = StringUtil.safeString(name);
-		homes.put(name, loc);
-		config.setProperty("homes." + name, loc);
-		config.save();
-	}
-
-	public void delHome(String name) throws Exception
-	{
-		String search = getHomeName(name);
-		if (!homes.containsKey(search))
-		{
-			search = StringUtil.safeString(search);
-		}
-		if (homes.containsKey(search))
-		{
-			homes.remove(search);
-			config.removeProperty("homes." + search);
-			config.save();
-		}
-		else
-		{
-			throw new Exception(_("invalidHome", search));
-		}
-	}
-
-	public boolean hasHome()
-	{
-		if (config.hasProperty("home"))
-		{
-			return true;
-		}
-		return false;
-	}
-	private String nickname;
-
-	public String _getNickname()
-	{
-		return config.getString("nickname");
-	}
-
-	public String getNickname()
-	{
-		return nickname;
-	}
-
-	public void setNickname(String nick)
-	{
-		nickname = nick;
-		config.setProperty("nickname", nick);
-		config.save();
-	}
-	private List<Integer> unlimited;
-
-	private List<Integer> _getUnlimited()
-	{
-		return config.getIntegerList("unlimited");
-	}
-
-	public List<Integer> getUnlimited()
-	{
-		return unlimited;
-	}
-
-	public boolean hasUnlimited(ItemStack stack)
-	{
-		return unlimited.contains(stack.getTypeId());
-	}
-
-	public void setUnlimited(ItemStack stack, boolean state)
-	{
-		if (unlimited.contains(stack.getTypeId()))
-		{
-			unlimited.remove(Integer.valueOf(stack.getTypeId()));
-		}
-		if (state)
-		{
-			unlimited.add(stack.getTypeId());
-		}
-		config.setProperty("unlimited", unlimited);
-		config.save();
-	}
-	private Map<String, Object> powertools;
-
-	private Map<String, Object> _getPowertools()
-	{
-		if (config.isConfigurationSection("powertools"))
-		{
-			return config.getConfigurationSection("powertools").getValues(false);
-		}
-		return new HashMap<String, Object>();
-	}
-
-	public void clearAllPowertools()
-	{
-		powertools.clear();
-		config.setProperty("powertools", powertools);
-		config.save();
-	}
-
-	@SuppressWarnings("unchecked")
-	public List<String> getPowertool(ItemStack stack)
-	{
-		return (List<String>)powertools.get("" + stack.getTypeId());
-	}
-
-	@SuppressWarnings("unchecked")
-	public List<String> getPowertool(int id)
-	{
-		return (List<String>)powertools.get("" + id);
-	}
-
-	public void setPowertool(ItemStack stack, List<String> commandList)
-	{
-		if (commandList == null || commandList.isEmpty())
-		{
-			powertools.remove("" + stack.getTypeId());
-		}
-		else
-		{
-			powertools.put("" + stack.getTypeId(), commandList);
-		}
-		config.setProperty("powertools", powertools);
-		config.save();
-	}
-
-	public boolean hasPowerTools()
-	{
-		return !powertools.isEmpty();
-	}
-	private Location lastLocation;
-
-	private Location _getLastLocation()
-	{
-		try
-		{
-			return config.getLocation("lastlocation", getServer());
-		}
-		catch (InvalidWorldException e)
-		{
-			return null;
-		}
-	}
-
-	public Location getLastLocation()
-	{
-		return lastLocation;
-	}
-
-	public void setLastLocation(Location loc)
-	{
-		if (loc == null || loc.getWorld() == null)
-		{
-			return;
-		}
-		lastLocation = loc;
-		config.setProperty("lastlocation", loc);
-		config.save();
-	}
-	private Location logoutLocation;
-
-	private Location _getLogoutLocation()
-	{
-		try
-		{
-			return config.getLocation("logoutlocation", getServer());
-		}
-		catch (InvalidWorldException e)
-		{
-			return null;
-		}
-	}
-
-	public Location getLogoutLocation()
-	{
-		return logoutLocation;
-	}
-
-	public void setLogoutLocation(Location loc)
-	{
-		if (loc == null || loc.getWorld() == null)
-		{
-			return;
-		}
-		logoutLocation = loc;
-		config.setProperty("logoutlocation", loc);
-		config.save();
-	}
-	private long lastTeleportTimestamp;
-
-	private long _getLastTeleportTimestamp()
-	{
-		return config.getLong("timestamps.lastteleport", 0);
-	}
-
-	public long getLastTeleportTimestamp()
-	{
-		return lastTeleportTimestamp;
-	}
-
-	public void setLastTeleportTimestamp(long time)
-	{
-		lastTeleportTimestamp = time;
-		config.setProperty("timestamps.lastteleport", time);
-		config.save();
-	}
-	private long lastHealTimestamp;
-
-	private long _getLastHealTimestamp()
-	{
-		return config.getLong("timestamps.lastheal", 0);
-	}
-
-	public long getLastHealTimestamp()
-	{
-		return lastHealTimestamp;
-	}
-
-	public void setLastHealTimestamp(long time)
-	{
-		lastHealTimestamp = time;
-		config.setProperty("timestamps.lastheal", time);
-		config.save();
-	}
-	private String jail;
-
-	private String _getJail()
-	{
-		return config.getString("jail");
-	}
-
-	public String getJail()
-	{
-		return jail;
-	}
-
-	public void setJail(String jail)
-	{
-		if (jail == null || jail.isEmpty())
-		{
-			this.jail = null;
-			config.removeProperty("jail");
-		}
-		else
-		{
-			this.jail = jail;
-			config.setProperty("jail", jail);
-		}
-		config.save();
-	}
-	private List<String> mails;
-
-	private List<String> _getMails()
-	{
-		return config.getStringList("mail");
-	}
-
-	public List<String> getMails()
-	{
-		return mails;
-	}
-
-	public void setMails(List<String> mails)
-	{
-		if (mails == null)
-		{
-			config.removeProperty("mail");
-			mails = _getMails();
-		}
-		else
-		{
-			config.setProperty("mail", mails);
-		}
-		this.mails = mails;
-		config.save();
-	}
-
-	public void addMail(String mail)
-	{
-		mails.add(mail);
-		setMails(mails);
-	}
-	private boolean teleportEnabled;
-
-	private boolean _getTeleportEnabled()
-	{
-		return config.getBoolean("teleportenabled", true);
-	}
-
-	public boolean isTeleportEnabled()
-	{
-		return teleportEnabled;
-	}
-
-	public void setTeleportEnabled(boolean set)
-	{
-		teleportEnabled = set;
-		config.setProperty("teleportenabled", set);
-		config.save();
-	}
-	private List<String> ignoredPlayers;
-
-	public List<String> _getIgnoredPlayers()
-	{
-		return Collections.synchronizedList(config.getStringList("ignore"));
-	}
-
-	public void setIgnoredPlayers(List<String> players)
-	{
-		if (players == null || players.isEmpty())
-		{
-			ignoredPlayers = Collections.synchronizedList(new ArrayList<String>());
-			config.removeProperty("ignore");
-		}
-		else
-		{
-			ignoredPlayers = players;
-			config.setProperty("ignore", players);
-		}
-		config.save();
-	}
-
-	@Deprecated
-	public boolean isIgnoredPlayer(final String userName)
-	{
-		final IUser user = ess.getUser(userName);
-		if (user == null || !user.getBase().isOnline())
-		{
-			return false;
-		}
-		return isIgnoredPlayer(user);
-	}
-
-	public boolean isIgnoredPlayer(IUser user)
-	{
-		return (ignoredPlayers.contains(user.getName().toLowerCase(Locale.ENGLISH)) && !user.isIgnoreExempt());
-	}
-
-	public void setIgnoredPlayer(IUser user, boolean set)
-	{
-		if (set)
-		{
-			ignoredPlayers.add(user.getName().toLowerCase(Locale.ENGLISH));
-		}
-		else
-		{
-			ignoredPlayers.remove(user.getName().toLowerCase(Locale.ENGLISH));
-		}
-		setIgnoredPlayers(ignoredPlayers);
-	}
-	private boolean godmode;
-
-	private boolean _getGodModeEnabled()
-	{
-		return config.getBoolean("godmode", false);
-	}
-
-	public boolean isGodModeEnabled()
-	{
-		return godmode;
-	}
-
-	public void setGodModeEnabled(boolean set)
-	{
-		godmode = set;
-		config.setProperty("godmode", set);
-		config.save();
-	}
-	private boolean muted;
-
-	public boolean _getMuted()
-	{
-		return config.getBoolean("muted", false);
-	}
-
-	public boolean getMuted()
-	{
-		return muted;
-	}
-
-	public boolean isMuted()
-	{
-		return muted;
-	}
-
-	public void setMuted(boolean set)
-	{
-		muted = set;
-		config.setProperty("muted", set);
-		config.save();
-	}
-	private long muteTimeout;
-
-	private long _getMuteTimeout()
-	{
-		return config.getLong("timestamps.mute", 0);
-	}
-
-	public long getMuteTimeout()
-	{
-		return muteTimeout;
-	}
-
-	public void setMuteTimeout(long time)
-	{
-		muteTimeout = time;
-		config.setProperty("timestamps.mute", time);
-		config.save();
-	}
-	private boolean jailed;
-
-	private boolean _getJailed()
-	{
-		return config.getBoolean("jailed", false);
-	}
-
-	public boolean isJailed()
-	{
-		return jailed;
-	}
-
-	public void setJailed(boolean set)
-	{
-		jailed = set;
-		config.setProperty("jailed", set);
-		config.save();
-	}
-
-	public boolean toggleJailed()
-	{
-		boolean ret = !isJailed();
-		setJailed(ret);
-		return ret;
-	}
-	private long jailTimeout;
-
-	private long _getJailTimeout()
-	{
-		return config.getLong("timestamps.jail", 0);
-	}
-
-	public long getJailTimeout()
-	{
-		return jailTimeout;
-	}
-
-	public void setJailTimeout(long time)
-	{
-		jailTimeout = time;
-		config.setProperty("timestamps.jail", time);
-		config.save();
-	}
-
-	public String getBanReason()
-	{
-		return config.getString("ban.reason", "");
-	}
-
-	public void setBanReason(String reason)
-	{
-		config.setProperty("ban.reason", StringUtil.sanitizeString(reason));
-		config.save();
-	}
-
-	public long getBanTimeout()
-	{
-		return config.getLong("ban.timeout", 0);
-	}
-
-	public void setBanTimeout(long time)
-	{
-		config.setProperty("ban.timeout", time);
-		config.save();
-	}
-	private long lastLogin;
-
-	private long _getLastLogin()
-	{
-		return config.getLong("timestamps.login", 0);
-	}
-
-	public long getLastLogin()
-	{
-		return lastLogin;
-	}
-
-	private void _setLastLogin(long time)
-	{
-		lastLogin = time;
-		config.setProperty("timestamps.login", time);
-	}
-
-	public void setLastLogin(long time)
-	{
-		_setLastLogin(time);
-		if (base.getAddress() != null && base.getAddress().getAddress() != null)
-		{
-			_setLastLoginAddress(base.getAddress().getAddress().getHostAddress());
-		}
-		config.save();
-	}
-	private long lastLogout;
-
-	private long _getLastLogout()
-	{
-		return config.getLong("timestamps.logout", 0);
-	}
-
-	public long getLastLogout()
-	{
-		return lastLogout;
-	}
-
-	public void setLastLogout(long time)
-	{
-		lastLogout = time;
-		config.setProperty("timestamps.logout", time);
-		config.save();
-	}
-	private String lastLoginAddress;
-
-	private String _getLastLoginAddress()
-	{
-		return config.getString("ipAddress", "");
-	}
-
-	public String getLastLoginAddress()
-	{
-		return lastLoginAddress;
-	}
-
-	private void _setLastLoginAddress(String address)
-	{
-		lastLoginAddress = address;
-		config.setProperty("ipAddress", address);
-	}
-	private boolean afk;
-
-	private boolean _getAfk()
-	{
-		return config.getBoolean("afk", false);
-	}
-
-	public boolean isAfk()
-	{
-		return afk;
-	}
-
-	public void setAfk(boolean set)
-	{
-		afk = set;
-		config.setProperty("afk", set);
-		config.save();
-	}
-
-	public boolean toggleAfk()
-	{
-		boolean ret = !isAfk();
-		setAfk(ret);
-		return ret;
-	}
-	private boolean newplayer;
-	private String geolocation;
-
-	private String _getGeoLocation()
-	{
-		return config.getString("geolocation");
-	}
-
-	public String getGeoLocation()
-	{
-		return geolocation;
-	}
-
-	public void setGeoLocation(String geolocation)
-	{
-		if (geolocation == null || geolocation.isEmpty())
-		{
-			this.geolocation = null;
-			config.removeProperty("geolocation");
-		}
-		else
-		{
-			this.geolocation = geolocation;
-			config.setProperty("geolocation", geolocation);
-		}
-		config.save();
-	}
-	private boolean isSocialSpyEnabled;
-
-	private boolean _isSocialSpyEnabled()
-	{
-		return config.getBoolean("socialspy", false);
-	}
-
-	public boolean isSocialSpyEnabled()
-	{
-		return isSocialSpyEnabled;
-	}
-
-	public void setSocialSpyEnabled(boolean status)
-	{
-		isSocialSpyEnabled = status;
-		config.setProperty("socialspy", status);
-		config.save();
-	}
-	private boolean isNPC;
-
-	private boolean _isNPC()
-	{
-		return config.getBoolean("npc", false);
-	}
-
-	public boolean isNPC()
-	{
-		return isNPC;
-	}
-
-	public void setNPC(boolean set)
-	{
-		isNPC = set;
-		config.setProperty("npc", set);
-		config.save();
-	}
-	private boolean arePowerToolsEnabled;
-
-	public boolean arePowerToolsEnabled()
-	{
-		return arePowerToolsEnabled;
-	}
-
-	public void setPowerToolsEnabled(boolean set)
-	{
-		arePowerToolsEnabled = set;
-		config.setProperty("powertoolsenabled", set);
-		config.save();
-	}
-
-	public boolean togglePowerToolsEnabled()
-	{
-		boolean ret = !arePowerToolsEnabled();
-		setPowerToolsEnabled(ret);
-		return ret;
-	}
-
-	private boolean _arePowerToolsEnabled()
-	{
-		return config.getBoolean("powertoolsenabled", true);
-	}
-	private Map<String, Long> kitTimestamps;
-
-	private Map<String, Long> _getKitTimestamps()
-	{
-
-		if (config.isConfigurationSection("timestamps.kits"))
-		{
-			final ConfigurationSection section = config.getConfigurationSection("timestamps.kits");
-			final Map<String, Long> timestamps = new HashMap<String, Long>();
-			for (String command : section.getKeys(false))
-			{
-				if (section.isLong(command))
-				{
-					timestamps.put(command.toLowerCase(Locale.ENGLISH), section.getLong(command));
-				}
-				else if (section.isInt(command))
-				{
-					timestamps.put(command.toLowerCase(Locale.ENGLISH), (long)section.getInt(command));
-				}
-			}
-			return timestamps;
-		}
-		return new HashMap<String, Long>();
-	}
-
-	public long getKitTimestamp(String name)
-	{
-		name = name.replace('.', '_').replace('/', '_');
-		if (kitTimestamps != null && kitTimestamps.containsKey(name))
-		{
-			return kitTimestamps.get(name);
-		}
-		return 0l;
-	}
-
-	public void setKitTimestamp(final String name, final long time)
-	{
-		kitTimestamps.put(name.toLowerCase(Locale.ENGLISH), time);
-		config.setProperty("timestamps.kits", kitTimestamps);
-		config.save();
-	}
-
-	public void setConfigProperty(String node, Object object)
-	{
-		final String prefix = "info.";
-		node = prefix + node;
-		if (object instanceof Map)
-		{
-			config.setProperty(node, (Map)object);
-		}
-		else if (object instanceof List)
-		{
-			config.setProperty(node, (List<String>)object);
-		}
-		else if (object instanceof Location)
-		{
-			config.setProperty(node, (Location)object);
-		}
-		else if (object instanceof ItemStack)
-		{
-			config.setProperty(node, (ItemStack)object);
-		}
-		else
-		{
-			config.setProperty(node, object);
-		}
-		config.save();
-	}
-
-	public Set<String> getConfigKeys()
-	{
-		if (config.isConfigurationSection("info"))
-		{
-			return config.getConfigurationSection("info").getKeys(true);
-		}
-		return new HashSet<String>();
-	}
-
-	public Map<String, Object> getConfigMap()
-	{
-		if (config.isConfigurationSection("info"))
-		{
-			return config.getConfigurationSection("info").getValues(true);
-		}
-		return new HashMap<String, Object>();
-	}
-
-	public Map<String, Object> getConfigMap(String node)
-	{
-		if (config.isConfigurationSection("info." + node))
-		{
-			return config.getConfigurationSection("info." + node).getValues(true);
-		}
-		return new HashMap<String, Object>();
-	}
-
-	public void save()
-	{
-		config.save();
-	}
-}

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

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

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

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

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

@@ -1,152 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import java.io.File;
-import java.math.BigDecimal;
-import java.util.Locale;
-import java.util.logging.Logger;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-
-
-public class Worth implements IConf
-{
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	private final EssentialsConf config;
-
-	public Worth(File dataFolder)
-	{
-		config = new EssentialsConf(new File(dataFolder, "worth.yml"));
-		config.setTemplateName("/worth.yml");
-		config.load();
-	}
-
-	public BigDecimal getPrice(ItemStack itemStack)
-	{
-		String itemname = itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
-		BigDecimal result;
-		result = config.getBigDecimal("worth." + itemname + "." + itemStack.getDurability(), BigDecimal.ONE.negate());
-		if (result.signum() < 0)
-		{
-			result = config.getBigDecimal("worth." + itemname + ".0", BigDecimal.ONE.negate());
-		}
-		if (result.signum() < 0)
-		{
-			result = config.getBigDecimal("worth." + itemname, BigDecimal.ONE.negate());
-		}
-		if (result.signum() < 0)
-		{
-			result = config.getBigDecimal("worth." + itemStack.getTypeId() + "." + itemStack.getDurability(), BigDecimal.ONE.negate());
-		}		
-		if (result.signum() < 0)
-		{
-			result = config.getBigDecimal("worth." + itemStack.getTypeId() + ".0", BigDecimal.ONE.negate());
-		}
-		if (result.signum() < 0)
-		{
-			result = config.getBigDecimal("worth." + itemStack.getTypeId(), BigDecimal.ONE.negate());
-		}		
-		if (result.signum() < 0)
-		{
-			result = config.getBigDecimal("worth-" + itemStack.getTypeId(), BigDecimal.ONE.negate());
-		}
-		if (result.signum() < 0)
-		{
-			return null;
-		}
-		return result;
-	}
-
-	public int getAmount(IEssentials ess, User user, ItemStack is, String[] args, boolean isBulkSell) throws Exception
-	{
-		if (is == null || is.getType() == Material.AIR)
-		{
-			throw new Exception(_("itemSellAir"));
-		}
-		int id = is.getTypeId();
-		int amount = 0;
-
-		if (args.length > 1)
-		{
-			try {
-				amount = Integer.parseInt(args[1].replaceAll("[^0-9]", ""));
-			}
-			catch (NumberFormatException ex) {
-				throw new NotEnoughArgumentsException(ex);
-			}
-			if (args[1].startsWith("-"))
-			{
-				amount = -amount;
-			}
-		}
-
-		boolean stack = args.length > 1 && args[1].endsWith("s");
-		boolean requireStack = ess.getSettings().isTradeInStacks(id);
-
-		if (requireStack && !stack)
-		{
-			throw new Exception(_("itemMustBeStacked"));
-		}
-
-		int max = 0;
-		for (ItemStack s : user.getInventory().getContents())
-		{
-			if (s == null || !s.isSimilar(is))
-			{
-				continue;
-			}
-			max += s.getAmount();
-		}
-
-		if (stack)
-		{
-			amount *= is.getType().getMaxStackSize();
-		}
-		if (amount < 1)
-		{
-			amount += max;
-		}
-
-		if (requireStack)
-		{
-			amount -= amount % is.getType().getMaxStackSize();
-		}
-		if (amount > max || amount < 1)
-		{
-			if (!isBulkSell)
-			{
-				user.sendMessage(_("itemNotEnough2"));
-				user.sendMessage(_("itemNotEnough3"));
-				throw new Exception(_("itemNotEnough1"));
-			}
-			else
-			{
-				return amount;
-			}
-		}
-
-		return amount;
-	}
-
-	public void setPrice(ItemStack itemStack, double price)
-	{
-		if (itemStack.getType().getData() == null)
-		{
-			config.setProperty("worth." + itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), price);
-		}
-		else
-		{
-			// Bukkit-bug: getDurability still contains the correct value, while getData().getData() is 0.
-			config.setProperty("worth." + itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "") + "." + itemStack.getDurability(), price);
-		}
-		config.removeProperty("worth-" + itemStack.getTypeId());
-		config.save();
-	}
-
-	@Override
-	public void reloadConfig()
-	{
-		config.load();
-	}
-}

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

@@ -1,453 +0,0 @@
-package com.earth2me.essentials.api;
-
-import com.earth2me.essentials.EssentialsConf;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import static com.earth2me.essentials.api.Economy.add;
-import static com.earth2me.essentials.api.Economy.divide;
-import static com.earth2me.essentials.api.Economy.format;
-import static com.earth2me.essentials.api.Economy.getMoneyExact;
-import static com.earth2me.essentials.api.Economy.hasEnough;
-import static com.earth2me.essentials.api.Economy.hasLess;
-import static com.earth2me.essentials.api.Economy.hasMore;
-import static com.earth2me.essentials.api.Economy.multiply;
-import static com.earth2me.essentials.api.Economy.setMoney;
-import static com.earth2me.essentials.api.Economy.substract;
-import com.earth2me.essentials.utils.NumberUtil;
-import com.earth2me.essentials.utils.StringUtil;
-import java.io.File;
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import net.ess3.api.IEssentials;
-
-
-/**
- * Instead of using this api directly, we recommend to use the register plugin: http://bit.ly/RegisterMethod
- */
-public class Economy
-{
-	public Economy()
-	{
-	}
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	private static IEssentials ess;
-	private static final String noCallBeforeLoad = "Essentials API is called before Essentials is loaded.";
-	public static final MathContext MATH_CONTEXT = MathContext.DECIMAL128;
-
-	/**
-	 * @param aEss the ess to set
-	 */
-	public static void setEss(IEssentials aEss)
-	{
-		ess = aEss;
-	}
-
-	private static void createNPCFile(String name)
-	{
-		File folder = new File(ess.getDataFolder(), "userdata");
-		if (!folder.exists())
-		{
-			folder.mkdirs();
-		}
-		EssentialsConf npcConfig = new EssentialsConf(new File(folder, StringUtil.sanitizeFileName(name) + ".yml"));
-		npcConfig.load();
-		npcConfig.setProperty("npc", true);
-		npcConfig.setProperty("money", ess.getSettings().getStartingBalance());
-		npcConfig.forceSave();
-	}
-
-	private static void deleteNPC(String name)
-	{
-		File folder = new File(ess.getDataFolder(), "userdata");
-		if (!folder.exists())
-		{
-			folder.mkdirs();
-		}
-		File config = new File(folder, StringUtil.sanitizeFileName(name) + ".yml");
-		EssentialsConf npcConfig = new EssentialsConf(config);
-		npcConfig.load();
-		if (npcConfig.hasProperty("npc") && npcConfig.getBoolean("npc", false))
-		{
-			if (!config.delete())
-			{
-				logger.log(Level.WARNING, _("deleteFileError", config));
-			}
-			ess.getUserMap().removeUser(name);
-		}
-	}
-
-	private static User getUserByName(String name)
-	{
-		if (ess == null)
-		{
-			throw new RuntimeException(noCallBeforeLoad);
-		}
-		return ess.getUser(name);
-	}
-
-	/**
-	 * Returns the balance of a user
-	 *
-	 * @param name Name of the user
-	 * @return balance
-	 * @throws UserDoesNotExistException
-	 */
-	@Deprecated
-	public static double getMoney(String name) throws UserDoesNotExistException
-	{
-		return getMoneyExact(name).doubleValue();
-	}
-
-	public static BigDecimal getMoneyExact(String name) throws UserDoesNotExistException
-	{
-		User user = getUserByName(name);
-		if (user == null)
-		{
-			throw new UserDoesNotExistException(name);
-		}
-		return user.getMoney();
-	}
-
-	/**
-	 * Sets the balance of a user
-	 *
-	 * @param name Name of the user
-	 * @param balance The balance you want to set
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
-	 */
-	@Deprecated
-	public static void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		try
-		{
-			setMoney(name, BigDecimal.valueOf(balance));
-		}
-		catch (ArithmeticException e)
-		{
-			logger.log(Level.WARNING, "Failed to set balance of " + name + " to " + balance + ": " + e.getMessage(), e);
-		}
-	}
-
-	public static void setMoney(String name, BigDecimal balance) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		User user = getUserByName(name);
-		if (user == null)
-		{
-			throw new UserDoesNotExistException(name);
-		}
-		if (balance.compareTo(ess.getSettings().getMinMoney()) < 0)
-		{
-			throw new NoLoanPermittedException();
-		}
-		if (balance.signum() < 0 && !user.isAuthorized("essentials.eco.loan"))
-		{
-			throw new NoLoanPermittedException();
-		}
-		user.setMoney(balance);
-	}
-
-	/**
-	 * Adds money to the balance of a user
-	 *
-	 * @param name Name of the user
-	 * @param amount The money you want to add
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
-	 */
-	@Deprecated
-	public static void add(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		try
-		{
-			add(name, BigDecimal.valueOf(amount));
-		}
-		catch (ArithmeticException e)
-		{
-			logger.log(Level.WARNING, "Failed to add " + amount + " to balance of " + name + ": " + e.getMessage(), e);
-		}
-	}
-
-	public static void add(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
-	{
-		BigDecimal result = getMoneyExact(name).add(amount, MATH_CONTEXT);
-		setMoney(name, result);
-	}
-
-	/**
-	 * Substracts money from the balance of a user
-	 *
-	 * @param name Name of the user
-	 * @param amount The money you want to substract
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
-	 */
-	@Deprecated
-	public static void subtract(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		try
-		{
-			substract(name, BigDecimal.valueOf(amount));
-		}
-		catch (ArithmeticException e)
-		{
-			logger.log(Level.WARNING, "Failed to substract " + amount + " of balance of " + name + ": " + e.getMessage(), e);
-		}
-	}
-
-	public static void substract(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
-	{
-		BigDecimal result = getMoneyExact(name).subtract(amount, MATH_CONTEXT);
-		setMoney(name, result);
-	}
-
-	/**
-	 * Divides the balance of a user by a value
-	 *
-	 * @param name Name of the user
-	 * @param value The balance is divided by this value
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
-	 */
-	@Deprecated
-	public static void divide(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		try
-		{
-			divide(name, BigDecimal.valueOf(amount));
-		}
-		catch (ArithmeticException e)
-		{
-			logger.log(Level.WARNING, "Failed to divide balance of " + name + " by " + amount + ": " + e.getMessage(), e);
-		}
-	}
-
-	public static void divide(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
-	{
-		BigDecimal result = getMoneyExact(name).divide(amount, MATH_CONTEXT);
-		setMoney(name, result);
-	}
-
-	/**
-	 * Multiplies the balance of a user by a value
-	 *
-	 * @param name Name of the user
-	 * @param value The balance is multiplied by this value
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
-	 */
-	@Deprecated
-	public static void multiply(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		try
-		{
-			multiply(name, BigDecimal.valueOf(amount));
-		}
-		catch (ArithmeticException e)
-		{
-			logger.log(Level.WARNING, "Failed to multiply balance of " + name + " by " + amount + ": " + e.getMessage(), e);
-		}
-	}
-
-	public static void multiply(String name, BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException
-	{
-		BigDecimal result = getMoneyExact(name).multiply(amount, MATH_CONTEXT);
-		setMoney(name, result);
-	}
-
-	/**
-	 * Resets the balance of a user to the starting balance
-	 *
-	 * @param name Name of the user
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
-	 */
-	public static void resetBalance(String name) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		if (ess == null)
-		{
-			throw new RuntimeException(noCallBeforeLoad);
-		}
-		setMoney(name, ess.getSettings().getStartingBalance());
-	}
-
-	/**
-	 * @param name Name of the user
-	 * @param amount The amount of money the user should have
-	 * @return true, if the user has more or an equal amount of money
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 */
-	@Deprecated
-	public static boolean hasEnough(String name, double amount) throws UserDoesNotExistException
-	{
-		try
-		{
-			return hasEnough(name, BigDecimal.valueOf(amount));
-		}
-		catch (ArithmeticException e)
-		{
-			logger.log(Level.WARNING, "Failed to compare balance of " + name + " with " + amount + ": " + e.getMessage(), e);
-			return false;
-		}
-	}
-
-	public static boolean hasEnough(String name, BigDecimal amount) throws UserDoesNotExistException, ArithmeticException
-	{
-		return amount.compareTo(getMoneyExact(name)) <= 0;
-	}
-
-	/**
-	 * @param name Name of the user
-	 * @param amount The amount of money the user should have
-	 * @return true, if the user has more money
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 */
-	@Deprecated
-	public static boolean hasMore(String name, double amount) throws UserDoesNotExistException
-	{
-		try
-		{
-			return hasMore(name, BigDecimal.valueOf(amount));
-		}
-		catch (ArithmeticException e)
-		{
-			logger.log(Level.WARNING, "Failed to compare balance of " + name + " with " + amount + ": " + e.getMessage(), e);
-			return false;
-		}
-	}
-
-	public static boolean hasMore(String name, BigDecimal amount) throws UserDoesNotExistException, ArithmeticException
-	{
-		return amount.compareTo(getMoneyExact(name)) < 0;
-	}
-
-	/**
-	 * @param name Name of the user
-	 * @param amount The amount of money the user should not have
-	 * @return true, if the user has less money
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 */
-	@Deprecated
-	public static boolean hasLess(String name, double amount) throws UserDoesNotExistException
-	{
-		try
-		{
-			return hasLess(name, BigDecimal.valueOf(amount));
-		}
-		catch (ArithmeticException e)
-		{
-			logger.log(Level.WARNING, "Failed to compare balance of " + name + " with " + amount + ": " + e.getMessage(), e);
-			return false;
-		}
-	}
-
-	public static boolean hasLess(String name, BigDecimal amount) throws UserDoesNotExistException, ArithmeticException
-	{
-		return amount.compareTo(getMoneyExact(name)) > 0;
-	}
-
-	/**
-	 * Test if the user has a negative balance
-	 *
-	 * @param name Name of the user
-	 * @return true, if the user has a negative balance
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 */
-	public static boolean isNegative(String name) throws UserDoesNotExistException
-	{
-		return getMoneyExact(name).signum() < 0;
-	}
-
-	/**
-	 * Formats the amount of money like all other Essentials functions. Example: $100000 or $12345.67
-	 *
-	 * @param amount The amount of money
-	 * @return Formatted money
-	 */
-	@Deprecated
-	public static String format(double amount)
-	{
-		try
-		{
-			return format(BigDecimal.valueOf(amount));
-		}
-		catch (NumberFormatException e)
-		{
-			logger.log(Level.WARNING, "Failed to display " + amount + ": " + e.getMessage(), e);
-			return "NaN";
-		}
-	}
-
-	public static String format(BigDecimal amount)
-	{
-		if (ess == null)
-		{
-			throw new RuntimeException(noCallBeforeLoad);
-		}
-		return NumberUtil.displayCurrency(amount, ess);
-	}
-
-	/**
-	 * Test if a player exists to avoid the UserDoesNotExistException
-	 *
-	 * @param name Name of the user
-	 * @return true, if the user exists
-	 */
-	public static boolean playerExists(String name)
-	{
-		return getUserByName(name) != null;
-	}
-
-	/**
-	 * Test if a player is a npc
-	 *
-	 * @param name Name of the player
-	 * @return true, if it's a npc
-	 * @throws UserDoesNotExistException
-	 */
-	public static boolean isNPC(String name) throws UserDoesNotExistException
-	{
-		User user = getUserByName(name);
-		if (user == null)
-		{
-			throw new UserDoesNotExistException(name);
-		}
-		return user.isNPC();
-	}
-
-	/**
-	 * Creates dummy files for a npc, if there is no player yet with that name.
-	 *
-	 * @param name Name of the player
-	 * @return true, if a new npc was created
-	 */
-	public static boolean createNPC(String name)
-	{
-		User user = getUserByName(name);
-		if (user == null)
-		{
-			createNPCFile(name);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Deletes a user, if it is marked as npc.
-	 *
-	 * @param name Name of the player
-	 * @throws UserDoesNotExistException
-	 */
-	public static void removeNPC(String name) throws UserDoesNotExistException
-	{
-		User user = getUserByName(name);
-		if (user == null)
-		{
-			throw new UserDoesNotExistException(name);
-		}
-		deleteNPC(name);
-	}
-}
-

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +0,0 @@
-package com.earth2me.essentials.api;
-
-
-public class NoLoanPermittedException extends net.ess3.api.NoLoanPermittedException
-{
-
-}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,49 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.utils.NumberUtil;
-import java.math.BigDecimal;
-import org.bukkit.Server;
-
-
-public class Commandbalance extends EssentialsCommand
-{
-	public Commandbalance()
-	{
-		super("balance");
-	}
-
-	@Override
-	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-
-		User target = getPlayer(server, args, 0, true, true);
-		sender.sendMessage(_("balanceOther", target.isHidden() ? target.getName() : target.getDisplayName(), NumberUtil.displayCurrency(target.getMoney(), ess)));
-	}
-
-	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length == 1 && user.isAuthorized("essentials.balance.others"))
-		{
-			final User target = getPlayer(server, args, 0, true, true);
-			final BigDecimal bal = target.getMoney();
-			user.sendMessage(_("balanceOther", target.isHidden() ? target.getName() : target.getDisplayName(), NumberUtil.displayCurrency(bal, ess)));
-		}
-		else if (args.length < 2)
-		{
-			final BigDecimal bal = user.getMoney();
-			user.sendMessage(_("balance", NumberUtil.displayCurrency(bal, ess)));
-		}
-		else
-		{
-			throw new NotEnoughArgumentsException();
-		}
-	}
-}

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

@@ -1,196 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.textreader.SimpleTextInput;
-import com.earth2me.essentials.textreader.TextPager;
-import com.earth2me.essentials.utils.NumberUtil;
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.bukkit.Server;
-
-//TODO: Remove op and replace with perm
-public class Commandbalancetop extends EssentialsCommand
-{
-	public Commandbalancetop()
-	{
-		super("balancetop");
-	}
-	private static final int CACHETIME = 2 * 60 * 1000;
-	public static final int MINUSERS = 50;
-	private static final SimpleTextInput cache = new SimpleTextInput();
-	private static long cacheage = 0;
-	private static final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
-
-	@Override
-	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
-	{
-		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.getSender().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.runTaskAsynchronously(new Viewer(sender, page, force));
-		}
-		else
-		{
-			if (ess.getUserMap().getUniqueUsers() > MINUSERS)
-			{
-				sender.sendMessage(_("orderBalances", ess.getUserMap().getUniqueUsers()));
-			}
-			ess.runTaskAsynchronously(new Viewer(sender, page, force));
-		}
-
-	}
-
-	private static void outputCache(final CommandSource 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), null, "balancetop", sender);
-	}
-
-
-	private class Calculator implements Runnable
-	{
-		private final transient Viewer viewer;
-		private final boolean force;
-
-		public Calculator(final Viewer viewer, final boolean force)
-		{
-			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, BigDecimal> balances = new HashMap<String, BigDecimal>();
-					BigDecimal totalMoney = BigDecimal.ZERO;
-					if (ess.getSettings().isEcoDisabled())
-					{
-						if (ess.getSettings().isDebug())
-						{
-							ess.getLogger().info("Internal economy functions disabled, aborting baltop.");
-						}
-					}
-					else
-					{
-						for (String u : ess.getUserMap().getAllUniqueUsers())
-						{
-							final User user = ess.getUserMap().getUser(u);
-							if (user != null)
-							{
-								final BigDecimal userMoney = user.getMoney();
-								user.updateMoneyCache(userMoney);
-								totalMoney = totalMoney.add(userMoney);
-								final String name = user.isHidden() ? user.getName() : user.getDisplayName();
-								balances.put(name, userMoney);
-							}
-						}
-					}
-
-					final List<Map.Entry<String, BigDecimal>> sortedEntries = new ArrayList<Map.Entry<String, BigDecimal>>(balances.entrySet());
-					Collections.sort(sortedEntries, new Comparator<Map.Entry<String, BigDecimal>>()
-					{
-						@Override
-						public int compare(final Entry<String, BigDecimal> entry1, final Entry<String, BigDecimal> entry2)
-						{
-							return entry2.getValue().compareTo(entry1.getValue());
-						}
-					});
-
-					cache.getLines().add(_("serverTotal", NumberUtil.displayCurrency(totalMoney, ess)));
-					int pos = 1;
-					for (Map.Entry<String, BigDecimal> entry : sortedEntries)
-					{
-						cache.getLines().add(pos + ". " + entry.getKey() + ", " + NumberUtil.displayCurrency(entry.getValue(), ess));
-						pos++;
-					}
-					cacheage = System.currentTimeMillis();
-				}
-			}
-			finally
-			{
-				lock.writeLock().unlock();
-			}
-			ess.runTaskAsynchronously(viewer);
-		}
-	}
-
-
-	private class Viewer implements Runnable
-	{
-		private final transient CommandSource sender;
-		private final transient int page;
-		private final transient boolean force;
-
-		public Viewer(final CommandSource 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.runTaskAsynchronously(new Calculator(new Viewer(sender, page, false), force));
-		}
-	}
-}

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

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

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

@@ -1,57 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import com.earth2me.essentials.CommandSource;
-import com.earth2me.essentials.Console;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.utils.FormatUtil;
-import java.util.logging.Level;
-import org.bukkit.Server;
-
-
-public class Commandbanip extends EssentialsCommand
-{
-	public Commandbanip()
-	{
-		super("banip");
-	}
-
-	@Override
-	public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-
-		final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
-
-		String ipAddress;
-		if (FormatUtil.validIP(args[0]))
-		{
-			ipAddress = args[0];
-		}
-		else
-		{
-			try
-			{
-				User player = getPlayer(server, args, 0, true, true);
-				ipAddress = player.getLastLoginAddress();
-			}
-			catch (PlayerNotFoundException ex)
-			{
-				ipAddress = args[0];
-			}
-		}
-
-		if (ipAddress.isEmpty())
-		{
-			throw new PlayerNotFoundException();
-		}
-
-		ess.getServer().banIP(ipAddress);
-		server.getLogger().log(Level.INFO, _("playerBanIpAddress", senderName, ipAddress));
-
-		ess.broadcastMessage("essentials.ban.notify", _("playerBanIpAddress", senderName, ipAddress));
-	}
-}

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

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

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

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

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

@@ -1,48 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import org.bukkit.Material;
-import org.bukkit.Server;
-import org.bukkit.block.Block;
-import org.bukkit.event.block.BlockBreakEvent;
-
-
-public class Commandbreak extends EssentialsCommand
-{
-	public Commandbreak()
-	{
-		super("break");
-	}
-
-	//TODO: Switch to use util class
-	@Override
-	public void run(final Server server, final User 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 && !user.isAuthorized("essentials.break.bedrock"))
-		{
-			throw new Exception(_("noBreakBedrock"));
-		}
-		//final List<ItemStack> list = (List<ItemStack>)block.getDrops();		
-		//final BlockBreakEvent event = new BlockBreakEvent(block, user.getBase(), list);
-		final BlockBreakEvent event = new BlockBreakEvent(block, user.getBase());
-		server.getPluginManager().callEvent(event);
-		if (event.isCancelled())
-		{
-			throw new NoChargeException();
-		}
-		else
-		{
-			block.setType(Material.AIR);
-		}
-	}
-}

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

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

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

@@ -1,33 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import com.earth2me.essentials.CommandSource;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import org.bukkit.Server;
-
-
-public class Commandburn extends EssentialsCommand
-{
-	public Commandburn()
-	{
-		super("burn");
-	}
-
-	@Override
-	protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 2)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-
-		if (args[0].trim().length() < 2)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-
-		User user = getPlayer(server, sender, args, 0);
-		user.setFireTicks(Integer.parseInt(args[1]) * 20);
-		sender.sendMessage(_("burnMsg", user.getDisplayName(), Integer.parseInt(args[1])));
-	}
-}