Honor the configured Discord private-message format (#6644)

### Information

This PR fixes #6641.

### Details

**Proposed fix:**

Read the private-message format from `messages.pms-to-discord`, matching
the shipped config. The settings loader currently reads
`messages.private-chat` instead, so a custom format is ignored and the
default `[SocialSpy]` text is used.

Added settings tests that load real YAML files and check the custom
format, default fallback and reload, including placeholders and
apostrophes. The Discord module now includes the core project on its
test classpath.

**Environments tested:**

OS: Windows
Java version: Temurin 25.0.4.1+1

- [ ] Most recent Paper version
- [ ] CraftBukkit/Spigot/Paper 1.12.2
- [ ] CraftBukkit 1.8.8

The full Gradle build passes, including the new settings tests and
Checkstyle. Live Paper/Discord relay testing was not performed.

**Demonstration:**

The regression loads this configuration:

```yaml
messages:
  pms-to-discord: "[Privado] {sender-displayname} -> {receiver-displayname}: {message}"
```

Before the fix, the actual settings loader produces `[SocialSpy] sender
-> receiver: Hello`. After the fix, it produces `[Privado] Sender ->
Receiver: Hello`. The missing-key control keeps the existing default.

---------

Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>

.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>

.claude/skills/mc-update/SKILL.md

@@ -0,0 +1,270 @@
+---
+name: mc-update
+description: Update EssentialsX for a new Minecraft version. Use when the user asks to update to, bump, or support a new Minecraft or Paper version (for example "update to 26.4", "add 26.3 mobs", "bump supported version"), or asks what must be checked for new mobs, items, wood types, armor, enchantments, potions, or Bukkit API changes.
+---
+
+# Minecraft update
+
+This checklist comes from every Minecraft update PR from 1.14 to 26.3, and from the fix PRs that followed them.
+
+Paths are relative to the repository root. `ESS` means `Essentials/src/main/java/com/earth2me/essentials`.
+
+## Procedure
+
+1. Find the old and new `paper-api` jars in `~/.gradle/caches/modules-2/files-2.1/io.papermc.paper/paper-api/`. If the new jar is not there, set `paperVersion` in `build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts` and run `./gradlew :EssentialsX:compileJava` to download it.
+2. Diff the constants of these classes between the two jars: `org.bukkit.entity.EntityType`, `org.bukkit.Material`, `org.bukkit.enchantments.Enchantment`, `org.bukkit.potion.PotionEffectType`, `org.bukkit.potion.PotionType`, `org.bukkit.TreeType`, and each `*$Variant` class under `org.bukkit.entity`. Use this command for each class:
+
+   ```sh
+   unzip -p <jar> org/bukkit/entity/EntityType.class > /tmp/x.class && javap -p /tmp/x.class | grep 'public static final'
+   ```
+
+3. Sort each added, removed, or renamed constant into a section of part 2 or part 3 below.
+4. Do part 1. Then do each section that applies.
+5. Apply part 4 to every line you write.
+6. Run `./gradlew :EssentialsX:compileJava`. Fix errors.
+7. Do not commit unless the user asks.
+8. Report per section: what changed, and what you skipped and why.
+
+---
+
+## 1. Every update
+
+### 1.1 Version constants
+
+1. Open `ESS/utils/VersionUtil.java`.
+2. Add a constant `vXX_Y_R01 = BukkitVersion.fromString("XX.Y-R0.1-SNAPSHOT")`.
+   - For a patch release, change the string of the existing minor constant. Example: `v26_1_R01` holds `26.1.2`.
+   - For a minor release, add a new constant. Do not rename or delete an old constant. Old constants gate features. Deleting `v1_20_4_R01` caused #6460.
+3. Add the constant to `supportedVersions`. Keep the `ImmutableSet.of(...)` syntax. `build-logic/src/main/kotlin/VersionDataTask.kt` parses it with a regex.
+4. Start a server. Confirm `BukkitVersion.fromString(Bukkit.getBukkitVersion())` parses. Spigot 1.14.3 and Paper 26.1 both changed the string format.
+
+### 1.2 Documentation
+
+1. Update the supported versions sentence in `README.md`.
+2. Regenerate `items.json` with ItemDbGenerator.
+
+---
+
+## 2. New content
+
+### 2.1 New mob
+
+1. Add an entry to `ESS/Mob.java`: `NAME("CamelName", Enemies.X, "ENTITY_TYPE")`.
+   - Use the string constructor. Do not use `EntityType.X`. The constant does not exist on old servers.
+   - Set the plural suffix if it is not `s`. Fish use `""`. Fox uses `es`.
+   - The display name must not contain a space.
+   - Boats and rafts are also `Mob` entries.
+2. Add `EntityType` constant to `ESS/MobCompat.java` only if `MobData` needs it.
+3. Add the mob to `protect.prevent.spawn` in `Essentials/src/main/resources/config.yml`.
+4. Check `entityToDisplayName` in `providers/BaseProviders/.../SpawnerItemProvider.java` if the enum name does not title-case well.
+
+### 2.2 New mob variant or data
+
+1. Add entries to `ESS/MobData.java`. Use the string form `"kind:VARIANT"`. Example: `"wolf:PALE"`.
+2. Add a `case "kind":` to the `setData` switch.
+3. Add `setKindVariant(Entity, String)` to `MobCompat.java`. Gate it with `VersionUtil.getServerBukkitVersion().isLowerThan(vXX_Y_R01)`.
+4. Use `RegistryUtil.valueOf(Variant.class, name)` for registry types. Do not use `Enum.valueOf`.
+5. Do not call `NewClass.Variant.values()` in an enum initializer. Axolotl did this. It threw `NoClassDefFoundError` on 1.16 (#4376).
+6. Catch `Throwable` around reflective lookups. Cow variant threw NPE on old servers (#6121).
+7. For a boolean flag, add a `Data` constant and a branch in `setData`. Example: `GOAT_SCREAMING`.
+
+### 2.3 New rideable or saddle mob
+
+1. Add `SADDLE_<MOB>` to `MobData.java` with a `Data.<MOB>SADDLE` constant.
+2. Add `set<Mob>Saddle(Entity, Player)` to `MobCompat.java`. Tame the mob. Set the owner. Set the saddle.
+3. Check `ESS/craftbukkit/Inventories.java` if the mob adds a player inventory slot. Body and saddle slots (41, 42) broke `/clearinventory` in 1.21.6 (#6218).
+
+### 2.4 New item or block
+
+1. Check each `MaterialUtil` set that lists names by hand. See table.
+2. Check `ESS/utils/LocationUtil.java`:
+   - Add a block that hurts a standing player to `DAMAGING_TYPES`. Magma, campfire, berry bush and wither rose were missed for 2 years (#3537).
+   - `HOLLOW_MATERIALS` comes from `Material.isTransparent()`. Add a passable block that is not transparent. Example: `LIGHT` (#4601). Remove a transparent block that is solid. Examples: `BARRIER`, `DIRT_PATH`, `FARMLAND`.
+3. Check for a new event that reveals player position. Sculk sensor needed vanish handling in `EssentialsPlayerListener` (#5262).
+
+| `ESS/utils/MaterialUtil.java` set | Add when |
+|---|---|
+| `HELMETS`, `CHESTPLATES`, `LEGGINGS`, `BOOTS` | New armor tier |
+| `LEATHER_ARMOR` | New dyeable armor |
+| `BEDS` | New bed. `STRAW_BED` in 26.3. |
+| `BANNERS` | New banner colour |
+| `SIGN_POSTS`, `WALL_SIGNS`, `HANGING_SIGNS`, `HANGING_WALL_SIGNS` | New wood type |
+| `MOB_HEADS` | New head. `PIGLIN_HEAD` in 1.20. |
+| `POTIONS` | New potion container |
+| `EDITABLE_BOOKS` | New book type |
+| `FIREWORKS`, `FIREWORK_CHARGE` | New firework item |
+
+`EnumUtil.getAllMatching` skips a name that does not exist. Adding a name is safe on old servers.
+
+### 2.5 Renamed item, block or entity
+
+1. Grep `ESS` for `Material.OLD_NAME` and `EntityType.OLD_NAME`. Replace with `EnumUtil.getMaterial("NEW", "OLD")` or a `MobCompat` constant. `EntityType.PIG_ZOMBIE` in a static map broke 1.16 (#3412). `EntityType.FIREWORK` broke `/firework` in 1.20.6.
+2. For a renamed `EntityType`, add `getEntityType("NEW", "OLD")` to `MobCompat.java`. Update `Mob.java`, `MobData.java` and `SpawnMob.java`.
+
+### 2.6 New wood type
+
+1. Add `<WOOD>_SIGN`, `<WOOD>_WALL_SIGN`, `<WOOD>_HANGING_SIGN`, `<WOOD>_WALL_HANGING_SIGN` to the four sign sets in `MaterialUtil.java`. Crimson and warped were missed in 1.16 (#3487).
+2. Add `<WOOD>_BOAT` to `Mob.java`. Boats are separate entity types since 1.21.3.
+3. Add `<WOOD>` to `MobCompat.BoatVariant` for servers before 1.21.3.
+4. Add `<WOOD>_BOAT` to `MobData.java`.
+5. Add `<WOOD>_CHEST_BOAT` to `Mob.java`.
+
+### 2.7 New tree type
+
+1. `Commandtree` reads `TreeType.values()`. It needs no code change.
+2. Add the name to `treeCommandUsage` and `treeCommandUsage1` in `messages.properties`.
+3. `Commandbigtree` has four hard-coded types. Add a case if the tree has a big variant.
+4. Bukkit adds `TreeType` late. 26.3-pre-2 has no `POPLAR`.
+
+### 2.8 New armor tier
+
+1. Add the four pieces to `HELMETS`, `CHESTPLATES`, `LEGGINGS`, `BOOTS` in `MaterialUtil.java`.
+2. Add a branch to the armor keyword chain in `ESS/SpawnMob.java`. The chain has `netherite`, `copper`, `diamond`, `gold`, `leather`, `iron`.
+3. For horse armor, add `<TIER>_HORSE_ARMOR` to `MobData.java`. Example: `NETHERITE_HORSE_ARMOR`.
+
+### 2.9 New enchantment
+
+1. Add a `try { // XX.Y }` block to `ESS/Enchantments.java`.
+2. Look up by name: `Enchantment.getByName("NAME")`. Check for null. Do not use `Enchantment.NAME`.
+3. Add `ENCHANTMENTS.put("name", e)` and `ALIASENCHANTMENTS.put("alias", e)`.
+4. Swift sneak (1.19) and lunge (1.21.11) were missed. Contributors added them months later.
+5. Display and permission names come from `Enchantments.getRealName()`. It uses the key on 1.13+.
+
+### 2.10 New potion effect or potion type
+
+1. Add a `try { // XX.Y }` block to `ESS/Potions.java`. Catch `Throwable`.
+2. Add `POTIONS.put("name", PotionEffectType.NAME)` and `ALIASPOTIONS.put(...)`.
+3. `ModernPotionMetaProvider` maps `LONG_` and `STRONG_` prefixes. Check a new potion follows that pattern.
+
+### 2.11 New banner pattern
+
+No code change. `PatternTypeProvider` reads the registry.
+
+### 2.12 New colour family
+
+Check `MaterialUtil.getColorOf` for a colour name that is not a `DyeColor`.
+
+### 2.13 New spawn egg
+
+No code change. `FlatSpawnEggProvider` derives the egg from `EntityType.name() + "_SPAWN_EGG"`.
+
+### 2.14 New command for new content
+
+1. Gate the command with `VersionUtil`. Return `tl("unsupportedFeature")` on old servers. Examples: `/beezooka`, `/ice`.
+2. Add the command to `plugin.yml` and `messages.properties`. Check message parameters. `iceOther` shipped without `{0}`.
+
+---
+
+## 3. API changes
+
+### 3.1 Enum becomes a registry
+
+Enchantment, PotionEffectType, Sound, PatternType, Villager.Profession, Cat.Type, Biome and Boat.Type all changed.
+
+1. Replace `EnumUtil.valueOf` with `RegistryUtil.valueOf(Class, names...)`. Replace `.values()` with `RegistryUtil.values(Class)`.
+2. If a static method moved from an enum to an interface, code compiled against the new API throws `IncompatibleClassChangeError` on old servers. `catch (Exception)` does not catch it. `PatternType.getByIdentifier` did this (#6553).
+3. For such a case, add a provider pair:
+   - Interface in `providers/BaseProviders/src/main/java/net/ess3/provider/`.
+   - `Modern*Provider` in BaseProviders with `@ProviderData(weight = 1)` and a `@ProviderTest`.
+   - `Legacy*Provider` in `providers/1_12Provider` or `providers/1_8Provider`. These compile against the old API.
+   - Register with `providerFactory.registerProvider(Legacy.class, Modern.class)` in `Essentials.java`.
+4. In a `@ProviderTest`, use `getMethod`, not `getDeclaredMethod`. 1.21 moved spawner methods to a super-interface (80bdc5269).
+
+### 3.2 Removed API class
+
+`PotionData`, `Potion`, `BannerMeta.setBaseColor` and `Achievement` were removed.
+
+1. Move code that uses the removed class to a provider in `1_12Provider` or `1_8Provider`.
+2. Add a modern provider in BaseProviders.
+3. Remove the method from `OfflinePlayer`, `FakeWorld` and `FakeServer` if it was an override.
+
+### 3.3 Changed method signature
+
+1. Read the Bukkit diff for changed return types on methods EssentialsX calls.
+2. A changed return type changes the call descriptor. The call throws `NoSuchMethodError` on old servers. `PlayerPickupArrowEvent#getArrow` did this (#3175). `InventoryView` becoming an interface did this (#5851).
+3. Use a provider or reflection for the changed call.
+
+### 3.4 New API methods on Player, World, Server
+
+1. Add stubs to `providers/1_8Provider/.../OfflinePlayer.java` and `providers/1_12Provider/.../FakeWorld.java` if they fail to compile.
+2. Tests use MockBukkit since 1.21.6. `FakeServer` no longer needs updates.
+
+### 3.5 New event
+
+1. Put the handler in a separate `*Listener_XX_Y` class.
+2. Register it behind a `VersionUtil` check or `Class.forName`.
+3. Do not put a new event in a listener that loads on old servers. `EntityTransformEvent` failed on 1.13.1 (#2942).
+
+### 3.6 Spigot NMS obfuscation
+
+1. Add `VXX_Y_RN` to `providers/NMSReflectionProvider/.../ReflUtil.java` if Spigot bumps the NMS revision.
+2. Update the obfuscated `MinecraftServer#isRunning` name table in `ReflServerStateProvider.java`. This broke on 1.18, 1.19, 1.19.3, 1.20.6 and 1.21.10.
+3. Paper uses `PaperServerStateProvider`. Test on Spigot to see this fail.
+
+### 3.7 Paper internal classes
+
+Paper config classes move. `ReflOnlineModeProvider` broke on 1.19 when config moved to `io.papermc.paper.configuration.GlobalConfiguration`. Check every reflective Paper access.
+
+### 3.8 World height
+
+1. Do not hard-code `0`, `-1`, `128` or `256` as a Y bound.
+2. Use `WorldInfoProvider.getMinHeight`, `getMaxHeight` and `getLogicalHeight`.
+3. Grep `LocationUtil`, `RandomTeleport`, `Commandtop`, `Commandsethome`, `Teleport`, `AsyncTeleport` and `SpawnMob`. 1.18 needed three fix PRs (#4657, #4667, #4715).
+
+### 3.9 Item data components
+
+1. Check `MetaItemStack.parseStringMeta`. The `[...]` component branch calls `UnsafeValues#modifyItemStack`. Its argument shape changed in 1.20.5 and again in 26.1 (#6570).
+2. Check `Commandbook`. Writable and written books have separate meta since 1.20.6 (#6064).
+3. Check `Commandskull`. Skull owner needs a resolved profile since 1.20.4 (#6188).
+4. Check `MetaItemStack.canSpawn()`.
+
+### 3.10 Vanilla messages
+
+Check the vanilla changelog for a new client message that duplicates an EssentialsX message. 1.15 added "Respawn point set". `EssentialsPlayerListener` now gates `bedSet` (#2943).
+
+### 3.11 Version string format
+
+1. `BukkitVersion.VERSION_PATTERN` in `VersionUtil.java` must parse the new string.
+2. Supported suffixes: `-snapshot-N`, `-pre-N`, `-rc-N`, `.build.N-channel`, `.local`, `-R0.1-SNAPSHOT`.
+3. `compareDevSpecifier` orders `snapshot < pre < rc < release`.
+4. `isSupportedVersion` compares major, minor and patch. A patch release needs a constant change.
+5. 26.1 needed four fix PRs for this (#6480, #6483, #6500, #6501).
+
+### 3.12 Adventure and Paper native paths
+
+Each Paper API shift produced a gate:
+- `Essentials.initAdventureFacet` gates the Paper facet at `v1_18_2_R01` (#6562).
+- `EssentialsSpawnPlayerListener` gates `getRespawnLocation` at `v1_20_4_R01` (#6460).
+- `EssentialsPlayerListener` gates configuration events at `v1_21_8_R01`.
+
+Check each gate against the new version.
+
+---
+
+## 4. Compatibility rules
+
+EssentialsX runs on 1.8.8 through the current version. Every update PR must keep that.
+
+1. Do not reference a new `Material`, `EntityType`, `Enchantment` or `PotionEffectType` constant in a static field or enum initializer. Use `EnumUtil.getMaterial`, `EnumUtil.getEntityType` or a name lookup.
+2. Catch `Throwable`, not `Exception`, around reflective lookups and provider selection. A swallowed `NoSuchFieldError` selected the wrong provider (7d6195375).
+3. Use only Guava and Gson methods that exist in 1.8.8. `Ints.constrainToRange` and `JsonArray#add(String)` do not (#4708, 576866540).
+4. Compile legacy providers in `1_8Provider` or `1_12Provider`. Code compiled against the new API can carry the wrong bytecode.
+5. Gate with `isLowerThan(<next major>)`, not `isLowerThanOrEqualTo(<patch>)`. Forks use nonstandard revision numbers (43eff69a2).
+6. Do not delete a `VersionUtil` constant.
+7. Test on Paper latest, Spigot latest, 1.12.2 and 1.8.8. Most follow-up fixes in this history came from old servers.
+
+---
+
+## 5. Test
+
+1. Run `./gradlew test`.
+2. Run `./gradlew runServer`.
+3. Run `/ess version`. Confirm the support status is FULL.
+4. Run `/spawnmob <newmob>`, `/spawnmob <mob>:<variant>`.
+5. Run `/give @s <newitem>`, `/give @s minecraft:<newitem>`.
+6. Run `/enchant <newenchant>`, `/potion <neweffect>`.
+7. Place an EssentialsX sign on each new sign type.
+8. Run `/tree <newtree>` if Bukkit has the `TreeType`.
+9. Run `/kit` with the new armor. Confirm auto-equip.
+10. Teleport onto each new damaging block. Confirm `/tp` refuses.
+11. Repeat on Spigot for `ReflServerStateProvider`.

.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,17 @@
+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/issues?q=is%3Aissue+label%3A%22type%3A+enhancement%22
+    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: 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,83 @@
+name: Report bug
+description: Report a bug in EssentialsX.
+labels: 'bug: unconfirmed'
+type: Bug
+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://pastes.dev 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://pastes.dev/UYL3ASLsee"
+
+- 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: textarea
+  attributes:
+    label: Additional Information
+    description: |
+      In this box, 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.
+  validations:
+    required: false
+    

.github/ISSUE_TEMPLATE/request-a-feature.yml

@@ -0,0 +1,41 @@
+name: Request a feature
+description: Suggest a feature you want to see in EssentialsX!
+labels: 'type: enhancement'
+type: Feature
+body:
+- type: markdown
+  attributes:
+    value: |
+      If you have a feature suggestion for EssentialsX, read the following tips:
+      1.  Fill out the template.
+            This will help us understand what you're requesting and why you want us
+            to add it.
+      2.  Keep it simple.
+            Make sure it's easy to understand what you're requesting. A good way is
+            to keep it to one request per GitHub issue, as we can then easily track
+            feature requests.
+      3.  Check whether it has already been asked or added.
+            You can search the issue tracker to see if your feature has already been
+            requested at https://github.com/EssentialsX/Essentials/issues. You can
+            also check the changelogs to see if the feature was recently added:
+            https://github.com/EssentialsX/Essentials/releases
+      4.  Ask yourself: "Does this belong in EssentialsX?"
+            There are lots of features that we reject because most servers won't
+            need or use them. If your feature is very specific or already exists in
+            another plugin, it might not be a good fit for EssentialsX.
+- type: textarea
+  attributes:
+    label: Feature description
+    description: Explain what you should expect to happen.
+    placeholder: |
+      What feature are you suggesting?
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: How the feature is useful
+    description: Explain what actually happens.
+    placeholder: |
+      How is the feature useful to players, server owners and/or developers?
+  validations:
+    required: true

.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 (XX.YY.Z, 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 (XX.YY.Z, 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,151 @@
+name: Build EssentialsX
+
+on:
+  push:
+    branches:
+    - 2.x
+    - dev/*
+  release:
+    types:
+    - published
+
+jobs:
+  build:
+    name: Build and upload
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout Git repo
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Set up JDK 25
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: 25
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
+
+    - name: Build with Gradle
+      run: |
+        chmod +x gradlew
+        ./gradlew build --stacktrace
+
+    - name: Publish JUnit report
+      uses: mikepenz/action-junit-report@v5
+      if: success() || failure() # Run even if the previous step fails
+      with:
+        report_paths: '**/build/test-results/test*/TEST-*.xml'
+
+    - name: Archive plugin jars on GitHub
+      uses: actions/upload-artifact@v7
+      with:
+        name: EssentialsX plugin jars
+        path: jars/
+
+    - name: Upload EssentialsX jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsX-*.jar
+        archive: false
+
+    - name: Upload EssentialsXAntiBuild jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsXAntiBuild-*.jar
+        archive: false
+
+    - name: Upload EssentialsXChat jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsXChat-*.jar
+        archive: false
+
+    - name: Upload EssentialsXDiscord jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsXDiscord-*.jar
+        archive: false
+
+    - name: Upload EssentialsXDiscordLink jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsXDiscordLink-*.jar
+        archive: false
+
+    - name: Upload EssentialsXGeoIP jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsXGeoIP-*.jar
+        archive: false
+
+    - name: Upload EssentialsXProtect jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsXProtect-*.jar
+        archive: false
+
+    - name: Upload EssentialsXSpawn jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsXSpawn-*.jar
+        archive: false
+
+    - name: Upload EssentialsXXMPP jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsXXMPP-*.jar
+        archive: false
+
+    - 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
+      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 EssentialsDiscordLink/build/docs/javadoc/ javadocs/EssentialsDiscordLink/
+        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: Archive Javadocs
+      uses: actions/upload-artifact@v7
+      with:
+        name: javadocs
+        path: javadocs/
+
+  publish-jd:
+    name: Publish Javadocs
+    needs: build
+    if: ${{ github.event_name == 'push' && github.repository == 'EssentialsX/Essentials' && github.ref == 'refs/heads/2.x' }}
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Setup Node
+      uses: actions/setup-node@v4
+      with:
+        node-version: 22
+
+    - name: Download Javadocs
+      uses: actions/download-artifact@v8
+      with:
+        name: javadocs
+        path: javadocs/
+
+    - name: Deploy Javadocs
+      run: npx netlify-cli 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,108 @@
+name: Build Pull Request
+
+on:
+  push:
+    branches:
+    - mc/* # MC version updates
+    - pr/* # PR rebases
+  pull_request:
+    branches:
+    - 2.x
+    - mc/*
+    - dev/*
+  merge_group:
+    types: [checks_requested]
+
+permissions:
+  checks: write
+
+jobs:
+  build:
+    name: Build and upload
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout Git repo
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Set up JDK 25
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: 25
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
+
+    - name: Build with Gradle
+      run: |
+        chmod +x gradlew
+        ./gradlew build --stacktrace
+
+    - name: Publish JUnit report
+      uses: mikepenz/action-junit-report@v4
+      if: success() || failure() # Run even if the previous step fails
+      with:
+        report_paths: '**/build/test-results/test*/TEST-*.xml'
+
+    - name: Archive plugin jars on GitHub
+      uses: actions/upload-artifact@v7
+      with:
+        name: EssentialsX plugin jars
+        path: jars/
+
+    - name: Upload EssentialsX jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsX-*.jar
+        archive: false
+
+    - name: Upload EssentialsXAntiBuild jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsXAntiBuild-*.jar
+        archive: false
+
+    - name: Upload EssentialsXChat jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsXChat-*.jar
+        archive: false
+
+    - name: Upload EssentialsXDiscord jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsXDiscord-*.jar
+        archive: false
+
+    - name: Upload EssentialsXDiscordLink jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsXDiscordLink-*.jar
+        archive: false
+
+    - name: Upload EssentialsXGeoIP jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsXGeoIP-*.jar
+        archive: false
+
+    - name: Upload EssentialsXProtect jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsXProtect-*.jar
+        archive: false
+
+    - name: Upload EssentialsXSpawn jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsXSpawn-*.jar
+        archive: false
+
+    - name: Upload EssentialsXXMPP jar
+      uses: actions/upload-artifact@v7
+      with:
+        path: jars/EssentialsXXMPP-*.jar
+        archive: false

.github/workflows/mirror-dump.yml

@@ -0,0 +1,112 @@
+name: Mirror EssentialsX dumps to Gist
+
+on:
+  issues:
+    types: [opened, edited, closed]
+  issue_comment:
+    types: [created]
+
+permissions:
+  issues: write
+  contents: read
+
+env:
+  DUMP_REGEX: 'https?://essentialsx\.net/dump\?bytebin=([A-Za-z0-9_-]+)'
+  GIST_LINK_FMT: 'https://essentialsx.net/dump?gist='
+
+jobs:
+  handle-dump:
+    if: github.event.action != 'closed'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Mirror dump to a private Gist
+        id: mirror
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GIST_TOKEN }}
+          script: |
+            const issue   = context.payload.issue ?? context.payload.comment.issue;
+            const bodySrc = context.payload.comment ? context.payload.comment.body : issue.body || '';
+
+            const regex = new RegExp(process.env.DUMP_REGEX);
+            const m = bodySrc.match(regex);
+            if (!m) {
+              core.info('No EssentialsX dump link found – abort.');
+              return;
+            }
+
+            const key = m[1];
+            const dump = await fetch(`https://api.pastes.dev/${key}`);
+            if (!dump.ok) throw new Error(`pastes.dev fetch failed (${dump.status})`);
+            const text = await dump.text();
+
+            const { data: gist } = await github.rest.gists.create({
+              files: { [`${key}.txt`]: { content: text } },
+              description: `EssentialsX dump for issue #${issue.number}`,
+              public: false
+            });
+
+            core.setOutput('link', `${process.env.GIST_LINK_FMT}${gist.id}`);
+            core.setOutput('issue_number', issue.number);
+
+      - name: Comment gist link on issue
+        if: steps.mirror.outputs.link != ''
+        uses: actions/github-script@v7
+        with:
+          script: |
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo:  context.repo.repo,
+              issue_number: ${{ steps.mirror.outputs.issue_number }},
+              body: `📋 Essentials Dump Backup → ${{ steps.mirror.outputs.link }}`
+            });
+
+  cleanup-gist:
+    if: github.event_name == 'issues' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Delete gist and hide bot comment
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GIST_TOKEN }}
+          script: |
+            const issue = context.payload.issue;
+
+            const comments = await github.paginate(
+              github.rest.issues.listComments,
+              { owner: context.repo.owner, repo: context.repo.repo, issue_number: issue.number, per_page: 100 }
+            );
+            
+            const re = /https?:\/\/essentialsx\.net\/dump\?gist=([A-Za-z0-9]+)/;
+            const hit = comments.reverse().find(c => re.test(c.body || ''));
+            
+            if (!hit) {
+              core.info('No gist link comment found – nothing to clean up.');
+              return;
+            }
+            
+            const gistId   = (hit.body.match(re))[1];
+            const commentNodeId = hit.node_id;
+
+            try {
+              await github.request('DELETE /gists/{gist_id}', { gist_id: gistId });
+              core.info(`Deleted Gist ${gistId}`);
+            } catch (err) {
+              core.warning(`Could not delete Gist ${gistId}: ${err.message}`);
+            }
+
+            try {
+              await github.graphql(
+                `mutation($id:ID!){
+                   minimizeComment(input:{subjectId:$id, classifier:OUTDATED}) {
+                     minimizedComment { id }
+                   }
+                 }`,
+                { id: commentNodeId }
+              );
+              core.info(`Minimised comment ${hit.id} as OUTDATED`);
+            } catch (err) {
+              core.warning(`Could not minimise comment: ${err.message}`);
+            }

.github/workflows/upload-plugin-data.yml

@@ -0,0 +1,43 @@
+name: Command and Permissions Data
+on:
+  push:
+    branches:
+      - 2.x
+
+jobs:
+  data:
+    name: Generate and Upload
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Git Repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 17
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Generate Data
+        run: |
+          chmod +x gradlew
+          ./gradlew commandData
+          ./gradlew versionData
+
+      - name: Upload Data
+        uses: ryand56/r2-upload-action@v1
+        with:
+          r2-account-id: ${{ secrets.R2_ACCOUNT_ID }}
+          r2-access-key-id: ${{ secrets.R2_ACCESS_KEY_ID }}
+          r2-secret-access-key: ${{ secrets.R2_SECRET_ACCESS_KEY }}
+          r2-bucket: ${{ secrets.R2_BUCKET }}
+          source-dir: generated
+          destination-dir: ./
+
+

.gitignore

@@ -1,42 +1,35 @@
+# Other IDE files
+*.classpath
+*.project
+*.settings/
+.idea/*
+*.iml
 .DS_Store
-/BuildAll/nbproject/private/
-/EssentialsProtect/nbproject/private/
-/EssentialsChat/nbproject/private/
-/EssentialsGroupBridge/nbproject/private/
-/EssentialsGeoIP/nbproject/private/
-/EssentialsSpawn/nbproject/private/
-/EssentialsXMPP/nbproject/private/
-/EssentialsGroupManager/nbproject/private/
-/BuildAll/build/
-/EssentialsGroupBridge/dist/
-/EssentialsGroupBridge/build/
-/EssentialsGeoIP/dist/
-/EssentialsGeoIP/build/
-/EssentialsGroupManager/build/
-/EssentialsGroupManager/dist/
-/BuildAll/dist/
-/EssentialsChat/build/
-/EssentialsChat/dist/
-/EssentialsSpawn/build/
-/EssentialsSpawn/dist/
-/EssentialsXMPP/dist/
-/EssentialsXMPP/build/
-/EssentialsProtect/dist/
-/EssentialsProtect/build/
-/EssentialsPermissionsCommands/nbproject/private/
-/EssentialsPermissionsCommands/build/
-/EssentialsPermissionsCommands/dist/
-/Essentials/nbproject/private/
-/Essentials/dist/
-/Essentials/build/
-/YamlAnnotations/
-/EssentialsUpdate/nbproject/private/
-/EssentialsRelease/
-/EssentialsUpdate/dist/
-/EssentialsUpdate/build/
-/WebPush/apikey.php
-/WebPush/nbproject/private
-/.idea
-*.iml
-/EssentialsGroupManager/bin
-/EssentialsGroupManager/.externalToolBuilders
+
+# Checkstyle-IDEA config
+!.idea/checkstyle-idea.xml
+
+# Essentials files
+/Essentials/userdata
+/Essentials/config.yml
+/Essentials/kits.yml
+/Essentials/userdata/testplayer1.yml
+/Essentials/usermap.csv
+/Essentials/usermap.bin
+/Essentials/uuids.bin
+
+# Build files
+.gradle/
+/jars/
+generated/
+out/
+build/
+target/
+*.class
+build-logic/.kotlin/
+build-logic/bin/
+bin/
+test-tmp/
+
+# Run directory
+/run/

.idea/checkstyle-idea.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CheckStyle-IDEA" serialisationVersion="2">
+    <checkstyleVersion>8.36.2</checkstyleVersion>
+    <scanScope>JavaOnly</scanScope>
+    <copyLibs>true</copyLibs>
+    <scanBeforeCheckin>true</scanBeforeCheckin>
+    <option name="thirdPartyClasspath" />
+    <option name="activeLocationIds">
+      <option value="321e5753-4201-4d2c-bf31-6232011122fd" />
+    </option>
+    <option name="locations">
+      <list>
+        <ConfigurationLocation id="bundled-sun-checks" type="BUNDLED" scope="All" description="Sun Checks">bundled-sun-checks</ConfigurationLocation>
+        <ConfigurationLocation id="bundled-google-checks" type="BUNDLED" scope="All" description="Google Checks">bundled-google-checks</ConfigurationLocation>
+        <ConfigurationLocation id="321e5753-4201-4d2c-bf31-6232011122fd" type="PROJECT_RELATIVE" scope="All" description="EssentialsX">
+          $PROJECT_DIR$/.checkstyle/checkstyle.xml
+          <option name="properties">
+            <map>
+              <entry key="configDirectory" value=".checkstyle/" />
+            </map>
+          </option>
+        </ConfigurationLocation>
+      </list>
+    </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>

BuildAll/build.xml

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

BuildAll/nbproject/genfiles.properties

@@ -1,8 +0,0 @@
-build.xml.data.CRC32=51b33957
-build.xml.script.CRC32=7a797370
-build.xml.stylesheet.CRC32=28e38971@1.44.1.45
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=51b33957
-nbproject/build-impl.xml.script.CRC32=2a17f1e9
-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.EssentialsProtect.jar}:\
-    ${reference.EssentialsSpawn.jar}:\
-    ${reference.EssentialsGeoIP.jar}:\
-    ${reference.EssentialsGroupBridge.jar}:\
-    ${reference.EssentialsXMPP.jar}:\
-    ${reference.EssentialsGroupManager.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.6
-javac.target=1.6
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=default_platform
-project.Essentials=../Essentials
-project.EssentialsChat=../EssentialsChat
-project.EssentialsGeoIP=../EssentialsGeoIP
-project.EssentialsGroupBridge=../EssentialsGroupBridge
-project.EssentialsGroupManager=../EssentialsGroupManager
-project.EssentialsProtect=../EssentialsProtect
-project.EssentialsSpawn=../EssentialsSpawn
-project.EssentialsXMPP=../EssentialsXMPP
-reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
-reference.EssentialsChat.jar=${project.EssentialsChat}/dist/EssentialsChat.jar
-reference.EssentialsGeoIP.jar=${project.EssentialsGeoIP}/dist/EssentialsGeoIP.jar
-reference.EssentialsGroupBridge.jar=${project.EssentialsGroupBridge}/dist/EssentialsGroupBridge.jar
-reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar
-reference.EssentialsProtect.jar=${project.EssentialsProtect}/dist/EssentialsProtect.jar
-reference.EssentialsSpawn.jar=${project.EssentialsSpawn}/dist/EssentialsSpawn.jar
-reference.EssentialsXMPP.jar=${project.EssentialsXMPP}/dist/EssentialsXMPP.jar
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test

BuildAll/nbproject/project.xml

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

CONTRIBUTING.md

@@ -0,0 +1,102 @@
+# Contributing to EssentialsX
+
+*By contributing to EssentialsX, you agree to license your changes under the [GNU General Public License version 3](https://github.com/EssentialsX/Essentials/blob/2.x/LICENSE).*
+
+## Submitting code changes to EssentialsX
+
+If you're interested in submitting new code to EssentialsX, we accept changes via GitHub pull requests.
+
+### Adding features
+
+In general, we will only consider PRs for features if they have already been discussed with the team through
+GitHub issues and discussions. Check the list of
+["open to PR" issues](https://github.com/EssentialsX/Essentials/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22status%3A+open+to+PR%22)
+and [feature request discussions](https://github.com/EssentialsX/Essentials/discussions/categories/ideas-and-feature-suggestions)
+before you start working on your changes. If you don't see your desired feature listed,
+[open a feature request](https://github.com/EssentialsX/Essentials/issues/new/choose) and wait for a response, otherwise
+you may end up wasting your time on a feature that we aren't in a position to accept.
+
+#### Keep it focused
+
+Please try to keep feature PRs focused around one feature. Your PR should ideally contain
+one feature, or a few closely-linked features. If you submit several unrelated features 
+in one PR, the PR will not be accepted.
+
+### Fixing bugs
+
+If you're opening a PR to fix a bug, please ensure a bug report has been filed - search the
+[issue tracker](https://github.com/EssentialsX/Essentials/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22bug%3A+confirmed%22%2C%22bug%3A+unconfirmed%22%2C%22bug%3A+upstream%22)
+for an existing report, and if you can't find a bug report,
+[create one](https://github.com/EssentialsX/Essentials/issues/new/choose) before you submit your PR.
+
+#### Unconfirmed bugs
+
+You may find a bug report with the label `bug: unconfirmed`. This means the EssentialsX team hasn't had the time
+to review the bug report yet or hasn't been able to confirm
+whether the reported issue is actually a bug in EssentialsX. You can help us by following the steps in the report and
+posting whether you are able to replicate this issue, ideally on the latest versions of EssentialsX and Paper. This will
+help us confirm issues and prioritise PRs accordingly.
+
+#### Upstream bugs
+
+You may also find bug reports with the `bug: upstream` label. This label means the issue is caused by a bug in *another
+project*, not EssentialsX. This includes bugs in CraftBukkit/Spigot and bugs in other plugins. It may be appropriate to
+mitigate an issue in EssentialsX, but please check with us in the [EssentialsX Development Discord server](https://discord.gg/CUN7qVb) before you submit a PR.
+
+### Making your changes
+
+You'll need the following to make your changes to EssentialsX:
+
+* A GitHub account
+* [`git`](https://git-scm.com/downloads): the Git command-line tool, used to track and save your changes
+* [`gh`](https://cli.github.com/): the GitHub command-line tool, used to submit your changes to EssentialsX
+* Your IDE of choice - we recommend [IntelliJ IDEA Community Edition](https://www.jetbrains.com/idea/download)
+
+If you're already familiar with Git, you can skip this next section.
+
+You'll need to clone the EssentialsX repository
+(`gh repo clone EssentialsX/Essentials`), then create a new branch for your work
+(`cd Essentials` then `git switch -c my-cool-pr`).
+
+You can then make changes using your IDE of choice. Follow the instructions in `README.md` to build and test your
+changes.
+
+Once you've finished, you should commit your changes (`git commit -am "My cool commit name!"`).
+
+### Submitting your PR
+
+*Even if you're already familiar with GitHub, you will need to follow these steps in order to submit a PR to
+EssentialsX. This ensures we have the information we need to test and review your changes.*
+
+Next, you'll need to fork EssentialsX on GitHub and push your changes to a branch on that fork. We strongly recommend
+using the `gh` command-line tool for this:
+
+* In your terminal, run `gh pr create`.
+* Select either the bug fix or feature template, depending on what your PR is for.
+* If you get asked `Where should we push the '...' branch?`, select `Create a fork of EssentialsX/Essentials`.
+* For the title, choose a title that describes what your PR does. For example, `Add more ducks to /spawnmob`.
+* For the body, press E. You will then need to fill in the PR template in your text editor.
+  - Follow the instructions in the template and fill out the sections as required.
+  - This step is important! Without it, we won't know why you've made your changes or how to test them.
+* Save the file in your text editor and close it, then return to the terminal.
+* Select `Submit` to open your PR.
+
+If you follow these steps correctly, GitHub will create a fork (if necessary) and then open a PR with your changes. You
+can now sit back while we review your changes. If we need to ask questions or request further changes to your code,
+we will review your PR and post a comment on GitHub. You can respond to our reviews and comments on the GitHub website,
+and you can push new changes using `git commit` and `git push`.
+
+
+## Submitting community translations to EssentialsX
+
+EssentialsX relies on community translations for its messages in other languages. You can help translate EssentialsX on
+[Crowdin](https://translate.essentialsx.net/). You'll need a Crowdin account to translate and improve messages.
+
+If your language isn't listed or doesn't have an active proofreader, please let us know on Discord (see below).
+
+
+## Discussing EssentialsX contributions 
+
+Want to discuss something before opening a PR or translating messages? 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.

Essentials/build.gradle

@@ -0,0 +1,106 @@
+plugins {
+    id("essentials.shadow-module")
+}
+
+dependencies {
+    compileOnly('net.essentialsx.deps:VaultAPI:1.7') {
+        exclude group: "org.bukkit", module: "bukkit"
+    }
+    compileOnly 'net.luckperms:api:5.3'
+
+    api 'io.papermc:paperlib:1.0.6'
+
+    implementation 'org.spongepowered:configurate-yaml:4.2.0'
+    implementation 'org.checkerframework:checker-qual:3.49.0'
+    implementation 'nu.studer:java-ordered-properties:1.0.4'
+
+    implementation 'net.kyori:adventure-api:4.25.0'
+    implementation 'net.kyori:adventure-text-minimessage:4.25.0'
+    implementation 'net.kyori:adventure-platform-bukkit:4.4.1'
+
+    // Providers
+    api(project(':providers:BaseProviders')) {
+        exclude(module: 'spigot-api')
+    }
+    api(project(path: ':providers:PaperProvider', configuration: 'shadow')){
+        exclude(module: 'paper-api')
+    }
+    api(project(':providers:NMSReflectionProvider')) {
+        exclude(module: 'bukkit')
+    }
+    api(project(':providers:1_8Provider')) {
+        exclude(module: 'spigot-api')
+    }
+    api(project(':providers:1_12Provider')) {
+        exclude(module: 'bukkit')
+    }
+}
+
+test {
+    testLogging.showStandardStreams = true
+}
+
+tasks.register('versionData', VersionDataTask) {
+    destination.set(rootProject.layout.projectDirectory.dir("generated").file("version-data.json"))
+}
+
+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 (dependency('nu.studer:java-ordered-properties'))
+        include (dependency('net.kyori:adventure-api'))
+        include (dependency('net.kyori:adventure-key'))
+        include (dependency('net.kyori:examination-api'))
+        include (dependency('net.kyori:examination-string'))
+        include (dependency('net.kyori:option'))
+        include (dependency('net.kyori:adventure-platform-bukkit'))
+        include (dependency('net.kyori:adventure-platform-api'))
+        include (dependency('net.kyori:adventure-platform-facet'))
+        include (dependency('net.kyori:adventure-nbt'))
+        include (dependency('net.kyori:adventure-text-serializer-bungeecord'))
+        include (dependency('net.kyori:adventure-text-serializer-gson'))
+        include (dependency('net.kyori:adventure-text-serializer-gson-legacy-impl'))
+        include (dependency('net.kyori:adventure-text-serializer-json'))
+        include (dependency('net.kyori:adventure-text-serializer-json-legacy-impl'))
+        include (dependency('net.kyori:adventure-text-serializer-legacy'))
+        include (dependency('net.kyori:adventure-text-minimessage'))
+        include (project(':providers:BaseProviders'))
+        include (project(path: ':providers:PaperProvider', configuration: 'shadow'))
+        include (project(':providers:NMSReflectionProvider'))
+        include (project(':providers:1_8Provider'))
+        include (project(':providers:1_12Provider'))
+
+        // Paper in-dev adventure versions (for snapshot/pre-releases)
+        include (dependency('io.papermc.adventure:adventure-api'))
+        include (dependency('io.papermc.adventure:adventure-key'))
+        include (dependency('io.papermc.adventure:adventure-nbt'))
+        include (dependency('io.papermc.adventure:adventure-text-serializer-gson'))
+        include (dependency('io.papermc.adventure:adventure-text-serializer-gson-legacy-impl'))
+        include (dependency('io.papermc.adventure:adventure-text-serializer-json'))
+        include (dependency('io.papermc.adventure:adventure-text-serializer-json-legacy-impl'))
+        include (dependency('io.papermc.adventure:adventure-text-serializer-legacy'))
+        include (dependency('io.papermc.adventure:adventure-text-minimessage'))
+    }
+    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'
+    relocate 'net.kyori', 'com.earth2me.essentials.libs.kyori'
+    relocate 'net.essentialsx.temp.adventure', 'net.kyori.adventure' // Undo temporary relocation for Paper Provider
+
+    minimize {
+        include(dependency('org.checkerframework:checker-qual'))
+        include(dependency('net.kyori:adventure-api'))
+        include(dependency('net.kyori:adventure-platform-bukkit'))
+        include(dependency('net.kyori:adventure-text-minimessage'))
+    }
+}

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=7c507372
-nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46
-nbproject/profiler-build-impl.xml.data.CRC32=ab78ce15
-nbproject/profiler-build-impl.xml.script.CRC32=abda56ed
-nbproject/profiler-build-impl.xml.stylesheet.CRC32=f10cf54c@1.11.1

Essentials/nbproject/pmd.settings

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

Essentials/nbproject/project.properties

@@ -1,154 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.processors.list=lombok.core.AnnotationProcessor
-annotation.processing.run.all.processors=false
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=Essentials
-application.vendor=
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder=*
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateImportGroups=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
-auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/Essentials.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.BOSEconomy7.jar=../lib/BOSEconomy7.jar
-file.reference.bPermissions.jar=../lib/bPermissions.jar
-file.reference.bpermissions2.jar=../lib/bpermissions2.jar
-file.reference.bukkit.jar=../lib/bukkit.jar
-file.reference.craftbukkit.jar=../lib/craftbukkit.jar
-file.reference.iCo4.jar=../lib/iCo4.jar
-file.reference.iCo5.jar=../lib/iCo5.jar
-file.reference.iCo6.jar=../lib/iCo6.jar
-file.reference.lombok.jar=../lib/lombok-0.10.8.jar
-file.reference.MultiCurrency.jar=../lib/MultiCurrency.jar
-file.reference.Permissions3.jar=../lib/Permissions3.jar
-file.reference.PermissionsBukkit-1.2.jar=../lib/PermissionsBukkit-1.2.jar
-file.reference.PermissionsEx.jar=../lib/PermissionsEx.jar
-file.reference.Privileges.jar=..\\lib\\Privileges.jar
-file.reference.Vault.jar=../lib/Vault.jar
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.compress=true
-jar.index=${jnlp.enabled}
-javac.classpath=\
-    ${file.reference.Permissions3.jar}:\
-    ${file.reference.iCo4.jar}:\
-    ${file.reference.iCo5.jar}:\
-    ${file.reference.iCo6.jar}:\
-    ${file.reference.MultiCurrency.jar}:\
-    ${file.reference.BOSEconomy7.jar}:\
-    ${file.reference.PermissionsEx.jar}:\
-    ${file.reference.bPermissions.jar}:\
-    ${file.reference.PermissionsBukkit-1.2.jar}:\
-    ${file.reference.lombok.jar}:\
-    ${reference.EssentialsGroupManager.jar}:\
-    ${file.reference.bukkit.jar}:\
-    ${file.reference.craftbukkit.jar}:\
-    ${file.reference.Vault.jar}:\
-    ${file.reference.Privileges.jar}:\
-    ${file.reference.bpermissions2.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.6
-javac.target=1.6
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit_4.10.classpath}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.reference.PermissionsEx.jar=../lib/PermissionsEx-javadoc.jar
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-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/src/com/earth2me/essentials/AlternativeCommandsHandler.java

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

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

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

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

@@ -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/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 Console instance = new Console();
-	private CommandSender replyTo;
-	public final static String NAME = "Console";
-
-	private Console()
-	{
-	}
-
-	public static CommandSender getCommandSender(Server server) throws Exception
-	{
-		return server.getConsoleSender();
-	}
-
-	@Override
-	public void setReplyTo(CommandSender user)
-	{
-		replyTo = user;
-	}
-
-	@Override
-	public CommandSender getReplyTo()
-	{
-		return replyTo;
-	}
-
-	public static Console getConsoleReplyTo()
-	{
-		return instance;
-	}
-}

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

@@ -1,298 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-
-/**
- * This utility class is used for converting between the ingame time in ticks to ingame time as a friendly string. Note
- * that the time is INGAME.
- *
- * http://www.minecraftwiki.net/wiki/Day/night_cycle
- *
- * @author Olof Larsson
- */
-public final class DescParseTickFormat
-{
-	// ============================================
-	// First some information vars. TODO: Should this be in a config file?
-	// --------------------------------------------
-	public static final Map<String, Integer> nameToTicks = new LinkedHashMap<String, Integer>();
-	public static final Set<String> resetAliases = new HashSet<String>();
-	public static final int ticksAtMidnight = 18000;
-	public static final int ticksPerDay = 24000;
-	public static final int ticksPerHour = 1000;
-	public static final double ticksPerMinute = 1000d / 60d;
-	public static final double ticksPerSecond = 1000d / 60d / 60d;
-	private static final SimpleDateFormat SDFTwentyFour = new SimpleDateFormat("HH:mm", Locale.ENGLISH);
-	private static final SimpleDateFormat SDFTwelve = new SimpleDateFormat("h:mmaa", Locale.ENGLISH);
-
-	static
-	{
-		SDFTwentyFour.setTimeZone(TimeZone.getTimeZone("GMT"));
-		SDFTwelve.setTimeZone(TimeZone.getTimeZone("GMT"));
-
-		nameToTicks.put("sunrise", 23000);
-		nameToTicks.put("dawn", 23000);
-
-		nameToTicks.put("daystart", 0);
-		nameToTicks.put("day", 0);
-
-		nameToTicks.put("morning", 1000);
-
-		nameToTicks.put("midday", 6000);
-		nameToTicks.put("noon", 6000);
-
-		nameToTicks.put("afternoon", 9000);
-
-		nameToTicks.put("sunset", 12000);
-		nameToTicks.put("dusk", 12000);
-		nameToTicks.put("sundown", 12000);
-		nameToTicks.put("nightfall", 12000);
-
-		nameToTicks.put("nightstart", 14000);
-		nameToTicks.put("night", 14000);
-
-		nameToTicks.put("midnight", 18000);
-
-		resetAliases.add("reset");
-		resetAliases.add("normal");
-		resetAliases.add("default");
-	}
-
-	private DescParseTickFormat()
-	{
-	}
-
-	// ============================================
-	// PARSE. From describing String to int
-	// --------------------------------------------
-	public static long parse(String desc) throws NumberFormatException
-	{
-		// Only look at alphanumeric and lowercase and : for 24:00
-		desc = desc.toLowerCase(Locale.ENGLISH).replaceAll("[^A-Za-z0-9:]", "");
-
-		// Detect ticks format
-		try
-		{
-			return parseTicks(desc);
-		}
-		catch (Exception e)
-		{
-		}
-
-		// Detect 24-hour format
-		try
-		{
-			return parse24(desc);
-		}
-		catch (Exception e)
-		{
-		}
-
-		// Detect 12-hour format
-		try
-		{
-			return parse12(desc);
-		}
-		catch (Exception e)
-		{
-		}
-
-		// Detect aliases
-		try
-		{
-			return parseAlias(desc);
-		}
-		catch (Exception e)
-		{
-		}
-
-		// Well we failed to understand...
-		throw new NumberFormatException();
-	}
-
-	public static long parseTicks(String desc) throws NumberFormatException
-	{
-		if (!desc.matches("^[0-9]+ti?c?k?s?$"))
-		{
-			throw new NumberFormatException();
-		}
-
-		desc = desc.replaceAll("[^0-9]", "");
-
-		return Long.parseLong(desc) % 24000;
-	}
-
-	public static long parse24(String desc) throws NumberFormatException
-	{
-		if (!desc.matches("^[0-9]{2}[^0-9]?[0-9]{2}$"))
-		{
-			throw new NumberFormatException();
-		}
-
-		desc = desc.toLowerCase(Locale.ENGLISH).replaceAll("[^0-9]", "");
-
-		if (desc.length() != 4)
-		{
-			throw new NumberFormatException();
-		}
-
-		final int hours = Integer.parseInt(desc.substring(0, 2));
-		final int minutes = Integer.parseInt(desc.substring(2, 4));
-
-		return hoursMinutesToTicks(hours, minutes);
-	}
-
-	public static long parse12(String desc) throws NumberFormatException
-	{
-		if (!desc.matches("^[0-9]{1,2}([^0-9]?[0-9]{2})?(pm|am)$"))
-		{
-			throw new NumberFormatException();
-		}
-
-		int hours = 0;
-		int minutes = 0;
-
-		desc = desc.toLowerCase(Locale.ENGLISH);
-		String parsetime = desc.replaceAll("[^0-9]", "");
-
-		if (parsetime.length() > 4)
-		{
-			throw new NumberFormatException();
-		}
-
-		if (parsetime.length() == 4)
-		{
-			hours += Integer.parseInt(parsetime.substring(0, 2));
-			minutes += Integer.parseInt(parsetime.substring(2, 4));
-		}
-		else if (parsetime.length() == 3)
-		{
-			hours += Integer.parseInt(parsetime.substring(0, 1));
-			minutes += Integer.parseInt(parsetime.substring(1, 3));
-		}
-		else if (parsetime.length() == 2)
-		{
-			hours += Integer.parseInt(parsetime.substring(0, 2));
-		}
-		else if (parsetime.length() == 1)
-		{
-			hours += Integer.parseInt(parsetime.substring(0, 1));
-		}
-		else
-		{
-			throw new NumberFormatException();
-		}
-
-		if (desc.endsWith("pm") && hours != 12)
-		{
-			hours += 12;
-		}
-
-		if (desc.endsWith("am") && hours == 12)
-		{
-			hours -= 12;
-		}
-
-		return hoursMinutesToTicks(hours, minutes);
-	}
-
-	public static long hoursMinutesToTicks(final int hours, final int minutes)
-	{
-		long ret = ticksAtMidnight;
-		ret += (hours) * ticksPerHour;
-
-		ret += (minutes / 60.0) * ticksPerHour;
-
-		ret %= ticksPerDay;
-		return ret;
-	}
-
-	public static long parseAlias(final String desc) throws NumberFormatException
-	{
-		final Integer ret = nameToTicks.get(desc);
-		if (ret == null)
-		{
-			throw new NumberFormatException();
-		}
-
-		return ret;
-	}
-
-	public static boolean meansReset(final String desc)
-	{
-		return resetAliases.contains(desc);
-	}
-
-	// ============================================
-	// FORMAT. From int to describing String
-	// --------------------------------------------
-	public static String format(final long ticks)
-	{
-		return _("timeFormat", format24(ticks), format12(ticks), formatTicks(ticks));
-	}
-
-	public static String formatTicks(final long ticks)
-	{
-		return (ticks % ticksPerDay) + "ticks";
-	}
-
-	public static String format24(final long ticks)
-	{
-		synchronized (SDFTwentyFour)
-		{
-			return formatDateFormat(ticks, SDFTwentyFour);
-		}
-	}
-
-	public static String format12(final long ticks)
-	{
-		synchronized (SDFTwelve)
-		{
-			return formatDateFormat(ticks, SDFTwelve);
-		}
-	}
-
-	public static String formatDateFormat(final long ticks, final SimpleDateFormat format)
-	{
-		final Date date = ticksToDate(ticks);
-		return format.format(date);
-	}
-
-	public static Date ticksToDate(long ticks)
-	{
-		// Assume the server time starts at 0. It would start on a day.
-		// But we will simulate that the server started with 0 at midnight.
-		ticks = ticks - ticksAtMidnight + ticksPerDay;
-
-		// How many ingame days have passed since the server start?
-		final long days = ticks / ticksPerDay;
-		ticks = ticks - days * ticksPerDay;
-
-		// How many hours on the last day?
-		final long hours = ticks / ticksPerHour;
-		ticks = ticks - hours * ticksPerHour;
-
-		// How many minutes on the last day?
-		final long minutes = (long)Math.floor(ticks / ticksPerMinute);
-		final double dticks = ticks - minutes * ticksPerMinute;
-
-		// How many seconds on the last day?
-		final long seconds = (long)Math.floor(dticks / ticksPerSecond);
-
-		// Now we create an english GMT calendar (We wan't no daylight savings)
-		final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"), Locale.ENGLISH);
-		cal.setLenient(true);
-
-		// And we set the time to 0! And append the time that passed!
-		cal.set(0, Calendar.JANUARY, 1, 0, 0, 0);
-		cal.add(Calendar.DAY_OF_YEAR, (int)days);
-		cal.add(Calendar.HOUR_OF_DAY, (int)hours);
-		cal.add(Calendar.MINUTE, (int)minutes);
-		cal.add(Calendar.SECOND, (int)seconds + 1); // To solve rounding errors.
-
-		return cal.getTime();
-	}
-}

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

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

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

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

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

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

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

@@ -1,401 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.google.common.io.Files;
-import java.io.*;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.channels.ClosedByInterruptException;
-import java.nio.channels.FileChannel;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CoderResult;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.Server;
-import org.bukkit.World;
-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;
-
-
-public class EssentialsConf extends YamlConfiguration
-{
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private transient File configFile;
-	private transient String templateName = null;
-	private transient Class<?> resourceClass = EssentialsConf.class;
-	private static final Charset UTF8 = Charset.forName("UTF-8");
-
-	public EssentialsConf(final File configFile)
-	{
-		super();
-		this.configFile = configFile;
-	}
-	private final byte[] bytebuffer = new byte[1024];
-
-	public synchronized void load()
-	{
-		configFile = configFile.getAbsoluteFile();
-		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
-			{
-				try
-				{
-					LOGGER.log(Level.INFO, _("creatingEmptyConfig", configFile.toString()));
-					if (!configFile.createNewFile())
-					{
-						LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()));
-					}
-				}
-				catch (IOException ex)
-				{
-					LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()), ex);
-				}
-			}
-		}
-
-
-		try
-		{
-			final FileInputStream inputStream = new FileInputStream(configFile);
-			try
-			{
-				final ByteBuffer buffer = ByteBuffer.allocate((int)configFile.length());
-				int length;
-				while ((length = inputStream.read(bytebuffer)) != -1)
-				{
-					buffer.put(bytebuffer, 0, length);
-				}
-				buffer.rewind();
-				final CharBuffer data = CharBuffer.allocate((int)configFile.length());
-				CharsetDecoder decoder = UTF8.newDecoder();
-				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 boolean hasProperty(final String path)
-	{
-		return isSet(path);
-	}
-
-	public Location getLocation(final String path, final Server server) throws Exception
-	{
-		final String worldName = getString((path == null ? "" : path + ".") + "world");
-		if (worldName == null || worldName.isEmpty())
-		{
-			return null;
-		}
-		final World world = server.getWorld(worldName);
-		if (world == null)
-		{
-			throw new Exception(_("invalidWorld"));
-		}
-		return new Location(world,
-							getDouble((path == null ? "" : path + ".") + "x", 0),
-							getDouble((path == null ? "" : path + ".") + "y", 0),
-							getDouble((path == null ? "" : path + ".") + "z", 0),
-							(float)getDouble((path == null ? "" : path + ".") + "yaw", 0),
-							(float)getDouble((path == null ? "" : path + ".") + "pitch", 0));
-	}
-
-	public void setProperty(final String path, final Location loc)
-	{
-		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 long getLong(final String path, final long def)
-	{
-		try
-		{
-			final Number num = (Number)get(path);
-			return num == null ? def : num.longValue();
-		}
-		catch (ClassCastException ex)
-		{
-			return def;
-		}
-	}
-
-	@Override
-	public double getDouble(final String path, final double def)
-	{
-		try
-		{
-			Number num = (Number)get(path);
-			return num == null ? def : num.doubleValue();
-		}
-		catch (ClassCastException ex)
-		{
-			return def;
-		}
-	}
-
-	public void save()
-	{
-		try
-		{
-			save(configFile);
-		}
-		catch (IOException ex)
-		{
-			LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
-		}
-	}
-
-	@Override
-	public synchronized void save(final File file) throws IOException
-	{
-		if (file == null)
-		{
-			throw new IllegalArgumentException("File cannot be null");
-		}
-
-		Files.createParentDirs(file);
-
-		final String data = saveToString();
-
-		final OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(file), UTF8);
-
-		try
-		{
-			writer.write(data);
-		}
-		finally
-		{
-			writer.close();
-		}
-	}
-
-	public Object getProperty(String path)
-	{
-		return get(path);
-	}
-
-	public void setProperty(String path, Object object)
-	{
-		set(path, object);
-	}
-
-	public void removeProperty(String path)
-	{
-		set(path, null);
-	}
-}

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

@@ -1,151 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import java.util.List;
-import org.bukkit.Material;
-import org.bukkit.entity.Ageable;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-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 final IEssentials ess;
-
-	public EssentialsEntityListener(IEssentials ess)
-	{
-		this.ess = ess;
-	}
-
-	@EventHandler(priority = EventPriority.LOW)
-	public void onEntityDamage(final EntityDamageByEntityEvent event)
-	{
-		final Entity eAttack = event.getDamager();
-		final Entity eDefend = event.getEntity();
-		if (eDefend instanceof Player && eAttack instanceof Player)
-		{
-			final User defender = ess.getUser(eDefend);
-			final User attacker = ess.getUser(eAttack);
-
-			if (ess.getSettings().getLoginAttackDelay() > 0 && !attacker.isAuthorized("essentials.pvpdelay.exempt")
-				&& (System.currentTimeMillis() < (attacker.getLastLogin() + ess.getSettings().getLoginAttackDelay())))
-			{
-				event.setCancelled(true);
-			}
-
-			if (attacker.hasInvulnerabilityAfterTeleport() || defender.hasInvulnerabilityAfterTeleport())
-			{
-				event.setCancelled(true);
-			}
-
-			attacker.updateActivity(true);
-			final List<String> commandList = attacker.getPowertool(attacker.getItemInHand());
-			if (commandList != null && !commandList.isEmpty())
-			{
-				for (final String command : commandList)
-				{
-					if (command != null && !command.isEmpty())
-					{
-						ess.scheduleSyncDelayedTask(
-								new Runnable()
-								{
-									@Override
-									public void run()
-									{
-										attacker.getServer().dispatchCommand(attacker.getBase(), command.replaceAll("\\{player\\}", defender.getName()));
-									}
-								});
-
-						event.setCancelled(true);
-						return;
-					}
-				}
-			}
-		}
-		else if (eDefend instanceof Ageable && eAttack instanceof Player)
-		{
-			final Player player = (Player)eAttack;
-			final ItemStack hand = player.getItemInHand();
-			if (hand != null && hand.getType() == Material.MILK_BUCKET)
-			{
-				((Ageable)eDefend).setBaby();
-				hand.setType(Material.BUCKET);
-				player.setItemInHand(hand);
-				player.updateInventory();
-				event.setCancelled(true);
-			}
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onEntityDamage(final EntityDamageEvent event)
-	{
-		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
-		{
-			final Player player = (Player)event.getEntity();
-			player.setFireTicks(0);
-			player.setRemainingAir(player.getMaximumAir());
-			event.setCancelled(true);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onEntityCombust(final EntityCombustEvent event)
-	{
-		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
-		{
-			event.setCancelled(true);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onPlayerDeathEvent(final PlayerDeathEvent event)
-	{
-		final User user = ess.getUser(event.getEntity());
-		if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back"))
-		{
-			user.setLastLocation();
-			user.sendMessage(_("backAfterDeath"));
-		}
-		if (!ess.getSettings().areDeathMessagesEnabled())
-		{
-			event.setDeathMessage("");
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW)
-	public void onPlayerDeathExpEvent(final PlayerDeathEvent event)
-	{
-		final User user = ess.getUser(event.getEntity());
-		if (user.isAuthorized("essentials.keepxp"))
-		{
-			event.setKeepLevel(true);
-			event.setDroppedExp(0);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onFoodLevelChange(final FoodLevelChangeEvent event)
-	{
-		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
-		{
-			event.setCancelled(true);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-	public void onEntityRegainHealth(final EntityRegainHealthEvent event)
-	{
-		if (event.getRegainReason() == RegainReason.SATIATED && event.getEntity() instanceof Player
-			&& ess.getUser(event.getEntity()).isAfk() && ess.getSettings().getFreezeAfkPlayers())
-		{
-			event.setCancelled(true);
-		}
-	}
-}

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

@@ -1,462 +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 java.io.IOException;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.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.PlayerLoginEvent.Result;
-import org.bukkit.event.player.*;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.inventory.ItemStack;
-
-
-public class EssentialsPlayerListener implements Listener
-{
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private final transient IEssentials ess;
-	private static final int AIR = Material.AIR.getId();
-	private static final int BED = Material.BED_BLOCK.getId();
-
-	public EssentialsPlayerListener(final IEssentials parent)
-	{
-		this.ess = parent;
-	}
-
-	@EventHandler(priority = EventPriority.NORMAL)
-	public void onPlayerRespawn(final PlayerRespawnEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		updateCompass(user);
-		user.setDisplayNick();
-	}
-
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onPlayerChat(final AsyncPlayerChatEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		if (user.isMuted())
-		{
-			event.setCancelled(true);
-			user.sendMessage(_("playerMuted"));
-			LOGGER.info(_("mutedUserSpeaks", user.getName()));
-		}
-		final Iterator<Player> it = event.getRecipients().iterator();
-		while (it.hasNext())
-		{
-			final User u = ess.getUser(it.next());
-			if (u.isIgnoredPlayer(user))
-			{
-				it.remove();
-			}
-		}
-		user.updateActivity(true);
-		user.setDisplayNick();
-	}
-
-	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-	public void onPlayerMove(final PlayerMoveEvent event)
-	{
-		if ((!ess.getSettings().cancelAfkOnMove() && !ess.getSettings().getFreezeAfkPlayers())
-			|| event.getFrom().getBlockX() == event.getTo().getBlockX()
-			   && event.getFrom().getBlockZ() == event.getTo().getBlockZ()
-			   && event.getFrom().getBlockY() == event.getTo().getBlockY())
-		{
-			return;
-		}
-
-		final User user = ess.getUser(event.getPlayer());
-		if (user.isAfk() && ess.getSettings().getFreezeAfkPlayers())
-		{
-			final Location from = event.getFrom();
-			final Location to = event.getTo().clone();
-			to.setX(from.getX());
-			to.setY(from.getY());
-			to.setZ(from.getZ());
-			try
-			{
-				event.setTo(Util.getSafeDestination(to));
-			}
-			catch (Exception ex)
-			{
-				event.setTo(to);
-			}
-			return;
-		}
-		final Location afk = user.getAfkPosition();
-		if (afk == null || !event.getTo().getWorld().equals(afk.getWorld()) || afk.distanceSquared(event.getTo()) > 9)
-		{
-			user.updateActivity(true);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerQuit(final PlayerQuitEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		if (ess.getSettings().removeGodOnDisconnect() && user.isGodModeEnabled())
-		{
-			user.setGodModeEnabled(false);
-		}
-		if (user.isVanished())
-		{
-			user.toggleVanished();
-		}
-		user.setLastLocation();
-		user.updateActivity(false);
-		user.dispose();
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerJoin(final PlayerJoinEvent event)
-	{
-		ess.scheduleAsyncDelayedTask(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				delayedJoin(event.getPlayer());
-			}
-		});
-	}
-
-	public void delayedJoin(final Player player)
-	{
-		if (!player.isOnline())
-		{
-			return;
-		}
-		ess.getBackup().onPlayerJoin();
-		final User user = ess.getUser(player);
-		user.setDisplayNick();
-		updateCompass(user);
-		user.setLastLogin(System.currentTimeMillis());
-		user.updateActivity(false);
-
-		for (String p : ess.getVanishedPlayers())
-		{
-			if (!user.isAuthorized("essentials.vanish.see"))
-			{
-				user.hidePlayer(ess.getUser(p).getBase());
-			}
-		}
-
-		if (user.isAuthorized("essentials.sleepingignored"))
-		{
-			user.setSleepingIgnored(true);
-		}
-
-		if (!ess.getSettings().isCommandDisabled("motd") && user.isAuthorized("essentials.motd"))
-		{
-			try
-			{
-				final IText input = new TextInput(user, "motd", true, ess);
-				final IText output = new KeywordReplacer(input, user, ess);
-				final TextPager pager = new TextPager(output, true);
-				pager.showPage("1", null, "motd", user);
-			}
-			catch (IOException ex)
-			{
-				if (ess.getSettings().isDebug())
-				{
-					LOGGER.log(Level.WARNING, ex.getMessage(), ex);
-				}
-				else
-				{
-					LOGGER.log(Level.WARNING, ex.getMessage());
-				}
-			}
-		}
-
-		if (!ess.getSettings().isCommandDisabled("mail") && user.isAuthorized("essentials.mail"))
-		{
-			final List<String> mail = user.getMails();
-			if (mail.isEmpty())
-			{
-				user.sendMessage(_("noNewMail"));
-			}
-			else
-			{
-				user.sendMessage(_("youHaveNewMail", mail.size()));
-			}
-		}
-	}
-
-	private void updateCompass(final User user)
-	{
-		Location loc = user.getHome(user.getLocation());
-		if (loc == null)
-		{
-			loc = user.getBedSpawnLocation();
-		}
-		if (loc != null)
-		{
-			final Location updateLoc = loc;
-			ess.scheduleSyncDelayedTask(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					user.setCompassTarget(updateLoc);
-				}
-			});
-		}
-	}
-
-	@EventHandler(priority = EventPriority.HIGH)
-	public void onPlayerLogin(final PlayerLoginEvent event)
-	{
-		switch (event.getResult())
-		{
-		case ALLOWED:
-		case KICK_FULL:
-		case KICK_BANNED:
-			break;
-		default:
-			return;
-		}
-
-		final User user = ess.getUser(event.getPlayer());
-		if (user.isNPC())
-		{
-			user.setNPC(false);
-		}
-
-		final long currentTime = System.currentTimeMillis();
-		final boolean banExpired = user.checkBanTimeout(currentTime);
-		user.checkMuteTimeout(currentTime);
-		user.checkJailTimeout(currentTime);
-
-		if (!banExpired && (user.isBanned() || event.getResult() == Result.KICK_BANNED))
-		{
-			final String banReason = user.getBanReason();
-			event.disallow(Result.KICK_BANNED, banReason != null && !banReason.isEmpty() && !banReason.equalsIgnoreCase("ban") ? banReason : _("defaultBanReason"));
-			return;
-		}
-
-		if (event.getResult() == Result.KICK_FULL && !user.isAuthorized("essentials.joinfullserver"))
-		{
-			event.disallow(Result.KICK_FULL, _("serverFull"));
-			return;
-		}
-		event.allow();
-	}
-
-	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-	public void onPlayerTeleport(final PlayerTeleportEvent event)
-	{
-		final boolean backListener = ess.getSettings().registerBackInListener();
-		final boolean teleportInvulnerability = ess.getSettings().isTeleportInvulnerability();
-		if (backListener || teleportInvulnerability)
-		{
-			final User user = ess.getUser(event.getPlayer());
-			//There is TeleportCause.COMMMAND but plugins have to actively pass the cause in on their teleports.
-			if (backListener && (event.getCause() == TeleportCause.PLUGIN || event.getCause() == TeleportCause.COMMAND))
-			{
-				user.setLastLocation();
-			}
-			if (teleportInvulnerability)
-			{
-				user.enableInvulnerabilityAfterTeleport();
-			}
-		}
-	}
-
-	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-	public void onPlayerEggThrow(final PlayerEggThrowEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		final ItemStack stack = new ItemStack(Material.EGG, 1);
-		if (user.hasUnlimited(stack))
-		{
-			user.getInventory().addItem(stack);
-			user.updateInventory();
-		}
-	}
-
-	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-	public void onPlayerBucketEmpty(final PlayerBucketEmptyEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		if (user.hasUnlimited(new ItemStack(event.getBucket())))
-		{
-			event.getItemStack().setType(event.getBucket());
-			ess.scheduleSyncDelayedTask(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					user.updateInventory();
-				}
-			});
-		}
-	}
-	private final static List<String> COMMANDS = Arrays.asList("msg", "r", "mail", "m", "t", "whisper", "emsg", "tell", "er", "reply", "ereply", "email", "action", "describe", "eme", "eaction", "edescribe", "etell", "ewhisper", "pm");
-
-	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-	public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event)
-	{
-		final Player player = event.getPlayer();
-		final String cmd = event.getMessage().toLowerCase(Locale.ENGLISH).split(" ")[0].replace("/", "").toLowerCase(Locale.ENGLISH);
-		if (COMMANDS.contains(cmd))
-		{
-			for (Player onlinePlayer : ess.getServer().getOnlinePlayers())
-			{
-				final User spyer = ess.getUser(onlinePlayer);
-				if (spyer.isSocialSpyEnabled() && !player.equals(onlinePlayer))
-				{
-					onlinePlayer.sendMessage(player.getDisplayName() + " : " + event.getMessage());
-				}
-			}
-		}
-		else if (!cmd.equalsIgnoreCase("afk"))
-		{
-			final User user = ess.getUser(player);
-			user.updateActivity(true);
-		}
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerChangedWorld(final PlayerChangedWorldEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		final String newWorld = event.getPlayer().getLocation().getWorld().getName();
-		user.setDisplayNick();
-		updateCompass(user);
-		if (ess.getSettings().getNoGodWorlds().contains(newWorld) && user.isGodModeEnabledRaw())
-		{
-			user.sendMessage(_("noGodWorldWarning"));
-		}
-
-		if (!event.getPlayer().getWorld().getName().equals(newWorld))
-		{
-			user.sendMessage(_("currentWorld", newWorld));
-		}
-	}
-
-	@EventHandler(priority = EventPriority.NORMAL)
-	public void onPlayerInteract(final PlayerInteractEvent event)
-	{
-		switch (event.getAction())
-		{
-		case RIGHT_CLICK_BLOCK:
-			if (!event.isCancelled() && event.getClickedBlock().getTypeId() == BED && ess.getSettings().getUpdateBedAtDaytime())
-			{
-				Player player = event.getPlayer();
-				player.setBedSpawnLocation(event.getClickedBlock().getLocation());
-				player.sendMessage(_("homeSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
-			}
-			break;
-		case LEFT_CLICK_AIR:
-		case LEFT_CLICK_BLOCK:
-			if (event.getItem() != null && event.getItem().getTypeId() != AIR)
-			{
-				final User user = ess.getUser(event.getPlayer());
-				if (user.hasPowerTools() && user.arePowerToolsEnabled() && usePowertools(user, event.getItem().getTypeId()))
-				{
-					event.setCancelled(true);
-				}
-			}
-			break;
-		default:
-			break;
-		}
-	}
-
-	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);
-							}
-						});
-			}
-		}
-		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)
-	public void onInventoryClickEvent(final InventoryClickEvent event)
-	{
-		if (event.getView().getTopInventory().getType() == InventoryType.PLAYER)
-		{
-			final User user = ess.getUser(event.getWhoClicked());
-			final InventoryHolder invHolder = event.getView().getTopInventory().getHolder();
-			if (invHolder != null && invHolder instanceof HumanEntity)
-			{
-				final User invOwner = ess.getUser((HumanEntity)invHolder);
-				if (user.isInvSee() && (!user.isAuthorized("essentials.invsee.modify")
-										|| invOwner.isAuthorized("essentials.invsee.preventmodify")
-										|| !invOwner.isOnline()))
-				{
-					event.setCancelled(true);
-				}
-			}
-		}
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onInventoryCloseEvent(final InventoryCloseEvent event)
-	{
-		if (event.getView().getTopInventory().getType() == InventoryType.PLAYER)
-		{
-			final User user = ess.getUser(event.getPlayer());
-			user.setInvSee(false);
-		}
-	}
-}

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

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

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

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

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

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

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

@@ -1,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,176 +0,0 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.api.II18n;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-
-public class I18n implements II18n
-{
-	private static I18n instance;
-	private static final String MESSAGES = "messages";
-	private final transient Locale defaultLocale = Locale.getDefault();
-	private transient Locale currentLocale = defaultLocale;
-	private transient ResourceBundle customBundle;
-	private transient ResourceBundle localeBundle;
-	private final transient ResourceBundle defaultBundle;
-	private final transient Map<String, MessageFormat> messageFormatCache = new HashMap<String, MessageFormat>();
-	private final transient IEssentials ess;
-
-	public I18n(final IEssentials ess)
-	{
-		this.ess = ess;
-		customBundle = ResourceBundle.getBundle(MESSAGES, defaultLocale, new FileResClassLoader(I18n.class.getClassLoader(), ess));
-		localeBundle = ResourceBundle.getBundle(MESSAGES, defaultLocale);
-		defaultBundle = ResourceBundle.getBundle(MESSAGES, Locale.ENGLISH);
-	}
-
-	public void onEnable()
-	{
-		instance = this;
-	}
-
-	public void onDisable()
-	{
-		instance = null;
-	}
-
-	public Locale getCurrentLocale()
-	{
-		return currentLocale;
-	}
-
-	public String translate(final String string)
-	{
-		try
-		{
-			try
-			{
-				return customBundle.getString(string);
-			}
-			catch (MissingResourceException ex)
-			{
-				return localeBundle.getString(string);
-			}
-		}
-		catch (MissingResourceException ex)
-		{
-			Logger.getLogger("Minecraft").log(Level.WARNING, String.format("Missing translation key \"%s\" in translation file %s", ex.getKey(), localeBundle.getLocale().toString()), ex);
-			return defaultBundle.getString(string);
-		}
-	}
-
-	public static String _(final String string, final Object... objects)
-	{
-		if (instance == null) {
-			return "";
-		}
-		if (objects.length == 0)
-		{
-			return instance.translate(string);
-		}
-		else
-		{
-			return instance.format(string, objects);
-		}
-	}
-
-	public String format(final String string, final Object... objects)
-	{
-		final String format = translate(string);
-		MessageFormat messageFormat = messageFormatCache.get(format);
-		if (messageFormat == null)
-		{
-			messageFormat = new MessageFormat(format);
-			messageFormatCache.put(format, messageFormat);
-		}
-		return messageFormat.format(objects);
-	}
-
-	public void updateLocale(final String loc)
-	{
-		if (loc == null || loc.isEmpty())
-		{
-			return;
-		}
-		final String[] parts = loc.split("[_\\.]");
-		if (parts.length == 1)
-		{
-			currentLocale = new Locale(parts[0]);
-		}
-		if (parts.length == 2)
-		{
-			currentLocale = new Locale(parts[0], parts[1]);
-		}
-		if (parts.length == 3)
-		{
-			currentLocale = new Locale(parts[0], parts[1], parts[2]);
-		}
-		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;
-
-		public FileResClassLoader(final ClassLoader classLoader, final IEssentials ess)
-		{
-			super(classLoader);
-			this.dataFolder = ess.getDataFolder();
-		}
-
-		@Override
-		public URL getResource(final String string)
-		{
-			final File file = new File(dataFolder, string);
-			if (file.exists())
-			{
-				try
-				{
-					return file.toURI().toURL();
-				}
-				catch (MalformedURLException ex)
-				{
-				}
-			}
-			return super.getResource(string);
-		}
-
-		@Override
-		public InputStream getResourceAsStream(final String string)
-		{
-			final File file = new File(dataFolder, string);
-			if (file.exists())
-			{
-				try
-				{
-					return new FileInputStream(file);
-				}
-				catch (FileNotFoundException ex)
-				{
-				}
-			}
-			return super.getResourceAsStream(string);
-		}
-	}
-}

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

@@ -1,9 +0,0 @@
-package com.earth2me.essentials;
-
-/**
- * @deprecated New interface will be IReload in api package
- */
-@Deprecated
-public interface IConf {
-	public void reloadConfig();
-}

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

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

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

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

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

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

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

@@ -1,184 +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.text.MessageFormat;
-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();
-
-	MessageFormat getChatFormat(String group);
-
-	int getChatRadius();
-
-	double getCommandCost(IEssentialsCommand cmd);
-
-	double getCommandCost(String label);
-
-	String getCurrencySymbol();
-
-	int getOversizedStackSize();
-
-	int getDefaultStackSize();
-
-	double getHealCooldown();
-
-	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);
-
-	boolean getSortListByGroups();
-
-	int getSpawnMobLimit();
-
-	int getStartingBalance();
-
-	double getTeleportCooldown();
-
-	double getTeleportDelay();
-
-	boolean hidePermissionlessHelp();
-
-	boolean isCommandDisabled(final IEssentialsCommand cmd);
-
-	boolean isCommandDisabled(String label);
-
-	boolean isCommandOverridden(String name);
-
-	boolean isCommandRestricted(IEssentialsCommand cmd);
-
-	boolean isCommandRestricted(String label);
-
-	boolean isDebug();
-
-	boolean isEcoDisabled();
-
-	boolean isTradeInStacks(int id);
-
-	List<Integer> itemSpawnBlacklist();
-
-	List<EssentialsSign> enabledSigns();
-
-	boolean permissionBasedItemSpawn();
-
-	boolean showNonEssCommandsInHelp();
-
-	boolean spawnIfNoHome();
-
-	boolean warnOnBuildDisallow();
-
-	boolean warnOnSmite();
-
-	double getMaxMoney();
-
-	double 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 areDeathMessagesEnabled();
-
-	public void setDebug(boolean debug);
-
-	Set<String> getNoGodWorlds();
-
-	boolean getUpdateBedAtDaytime();
-
-	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();
-}

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

@@ -1,49 +0,0 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.commands.IEssentialsCommand;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-
-
-/**
- * @deprecated This will be moved to the api package soon
- */
-@Deprecated
-public interface IUser extends Player
-{
-	long getLastTeleportTimestamp();
-
-	boolean isAuthorized(String node);
-
-	boolean isAuthorized(IEssentialsCommand cmd);
-
-	boolean isAuthorized(IEssentialsCommand cmd, String permissionPrefix);
-
-	void setLastTeleportTimestamp(long time);
-
-	Location getLastLocation();
-
-	Player getBase();
-
-	double getMoney();
-
-	void takeMoney(double value);
-
-	void giveMoney(double value);
-	
-	boolean canAfford(double value);
-
-	String getGroup();
-
-	void setLastLocation();
-
-	Location getHome(String name) throws Exception;
-
-	Location getHome(Location loc) throws Exception;
-
-	boolean isHidden();
-
-	Teleport getTeleport();
-
-	void setJail(String jail);
-}

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

@@ -1,122 +0,0 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.api.IItemDb;
-import static com.earth2me.essentials.I18n._;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-
-
-public class ItemDb implements IConf, IItemDb
-{
-	private final transient IEssentials ess;
-
-	public ItemDb(final IEssentials ess)
-	{
-		this.ess = ess;
-		file = new ManagedFile("items.csv", ess);
-	}
-	private final transient Map<String, Integer> items = new HashMap<String, Integer>();
-	private final transient Map<String, Short> durabilities = new HashMap<String, Short>();
-	private final transient ManagedFile file;
-
-	@Override
-	public void reloadConfig()
-	{
-		final List<String> lines = file.getLines();
-
-		if (lines.isEmpty())
-		{
-			return;
-		}
-
-		durabilities.clear();
-		items.clear();
-
-		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]);
-
-			durabilities.put(parts[0].toLowerCase(Locale.ENGLISH), parts.length > 2 && !parts[2].equals("0") ? Short.parseShort(parts[2]) : 0);
-			items.put(parts[0].toLowerCase(Locale.ENGLISH), numeric);
-		}
-	}
-
-	public ItemStack get(final String id, final int quantity) throws Exception
-	{
-		final ItemStack retval = get(id.toLowerCase(Locale.ENGLISH));
-		retval.setAmount(quantity);
-		return retval;
-	}
-
-	public ItemStack get(final String id) throws Exception
-	{
-		int itemid = 0;
-		String itemname = null;
-		short metaData = 0;
-		if (id.matches("^\\d+[:+',;.]\\d+$"))
-		{
-			itemid = Integer.parseInt(id.split("[:+',;.]")[0]);
-			metaData = Short.parseShort(id.split("[:+',;.]")[1]);
-		}
-		else if (id.matches("^\\d+$"))
-		{
-			itemid = Integer.parseInt(id);
-		}
-		else if (id.matches("^[^:+',;.]+[:+',;.]\\d+$"))
-		{
-			itemname = id.split("[:+',;.]")[0].toLowerCase(Locale.ENGLISH);
-			metaData = Short.parseShort(id.split("[:+',;.]")[1]);
-		}
-		else
-		{
-			itemname = id.toLowerCase(Locale.ENGLISH);
-		}
-
-		if (itemname != null)
-		{
-			if (items.containsKey(itemname))
-			{
-				itemid = items.get(itemname);
-				if (durabilities.containsKey(itemname) && metaData == 0)
-				{
-					metaData = durabilities.get(itemname);
-				}
-			}
-			else if (Material.getMaterial(itemname) != null)
-			{
-				itemid = Material.getMaterial(itemname).getId();
-				metaData = 0;
-			}
-			else
-			{
-				throw new Exception(_("unknownItemName", id));
-			}
-		}
-
-		final Material mat = Material.getMaterial(itemid);
-		if (mat == null)
-		{
-			throw new Exception(_("unknownItemId", itemid));
-		}
-		final ItemStack retval = new ItemStack(mat);
-		retval.setAmount(mat.getMaxStackSize());
-		retval.setDurability(metaData);
-		return retval;
-	}
-}

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

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

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

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

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

@@ -1,227 +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 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/Mob.java

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

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

@@ -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 implements Player
-{
-	@Delegate(types =
-	{
-		Player.class, Entity.class, CommandSender.class, ServerOperator.class,
-		HumanEntity.class, ConfigurationSerializable.class, LivingEntity.class,
-		Permissible.class
-	})
-	protected Player base;
-
-	public PlayerExtension(final Player base)
-	{
-		this.base = base;
-	}
-
-	public final Player getBase()
-	{
-		return base;
-	}
-
-	public final Player setBase(final Player base)
-	{
-		return this.base = base;
-	}
-}

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

@@ -1,915 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.commands.IEssentialsCommand;
-import com.earth2me.essentials.signs.EssentialsSign;
-import com.earth2me.essentials.signs.Signs;
-import com.earth2me.essentials.textreader.IText;
-import com.earth2me.essentials.textreader.SimpleTextInput;
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.ChatColor;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.MemoryConfiguration;
-import org.bukkit.event.EventPriority;
-import org.bukkit.inventory.ItemStack;
-
-
-public class Settings implements ISettings
-{
-	private final transient EssentialsConf config;
-	private final static Logger logger = Logger.getLogger("Minecraft");
-	private final transient IEssentials ess;
-	private boolean metricsEnabled = true;
-
-	public Settings(IEssentials ess)
-	{
-		this.ess = ess;
-		config = new EssentialsConf(new File(ess.getDataFolder(), "config.yml"));
-		config.setTemplateName("/config.yml");
-		reloadConfig();
-	}
-
-	@Override
-	public boolean getRespawnAtHome()
-	{
-		return config.getBoolean("respawn-at-home", false);
-	}
-
-	@Override
-	public boolean getUpdateBedAtDaytime()
-	{
-		return config.getBoolean("update-bed-at-daytime", true);
-	}
-
-	@Override
-	public Set<String> getMultipleHomes()
-	{
-		return config.getConfigurationSection("sethome-multiple").getKeys(false);
-	}
-
-	@Override
-	public int getHomeLimit(final User user)
-	{
-		final Set<String> homeList = getMultipleHomes();
-		if (homeList == null)
-		{
-			//TODO: Replace this code to remove backwards compat, after settings are automatically updated
-			// return getHomeLimit("default");
-			return config.getInt("multiple-homes", 5);
-		}
-		int limit = getHomeLimit("default");
-		for (String set : homeList)
-		{
-			if (user.isAuthorized("essentials.sethome.multiple." + set) && (limit < getHomeLimit(set)))
-			{
-				limit = getHomeLimit(set);
-			}
-		}
-		return limit;
-	}
-
-	@Override
-	public int getHomeLimit(final String set)
-	{
-		return config.getInt("sethome-multiple." + set, config.getInt("sethome-multiple.default", 3));
-	}
-	private int chatRadius = 0;
-
-	private int _getChatRadius()
-	{
-		return config.getInt("chat.radius", config.getInt("chat-radius", 0));
-	}
-
-	@Override
-	public int getChatRadius()
-	{
-		return chatRadius;
-	}
-
-	@Override
-	public double getTeleportDelay()
-	{
-		return config.getDouble("teleport-delay", 0);
-	}
-
-	@Override
-	public int getOversizedStackSize()
-	{
-		return config.getInt("oversized-stacksize", 64);
-	}
-
-	@Override
-	public int getDefaultStackSize()
-	{
-		return config.getInt("default-stack-size", -1);
-	}
-
-	@Override
-	public int getStartingBalance()
-	{
-		return config.getInt("starting-balance", 0);
-	}
-
-	@Override
-	public boolean isCommandDisabled(final IEssentialsCommand cmd)
-	{
-		return isCommandDisabled(cmd.getName());
-	}
-	private Set<String> disabledCommands = new HashSet<String>();
-
-	@Override
-	public boolean isCommandDisabled(String label)
-	{
-		return disabledCommands.contains(label);
-	}
-
-	private Set<String> getDisabledCommands()
-	{
-		Set<String> disCommands = new HashSet<String>();
-		for (String c : config.getStringList("disabled-commands"))
-		{
-			disCommands.add(c.toLowerCase(Locale.ENGLISH));
-		}
-		for (String c : config.getKeys(false))
-		{
-			if (c.startsWith("disable-"))
-			{
-				disCommands.add(c.substring(8).toLowerCase(Locale.ENGLISH));
-			}
-		}
-		return disCommands;
-	}
-
-	@Override
-	public boolean isCommandRestricted(IEssentialsCommand cmd)
-	{
-		return isCommandRestricted(cmd.getName());
-	}
-
-	@Override
-	public boolean isCommandRestricted(String label)
-	{
-		for (String c : config.getStringList("restricted-commands"))
-		{
-			if (!c.equalsIgnoreCase(label))
-			{
-				continue;
-			}
-			return true;
-		}
-		return config.getBoolean("restrict-" + label.toLowerCase(Locale.ENGLISH), false);
-	}
-
-	@Override
-	public boolean isPlayerCommand(String label)
-	{
-		for (String c : config.getStringList("player-commands"))
-		{
-			if (!c.equalsIgnoreCase(label))
-			{
-				continue;
-			}
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isCommandOverridden(String name)
-	{
-		for (String c : config.getStringList("overridden-commands"))
-		{
-			if (!c.equalsIgnoreCase(name))
-			{
-				continue;
-			}
-			return true;
-		}
-		return config.getBoolean("override-" + name.toLowerCase(Locale.ENGLISH), false);
-	}
-
-	@Override
-	public double getCommandCost(IEssentialsCommand cmd)
-	{
-		return getCommandCost(cmd.getName());
-	}
-
-	@Override
-	public double getCommandCost(String label)
-	{
-		double cost = config.getDouble("command-costs." + label, 0.0);
-		if (cost == 0.0)
-		{
-			cost = config.getDouble("cost-" + label, 0.0);
-		}
-		return cost;
-	}
-	private String nicknamePrefix = "~";
-
-	private String _getNicknamePrefix()
-	{
-		return config.getString("nickname-prefix", "~");
-	}
-
-	@Override
-	public String getNicknamePrefix()
-	{
-		return nicknamePrefix;
-	}
-
-	@Override
-	public double getTeleportCooldown()
-	{
-		return config.getDouble("teleport-cooldown", 0);
-	}
-
-	@Override
-	public double getHealCooldown()
-	{
-		return config.getDouble("heal-cooldown", 0);
-	}
-	private ConfigurationSection kits;
-
-	public ConfigurationSection _getKits()
-	{
-		if (config.isConfigurationSection("kits"))
-		{
-			final ConfigurationSection section = config.getConfigurationSection("kits");
-			final ConfigurationSection newSection = new MemoryConfiguration();
-			for (String kitItem : section.getKeys(false))
-			{
-				if (section.isConfigurationSection(kitItem))
-				{
-					newSection.set(kitItem.toLowerCase(Locale.ENGLISH), section.getConfigurationSection(kitItem));
-				}
-			}
-			return newSection;
-		}
-		return null;
-	}
-
-	@Override
-	public ConfigurationSection getKits()
-	{
-		return kits;
-	}
-
-	@Override
-	public Map<String, Object> getKit(String name)
-	{
-		name = name.replace('.', '_').replace('/', '_');
-		if (config.isConfigurationSection("kits"))
-		{
-			final ConfigurationSection kits = getKits();
-			if (kits.isConfigurationSection(name))
-			{
-				return kits.getConfigurationSection(name).getValues(true);
-			}
-		}
-		return null;
-	}
-	private ChatColor operatorColor = null;
-
-	@Override
-	public ChatColor getOperatorColor()
-	{
-		return operatorColor;
-	}
-
-	private ChatColor _getOperatorColor()
-	{
-		String colorName = config.getString("ops-name-color", null);
-
-		if (colorName == null)
-		{
-			return ChatColor.RED;
-		}
-		if ("none".equalsIgnoreCase(colorName) || colorName.isEmpty())
-		{
-			return null;
-		}
-
-		try
-		{
-			return ChatColor.valueOf(colorName.toUpperCase(Locale.ENGLISH));
-		}
-		catch (IllegalArgumentException ex)
-		{
-		}
-
-		return ChatColor.getByChar(colorName);
-	}
-
-	@Override
-	public int getSpawnMobLimit()
-	{
-		return config.getInt("spawnmob-limit", 10);
-	}
-
-	@Override
-	public boolean showNonEssCommandsInHelp()
-	{
-		return config.getBoolean("non-ess-in-help", true);
-	}
-
-	@Override
-	public boolean hidePermissionlessHelp()
-	{
-		return config.getBoolean("hide-permissionless-help", true);
-	}
-
-	@Override
-	public int getProtectCreeperMaxHeight()
-	{
-		return config.getInt("protect.creeper.max-height", -1);
-	}
-
-	@Override
-	public boolean areSignsDisabled()
-	{
-		return !signsEnabled;
-	}
-
-	@Override
-	public long getBackupInterval()
-	{
-		return config.getInt("backup.interval", 1440); // 1440 = 24 * 60
-	}
-
-	@Override
-	public String getBackupCommand()
-	{
-		return config.getString("backup.command", null);
-	}
-	private Map<String, MessageFormat> chatFormats = Collections.synchronizedMap(new HashMap<String, MessageFormat>());
-
-	@Override
-	public MessageFormat getChatFormat(String group)
-	{
-		MessageFormat mFormat = chatFormats.get(group);
-		if (mFormat == null)
-		{
-			String format = config.getString("chat.group-formats." + (group == null ? "Default" : group),
-											 config.getString("chat.format", "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}"));
-			format = Util.replaceFormat(format);
-			format = format.replace("{DISPLAYNAME}", "%1$s");
-			format = format.replace("{GROUP}", "{0}");
-			format = format.replace("{MESSAGE}", "%2$s");
-			format = format.replace("{WORLDNAME}", "{1}");
-			format = format.replace("{SHORTWORLDNAME}", "{2}");
-			format = format.replaceAll("\\{(\\D*?)\\}", "\\[$1\\]");
-			mFormat = new MessageFormat(format);
-			chatFormats.put(group, mFormat);
-		}
-		return mFormat;
-	}
-
-	@Override
-	public boolean getAnnounceNewPlayers()
-	{
-		return !config.getString("newbies.announce-format", "-").isEmpty();
-	}
-
-	@Override
-	public IText getAnnounceNewPlayerFormat()
-	{
-		return new SimpleTextInput(Util.replaceFormat(config.getString("newbies.announce-format", "&dWelcome {DISPLAYNAME} to the server!")));
-	}
-
-	@Override
-	public String getNewPlayerKit()
-	{
-		return config.getString("newbies.kit", "");
-	}
-
-	@Override
-	public String getNewbieSpawn()
-	{
-		return config.getString("newbies.spawnpoint", "default");
-	}
-
-	@Override
-	public boolean getPerWarpPermission()
-	{
-		return config.getBoolean("per-warp-permission", false);
-	}
-
-	@Override
-	public boolean getSortListByGroups()
-	{
-		return config.getBoolean("sort-list-by-groups", true);
-	}
-
-	@Override
-	public void reloadConfig()
-	{
-		config.load();
-		noGodWorlds = new HashSet<String>(config.getStringList("no-god-in-worlds"));
-		enabledSigns = _getEnabledSigns();
-		teleportInvulnerability = _isTeleportInvulnerability();
-		disableItemPickupWhileAfk = _getDisableItemPickupWhileAfk();
-		registerBackInListener = _registerBackInListener();
-		cancelAfkOnMove = _cancelAfkOnMove();
-		getFreezeAfkPlayers = _getFreezeAfkPlayers();
-		itemSpawnBl = _getItemSpawnBlacklist();
-		loginAttackDelay = _getLoginAttackDelay();
-		signUsePerSecond = _getSignUsePerSecond();
-		kits = _getKits();
-		chatFormats.clear();
-		changeDisplayName = _changeDisplayName();
-		disabledCommands = getDisabledCommands();
-		nicknamePrefix = _getNicknamePrefix();
-		operatorColor = _getOperatorColor();
-		changePlayerListName = _changePlayerListName();
-		configDebug = _isDebug();
-		prefixsuffixconfigured = _isPrefixSuffixConfigured();
-		addprefixsuffix = _addPrefixSuffix();
-		disablePrefix = _disablePrefix();
-		disableSuffix = _disableSuffix();
-		chatRadius = _getChatRadius();
-	}
-	private List<Integer> itemSpawnBl = new ArrayList<Integer>();
-
-	@Override
-	public List<Integer> itemSpawnBlacklist()
-	{
-		return itemSpawnBl;
-	}
-
-	private List<Integer> _getItemSpawnBlacklist()
-	{
-		final List<Integer> epItemSpwn = new ArrayList<Integer>();
-		if (ess.getItemDb() == null)
-		{
-			logger.log(Level.FINE, "Aborting ItemSpawnBL read, itemDB not yet loaded.");
-			return epItemSpwn;
-		}
-		for (String itemName : config.getString("item-spawn-blacklist", "").split(","))
-		{
-			itemName = itemName.trim();
-			if (itemName.isEmpty())
-			{
-				continue;
-			}
-			try
-			{
-				final ItemStack iStack = ess.getItemDb().get(itemName);
-				epItemSpwn.add(iStack.getTypeId());
-			}
-			catch (Exception ex)
-			{
-				logger.log(Level.SEVERE, _("unknownItemInList", itemName, "item-spawn-blacklist"));
-			}
-		}
-		return epItemSpwn;
-	}
-	private List<EssentialsSign> enabledSigns = new ArrayList<EssentialsSign>();
-	private boolean signsEnabled = false;
-
-	@Override
-	public List<EssentialsSign> enabledSigns()
-	{
-		return enabledSigns;
-	}
-
-	private List<EssentialsSign> _getEnabledSigns()
-	{
-		List<EssentialsSign> newSigns = new ArrayList<EssentialsSign>();
-
-		for (String signName : config.getStringList("enabledSigns"))
-		{
-			signName = signName.trim().toUpperCase(Locale.ENGLISH);
-			if (signName.isEmpty())
-			{
-				continue;
-			}
-			if (signName.equals("COLOR") || signName.equals("COLOUR"))
-			{
-				signsEnabled = true;
-				continue;
-			}
-			try
-			{
-				newSigns.add(Signs.valueOf(signName).getSign());
-			}
-			catch (Exception ex)
-			{
-				logger.log(Level.SEVERE, _("unknownItemInList", signName, "enabledSigns"));
-				continue;
-			}
-			signsEnabled = true;
-		}
-		return newSigns;
-	}
-
-	@Override
-	public boolean spawnIfNoHome()
-	{
-		return config.getBoolean("spawn-if-no-home", false);
-	}
-
-	@Override
-	public boolean warnOnBuildDisallow()
-	{
-		return config.getBoolean("protect.disable.warn-on-build-disallow", false);
-	}
-	private boolean debug = false;
-	private boolean configDebug = false;
-
-	private boolean _isDebug()
-	{
-		return config.getBoolean("debug", false);
-	}
-
-	@Override
-	public boolean isDebug()
-	{
-		return debug || configDebug;
-	}
-
-	@Override
-	public boolean warnOnSmite()
-	{
-		return config.getBoolean("warn-on-smite", true);
-	}
-
-	@Override
-	public boolean permissionBasedItemSpawn()
-	{
-		return config.getBoolean("permission-based-item-spawn", false);
-	}
-
-	@Override
-	public String getLocale()
-	{
-		return config.getString("locale", "");
-	}
-
-	@Override
-	public String getCurrencySymbol()
-	{
-		return config.getString("currency-symbol", "$").substring(0, 1).replaceAll("[0-9]", "$");
-	}
-
-	@Override
-	public boolean isTradeInStacks(int id)
-	{
-		return config.getBoolean("trade-in-stacks-" + id, false);
-	}
-
-	@Override
-	public boolean isEcoDisabled()
-	{
-		return config.getBoolean("disable-eco", false);
-	}
-
-	@Override
-	public boolean getProtectPreventSpawn(final String creatureName)
-	{
-		return config.getBoolean("protect.prevent.spawn." + creatureName, false);
-	}
-
-	@Override
-	public List<Integer> getProtectList(final String configName)
-	{
-		final List<Integer> list = new ArrayList<Integer>();
-		for (String itemName : config.getString(configName, "").split(","))
-		{
-			itemName = itemName.trim();
-			if (itemName.isEmpty())
-			{
-				continue;
-			}
-			ItemStack itemStack;
-			try
-			{
-				itemStack = ess.getItemDb().get(itemName);
-				list.add(itemStack.getTypeId());
-			}
-			catch (Exception ex)
-			{
-				logger.log(Level.SEVERE, _("unknownItemInList", itemName, configName));
-			}
-		}
-		return list;
-	}
-
-	@Override
-	public String getProtectString(final String configName)
-	{
-		return config.getString(configName, null);
-	}
-
-	@Override
-	public boolean getProtectBoolean(final String configName, boolean def)
-	{
-		return config.getBoolean(configName, def);
-	}
-	private final static double MAXMONEY = 10000000000000.0;
-
-	@Override
-	public double getMaxMoney()
-	{
-		double max = config.getDouble("max-money", MAXMONEY);
-		if (Math.abs(max) > MAXMONEY)
-		{
-			max = max < 0 ? -MAXMONEY : MAXMONEY;
-		}
-		return max;
-	}
-	private final static double MINMONEY = -10000000000000.0;
-
-	@Override
-	public double getMinMoney()
-	{
-		double min = config.getDouble("min-money", MINMONEY);
-		if (min > 0)
-		{
-			min = -min;
-		}
-		if (min < MINMONEY)
-		{
-			min = MINMONEY;
-		}
-		return min;
-	}
-
-	@Override
-	public boolean isEcoLogEnabled()
-	{
-		return config.getBoolean("economy-log-enabled", false);
-	}
-
-	@Override
-	public boolean isEcoLogUpdateEnabled()
-	{
-		return config.getBoolean("economy-log-update-enabled", false);
-	}
-
-	@Override
-	public boolean removeGodOnDisconnect()
-	{
-		return config.getBoolean("remove-god-on-disconnect", false);
-	}
-	private boolean changeDisplayName = true;
-
-	private boolean _changeDisplayName()
-	{
-		return config.getBoolean("change-displayname", true);
-	}
-
-	@Override
-	public boolean changeDisplayName()
-	{
-		return changeDisplayName;
-	}
-	private boolean changePlayerListName = false;
-
-	private boolean _changePlayerListName()
-	{
-		return config.getBoolean("change-playerlist", false);
-	}
-
-	@Override
-	public boolean changePlayerListName()
-	{
-		return changePlayerListName;
-	}
-
-	@Override
-	public boolean useBukkitPermissions()
-	{
-		return config.getBoolean("use-bukkit-permissions", false);
-	}
-	private boolean prefixsuffixconfigured = false;
-	private boolean addprefixsuffix = false;
-
-	private boolean _addPrefixSuffix()
-	{
-		return config.getBoolean("add-prefix-suffix", false);
-	}
-
-	private boolean _isPrefixSuffixConfigured()
-	{
-		return config.hasProperty("add-prefix-suffix");
-	}
-
-	@Override
-	public boolean addPrefixSuffix()
-	{
-		return prefixsuffixconfigured ? addprefixsuffix : ess.getServer().getPluginManager().isPluginEnabled("EssentialsChat");
-	}
-	private boolean disablePrefix = false;
-
-	private boolean _disablePrefix()
-	{
-		return config.getBoolean("disablePrefix", false);
-	}
-
-	@Override
-	public boolean disablePrefix()
-	{
-		return disablePrefix;
-	}
-	private boolean disableSuffix = false;
-
-	private boolean _disableSuffix()
-	{
-		return config.getBoolean("disableSuffix", false);
-	}
-
-	@Override
-	public boolean disableSuffix()
-	{
-		return disableSuffix;
-	}
-
-	@Override
-	public long getAutoAfk()
-	{
-		return config.getLong("auto-afk", 300);
-	}
-
-	@Override
-	public long getAutoAfkKick()
-	{
-		return config.getLong("auto-afk-kick", -1);
-	}
-	private boolean getFreezeAfkPlayers;
-
-	@Override
-	public boolean getFreezeAfkPlayers()
-	{
-		return getFreezeAfkPlayers;
-	}
-
-	private boolean _getFreezeAfkPlayers()
-	{
-		return config.getBoolean("freeze-afk-players", false);
-	}
-	private boolean cancelAfkOnMove;
-
-	@Override
-	public boolean cancelAfkOnMove()
-	{
-		return cancelAfkOnMove;
-	}
-
-	private boolean _cancelAfkOnMove()
-	{
-		return config.getBoolean("cancel-afk-on-move", true);
-	}
-
-	@Override
-	public boolean areDeathMessagesEnabled()
-	{
-		return config.getBoolean("death-messages", true);
-	}
-	private Set<String> noGodWorlds = new HashSet<String>();
-
-	@Override
-	public Set<String> getNoGodWorlds()
-	{
-		return noGodWorlds;
-	}
-
-	@Override
-	public void setDebug(final boolean debug)
-	{
-		this.debug = debug;
-	}
-
-	@Override
-	public boolean getRepairEnchanted()
-	{
-		return config.getBoolean("repair-enchanted", true);
-	}
-
-	@Override
-	public boolean isWorldTeleportPermissions()
-	{
-		return config.getBoolean("world-teleport-permissions", false);
-	}
-
-	@Override
-	public boolean isWorldHomePermissions()
-	{
-		return config.getBoolean("world-home-permissions", false);
-	}
-	private boolean registerBackInListener;
-
-	@Override
-	public boolean registerBackInListener()
-	{
-		return registerBackInListener;
-	}
-
-	private boolean _registerBackInListener()
-	{
-		return config.getBoolean("register-back-in-listener", false);
-	}
-	private boolean disableItemPickupWhileAfk;
-
-	@Override
-	public boolean getDisableItemPickupWhileAfk()
-	{
-		return disableItemPickupWhileAfk;
-	}
-
-	private boolean _getDisableItemPickupWhileAfk()
-	{
-		return config.getBoolean("disable-item-pickup-while-afk", false);
-	}
-
-	@Override
-	public EventPriority getRespawnPriority()
-	{
-		String priority = config.getString("respawn-listener-priority", "normal").toLowerCase(Locale.ENGLISH);
-		if ("lowest".equals(priority))
-		{
-			return EventPriority.LOWEST;
-		}
-		if ("low".equals(priority))
-		{
-			return EventPriority.LOW;
-		}
-		if ("normal".equals(priority))
-		{
-			return EventPriority.NORMAL;
-		}
-		if ("high".equals(priority))
-		{
-			return EventPriority.HIGH;
-		}
-		if ("highest".equals(priority))
-		{
-			return EventPriority.HIGHEST;
-		}
-		return EventPriority.NORMAL;
-	}
-
-	@Override
-	public long getTpaAcceptCancellation()
-	{
-		return config.getLong("tpa-accept-cancellation", 0);
-	}
-
-	@Override
-	public boolean isMetricsEnabled()
-	{
-		return metricsEnabled;
-	}
-
-	@Override
-	public void setMetricsEnabled(boolean metricsEnabled)
-	{
-		this.metricsEnabled = metricsEnabled;
-	}
-	private boolean teleportInvulnerability;
-
-	@Override
-	public long getTeleportInvulnerability()
-	{
-		return config.getLong("teleport-invulnerability", 0) * 1000;
-	}
-
-	private boolean _isTeleportInvulnerability()
-	{
-		return (config.getLong("teleport-invulnerability", 0) > 0);
-	}
-
-	@Override
-	public boolean isTeleportInvulnerability()
-	{
-		return teleportInvulnerability;
-	}
-	private long loginAttackDelay;
-
-	private long _getLoginAttackDelay()
-	{
-		return config.getLong("login-attack-delay", 0) * 1000;
-	}
-
-	@Override
-	public long getLoginAttackDelay()
-	{
-		return loginAttackDelay;
-	}
-	private int signUsePerSecond;
-
-	private int _getSignUsePerSecond()
-	{
-		final int perSec = config.getInt("sign-use-per-second", 4);
-		return perSec > 0 ? perSec : 1;
-	}
-
-	@Override
-	public int getSignUsePerSecond()
-	{
-		return signUsePerSecond;
-	}
-}

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

@@ -1,61 +0,0 @@
-package com.earth2me.essentials;
-
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityExplodeEvent;
-
-
-public class TNTExplodeListener implements Listener, Runnable
-{
-	private final transient IEssentials ess;
-	private transient boolean enabled = false;
-	private transient int timer = -1;
-
-	public TNTExplodeListener(final IEssentials ess)
-	{
-		super();
-		this.ess = ess;
-	}
-
-	public void enable()
-	{
-		if (!enabled)
-		{
-			enabled = true;
-			timer = ess.scheduleSyncDelayedTask(this, 1000);
-			return;
-		}
-		if (timer != -1)
-		{
-			ess.getScheduler().cancelTask(timer);
-			timer = ess.scheduleSyncDelayedTask(this, 1000);
-		}
-	}
-
-	@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,300 +0,0 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.api.ITeleport;
-import static com.earth2me.essentials.I18n._;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.logging.Logger;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerRespawnEvent;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-
-
-public class Teleport implements Runnable, ITeleport
-{
-	private static final double MOVE_CONSTANT = 0.3;
-
-
-	private static class Target
-	{
-		private final Location location;
-		private final Entity entity;
-
-		public Target(Location location)
-		{
-			this.location = location;
-			this.entity = null;
-		}
-
-		public Target(Entity entity)
-		{
-			this.entity = entity;
-			this.location = null;
-		}
-
-		public Location getLocation()
-		{
-			if (this.entity != null)
-			{
-				return this.entity.getLocation();
-			}
-			return location;
-		}
-	}
-	private IUser user;
-	private int teleTimer = -1;
-	private long started;	// time this task was initiated
-	private long delay;		// how long to delay the teleport
-	private int health;
-	// note that I initially stored a clone of the location for reference, but...
-	// when comparing locations, I got incorrect mismatches (rounding errors, looked like)
-	// so, the X/Y/Z values are stored instead and rounded off
-	private long initX;
-	private long initY;
-	private long initZ;
-	private Target teleportTarget;
-	private Trade chargeFor;
-	private final IEssentials ess;
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	private TeleportCause cause;
-
-	private void initTimer(long delay, Target target, Trade chargeFor, TeleportCause cause)
-	{
-		this.started = System.currentTimeMillis();
-		this.delay = delay;
-		this.health = user.getHealth();
-		this.initX = Math.round(user.getLocation().getX() * MOVE_CONSTANT);
-		this.initY = Math.round(user.getLocation().getY() * MOVE_CONSTANT);
-		this.initZ = Math.round(user.getLocation().getZ() * MOVE_CONSTANT);
-		this.teleportTarget = target;
-		this.chargeFor = chargeFor;
-		this.cause = cause;
-	}
-
-	@Override
-	public void run()
-	{
-
-		if (user == null || !user.isOnline() || user.getLocation() == null)
-		{
-			cancel();
-			return;
-		}
-		if (Math.round(user.getLocation().getX() * MOVE_CONSTANT) != initX
-			|| Math.round(user.getLocation().getY() * MOVE_CONSTANT) != initY
-			|| Math.round(user.getLocation().getZ() * MOVE_CONSTANT) != initZ
-			|| user.getHealth() < health)
-		{	// user moved, cancel teleport
-			cancel(true);
-			return;
-		}
-
-		health = user.getHealth();  // in case user healed, then later gets injured
-
-		long now = System.currentTimeMillis();
-		if (now > started + delay)
-		{
-			try
-			{
-				cooldown(false);
-				user.sendMessage(_("teleportationCommencing"));
-				try
-				{
-
-					now(teleportTarget, cause);
-					if (chargeFor != null)
-					{
-						chargeFor.charge(user);
-					}
-				}
-				catch (Throwable ex)
-				{
-					ess.showError(user.getBase(), ex, "teleport");
-				}
-			}
-			catch (Exception ex)
-			{
-				user.sendMessage(_("cooldownWithMessage", ex.getMessage()));
-			}
-		}
-	}
-
-	public Teleport(IUser user, IEssentials ess)
-	{
-		this.user = user;
-		this.ess = ess;
-	}
-
-	public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		final Player player = user.getBase();
-		final Location bed = player.getBedSpawnLocation();
-		final PlayerRespawnEvent pre = new PlayerRespawnEvent(player, bed == null ? player.getWorld().getSpawnLocation() : bed, bed != null);
-		ess.getServer().getPluginManager().callEvent(pre);
-		teleport(new Target(pre.getRespawnLocation()), chargeFor, cause);
-	}
-
-	public void warp(String warp, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		Location loc = ess.getWarps().getWarp(warp);
-		teleport(new Target(loc), chargeFor, cause);
-		user.sendMessage(_("warpingTo", warp));
-	}
-
-	public void cooldown(boolean check) throws Exception
-	{
-		final Calendar time = new GregorianCalendar();
-		if (user.getLastTeleportTimestamp() > 0)
-		{
-			// Take the current time, and remove the delay from it.
-			final double cooldown = ess.getSettings().getTeleportCooldown();
-			final Calendar earliestTime = new GregorianCalendar();
-			earliestTime.add(Calendar.SECOND, -(int)cooldown);
-			earliestTime.add(Calendar.MILLISECOND, -(int)((cooldown * 1000.0) % 1000.0));
-			// This value contains the most recent time a teleport could have been used that would allow another use.
-			final long earliestLong = earliestTime.getTimeInMillis();
-
-			// When was the last teleport used?
-			final Long lastTime = user.getLastTeleportTimestamp();
-
-			if (lastTime > time.getTimeInMillis())
-			{
-				// This is to make sure time didn't get messed up on last kit use.
-				// If this happens, let's give the user the benifit of the doubt.
-				user.setLastTeleportTimestamp(time.getTimeInMillis());
-				return;
-			}
-			else if (lastTime > earliestLong && !user.isAuthorized("essentials.teleport.cooldown.bypass"))
-			{
-				time.setTimeInMillis(lastTime);
-				time.add(Calendar.SECOND, (int)cooldown);
-				time.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
-				throw new Exception(_("timeBeforeTeleport", Util.formatDateDiff(time.getTimeInMillis())));
-			}
-		}
-		// if justCheck is set, don't update lastTeleport; we're just checking
-		if (!check)
-		{
-			user.setLastTeleportTimestamp(time.getTimeInMillis());
-		}
-	}
-
-	public void cancel(boolean notifyUser)
-	{
-		if (teleTimer == -1)
-		{
-			return;
-		}
-		try
-		{
-			ess.getServer().getScheduler().cancelTask(teleTimer);
-			if (notifyUser)
-			{
-				user.sendMessage(_("pendingTeleportCancelled"));
-			}
-		}
-		finally
-		{
-			teleTimer = -1;
-		}
-	}
-
-	public void cancel()
-	{
-		cancel(false);
-	}
-
-	public void teleport(Location loc, Trade chargeFor) throws Exception
-	{
-		teleport(new Target(loc), chargeFor, TeleportCause.PLUGIN);
-	}
-
-	public void teleport(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		teleport(new Target(loc), chargeFor, cause);
-	}
-
-	public void teleport(Entity entity, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		teleport(new Target(entity), chargeFor, cause);
-	}
-
-	private void teleport(Target target, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		double delay = ess.getSettings().getTeleportDelay();
-
-		if (chargeFor != null)
-		{
-			chargeFor.isAffordableFor(user);
-		}
-		cooldown(true);
-		if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
-		{
-			cooldown(false);
-			now(target, cause);
-			if (chargeFor != null)
-			{
-				chargeFor.charge(user);
-			}
-			return;
-		}
-
-		cancel();
-		Calendar c = new GregorianCalendar();
-		c.add(Calendar.SECOND, (int)delay);
-		c.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
-		user.sendMessage(_("dontMoveMessage", Util.formatDateDiff(c.getTimeInMillis())));
-		initTimer((long)(delay * 1000.0), target, chargeFor, cause);
-
-		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
-	}
-
-	private void now(Target target, TeleportCause cause) throws Exception
-	{
-		cancel();
-		user.setLastLocation();
-		user.getBase().teleport(Util.getSafeDestination(target.getLocation()), cause);
-	}
-
-	public void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception
-	{
-		if (cooldown)
-		{
-			cooldown(false);
-		}
-		now(new Target(loc), cause);
-	}
-
-	public void now(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		cooldown(false);
-		chargeFor.charge(user);
-		now(new Target(loc), cause);
-	}
-
-	public void now(Entity entity, boolean cooldown, TeleportCause cause) throws Exception
-	{
-		if (cooldown)
-		{
-			cooldown(false);
-		}
-		now(new Target(entity), cause);
-	}
-
-	public void back(Trade chargeFor) throws Exception
-	{
-		teleport(new Target(user.getLastLocation()), chargeFor, TeleportCause.COMMAND);
-	}
-
-	public void back() throws Exception
-	{
-		now(new Target(user.getLastLocation()), TeleportCause.COMMAND);
-	}
-
-	public void home(Location loc, Trade chargeFor) throws Exception
-	{
-		teleport(new Target(loc), chargeFor, TeleportCause.COMMAND);
-	}
-}

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

@@ -1,338 +0,0 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
-import com.earth2me.essentials.craftbukkit.SetExpFix;
-import static com.earth2me.essentials.I18n._;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.Location;
-import org.bukkit.entity.Item;
-import org.bukkit.inventory.ItemStack;
-
-
-public class Trade
-{
-	private final transient String command;
-	private final transient String fallbackCommand;
-	private final transient Double money;
-	private final transient ItemStack itemStack;
-	private final transient Integer exp;
-	private final transient IEssentials ess;
-
-	public Trade(final String command, final IEssentials ess)
-	{
-		this(command, null, null, null, null, ess);
-	}
-
-	public Trade(final String command, final String fallback, final IEssentials ess)
-	{
-		this(command, fallback, null, null, null, ess);
-	}
-
-	public Trade(final double money, final IEssentials ess)
-	{
-		this(null, null, money, null, null, ess);
-	}
-
-	public Trade(final ItemStack items, final IEssentials ess)
-	{
-		this(null, null, null, items, null, ess);
-	}
-
-	public Trade(final int exp, final IEssentials ess)
-	{
-		this(null, null, null, null, exp, ess);
-	}
-
-	private Trade(final String command, final String fallback, final Double money, final ItemStack item, final Integer exp, final IEssentials ess)
-	{
-		this.command = command;
-		this.fallbackCommand = fallback;
-		this.money = money;
-		this.itemStack = item;
-		this.exp = exp;
-		this.ess = ess;
-	}
-
-	public void isAffordableFor(final IUser user) throws ChargeException
-	{
-		if (getMoney() != null
-			&& getMoney() > 0
-			&& !user.canAfford(getMoney()))
-		{
-			throw new ChargeException(_("notEnoughMoney"));
-		}
-
-		if (getItemStack() != null
-			&& !InventoryWorkaround.containsItem(user.getInventory(), true, true, itemStack))
-		{
-			throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
-		}
-
-		double money;
-		if (command != null && !command.isEmpty()
-			&& 0 < (money = getCommandCost(user))
-			&& !user.canAfford(money))
-		{
-			throw new ChargeException(_("notEnoughMoney"));
-		}
-
-		if (exp != null && exp > 0
-			&& SetExpFix.getTotalExperience(user) < exp)
-		{
-			throw new ChargeException(_("notEnoughExperience"));
-		}
-	}
-
-	public void pay(final IUser user)
-	{
-		pay(user, true);
-	}
-
-	public boolean pay(final IUser user, final boolean dropItems)
-	{
-		boolean success = true;
-		if (getMoney() != null && getMoney() > 0)
-		{
-			user.giveMoney(getMoney());
-		}
-		if (getItemStack() != null)
-		{
-			if (dropItems)
-			{
-				final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItem(user.getInventory(), true, getItemStack());
-				final Location loc = user.getLocation();
-				for (ItemStack itemStack : leftOver.values())
-				{
-					final int maxStackSize = itemStack.getType().getMaxStackSize();
-					final int stacks = itemStack.getAmount() / maxStackSize;
-					final int leftover = itemStack.getAmount() % maxStackSize;
-					final Item[] itemStacks = new Item[stacks + (leftover > 0 ? 1 : 0)];
-					for (int i = 0; i < stacks; i++)
-					{
-						final ItemStack stack = itemStack.clone();
-						stack.setAmount(maxStackSize);
-						itemStacks[i] = loc.getWorld().dropItem(loc, stack);
-					}
-					if (leftover > 0)
-					{
-						final ItemStack stack = itemStack.clone();
-						stack.setAmount(leftover);
-						itemStacks[stacks] = loc.getWorld().dropItem(loc, stack);
-					}
-				}
-			}
-			else
-			{
-				success = InventoryWorkaround.addAllItems(user.getInventory(), true, getItemStack());
-			}
-			user.updateInventory();
-		}
-		if (getExperience() != null)
-		{
-			SetExpFix.setTotalExperience(user, SetExpFix.getTotalExperience(user) + getExperience());
-		}
-		return success;
-	}
-
-	public void charge(final IUser user) throws ChargeException
-	{
-		if (getMoney() != null)
-		{
-			if (!user.canAfford(getMoney()) && getMoney() > 0)
-			{
-				throw new ChargeException(_("notEnoughMoney"));
-			}
-			user.takeMoney(getMoney());
-		}
-		if (getItemStack() != null)
-		{
-			if (!InventoryWorkaround.containsItem(user.getInventory(), true, true, itemStack))
-			{
-				throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
-			}
-			InventoryWorkaround.removeItem(user.getInventory(), true, true, getItemStack());
-			user.updateInventory();
-		}
-		if (command != null)
-		{
-			final double cost = getCommandCost(user);
-			if (!user.canAfford(cost) && cost > 0)
-			{
-				throw new ChargeException(_("notEnoughMoney"));
-			}
-			user.takeMoney(cost);
-		}
-		if (getExperience() != null)
-		{
-			final int experience = SetExpFix.getTotalExperience(user);
-			if (experience < getExperience() && getExperience() > 0)
-			{
-				throw new ChargeException(_("notEnoughExperience"));
-			}
-			SetExpFix.setTotalExperience(user, experience - getExperience());
-		}
-	}
-
-	public Double getMoney()
-	{
-		return money;
-	}
-
-	public ItemStack getItemStack()
-	{
-		return itemStack;
-	}
-
-	public Integer getExperience()
-	{
-		return exp;
-	}
-
-	public Double getCommandCost(final IUser user)
-	{
-		double cost = 0d;
-		if (command != null && !command.isEmpty()
-			&& !user.isAuthorized("essentials.nocommandcost.all")
-			&& !user.isAuthorized("essentials.nocommandcost." + command))
-		{
-			cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
-			if (cost == 0.0 && fallbackCommand != null && !fallbackCommand.isEmpty())
-			{
-				cost = ess.getSettings().getCommandCost(fallbackCommand.charAt(0) == '/' ? fallbackCommand.substring(1) : fallbackCommand);
-			}
-		}
-		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)
-	{
-		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,697 +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 java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-
-public class User extends UserData implements Comparable<User>, IReplyTo, IUser
-{
-	private CommandSender replyTo = null;
-	private transient User teleportRequester;
-	private transient boolean teleportRequestHere;
-	private transient boolean vanished;
-	private transient final Teleport teleport;
-	private transient long teleportRequestTime;
-	private transient long lastOnlineActivity;
-	private transient long lastThrottledAction;
-	private transient long lastActivity = System.currentTimeMillis();
-	private boolean hidden = false;
-	private transient Location afkPosition = null;
-	private boolean invSee = false;
-	private static final Logger logger = Logger.getLogger("Minecraft");
-
-	User(final Player base, final IEssentials ess)
-	{
-		super(base, ess);
-		teleport = new Teleport(this, ess);
-		if (isAfk())
-		{
-			afkPosition = getLocation();
-		}
-	}
-
-	User update(final Player base)
-	{
-		setBase(base);
-		return this;
-	}
-
-	@Override
-	public boolean isAuthorized(final IEssentialsCommand cmd)
-	{
-		return isAuthorized(cmd, "essentials.");
-	}
-
-	@Override
-	public boolean isAuthorized(final IEssentialsCommand cmd, final String permissionPrefix)
-	{
-		return isAuthorized(permissionPrefix + (cmd.getName().equals("r") ? "msg" : cmd.getName()));
-	}
-
-	@Override
-	public boolean isAuthorized(final String node)
-	{
-		if (ess.getSettings().isDebug())
-		{
-			ess.getLogger().log(Level.INFO, "checking if " + base.getName() + " has " + node);
-		}
-		if (base instanceof OfflinePlayer)
-		{
-			return false;
-		}
-
-		if (isOp())
-		{
-			return true;
-		}
-
-		if (isJailed())
-		{
-			return false;
-		}
-
-		try
-		{
-			return ess.getPermissionsHandler().hasPermission(base, node);
-		}
-		catch (Exception ex)
-		{
-			ess.getLogger().log(Level.SEVERE, "Permission System Error: " + ess.getPermissionsHandler().getName() + " returned: " + ex.getMessage());
-			return false;
-		}
-	}
-
-	public void healCooldown() throws Exception
-	{
-		final Calendar now = new GregorianCalendar();
-		if (getLastHealTimestamp() > 0)
-		{
-			final double cooldown = ess.getSettings().getHealCooldown();
-			final Calendar cooldownTime = new GregorianCalendar();
-			cooldownTime.setTimeInMillis(getLastHealTimestamp());
-			cooldownTime.add(Calendar.SECOND, (int)cooldown);
-			cooldownTime.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
-			if (cooldownTime.after(now) && !isAuthorized("essentials.heal.cooldown.bypass"))
-			{
-				throw new Exception(_("timeBeforeHeal", Util.formatDateDiff(cooldownTime.getTimeInMillis())));
-			}
-		}
-		setLastHealTimestamp(now.getTimeInMillis());
-	}
-
-	@Override
-	public void giveMoney(final double value)
-	{
-		giveMoney(value, null);
-	}
-
-	public void giveMoney(final double value, final CommandSender initiator)
-	{
-		if (value == 0)
-		{
-			return;
-		}
-		setMoney(getMoney() + value);
-		sendMessage(_("addedToAccount", Util.displayCurrency(value, ess)));
-		if (initiator != null)
-		{
-			initiator.sendMessage(_("addedToOthersAccount", Util.displayCurrency(value, ess), this.getDisplayName(), Util.displayCurrency(getMoney(), ess)));
-		}
-	}
-
-	public void payUser(final User reciever, final double value) throws Exception
-	{
-		if (value == 0)
-		{
-			return;
-		}
-		if (canAfford(value))
-		{
-			setMoney(getMoney() - value);
-			reciever.setMoney(reciever.getMoney() + value);
-			sendMessage(_("moneySentTo", Util.displayCurrency(value, ess), reciever.getDisplayName()));
-			reciever.sendMessage(_("moneyRecievedFrom", Util.displayCurrency(value, ess), getDisplayName()));
-		}
-		else
-		{
-			throw new Exception(_("notEnoughMoney"));
-		}
-	}
-
-	@Override
-	public void takeMoney(final double value)
-	{
-		takeMoney(value, null);
-	}
-
-	public void takeMoney(final double value, final CommandSender initiator)
-	{
-		if (value == 0)
-		{
-			return;
-		}
-		setMoney(getMoney() - value);
-		sendMessage(_("takenFromAccount", Util.displayCurrency(value, ess)));
-		if (initiator != null)
-		{
-			initiator.sendMessage(_("takenFromOthersAccount", Util.displayCurrency(value, ess), this.getDisplayName(), Util.displayCurrency(getMoney(), ess)));
-		}
-	}
-
-	@Override
-	public boolean canAfford(final double cost)
-	{
-		return canAfford(cost, true);
-	}
-
-	public boolean canAfford(final double cost, final boolean permcheck)
-	{
-		final double mon = getMoney();
-		if (!permcheck || isAuthorized("essentials.eco.loan"))
-		{
-			return (mon - cost) >= ess.getSettings().getMinMoney();
-		}
-		return cost <= mon;
-	}
-
-	public void dispose()
-	{
-		this.base = new OfflinePlayer(getName(), ess);
-	}
-
-	@Override
-	public void setReplyTo(final CommandSender user)
-	{
-		replyTo = user;
-	}
-
-	@Override
-	public CommandSender getReplyTo()
-	{
-		return replyTo;
-	}
-
-	@Override
-	public int compareTo(final User other)
-	{
-		return Util.stripFormat(this.getDisplayName()).compareToIgnoreCase(Util.stripFormat(other.getDisplayName()));
-	}
-
-	@Override
-	public boolean equals(final Object object)
-	{
-		if (!(object instanceof User))
-		{
-			return false;
-		}
-		return this.getName().equalsIgnoreCase(((User)object).getName());
-
-	}
-
-	@Override
-	public int hashCode()
-	{
-		return this.getName().hashCode();
-	}
-
-	public Boolean canSpawnItem(final int itemId)
-	{
-		return !ess.getSettings().itemSpawnBlacklist().contains(itemId);
-	}
-
-	public Location getHome() throws Exception
-	{
-		return getHome(getHomes().get(0));
-	}
-
-	public void setHome()
-	{
-		setHome("home", getLocation());
-	}
-
-	public void setHome(final String name)
-	{
-		setHome(name, getLocation());
-	}
-
-	@Override
-	public void setLastLocation()
-	{
-		setLastLocation(getLocation());
-	}
-
-	public void requestTeleport(final User player, final boolean here)
-	{
-		teleportRequestTime = System.currentTimeMillis();
-		teleportRequester = player;
-		teleportRequestHere = here;
-	}
-
-	public User getTeleportRequest()
-	{
-		return teleportRequester;
-	}
-
-	public boolean isTpRequestHere()
-	{
-		return teleportRequestHere;
-	}
-
-	public String getNick(final boolean longnick)
-	{
-		final StringBuilder prefix = new StringBuilder();
-		String nickname;
-		String suffix = "";
-		final String nick = getNickname();
-		if (ess.getSettings().isCommandDisabled("nick") || nick == null || nick.isEmpty() || nick.equals(getName()))
-		{
-			nickname = getName();
-		}
-		else
-		{
-			nickname = ess.getSettings().getNicknamePrefix() + nick;
-		}
-
-		if (isOp())
-		{
-			try
-			{
-				final ChatColor opPrefix = ess.getSettings().getOperatorColor();
-				if (opPrefix != null && opPrefix.toString().length() > 0)
-				{
-					prefix.insert(0, opPrefix.toString());
-					suffix = "§f";
-				}
-			}
-			catch (Exception e)
-			{
-			}
-		}
-
-		if (ess.getSettings().addPrefixSuffix())
-		{
-			if (!ess.getSettings().disablePrefix())
-			{
-				final String ptext = ess.getPermissionsHandler().getPrefix(base).replace('&', '§');
-				prefix.insert(0, ptext);
-				suffix = "§f";
-			}
-			if (!ess.getSettings().disableSuffix())
-			{
-				final String stext = ess.getPermissionsHandler().getSuffix(base).replace('&', '§');
-				suffix = stext + "§f";
-				suffix = suffix.replace("§f§f", "§f");
-			}
-		}
-		final String strPrefix = prefix.toString();
-		String output = strPrefix + nickname + suffix;
-		if (!longnick && output.length() > 16)
-		{
-			output = strPrefix + nickname;
-		}
-		if (!longnick && output.length() > 16)
-		{
-			output = Util.lastCode(strPrefix) + nickname;
-		}
-		if (!longnick && output.length() > 16)
-		{
-			output = Util.lastCode(strPrefix) + nickname.substring(0, 14);
-		}
-		if (output.charAt(output.length() - 1) == '§')
-		{
-			output = output.substring(0, output.length() - 1);
-		}
-		return output;
-	}
-
-	public void setDisplayNick()
-	{
-		if (base.isOnline() && ess.getSettings().changeDisplayName())
-		{
-			setDisplayName(getNick(true));
-			if (ess.getSettings().changePlayerListName())
-			{
-				String name = getNick(false);
-				try
-				{
-					setPlayerListName(name);
-				}
-				catch (IllegalArgumentException e)
-				{
-					if (ess.getSettings().isDebug())
-					{
-						logger.log(Level.INFO, "Playerlist for " + name + " was not updated. Name clashed with another online player.");
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	public String getDisplayName()
-	{
-		return super.getDisplayName() == null ? super.getName() : super.getDisplayName();
-	}
-
-	@Override
-	public Teleport getTeleport()
-	{
-		return teleport;
-	}
-
-	public long getLastOnlineActivity()
-	{
-		return lastOnlineActivity;
-	}
-
-	public void setLastOnlineActivity(final long timestamp)
-	{
-		lastOnlineActivity = timestamp;
-	}
-
-	@Override
-	public double getMoney()
-	{
-		if (ess.getPaymentMethod().hasMethod())
-		{
-			try
-			{
-				final Method method = ess.getPaymentMethod().getMethod();
-				if (!method.hasAccount(this.getName()))
-				{
-					throw new Exception();
-				}
-				final Method.MethodAccount account = ess.getPaymentMethod().getMethod().getAccount(this.getName());
-				return account.balance();
-			}
-			catch (Throwable ex)
-			{
-			}
-		}
-		return super.getMoney();
-	}
-
-	@Override
-	public void setMoney(final double value)
-	{
-		if (ess.getPaymentMethod().hasMethod())
-		{
-			try
-			{
-				final Method method = ess.getPaymentMethod().getMethod();
-				if (!method.hasAccount(this.getName()))
-				{
-					throw new Exception();
-				}
-				final Method.MethodAccount account = ess.getPaymentMethod().getMethod().getAccount(this.getName());
-				account.set(value);
-			}
-			catch (Throwable ex)
-			{
-			}
-		}
-		super.setMoney(value);
-		Trade.log("Update", "Set", "API", getName(), new Trade(value, ess), null, null, null, ess);
-	}
-
-	public void updateMoneyCache(final double value)
-	{
-		if (ess.getPaymentMethod().hasMethod() && super.getMoney() != value)
-		{
-			super.setMoney(value);
-		}
-	}
-
-	@Override
-	public void setAfk(final boolean set)
-	{
-		this.setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : set);
-		if (set && !isAfk())
-		{
-			afkPosition = getLocation();
-		}
-		else if (!set && isAfk())
-		{
-			afkPosition = null;
-		}
-		super.setAfk(set);
-	}
-
-	@Override
-	public boolean toggleAfk()
-	{
-		final boolean now = super.toggleAfk();
-		this.setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : now);
-		return now;
-	}
-
-	@Override
-	public boolean isHidden()
-	{
-		return hidden;
-	}
-
-	public void setHidden(final boolean hidden)
-	{
-		this.hidden = hidden;
-		if (hidden == true)
-		{
-			setLastLogout(getLastOnlineActivity());
-		}
-	}
-
-	//Returns true if status expired during this check
-	public boolean checkJailTimeout(final long currentTime)
-	{
-		if (getJailTimeout() > 0 && getJailTimeout() < currentTime && isJailed())
-		{
-			setJailTimeout(0);
-			setJailed(false);
-			sendMessage(_("haveBeenReleased"));
-			setJail(null);
-			try
-			{
-				getTeleport().back();
-			}
-			catch (Exception ex)
-			{
-			}
-			return true;
-		}
-		return false;
-	}
-
-	//Returns true if status expired during this check
-	public boolean checkMuteTimeout(final long currentTime)
-	{
-		if (getMuteTimeout() > 0 && getMuteTimeout() < currentTime && isMuted())
-		{
-			setMuteTimeout(0);
-			sendMessage(_("canTalkAgain"));
-			setMuted(false);
-			return true;
-		}
-		return false;
-	}
-
-	//Returns true if status expired during this check
-	public boolean checkBanTimeout(final long currentTime)
-	{
-		if (getBanTimeout() > 0 && getBanTimeout() < currentTime && isBanned())
-		{
-			setBanTimeout(0);
-			setBanned(false);
-			return true;
-		}
-		return false;
-	}
-
-	public void updateActivity(final boolean broadcast)
-	{
-		if (isAfk())
-		{
-			setAfk(false);
-			if (broadcast && !isHidden())
-			{
-				setDisplayNick();
-				ess.broadcastMessage(this, _("userIsNotAway", getDisplayName()));
-			}
-		}
-		lastActivity = System.currentTimeMillis();
-	}
-
-	public void checkActivity()
-	{
-		final long autoafkkick = ess.getSettings().getAutoAfkKick();
-		if (autoafkkick > 0 && lastActivity > 0 && (lastActivity + (autoafkkick * 1000)) < System.currentTimeMillis()
-			&& !isHidden() && !isAuthorized("essentials.kick.exempt") && !isAuthorized("essentials.afk.kickexempt"))
-		{
-			final String kickReason = _("autoAfkKickReason", autoafkkick / 60.0);
-			lastActivity = 0;
-			kickPlayer(kickReason);
-
-
-			for (Player player : ess.getServer().getOnlinePlayers())
-			{
-				final User user = ess.getUser(player);
-				if (user.isAuthorized("essentials.kick.notify"))
-				{
-					player.sendMessage(_("playerKicked", Console.NAME, getName(), kickReason));
-				}
-			}
-		}
-		final long autoafk = ess.getSettings().getAutoAfk();
-		if (!isAfk() && autoafk > 0 && lastActivity + autoafk * 1000 < System.currentTimeMillis() && isAuthorized("essentials.afk"))
-		{
-			setAfk(true);
-			if (!isHidden())
-			{
-				setDisplayNick();
-				ess.broadcastMessage(this, _("userIsAway", getDisplayName()));
-			}
-		}
-	}
-
-	public Location getAfkPosition()
-	{
-		return afkPosition;
-	}
-
-	@Override
-	public boolean isGodModeEnabled()
-	{
-		return (super.isGodModeEnabled() && !ess.getSettings().getNoGodWorlds().contains(getLocation().getWorld().getName()))
-			   || (isAfk() && ess.getSettings().getFreezeAfkPlayers());
-	}
-
-	public boolean isGodModeEnabledRaw()
-	{
-		return super.isGodModeEnabled();
-	}
-
-	@Override
-	public String getGroup()
-	{
-		return ess.getPermissionsHandler().getGroup(base);
-	}
-
-	public boolean inGroup(final String group)
-	{
-		return ess.getPermissionsHandler().inGroup(base, group);
-	}
-
-	public boolean canBuild()
-	{
-		if (isOp())
-		{
-			return true;
-		}
-		return ess.getPermissionsHandler().canBuild(base, getGroup());
-	}
-
-	public long getTeleportRequestTime()
-	{
-		return teleportRequestTime;
-	}
-
-	public boolean isInvSee()
-	{
-		return invSee;
-	}
-
-	public void setInvSee(final boolean set)
-	{
-		invSee = set;
-	}
-	private transient long teleportInvulnerabilityTimestamp = 0;
-
-	public void enableInvulnerabilityAfterTeleport()
-	{
-		final long time = ess.getSettings().getTeleportInvulnerability();
-		if (time > 0)
-		{
-			teleportInvulnerabilityTimestamp = System.currentTimeMillis() + time;
-		}
-	}
-
-	public void resetInvulnerabilityAfterTeleport()
-	{
-		if (teleportInvulnerabilityTimestamp != 0
-			&& teleportInvulnerabilityTimestamp < System.currentTimeMillis())
-		{
-			teleportInvulnerabilityTimestamp = 0;
-		}
-	}
-
-	public boolean hasInvulnerabilityAfterTeleport()
-	{
-		return teleportInvulnerabilityTimestamp != 0 && teleportInvulnerabilityTimestamp >= System.currentTimeMillis();
-	}
-
-	public boolean isVanished()
-	{
-		return vanished;
-	}
-
-	public void setVanished(final boolean set)
-	{
-		vanished = set;
-		if (set)
-		{
-			for (Player p : ess.getServer().getOnlinePlayers())
-			{
-				if (!ess.getUser(p).isAuthorized("essentials.vanish.see"))
-				{
-					p.hidePlayer(getBase());
-				}
-			}
-			setHidden(true);
-			ess.getVanishedPlayers().add(getName());
-		}
-		else
-		{
-			for (Player p : ess.getServer().getOnlinePlayers())
-			{
-				p.showPlayer(getBase());
-			}
-			setHidden(false);
-			ess.getVanishedPlayers().remove(getName());
-		}
-	}
-
-	public void toggleVanished()
-	{
-		final boolean set = !vanished;
-		this.setVanished(set);
-	}
-
-	public boolean checkSignThrottle()
-	{
-		if (isSignThrottled())
-		{
-			return true;
-		}
-		updateThrottle();
-		return false;
-	}
-
-	public boolean isSignThrottled()
-	{
-		final long minTime = lastThrottledAction + (1000 / ess.getSettings().getSignUsePerSecond());
-		return (System.currentTimeMillis() < minTime);
-	}
-
-	public void updateThrottle()
-	{
-		lastThrottledAction = System.currentTimeMillis();;
-	}
-}

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

@@ -1,809 +0,0 @@
-package com.earth2me.essentials;
-
-import static com.earth2me.essentials.I18n._;
-import java.io.File;
-import java.util.*;
-import org.bukkit.Location;
-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;
-
-	protected UserData(Player base, IEssentials ess)
-	{
-		super(base);
-		this.ess = ess;
-		File folder = new File(ess.getDataFolder(), "userdata");
-		if (!folder.exists())
-		{
-			folder.mkdirs();
-		}
-		config = new EssentialsConf(new File(folder, Util.sanitizeFileName(base.getName()) + ".yml"));
-		reloadConfig();
-	}
-
-	@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();
-		ignoredPlayers = getIgnoredPlayers();
-		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();
-	}
-	private double money;
-
-	private double _getMoney()
-	{
-		double money = ess.getSettings().getStartingBalance();
-		if (config.hasProperty("money"))
-		{
-			money = config.getDouble("money", money);
-		}
-		if (Math.abs(money) > ess.getSettings().getMaxMoney())
-		{
-			money = money < 0 ? -ess.getSettings().getMaxMoney() : ess.getSettings().getMaxMoney();
-		}
-		return money;
-	}
-
-	public double getMoney()
-	{
-		return money;
-	}
-
-	public void setMoney(double value)
-	{
-		money = value;
-		if (Math.abs(money) > ess.getSettings().getMaxMoney())
-		{
-			money = money < 0 ? -ess.getSettings().getMaxMoney() : ess.getSettings().getMaxMoney();
-		}
-		config.setProperty("money", value);
-		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>();
-	}
-
-	public Location getHome(String name) throws Exception
-	{
-		Location loc = config.getLocation("homes." + name, getServer());
-		if (loc == null)
-		{
-			try
-			{
-				loc = config.getLocation("homes." + getHomes().get(Integer.parseInt(name) - 1), getServer());
-			}
-			catch (IndexOutOfBoundsException e)
-			{
-				return null;
-			}
-			catch (NumberFormatException e)
-			{
-				return null;
-			}
-		}
-
-		return loc;
-	}
-
-	public Location getHome(final Location world)
-	{
-		try
-		{
-			Location loc;
-			for (String home : getHomes())
-			{
-				loc = config.getLocation("homes." + home, getServer());
-				if (world.getWorld() == loc.getWorld())
-				{
-					return loc;
-				}
-
-			}
-			loc = config.getLocation("homes." + getHomes().get(0), getServer());
-			return loc;
-		}
-		catch (Exception ex)
-		{
-			return null;
-		}
-	}
-
-	public List<String> getHomes()
-	{
-		return new ArrayList<String>(homes.keySet());
-	}
-
-	public void setHome(String name, Location loc)
-	{
-		//Invalid names will corrupt the yaml
-		name = Util.sanitizeFileName(name);
-		homes.put(name, loc);
-		config.setProperty("homes." + name, loc);
-		config.save();
-	}
-
-	public void delHome(String name) throws Exception
-	{
-		String search = name;
-		if (!homes.containsKey(search))
-		{
-			search = Util.sanitizeFileName(name);
-		}
-		if (homes.containsKey(search))
-		{
-			homes.remove(name);
-			config.removeProperty("homes." + name);
-			config.save();
-		}
-		else
-		{
-			throw new Exception(_("invalidHome", name));
-		}
-	}
-
-	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 (Exception 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 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();
-	}
-
-	public boolean toggleTeleportEnabled()
-	{
-		boolean ret = !isTeleportEnabled();
-		setTeleportEnabled(ret);
-		return ret;
-	}
-
-	public boolean toggleSocialSpy()
-	{
-		boolean ret = !isSocialSpyEnabled();
-		setSocialSpyEnabled(ret);
-		return ret;
-	}
-	private List<String> ignoredPlayers;
-
-	public List<String> getIgnoredPlayers()
-	{
-		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.isOnline())
-		{
-			return false;
-		}
-		return isIgnoredPlayer(user);
-	}
-
-	public boolean isIgnoredPlayer(IUser user)
-	{
-		return (ignoredPlayers.contains(user.getName().toLowerCase(Locale.ENGLISH)) && !user.isAuthorized("essentials.chat.ignoreexempt"));
-	}
-
-	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 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", Util.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);
-		_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, Object> kitTimestamps;
-
-	private Map<String, Object> _getKitTimestamps()
-	{
-
-		if (config.isConfigurationSection("timestamps.kits"))
-		{
-			return config.getConfigurationSection("timestamps.kits").getValues(false);
-		}
-		return new HashMap<String, Object>();
-	}
-
-	public Long getKitTimestamp(final String name)
-	{
-		final Number num = (Number)kitTimestamps.get(name.toLowerCase(Locale.ENGLISH));
-		return num == null ? null : num.longValue();
-	}
-
-	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 save()
-	{
-		config.save();
-	}
-}

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

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

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

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

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

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

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

@@ -1,61 +0,0 @@
-package com.earth2me.essentials;
-
-import java.io.File;
-import java.util.Locale;
-import java.util.logging.Logger;
-import org.bukkit.inventory.ItemStack;
-
-
-public class Worth implements IConf
-{
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	private final EssentialsConf config;
-
-	public Worth(File dataFolder)
-	{
-		config = new EssentialsConf(new File(dataFolder, "worth.yml"));
-		config.setTemplateName("/worth.yml");
-		config.load();
-	}
-
-	public double getPrice(ItemStack itemStack)
-	{
-		String itemname = itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
-		double result;
-		result = config.getDouble("worth." + itemname + "." + itemStack.getDurability(), Double.NaN);
-		if (Double.isNaN(result))
-		{
-			result = config.getDouble("worth." + itemname + ".0", Double.NaN);
-		}
-		if (Double.isNaN(result))
-		{
-			result = config.getDouble("worth." + itemname, Double.NaN);
-		}
-		if (Double.isNaN(result))
-		{
-			result = config.getDouble("worth-" + itemStack.getTypeId(), Double.NaN);
-		}
-		return result;
-	}
-
-	public void setPrice(ItemStack itemStack, double price)
-	{
-		if (itemStack.getType().getData() == null)
-		{
-			config.setProperty("worth." + itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), price);
-		}
-		else
-		{
-			// Bukkit-bug: getDurability still contains the correct value, while getData().getData() is 0.
-			config.setProperty("worth." + itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "") + "." + itemStack.getDurability(), price);
-		}
-		config.removeProperty("worth-" + itemStack.getTypeId());
-		config.save();
-	}
-
-	@Override
-	public void reloadConfig()
-	{
-		config.load();
-	}
-}

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

@@ -1,311 +0,0 @@
-package com.earth2me.essentials.api;
-
-import com.earth2me.essentials.EssentialsConf;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.IEssentials;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
-import java.io.File;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.entity.Player;
-
-
-/**
- * Instead of using this api directly, we recommend to use the register plugin:
- * http://bit.ly/RegisterMethod
- */
-public final class Economy
-{
-	private Economy()
-	{
-	}
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	private static IEssentials ess;
-	private static final String noCallBeforeLoad = "Essentials API is called before Essentials is loaded.";
-
-	/**
-	 * @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, Util.sanitizeFileName(name) + ".yml"));
-		npcConfig.load();
-		npcConfig.setProperty("npc", true);
-		npcConfig.setProperty("money", ess.getSettings().getStartingBalance());
-		npcConfig.save();
-	}
-
-	private static void deleteNPC(String name)
-	{
-		File folder = new File(ess.getDataFolder(), "userdata");
-		if (!folder.exists())
-		{
-			folder.mkdirs();
-		}
-		File config = new File(folder, Util.sanitizeFileName(name) + ".yml");
-		EssentialsConf npcConfig = new EssentialsConf(config);
-		npcConfig.load();
-		if (npcConfig.hasProperty("npc") && npcConfig.getBoolean("npc", false))
-		{
-			if (!config.delete())
-			{
-				logger.log(Level.WARNING, _("deleteFileError", config));
-			}
-			ess.getUserMap().removeUser(name);
-		}
-	}
-
-	private static User getUserByName(String name)
-	{
-		if (ess == null)
-		{
-			throw new RuntimeException(noCallBeforeLoad);
-		}
-		User user;
-		Player player = ess.getServer().getPlayer(name);
-		if (player != null)
-		{
-			user = ess.getUser(player);
-		}
-		else
-		{
-			user = ess.getOfflineUser(name);
-		}
-		return user;
-	}
-
-	/**
-	 * Returns the balance of a user
-	 * @param name Name of the user
-	 * @return balance
-	 * @throws UserDoesNotExistException 
-	 */
-	public static double getMoney(String name) throws UserDoesNotExistException
-	{
-		User user = getUserByName(name);
-		if (user == null)
-		{
-			throw new UserDoesNotExistException(name);
-		}
-		return user.getMoney();
-	}
-
-	/**
-	 * Sets the balance of a user
-	 * @param name Name of the user
-	 * @param balance The balance you want to set
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
-	 */
-	public static void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		User user = getUserByName(name);
-		if (user == null)
-		{
-			throw new UserDoesNotExistException(name);
-		}
-		if (balance < ess.getSettings().getMinMoney())
-		{
-			throw new NoLoanPermittedException();
-		}
-		if (balance < 0.0 && !user.isAuthorized("essentials.eco.loan"))
-		{
-			throw new NoLoanPermittedException();
-		}
-		user.setMoney(balance);
-	}
-
-	/**
-	 * Adds money to the balance of a user
-	 * @param name Name of the user
-	 * @param amount The money you want to add
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 * @throws NoLoanPermittedException If the user is not allowed to have a negative balance
-	 */
-	public static void add(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		double result = getMoney(name) + amount;
-		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
-	 */
-	public static void subtract(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		double result = getMoney(name) - amount;
-		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
-	 */
-	public static void divide(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		double result = getMoney(name) / value;
-		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
-	 */
-	public static void multiply(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException
-	{
-		double result = getMoney(name) * value;
-		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
-	 */
-	public static boolean hasEnough(String name, double amount) throws UserDoesNotExistException
-	{
-		return amount <= getMoney(name);
-	}
-
-	/**
-	 * @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
-	 */
-	public static boolean hasMore(String name, double amount) throws UserDoesNotExistException
-	{
-		return amount < getMoney(name);
-	}
-
-	/**
-	 * @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
-	 */
-	public static boolean hasLess(String name, double amount) throws UserDoesNotExistException
-	{
-		return amount > getMoney(name);
-	}
-
-	/**
-	 * Test if the user has a negative balance
-	 * @param name Name of the user
-	 * @return true, if the user has a negative balance
-	 * @throws UserDoesNotExistException If a user by that name does not exists
-	 */
-	public static boolean isNegative(String name) throws UserDoesNotExistException
-	{
-		return getMoney(name) < 0.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
-	 */
-	public static String format(double amount)
-	{
-		if (ess == null)
-		{
-			throw new RuntimeException(noCallBeforeLoad);
-		}
-		return Util.displayCurrency(amount, ess);
-	}
-
-	/**
-	 * Test if a player exists to avoid the UserDoesNotExistException
-	 * @param name Name of the user
-	 * @return true, if the user exists
-	 */
-	public static boolean playerExists(String name)
-	{
-		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/IAlternativeCommandsHandler.java

@@ -1,10 +0,0 @@
-package com.earth2me.essentials.api;
-
-import java.util.Map;
-import org.bukkit.command.PluginCommand;
-
-
-public interface IAlternativeCommandsHandler
-{	
-	Map<String, String> disabledCommands();
-}

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

@@ -1,51 +0,0 @@
-package com.earth2me.essentials.api;
-
-import com.earth2me.essentials.perm.IPermissionsHandler;
-import com.earth2me.essentials.register.payment.Methods;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
-
-
-public interface IEssentials extends Plugin, IReload
-{
-	void addReloadListener(IReload listener);
-
-	IUser getUser(Object base);
-
-	int broadcastMessage(IUser sender, String message);
-
-	II18n getI18n();
-
-	ISettings getSettings();
-
-	IJails getJail();
-
-	IWarps getWarps();
-
-	IWorth getWorth();
-
-	IItemDb getItemDb();
-
-	IUserMap getUserMap();
-
-	IEssentialsEconomy getEconomy();
-
-	World getWorld(String name);
-
-	Methods getPaymentMethod();
-
-	int scheduleAsyncDelayedTask(Runnable run);
-
-	int scheduleSyncDelayedTask(Runnable run);
-
-	int scheduleSyncDelayedTask(Runnable run, long delay);
-
-	int scheduleSyncRepeatingTask(Runnable run, long delay, long period);
-
-	IPermissionsHandler getPermissionsHandler();
-
-	IAlternativeCommandsHandler getAlternativeCommandsHandler();
-
-	void showCommandError(CommandSender sender, String commandLabel, Throwable exception);
-}

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

@@ -1,37 +0,0 @@
-package com.earth2me.essentials.api;
-
-
-public interface IEssentialsEconomy
-{
-	double getMoney(String name) throws UserDoesNotExistException;
-
-	void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException;
-
-	void add(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException;
-
-	void subtract(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException;
-
-	void divide(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException;
-
-	void multiply(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException;
-
-	void resetBalance(String name) throws UserDoesNotExistException, NoLoanPermittedException;
-
-	boolean hasEnough(String name, double amount) throws UserDoesNotExistException;
-
-	boolean hasMore(String name, double amount) throws UserDoesNotExistException;
-
-	boolean hasLess(String name, double amount) throws UserDoesNotExistException;
-
-	boolean isNegative(String name) throws UserDoesNotExistException;
-
-	String format(double amount);
-
-	boolean playerExists(String name);
-
-	boolean isNPC(String name) throws UserDoesNotExistException;
-
-	boolean createNPC(String name);
-
-	void removeNPC(String name) throws UserDoesNotExistException;
-}

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

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

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

@@ -1,11 +0,0 @@
-package com.earth2me.essentials.api;
-
-import org.bukkit.inventory.ItemStack;
-
-
-public interface IItemDb
-{
-	ItemStack get(final String name, final int quantity) throws Exception;
-	
-	ItemStack get(final String name) throws Exception;
-}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,20 +0,0 @@
-package com.earth2me.essentials.api;
-
-import java.io.File;
-import java.util.Set;
-
-
-public interface IUserMap
-{
-	boolean userExists(final String name);
-
-	IUser getUser(final String name);
-
-	void removeUser(final String name);
-
-	Set<String> getAllUniqueUsers();
-
-	int getUniqueUsers();
-
-	File getUserFile(final String name);
-}

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

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

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

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

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

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

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

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

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

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

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.Util;
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.entity.TNTPrimed;
-
-
-public class Commandantioch extends EssentialsCommand
-{
-	public Commandantioch()
-	{
-		super("antioch");
-	}
-
-	@Override
-	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length > 0)
-		{
-			ess.broadcastMessage(user, "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,");
-			ess.broadcastMessage(user, "who being naughty in My sight, shall snuff it.");
-		}		
-
-		final Location loc = Util.getTarget(user);
-		loc.getWorld().spawn(loc, TNTPrimed.class);
-	}
-}

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

@@ -1,30 +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.getWorld() != user.getLastLocation().getWorld() && ess.getSettings().isWorldTeleportPermissions()
-			&& !user.isAuthorized("essentials.world." + user.getLastLocation().getWorld().getName()))
-		{
-			throw new Exception(_("noPerm", "essentials.world." + 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 static com.earth2me.essentials.I18n._;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandbackup extends EssentialsCommand
-{
-	public Commandbackup()
-	{
-		super("backup");
-	}
-
-	@Override
-	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		final Backup backup = ess.getBackup();
-		if (backup == null)
-		{
-			throw new Exception(_("backupDisabled"));
-		}
-		final String command = ess.getSettings().getBackupCommand();
-		if (command == null || "".equals(command) || "save-all".equalsIgnoreCase(command))
-		{
-			throw new Exception(_("backupDisabled"));
-		}
-		backup.run();
-		sender.sendMessage(_("backupStarted"));
-	}
-}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,51 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.User;
-import java.util.ArrayList;
-import java.util.List;
-import org.bukkit.Material;
-import org.bukkit.Server;
-import org.bukkit.block.Block;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.inventory.ItemStack;
-
-
-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,26 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-
-
-public class Commandbroadcast extends EssentialsCommand
-{
-	public Commandbroadcast()
-	{
-		super("broadcast");
-	}
-
-	@Override
-	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
-	{
-		if (args.length < 1)
-		{
-			throw new NotEnoughArgumentsException();
-		}
-
-		ess.broadcastMessage(null, _("broadcast", Util.replaceFormat(getFinalArg(args, 0))));
-	}
-}

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

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

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

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