Bump version to 2.17.2

\o/

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# Currently used
+patreon: EssentialsX
+ko_fi: essentialsx
+
+# Currently not used
+#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+#open_collective: # Replace with a single Open Collective username
+#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/workflows/build.yml

@@ -0,0 +1,41 @@
+name: Build EssentialsX
+
+on:
+  push:
+    branches: 
+    - 2.x
+    - mc/*
+  pull_request:
+    branches: 
+    - 2.x
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout Git repo
+      uses: actions/checkout@v1
+    - name: Restore Maven cache
+      uses: actions/cache@v1
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Run BuildTools
+      if: steps.cache.outputs.cache-hit != 'true'
+      run: chmod +x scripts/buildtools.sh && ./scripts/buildtools.sh
+    - name: Build with Maven
+      run: mvn package --file pom.xml
+    - name: Copy artifacts
+      run: mkdir -p ./out/ && cp -t ./out/ **/target/Essentials*.jar
+    - uses: actions/upload-artifact@master
+      with:
+        name: Plugin jars
+        path: out/

.travis.yml

@@ -1,10 +0,0 @@
-language: java
-
-cache:
-  directories:
-  - .buildtools
-  - $HOME/.m2
-
-before_install:
-  - chmod +x scripts/buildtools.sh
-  - scripts/buildtools.sh

Essentials/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.ess3</groupId>
         <artifactId>EssentialsXParent</artifactId>
-        <version>2.16.1</version>
+        <version>2.17.2</version>
     </parent>
 
     <artifactId>EssentialsX</artifactId>
@@ -49,7 +49,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>net.milkbowl.vault</groupId>
+            <groupId>com.github.milkbowl</groupId>
             <artifactId>VaultAPI</artifactId>
             <version>1.7</version>
             <scope>provided</scope>
@@ -63,19 +63,19 @@
         <dependency>
             <groupId>net.ess3</groupId>
             <artifactId>NMSProvider</artifactId>
-            <version>2.16.1</version>
+            <version>2.17.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.ess3</groupId>
             <artifactId>UpdatedMetaProvider</artifactId>
-            <version>2.16.1</version>
+            <version>2.17.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.ess3</groupId>
             <artifactId>1_8_R1Provider</artifactId>
-            <version>2.16.1</version>
+            <version>2.17.2</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>net.ess3</groupId>
             <artifactId>1_8_R2Provider</artifactId>
-            <version>2.16.1</version>
+            <version>2.17.2</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -99,19 +99,19 @@
         <dependency>
             <groupId>net.ess3</groupId>
             <artifactId>LegacyProvider</artifactId>
-            <version>2.16.1</version>
+            <version>2.17.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.ess3</groupId>
             <artifactId>ReflectionProvider</artifactId>
-            <version>2.16.1</version>
+            <version>2.17.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.ess3</groupId>
             <artifactId>FlattenedProvider</artifactId>
-            <version>2.16.1</version>
+            <version>2.17.2</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

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

@@ -25,12 +25,7 @@ public class Backup implements Runnable {
         this.ess = ess;
         server = ess.getServer();
         if (!ess.getOnlinePlayers().isEmpty()) {
-            ess.runTaskAsynchronously(new Runnable() {
-                @Override
-                public void run() {
-                    startTask();
-                }
-            });
+            ess.runTaskAsynchronously(this::startTask);
         }
     }
 

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

@@ -231,6 +231,26 @@ public class Enchantments {
             }
         } catch (IllegalArgumentException ignored) {}
 
+
+        try { // 1.14
+            Enchantment multishot = Enchantment.getByName("MULTISHOT");
+            if (multishot != null) {
+                ENCHANTMENTS.put("multishot", multishot);
+                ALIASENCHANTMENTS.put("tripleshot", multishot);
+            }
+            Enchantment quickCharge = Enchantment.getByName("QUICK_CHARGE");
+            if (quickCharge != null) {
+                ENCHANTMENTS.put("quickcharge", quickCharge);
+                ALIASENCHANTMENTS.put("quickdraw", quickCharge);
+                ALIASENCHANTMENTS.put("fastcharge", quickCharge);
+                ALIASENCHANTMENTS.put("fastdraw", quickCharge);
+            }
+            Enchantment piercing = Enchantment.getByName("PIERCING");
+            if (piercing != null) {
+                ENCHANTMENTS.put("piercing", piercing);
+            }
+        } catch (IllegalArgumentException ignored) {}
+
         try {
             Class<?> namespacedKeyClass = Class.forName("org.bukkit.NamespacedKey");
             Class<?> enchantmentClass = Class.forName("org.bukkit.enchantments.Enchantment");

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

@@ -19,6 +19,7 @@ package com.earth2me.essentials;
 
 import com.earth2me.essentials.commands.*;
 import com.earth2me.essentials.items.AbstractItemDb;
+import com.earth2me.essentials.items.CustomItemResolver;
 import com.earth2me.essentials.items.FlatItemDb;
 import com.earth2me.essentials.items.LegacyItemDb;
 import com.earth2me.essentials.metrics.Metrics;
@@ -32,12 +33,18 @@ import com.earth2me.essentials.textreader.KeywordReplacer;
 import com.earth2me.essentials.textreader.SimpleTextInput;
 import com.earth2me.essentials.utils.DateUtil;
 import com.earth2me.essentials.utils.VersionUtil;
-import com.google.common.base.Function;
 import com.google.common.base.Throwables;
-import com.google.common.collect.Iterables;
-import net.ess3.api.*;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
 import net.ess3.api.IEssentials;
 import net.ess3.api.ISettings;
+import net.ess3.api.*;
 import net.ess3.nms.PotionMetaProvider;
 import net.ess3.nms.SpawnEggProvider;
 import net.ess3.nms.SpawnerProvider;
@@ -76,14 +83,6 @@ import org.bukkit.scheduler.BukkitScheduler;
 import org.bukkit.scheduler.BukkitTask;
 import org.yaml.snakeyaml.error.YAMLException;
 
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import static com.earth2me.essentials.I18n.tl;
 
 
@@ -97,6 +96,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
     private transient List<IConf> confList;
     private transient Backup backup;
     private transient AbstractItemDb itemDb;
+    private transient CustomItemResolver customItemResolver;
     private transient final Methods paymentMethod = new Methods();
     private transient PermissionsHandler permissionsHandler;
     private transient AlternativeCommandsHandler alternativeCommandsHandler;
@@ -216,13 +216,25 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
 
                 warps = new Warps(getServer(), this.getDataFolder());
                 confList.add(warps);
-                execTimer.mark("Init(Spawn/Warp)");
+                execTimer.mark("Init(Warp)");
 
                 worth = new Worth(this.getDataFolder());
                 confList.add(worth);
+                execTimer.mark("Init(Worth)");
+
                 itemDb = getItemDbFromConfig();
                 confList.add(itemDb);
-                execTimer.mark("Init(Worth/ItemDB)");
+                execTimer.mark("Init(ItemDB)");
+
+                customItemResolver = new CustomItemResolver(this);
+                try {
+                    itemDb.registerResolver(this, "custom_items", customItemResolver);
+                    confList.add(customItemResolver);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    customItemResolver = null;
+                }
+                execTimer.mark("Init(CustomItemResolver)");
 
                 jails = new Jails(this);
                 confList.add(jails);
@@ -487,7 +499,9 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
             }
 
             if (bSenderBlock != null) {
-                Bukkit.getLogger().log(Level.INFO, "CommandBlock at {0},{1},{2} issued server command: /{3} {4}", new Object[]{bSenderBlock.getX(), bSenderBlock.getY(), bSenderBlock.getZ(), commandLabel, EssentialsCommand.getFinalArg(args, 0)});
+                if (getSettings().logCommandBlockCommands()) {
+                    Bukkit.getLogger().log(Level.INFO, "CommandBlock at {0},{1},{2} issued server command: /{3} {4}", new Object[]{bSenderBlock.getX(), bSenderBlock.getY(), bSenderBlock.getZ(), commandLabel, EssentialsCommand.getFinalArg(args, 0)});
+                }
             } else if (user == null) {
                 Bukkit.getLogger().log(Level.INFO, "{0} issued server command: /{1} {2}", new Object[]{cSender.getName(), commandLabel, EssentialsCommand.getFinalArg(args, 0)});
             }
@@ -871,13 +885,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
 
     @Override
     public Iterable<User> getOnlineUsers() {
-        return Iterables.transform(getOnlinePlayers(), new Function<Player, User>() {
-
-            @Override
-            public User apply(Player player) {
-                return getUser(player);
-            }
-        });
+        return getOnlinePlayers().stream().map(this::getUser).collect(Collectors.toList());
     }
 
     @Override
@@ -895,6 +903,11 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
         return potionMetaProvider;
     }
 
+    @Override
+    public CustomItemResolver getCustomItemResolver() {
+        return customItemResolver;
+    }
+
     private static void addDefaultBackPermissionsToWorld(World w) {
         String permName = "essentials.back.into." + w.getName();
 

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

@@ -1,25 +1,31 @@
 package com.earth2me.essentials;
 
-import com.google.common.io.Files;
-import net.ess3.api.InvalidWorldException;
-import org.bukkit.*;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.InvalidConfigurationException;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.util.Vector;
+import static com.earth2me.essentials.I18n.tl;
 
-import java.io.*;
+import com.google.common.io.Files;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.math.BigDecimal;
 import java.math.MathContext;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CoderResult;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -28,8 +34,18 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
-import static com.earth2me.essentials.I18n.tl;
+import net.ess3.api.InvalidWorldException;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.OfflinePlayer;
+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;
+import org.bukkit.util.Vector;
 
 
 public class EssentialsConf extends YamlConfiguration {
@@ -108,20 +124,21 @@ public class EssentialsConf extends YamlConfiguration {
                     if (length > buffer.remaining()) {
                         ByteBuffer resize = ByteBuffer.allocate(buffer.capacity() + length - buffer.remaining());
                         int resizePosition = buffer.position();
-                        buffer.rewind();
+                        // Fix builds compiled against Java 9+ breaking on Java 8
+                        ((Buffer) buffer).rewind();
                         resize.put(buffer);
                         resize.position(resizePosition);
                         buffer = resize;
                     }
                     buffer.put(bytebuffer, 0, length);
                 }
-                buffer.rewind();
+                ((Buffer) buffer).rewind();
                 final CharBuffer data = CharBuffer.allocate(buffer.capacity());
                 CharsetDecoder decoder = UTF8.newDecoder();
                 CoderResult result = decoder.decode(buffer, data, true);
                 if (result.isError()) {
-                    buffer.rewind();
-                    data.clear();
+                    ((Buffer) buffer).rewind();
+                    ((Buffer) data).clear();
                     LOGGER.log(Level.INFO, "File " + configFile.getAbsolutePath() + " is not utf-8 encoded, trying " + Charset.defaultCharset().displayName());
                     decoder = Charset.defaultCharset().newDecoder();
                     result = decoder.decode(buffer, data, true);
@@ -134,7 +151,7 @@ public class EssentialsConf extends YamlConfiguration {
                     decoder.flush(data);
                 }
                 final int end = data.position();
-                data.rewind();
+                ((Buffer) data).rewind();
                 super.loadFromString(data.subSequence(0, end).toString());
             }
         } catch (IOException ex) {

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

@@ -92,7 +92,7 @@ public class EssentialsEntityListener implements Listener {
                     class PowerToolInteractTask implements Runnable {
                         @Override
                         public void run() {
-                            attacker.getServer().dispatchCommand(attacker.getBase(), command);
+                            attacker.getBase().chat("/" + command);
                             LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", attacker.getName(), command));
                         }
                     }
@@ -159,6 +159,15 @@ public class EssentialsEntityListener implements Listener {
         }
     }
 
+    @EventHandler(priority = EventPriority.LOW)
+    public void onPlayerDeathInvEvent(final PlayerDeathEvent event) {
+        final User user = ess.getUser(event.getEntity());
+        if (user.isAuthorized("essentials.keepinv")) {
+            event.setKeepInventory(true);
+            event.getDrops().clear();
+        }
+    }
+
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
     public void onFoodLevelChange(final FoodLevelChangeEvent event) {
         if (event.getEntity() instanceof Player) {

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

@@ -7,15 +7,10 @@ import com.earth2me.essentials.textreader.TextPager;
 import com.earth2me.essentials.utils.DateUtil;
 import com.earth2me.essentials.utils.LocationUtil;
 import com.earth2me.essentials.utils.MaterialUtil;
+import com.earth2me.essentials.utils.VersionUtil;
 import io.papermc.lib.PaperLib;
 import net.ess3.api.IEssentials;
-
-import org.bukkit.BanEntry;
-import org.bukkit.BanList;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
@@ -36,11 +31,7 @@ import org.bukkit.inventory.PlayerInventory;
 
 import java.io.IOException;
 import java.text.NumberFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
+import java.util.*;
 import java.util.Map.Entry;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -57,12 +48,35 @@ public class EssentialsPlayerListener implements Listener {
         this.ess = parent;
     }
 
+    private static boolean isEntityPickupEvent() {
+        try {
+            Class.forName("org.bukkit.event.entity.EntityPickupItemEvent");
+            return true;
+        } catch (ClassNotFoundException ignored) {
+            return false;
+        }
+    }
+
+    private static boolean isCommandSendEvent() {
+        try {
+            Class.forName("org.bukkit.event.player.PlayerCommandSendEvent");
+            return true;
+        } catch (ClassNotFoundException ignored) {
+            return false;
+        }
+    }
+
     public void registerEvents() {
         ess.getServer().getPluginManager().registerEvents(this, ess);
+
         if (isEntityPickupEvent()) {
-            ess.getServer().getPluginManager().registerEvents(new PlayerListener1_12(), ess);
+            ess.getServer().getPluginManager().registerEvents(new PickupListener1_12(), ess);
         } else {
-            ess.getServer().getPluginManager().registerEvents(new PlayerListenerPre1_12(), ess);
+            ess.getServer().getPluginManager().registerEvents(new PickupListenerPre1_12(), ess);
+        }
+
+        if (isCommandSendEvent()) {
+            ess.getServer().getPluginManager().registerEvents(new CommandSendListener(), ess);
         }
     }
 
@@ -82,7 +96,9 @@ public class EssentialsPlayerListener implements Listener {
         final User user = ess.getUser(event.getPlayer());
         if (user.isMuted()) {
             event.setCancelled(true);
-            user.sendMessage(tl("voiceSilenced"));
+
+            user.sendMessage(user.hasMuteReason() ? tl("voiceSilencedReason", user.getMuteReason()) : tl("voiceSilenced"));
+
             LOGGER.info(tl("mutedUserSpeaks", user.getName(), event.getMessage()));
         }
         try {
@@ -158,7 +174,7 @@ public class EssentialsPlayerListener implements Listener {
                     .replace("{PLAYER}", player.getDisplayName())
                     .replace("{USERNAME}", player.getName())
                     .replace("{ONLINE}", NumberFormat.getInstance().format(ess.getOnlinePlayers().size()));
-            
+
             event.setQuitMessage(msg.isEmpty() ? null : msg);
         }
 
@@ -183,7 +199,7 @@ public class EssentialsPlayerListener implements Listener {
             }
         }
 
-        user.updateActivityOnInteract(false);
+        user.updateActivity(false);
         if (!user.isHidden()) {
             user.setLastLogout(System.currentTimeMillis());
         }
@@ -195,12 +211,8 @@ public class EssentialsPlayerListener implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onPlayerJoin(final PlayerJoinEvent event) {
         final String joinMessage = event.getJoinMessage();
-        ess.runTaskAsynchronously(new Runnable() {
-            @Override
-            public void run() {
-                delayedJoin(event.getPlayer(), joinMessage);
-            }
-        });
+        ess.runTaskAsynchronously(() -> delayedJoin(event.getPlayer(), joinMessage));
+
         if (ess.getSettings().allowSilentJoinQuit() || ess.getSettings().isCustomJoinMessage()) {
             event.setJoinMessage(null);
         }
@@ -221,7 +233,7 @@ public class EssentialsPlayerListener implements Listener {
 
         final long currentTime = System.currentTimeMillis();
         dUser.checkMuteTimeout(currentTime);
-        dUser.updateActivityOnInteract(false);
+        dUser.updateActivity(false);
         dUser.stopTransaction();
 
         class DelayJoinTask implements Runnable {
@@ -264,9 +276,9 @@ public class EssentialsPlayerListener implements Listener {
                     //NOOP
                 } else if (ess.getSettings().isCustomJoinMessage()) {
                     String msg = ess.getSettings().getCustomJoinMessage()
-                        .replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName())
-                        .replace("{UNIQUE}", NumberFormat.getInstance().format(ess.getUserMap().getUniqueUsers()))
-                        .replace("{ONLINE}", NumberFormat.getInstance().format(ess.getOnlinePlayers().size()));
+                            .replace("{PLAYER}", player.getDisplayName()).replace("{USERNAME}", player.getName())
+                            .replace("{UNIQUE}", NumberFormat.getInstance().format(ess.getUserMap().getUniqueUsers()))
+                            .replace("{ONLINE}", NumberFormat.getInstance().format(ess.getOnlinePlayers().size()));
                     if (!msg.isEmpty()) {
                         ess.getServer().broadcastMessage(msg);
                     }
@@ -318,7 +330,7 @@ public class EssentialsPlayerListener implements Listener {
                     user.setGodModeEnabled(false);
                     ess.getLogger().log(Level.INFO, "Set god mode to false for {0} because they had it enabled without permission.", user.getName());
                 }
-                
+
                 user.setConfirmingClearCommand(null);
                 user.getConfirmingPayments().clear();
 
@@ -448,12 +460,7 @@ public class EssentialsPlayerListener implements Listener {
         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.getBase().updateInventory();
-                }
-            });
+            ess.scheduleSyncDelayedTask(user.getBase()::updateInventory);
         }
     }
 
@@ -488,7 +495,7 @@ public class EssentialsPlayerListener implements Listener {
             LOGGER.info(tl("mutedUserSpeaks", player.getName(), event.getMessage()));
             return;
         }
-        
+
         boolean broadcast = true; // whether to broadcast the updated activity
         boolean update = true; // Only modified when the command is afk
 
@@ -507,16 +514,16 @@ public class EssentialsPlayerListener implements Listener {
         }
 
         if (ess.getSettings().isCommandCooldownsEnabled() && pluginCommand != null
-            && !user.isAuthorized("essentials.commandcooldowns.bypass")) {
+                && !user.isAuthorized("essentials.commandcooldowns.bypass")) {
             int argStartIndex = event.getMessage().indexOf(" ");
-            String args = argStartIndex == -1 ? "" // No arguments present 
-                : " " + event.getMessage().substring(argStartIndex); // arguments start at argStartIndex; substring from there.
+            String args = argStartIndex == -1 ? "" // No arguments present
+                    : " " + event.getMessage().substring(argStartIndex); // arguments start at argStartIndex; substring from there.
             String fullCommand = pluginCommand.getName() + args;
 
             // Used to determine whether a user already has an existing cooldown
             // If so, no need to check for (and write) new ones.
             boolean cooldownFound = false;
-            
+
             // Iterate over a copy of getCommandCooldowns in case of concurrent modifications
             for (Entry<Pattern, Long> entry : new HashMap<>(user.getCommandCooldowns()).entrySet()) {
                 // Remove any expired cooldowns
@@ -554,8 +561,8 @@ public class EssentialsPlayerListener implements Listener {
         final User user = ess.getUser(event.getPlayer());
         if (user.getBase().getGameMode() != GameMode.CREATIVE
                 // COMPAT: String compare for 1.7.10
-            && !user.getBase().getGameMode().name().equals("SPECTATOR")
-            && !user.isAuthorized("essentials.fly")) {
+                && !user.getBase().getGameMode().name().equals("SPECTATOR")
+                && !user.isAuthorized("essentials.fly")) {
             user.getBase().setFallDistance(0f);
             user.getBase().setAllowFlight(false);
         }
@@ -599,13 +606,18 @@ public class EssentialsPlayerListener implements Listener {
 
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerInteract(final PlayerInteractEvent event) {
+        boolean updateActivity = true;
+
         switch (event.getAction()) {
             case RIGHT_CLICK_BLOCK:
                 if (!event.isCancelled() && MaterialUtil.isBed(event.getClickedBlock().getType()) && ess.getSettings().getUpdateBedAtDaytime()) {
                     User player = ess.getUser(event.getPlayer());
                     if (player.isAuthorized("essentials.sethome.bed") && player.getWorld().getEnvironment().equals(World.Environment.NORMAL)) {
                         player.getBase().setBedSpawnLocation(event.getClickedBlock().getLocation());
-                        player.sendMessage(tl("bedSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
+                        // In 1.15 and above, vanilla sends its own bed spawn message.
+                        if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_15_R01)) {
+                            player.sendMessage(tl("bedSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
+                        }
                     }
                 }
                 break;
@@ -625,8 +637,16 @@ public class EssentialsPlayerListener implements Listener {
                     }
                 }
                 break;
+            case PHYSICAL:
+                updateActivity = false;
+                break;
+            default:
+                break;
         }
+
+        if (updateActivity) {
             ess.getUser(event.getPlayer()).updateActivityOnInteract(true);
+        }
     }
 
     // This method allows the /jump lock feature to work, allows teleporting while flying #EasterEgg
@@ -673,7 +693,7 @@ public class EssentialsPlayerListener implements Listener {
                 class PowerToolUseTask implements Runnable {
                     @Override
                     public void run() {
-                        user.getServer().dispatchCommand(user.getBase(), command);
+                        user.getBase().chat("/" + command);
                         LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", user.getName(), command));
                     }
                 }
@@ -728,9 +748,9 @@ public class EssentialsPlayerListener implements Listener {
             }
         } else if (clickedInventory != null && clickedInventory.getType() == InventoryType.PLAYER) {
             if (ess.getSettings().isDirectHatAllowed() && event.getClick() == ClickType.LEFT && event.getSlot() == 39
-                && event.getCursor().getType() != Material.AIR && event.getCursor().getType().getMaxDurability() == 0
-                && !MaterialUtil.isSkull(event.getCursor().getType())
-                && ess.getUser(event.getWhoClicked()).isAuthorized("essentials.hat")) {
+                    && event.getCursor().getType() != Material.AIR && event.getCursor().getType().getMaxDurability() == 0
+                    && !MaterialUtil.isSkull(event.getCursor().getType())
+                    && ess.getUser(event.getWhoClicked()).isAuthorized("essentials.hat") && !ess.getUser(event.getWhoClicked()).isAuthorized("essentials.hat.prevent-type." + event.getCursor().getType().name().toLowerCase())) {
                 event.setCancelled(true);
                 final PlayerInventory inv = (PlayerInventory) clickedInventory;
                 final ItemStack head = inv.getHelmet();
@@ -741,12 +761,7 @@ public class EssentialsPlayerListener implements Listener {
 
         if (refreshPlayer != null) {
             final Player player = refreshPlayer;
-            ess.scheduleSyncDelayedTask(new Runnable() {
-                @Override
-                public void run() {
-                    player.updateInventory();
-                }
-            }, 1);
+            ess.scheduleSyncDelayedTask(player::updateInventory, 1);
         }
     }
 
@@ -781,32 +796,17 @@ public class EssentialsPlayerListener implements Listener {
 
         if (refreshPlayer != null) {
             final Player player = refreshPlayer;
-            ess.scheduleSyncDelayedTask(new Runnable() {
-                @Override
-                public void run() {
-                    player.updateInventory();
-                }
-            }, 1);
+            ess.scheduleSyncDelayedTask(player::updateInventory, 1);
         }
     }
 
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
     public void onPlayerFishEvent(final PlayerFishEvent event) {
         final User user = ess.getUser(event.getPlayer());
-            user.updateActivityOnInteract(true);
+        user.updateActivityOnInteract(true);
     }
 
-    private static boolean isEntityPickupEvent() {
-        try {
-            Class.forName("org.bukkit.event.entity.EntityPickupItemEvent");
-            return true;
-        } catch (ClassNotFoundException ignored) {
-            return false;
-        }
-    }
-
-    private final class PlayerListenerPre1_12 implements Listener {
-
+    private final class PickupListenerPre1_12 implements Listener {
         @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
         public void onPlayerPickupItem(final org.bukkit.event.player.PlayerPickupItemEvent event) {
             if (ess.getSettings().getDisableItemPickupWhileAfk()) {
@@ -817,8 +817,7 @@ public class EssentialsPlayerListener implements Listener {
         }
     }
 
-    private final class PlayerListener1_12 implements Listener {
-
+    private final class PickupListener1_12 implements Listener {
         @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
         public void onPlayerPickupItem(final org.bukkit.event.entity.EntityPickupItemEvent event) {
             if (ess.getSettings().getDisableItemPickupWhileAfk() && event.getEntity() instanceof Player) {
@@ -828,4 +827,46 @@ public class EssentialsPlayerListener implements Listener {
             }
         }
     }
+
+    private final class CommandSendListener implements Listener {
+        @EventHandler(priority = EventPriority.NORMAL)
+        public void onCommandSend(final PlayerCommandSendEvent event) {
+            User user = ess.getUser(event.getPlayer());
+
+            Set<PluginCommand> checked = new HashSet<>();
+            Set<PluginCommand> toRemove = new HashSet<>();
+
+            event.getCommands().removeIf(label -> {
+                if (isEssentialsCommand(label)) {
+                    PluginCommand command = ess.getServer().getPluginCommand(label);
+                    if (!checked.contains(command)) {
+                        checked.add(command);
+                        if (!user.isAuthorized(command.getName().equals("r") ? "essentials.msg" : "essentials." + command.getName())) {
+                            toRemove.add(command);
+                        }
+                    }
+                    return toRemove.contains(command);
+                }
+                return false;
+            });
+
+            if (ess.getSettings().isDebug()) {
+                ess.getLogger().info("Removed commands: " + toRemove.toString());
+            }
+        }
+
+        /**
+         * Returns true if all of the following are true:
+         * - The command is a plugin command
+         * - The plugin command is from Essentials
+         * - There is no known alternative OR the alternative is overridden by Essentials
+         */
+        private boolean isEssentialsCommand(String label) {
+            PluginCommand command = ess.getServer().getPluginCommand(label);
+
+            return command != null
+                    && command.getPlugin() == ess
+                    && (ess.getSettings().isCommandOverridden(label) || (ess.getAlternativeCommandsHandler().getAlternative(label) == null));
+        }
+    }
 }

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

@@ -18,7 +18,8 @@ import java.util.logging.Level;
 
 public class EssentialsServerListener implements Listener {
     private static List<String> ignoredSLPECallers = Arrays.asList(
-        ".LegacyPingHandler.channelRead(" // CB responding to pings from pre-Netty clients
+        ".LegacyPingHandler.channelRead(", // CB responding to pings from pre-Netty clients
+        "de.dytanic.cloudnet.bridge.BukkitBootstrap" // CloudNet v2 doing... something
     );
 
     private final transient IEssentials ess;

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

@@ -15,6 +15,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
 
@@ -185,6 +186,8 @@ public interface ISettings extends IConf {
 
     boolean cancelAfkOnInteract();
 
+    boolean sleepIgnoresAfkPlayers();
+
     boolean isAfkListName();
 
     String getAfkListName();
@@ -313,6 +316,8 @@ public interface ISettings extends IConf {
 
     boolean isConfirmCommandEnabledByDefault(String commandName);
 
+    boolean isTeleportBackWhenFreedFromJail();
+
     boolean isCompassTowardsHomePerm();
 
     boolean isAllowWorldInBroadcastworld();
@@ -322,4 +327,16 @@ public interface ISettings extends IConf {
     boolean isForceEnableRecipe();
 
     boolean allowOldIdSigns();
+
+    boolean isWaterSafe();
+  
+    boolean isSafeUsermap();
+
+    boolean logCommandBlockCommands();
+
+    Set<Predicate<String>> getNickBlacklist();
+
+    double getMaxProjectileSpeed();
+
+    boolean isSpawnIfNoHome();
 }

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

@@ -22,6 +22,8 @@ public interface IUser {
 
     boolean isAuthorized(IEssentialsCommand cmd, String permissionPrefix);
 
+    boolean isPermissionSet(String node);
+
     void healCooldown() throws Exception;
 
     void giveMoney(BigDecimal value) throws MaxMoneyException;
@@ -184,5 +186,9 @@ public interface IUser {
     
     void setPromptingClearConfirm(boolean prompt);
 
+    boolean isLastMessageReplyRecipient();
+
+    void setLastMessageReplyRecipient(boolean enabled);
+
     Map<User, BigDecimal> getConfirmingPayments();
 }

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

@@ -16,10 +16,7 @@ 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.*;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.plugin.PluginManager;
 
@@ -203,6 +200,14 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
             }
         }
 
+        @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+        public void onJailPlayerGameModeChange(PlayerGameModeChangeEvent event) {
+            final User user = ess.getUser(event.getPlayer());
+            if (user.isJailed()) {
+                event.setCancelled(true);
+            }
+        }
+
         @EventHandler(priority = EventPriority.HIGHEST)
         public void onJailPlayerRespawn(final PlayerRespawnEvent event) {
             final User user = ess.getUser(event.getPlayer());

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

@@ -79,6 +79,12 @@ public class Kits implements IConf {
         config.save();
     }
 
+    public void removeKit(String name) {
+        config.set("kits." + name, null);
+        kits = _getKits();
+        config.save();
+    }
+
     public String listKits(final net.ess3.api.IEssentials ess, final User user) throws Exception {
         try {
             final ConfigurationSection kits = config.getConfigurationSection("kits");

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

@@ -1,8 +1,5 @@
 package com.earth2me.essentials;
 
-import net.ess3.api.IEssentials;
-import org.bukkit.Bukkit;
-
 import java.io.*;
 import java.math.BigInteger;
 import java.security.DigestInputStream;
@@ -13,6 +10,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
+import java.util.stream.Collectors;
+import net.ess3.api.IEssentials;
+import org.bukkit.Bukkit;
 
 import static com.earth2me.essentials.I18n.tl;
 
@@ -38,7 +38,7 @@ public class ManagedFile {
             try {
                 copyResourceAscii("/" + filename, file);
             } catch (IOException ex) {
-                Bukkit.getLogger().log(Level.SEVERE, tl("itemsCsvNotLoaded"), ex);
+                Bukkit.getLogger().log(Level.SEVERE, tl("itemsCsvNotLoaded", filename), ex);
             }
         }
     }

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

@@ -8,10 +8,12 @@ import com.earth2me.essentials.utils.FormatUtil;
 import com.earth2me.essentials.utils.MaterialUtil;
 import com.earth2me.essentials.utils.NumberUtil;
 import com.google.common.base.Joiner;
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.regex.Pattern;
 import net.ess3.api.IEssentials;
 import net.ess3.nms.refl.ReflUtil;
-
-import org.apache.commons.lang.ArrayUtils;
 import org.bukkit.Color;
 import org.bukkit.DyeColor;
 import org.bukkit.FireworkEffect;
@@ -26,11 +28,6 @@ import org.bukkit.potion.Potion;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.regex.Pattern;
-
 import static com.earth2me.essentials.I18n.tl;
 
 
@@ -165,8 +162,8 @@ public class MetaItemStack {
             stack.setItemMeta(meta);
         } else if (split.length > 1 && (split[0].equalsIgnoreCase("lore") || split[0].equalsIgnoreCase("desc")) && hasMetaPermission(sender, "lore", false, true, ess)) {
             final List<String> lore = new ArrayList<String>();
-            for (String line : split[1].split("\\|")) {
-                lore.add(FormatUtil.replaceFormat(line.replace('_', ' ')));
+            for (String line : split[1].split("(?<!\\\\)\\|")) {
+                lore.add(FormatUtil.replaceFormat(line.replace('_', ' ').replace("\\|", "|")));
             }
             final ItemMeta meta = stack.getItemMeta();
             meta.setLore(lore);
@@ -177,9 +174,7 @@ public class MetaItemStack {
         } else if (split.length > 1 && (split[0].equalsIgnoreCase("player") || split[0].equalsIgnoreCase("owner")) && hasMetaPermission(sender, "head", false, true, ess)) {
             if (MaterialUtil.isPlayerHead(stack.getType(), stack.getDurability())) {
                 final String owner = split[1];
-                final SkullMeta meta = (SkullMeta) stack.getItemMeta();
-                meta.setOwningPlayer(ess.getServer().getOfflinePlayer(owner));
-                stack.setItemMeta(meta);
+                setSkullOwner(ess, stack, owner);
             } else {
                 throw new Exception(tl("onlyPlayerSkulls"));
             }
@@ -208,13 +203,19 @@ public class MetaItemStack {
             stack.setItemMeta(meta);
         } else if (split.length > 1 && split[0].equalsIgnoreCase("itemflags") && hasMetaPermission(sender, "itemflags", false, true, ess)) {
             addItemFlags(string);
-        } else if (MaterialUtil.isFirework(stack.getType())) {//WARNING - Meta for fireworks will be ignored after this point.
+        } else if (MaterialUtil.isFirework(stack.getType())) {
+            //WARNING - Meta for fireworks will be ignored after this point.
             addFireworkMeta(sender, false, string, ess);
-        } else if (MaterialUtil.isPotion(stack.getType())) { //WARNING - Meta for potions will be ignored after this point.
+        } else if (MaterialUtil.isPotion(stack.getType())) {
+            //WARNING - Meta for potions will be ignored after this point.
             addPotionMeta(sender, false, string, ess);
         } else if (MaterialUtil.isBanner(stack.getType())) {
-            //WARNING - Meta for banners will be ignored after this point.
-            addBannerMeta(sender, false, string, ess);
+            if (stack.getType().toString().equals("SHIELD") && Enchantments.getByName(split[0]) != null) {
+                parseEnchantmentStrings(sender, allowUnsafe, split, ess);
+            } else {
+                //WARNING - Meta for banners will be ignored after this point.
+                addBannerMeta(sender, false, string, ess);
+            }
         } else if (split.length > 1 && (split[0].equalsIgnoreCase("color") || split[0].equalsIgnoreCase("colour")) && MaterialUtil.isLeatherArmor(stack.getType())) {
             final String[] color = split[1].split("(\\||,)");
             if (color.length == 1 && (NumberUtil.isInt(color[0]) || color[0].startsWith("#"))) {
@@ -578,4 +579,24 @@ public class MetaItemStack {
             t.printStackTrace();
         }
     }
+
+    private static boolean useNewSkullMethod = true;
+
+    private static void setSkullOwner(final IEssentials ess, final ItemStack stack, final String owner) {
+        if (!(stack.getItemMeta() instanceof SkullMeta)) return;
+
+        SkullMeta meta = (SkullMeta) stack.getItemMeta();
+        if (useNewSkullMethod) {
+            try {
+                meta.setOwningPlayer(ess.getServer().getOfflinePlayer(owner));
+                stack.setItemMeta(meta);
+                return;
+            } catch (NoSuchMethodError e) {
+                useNewSkullMethod = false;
+            }
+        }
+
+        meta.setOwner(owner);
+        stack.setItemMeta(meta);
+    }
 }

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

@@ -1,10 +1,10 @@
 package com.earth2me.essentials;
 
+import com.earth2me.essentials.utils.EnumUtil;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.World;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
+import org.bukkit.entity.*;
 
 import java.util.*;
 import java.util.logging.Level;
@@ -77,12 +77,20 @@ public enum Mob {
     PARROT("Parrot", Enemies.NEUTRAL, "PARROT"),
     TURTLE("Turtle", Enemies.NEUTRAL, "TURTLE"),
     PHANTOM("Phantom", Enemies.ENEMY, "PHANTOM"),
-    COD("Cod", Enemies.NEUTRAL, "COD"),
-    SALMON("Salmon", Enemies.NEUTRAL, "SALMON"),
-    PUFFERFISH("Pufferfish", Enemies.NEUTRAL, "PUFFERFISH"),
-    TROPICAL_FISH("TropicalFish", Enemies.NEUTRAL, "TROPICAL_FISH"),
+    COD("Cod", Enemies.NEUTRAL, "", "COD"),
+    SALMON("Salmon", Enemies.NEUTRAL, "", "SALMON"),
+    PUFFERFISH("Pufferfish", Enemies.NEUTRAL, "", "PUFFERFISH"),
+    TROPICAL_FISH("TropicalFish", Enemies.NEUTRAL, "", "TROPICAL_FISH"),
     DROWNED("Drowned", Enemies.ENEMY, "DROWNED"),
     DOLPHIN("Dolphin", Enemies.NEUTRAL, "DOLPHIN"),
+    CAT("Cat", Enemies.FRIENDLY, "CAT"),
+    FOX("Fox", Enemies.FRIENDLY, "es", "FOX"),
+    PANDA("Panda", Enemies.NEUTRAL, "PANDA"),
+    PILLAGER("Pillager", Enemies.ENEMY, "PILLAGER"),
+    RAVAGER("Ravager", Enemies.ENEMY, "RAVAGER"),
+    TRADER_LLAMA("TraderLlama", Enemies.FRIENDLY, "TRADER_LLAMA"),
+    WANDERING_TRADER("WanderingTrader", Enemies.FRIENDLY, "WANDERING_TRADER"),
+    BEE("Bee", Enemies.NEUTRAL, "BEE")
     ;
 
     public static final Logger logger = Logger.getLogger("Essentials");
@@ -100,16 +108,17 @@ public enum Mob {
         this.bukkitType = type;
     }
 
+    Mob(String n, Enemies en, String s, String typeName) {
+        this.suffix = s;
+        this.name = n;
+        this.type = en;
+        bukkitType = EnumUtil.getEntityType(typeName);
+    }
+
     Mob(String n, Enemies en, String typeName) {
         this.name = n;
         this.type = en;
-        EntityType entityType;
-        try {
-            entityType = EntityType.valueOf(typeName);
-        } catch (IllegalArgumentException ignored) {
-            entityType = null;
-        }
-        bukkitType = entityType;
+        bukkitType = EnumUtil.getEntityType(typeName);
     }
 
     public String suffix = "s";

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

@@ -0,0 +1,224 @@
+package com.earth2me.essentials;
+
+import com.earth2me.essentials.utils.EnumUtil;
+import net.ess3.nms.refl.ReflUtil;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Ocelot;
+import org.bukkit.entity.Villager;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import static com.earth2me.essentials.utils.EnumUtil.getEntityType;
+
+public class MobCompat {
+
+    // Constants for mobs added in later versions
+    public static final EntityType LLAMA = getEntityType("LLAMA");
+    public static final EntityType PARROT = getEntityType("PARROT");
+    public static final EntityType TROPICAL_FISH = getEntityType("TROPICAL_FISH");
+    public static final EntityType PANDA = getEntityType("PANDA");
+    public static final EntityType TRADER_LLAMA = getEntityType("TRADER_LLAMA");
+
+    // Constants for mobs that have changed since earlier versions
+    public static final EntityType CAT = getEntityType("CAT", "OCELOT");
+
+    public enum CatType {
+        // These are (loosely) Mojang names for the cats
+        SIAMESE("SIAMESE", "SIAMESE_CAT"),
+        WHITE("WHITE", "SIAMESE_CAT"),
+        RED("RED", "RED_CAT"),
+        TABBY("TABBY", "RED_CAT"),
+        TUXEDO("BLACK", "BLACK_CAT"),
+        BRITISH_SHORTHAIR("BRITISH_SHORTHAIR", "SIAMESE_CAT"),
+        CALICO("CALICO", "RED_CAT"),
+        PERSIAN("PERSIAN", "RED_CAT"),
+        RAGDOLL("RAGDOLL", "SIAMESE_CAT"),
+        JELLIE("JELLIE", "SIAMESE_CAT"),
+        BLACK("ALL_BLACK", "BLACK_CAT"),
+        ;
+
+        private final String catTypeName;
+        private final String ocelotTypeName;
+
+        CatType(final String catTypeName, final String ocelotTypeName) {
+            this.catTypeName = catTypeName;
+            this.ocelotTypeName = ocelotTypeName;
+        }
+    }
+
+    public enum VillagerProfession {
+        // These are 1.14+ villager professions mapped to their respective pre-V&P profession and career
+        NONE("FARMER", "FARMER", "NONE"),
+        ARMORER("BLACKSMITH", "ARMORER"),
+        BUTCHER("FARMER", "BUTCHER"),
+        CARTOGRAPHER("LIBRARIAN", "CARTOGRAPHER"),
+        CLERIC("PRIEST", "CLERIC"),
+        FARMER("FARMER", "FARMER"),
+        FISHERMAN("FARMER", "FISHERMAN"),
+        FLETCHER("FARMER", "FLETCHER"),
+        LEATHERWORKER("BUTCHER", "LEATHERWORKER"),
+        LIBRARIAN("LIBRARIAN", "LIBRARIAN"),
+        MASON(null, null, "MASON"),
+        NITWIT("NITWIT", "NITWIT"),
+        SHEPHERD("FARMER", "SHEPHERD"),
+        TOOLSMITH("BLACKSMITH", "TOOL_SMITH", "TOOLSMITH"),
+        WEAPONSMITH("BLACKSMITH", "WEAPON_SMITH", "WEAPONSMITH")
+        ;
+
+        private String oldProfession;
+        private String oldCareer;
+        private String newProfession;
+
+        VillagerProfession(final String oldProfession, final String career) {
+            this.oldProfession = oldProfession;
+            this.oldCareer = career;
+            this.newProfession = career;
+        }
+
+        VillagerProfession(final String oldProfession, final String oldCareer, final String newProfession) {
+            this.oldProfession = oldProfession;
+            this.oldCareer = oldCareer;
+            this.newProfession = newProfession;
+        }
+
+        private Villager.Profession asEnum() {
+            return EnumUtil.valueOf(Villager.Profession.class, newProfession, oldProfession);
+        }
+    }
+
+    // Older cats are Ocelots, whereas 1.14+ cats are Cats
+    private static Class catClass = ReflUtil.getClassCached("org.bukkit.entity.Cat");
+    private static Class catTypeClass = ReflUtil.getClassCached("org.bukkit.entity.Cat.Type");
+    private static Method catSetTypeMethod = (catClass == null || catTypeClass == null) ? null : ReflUtil.getMethodCached(catClass, "setCatType", catTypeClass);
+
+    private static boolean isNewCat() {
+        return (catClass != null && catTypeClass != null && catSetTypeMethod != null);
+    }
+
+    public static void setCatType(final Entity entity, final CatType type) {
+        if (isNewCat()) {
+            try {
+                catSetTypeMethod.invoke(entity, EnumUtil.valueOf(catTypeClass, type.catTypeName));
+            } catch (IllegalAccessException | InvocationTargetException e) {
+                e.printStackTrace();
+            }
+        } else {
+            ((Ocelot) entity).setCatType(Ocelot.Type.valueOf(type.ocelotTypeName));
+        }
+    }
+
+    // Older villagers have professions and careers, 1.14+ villagers only have professions
+    private static Class villagerCareerClass = ReflUtil.getClassCached("org.bukkit.entity.Villager.Career");
+    private static Method villagerSetCareerMethod = (villagerCareerClass == null) ? null : ReflUtil.getMethodCached(Villager.class, "setCareer", villagerCareerClass);
+
+    private static boolean isCareerVillager() {
+        return (villagerCareerClass != null && villagerSetCareerMethod != null);
+    }
+
+    public static void setVillagerProfession(final Entity entity, final VillagerProfession profession) {
+        if (!isCareerVillager()) {
+            ((Villager) entity).setProfession(profession.asEnum());
+        } else {
+            ((Villager) entity).setProfession(profession.asEnum());
+            try {
+                villagerSetCareerMethod.invoke(entity, EnumUtil.valueOf(villagerCareerClass, profession.oldCareer));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    // Only 1.14+ villagers have biome variants
+    public static void setVillagerType(final Entity entity, final String type) {
+        Class typeEnum = ReflUtil.getClassCached("org.bukkit.entity.Villager.Type");
+        if (typeEnum == null) return;
+
+        Method villagerSetTypeMethod = ReflUtil.getMethodCached(Villager.class, "setVillagerType", typeEnum);
+        try {
+            villagerSetTypeMethod.invoke(entity, EnumUtil.valueOf(typeEnum, type));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    // Llamas only exist in 1.11+
+    public static void setLlamaColor(final Entity entity, final String color) {
+        Class llamaClass = ReflUtil.getClassCached("org.bukkit.entity.Llama");
+        if (llamaClass == null) return;
+
+        Class colorEnum = ReflUtil.getClassCached("org.bukkit.entity.Llama.Color");
+        Method setVariantMethod = ReflUtil.getMethodCached(llamaClass, "setColor");
+
+        try {
+            setVariantMethod.invoke(entity, EnumUtil.valueOf(colorEnum, color));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    // Parrots only exist in 1.12+
+    public static void setParrotVariant(final Entity entity, final String variant) {
+        Class parrotClass = ReflUtil.getClassCached("org.bukkit.entity.Parrot");
+        if (parrotClass == null) return;
+
+        Class variantEnum = ReflUtil.getClassCached("org.bukkit.entity.Parrot.Variant");
+        Method setVariantMethod = ReflUtil.getMethodCached(parrotClass, "setVariant");
+        try {
+            setVariantMethod.invoke(entity, EnumUtil.valueOf(variantEnum, variant));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    // Tropical fish only exist in 1.13+
+    public static void setTropicalFishPattern(final Entity entity, final String pattern) {
+        Class tropicalFishClass = ReflUtil.getClassCached("org.bukkit.entity.TropicalFish");
+        if (tropicalFishClass == null) return;
+
+        Class patternEnum = ReflUtil.getClassCached("org.bukkit.entity.TropicalFish.Pattern");
+        Method setPatternMethod = ReflUtil.getMethodCached(tropicalFishClass, "setPattern");
+        try {
+            setPatternMethod.invoke(entity, EnumUtil.valueOf(patternEnum, pattern));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    // Mushroom cow variant API only exists in 1.14+
+    public static void setMooshroomVariant(final Entity entity, final String variant) {
+        Class mushroomCowClass = ReflUtil.getClassCached("org.bukkit.entity.MushroomCow");
+        Class variantEnum = ReflUtil.getClassCached("org.bukkit.entity.MushroomCow.Variant");
+        if (mushroomCowClass == null || variantEnum == null) return;
+
+        Method setVariantMethod = ReflUtil.getMethodCached(mushroomCowClass, "setVariant");
+        try {
+            setVariantMethod.invoke(entity, EnumUtil.valueOf(variantEnum, variant));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    // Pandas only exists in 1.14+
+    public static void setPandaGene(final Entity entity, final String gene, final boolean mainGene) {
+        Class pandaClass = ReflUtil.getClassCached("org.bukkit.entity.Panda");
+        if (pandaClass == null) return;
+
+        Class geneEnum = ReflUtil.getClassCached("org.bukkit.entity.Panda.Gene");
+        Method setGeneMethod;
+
+        if (mainGene) {
+            setGeneMethod = ReflUtil.getMethodCached(pandaClass, "setMainGene");
+        } else {
+            setGeneMethod = ReflUtil.getMethodCached(pandaClass, "setHiddenGene");
+        }
+
+        try {
+            setGeneMethod.invoke(entity, EnumUtil.valueOf(geneEnum, gene));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}

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

@@ -17,8 +17,10 @@ import static com.earth2me.essentials.I18n.tl;
 
 
 public enum MobData {
+
     BABY_AGEABLE("baby", Ageable.class, Data.BABY, true),
     ADULT_AGEABLE("adult", Ageable.class, Data.ADULT, true),
+    BABY_CAT("kitten", MobCompat.CAT, Data.BABY, false),
     BABY_PIG("piglet", EntityType.PIG, Data.BABY, false),
     BABY_WOLF("puppy", EntityType.WOLF, Data.BABY, false),
     BABY_CHICKEN("chick", EntityType.CHICKEN, Data.BABY, false),
@@ -57,13 +59,19 @@ public enum MobData {
     GOLD_ARMOR_HORSE("goldarmor", EntityType.HORSE, EnumUtil.getMaterial("GOLDEN_HORSE_ARMOR", "GOLD_BARDING"), true),
     DIAMOND_ARMOR_HORSE("diamondarmor", EntityType.HORSE, EnumUtil.getMaterial("DIAMOND_HORSE_ARMOR", "DIAMOND_BARDING"), true),
     ARMOR_HORSE("armor", EntityType.HORSE, EnumUtil.getMaterial("IRON_HORSE_ARMOR", "IRON_BARDING"), true),
-    SIAMESE_CAT("siamese", EntityType.OCELOT, Ocelot.Type.SIAMESE_CAT, true),
-    WHITE_CAT("white", EntityType.OCELOT, Ocelot.Type.SIAMESE_CAT, false),
-    RED_CAT("red", EntityType.OCELOT, Ocelot.Type.RED_CAT, true),
-    ORANGE_CAT("orange", EntityType.OCELOT, Ocelot.Type.RED_CAT, false),
-    TABBY_CAT("tabby", EntityType.OCELOT, Ocelot.Type.RED_CAT, false),
-    BLACK_CAT("black", EntityType.OCELOT, Ocelot.Type.BLACK_CAT, true),
-    TUXEDO_CAT("tuxedo", EntityType.OCELOT, Ocelot.Type.BLACK_CAT, false),
+    SIAMESE_CAT("siamese", MobCompat.CAT, MobCompat.CatType.SIAMESE, true),
+    WHITE_CAT("white", MobCompat.CAT, MobCompat.CatType.WHITE, false),
+    RED_CAT("red", MobCompat.CAT, MobCompat.CatType.RED, true),
+    ORANGE_CAT("orange", MobCompat.CAT, MobCompat.CatType.RED, false),
+    TABBY_CAT("tabby", MobCompat.CAT, MobCompat.CatType.TABBY, true),
+    BLACK_CAT("black", MobCompat.CAT, MobCompat.CatType.BLACK, true),
+    TUXEDO_CAT("tuxedo", MobCompat.CAT, MobCompat.CatType.TUXEDO, true),
+    BRITISH_SHORTHAIR_CAT("britishshorthair", MobCompat.CAT, MobCompat.CatType.BRITISH_SHORTHAIR, true),
+    CALICO_CAT("calico", MobCompat.CAT, MobCompat.CatType.CALICO, true),
+    PERSIAN_CAT("persian", MobCompat.CAT, MobCompat.CatType.PERSIAN, true),
+    RAGDOLL_CAT("ragdoll", MobCompat.CAT, MobCompat.CatType.RAGDOLL, true),
+    JELLIE_CAT("jellie", MobCompat.CAT, MobCompat.CatType.JELLIE, true),
+    ALL_BLACK_CAT("allblack", MobCompat.CAT, MobCompat.CatType.BLACK, true),
     BABY_ZOMBIE("baby", EntityType.ZOMBIE.getEntityClass(), Data.BABYZOMBIE, true),
     ADULT_ZOMBIE("adult", EntityType.ZOMBIE.getEntityClass(), Data.ADULTZOMBIE, true),
     DIAMOND_SWORD_ZOMBIE("diamondsword", EntityType.ZOMBIE.getEntityClass(), Material.DIAMOND_SWORD, true),
@@ -83,31 +91,69 @@ public enum MobData {
     SADDLE_PIG("saddle", EntityType.PIG, Data.PIGSADDLE, true),
     ANGRY_WOLF("angry", EntityType.WOLF, Data.ANGRY, true),
     RABID_WOLF("rabid", EntityType.WOLF, Data.ANGRY, false),
-    FARMER_VILLAGER("farmer", EntityType.VILLAGER, Villager.Profession.FARMER, true),
-    LIBRARIAN_VILLAGER("librarian", EntityType.VILLAGER, Villager.Profession.LIBRARIAN, true),
-    PRIEST_VILLAGER("priest", EntityType.VILLAGER, Villager.Profession.PRIEST, true),
-    FATHER_VILLAGER("father", EntityType.VILLAGER, Villager.Profession.PRIEST, false),
-    SMITH_VILLAGER("smith", EntityType.VILLAGER, Villager.Profession.BLACKSMITH, true),
-    BUTCHER_VILLAGER("butcher", EntityType.VILLAGER, Villager.Profession.BUTCHER, true),
+    VILLAGER("villager", EntityType.VILLAGER, MobCompat.VillagerProfession.NONE, true),
+    ARMORER_VILLAGER("armorer", EntityType.VILLAGER, MobCompat.VillagerProfession.ARMORER, true),
+    BUTCHER_VILLAGER("butcher", EntityType.VILLAGER, MobCompat.VillagerProfession.BUTCHER, true),
+    CARTOGRAPHER_VILLAGER("cartographer", EntityType.VILLAGER, MobCompat.VillagerProfession.CARTOGRAPHER, true),
+    CLERIC_VILLAGER("cleric", EntityType.VILLAGER, MobCompat.VillagerProfession.CLERIC, true),
+    FARMER_VILLAGER("farmer", EntityType.VILLAGER, MobCompat.VillagerProfession.FARMER, true),
+    FISHERMAN_VILLAGER("fisherman", EntityType.VILLAGER, MobCompat.VillagerProfession.FISHERMAN, true),
+    FLETCHER_VILLAGER("fletcher", EntityType.VILLAGER, MobCompat.VillagerProfession.FLETCHER, true),
+    LEATHERWORKER_VILLAGER("leatherworker", EntityType.VILLAGER, MobCompat.VillagerProfession.LEATHERWORKER, true),
+    LIBRARIAN_VILLAGER("librarian", EntityType.VILLAGER, MobCompat.VillagerProfession.LIBRARIAN, true),
+    MASON_VILLAGER("mason", EntityType.VILLAGER, MobCompat.VillagerProfession.MASON, true),
+    NITWIT_VILLAGER("nitwit", EntityType.VILLAGER, MobCompat.VillagerProfession.NITWIT, true),
+    SHEPHERD_VILLAGER("shepherd", EntityType.VILLAGER, MobCompat.VillagerProfession.SHEPHERD, true),
+    TOOLSMITH_VILLAGER("toolsmith", EntityType.VILLAGER, MobCompat.VillagerProfession.TOOLSMITH, true),
+    WEAPONSMITH_VILLAGER("weaponsmith", EntityType.VILLAGER, MobCompat.VillagerProfession.WEAPONSMITH, true),
+    DESERT_VILLAGER("desert", EntityType.VILLAGER, "villagertype:DESERT", true),
+    JUNGLE_VILLAGER("jungle", EntityType.VILLAGER, "villagertype:JUNGLE", true),
+    PLAINS_VILLAGER("plains", EntityType.VILLAGER, "villagertype:PLAINS", true),
+    SAVANNA_VILLAGER("savanna", EntityType.VILLAGER, "villagertype:SAVANNA", true),
+    SNOWY_VILLAGER("snowy", EntityType.VILLAGER, "villagertype:SNOWY", true),
+    SWAMP_VILLAGER("swamp", EntityType.VILLAGER, "villagertype:SWAMP", true),
+    TAIGA_VILLAGER("taiga", EntityType.VILLAGER, "villagertype:TAIGA", true),
     SIZE_SLIME("", "<1-100>", EntityType.SLIME.getEntityClass(), Data.SIZE, true),
     NUM_EXPERIENCE_ORB("", "<1-2000000000>", EntityType.EXPERIENCE_ORB, Data.EXP, true),
-    RED_PARROT("red", EntityType.PARROT, Parrot.Variant.RED, true),
-    GREEN_PARROT("green", EntityType.PARROT, Parrot.Variant.GREEN, true),
-    BLUE_PARROT("blue", EntityType.PARROT, Parrot.Variant.BLUE, true),
-    CYAN_PARROT("cyan", EntityType.PARROT, Parrot.Variant.CYAN, true),
-    GRAY_PARROT("gray", EntityType.PARROT, Parrot.Variant.GRAY, true),
-    KOB_TROPICAL_FISH("kob", EntityType.TROPICAL_FISH, TropicalFish.Pattern.KOB, true),
-    SUNSTREAK_TROPICAL_FISH("sunstreak", EntityType.TROPICAL_FISH, TropicalFish.Pattern.SUNSTREAK, true),
-    SNOOPER_TROPICAL_FISH("snooper", EntityType.TROPICAL_FISH, TropicalFish.Pattern.SNOOPER, true),
-    DASHER_TROPICAL_FISH("dasher", EntityType.TROPICAL_FISH, TropicalFish.Pattern.DASHER, true),
-    BRINELY_TROPICAL_FISH("brinely", EntityType.TROPICAL_FISH, TropicalFish.Pattern.BRINELY, true),
-    SPOTTY_TROPICAL_FISH("spotty", EntityType.TROPICAL_FISH, TropicalFish.Pattern.SPOTTY, true),
-    FLOPPER_TROPICAL_FISH("flopper", EntityType.TROPICAL_FISH, TropicalFish.Pattern.FLOPPER, true),
-    STRIPEY_TROPICAL_FISH("stripey", EntityType.TROPICAL_FISH, TropicalFish.Pattern.STRIPEY, true),
-    GLITTER_TROPICAL_FISH("glitter", EntityType.TROPICAL_FISH, TropicalFish.Pattern.GLITTER, true),
-    BLOCKFISH_TROPICAL_FISH("blockfish", EntityType.TROPICAL_FISH, TropicalFish.Pattern.BLOCKFISH, true),
-    BETTY_TROPICAL_FISH("betty", EntityType.TROPICAL_FISH, TropicalFish.Pattern.BETTY, true),
-    CLAYFISH_TROPICAL_FISH("clayfish", EntityType.TROPICAL_FISH, TropicalFish.Pattern.CLAYFISH, true);
+    RED_PARROT("red", MobCompat.PARROT, "parrot:RED", true),
+    GREEN_PARROT("green", MobCompat.PARROT, "parrot:GREEN", true),
+    BLUE_PARROT("blue", MobCompat.PARROT, "parrot:BLUE", true),
+    CYAN_PARROT("cyan", MobCompat.PARROT, "parrot:CYAN", true),
+    GRAY_PARROT("gray", MobCompat.PARROT, "parrot:GRAY", true),
+    KOB_TROPICAL_FISH("kob", MobCompat.TROPICAL_FISH, "tropicalfish:KOB", true),
+    SUNSTREAK_TROPICAL_FISH("sunstreak", MobCompat.TROPICAL_FISH, "tropicalfish:SUNSTREAK", true),
+    SNOOPER_TROPICAL_FISH("snooper", MobCompat.TROPICAL_FISH, "tropicalfish:SNOOPER", true),
+    DASHER_TROPICAL_FISH("dasher", MobCompat.TROPICAL_FISH, "tropicalfish:DASHER", true),
+    BRINELY_TROPICAL_FISH("brinely", MobCompat.TROPICAL_FISH, "tropicalfish:BRINELY", true),
+    SPOTTY_TROPICAL_FISH("spotty", MobCompat.TROPICAL_FISH, "tropicalfish:SPOTTY", true),
+    FLOPPER_TROPICAL_FISH("flopper", MobCompat.TROPICAL_FISH, "tropicalfish:FLOPPER", true),
+    STRIPEY_TROPICAL_FISH("stripey", MobCompat.TROPICAL_FISH, "tropicalfish:STRIPEY", true),
+    GLITTER_TROPICAL_FISH("glitter", MobCompat.TROPICAL_FISH, "tropicalfish:GLITTER", true),
+    BLOCKFISH_TROPICAL_FISH("blockfish", MobCompat.TROPICAL_FISH, "tropicalfish:BLOCKFISH", true),
+    BETTY_TROPICAL_FISH("betty", MobCompat.TROPICAL_FISH, "tropicalfish:BETTY", true),
+    CLAYFISH_TROPICAL_FISH("clayfish", MobCompat.TROPICAL_FISH, "tropicalfish:CLAYFISH", true),
+    BROWN_MUSHROOM_COW("brown", EntityType.MUSHROOM_COW, "mooshroom:BROWN", true),
+    RED_MUSHROOM_COW("red", EntityType.MUSHROOM_COW, "mooshroom:RED", true),
+    AGGRESSIVE_PANDA_MAIN("aggressive", MobCompat.PANDA, "pandamain:AGGRESSIVE", true),
+    LAZY_PANDA_MAIN("lazy", MobCompat.PANDA, "pandamain:LAZY", true),
+    WORRIED_PANDA_MAIN("worried", MobCompat.PANDA, "pandamain:WORRIED", true),
+    PLAYFUL_PANDA_MAIN("playful", MobCompat.PANDA, "pandamain:PLAYFUL", true),
+    BROWN_PANDA_MAIN("brown", MobCompat.PANDA, "pandamain:BROWN", true),
+    WEAK_PANDA_MAIN("weak", MobCompat.PANDA, "pandamain:WEAK", true),
+    AGGRESSIVE_PANDA_HIDDEN("aggressive_hidden", MobCompat.PANDA, "pandahidden:AGGRESSIVE", true),
+    LAZY_PANDA_HIDDEN("lazy_hidden", MobCompat.PANDA, "pandahidden:LAZY", true),
+    WORRIED_PANDA_HIDDEN("worried_hidden", MobCompat.PANDA, "pandahidden:WORRIED", true),
+    PLAYFUL_PANDA_HIDDEN("playful_hidden", MobCompat.PANDA, "pandahidden:PLAYFUL", true),
+    BROWN_PANDA_HIDDEN("brown_hidden", MobCompat.PANDA, "pandahidden:BROWN", true),
+    WEAK_PANDA_HIDDEN("weak_hidden", MobCompat.PANDA, "pandahidden:WEAK", true),
+    CREAMY_LLAMA("creamy", MobCompat.LLAMA, "llama:CREAMY", true),
+    WHITE_LLAMA("white", MobCompat.LLAMA, "llama:WHITE", true),
+    BROWN_LLAMA("brown", MobCompat.LLAMA, "llama:BROWN", true),
+    GRAY_LLAMA("gray", MobCompat.LLAMA, "llama:GRAY", true),
+    CREAMY_TRADER_LLAMA("creamy", MobCompat.TRADER_LLAMA, "llama:CREAMY", true),
+    WHITE_TRADER_LLAMA("white", MobCompat.TRADER_LLAMA, "llama:WHITE", true),
+    BROWN_TRADER_LLAMA("brown", MobCompat.TRADER_LLAMA, "llama:BROWN", true),
+    GRAY_TRADER_LLAMA("gray", MobCompat.TRADER_LLAMA, "llama:GRAY", true)
     ;
 
 
@@ -127,6 +173,8 @@ public enum MobData {
         SIZE
     }
 
+
+
     public static final Logger logger = Logger.getLogger("Essentials");
 
     MobData(String n, Object type, Object value, boolean isPublic) {
@@ -157,9 +205,11 @@ public enum MobData {
     public static LinkedHashMap<String, MobData> getPossibleData(final Entity spawned, boolean publicOnly) {
         LinkedHashMap<String, MobData> mobList = new LinkedHashMap<String, MobData>();
         for (MobData data : MobData.values()) {
-            if (data.type instanceof EntityType && spawned.getType().equals(data.type) && ((publicOnly && data.isPublic) || !publicOnly)) {
+            if (data.type == null || (publicOnly && !data.isPublic)) continue;
+            
+            if (data.type instanceof EntityType && spawned.getType().equals(data.type)) {
                 mobList.put(data.nickname.toLowerCase(Locale.ENGLISH), data);
-            } else if (data.type instanceof Class && ((Class) data.type).isAssignableFrom(spawned.getClass()) && ((publicOnly && data.isPublic) || !publicOnly)) {
+            } else if (data.type instanceof Class && ((Class) data.type).isAssignableFrom(spawned.getClass())) {
                 mobList.put(data.nickname.toLowerCase(Locale.ENGLISH), data);
             }
         }
@@ -250,10 +300,10 @@ public enum MobData {
             ((Horse) spawned).setColor((Horse.Color) this.value);
         } else if (this.value instanceof Horse.Style) {
             ((Horse) spawned).setStyle((Horse.Style) this.value);
-        } else if (this.value instanceof Ocelot.Type) {
-            ((Ocelot) spawned).setCatType((Ocelot.Type) this.value);
-        } else if (this.value instanceof Villager.Profession) {
-            ((Villager) spawned).setProfession((Villager.Profession) this.value);
+        } else if (this.value instanceof MobCompat.CatType) {
+            MobCompat.setCatType(spawned, (MobCompat.CatType) this.value);
+        } else if (this.value instanceof MobCompat.VillagerProfession) {
+            MobCompat.setVillagerProfession(spawned, (MobCompat.VillagerProfession) this.value);
         } else if (this.value instanceof Material) {
             if (this.type.equals(EntityType.HORSE)) {
                 ((Horse) spawned).setTamed(true);
@@ -263,10 +313,33 @@ public enum MobData {
                 InventoryWorkaround.setItemInMainHand(invent, new ItemStack((Material) this.value, 1));
                 InventoryWorkaround.setItemInMainHandDropChance(invent, 0.1f);
             }
-        } else if (this.value instanceof Parrot.Variant) {
-            ((Parrot) spawned).setVariant((Parrot.Variant) this.value);
-        } else if (this.value instanceof TropicalFish.Pattern) {
-            ((TropicalFish) spawned).setPattern((TropicalFish.Pattern) this.value);
+        } else if (this.value instanceof String) {
+            final String[] split = ((String) this.value).split(":");
+            switch (split[0]) {
+                case "parrot":
+                    MobCompat.setParrotVariant(spawned, split[1]);
+                    break;
+                case "tropicalfish":
+                    MobCompat.setTropicalFishPattern(spawned, split[1]);
+                    break;
+                case "mooshroom":
+                    MobCompat.setMooshroomVariant(spawned, split[1]);
+                    break;
+                case "pandamain":
+                    MobCompat.setPandaGene(spawned, split[1], true);
+                    break;
+                case "pandahidden":
+                    MobCompat.setPandaGene(spawned, split[1], false);
+                    break;
+                case "llama":
+                    MobCompat.setLlamaColor(spawned, split[1]);
+                    break;
+                case "villagertype":
+                    MobCompat.setVillagerType(spawned, split[1]);
+                    break;
+            }
+        } else {
+            logger.warning("Unknown mob data type: " + this.toString());
         }
     }
 }

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

@@ -14,6 +14,7 @@ import org.bukkit.block.data.BlockData;
 import org.bukkit.conversations.Conversation;
 import org.bukkit.conversations.ConversationAbandonedEvent;
 import org.bukkit.entity.*;
+import org.bukkit.entity.memory.MemoryKey;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.inventory.*;
@@ -23,6 +24,7 @@ import org.bukkit.metadata.MetadataValue;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionAttachment;
 import org.bukkit.permissions.PermissionAttachmentInfo;
+import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
@@ -108,6 +110,15 @@ public class OfflinePlayer implements Player {
     public void setHealth(double d) {
     }
 
+    @Override
+    public double getAbsorptionAmount() {
+        return 0;
+    }
+
+    @Override
+    public void setAbsorptionAmount(double v) {
+    }
+
     @Override
     public boolean isInsideVehicle() {
         return false;
@@ -133,15 +144,24 @@ public class OfflinePlayer implements Player {
         return world;
     }
 
+    @Override
+    public void setRotation(float yaw, float pitch) {
+        location.setYaw(yaw);
+        location.setPitch(pitch);
+    }
+
     public void setLocation(Location loc) {
         location = loc;
         world = loc.getWorld();
     }
 
     public void teleportTo(Location lctn) {
+        location = lctn;
+        world = location.getWorld();
     }
 
     public void teleportTo(Entity entity) {
+        teleportTo(entity.getLocation());
     }
 
     @Override
@@ -153,6 +173,11 @@ public class OfflinePlayer implements Player {
         return null;
     }
 
+    @Override
+    public Pose getPose() {
+        return null;
+    }
+
     @Override
     public boolean performCommand(String string) {
         return false;
@@ -411,19 +436,6 @@ public class OfflinePlayer implements Player {
         return true;
     }
 
-    @Override
-    public void awardAchievement(Achievement a) {
-    }
-
-    @Override
-    public void removeAchievement(Achievement achievement) {
-    }
-
-    @Override
-    public boolean hasAchievement(Achievement achievement) {
-        return false;
-    }
-
     @Override
     public void incrementStatistic(Statistic ststc) {
     }
@@ -641,6 +653,14 @@ public class OfflinePlayer implements Player {
     public void setTotalExperience(int i) {
     }
 
+    @Override
+    public void sendExperienceChange(float v) {
+    }
+
+    @Override
+    public void sendExperienceChange(float v, int i) {
+    }
+
     @Override
     public float getExhaustion() {
         return 0F;
@@ -1326,6 +1346,16 @@ public class OfflinePlayer implements Player {
         return false;
     }
 
+    @Override
+    public <T> T getMemory(MemoryKey<T> memoryKey) {
+        return null;
+    }
+
+    @Override
+    public <T> void setMemory(MemoryKey<T> memoryKey, T t) {
+
+    }
+
     @Override
     public <T extends Projectile> T launchProjectile(Class<? extends T> type, Vector vector) {
         return null;
@@ -1335,6 +1365,11 @@ public class OfflinePlayer implements Player {
     public void sendSignChange(Location arg0, String[] arg1) throws IllegalArgumentException {
     }
 
+    @Override
+    public void sendSignChange(Location loc, String[] lines, DyeColor dyeColor) throws IllegalArgumentException {
+
+    }
+
     @Override
     public Location getBedSpawnLocation() {
         return null;
@@ -1605,4 +1640,13 @@ public class OfflinePlayer implements Player {
     @Override
 	public void updateCommands() {
 	}
+
+    @Override
+    public void openBook(ItemStack book) {
+    }
+
+    @Override
+    public PersistentDataContainer getPersistentDataContainer() {
+        return null;
+    }
 }

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

@@ -8,8 +8,8 @@ import com.earth2me.essentials.textreader.IText;
 import com.earth2me.essentials.textreader.SimpleTextInput;
 import com.earth2me.essentials.utils.EnumUtil;
 import com.earth2me.essentials.utils.FormatUtil;
+import com.earth2me.essentials.utils.LocationUtil;
 import com.earth2me.essentials.utils.NumberUtil;
-
 import net.ess3.api.IEssentials;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -24,15 +24,25 @@ import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
+import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
-import static com.earth2me.essentials.I18n.tl;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
+import static com.earth2me.essentials.I18n.tl;
+
 
 public class Settings implements net.ess3.api.ISettings {
     private final transient EssentialsConf config;
@@ -429,6 +439,7 @@ public class Settings implements net.ess3.api.ISettings {
             mFormat = mFormat.replace("{TEAMNAME}", "{5}");
             mFormat = mFormat.replace("{PREFIX}", "{6}");
             mFormat = mFormat.replace("{SUFFIX}", "{7}");
+            mFormat = mFormat.replace("{USERNAME}", "{8}");
             mFormat = "§r".concat(mFormat);
             chatFormats.put(group, mFormat);
         }
@@ -494,6 +505,7 @@ public class Settings implements net.ess3.api.ISettings {
         cancelAfkOnInteract = _cancelAfkOnInteract();
         cancelAfkOnMove = _cancelAfkOnMove();
         getFreezeAfkPlayers = _getFreezeAfkPlayers();
+        sleepIgnoresAfkPlayers = _sleepIgnoresAfkPlayers();
         afkListName = _getAfkListName();
         isAfkListName = !afkListName.equalsIgnoreCase("none");
         itemSpawnBl = _getItemSpawnBlacklist();
@@ -536,11 +548,17 @@ public class Settings implements net.ess3.api.ISettings {
         currencyFormat = _getCurrencyFormat();
         unprotectedSigns = _getUnprotectedSign();
         defaultEnabledConfirmCommands = _getDefaultEnabledConfirmCommands();
+        teleportBackWhenFreedFromJail = _isTeleportBackWhenFreedFromJail();
         isCompassTowardsHomePerm = _isCompassTowardsHomePerm();
         isAllowWorldInBroadcastworld = _isAllowWorldInBroadcastworld();
         itemDbType = _getItemDbType();
         forceEnableRecipe = _isForceEnableRecipe();
         allowOldIdSigns = _allowOldIdSigns();
+        isWaterSafe = _isWaterSafe();
+        isSafeUsermap = _isSafeUsermap();
+        logCommandBlockCommands = _logCommandBlockCommands();
+        nickBlacklist = _getNickBlacklist();
+        maxProjectileSpeed = _getMaxProjectileSpeed();
     }
 
     void _lateLoadItemSpawnBlacklist() {
@@ -893,6 +911,17 @@ public class Settings implements net.ess3.api.ISettings {
         return config.getBoolean("cancel-afk-on-interact", true);
     }
 
+    private boolean sleepIgnoresAfkPlayers;
+
+    @Override
+    public boolean sleepIgnoresAfkPlayers() {
+        return sleepIgnoresAfkPlayers;
+    }
+
+    private boolean _sleepIgnoresAfkPlayers() {
+        return config.getBoolean("sleep-ignores-afk-players", true);
+    }
+
     private String afkListName;
     private boolean isAfkListName;
 
@@ -1462,6 +1491,17 @@ public class Settings implements net.ess3.api.ISettings {
         return getDefaultEnabledConfirmCommands().contains(commandName.toLowerCase());
     }
 
+    private boolean teleportBackWhenFreedFromJail;
+
+    private boolean _isTeleportBackWhenFreedFromJail() {
+        return config.getBoolean("teleport-back-when-freed-from-jail", true);
+    }
+
+    @Override
+    public boolean isTeleportBackWhenFreedFromJail() {
+        return teleportBackWhenFreedFromJail;
+    }
+
     private boolean isCompassTowardsHomePerm;
 
     private boolean _isCompassTowardsHomePerm() {
@@ -1516,4 +1556,77 @@ public class Settings implements net.ess3.api.ISettings {
     public boolean allowOldIdSigns() {
         return allowOldIdSigns;
     }
+
+    private boolean isWaterSafe;
+
+    private boolean _isWaterSafe() {
+        boolean _isWaterSafe = config.getBoolean("is-water-safe", false);
+        LocationUtil.setIsWaterSafe(_isWaterSafe);
+
+        return _isWaterSafe;
+    }
+
+    @Override
+    public boolean isWaterSafe() {
+        return isWaterSafe;
+    }
+    
+    private boolean isSafeUsermap;
+
+    private boolean _isSafeUsermap() {
+        return config.getBoolean("safe-usermap-names", true);
+    }
+
+    @Override
+    public boolean isSafeUsermap() {
+        return isSafeUsermap;
+    }
+
+    private boolean logCommandBlockCommands;
+
+    private boolean _logCommandBlockCommands() {
+        return config.getBoolean("log-command-block-commands", true);
+    }
+
+    @Override
+    public boolean logCommandBlockCommands() {
+        return logCommandBlockCommands;
+    }
+
+    private Set<Predicate<String>> nickBlacklist;
+
+    private Set<Predicate<String>> _getNickBlacklist() {
+        Set<Predicate<String>> blacklist = new HashSet<>();
+
+        config.getStringList("nick-blacklist").forEach(entry -> {
+            try {
+                blacklist.add(Pattern.compile(entry).asPredicate());
+            } catch (PatternSyntaxException e) {
+                logger.warning("Invalid nickname blacklist regex: " + entry);
+            }
+        });
+
+        return blacklist;
+    }
+
+    @Override
+    public Set<Predicate<String>> getNickBlacklist() {
+        return nickBlacklist;
+    }
+
+    private double maxProjectileSpeed;
+
+    private double _getMaxProjectileSpeed() {
+        return config.getDouble("max-projectile-speed", 8);
+    }
+
+    @Override
+    public double getMaxProjectileSpeed() {
+        return maxProjectileSpeed;
+    }
+
+    @Override
+    public boolean isSpawnIfNoHome() {
+        return config.getBoolean("spawn-if-no-home", true);
+    }
 }

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

@@ -211,6 +211,39 @@ public class Teleport implements ITeleport {
         initTimer((long) (delay * 1000.0), teleportee, target, cashCharge, cause, false);
     }
 
+    private void teleportOther(IUser teleporter, IUser teleportee, ITarget target, Trade chargeFor, TeleportCause cause) throws Exception {
+        double delay = ess.getSettings().getTeleportDelay();
+
+        Trade cashCharge = chargeFor;
+
+        if (teleporter != null && chargeFor != null) {
+            chargeFor.isAffordableFor(teleporter);
+
+            //This code is to make sure that commandcosts are checked in the initial world, and not in the resulting world.
+            if (!chargeFor.getCommandCost(teleporter).equals(BigDecimal.ZERO)) {
+                //By converting a command cost to a regular cost, the command cost permission isn't checked when executing the charge after teleport.
+                cashCharge = new Trade(chargeFor.getCommandCost(teleporter), ess);
+            }
+        }
+
+        cooldown(true);
+        if (delay <= 0 || teleporter == null
+                || teleporter.isAuthorized("essentials.teleport.timer.bypass")
+                || teleportOwner.isAuthorized("essentials.teleport.timer.bypass")
+                || teleportee.isAuthorized("essentials.teleport.timer.bypass")) {
+            cooldown(false);
+            now(teleportee, target, cause);
+            if (teleporter != null && cashCharge != null) {
+                cashCharge.charge(teleporter);
+            }
+            return;
+        }
+
+        cancel(false);
+        warnUser(teleportee, delay);
+        initTimer((long) (delay * 1000.0), teleportee, target, cashCharge, cause, false);
+    }
+
     //The respawn function is a wrapper used to handle tp fallback, on /jail and /home
     @Override
     public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception {
@@ -269,10 +302,16 @@ public class Teleport implements ITeleport {
     //The back function is a wrapper used to teleportPlayer a player /back to their previous location.
     @Override
     public void back(Trade chargeFor) throws Exception {
+        back(teleportOwner, chargeFor);
+    }
+
+    //This function is a wrapper over the other back function for cases where another player performs back for them
+    @Override
+    public void back(IUser teleporter, Trade chargeFor) throws Exception {
         tpType = TeleportType.BACK;
         final Location loc = teleportOwner.getLastLocation();
         teleportOwner.sendMessage(tl("backUsageMsg", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
-        teleport(teleportOwner, new LocationTarget(loc), chargeFor, TeleportCause.COMMAND);
+        teleportOther(teleporter, teleportOwner, new LocationTarget(loc), chargeFor, TeleportCause.COMMAND);
     }
 
     //This function is used to throw a user back after a jail sentence

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

@@ -97,6 +97,11 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
         return result;
     }
 
+    @Override
+    public boolean isPermissionSet(final String node) {
+        return isPermSetCheck(node);
+    }
+
     private boolean isAuthorizedCheck(final String node) {
 
         if (base instanceof OfflinePlayer) {
@@ -116,6 +121,24 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
         }
     }
 
+    private boolean isPermSetCheck(final String node) {
+        if (base instanceof OfflinePlayer) {
+            return false;
+        }
+
+        try {
+            return ess.getPermissionsHandler().isPermissionSet(base, node);
+        } catch (Exception ex) {
+            if (ess.getSettings().isDebug()) {
+                ess.getLogger().log(Level.SEVERE, "Permission System Error: " + ess.getPermissionsHandler().getName() + " returned: " + ex.getMessage(), ex);
+            } else {
+                ess.getLogger().log(Level.SEVERE, "Permission System Error: " + ess.getPermissionsHandler().getName() + " returned: " + ex.getMessage());
+            }
+
+            return false;
+        }
+    }
+
     @Override
     public void healCooldown() throws Exception {
         final Calendar now = new GregorianCalendar();
@@ -139,10 +162,14 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
 
     @Override
     public void giveMoney(final BigDecimal value, final CommandSource initiator) throws MaxMoneyException {
+        giveMoney(value, initiator, UserBalanceUpdateEvent.Cause.UNKNOWN);
+    }
+
+    public void giveMoney(final BigDecimal value, final CommandSource initiator, UserBalanceUpdateEvent.Cause cause) throws MaxMoneyException {
         if (value.signum() == 0) {
             return;
         }
-        setMoney(getMoney().add(value));
+        setMoney(getMoney().add(value), cause);
         sendMessage(tl("addedToAccount", NumberUtil.displayCurrency(value, ess)));
         if (initiator != null) {
             initiator.sendMessage(tl("addedToOthersAccount", NumberUtil.displayCurrency(value, ess), this.getDisplayName(), NumberUtil.displayCurrency(getMoney(), ess)));
@@ -151,6 +178,10 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
 
     @Override
     public void payUser(final User reciever, final BigDecimal value) throws Exception {
+        payUser(reciever, value, UserBalanceUpdateEvent.Cause.UNKNOWN);
+    }
+
+    public void payUser(final User reciever, final BigDecimal value, UserBalanceUpdateEvent.Cause cause) throws Exception {
         if (value.compareTo(BigDecimal.ZERO) < 1) {
             throw new Exception(tl("payMustBePositive"));
         }
@@ -172,11 +203,15 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
 
     @Override
     public void takeMoney(final BigDecimal value, final CommandSource initiator) {
+        takeMoney(value, initiator, UserBalanceUpdateEvent.Cause.UNKNOWN);
+    }
+
+    public void takeMoney(final BigDecimal value, final CommandSource initiator, UserBalanceUpdateEvent.Cause cause) {
         if (value.signum() == 0) {
             return;
         }
         try {
-            setMoney(getMoney().subtract(value));
+            setMoney(getMoney().subtract(value), cause);
         } catch (MaxMoneyException ex) {
             ess.getLogger().log(Level.WARNING, "Invalid call to takeMoney, total balance can't be more than the max-money limit.", ex);
         }
@@ -417,6 +452,10 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
 
     @Override
     public void setMoney(final BigDecimal value) throws MaxMoneyException {
+        setMoney(value, UserBalanceUpdateEvent.Cause.UNKNOWN);
+    }
+
+    public void setMoney(final BigDecimal value, UserBalanceUpdateEvent.Cause cause) throws MaxMoneyException {
         if (ess.getSettings().isEcoDisabled()) {
             if (ess.getSettings().isDebug()) {
                 ess.getLogger().info("Internal economy functions disabled, aborting balance change.");
@@ -424,11 +463,11 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
             return;
         }
         final BigDecimal oldBalance = _getMoney();
-        
-        UserBalanceUpdateEvent updateEvent = new UserBalanceUpdateEvent(this.getBase(), oldBalance, value);
+
+        UserBalanceUpdateEvent updateEvent = new UserBalanceUpdateEvent(this.getBase(), oldBalance, value, cause);
         ess.getServer().getPluginManager().callEvent(updateEvent);
         BigDecimal newBalance = updateEvent.getNewBalance();
-        
+
         if (Methods.hasMethod()) {
             try {
                 final Method method = Methods.getMethod();
@@ -465,7 +504,7 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
             return;
         }
 
-        this.getBase().setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : set);
+        this.getBase().setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") || set && ess.getSettings().sleepIgnoresAfkPlayers());
         if (set && !isAfk()) {
             afkPosition = this.getLocation();
             this.afkSince = System.currentTimeMillis();
@@ -522,12 +561,14 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
                 setJailed(false);
                 sendMessage(tl("haveBeenReleased"));
                 setJail(null);
-                try {
-                    getTeleport().back();
-                } catch (Exception ex) {
+                if (ess.getSettings().isTeleportBackWhenFreedFromJail()) {
                     try {
-                        getTeleport().respawn(null, TeleportCause.PLUGIN);
-                    } catch (Exception ex1) {
+                        getTeleport().back();
+                    } catch (Exception ex) {
+                        try {
+                            getTeleport().respawn(null, TeleportCause.PLUGIN);
+                        } catch (Exception ex1) {
+                        }
                     }
                 }
                 return true;
@@ -546,6 +587,7 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
                 setMuteTimeout(0);
                 sendMessage(tl("canTalkAgain"));
                 setMuted(false);
+                setMuteReason(null);
                 return true;
             }
         }

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

@@ -17,6 +17,7 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static com.earth2me.essentials.I18n.tl;
 
@@ -74,6 +75,7 @@ public abstract class UserData extends PlayerExtension implements IConf {
         godmode = _getGodModeEnabled();
         muted = _getMuted();
         muteTimeout = _getMuteTimeout();
+        muteReason = _getMuteReason();
         jailed = _getJailed();
         jailTimeout = _getJailTimeout();
         lastLogin = _getLastLogin();
@@ -93,6 +95,7 @@ public abstract class UserData extends PlayerExtension implements IConf {
         acceptingPay = _getAcceptingPay();
         confirmPay = _getConfirmPay();
         confirmClear = _getConfirmClear();
+        lastMessageReplyRecipient = _getLastMessageReplyRecipient();
     }
 
     private BigDecimal money;
@@ -232,10 +235,10 @@ public abstract class UserData extends PlayerExtension implements IConf {
         config.save();
     }
 
-    private List<Material> unlimited;
+    private Set<Material> unlimited;
 
-    private List<Material> _getUnlimited() {
-        List<Material> retlist = new ArrayList<>();
+    private Set<Material> _getUnlimited() {
+        Set<Material> retlist = new HashSet<>();
         List<String> configList = config.getStringList("unlimited");
         for(String s : configList) {
             Material mat = Material.matchMaterial(s);
@@ -247,7 +250,7 @@ public abstract class UserData extends PlayerExtension implements IConf {
         return retlist;
     }
 
-    public List<Material> getUnlimited() {
+    public Set<Material> getUnlimited() {
         return unlimited;
     }
 
@@ -256,13 +259,20 @@ public abstract class UserData extends PlayerExtension implements IConf {
     }
 
     public void setUnlimited(ItemStack stack, boolean state) {
-        if (unlimited.contains(stack.getType())) {
-            unlimited.remove(stack.getType());
-        }
+        boolean wasUpdated;
         if (state) {
-            unlimited.add(stack.getType());
+            wasUpdated = unlimited.add(stack.getType());
+        } else {
+            wasUpdated = unlimited.remove(stack.getType());
         }
-        config.setProperty("unlimited", unlimited);
+
+        if (wasUpdated) {
+            applyUnlimited();
+        }
+    }
+
+    private void applyUnlimited() {
+        config.setProperty("unlimited", unlimited.stream().map(Enum::name).collect(Collectors.toList()));
         config.save();
     }
 
@@ -446,6 +456,22 @@ public abstract class UserData extends PlayerExtension implements IConf {
         config.save();
     }
 
+    private boolean autoTeleportEnabled;
+
+    private boolean _getAutoTeleportEnabled() {
+        return config.getBoolean("teleportauto", false);
+    }
+
+    public boolean isAutoTeleportEnabled() {
+        return autoTeleportEnabled;
+    }
+
+    public void setAutoTeleportEnabled(boolean set) {
+        autoTeleportEnabled = set;
+        config.setProperty("teleportauto", set);
+        config.save();
+    }
+
     private List<String> ignoredPlayers;
 
     public List<String> _getIgnoredPlayers() {
@@ -503,6 +529,7 @@ public abstract class UserData extends PlayerExtension implements IConf {
     }
 
     private boolean muted;
+    private String muteReason;
 
     public boolean _getMuted() {
         return config.getBoolean("muted", false);
@@ -522,6 +549,29 @@ public abstract class UserData extends PlayerExtension implements IConf {
         config.save();
     }
 
+    public String _getMuteReason() {
+        return config.getString("muteReason");
+    }
+
+    public String getMuteReason() {
+        return muteReason;
+    }
+
+    public void setMuteReason(String reason) {
+        if (reason == null) {
+            config.removeProperty("muteReason");
+            muteReason = null;
+        } else {
+            muteReason = reason;
+            config.setProperty("muteReason", reason);
+        }
+        config.save();
+    }
+
+    public boolean hasMuteReason(){
+        return muteReason != null;
+    }
+
     private long muteTimeout;
 
     private long _getMuteTimeout() {
@@ -759,15 +809,16 @@ public abstract class UserData extends PlayerExtension implements IConf {
     }
 
     public long getKitTimestamp(String name) {
-        name = name.replace('.', '_').replace('/', '_');
+        name = name.replace('.', '_').replace('/', '_').toLowerCase(Locale.ENGLISH);
         if (kitTimestamps != null && kitTimestamps.containsKey(name)) {
             return kitTimestamps.get(name);
         }
-        return 0l;
+        return 0L;
     }
 
-    public void setKitTimestamp(final String name, final long time) {
-        kitTimestamps.put(name.toLowerCase(Locale.ENGLISH), time);
+    public void setKitTimestamp(String name, final long time) {
+        name = name.replace('.', '_').replace('/', '_').toLowerCase(Locale.ENGLISH);
+        kitTimestamps.put(name, time);
         config.setProperty("timestamps.kits", kitTimestamps);
         config.save();
     }
@@ -814,7 +865,7 @@ public abstract class UserData extends PlayerExtension implements IConf {
     private Map<Pattern, Long> commandCooldowns;
 
     private Map<Pattern, Long> _getCommandCooldowns() {
-        if (!config.isConfigurationSection("timestamps.command-cooldowns")) {
+        if (!config.contains("timestamps.command-cooldowns")) {
             return null;
         }
 
@@ -941,6 +992,22 @@ public abstract class UserData extends PlayerExtension implements IConf {
         save();
     }
 
+    private boolean lastMessageReplyRecipient;
+
+    private boolean _getLastMessageReplyRecipient() {
+        return config.getBoolean("last-message-reply-recipient", ess.getSettings().isLastMessageReplyRecipient());
+    }
+
+    public boolean isLastMessageReplyRecipient() {
+        return this.lastMessageReplyRecipient;
+    }
+
+    public void setLastMessageReplyRecipient(boolean enabled) {
+        this.lastMessageReplyRecipient = enabled;
+        config.setProperty("last-message-reply-recipient", enabled);
+        save();
+    }
+
     public UUID getConfigUUID() {
         return config.uuid;
     }

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

@@ -123,7 +123,7 @@ public class UserMap extends CacheLoader<String, User> implements IConf {
         if (uuid != null) {
             keys.add(uuid);
             if (name != null && name.length() > 0) {
-                final String keyName = StringUtil.safeString(name);
+                final String keyName = ess.getSettings().isSafeUsermap() ? StringUtil.safeString(name) : name;
                 if (!names.containsKey(keyName)) {
                     names.put(keyName, uuid);
                     uuidMap.writeUUIDMap();

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

@@ -8,6 +8,7 @@ import com.earth2me.essentials.utils.StringUtil;
 import com.google.common.base.Charsets;
 import net.ess3.api.IEssentials;
 import net.ess3.api.MaxMoneyException;
+import net.ess3.api.events.UserBalanceUpdateEvent;
 import org.bukkit.entity.Player;
 
 import java.io.File;
@@ -144,7 +145,7 @@ public class Economy {
             throw new NoLoanPermittedException();
         }
         try {
-            user.setMoney(balance);
+            user.setMoney(balance, UserBalanceUpdateEvent.Cause.API);
         } catch (MaxMoneyException ex) {
             //TODO: Update API to show max balance errors
         }

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

@@ -33,6 +33,9 @@ public interface IItemDb {
     /**
      * Create a stack from the given name with the maximum stack size for that material.
      *
+     * Note that this will always check against resolver functions from other plugins as well.
+     * To avoid this behaviour, use net.ess3.api.IItemDb#get(String name, boolean useResolvers).
+     *
      * @param name Item name to look up in the database
      * @return The requested item stack with the maximum stack size
      * @throws Exception if the item stack cannot be created
@@ -127,11 +130,13 @@ public interface IItemDb {
      * item IDs to modern names.
      *
      * @param item Legacy ID in colon syntax.
-     * @return
+     * @return Material if an appropriate material exists, else null.
      */
     default Material getFromLegacy(String item) {
         final String[] split = item.split(":");
 
+        if (!NumberUtil.isInt(split[0])) return null;
+
         final int id = Integer.parseInt(split[0]);
         byte damage = 0;
 

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

@@ -110,6 +110,19 @@ public interface ITeleport {
      */
     void back(Trade chargeFor) throws Exception;
 
+    /**
+     * Teleport wrapper used to handle /back teleports that
+     * are executed by a different player with this
+     * instance of teleport as a target.
+     *
+     * @param teleporter - The user performing the /back command.
+     *                   This value may be {@code null} to indicate console.
+     * @param chargeFor - What the {@code teleporter} will be charged if teleportPlayer is successful
+     *
+     * @throws Exception
+     */
+    void back(IUser teleporter, Trade chargeFor) throws Exception;
+
     /**
      * Teleport wrapper used to handle throwing user home after a jail sentence
      *

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

@@ -24,10 +24,6 @@ public class Commandafk extends EssentialsCommand {
                 afkUser = getPlayer(server, user, args, 0);
                 message = args.length > 1 ? getFinalArg(args, 1) : null;
             } catch (PlayerNotFoundException e) {
-                // If only one arg is passed, assume the command executor is targeting another player.
-                if (args.length == 1) {
-                    throw e;
-                }
                 message = getFinalArg(args, 0);
             }
             toggleAfk(user, afkUser, message);
@@ -51,7 +47,7 @@ public class Commandafk extends EssentialsCommand {
     private void toggleAfk(User sender, User user, String message) throws Exception {
         if (message != null && sender != null) {
             if (sender.isMuted()) {
-                throw new Exception(tl("voiceSilenced"));
+                throw new Exception(sender.hasMuteReason() ? tl("voiceSilencedReason", sender.getMuteReason()) : tl("voiceSilenced"));
             }
             if (!sender.isAuthorized("essentials.afk.message")) {
                 throw new Exception(tl("noPermToAFKMessage"));

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

@@ -1,8 +1,15 @@
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.CommandSource;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
 import org.bukkit.Server;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 import static com.earth2me.essentials.I18n.tl;
 
@@ -13,24 +20,82 @@ public class Commandback extends EssentialsCommand {
     }
 
     @Override
-    protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
+    protected void run(Server server, User user, String commandLabel, String[] args) throws Exception {
+        CommandSource sender = user.getSource();
+        if (args.length > 0 && user.isAuthorized("essentials.back.others")) {
+            this.parseCommand(server, sender, args, true);
+            return;
+        }
+
+        teleportBack(sender, user);
+    }
+
+    @Override
+    protected void run(Server server, CommandSource sender, String commandLabel, String[] args) throws Exception {
+        if (args.length < 1) {
+            throw new NotEnoughArgumentsException();
+        }
+
+        this.parseCommand(server, sender, args, true);
+    }
+
+    private void parseCommand(Server server, CommandSource sender, String[] args, boolean allowOthers) throws Exception {
+        Collection<Player> players = new ArrayList<>();
+
+        if (allowOthers && args.length > 0 && args[0].trim().length() > 2) {
+            players = server.matchPlayer(args[0].trim());
+        }
+
+        if (players.size() < 1) {
+            throw new PlayerNotFoundException();
+        }
+
+        for (Player player : players) {
+            sender.sendMessage(tl("backOther", player.getName()));
+            teleportBack(sender, ess.getUser(player));
+        }
+    }
+
+    private void teleportBack(CommandSource sender, User user) throws Exception {
         if (user.getLastLocation() == null) {
             throw new Exception(tl("noLocationFound"));
         }
 
         String lastWorldName = user.getLastLocation().getWorld().getName();
 
-        if (user.getWorld() != user.getLastLocation().getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + lastWorldName)) {
-            throw new Exception(tl("noPerm", "essentials.worlds." + lastWorldName));
+        User requester = null;
+        if (sender.isPlayer()) {
+            requester = ess.getUser(sender.getPlayer());
+
+            if (user.getWorld() != user.getLastLocation().getWorld() && this.ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + lastWorldName)) {
+                throw new Exception(tl("noPerm", "essentials.worlds." + lastWorldName));
+            }
+
+            if (!requester.isAuthorized("essentials.back.into." + lastWorldName)) {
+                throw new Exception(tl("noPerm", "essentials.back.into." + lastWorldName));
+            }
         }
 
-        if (!user.isAuthorized("essentials.back.into." + lastWorldName)) {
-            throw new Exception(tl("noPerm", "essentials.back.into." + lastWorldName));
+        if (requester == null) {
+            user.getTeleport().back(null, null);
+        } else if (!requester.equals(user)) {
+            Trade charge = new Trade(this.getName(), this.ess);
+            charge.isAffordableFor(requester);
+            user.getTeleport().back(requester, charge);
+        } else {
+            Trade charge = new Trade(this.getName(), this.ess);
+            charge.isAffordableFor(user);
+            user.getTeleport().back(charge);
         }
-
-        final Trade charge = new Trade(this.getName(), ess);
-        charge.isAffordableFor(user);
-        user.getTeleport().back(charge);
         throw new NoChargeException();
     }
+
+    @Override
+    protected List<String> getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) {
+        if (user.isAuthorized("essentials.back.others") && args.length == 1) {
+            return getPlayers(server, user);
+        } else {
+            return Collections.emptyList();
+        }
+    }
 }

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

@@ -102,11 +102,13 @@ public class Commandbalancetop extends EssentialsCommand {
                                     // Don't list NPCs in output
                                     continue;
                                 }
-                                final BigDecimal userMoney = user.getMoney();
-                                user.updateMoneyCache(userMoney);
-                                totalMoney = totalMoney.add(userMoney);
-                                final String name = user.isHidden() ? user.getName() : user.getDisplayName();
-                                balances.put(name, userMoney);
+                                if (!user.isAuthorized("essentials.balancetop.exclude")) {
+                                    final BigDecimal userMoney = user.getMoney();
+                                    user.updateMoneyCache(userMoney);
+                                    totalMoney = totalMoney.add(userMoney);
+                                    final String name = user.isHidden() ? user.getName() : user.getDisplayName();
+                                    balances.put(name, userMoney);
+                                }
                             }
                         }
                     }

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

@@ -0,0 +1,35 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.Mob;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.VersionUtil;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.entity.Entity;
+
+import static com.earth2me.essentials.I18n.tl;
+
+public class Commandbeezooka extends EssentialsCommand {
+
+    public Commandbeezooka() {
+        super("beezooka");
+    }
+
+    @Override
+    protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
+        if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_15_R01)) {
+            user.sendMessage(tl("unsupportedFeature"));
+            return;
+        }
+
+        final Entity bee = Mob.BEE.spawn(user.getWorld(), server, user.getBase().getEyeLocation());
+        bee.setVelocity(user.getBase().getEyeLocation().getDirection().multiply(2));
+
+        ess.scheduleSyncDelayedTask(() -> {
+            final Location loc = bee.getLocation();
+            bee.remove();
+            loc.getWorld().createExplosion(loc, 0F);
+        }, 20);
+    }
+
+}

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

@@ -135,6 +135,10 @@ public class Commandcondense extends EssentialsCommand {
 
         if (recipe instanceof ShapedRecipe) {
             ShapedRecipe sRecipe = (ShapedRecipe) recipe;
+            if (sRecipe.getShape().length != sRecipe.getShape()[0].length()) {
+                // Only accept square recipes
+                return null;
+            }
             inputList = sRecipe.getIngredientMap().values();
         } else if (recipe instanceof ShapelessRecipe) {
             ShapelessRecipe slRecipe = (ShapelessRecipe) recipe;

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

@@ -0,0 +1,45 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.CommandSource;
+import com.earth2me.essentials.Kit;
+import com.google.common.collect.Lists;
+import org.bukkit.Server;
+
+import java.util.Collections;
+import java.util.List;
+
+import static com.earth2me.essentials.I18n.tl;
+
+
+public class Commanddelkit extends EssentialsCommand {
+    public Commanddelkit() {
+        super("delkit");
+    }
+
+    @Override
+    public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
+        if (args.length < 1) {
+            final String kitList = ess.getKits().listKits(ess, null);
+            sender.sendMessage(kitList.length() > 0 ? tl("kits", kitList) : tl("noKits"));
+            throw new NoChargeException();
+        } else {
+            final String kitName = args[0];
+            final Kit kit = new Kit(kitName, ess);
+
+            if (sender.getPlayer() != null) {
+                kit.checkPerms(ess.getUser(sender.getPlayer()));
+            }
+
+            ess.getKits().removeKit(kitName);
+            sender.sendMessage(tl("deleteKit", kitName));
+        }
+    }
+
+    @Override
+    protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
+        if (args.length == 1) {
+            return Lists.newArrayList(ess.getKits().getKits().getKeys(false));
+        }
+        return Collections.emptyList();
+    }
+}

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

@@ -14,7 +14,7 @@ public class Commanddisposal extends EssentialsCommand {
     @Override
     protected void run(Server server, User user, String commandLabel, String[] args) throws Exception {
         user.sendMessage(tl("openingDisposal"));
-        user.getBase().openInventory(ess.getServer().createInventory(user.getBase(), 36, "Disposal"));
+        user.getBase().openInventory(ess.getServer().createInventory(user.getBase(), 36, tl("disposal")));
     }
 
 }

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

@@ -6,6 +6,7 @@ import com.earth2me.essentials.User;
 import com.earth2me.essentials.utils.NumberUtil;
 import com.google.common.collect.Lists;
 import net.ess3.api.MaxMoneyException;
+import net.ess3.api.events.UserBalanceUpdateEvent;
 import org.bukkit.Server;
 
 import java.math.BigDecimal;
@@ -54,7 +55,7 @@ public class Commandeco extends EssentialsLoopCommand {
     protected void updatePlayer(final Server server, final CommandSource sender, final User player, final String[] args) throws NotEnoughArgumentsException, ChargeException, MaxMoneyException {
         switch (cmd) {
             case GIVE:
-                player.giveMoney(amount, sender);
+                player.giveMoney(amount, sender, UserBalanceUpdateEvent.Cause.COMMAND_ECO);
                 break;
 
             case TAKE:
@@ -72,10 +73,10 @@ public class Commandeco extends EssentialsLoopCommand {
         BigDecimal money = player.getMoney();
         BigDecimal minBalance = ess.getSettings().getMinMoney();
         if (money.subtract(amount).compareTo(minBalance) >= 0) {
-            player.takeMoney(amount, sender);
+            player.takeMoney(amount, sender, UserBalanceUpdateEvent.Cause.COMMAND_ECO);
         } else if (sender == null) {
             try {
-                player.setMoney(minBalance);
+                player.setMoney(minBalance, UserBalanceUpdateEvent.Cause.COMMAND_ECO);
             } catch (MaxMoneyException ex) {
                 // Take shouldn't be able to throw a max money exception
             }
@@ -90,7 +91,7 @@ public class Commandeco extends EssentialsLoopCommand {
         BigDecimal maxBalance = ess.getSettings().getMaxMoney();
         boolean underMinimum = (amount.compareTo(minBalance) < 0);
         boolean aboveMax = (amount.compareTo(maxBalance) > 0);
-        player.setMoney(underMinimum ? minBalance : aboveMax ? maxBalance : amount);
+        player.setMoney(underMinimum ? minBalance : aboveMax ? maxBalance : amount, UserBalanceUpdateEvent.Cause.COMMAND_ECO);
         player.sendMessage(tl("setBal", NumberUtil.displayCurrency(player.getMoney(), ess)));
         if (sender != null) {
             sender.sendMessage(tl("setBalOthers", player.getDisplayName(), NumberUtil.displayCurrency(player.getMoney(), ess)));

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

@@ -6,96 +6,144 @@ import com.earth2me.essentials.User;
 import com.earth2me.essentials.UserMap;
 import com.earth2me.essentials.utils.*;
 import com.google.common.base.Charsets;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
-import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.Sound;
-import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
+import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.*;
+import java.util.function.Supplier;
 
 import static com.earth2me.essentials.I18n.tl;
 
 // This command has 4 undocumented behaviours #EasterEgg
 public class Commandessentials extends EssentialsCommand {
 
-    private final Sound NOTE_HARP = EnumUtil.valueOf(Sound.class, "BLOCK_NOTE_HARP", "NOTE_PIANO");
+    private static final Sound NOTE_HARP = EnumUtil.valueOf(Sound.class, "BLOCK_NOTE_BLOCK_HARP", "BLOCK_NOTE_HARP", "NOTE_PIANO");
+    private static final Sound MOO_SOUND = EnumUtil.valueOf(Sound.class, "COW_IDLE", "ENTITY_COW_MILK");
+
+    private static final String NYAN_TUNE = "1D#,1E,2F#,,2A#,1E,1D#,1E,2F#,2B,2D#,2E,2D#,2A#,2B,,2F#,,1D#,1E,2F#,2B,2C#,2A#,2B,2C#,2E,2D#,2E,2C#,,2F#,,2G#,,1D,1D#,,1C#,1D,1C#,1B,,1B,,1C#,,1D,,1D,1C#,1B,1C#,1D#,2F#,2G#,1D#,2F#,1C#,1D#,1B,1C#,1B,1D#,,2F#,,2G#,1D#,2F#,1C#,1D#,1B,1D,1D#,1D,1C#,1B,1C#,1D,,1B,1C#,1D#,2F#,1C#,1D,1C#,1B,1C#,,1B,,1C#,,2F#,,2G#,,1D,1D#,,1C#,1D,1C#,1B,,1B,,1C#,,1D,,1D,1C#,1B,1C#,1D#,2F#,2G#,1D#,2F#,1C#,1D#,1B,1C#,1B,1D#,,2F#,,2G#,1D#,2F#,1C#,1D#,1B,1D,1D#,1D,1C#,1B,1C#,1D,,1B,1C#,1D#,2F#,1C#,1D,1C#,1B,1C#,,1B,,1B,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1B,,";
+    private static final String[] CONSOLE_MOO = new String[]{"         (__)", "         (oo)", "   /------\\/", "  / |    ||", " *  /\\---/\\", "    ~~   ~~", "....\"Have you mooed today?\"..."};
+    private static final String[] PLAYER_MOO = new String[]{"            (__)", "            (oo)", "   /------\\/", "  /  |      | |", " *  /\\---/\\", "    ~~    ~~", "....\"Have you mooed today?\"..."};
 
     public Commandessentials() {
         super("essentials");
     }
 
-    private transient int taskid;
-    private final transient Map<Player, Block> noteBlocks = new HashMap<Player, Block>();
+    private transient TuneRunnable currentTune = null;
 
-    private final List<String> versionPlugins = Arrays.asList(
-            "Vault",
-            "LuckPerms",
-            "PermissionsEx",
-            "GroupManager"
+    private static final List<String> versionPlugins = Arrays.asList(
+        "Vault", // API
+        "Reserve", // API
+        "PlaceholderAPI", // API
+        "CMI", // potential for issues
+        "Towny", // past issues; admins should ensure latest
+        "ChestShop", // past issues; admins should ensure latest
+        "Citizens", // fires player events
+        "LuckPerms", // permissions (recommended)
+        "UltraPermissions",
+        "PermissionsEx", // permissions (unsupported)
+        "GroupManager", // permissions (unsupported)
+        "bPermissions" // permissions (unsupported)
     );
 
-    private final List<String> officialPlugins = Arrays.asList(
-            "EssentialsAntiBuild",
-            "EssentialsChat",
-            "EssentialsGeoIP",
-            "EssentialsProtect",
-            "EssentialsSpawn",
-            "EssentialsXMPP"
+    private static final List<String> officialPlugins = Arrays.asList(
+        "EssentialsAntiBuild",
+        "EssentialsChat",
+        "EssentialsGeoIP",
+        "EssentialsProtect",
+        "EssentialsSpawn",
+        "EssentialsXMPP"
     );
 
-    private final List<String> warnPlugins = Arrays.asList(
-            "PermissionsEx",
-            "GroupManager"
+    private static final List<String> warnPlugins = Arrays.asList(
+        "PermissionsEx",
+        "GroupManager",
+        "bPremissions"
     );
 
     @Override
     public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
         if (args.length == 0) {
-            run_disabled(server, sender, commandLabel, args);
-        } else if (args[0].equalsIgnoreCase("debug")) {
-            run_debug(server, sender, commandLabel, args);
-        } else if (args[0].equalsIgnoreCase("nya")) {
-            run_nya(server, sender, commandLabel, args);
-        } else if (args[0].equalsIgnoreCase("moo")) {
-            run_moo(server, sender, commandLabel, args);
-        } else if (args[0].equalsIgnoreCase("reset")) {
-            run_reset(server, sender, commandLabel, args);
-        } else if (args[0].equalsIgnoreCase("cleanup")) {
-            run_cleanup(server, sender, commandLabel, args);
-        } else if (args[0].equalsIgnoreCase("uuidconvert")) {
-            run_uuidconvert(server, sender, commandLabel, args);
-        } else if (args[0].equalsIgnoreCase("uuidtest")) {
-            run_uuidtest(server, sender, commandLabel, args);
-        } else if (args[0].equalsIgnoreCase("version")) {
-            run_version(server, sender, commandLabel, args);
-        } else {
-            run_reload(server, sender, commandLabel, args);
+            showUsage(sender);
+        }
+
+        switch(args[0]) {
+            // Info commands
+            case "debug":
+            case "verbose":
+                runDebug(server, sender, commandLabel, args);
+                break;
+                
+            case "ver":
+            case "version":
+                runVersion(server, sender, commandLabel, args);
+                break;
+                
+            case "cmd":
+            case "commands":
+                runCommands(server, sender, commandLabel, args);
+                break;
+                
+            // Data commands
+            case "reload":
+                runReload(server, sender, commandLabel, args);
+                break;
+            case "reset":
+                runReset(server, sender, commandLabel, args);
+                break;
+            case "cleanup":
+                runCleanup(server, sender, commandLabel, args);
+                break;
+            case "uuidconvert":
+                runUUIDConvert(server, sender, commandLabel, args);
+                break;
+            case "uuidtest":
+                runUUIDTest(server, sender, commandLabel, args);
+                break;
+                
+            // "#EasterEgg"
+            case "nya":
+            case "nyan":
+                runNya(server, sender, commandLabel, args);
+                break;
+            case "moo":
+                runMoo(server, sender, commandLabel, args);
+                break;
+            default:
+                showUsage(sender);    
         }
     }
 
-    //If you do not supply an argument this command will list 'overridden' commands.
-    private void run_disabled(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
-        sender.sendMessage("/<command> <reload/debug>");
+    // Displays the command's usage.
+    private void showUsage(final CommandSource sender) throws Exception {
+        throw new NotEnoughArgumentsException("/<command> <reload/debug/commands>");
+    }
 
+    // Lists commands that are being handed over to other plugins.
+    private void runCommands(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
         final StringBuilder disabledCommands = new StringBuilder();
         for (Map.Entry<String, String> entry : ess.getAlternativeCommandsHandler().disabledCommands().entrySet()) {
             if (disabledCommands.length() > 0) {
-                disabledCommands.append(", ");
+                disabledCommands.append("\n");
             }
             disabledCommands.append(entry.getKey()).append(" => ").append(entry.getValue());
         }
         if (disabledCommands.length() > 0) {
             sender.sendMessage(tl("blockList"));
             sender.sendMessage(disabledCommands.toString());
+        } else {
+            sender.sendMessage(tl("blockListEmpty"));
         }
     }
 
-    private void run_reset(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
+    // Resets the given player's user data.
+    private void runReset(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
         if (args.length < 2) {
             throw new Exception("/<command> reset <player>");
         }
@@ -104,108 +152,59 @@ public class Commandessentials extends EssentialsCommand {
         sender.sendMessage("Reset Essentials userdata for player: " + user.getDisplayName());
     }
 
-    private void run_debug(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
+    // Toggles debug mode.
+    private void runDebug(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
         ess.getSettings().setDebug(!ess.getSettings().isDebug());
         sender.sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
     }
 
-    private void run_reload(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
+    // Reloads all reloadable configs.
+    private void runReload(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
         ess.reload();
         sender.sendMessage(tl("essentialsReload", ess.getDescription().getVersion()));
     }
 
-    private void run_nya(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
-        final Map<String, Float> noteMap = new HashMap<String, Float>();
-        noteMap.put("1F#", 0.5f);
-        noteMap.put("1G", 0.53f);
-        noteMap.put("1G#", 0.56f);
-        noteMap.put("1A", 0.6f);
-        noteMap.put("1A#", 0.63f);
-        noteMap.put("1B", 0.67f);
-        noteMap.put("1C", 0.7f);
-        noteMap.put("1C#", 0.76f);
-        noteMap.put("1D", 0.8f);
-        noteMap.put("1D#", 0.84f);
-        noteMap.put("1E", 0.9f);
-        noteMap.put("1F", 0.94f);
-        noteMap.put("2F#", 1.0f);
-        noteMap.put("2G", 1.06f);
-        noteMap.put("2G#", 1.12f);
-        noteMap.put("2A", 1.18f);
-        noteMap.put("2A#", 1.26f);
-        noteMap.put("2B", 1.34f);
-        noteMap.put("2C", 1.42f);
-        noteMap.put("2C#", 1.5f);
-        noteMap.put("2D", 1.6f);
-        noteMap.put("2D#", 1.68f);
-        noteMap.put("2E", 1.78f);
-        noteMap.put("2F", 1.88f);
-        final String tuneStr = "1D#,1E,2F#,,2A#,1E,1D#,1E,2F#,2B,2D#,2E,2D#,2A#,2B,,2F#,,1D#,1E,2F#,2B,2C#,2A#,2B,2C#,2E,2D#,2E,2C#,,2F#,,2G#,,1D,1D#,,1C#,1D,1C#,1B,,1B,,1C#,,1D,,1D,1C#,1B,1C#,1D#,2F#,2G#,1D#,2F#,1C#,1D#,1B,1C#,1B,1D#,,2F#,,2G#,1D#,2F#,1C#,1D#,1B,1D,1D#,1D,1C#,1B,1C#,1D,,1B,1C#,1D#,2F#,1C#,1D,1C#,1B,1C#,,1B,,1C#,,2F#,,2G#,,1D,1D#,,1C#,1D,1C#,1B,,1B,,1C#,,1D,,1D,1C#,1B,1C#,1D#,2F#,2G#,1D#,2F#,1C#,1D#,1B,1C#,1B,1D#,,2F#,,2G#,1D#,2F#,1C#,1D#,1B,1D,1D#,1D,1C#,1B,1C#,1D,,1B,1C#,1D#,2F#,1C#,1D,1C#,1B,1C#,,1B,,1B,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1B,,";
-        final String[] tune = tuneStr.split(",");
-        taskid = ess.scheduleSyncRepeatingTask(new Runnable() {
-            int i = 0;
-
-            @Override
-            public void run() {
-                final String note = tune[i];
-                i++;
-                if (i >= tune.length) {
-                    Commandessentials.this.stopTune();
-                }
-                if (note == null || note.isEmpty()) {
-                    return;
-                }
-
-                for (Player onlinePlayer : ess.getOnlinePlayers()) {
-                    onlinePlayer.playSound(onlinePlayer.getLocation(), NOTE_HARP, 1, noteMap.get(note));
-                }
-            }
-        }, 20, 2);
-    }
-
-    private void stopTune() {
-        ess.getScheduler().cancelTask(taskid);
-        for (Block block : noteBlocks.values()) {
-            if (block.getType() == Material.NOTE_BLOCK) {
-                block.setType(Material.AIR);
-            }
+    // Pop tarts.
+    private void runNya(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
+        if (currentTune != null) {
+            currentTune.cancel();
         }
-        noteBlocks.clear();
+
+        currentTune = new TuneRunnable(NYAN_TUNE, NOTE_HARP, ess::getOnlinePlayers);
+        currentTune.runTaskTimer(ess, 20, 2);
     }
 
-    private final String[] consoleMoo = new String[]{"         (__)", "         (oo)", "   /------\\/", "  / |    ||", " *  /\\---/\\", "    ~~   ~~", "....\"Have you mooed today?\"..."};
-    private final String[] playerMoo = new String[]{"            (__)", "            (oo)", "   /------\\/", "  /  |      | |", " *  /\\---/\\", "    ~~    ~~", "....\"Have you mooed today?\"..."};
-
-    private void run_moo(final Server server, final CommandSource sender, final String command, final String args[]) {
-        Sound moo = EnumUtil.valueOf(Sound.class, "COW_IDLE", "ENTITY_COW_MILK");
-
+    // Cow farts.
+    private void runMoo(final Server server, final CommandSource sender, final String command, final String args[]) {
         if (args.length == 2 && args[1].equals("moo")) {
-            for (String s : consoleMoo) {
+            for (String s : CONSOLE_MOO) {
                 logger.info(s);
             }
             for (Player player : ess.getOnlinePlayers()) {
-                player.sendMessage(playerMoo);
-                player.playSound(player.getLocation(), moo, 1, 1.0f);
+                player.sendMessage(PLAYER_MOO);
+                player.playSound(player.getLocation(), MOO_SOUND, 1, 1.0f);
             }
         } else {
             if (sender.isPlayer()) {
-                sender.getSender().sendMessage(playerMoo);
+                sender.getSender().sendMessage(PLAYER_MOO);
                 final Player player = sender.getPlayer();
-                player.playSound(player.getLocation(), moo, 1, 1.0f);
+                player.playSound(player.getLocation(), MOO_SOUND, 1, 1.0f);
 
             } else {
-                sender.getSender().sendMessage(consoleMoo);
+                sender.getSender().sendMessage(CONSOLE_MOO);
             }
         }
     }
 
-    private void run_cleanup(final Server server, final CommandSource sender, final String command, final String args[]) throws Exception {
+    // Cleans up inactive users.
+    private void runCleanup(final Server server, final CommandSource sender, final String command, final String args[]) throws Exception {
         if (args.length < 2 || !NumberUtil.isInt(args[1])) {
-            sender.sendMessage("This sub-command will delete users who havent logged in in the last <days> days.");
-            sender.sendMessage("Optional parameters define the minium amount required to prevent deletion.");
-            sender.sendMessage("Unless you define larger default values, this command wil ignore people who have more than 0 money/homes.");
+            sender.sendMessage("This sub-command will delete users who haven't logged in in the last <days> days.");
+            sender.sendMessage("Optional parameters define the minimum amount required to prevent deletion.");
+            sender.sendMessage("Unless you define larger default values, this command will ignore people who have more than 0 money/homes.");
             throw new Exception("/<command> cleanup <days> [money] [homes]");
         }
+
         sender.sendMessage(tl("cleaning"));
 
         final long daysArg = Long.parseLong(args[1]);
@@ -213,59 +212,58 @@ public class Commandessentials extends EssentialsCommand {
         final int homesArg = args.length >= 4 && NumberUtil.isInt(args[3]) ? Integer.parseInt(args[3]) : 0;
         final UserMap userMap = ess.getUserMap();
 
-        ess.runTaskAsynchronously(new Runnable() {
-            @Override
-            public void run() {
-                Long currTime = System.currentTimeMillis();
-                for (UUID u : userMap.getAllUniqueUsers()) {
-                    final User user = ess.getUserMap().getUser(u);
-                    if (user == null) {
-                        continue;
-                    }
-
-                    long lastLog = user.getLastLogout();
-                    if (lastLog == 0) {
-                        lastLog = user.getLastLogin();
-                    }
-                    if (lastLog == 0) {
-                        user.setLastLogin(currTime);
-                    }
-
-                    if (user.isNPC()) {
-                        continue;
-                    }
-
-                    long timeDiff = currTime - lastLog;
-                    long milliDays = daysArg * 24L * 60L * 60L * 1000L;
-                    int homeCount = user.getHomes().size();
-                    double moneyCount = user.getMoney().doubleValue();
-
-                    if ((lastLog == 0) || (timeDiff < milliDays) || (homeCount > homesArg) || (moneyCount > moneyArg)) {
-                        continue;
-                    }
-
-                    if (ess.getSettings().isDebug()) {
-                        ess.getLogger().info("Deleting user: " + user.getName() + " Money: " + moneyCount + " Homes: " + homeCount + " Last seen: " + DateUtil.formatDateDiff(lastLog));
-                    }
-
-                    user.reset();
+        ess.runTaskAsynchronously(() -> {
+            Long currTime = System.currentTimeMillis();
+            for (UUID u : userMap.getAllUniqueUsers()) {
+                final User user = ess.getUserMap().getUser(u);
+                if (user == null) {
+                    continue;
                 }
-                sender.sendMessage(tl("cleaned"));
+
+                long lastLog = user.getLastLogout();
+                if (lastLog == 0) {
+                    lastLog = user.getLastLogin();
+                }
+                if (lastLog == 0) {
+                    user.setLastLogin(currTime);
+                }
+
+                if (user.isNPC()) {
+                    continue;
+                }
+
+                long timeDiff = currTime - lastLog;
+                long milliDays = daysArg * 24L * 60L * 60L * 1000L;
+                int homeCount = user.getHomes().size();
+                double moneyCount = user.getMoney().doubleValue();
+
+                if ((lastLog == 0) || (timeDiff < milliDays) || (homeCount > homesArg) || (moneyCount > moneyArg)) {
+                    continue;
+                }
+
+                if (ess.getSettings().isDebug()) {
+                    ess.getLogger().info("Deleting user: " + user.getName() + " Money: " + moneyCount + " Homes: " + homeCount + " Last seen: " + DateUtil.formatDateDiff(lastLog));
+                }
+
+                user.reset();
             }
+            sender.sendMessage(tl("cleaned"));
         });
 
     }
 
-    private void run_uuidconvert(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
-        sender.sendMessage("Starting Essentials UUID userdata conversion, this may lag the server.");
+    // Forces a rerun of userdata UUID conversion.
+    private void runUUIDConvert(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
+        sender.sendMessage("Starting Essentials UUID userdata conversion; this may lag the server.");
 
         Boolean ignoreUFCache = (args.length > 2 && args[1].toLowerCase(Locale.ENGLISH).contains("ignore"));
         EssentialsUpgrade.uuidFileConvert(ess, ignoreUFCache);
 
-        sender.sendMessage("UUID conversion complete, check your server log for more information.");
+        sender.sendMessage("UUID conversion complete. Check your server log for more information.");
     }
 
-    private void run_uuidtest(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
+    // Looks up various UUIDs for a user.
+    private void runUUIDTest(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
         if (args.length < 2) {
             throw new Exception("/<command> uuidtest <name>");
         }
@@ -302,7 +300,8 @@ public class Commandessentials extends EssentialsCommand {
         sender.sendMessage("Offline Mode UUID: " + offlineuuid.toString());
     }
 
-    private void run_version(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
+    // Displays versions of EssentialsX and related plugins.
+    private void runVersion(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
         if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.version")) return;
 
         boolean isMismatched = false;
@@ -369,47 +368,101 @@ public class Commandessentials extends EssentialsCommand {
     protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
         if (args.length == 1) {
             List<String> options = Lists.newArrayList();
-            options.add("reload");
             options.add("debug");
-            //options.add("nya");
-            //options.add("moo");
+            options.add("commands");
+            options.add("version");
+            options.add("reload");
             options.add("reset");
             options.add("cleanup");
             //options.add("uuidconvert");
             //options.add("uuidtest");
-            options.add("version");
+            //options.add("nya");
+            //options.add("moo");
             return options;
-        } else if (args[0].equalsIgnoreCase("debug")) {
-            // No args
-        } else if (args[0].equalsIgnoreCase("nya")) {
-            // No args
-        } else if (args[0].equalsIgnoreCase("moo")) {
-            if (args.length == 2) {
-                return Lists.newArrayList("moo");
-            }
-        } else if (args[0].equalsIgnoreCase("reset")) {
-            if (args.length == 2) {
-                return getPlayers(server, sender);
-            }
-        } else if (args[0].equalsIgnoreCase("cleanup")) {
-            if (args.length == 2) {
-                return COMMON_DURATIONS;
-            } else if (args.length == 3 || args.length == 4) {
-                return Lists.newArrayList("-1", "0");
-            }
-        } else if (args[0].equalsIgnoreCase("uuidconvert")) {
-            if (args.length == 2) {
-                return Lists.newArrayList("ignoreUFCache");
-            }
-        } else if (args[0].equalsIgnoreCase("uuidtest")) {
-            if (args.length == 2) {
-                return getPlayers(server, sender);
-            }
-        } else if (args[0].equalsIgnoreCase("version")) {
-            // No args
-        } else {
-            // No args
         }
+
+        switch (args[0]) {
+            case "moo":
+                if (args.length == 2) {
+                    return Lists.newArrayList("moo");
+                }
+                break;
+            case "reset":
+            case "uuidtest":
+                if (args.length == 2) {
+                    return getPlayers(server, sender);
+                }
+                break;
+            case "cleanup":
+                if (args.length == 2) {
+                    return COMMON_DURATIONS;
+                } else if (args.length == 3 || args.length == 4) {
+                    return Lists.newArrayList("-1", "0");
+                }
+                break;
+            case "uuidconvert":
+                if (args.length == 2) {
+                    return Lists.newArrayList("ignoreUFCache");
+                }
+                break;
+        }
+
         return Collections.emptyList();
     }
+    
+    private static class TuneRunnable extends BukkitRunnable {
+        private static final Map<String, Float> noteMap = ImmutableMap.<String, Float>builder()
+            .put("1F#", 0.5f)
+            .put("1G", 0.53f)
+            .put("1G#", 0.56f)
+            .put("1A", 0.6f)
+            .put("1A#", 0.63f)
+            .put("1B", 0.67f)
+            .put("1C", 0.7f)
+            .put("1C#", 0.76f)
+            .put("1D", 0.8f)
+            .put("1D#", 0.84f)
+            .put("1E", 0.9f)
+            .put("1F", 0.94f)
+            .put("2F#", 1.0f)
+            .put("2G", 1.06f)
+            .put("2G#", 1.12f)
+            .put("2A", 1.18f)
+            .put("2A#", 1.26f)
+            .put("2B", 1.34f)
+            .put("2C", 1.42f)
+            .put("2C#", 1.5f)
+            .put("2D", 1.6f)
+            .put("2D#", 1.68f)
+            .put("2E", 1.78f)
+            .put("2F", 1.88f)
+            .build();
+
+        private final String[] tune;
+        private final Sound sound;
+        private final Supplier<Collection<Player>> players;
+        private int i = 0;
+
+        TuneRunnable(final String tuneStr, final Sound sound, final Supplier<Collection<Player>> players) {
+            this.tune = tuneStr.split(",");
+            this.sound = sound;
+            this.players = players;
+        }
+
+        @Override
+        public void run() {
+            final String note = tune[i];
+            i++;
+            if (i >= tune.length) {
+                cancel();
+            }
+            if (note == null || note.isEmpty()) {
+                return;
+            }
+
+            for (Player onlinePlayer : players.get()) {
+                onlinePlayer.playSound(onlinePlayer.getLocation(), sound, 1, noteMap.get(note));
+            }
+        }
+    }
 }

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

@@ -36,6 +36,18 @@ public class Commandexp extends EssentialsCommand {
             } else {
                 setExp(user.getSource(), user, args[1], true);
             }
+        } else if (args.length > 1 && args[0].equalsIgnoreCase("take") && user.isAuthorized("essentials.exp.take")) {
+            if (args.length == 3 && user.isAuthorized("essentials.exp.take.others")) {
+                expMatch(server, user.getSource(), args[1], "-" + args[2], true);
+            } else {
+                setExp(user.getSource(), user, "-" + args[1], true);
+            }        
+        } else if (args.length < 3 && args[0].equalsIgnoreCase("reset") && user.isAuthorized("essentials.exp.reset")) {
+            if (args.length == 2 && user.isAuthorized("essentials.exp.reset.others")) {
+                expMatch(server, user.getSource(), args[1], "0", false);
+            } else {
+                setExp(user.getSource(), user, "0", false);
+            }
         } else if (args[0].equalsIgnoreCase("show")) {
             if (args.length >= 2 && user.isAuthorized("essentials.exp.others")) {
                 String match = args[1].trim();
@@ -159,6 +171,12 @@ public class Commandexp extends EssentialsCommand {
             if (user.isAuthorized("essentials.exp.give")) {
                 options.add("give");
             }
+            if (user.isAuthorized("essentials.exp.take")) {
+                options.add("take");
+            }
+            if (user.isAuthorized("essentials.exp.reset")) {
+                options.add("reset");
+            }
             return options;
         } else if (args.length == 2) {
             if ((args[0].equalsIgnoreCase("set") && user.isAuthorized("essentials.exp.set")) || (args[0].equalsIgnoreCase("give") && user.isAuthorized("essentials.exp.give"))) {
@@ -184,7 +202,7 @@ public class Commandexp extends EssentialsCommand {
     protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
         if (args.length == 1) {
             // TODO: This seems somewhat buggy, both setting and showing - right now, ignoring that
-            return Lists.newArrayList("set", "give", "show");
+            return Lists.newArrayList("set", "give", "show", "take", "reset");
         } else if (args.length == 2) {
             if (args[0].equalsIgnoreCase("set") || args[0].equalsIgnoreCase("give")) {
                 String levellessArg = args[1].toLowerCase(Locale.ENGLISH).replace("l", "");

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

@@ -1,6 +1,9 @@
 package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.FloatUtil;
+import com.earth2me.essentials.utils.VersionUtil;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import org.bukkit.Server;
 import org.bukkit.entity.*;
@@ -8,44 +11,86 @@ import org.bukkit.util.Vector;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.earth2me.essentials.I18n.tl;
 
 public class Commandfireball extends EssentialsCommand {
+    private static final Map<String, Class<? extends Projectile>> types;
+
+    static {
+        ImmutableMap.Builder<String, Class<? extends Projectile>> builder = ImmutableMap.<String, Class<? extends Projectile>>builder()
+                .put("fireball", Fireball.class)
+                .put("small", SmallFireball.class)
+                .put("large", LargeFireball.class)
+                .put("arrow", Arrow.class)
+                .put("skull", WitherSkull.class)
+                .put("egg", Egg.class)
+                .put("snowball", Snowball.class)
+                .put("expbottle", ThrownExpBottle.class)
+                .put("splashpotion", SplashPotion.class)
+                .put("lingeringpotion", LingeringPotion.class);
+
+        if (VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_9_R01)) {
+            builder.put("dragon", DragonFireball.class);
+        }
+
+        if (VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_13_0_R01)) {
+            builder.put("trident", Trident.class);
+        }
+
+        types = builder.build();
+    }
+
     public Commandfireball() {
         super("fireball");
     }
 
     @Override
     protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
-        Class<? extends Entity> type = Fireball.class;
-        Projectile projectile;
-        int speed = 2;
-        if (args.length > 0) {
-            if (args[0].equalsIgnoreCase("small")) {
-                type = SmallFireball.class;
-            } else if (args[0].equalsIgnoreCase("arrow")) {
-                type = Arrow.class;
-            } else if (args[0].equalsIgnoreCase("skull")) {
-                type = WitherSkull.class;
-            } else if (args[0].equalsIgnoreCase("egg")) {
-                type = Egg.class;
-            } else if (args[0].equalsIgnoreCase("snowball")) {
-                type = Snowball.class;
-            } else if (args[0].equalsIgnoreCase("expbottle")) {
-                type = ThrownExpBottle.class;
-            } else if (args[0].equalsIgnoreCase("large")) {
-                type = LargeFireball.class;
+        String type = "fireball";
+        double speed = 2;
+        boolean ride = false;
+
+        if (args.length > 0 && types.containsKey(args[0])) {
+            type = args[0];
+        }
+
+        if (args.length > 1) {
+            try {
+                speed = FloatUtil.parseDouble(args[1]);
+                speed = Double.max(0, Double.min(speed, ess.getSettings().getMaxProjectileSpeed()));
+            } catch (Exception ignored) {
             }
         }
+
+        if (args.length > 2 && args[2].equalsIgnoreCase("ride") && user.isAuthorized("essentials.fireball.ride")) {
+            ride = true;
+        }
+
+        if (!user.isAuthorized("essentials.fireball." + type)) {
+            throw new Exception(tl("noPerm", "essentials.fireball." + type));
+        }
+
         final Vector direction = user.getBase().getEyeLocation().getDirection().multiply(speed);
-        projectile = (Projectile) user.getWorld().spawn(user.getBase().getEyeLocation().add(direction.getX(), direction.getY(), direction.getZ()), type);
+        Projectile projectile = user.getWorld().spawn(user.getBase().getEyeLocation().add(direction.getX(), direction.getY(), direction.getZ()), types.get(type));
         projectile.setShooter(user.getBase());
         projectile.setVelocity(direction);
+
+        if (ride) {
+            projectile.addPassenger(user.getBase());
+        }
     }
 
     @Override
     protected List<String> getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) {
         if (args.length == 1) {
-            return Lists.newArrayList("small", "arrow", "skull", "egg", "snowball", "expbottle", "large");
+            return types.keySet().stream()
+                    .filter(type -> user.isAuthorized("essentials.fireball." + type))
+                    .collect(Collectors.toList());
+        } else if (args.length == 2) {
+            return Lists.newArrayList("1", "2", "3", "4", "5");
         } else {
             return Collections.emptyList();
         }

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

@@ -35,6 +35,10 @@ public class Commandhat extends EssentialsCommand {
         } else {
             final ItemStack hand = user.getItemInHand();
             if (hand != null && hand.getType() != Material.AIR) {
+                if (user.isAuthorized("essentials.hat.prevent-type." + hand.getType().name().toLowerCase())) {
+                    user.sendMessage(tl("hatFail"));
+                    return;
+                }
                 if (hand.getType().getMaxDurability() == 0) {
                     final PlayerInventory inv = user.getBase().getInventory();
                     final ItemStack head = inv.getHelmet();

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

@@ -53,7 +53,11 @@ public class Commandhome extends EssentialsCommand {
             Location bed = player.getBase().getBedSpawnLocation();
             final List<String> homes = player.getHomes();
             if (homes.isEmpty() && player.equals(user)) {
-                user.getTeleport().respawn(charge, TeleportCause.COMMAND);
+                if (ess.getSettings().isSpawnIfNoHome()) {
+                    user.getTeleport().respawn(charge, TeleportCause.COMMAND);
+                } else {
+                    throw new Exception(tl("noHomeSetPlayer"));
+                }
             } else if (homes.isEmpty()) {
                 throw new Exception(tl("noHomeSetPlayer"));
             } else if (homes.size() == 1 && player.equals(user)) {
@@ -95,6 +99,7 @@ public class Commandhome extends EssentialsCommand {
             throw new Exception(tl("noPerm", "essentials.worlds." + loc.getWorld().getName()));
         }
         user.getTeleport().teleport(loc, charge, TeleportCause.COMMAND);
+        user.sendMessage(tl("teleportHome", home));
     }
 
     @Override

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

@@ -0,0 +1,40 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n.tl;
+
+import com.earth2me.essentials.CommandSource;
+import com.earth2me.essentials.I18n;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.FormatUtil;
+
+import com.earth2me.essentials.utils.MaterialUtil;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+import java.util.Locale;
+
+public class Commanditemname extends EssentialsCommand {
+    
+    public Commanditemname() {
+        super("itemname");
+    }
+
+    @Override
+    protected void run(Server server, User user, String commandLabel, String[] args) throws Exception {
+        ItemStack item = user.getBase().getItemInHand();
+        if (item.getType().name().contains("AIR")) {
+            user.sendMessage(tl("itemnameInvalidItem", item.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' ')));
+            return;
+        }
+
+        String name = FormatUtil.formatString(user, "essentials.itemname", getFinalArg(args, 0)).trim();
+        if (name.isEmpty()) name = null;
+
+        ItemMeta im = item.getItemMeta();
+        im.setDisplayName(name);
+        item.setItemMeta(im);
+        user.sendMessage(name == null ? tl("itemnameClear") : tl("itemnameSuccess", name));
+    }
+}

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

@@ -4,7 +4,11 @@ import com.earth2me.essentials.Mob;
 import com.earth2me.essentials.User;
 import org.bukkit.Location;
 import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.entity.Cat;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Ocelot;
+import org.bukkit.entity.Tameable;
 
 import java.util.Random;
 
@@ -18,16 +22,7 @@ public class Commandkittycannon extends EssentialsCommand {
 
     @Override
     protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
-        final Mob cat = Mob.OCELOT;
-        final Ocelot ocelot = (Ocelot) cat.spawn(user.getWorld(), server, user.getBase().getEyeLocation());
-        if (ocelot == null) {
-            return;
-        }
-        final int i = random.nextInt(Ocelot.Type.values().length);
-        ocelot.setCatType(Ocelot.Type.values()[i]);
-        ocelot.setTamed(true);
-        ocelot.setBaby();
-        ocelot.setVelocity(user.getBase().getEyeLocation().getDirection().multiply(2));
+        final Entity ocelot = Mob.CAT.getType() == null ? spawnOcelot(user.getWorld(), server, user) : spawnCat(user.getWorld(), server, user);
 
         class KittyCannonExplodeTask implements Runnable {
             @Override
@@ -40,4 +35,32 @@ public class Commandkittycannon extends EssentialsCommand {
         ess.scheduleSyncDelayedTask(new KittyCannonExplodeTask(), 20);
 
     }
+
+    private static Ocelot spawnOcelot(World world, Server server, User user) throws Mob.MobException {
+        final Ocelot ocelot = (Ocelot) Mob.OCELOT.spawn(user.getWorld(), server, user.getBase().getEyeLocation());
+        if (ocelot == null) {
+            return null;
+        }
+        final int i = random.nextInt(Ocelot.Type.values().length);
+        ocelot.setCatType(Ocelot.Type.values()[i]);
+        ((Tameable) ocelot).setTamed(true);
+        ocelot.setBaby();
+        ocelot.setVelocity(user.getBase().getEyeLocation().getDirection().multiply(2));
+
+        return ocelot;
+    }
+
+    private static Entity spawnCat(World world, Server server, User user) throws Mob.MobException {
+        final Cat cat = (Cat) Mob.CAT.spawn(user.getWorld(), server, user.getBase().getEyeLocation());
+        if (cat == null) {
+            return null;
+        }
+        final int i = random.nextInt(Cat.Type.values().length);
+        cat.setCatType(Cat.Type.values()[i]);
+        cat.setTamed(true);
+        cat.setBaby();
+        cat.setVelocity(user.getBase().getEyeLocation().getDirection().multiply(2));
+
+        return cat;
+    }
 }

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

@@ -48,7 +48,7 @@ public class Commandmail extends EssentialsCommand {
             }
 
             if (user.isMuted()) {
-                throw new Exception(tl("voiceSilenced"));
+                throw new Exception(user.hasMuteReason() ? tl("voiceSilencedReason", user.getMuteReason()) : tl("voiceSilenced"));
             }
 
             User u = getPlayer(server, args[1], true, true);
@@ -87,6 +87,11 @@ public class Commandmail extends EssentialsCommand {
             return;
         }
         if (args.length >= 1 && "clear".equalsIgnoreCase(args[0])) {
+            if (user.getMails() == null || user.getMails().isEmpty()) {
+                user.sendMessage(tl("noMail"));
+                throw new NoChargeException();
+            }
+
             user.setMails(null);
             user.sendMessage(tl("mailCleared"));
             return;

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

@@ -24,7 +24,7 @@ public class Commandme extends EssentialsCommand {
     @Override
     public void run(Server server, User user, String commandLabel, String[] args) throws Exception {
         if (user.isMuted()) {
-            throw new Exception(tl("voiceSilenced"));
+            throw new Exception(user.hasMuteReason() ? tl("voiceSilencedReason", user.getMuteReason()) : tl("voiceSilenced"));
         }
 
         if (args.length < 1) {

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

@@ -29,7 +29,7 @@ public class Commandmsg extends EssentialsLoopCommand {
         if (sender.isPlayer()) {
             User user = ess.getUser(sender.getPlayer());
             if (user.isMuted()) {
-                throw new Exception(tl("voiceSilenced"));
+                throw new Exception(user.hasMuteReason() ? tl("voiceSilencedReason", user.getMuteReason()) : tl("voiceSilenced"));
             }
             message = FormatUtil.formatMessage(user, "essentials.msg", message);
             canWildcard = user.isAuthorized("essentials.msg.multiple");

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

@@ -41,7 +41,7 @@ public class Commandmute extends EssentialsCommand {
             }
         }
         
-        final boolean willMute = (args.length > 1) ? true : !user.getMuted();
+        final boolean willMute = (args.length > 1) || !user.getMuted();
         final User controller = sender.isPlayer() ? ess.getUser(sender.getPlayer()) : null;
         final MuteStatusChangeEvent event = new MuteStatusChangeEvent(user, controller, willMute);
         ess.getServer().getPluginManager().callEvent(event);
@@ -50,11 +50,22 @@ public class Commandmute extends EssentialsCommand {
             long muteTimestamp = 0;
 
             if (args.length > 1) {
-                final String time = getFinalArg(args, 1);
-                muteTimestamp = DateUtil.parseDateDiff(time, true);
+                final String time = args[1];
+                String muteReason;
+                try {
+                    muteTimestamp = DateUtil.parseDateDiff(time, true);
+                    muteReason = getFinalArg(args, 2);
+                } catch (Exception e) {
+                    muteReason = getFinalArg(args, 1);
+                }
+
+                user.setMuteReason(muteReason.isEmpty() ? null : muteReason);
                 user.setMuted(true);
             } else {
                 user.setMuted(!user.getMuted());
+                if (!user.getMuted()) {
+                    user.setMuteReason(null);
+                }
             }
             user.setMuteTimeout(muteTimestamp);
             final boolean muted = user.getMuted();
@@ -66,17 +77,35 @@ public class Commandmute extends EssentialsCommand {
 
             if (muted) {
                 if (muteTimestamp > 0) {
-                    sender.sendMessage(tl("mutedPlayerFor", user.getDisplayName(), muteTime));
-                    user.sendMessage(tl("playerMutedFor", muteTime));
+                    if (!user.hasMuteReason()) {
+                        sender.sendMessage(tl("mutedPlayerFor", user.getDisplayName(), muteTime));
+                        user.sendMessage(tl("playerMutedFor", muteTime));
+                    } else {
+                        sender.sendMessage(tl("mutedPlayerForReason", user.getDisplayName(), muteTime, user.getMuteReason()));
+                        user.sendMessage(tl("playerMutedForReason", muteTime, user.getMuteReason()));
+                    }
                 } else {
-                    sender.sendMessage(tl("mutedPlayer", user.getDisplayName()));
-                    user.sendMessage(tl("playerMuted"));
+                    if (!user.hasMuteReason()) {
+                        sender.sendMessage(tl("mutedPlayer", user.getDisplayName()));
+                        user.sendMessage(tl("playerMuted"));
+                    } else {
+                        sender.sendMessage(tl("mutedPlayerReason", user.getDisplayName(), user.getMuteReason()));
+                        user.sendMessage(tl("playerMutedReason", user.getMuteReason()));
+                    }
                 }
                 final String message;
                 if (muteTimestamp > 0) {
-                    message = tl("muteNotifyFor", sender.getSender().getName(), user.getName(), muteTime);
+                    if (!user.hasMuteReason()) {
+                        message = tl("muteNotifyFor", sender.getSender().getName(), user.getName(), muteTime);
+                    } else {
+                        message = tl("muteNotifyForReason", sender.getSender().getName(), user.getName(), muteTime, user.getMuteReason());
+                    }
                 } else {
-                    message = tl("muteNotify", sender.getSender().getName(), user.getName());
+                    if (!user.hasMuteReason()) {
+                        message = tl("muteNotify", sender.getSender().getName(), user.getName());
+                    } else {
+                        message = tl("muteNotifyReason", sender.getSender().getName(), user.getName(), user.getMuteReason());
+                    }
                 }
                 server.getLogger().log(Level.INFO, message);
                 ess.broadcastMessage("essentials.mute.notify", message);

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

@@ -9,6 +9,8 @@ import org.bukkit.World;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.PriorityQueue;
+import java.util.Queue;
 
 import static com.earth2me.essentials.I18n.tl;
 
@@ -83,6 +85,8 @@ public class Commandnear extends EssentialsCommand {
         final long radiusSquared = radius * radius;
         boolean showHidden = user.canInteractVanished();
 
+        Queue<User> nearbyPlayers = new PriorityQueue<>((o1, o2) -> (int) (o1.getLocation().distanceSquared(loc) - o2.getLocation().distanceSquared(loc)));
+
         for (User player : ess.getOnlineUsers()) {
             if (!player.equals(user) && (!player.isHidden(user.getBase()) || showHidden || user.getBase().canSee(player.getBase()))) {
                 final Location playerLoc = player.getLocation();
@@ -92,13 +96,19 @@ public class Commandnear extends EssentialsCommand {
 
                 final long delta = (long) playerLoc.distanceSquared(loc);
                 if (delta < radiusSquared) {
-                    if (output.length() > 0) {
-                        output.append(", ");
-                    }
-                    output.append(player.getDisplayName()).append("§f(§4").append((long) Math.sqrt(delta)).append("m§f)");
+                    nearbyPlayers.offer(player);
                 }
             }
         }
+
+        while (!nearbyPlayers.isEmpty()) {
+            if (output.length() > 0) {
+                output.append(", ");
+            }
+            User nearbyPlayer = nearbyPlayers.poll();
+            output.append(nearbyPlayer.getDisplayName()).append("§f(§4").append((long) nearbyPlayer.getLocation().distance(loc)).append("m§f)");
+        }
+
         return output.length() > 1 ? output.toString() : tl("none");
     }
 

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

@@ -83,10 +83,17 @@ public class Commandnick extends EssentialsLoopCommand {
             throw new Exception(tl("nickNamesAlpha"));
         } else if (user != null && (user.isAuthorized("essentials.nick.changecolors") && !user.isAuthorized("essentials.nick.changecolors.bypass")) && !FormatUtil.stripFormat(newNick).equals(user.getName())) {
             throw new Exception(tl("nickNamesOnlyColorChanges"));
+        } else if (user != null && !user.isAuthorized("essentials.nick.blacklist.bypass") && isNickBanned(newNick)) {
+            throw new Exception(tl("nickNameBlacklist", nick));
         }
         return newNick;
     }
 
+    private boolean isNickBanned(String newNick) {
+        return ess.getSettings().getNickBlacklist().stream()
+            .anyMatch(entry -> entry.test(newNick));
+    }
+
     private int getNickLength(final String nick) {
         return ess.getSettings().ignoreColorsInMaxLength() ? ChatColor.stripColor(nick).length() : nick.length();
     }

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

@@ -9,6 +9,7 @@ import com.earth2me.essentials.utils.StringUtil;
 
 import com.google.common.collect.Lists;
 import net.ess3.api.MaxMoneyException;
+import net.ess3.api.events.UserBalanceUpdateEvent;
 import org.bukkit.Server;
 
 import java.math.BigDecimal;
@@ -73,7 +74,7 @@ public class Commandpay extends EssentialsLoopCommand {
                 user.getConfirmingPayments().put(player, amount);
                 return;
             }
-            user.payUser(player, amount);
+            user.payUser(player, amount, UserBalanceUpdateEvent.Cause.COMMAND_PAY);
             user.getConfirmingPayments().remove(player);
             Trade.log("Command", "Pay", "Player", user.getName(), new Trade(amount, ess), player.getName(), new Trade(amount, ess), user.getLocation(), ess);
         } catch (MaxMoneyException ex) {

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

@@ -28,7 +28,7 @@ public class Commandr extends EssentialsCommand {
             User user = ess.getUser(sender.getPlayer());
 
             if (user.isMuted()) {
-                throw new Exception(tl("voiceSilenced"));
+                throw new Exception(user.hasMuteReason() ? tl("voiceSilencedReason", user.getMuteReason()) : tl("voiceSilenced"));
             }
 
             message = FormatUtil.formatMessage(user, "essentials.msg", message);

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

@@ -0,0 +1,37 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.CommandSource;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+
+import static com.earth2me.essentials.I18n.tl;
+
+public class Commandrtoggle extends EssentialsToggleCommand {
+    public Commandrtoggle() {
+        super("rtoggle", "essentials.rtoggle.others");
+    }
+
+    @Override
+    public void run(Server server, User user, String commandLabel, String[] args) throws Exception {
+        handleToggleWithArgs(server, user, args);
+    }
+
+    @Override
+    public void run(Server server, CommandSource sender, String commandLabel, String[] args) throws Exception {
+        toggleOtherPlayers(server, sender, args);
+    }
+
+    @Override
+    void togglePlayer(CommandSource sender, User user, Boolean enabled) throws NotEnoughArgumentsException {
+        if (enabled == null) {
+            enabled = !user.isLastMessageReplyRecipient();
+        }
+
+        user.setLastMessageReplyRecipient(enabled);
+
+        user.sendMessage(!enabled ? tl("replyLastRecipientDisabled") : tl("replyLastRecipientEnabled"));
+        if (!sender.isPlayer() || !user.getBase().equals(sender.getPlayer())) {
+            sender.sendMessage(!enabled ? tl("replyLastRecipientDisabledFor", user.getDisplayName()) : tl("replyLastRecipientEnabledFor", user.getDisplayName()));
+        }
+    }
+}

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

@@ -117,7 +117,12 @@ public class Commandseen extends EssentialsCommand {
             sender.sendMessage(tl("whoisJail", (user.getJailTimeout() > 0 ? DateUtil.formatDateDiff(user.getJailTimeout()) : tl("true"))));
         }
         if (user.isMuted()) {
-            sender.sendMessage(tl("whoisMuted", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true"))));
+            long muteTimeout = user.getMuteTimeout();
+            if (!user.hasMuteReason()) {
+                sender.sendMessage(tl("whoisMuted", (muteTimeout > 0 ? DateUtil.formatDateDiff(muteTimeout) : tl("true"))));
+            } else {
+                sender.sendMessage(tl("whoisMutedReason", (muteTimeout > 0 ? DateUtil.formatDateDiff(muteTimeout) : tl("true")), user.getMuteReason()));
+            }
         }
         final String location = user.getGeoLocation();
         if (location != null && (!(sender.isPlayer()) || ess.getUser(sender.getPlayer()).isAuthorized("essentials.geoip.show"))) {
@@ -159,6 +164,15 @@ public class Commandseen extends EssentialsCommand {
             }
         }
 
+        if (user.isMuted()) {
+            long muteTimeout = user.getMuteTimeout();
+            if (!user.hasMuteReason()) {
+                sender.sendMessage(tl("whoisMuted", (muteTimeout > 0 ? DateUtil.formatDateDiff(muteTimeout) : tl("true"))));
+            } else {
+                sender.sendMessage(tl("whoisMutedReason", (muteTimeout > 0 ? DateUtil.formatDateDiff(muteTimeout) : tl("true")), user.getMuteReason()));
+            }
+        }
+
         final String location = user.getGeoLocation();
         if (location != null && (!(sender.isPlayer()) || ess.getUser(sender.getPlayer()).isAuthorized("essentials.geoip.show"))) {
             sender.sendMessage(tl("whoisGeoLocation", location));

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

@@ -4,6 +4,7 @@ import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.utils.NumberUtil;
 import com.google.common.collect.Lists;
+import net.ess3.api.events.UserBalanceUpdateEvent;
 import org.bukkit.Server;
 import org.bukkit.inventory.ItemStack;
 
@@ -94,7 +95,7 @@ public class Commandsell extends EssentialsCommand {
         user.getBase().getInventory().removeItem(ris);
         user.getBase().updateInventory();
         Trade.log("Command", "Sell", "Item", user.getName(), new Trade(ris, ess), user.getName(), new Trade(result, ess), user.getLocation(), ess);
-        user.giveMoney(result);
+        user.giveMoney(result, null, UserBalanceUpdateEvent.Cause.COMMAND_SELL);
         user.sendMessage(tl("itemSold", NumberUtil.displayCurrency(result, ess), amount, is.getType().toString().toLowerCase(Locale.ENGLISH), NumberUtil.displayCurrency(worth, ess)));
         logger.log(Level.INFO, tl("itemSoldConsole", user.getDisplayName(), is.getType().toString().toLowerCase(Locale.ENGLISH), NumberUtil.displayCurrency(result, ess), amount, NumberUtil.displayCurrency(worth, ess)));
         return result;

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

@@ -56,7 +56,7 @@ public class Commandsudo extends EssentialsLoopCommand {
                 @Override
                 public void run() {
                     try {
-                        ess.getServer().dispatchCommand(user.getBase(), command);
+                        user.getBase().chat("/" + command);
                     } catch (Exception e) {
                         sender.sendMessage(tl("errorCallingCommand", command));
                     }

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

@@ -1,7 +1,11 @@
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.Teleport;
+import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
+import net.ess3.api.events.TPARequestEvent;
 import org.bukkit.Server;
+import org.bukkit.event.player.PlayerTeleportEvent;
 
 import java.util.Collections;
 import java.util.List;
@@ -32,11 +36,25 @@ public class Commandtpa extends EssentialsCommand {
         }
         // Don't let sender request teleport twice to the same player.
         if (user.getConfigUUID().equals(player.getTeleportRequest()) && player.hasOutstandingTeleportRequest() // Check timeout
-            && player.isTpRequestHere() == false) { // Make sure the last teleport request was actually tpa and not tpahere
+            && !player.isTpRequestHere()) { // Make sure the last teleport request was actually tpa and not tpahere
             throw new Exception(tl("requestSentAlready", player.getDisplayName()));
         }
+        if (player.isAutoTeleportEnabled() && !player.isIgnoredPlayer(user)) {
+            final Trade charge = new Trade(this.getName(), ess);
+            Teleport teleport = user.getTeleport();
+            teleport.setTpType(Teleport.TeleportType.TPA);
+            teleport.teleport(player.getBase(), charge, PlayerTeleportEvent.TeleportCause.COMMAND);
+            player.sendMessage(tl("requestAcceptedAuto", user.getDisplayName()));
+            user.sendMessage(tl("requestAcceptedFromAuto", player.getDisplayName()));
+            return;
+        }
 
         if (!player.isIgnoredPlayer(user)) {
+            TPARequestEvent tpaEvent = new TPARequestEvent(user.getSource(), player, false);
+            ess.getServer().getPluginManager().callEvent(tpaEvent);
+            if (tpaEvent.isCancelled()) {
+                throw new Exception(tl("teleportRequestCancelled", player.getDisplayName()));
+            }
             player.requestTeleport(user, false);
             player.sendMessage(tl("teleportRequest", user.getDisplayName()));
             player.sendMessage(tl("typeTpaccept"));
@@ -46,7 +64,9 @@ public class Commandtpa extends EssentialsCommand {
             }
         }
         user.sendMessage(tl("requestSent", player.getDisplayName()));
-        user.sendMessage(tl("typeTpacancel"));
+        if (user.isAuthorized("essentials.tpacancel")) {
+            user.sendMessage(tl("typeTpacancel"));
+        }
     }
 
     @Override

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

@@ -2,6 +2,7 @@ package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.CommandSource;
 import com.earth2me.essentials.User;
+import net.ess3.api.events.TPARequestEvent;
 import org.bukkit.Server;
 
 import java.util.Collections;
@@ -42,6 +43,12 @@ public class Commandtpaall extends EssentialsCommand {
                 continue;
             }
             try {
+                TPARequestEvent tpaEvent = new TPARequestEvent(sender, player, true);
+                ess.getServer().getPluginManager().callEvent(tpaEvent);
+                if (tpaEvent.isCancelled()) {
+                    sender.sendMessage(tl("teleportRequestCancelled", player.getDisplayName()));
+                    continue;
+                }
                 player.requestTeleport(target, true);
                 player.sendMessage(tl("teleportHereRequest", target.getDisplayName()));
                 player.sendMessage(tl("typeTpaccept"));

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

@@ -1,6 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.User;
+import net.ess3.api.events.TPARequestEvent;
 import org.bukkit.Server;
 
 import java.util.Collections;
@@ -32,10 +33,15 @@ public class Commandtpahere extends EssentialsCommand {
         }
         // Don't let sender request teleport twice to the same player.
         if (user.getConfigUUID().equals(player.getTeleportRequest()) && player.hasOutstandingTeleportRequest() // Check timeout
-            && player.isTpRequestHere() == true) { // Make sure the last teleport request was actually tpahere and not tpa
+            && player.isTpRequestHere()) { // Make sure the last teleport request was actually tpahere and not tpa
             throw new Exception(tl("requestSentAlready", player.getDisplayName()));
         }
         if (!player.isIgnoredPlayer(user)) {
+            TPARequestEvent tpaEvent = new TPARequestEvent(user.getSource(), player, true);
+            ess.getServer().getPluginManager().callEvent(tpaEvent);
+            if (tpaEvent.isCancelled()) {
+                throw new Exception(tl("teleportRequestCancelled", player.getDisplayName()));
+            }
             player.requestTeleport(user, true);
             player.sendMessage(tl("teleportHereRequest", user.getDisplayName()));
             player.sendMessage(tl("typeTpaccept"));

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

@@ -0,0 +1,41 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.CommandSource;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+
+import static com.earth2me.essentials.I18n.tl;
+
+
+public class Commandtpauto extends EssentialsToggleCommand {
+    public Commandtpauto() {
+        super("tpauto", "essentials.tpauto.others");
+    }
+
+    @Override
+    protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
+        toggleOtherPlayers(server, sender, args);
+    }
+
+    @Override
+    protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
+        handleToggleWithArgs(server, user, args);
+    }
+
+    @Override
+    void togglePlayer(CommandSource sender, User user, Boolean enabled) {
+        if (enabled == null) {
+            enabled = !user.isAutoTeleportEnabled();
+        }
+
+        user.setAutoTeleportEnabled(enabled);
+
+        user.sendMessage(enabled ? tl("autoTeleportEnabled") : tl("autoTeleportDisabled"));
+        if (enabled && !user.isTeleportEnabled()) {
+            user.sendMessage(tl("teleportationDisabledWarning"));
+        }
+        if (!sender.isPlayer() || !user.getBase().equals(sender.getPlayer())) {
+            sender.sendMessage(enabled ? tl("autoTeleportEnabledFor", user.getDisplayName()) : tl("autoTeleportDisabledFor", user.getDisplayName()));
+        }
+    }
+}

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

@@ -44,6 +44,6 @@ public class Commandunbanip extends EssentialsCommand {
         final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
         server.getLogger().log(Level.INFO, tl("playerUnbanIpAddress", senderName, ipAddress));
 
-        ess.broadcastMessage("essentials.ban.notify", tl("playerUnbanIpAddress", senderName, ipAddress));
+        ess.broadcastMessage("essentials.banip.notify", tl("playerUnbanIpAddress", senderName, ipAddress));
     }
 }

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

@@ -5,8 +5,10 @@ import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 import static com.earth2me.essentials.I18n.tl;
 
@@ -32,14 +34,10 @@ public class Commandunlimited extends EssentialsCommand {
             final String list = getList(target);
             user.sendMessage(list);
         } else if (args[0].equalsIgnoreCase("clear")) {
-            final List<Material> itemList = target.getUnlimited();
+            final Set<Material> itemList = new HashSet<>(target.getUnlimited());
 
-            int index = 0;
-            while (itemList.size() > index) {
-                final Material item = itemList.get(index);
-                if (!toggleUnlimited(user, target, item.toString())) {
-                    index++;
-                }
+            for (Material m : itemList) {
+                toggleUnlimited(user, target, m.toString());
             }
         } else {
             toggleUnlimited(user, target, args[0]);
@@ -50,7 +48,7 @@ public class Commandunlimited extends EssentialsCommand {
         final StringBuilder output = new StringBuilder();
         output.append(tl("unlimitedItems")).append(" ");
         boolean first = true;
-        final List<Material> items = target.getUnlimited();
+        final Set<Material> items = target.getUnlimited();
         if (items.isEmpty()) {
             output.append(tl("none"));
         }

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

@@ -63,8 +63,14 @@ public class Commandwhois extends EssentialsCommand {
             sender.sendMessage(tl("whoisAFK", tl("false")));
         }
         sender.sendMessage(tl("whoisJail", (user.isJailed() ? user.getJailTimeout() > 0 ? DateUtil.formatDateDiff(user.getJailTimeout()) : tl("true") : tl("false"))));
-        sender.sendMessage(tl("whoisMuted", (user.isMuted() ? user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true") : tl("false"))));
 
+        long muteTimeout = user.getMuteTimeout();
+        if (!user.hasMuteReason()) {
+            sender.sendMessage(tl("whoisMuted", (user.isMuted() ? (muteTimeout > 0 ? DateUtil.formatDateDiff(muteTimeout) : tl("true")) : tl("false"))));
+        } else {
+            sender.sendMessage(tl("whoisMutedReason", (user.isMuted() ? (muteTimeout > 0 ? DateUtil.formatDateDiff(muteTimeout) : tl("true")) : tl("false")),
+                user.getMuteReason()));
+        }
     }
 
     @Override

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

@@ -104,7 +104,11 @@ public abstract class EssentialsCommand implements IEssentialsCommand {
         try {
             exPlayer = server.getPlayer(UUID.fromString(searchTerm));
         } catch (IllegalArgumentException ex) {
-            exPlayer = server.getPlayer(searchTerm);
+            if (getOffline) {
+                exPlayer = server.getPlayerExact(searchTerm);
+            } else {
+                exPlayer = server.getPlayer(searchTerm);
+            }
         }
 
         if (exPlayer != null) {

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

@@ -4,6 +4,7 @@ import com.earth2me.essentials.ChargeException;
 import com.earth2me.essentials.CommandSource;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.utils.FormatUtil;
+import com.earth2me.essentials.utils.StringUtil;
 import net.ess3.api.MaxMoneyException;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
@@ -23,7 +24,11 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand {
             throw new PlayerNotFoundException();
         }
 
-        if (matchWildcards && searchTerm.contentEquals("**")) {
+        final UUID uuid = StringUtil.toUUID(searchTerm);
+        if (uuid != null) {
+            final User matchedUser = ess.getUser(uuid);
+            updatePlayer(server, sender, matchedUser, commandArgs);
+        } else if (matchWildcards && searchTerm.contentEquals("**")) {
             for (UUID sUser : ess.getUserMap().getAllUniqueUsers()) {
                 final User matchedUser = ess.getUser(sUser);
                 updatePlayer(server, sender, matchedUser, commandArgs);

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

@@ -18,6 +18,7 @@ import org.bukkit.util.Vector;
 import java.io.File;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.Predicate;
@@ -112,7 +113,7 @@ public class FakeWorld implements World {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    @Override
+    //@Override
     public boolean unloadChunk(int i, int i1, boolean bln, boolean bln1) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
@@ -122,7 +123,7 @@ public class FakeWorld implements World {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    @Override
+    //@Override
     public boolean unloadChunkRequest(int i, int i1, boolean bln) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
@@ -152,6 +153,31 @@ public class FakeWorld implements World {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
+    @Override
+    public boolean addPluginChunkTicket(int i, int i1, Plugin plugin) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean removePluginChunkTicket(int i, int i1, Plugin plugin) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public void removePluginChunkTickets(Plugin plugin) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Collection<Plugin> getPluginChunkTickets(int i, int i1) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Map<Plugin, Collection<Chunk>> getPluginChunkTickets() {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
     @Override
     public Item dropItem(Location lctn, ItemStack is) {
         throw new UnsupportedOperationException("Not supported yet.");
@@ -168,7 +194,7 @@ public class FakeWorld implements World {
     }
 
     @Override
-    public <T extends Arrow> T spawnArrow(Location location, Vector vector, float v, float v1, Class<T> aClass) {
+    public <T extends AbstractArrow> T spawnArrow(Location location, Vector direction, float speed, float spread, Class<T> clazz) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
@@ -351,6 +377,21 @@ public class FakeWorld implements World {
     public boolean createExplosion(Location lctn, float f, boolean bln) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
+    
+    @Override
+    public boolean createExplosion(double d, double d1, double d2, float f, boolean bln, boolean bln1, Entity entity) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean createExplosion(Location lctn, float f, boolean bln, boolean bln1) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean createExplosion(Location lctn, float f, boolean bln, boolean bln1, Entity entity) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
 
     @Override
     public <T extends Entity> T spawn(Location lctn, Class<T> type) throws IllegalArgumentException {
@@ -407,21 +448,56 @@ public class FakeWorld implements World {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
+    @Override
+    public int getHighestBlockYAt(int i, int i1, HeightMap heightMap) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public int getHighestBlockYAt(Location location, HeightMap heightMap) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Block getHighestBlockAt(int i, int i1, HeightMap heightMap) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public Block getHighestBlockAt(Location location, HeightMap heightMap) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
     @Override
     public Biome getBiome(int i, int i1) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
+    @Override
+    public Biome getBiome(int i, int i1, int i2) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
     @Override
     public double getTemperature(int i, int i1) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
+    @Override
+    public double getTemperature(int i, int i1, int i2) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
     @Override
     public double getHumidity(int i, int i1) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
+    @Override
+    public double getHumidity(int i, int i1, int i2) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
     @Override
     public boolean unloadChunk(Chunk chunk) {
         throw new UnsupportedOperationException("Not supported yet.");
@@ -497,6 +573,16 @@ public class FakeWorld implements World {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
+    @Override
+    public boolean isHardcore() {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public void setHardcore(boolean hardcore) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
     @Override
     public long getTicksPerAnimalSpawns() {
         throw new UnsupportedOperationException("Not supported yet.");
@@ -562,6 +648,11 @@ public class FakeWorld implements World {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
+    @Override
+    public void setBiome(int i, int i1, int i2, Biome biome) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
     @Override
     public int getMonsterSpawnLimit() {
         throw new UnsupportedOperationException("Not supported yet.");
@@ -742,6 +833,16 @@ public class FakeWorld implements World {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
+    @Override
+    public Raid locateNearestRaid(Location location, int radius) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public List<Raid> getRaids() {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
     @Override
     public List<Entity> getNearbyEntities(Location loc, double x, double y, double z) {
         throw new UnsupportedOperationException("Not supported yet.");

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

@@ -1,34 +1,114 @@
 package com.earth2me.essentials.items;
 
-import com.earth2me.essentials.Essentials;
 import com.earth2me.essentials.IConf;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.utils.MaterialUtil;
-import com.earth2me.essentials.utils.StringUtil;
 import com.earth2me.essentials.utils.VersionUtil;
-import org.bukkit.Color;
-import org.bukkit.DyeColor;
-import org.bukkit.FireworkEffect;
-import org.bukkit.Material;
+import net.ess3.api.IEssentials;
+import net.ess3.api.PluginKey;
+import org.bukkit.*;
 import org.bukkit.block.Banner;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.*;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.potion.Potion;
 import org.bukkit.potion.PotionEffect;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import static com.earth2me.essentials.I18n.tl;
 
 public abstract class AbstractItemDb implements IConf, net.ess3.api.IItemDb {
 
+    protected final IEssentials ess;
     protected boolean ready = false;
 
+    private Map<PluginKey, ItemResolver> resolverMap = new HashMap<>();
+
+    AbstractItemDb(IEssentials ess) {
+        this.ess = ess;
+    }
+
+    @Override
+    public void registerResolver(Plugin plugin, String name, ItemResolver resolver) throws Exception {
+        PluginKey key = PluginKey.fromKey(plugin, name);
+        if (resolverMap.containsKey(key)) {
+            throw new Exception("Tried to add a duplicate resolver with name " + key.toString());
+        }
+
+        resolverMap.put(key, resolver);
+    }
+
+    @Override
+    public void unregisterResolver(Plugin plugin, String name) throws Exception {
+        PluginKey key = PluginKey.fromKey(plugin, name);
+        if (!resolverMap.containsKey(key)) {
+            throw new Exception("Tried to remove nonexistent resolver with name " + key.toString());
+        }
+
+        resolverMap.remove(key);
+    }
+
+    @Override
+    public boolean isResolverPresent(Plugin plugin, String name) {
+        return resolverMap.containsKey(PluginKey.fromKey(plugin, name));
+    }
+
+    @Override
+    public Map<PluginKey, ItemResolver> getResolvers() {
+        return new HashMap<>(resolverMap);
+    }
+
+    @Override
+    public Map<PluginKey, ItemResolver> getResolvers(Plugin plugin) {
+        Map<PluginKey, ItemResolver> matchingResolvers = new HashMap<>();
+        for (PluginKey key : resolverMap.keySet()) {
+            if (key.getPlugin().equals(plugin)) {
+                matchingResolvers.put(key, resolverMap.get(key));
+            }
+        }
+
+        return matchingResolvers;
+    }
+
+    @Override
+    public ItemResolver getResolver(Plugin plugin, String name) {
+        return resolverMap.get(PluginKey.fromKey(plugin, name));
+    }
+
+    @Override
+    public ItemStack get(String id) throws Exception {
+        return get(id, true);
+    }
+
+    ItemStack tryResolvers(String id) {
+        for (PluginKey key : resolverMap.keySet()) {
+            if (ess.getSettings().isDebug()) {
+                ess.getLogger().info(String.format("Trying resolver '%s' for item '%s'...", key, id));
+            }
+
+            Function<String, ItemStack> resolver = resolverMap.get(key);
+            ItemStack stack = resolver.apply(id);
+
+            if (stack != null) {
+                return stack;
+            }
+        }
+
+        return null;
+    }
+
+    Collection<String> getResolverNames() {
+        return resolverMap.values().stream()
+            .map(ItemResolver::getNames)
+            .flatMap(Collection::stream)
+            .collect(Collectors.toList());
+    }
+
     @Override
     public List<ItemStack> getMatching(User user, String[] args) throws Exception {
         List<ItemStack> is = new ArrayList<>();

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

@@ -0,0 +1,89 @@
+package com.earth2me.essentials.items;
+
+import com.earth2me.essentials.Essentials;
+import com.earth2me.essentials.EssentialsConf;
+import com.earth2me.essentials.IConf;
+import java.io.File;
+import java.util.Collection;
+import java.util.HashMap;
+import net.ess3.api.IItemDb;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.inventory.ItemStack;
+
+public class CustomItemResolver implements IItemDb.ItemResolver, IConf {
+    private final EssentialsConf config;
+    private final Essentials ess;
+    private final HashMap<String, String> map = new HashMap<>();
+
+    public CustomItemResolver(Essentials ess) {
+        config = new EssentialsConf(new File(ess.getDataFolder(), "custom_items.yml"));
+        this.ess = ess;
+        config.setTemplateName("/custom_items.yml");
+    }
+
+    @Override
+    public ItemStack apply(String item) {
+        if (map.containsKey(item)) {
+            try {
+                return ess.getItemDb().get(map.get(item));
+            } catch (Exception ignored) {}
+        }
+
+        return null;
+    }
+
+    @Override
+    public Collection<String> getNames() {
+        return map.keySet();
+    }
+
+    @Override
+    public void reloadConfig() {
+        map.clear();
+        config.load();
+
+        ConfigurationSection section = config.getConfigurationSection("aliases");
+        if (section == null || section.getKeys(false).isEmpty()) {
+            ess.getLogger().warning("No aliases found in custom_items.yml.");
+            return;
+        }
+
+        for (String alias : section.getKeys(false)) {
+            if (!section.isString(alias)) continue;
+            String target = section.getString(alias);
+
+            if (target != null && !section.contains(target) && existsInItemDb(target)) {
+                map.put(alias, target);
+            }
+        }
+    }
+
+    public void setAlias(String alias, String target) {
+        if (map.containsKey(alias) && map.get(alias).equalsIgnoreCase(target)) {
+            return;
+        }
+
+        map.put(alias, target);
+        save();
+    }
+
+    public void removeAlias(String alias) {
+        if (map.remove(alias) != null) {
+            save();
+        }
+    }
+
+    private void save() {
+        config.setProperty("aliases", map);
+        config.save();
+    }
+
+    private boolean existsInItemDb(String item) {
+        try {
+            ess.getItemDb().get(item);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.earth2me.essentials.items;
 
 import com.earth2me.essentials.ManagedFile;
+import com.earth2me.essentials.utils.EnumUtil;
 import com.earth2me.essentials.utils.MaterialUtil;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
@@ -25,7 +26,7 @@ import static com.earth2me.essentials.I18n.tl;
 public class FlatItemDb extends AbstractItemDb {
     protected static final Logger LOGGER = Logger.getLogger("Essentials");
     private static Gson gson = new Gson();
-    private final transient IEssentials ess;
+
     // Maps primary name to ItemData
     private final transient Map<String, ItemData> items = new HashMap<>();
 
@@ -38,7 +39,7 @@ public class FlatItemDb extends AbstractItemDb {
     private transient ManagedFile file = null;
 
     public FlatItemDb(final IEssentials ess) {
-        this.ess = ess;
+        super(ess);
     }
 
     @Override
@@ -70,7 +71,7 @@ public class FlatItemDb extends AbstractItemDb {
         allAliases.clear();
     }
 
-    public void loadJSON(String source) {
+    private void loadJSON(String source) {
         JsonObject map = (new JsonParser()).parse(source).getAsJsonObject();
 
         for (Map.Entry<String, JsonElement> entry : map.entrySet()) {
@@ -99,7 +100,14 @@ public class FlatItemDb extends AbstractItemDb {
     }
 
     @Override
-    public ItemStack get(String id) throws Exception {
+    public ItemStack get(String id, boolean useResolvers) throws Exception {
+        if (useResolvers) {
+            ItemStack resolved = tryResolvers(id);
+            if (resolved != null) {
+                return resolved;
+            }
+        }
+
         id = id.toLowerCase();
         final String[] split = id.split(":");
 
@@ -184,11 +192,11 @@ public class FlatItemDb extends AbstractItemDb {
 
     @Override
     @Deprecated
-    public int getLegacyId(Material material) throws Exception {
+    public int getLegacyId(Material material) {
         throw new UnsupportedOperationException("Legacy IDs aren't supported on this version.");
     }
 
-    public ItemData lookup(ItemStack item) {
+    private ItemData lookup(ItemStack item) {
         Material type = item.getType();
 
         if (MaterialUtil.isPotion(type) && item.getItemMeta() instanceof PotionMeta) {
@@ -204,24 +212,27 @@ public class FlatItemDb extends AbstractItemDb {
 
     @Override
     public Collection<String> listNames() {
-        return Collections.unmodifiableSet(allAliases);
+        Set<String> names = new HashSet<>(allAliases);
+        names.addAll(getResolverNames());
+        return names;
     }
 
     public static class ItemData {
-        private final Material material;
+        private Material material;
+        private String[] fallbacks = null;
         private PotionData potionData = null;
         private EntityType entity = null;
 
-        public ItemData(Material material) {
+        ItemData(Material material) {
             this.material = material;
         }
 
-        public ItemData(Material material, PotionData potionData) {
+        ItemData(Material material, PotionData potionData) {
             this.material = material;
             this.potionData = potionData;
         }
 
-        public ItemData(Material material, EntityType entity) {
+        ItemData(Material material, EntityType entity) {
             this.material = material;
             this.entity = entity;
         }
@@ -240,10 +251,15 @@ public class FlatItemDb extends AbstractItemDb {
                 return false;
             }
             ItemData that = (ItemData) o;
-            return this.material == that.getMaterial() && potionDataEquals(that) && entityEquals(that);
+            return this.getMaterial() == that.getMaterial() && potionDataEquals(that) && entityEquals(that);
         }
 
         public Material getMaterial() {
+            if (material == null && fallbacks != null) {
+                material = EnumUtil.getMaterial(fallbacks);
+                fallbacks = null; // If fallback fails, don't keep trying to look up fallbacks
+            }
+
             return material;
         }
 

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

@@ -20,7 +20,6 @@ import static com.earth2me.essentials.I18n.tl;
 
 public class LegacyItemDb extends AbstractItemDb {
     protected static final Logger LOGGER = Logger.getLogger("Essentials");
-    private final transient IEssentials ess;
     private final transient Map<String, Integer> items = new HashMap<>();
     private final transient Map<ItemData, List<String>> names = new HashMap<>();
     private final transient Map<ItemData, String> primaryName = new HashMap<>();
@@ -32,7 +31,7 @@ public class LegacyItemDb extends AbstractItemDb {
     private final transient Pattern csvSplitPattern = Pattern.compile("(\"([^\"]*)\"|[^,]*)(,|$)");
 
     public LegacyItemDb(final IEssentials ess) {
-        this.ess = ess;
+        super(ess);
         file = new ManagedFile("items.csv", ess);
     }
 
@@ -121,7 +120,14 @@ public class LegacyItemDb extends AbstractItemDb {
     }
 
     @Override
-    public ItemStack get(final String id) throws Exception {
+    public ItemStack get(final String id, final boolean useResolvers) throws Exception {
+        if (useResolvers) {
+            ItemStack resolved = tryResolvers(id);
+            if (resolved != null) {
+                return resolved;
+            }
+        }
+
         int itemid = 0;
         String itemname;
         short metaData = 0;
@@ -243,7 +249,9 @@ public class LegacyItemDb extends AbstractItemDb {
 
     @Override
     public Collection<String> listNames() {
-        return primaryName.values();
+        Collection<String> values = new ArrayList<>(primaryName.values());
+        values.addAll(getResolverNames());
+        return values;
     }
 
     static class ItemData {

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

@@ -1,13 +1,13 @@
 package com.earth2me.essentials.messaging;
 
-import static com.earth2me.essentials.I18n.tl;
-
 import com.earth2me.essentials.IEssentials;
 import com.earth2me.essentials.IUser;
 import com.earth2me.essentials.User;
 
 import java.lang.ref.WeakReference;
 
+import static com.earth2me.essentials.I18n.tl;
+
 /**
  * Represents a simple reusable implementation of {@link IMessageRecipient}. This class provides functionality for the following methods:
  * <ul>
@@ -119,11 +119,13 @@ public class SimpleMessageRecipient implements IMessageRecipient {
 
         User user = getUser(this);
         boolean afk = false;
+        boolean isLastMessageReplyRecipient = ess.getSettings().isLastMessageReplyRecipient();
         if (user != null) {
-              if (user.isIgnoreMsg() && sender instanceof IUser && !((IUser) sender).isAuthorized("essentials.msgtoggle.bypass")) { // Don't ignore console and senders with permission
-                  return MessageResponse.MESSAGES_IGNORED;
+            if (user.isIgnoreMsg() && sender instanceof IUser && !((IUser) sender).isAuthorized("essentials.msgtoggle.bypass")) { // Don't ignore console and senders with permission
+                return MessageResponse.MESSAGES_IGNORED;
             }
             afk = user.isAfk();
+            isLastMessageReplyRecipient = user.isLastMessageReplyRecipient();
             // Check whether this recipient ignores the sender, only if the sender is not the console.
             if (sender instanceof IUser && user.isIgnoredPlayer((IUser) sender)) {
                 return MessageResponse.SENDER_IGNORED;
@@ -132,7 +134,7 @@ public class SimpleMessageRecipient implements IMessageRecipient {
         // Display the formatted message to this recipient.
         sendMessage(tl("msgFormat", sender.getDisplayName(), tl("me"), message));
 
-        if (ess.getSettings().isLastMessageReplyRecipient()) {
+        if (isLastMessageReplyRecipient) {
             // If this recipient doesn't have a reply recipient, initiate by setting the first
             // message sender to this recipient's replyRecipient.
             long timeout = ess.getSettings().getLastMessageReplyRecipientTimeout() * 1000;

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

@@ -1,13 +1,14 @@
 package com.earth2me.essentials.metrics;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.ServicePriority;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
 
 import javax.net.ssl.HttpsURLConnection;
 import java.io.*;
@@ -186,24 +187,24 @@ public class Metrics {
      *
      * @return The plugin specific data.
      */
-    public JSONObject getPluginData() {
-        JSONObject data = new JSONObject();
+    public JsonObject getPluginData() {
+        JsonObject data = new JsonObject();
 
         String pluginName = plugin.getDescription().getName().replace("Essentials", "EssentialsX");
         String pluginVersion = plugin.getDescription().getVersion();
 
-        data.put("pluginName", pluginName); // Append the name of the plugin
-        data.put("pluginVersion", pluginVersion); // Append the version of the plugin
-        JSONArray customCharts = new JSONArray();
+        data.addProperty("pluginName", pluginName); // Append the name of the plugin
+        data.addProperty("pluginVersion", pluginVersion); // Append the version of the plugin
+        JsonArray customCharts = new JsonArray();
         for (CustomChart customChart : charts) {
             // Add the data of the custom charts
-            JSONObject chart = customChart.getRequestJsonObject();
+            JsonObject chart = customChart.getRequestJsonObject();
             if (chart == null) { // If the chart is null, we skip it
                 continue;
             }
             customCharts.add(chart);
         }
-        data.put("customCharts", customCharts);
+        data.add("customCharts", customCharts);
 
         return data;
     }
@@ -213,7 +214,7 @@ public class Metrics {
      *
      * @return The server specific data.
      */
-    private JSONObject getServerData() {
+    private JsonObject getServerData() {
         // Minecraft specific data
         int playerAmount;
         try {
@@ -228,6 +229,7 @@ public class Metrics {
         }
         int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
         String bukkitVersion = Bukkit.getVersion();
+        String bukkitName = Bukkit.getName();
 
         // OS/Java specific data
         String javaVersion = System.getProperty("java.version");
@@ -236,19 +238,20 @@ public class Metrics {
         String osVersion = System.getProperty("os.version");
         int coreCount = Runtime.getRuntime().availableProcessors();
 
-        JSONObject data = new JSONObject();
+        JsonObject data = new JsonObject();
 
-        data.put("serverUUID", serverUUID);
+        data.addProperty("serverUUID", serverUUID);
 
-        data.put("playerAmount", playerAmount);
-        data.put("onlineMode", onlineMode);
-        data.put("bukkitVersion", bukkitVersion);
+        data.addProperty("playerAmount", playerAmount);
+        data.addProperty("onlineMode", onlineMode);
+        data.addProperty("bukkitVersion", bukkitVersion);
+        data.addProperty("bukkitName", bukkitName);
 
-        data.put("javaVersion", javaVersion);
-        data.put("osName", osName);
-        data.put("osArch", osArch);
-        data.put("osVersion", osVersion);
-        data.put("coreCount", coreCount);
+        data.addProperty("javaVersion", javaVersion);
+        data.addProperty("osName", osName);
+        data.addProperty("osArch", osArch);
+        data.addProperty("osVersion", osVersion);
+        data.addProperty("coreCount", coreCount);
 
         return data;
     }
@@ -257,9 +260,9 @@ public class Metrics {
      * Collects the data and sends it afterwards.
      */
     private void submitData() {
-        final JSONObject data = getServerData();
+        final JsonObject data = getServerData();
 
-        JSONArray pluginData = new JSONArray();
+        JsonArray pluginData = new JsonArray();
         // Search for all other bStats Metrics classes to get their plugin data
         for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
             try {
@@ -267,26 +270,43 @@ public class Metrics {
 
                 for (RegisteredServiceProvider<?> provider : Bukkit.getServicesManager().getRegistrations(service)) {
                     try {
-                        pluginData.add(provider.getService().getMethod("getPluginData").invoke(provider.getProvider()));
+                        Object plugin = provider.getService().getMethod("getPluginData").invoke(provider.getProvider());
+                        if (plugin instanceof JsonObject) {
+                            pluginData.add((JsonObject) plugin);
+                        } else { // old bstats version compatibility
+                            try {
+                                Class<?> jsonObjectJsonSimple = Class.forName("org.json.simple.JSONObject");
+                                if (plugin.getClass().isAssignableFrom(jsonObjectJsonSimple)) {
+                                    Method jsonStringGetter = jsonObjectJsonSimple.getDeclaredMethod("toJSONString");
+                                    jsonStringGetter.setAccessible(true);
+                                    String jsonString = (String) jsonStringGetter.invoke(plugin);
+                                    JsonObject object = new JsonParser().parse(jsonString).getAsJsonObject();
+                                    pluginData.add(object);
+                                }
+                            } catch (ClassNotFoundException e) {
+                                // minecraft version 1.14+
+                                if (logFailedRequests) {
+                                    this.plugin.getLogger().log(Level.SEVERE, "Encountered unexpected exception", e);
+                                }
+                                continue; // continue looping since we cannot do any other thing.
+                            }
+                        }
                     } catch (NullPointerException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }
                 }
             } catch (NoSuchFieldException ignored) { }
         }
 
-        data.put("plugins", pluginData);
+        data.add("plugins", pluginData);
 
         // Create a new thread for the connection to the bStats server
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    // Send the data
-                    sendData(plugin, data);
-                } catch (Exception e) {
-                    // Something went wrong! :(
-                    if (logFailedRequests) {
-                        plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e);
-                    }
+        new Thread(() -> {
+            try {
+                // Send the data
+                sendData(plugin, data);
+            } catch (Exception e) {
+                // Something went wrong! :(
+                if (logFailedRequests) {
+                    plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e);
                 }
             }
         }).start();
@@ -299,7 +319,7 @@ public class Metrics {
      * @param data The data to send.
      * @throws Exception If the request failed.
      */
-    private static void sendData(Plugin plugin, JSONObject data) throws Exception {
+    private static void sendData(Plugin plugin, JsonObject data) throws Exception {
         if (data == null) {
             throw new IllegalArgumentException("Data cannot be null!");
         }
@@ -382,16 +402,16 @@ public class Metrics {
             this.chartId = chartId;
         }
 
-        private JSONObject getRequestJsonObject() {
-            JSONObject chart = new JSONObject();
-            chart.put("chartId", chartId);
+        private JsonObject getRequestJsonObject() {
+            JsonObject chart = new JsonObject();
+            chart.addProperty("chartId", chartId);
             try {
-                JSONObject data = getChartData();
+                JsonObject data = getChartData();
                 if (data == null) {
                     // If the data is null we don't send the chart.
                     return null;
                 }
-                chart.put("data", data);
+                chart.add("data", data);
             } catch (Throwable t) {
                 if (logFailedRequests) {
                     Bukkit.getLogger().log(Level.WARNING, "Failed to get data for custom chart with id " + chartId, t);
@@ -401,7 +421,7 @@ public class Metrics {
             return chart;
         }
 
-        protected abstract JSONObject getChartData() throws Exception;
+        protected abstract JsonObject getChartData() throws Exception;
 
     }
 
@@ -424,14 +444,14 @@ public class Metrics {
         }
 
         @Override
-        protected JSONObject getChartData() throws Exception {
-            JSONObject data = new JSONObject();
+        protected JsonObject getChartData() throws Exception {
+            JsonObject data = new JsonObject();
             String value = callable.call();
             if (value == null || value.isEmpty()) {
                 // Null = skip the chart
                 return null;
             }
-            data.put("value", value);
+            data.addProperty("value", value);
             return data;
         }
     }
@@ -455,9 +475,9 @@ public class Metrics {
         }
 
         @Override
-        protected JSONObject getChartData() throws Exception {
-            JSONObject data = new JSONObject();
-            JSONObject values = new JSONObject();
+        protected JsonObject getChartData() throws Exception {
+            JsonObject data = new JsonObject();
+            JsonObject values = new JsonObject();
             Map<String, Integer> map = callable.call();
             if (map == null || map.isEmpty()) {
                 // Null = skip the chart
@@ -469,13 +489,13 @@ public class Metrics {
                     continue; // Skip this invalid
                 }
                 allSkipped = false;
-                values.put(entry.getKey(), entry.getValue());
+                values.addProperty(entry.getKey(), entry.getValue());
             }
             if (allSkipped) {
                 // Null = skip the chart
                 return null;
             }
-            data.put("values", values);
+            data.add("values", values);
             return data;
         }
     }
@@ -499,9 +519,9 @@ public class Metrics {
         }
 
         @Override
-        public JSONObject getChartData() throws Exception {
-            JSONObject data = new JSONObject();
-            JSONObject values = new JSONObject();
+        public JsonObject getChartData() throws Exception {
+            JsonObject data = new JsonObject();
+            JsonObject values = new JsonObject();
             Map<String, Map<String, Integer>> map = callable.call();
             if (map == null || map.isEmpty()) {
                 // Null = skip the chart
@@ -509,22 +529,22 @@ public class Metrics {
             }
             boolean reallyAllSkipped = true;
             for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
-                JSONObject value = new JSONObject();
+                JsonObject value = new JsonObject();
                 boolean allSkipped = true;
                 for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) {
-                    value.put(valueEntry.getKey(), valueEntry.getValue());
+                    value.addProperty(valueEntry.getKey(), valueEntry.getValue());
                     allSkipped = false;
                 }
                 if (!allSkipped) {
                     reallyAllSkipped = false;
-                    values.put(entryValues.getKey(), value);
+                    values.add(entryValues.getKey(), value);
                 }
             }
             if (reallyAllSkipped) {
                 // Null = skip the chart
                 return null;
             }
-            data.put("values", values);
+            data.add("values", values);
             return data;
         }
     }
@@ -548,14 +568,14 @@ public class Metrics {
         }
 
         @Override
-        protected JSONObject getChartData() throws Exception {
-            JSONObject data = new JSONObject();
+        protected JsonObject getChartData() throws Exception {
+            JsonObject data = new JsonObject();
             int value = callable.call();
             if (value == 0) {
                 // Null = skip the chart
                 return null;
             }
-            data.put("value", value);
+            data.addProperty("value", value);
             return data;
         }
 
@@ -580,9 +600,9 @@ public class Metrics {
         }
 
         @Override
-        protected JSONObject getChartData() throws Exception {
-            JSONObject data = new JSONObject();
-            JSONObject values = new JSONObject();
+        protected JsonObject getChartData() throws Exception {
+            JsonObject data = new JsonObject();
+            JsonObject values = new JsonObject();
             Map<String, Integer> map = callable.call();
             if (map == null || map.isEmpty()) {
                 // Null = skip the chart
@@ -594,13 +614,13 @@ public class Metrics {
                     continue; // Skip this invalid
                 }
                 allSkipped = false;
-                values.put(entry.getKey(), entry.getValue());
+                values.addProperty(entry.getKey(), entry.getValue());
             }
             if (allSkipped) {
                 // Null = skip the chart
                 return null;
             }
-            data.put("values", values);
+            data.add("values", values);
             return data;
         }
 
@@ -625,20 +645,20 @@ public class Metrics {
         }
 
         @Override
-        protected JSONObject getChartData() throws Exception {
-            JSONObject data = new JSONObject();
-            JSONObject values = new JSONObject();
+        protected JsonObject getChartData() throws Exception {
+            JsonObject data = new JsonObject();
+            JsonObject values = new JsonObject();
             Map<String, Integer> map = callable.call();
             if (map == null || map.isEmpty()) {
                 // Null = skip the chart
                 return null;
             }
             for (Map.Entry<String, Integer> entry : map.entrySet()) {
-                JSONArray categoryValues = new JSONArray();
+                JsonArray categoryValues = new JsonArray();
                 categoryValues.add(entry.getValue());
-                values.put(entry.getKey(), categoryValues);
+                values.add(entry.getKey(), categoryValues);
             }
-            data.put("values", values);
+            data.add("values", values);
             return data;
         }
 
@@ -663,9 +683,9 @@ public class Metrics {
         }
 
         @Override
-        protected JSONObject getChartData() throws Exception {
-            JSONObject data = new JSONObject();
-            JSONObject values = new JSONObject();
+        protected JsonObject getChartData() throws Exception {
+            JsonObject data = new JsonObject();
+            JsonObject values = new JsonObject();
             Map<String, int[]> map = callable.call();
             if (map == null || map.isEmpty()) {
                 // Null = skip the chart
@@ -677,17 +697,17 @@ public class Metrics {
                     continue; // Skip this invalid
                 }
                 allSkipped = false;
-                JSONArray categoryValues = new JSONArray();
+                JsonArray categoryValues = new JsonArray();
                 for (int categoryValue : entry.getValue()) {
                     categoryValues.add(categoryValue);
                 }
-                values.put(entry.getKey(), categoryValues);
+                values.add(entry.getKey(), categoryValues);
             }
             if (allSkipped) {
                 // Null = skip the chart
                 return null;
             }
-            data.put("values", values);
+            data.add("values", values);
             return data;
         }
     }

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

@@ -16,6 +16,9 @@ public interface IPermissionsHandler {
 
     boolean hasPermission(Player base, String node);
 
+    // Does not check for * permissions
+    boolean isPermissionSet(Player base, String node);
+
     String getPrefix(Player base);
 
     String getSuffix(Player base);

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

@@ -62,6 +62,11 @@ public class PermissionsHandler implements IPermissionsHandler {
         return handler.hasPermission(base, node);
     }
 
+    @Override
+    public boolean isPermissionSet(final Player base, final String node) {
+        return handler.isPermissionSet(base, node);
+    }
+
     @Override
     public String getPrefix(final Player base) {
         final long start = System.nanoTime();
@@ -92,7 +97,7 @@ public class PermissionsHandler implements IPermissionsHandler {
     public void checkPermissions() {
         // load and assign a handler
         List<Class<? extends SuperpermsHandler>> providerClazz = Arrays.asList(
-                PermissionsExHandler.class,
+                ModernVaultHandler.class,
                 GenericVaultHandler.class,
                 SuperpermsHandler.class
         );

Essentials/src/com/earth2me/essentials/perm/impl/AbstractVaultHandler.java

@@ -46,23 +46,31 @@ public abstract class AbstractVaultHandler extends SuperpermsHandler {
     @Override
     public String getPrefix(final Player base) {
         String playerPrefix = chat.getPlayerPrefix(base);
-        if (playerPrefix == null) {
-            String playerGroup = perms.getPrimaryGroup(base);
-            return chat.getGroupPrefix(base.getWorld().getName(), playerGroup);
-        } else {
+        if (playerPrefix != null) {
             return playerPrefix;
         }
+
+        String playerGroup = perms.getPrimaryGroup(base);
+        if (playerGroup != null) {
+            return chat.getGroupPrefix(base.getWorld().getName(), playerGroup);
+        }
+
+        return null;
     }
 
     @Override
     public String getSuffix(final Player base) {
         String playerSuffix = chat.getPlayerSuffix(base);
-        if (playerSuffix == null) {
-            String playerGroup = perms.getPrimaryGroup(base);
-            return chat.getGroupSuffix(base.getWorld().getName(), playerGroup);
-        } else {
+        if (playerSuffix != null) {
             return playerSuffix;
         }
+
+        String playerGroup = perms.getPrimaryGroup(base);
+        if (playerGroup != null) {
+            return chat.getGroupSuffix(base.getWorld().getName(), playerGroup);
+        }
+
+        return null;
     }
 
     boolean canLoad() {

Essentials/src/com/earth2me/essentials/perm/impl/ModernVaultHandler.java

@@ -0,0 +1,26 @@
+package com.earth2me.essentials.perm.impl;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import org.bukkit.entity.Player;
+
+public class ModernVaultHandler extends AbstractVaultHandler {
+    private final List<String> supportedPlugins = Arrays.asList("PermissionsEx", "LuckPerms");
+
+    @Override
+    protected boolean emulateWildcards() {
+        return false;
+    }
+
+    @Override
+    public boolean canBuild(final Player base, final String group) {
+        Objects.requireNonNull(base, "Can't check build override for nonexistent player!");
+        return super.canBuild(base, group) || chat.getPlayerInfoBoolean(base.getWorld().getName(), base, "build", false);
+    }
+
+    @Override
+    public boolean tryProvider() {
+        return super.canLoad() && supportedPlugins.contains(getEnabledPermsPlugin());
+    }
+}

Essentials/src/com/earth2me/essentials/perm/impl/PermissionsExHandler.java

@@ -1,16 +0,0 @@
-package com.earth2me.essentials.perm.impl;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-public class PermissionsExHandler extends AbstractVaultHandler {
-    @Override
-    public boolean canBuild(final Player base, final String group) {
-        return base != null && chat.getPlayerInfoBoolean(base.getWorld().getName(), base, "build", false);
-    }
-
-    @Override
-    public boolean tryProvider() {
-        return super.canLoad() && Bukkit.getPluginManager().getPlugin("PermissionsEx") != null;
-    }
-}

Essentials/src/com/earth2me/essentials/perm/impl/SuperpermsHandler.java

@@ -10,6 +10,10 @@ import java.util.List;
 
 
 public class SuperpermsHandler implements IPermissionsHandler {
+    protected boolean emulateWildcards() {
+        return true;
+    }
+
     @Override
     public String getGroup(final Player base) {
         return null;
@@ -22,7 +26,7 @@ public class SuperpermsHandler implements IPermissionsHandler {
 
     @Override
     public boolean canBuild(final Player base, final String group) {
-        return false;
+        return hasPermission(base, "essentials.build");
     }
 
     @Override
@@ -32,6 +36,10 @@ public class SuperpermsHandler implements IPermissionsHandler {
 
     @Override
     public boolean hasPermission(final Player base, String node) {
+        if (!emulateWildcards()) {
+            return base.hasPermission(node);
+        }
+
         String permCheck = node;
         int index;
         while (true) {
@@ -49,6 +57,11 @@ public class SuperpermsHandler implements IPermissionsHandler {
         }
     }
 
+    @Override
+    public boolean isPermissionSet(final Player base, final String node) {
+        return base.isPermissionSet(node);
+    }
+
     @Override
     public String getPrefix(final Player base) {
         return null;

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

@@ -2,15 +2,39 @@ package com.earth2me.essentials.settings;
 
 import com.earth2me.essentials.storage.MapValueType;
 import com.earth2me.essentials.storage.StorageObject;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.bukkit.Location;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 
-@Data @EqualsAndHashCode(callSuper = false) public class Jails implements StorageObject {
+public class Jails implements StorageObject {
     @MapValueType(Location.class)
-    private Map<String, Location> jails = new HashMap<String, Location>();
+    private Map<String, Location> jails = new HashMap<>();
+
+    public Map<String, Location> getJails() {
+        return jails;
+    }
+
+    public void setJails(Map<String, Location> jails) {
+        this.jails = jails;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Jails jails1 = (Jails) o;
+        return Objects.equals(jails, jails1.jails);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(jails);
+    }
 }

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

@@ -2,14 +2,38 @@ package com.earth2me.essentials.settings;
 
 import com.earth2me.essentials.storage.MapValueType;
 import com.earth2me.essentials.storage.StorageObject;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.bukkit.Location;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
-@Data @EqualsAndHashCode(callSuper = false) public class Spawns implements StorageObject {
+public class Spawns implements StorageObject {
     @MapValueType(Location.class)
     private Map<String, Location> spawns = new HashMap<>();
+
+    public Map<String, Location> getSpawns() {
+        return spawns;
+    }
+
+    public void setSpawns(Map<String, Location> spawns) {
+        this.spawns = spawns;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Spawns spawns1 = (Spawns) o;
+        return Objects.equals(spawns, spawns1.spawns);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(spawns);
+    }
 }

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

@@ -1,7 +1,7 @@
 package com.earth2me.essentials.signs;
 
 import com.earth2me.essentials.*;
-import com.earth2me.essentials.utils.EnumUtil;
+import com.earth2me.essentials.utils.MaterialUtil;
 import com.earth2me.essentials.utils.NumberUtil;
 import net.ess3.api.IEssentials;
 import net.ess3.api.MaxMoneyException;
@@ -13,6 +13,7 @@ import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.Sign;
+import org.bukkit.block.data.type.WallSign;
 import org.bukkit.entity.Player;
 import org.bukkit.event.block.SignChangeEvent;
 import org.bukkit.inventory.ItemStack;
@@ -26,7 +27,6 @@ import static com.earth2me.essentials.I18n.tl;
 
 
 public class EssentialsSign {
-    private static final Material SIGN_POST = EnumUtil.getMaterial("SIGN", "SIGN_POST");
     private static final Set<Material> EMPTY_SET = new HashSet<Material>();
     protected static final BigDecimal MINTRANSACTION = new BigDecimal("0.01");
     protected transient final String signName;
@@ -206,16 +206,15 @@ public class EssentialsSign {
 
     protected static boolean checkIfBlockBreaksSigns(final Block block) {
         final Block sign = block.getRelative(BlockFace.UP);
-        if (sign.getType() == SIGN_POST && isValidSign(new BlockSign(sign))) {
+        if (MaterialUtil.isSignPost(sign.getType()) && isValidSign(new BlockSign(sign))) {
             return true;
         }
         final BlockFace[] directions = new BlockFace[]{BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST};
         for (BlockFace blockFace : directions) {
-            final Block signblock = block.getRelative(blockFace);
-            if (signblock.getType() == Material.WALL_SIGN) {
+            final Block signBlock = block.getRelative(blockFace);
+            if (MaterialUtil.isWallSign(signBlock.getType())) {
                 try {
-                    final org.bukkit.material.Sign signMat = (org.bukkit.material.Sign) signblock.getState().getData();
-                    if (signMat != null && signMat.getFacing() == blockFace && isValidSign(new BlockSign(signblock))) {
+                    if (getWallSignFacing(signBlock) == blockFace && isValidSign(new BlockSign(signBlock))) {
                         return true;
                     }
                 } catch (NullPointerException ex) {
@@ -445,6 +444,16 @@ public class EssentialsSign {
         ess.showError(sender, exception, "\\ sign: " + signName);
     }
 
+    private static BlockFace getWallSignFacing(Block block) {
+        try {
+            final WallSign signData = (WallSign) block.getState().getBlockData();
+            return signData.getFacing();
+        } catch (NoClassDefFoundError | NoSuchMethodError e) {
+            final org.bukkit.material.Sign signMat = (org.bukkit.material.Sign) block.getState().getData();
+            return signMat.getFacing();
+        }
+    }
+
 
     static class EventSign implements ISign {
         private final transient SignChangeEvent event;

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

@@ -4,6 +4,7 @@ import com.earth2me.essentials.I18n;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.utils.EnumUtil;
 import com.earth2me.essentials.utils.FormatUtil;
+import com.earth2me.essentials.utils.MaterialUtil;
 import net.ess3.api.IEssentials;
 import net.ess3.api.MaxMoneyException;
 import org.bukkit.ChatColor;
@@ -22,8 +23,6 @@ import java.util.logging.Logger;
 
 public class SignBlockListener implements Listener {
     private static final Logger LOGGER = Logger.getLogger("Essentials");
-    private static final Material WALL_SIGN = Material.WALL_SIGN;
-    private static final Material SIGN_POST = EnumUtil.getMaterial("SIGN", "SIGN_POST");
     private final transient IEssentials ess;
 
     public SignBlockListener(IEssentials ess) {
@@ -55,7 +54,7 @@ public class SignBlockListener implements Listener {
         }
 
         final Material mat = block.getType();
-        if (mat == SIGN_POST || mat == WALL_SIGN) {
+        if (MaterialUtil.isSign(mat)) {
             final Sign csign = (Sign) block.getState();
 
             for (EssentialsSign sign : ess.getSettings().enabledSigns()) {
@@ -143,12 +142,12 @@ public class SignBlockListener implements Listener {
         }
 
         final Block against = event.getBlockAgainst();
-        if ((against.getType() == WALL_SIGN || against.getType() == SIGN_POST) && EssentialsSign.isValidSign(ess, new EssentialsSign.BlockSign(against))) {
+        if (MaterialUtil.isSign(against.getType()) && EssentialsSign.isValidSign(ess, new EssentialsSign.BlockSign(against))) {
             event.setCancelled(true);
             return;
         }
         final Block block = event.getBlock();
-        if (block.getType() == WALL_SIGN || block.getType() == SIGN_POST) {
+        if (MaterialUtil.isSign(block.getType())) {
             return;
         }
         for (EssentialsSign sign : ess.getSettings().enabledSigns()) {
@@ -167,7 +166,7 @@ public class SignBlockListener implements Listener {
         }
 
         final Block block = event.getBlock();
-        if (((block.getType() == WALL_SIGN || block.getType() == SIGN_POST) && EssentialsSign.isValidSign(ess, new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) {
+        if ((MaterialUtil.isSign(block.getType()) && EssentialsSign.isValidSign(ess, new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) {
             event.setCancelled(true);
             return;
         }
@@ -187,7 +186,7 @@ public class SignBlockListener implements Listener {
         }
 
         final Block block = event.getBlock();
-        if (((block.getType() == WALL_SIGN || block.getType() == SIGN_POST) && EssentialsSign.isValidSign(ess, new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) {
+        if ((MaterialUtil.isSign(block.getType()) && EssentialsSign.isValidSign(ess, new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) {
             event.setCancelled(true);
             return;
         }
@@ -207,7 +206,7 @@ public class SignBlockListener implements Listener {
         }
 
         for (Block block : event.getBlocks()) {
-            if (((block.getType() == WALL_SIGN || block.getType() == SIGN_POST) && EssentialsSign.isValidSign(ess, new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) {
+            if ((MaterialUtil.isSign(block.getType()) && EssentialsSign.isValidSign(ess, new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) {
                 event.setCancelled(true);
                 return;
             }
@@ -232,7 +231,7 @@ public class SignBlockListener implements Listener {
             final Block[] affectedBlocks = new Block[]{pistonBaseBlock, pistonBaseBlock.getRelative(event.getDirection()), event.getRetractLocation().getBlock()};
 
             for (Block block : affectedBlocks) {
-                if (((block.getType() == WALL_SIGN || block.getType() == SIGN_POST) && EssentialsSign.isValidSign(ess, new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) {
+                if ((MaterialUtil.isSign(block.getType()) && EssentialsSign.isValidSign(ess, new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) {
                     event.setCancelled(true);
                     return;
                 }

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

@@ -3,6 +3,8 @@ package com.earth2me.essentials.signs;
 import com.earth2me.essentials.User;
 import net.ess3.api.IEssentials;
 
+import static com.earth2me.essentials.I18n.tl;
+
 
 public class SignDisposal extends EssentialsSign {
     public SignDisposal() {
@@ -11,7 +13,7 @@ public class SignDisposal extends EssentialsSign {
 
     @Override
     protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) {
-        player.getBase().openInventory(ess.getServer().createInventory(player.getBase(), 36, "Disposal"));
+        player.getBase().openInventory(ess.getServer().createInventory(player.getBase(), 36, tl("disposal")));
         return true;
     }
 }

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

@@ -1,6 +1,7 @@
 package com.earth2me.essentials.signs;
 
 import com.earth2me.essentials.utils.EnumUtil;
+import com.earth2me.essentials.utils.MaterialUtil;
 import net.ess3.api.IEssentials;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -13,7 +14,6 @@ import org.bukkit.event.entity.EntityExplodeEvent;
 
 public class SignEntityListener implements Listener {
 
-    private static final Material SIGN_POST = EnumUtil.getMaterial("SIGN", "SIGN_POST");
     private final transient IEssentials ess;
 
     public SignEntityListener(final IEssentials ess) {
@@ -28,7 +28,7 @@ public class SignEntityListener implements Listener {
         }
 
         for (Block block : event.blockList()) {
-            if (((block.getType() == Material.WALL_SIGN || block.getType() == SIGN_POST) && EssentialsSign.isValidSign(ess, new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) {
+            if ((MaterialUtil.isSign(block.getType()) && EssentialsSign.isValidSign(ess, new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) {
                 event.setCancelled(true);
                 return;
             }
@@ -49,7 +49,7 @@ public class SignEntityListener implements Listener {
         }
 
         final Block block = event.getBlock();
-        if (((block.getType() == Material.WALL_SIGN || block.getType() == SIGN_POST) && EssentialsSign.isValidSign(ess, new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) {
+        if ((MaterialUtil.isSign(block.getType()) && EssentialsSign.isValidSign(ess, new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) {
             event.setCancelled(true);
             return;
         }

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

@@ -75,7 +75,7 @@ public class SignProtection extends EssentialsSign {
                 final Block sign = entry.getKey().getBlock();
                 if (!hasAdjacentBlock(sign, block)) {
                     block.setType(Material.AIR);
-                    final Trade trade = new Trade(new ItemStack(Material.SIGN, 1), ess);
+                    final Trade trade = new Trade(new ItemStack(sign.getType(), 1), ess);
                     trade.pay(player, OverflowType.DROP);
                 }
             }

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

@@ -40,16 +40,24 @@ public class SignWarp extends EssentialsSign {
     protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException {
         final String warpName = sign.getLine(1);
         final String group = sign.getLine(2);
-        if ((!group.isEmpty() && ("§2Everyone".equals(group) || player.inGroup(group))) || (group.isEmpty() && (!ess.getSettings().getPerWarpPermission() || player.isAuthorized("essentials.warps." + warpName)))) {
-            final Trade charge = getTrade(sign, 3, ess);
-            try {
-                player.getTeleport().warp(player, warpName, charge, TeleportCause.PLUGIN);
-                Trade.log("Sign", "Warp", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess);
-            } catch (Exception ex) {
-                throw new SignException(ex.getMessage(), ex);
+
+        if (!group.isEmpty()) {
+            if (!"§2Everyone".equals(group) && !player.inGroup(group)) {
+                throw new SignException(tl("warpUsePermission"));
+            }
+        } else {
+            if (ess.getSettings().getPerWarpPermission() && !player.isAuthorized("essentials.warps." + warpName)) {
+                throw new SignException(tl("warpUsePermission"));
             }
-            return true;
         }
-        return false;
+
+        final Trade charge = getTrade(sign, 3, ess);
+        try {
+            player.getTeleport().warp(player, warpName, charge, TeleportCause.PLUGIN);
+            Trade.log("Sign", "Warp", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess);
+        } catch (Exception ex) {
+            throw new SignException(ex.getMessage(), ex);
+        }
+        return true;
     }
 }

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

@@ -2,6 +2,7 @@ package com.earth2me.essentials.utils;
 
 import org.bukkit.Material;
 import org.bukkit.Statistic;
+import org.bukkit.entity.EntityType;
 
 import java.lang.reflect.Field;
 import java.util.HashSet;
@@ -78,4 +79,7 @@ public class EnumUtil {
         return valueOf(Statistic.class, names);
     }
 
+    public static EntityType getEntityType(String... names) {
+        return valueOf(EntityType.class, names);
+    }
 }

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

@@ -3,23 +3,25 @@ package com.earth2me.essentials.utils;
 import net.ess3.api.IUser;
 import org.bukkit.ChatColor;
 
+import java.util.EnumSet;
+import java.util.Locale;
+import java.util.Set;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 
 public class FormatUtil {
+    private static final Set<ChatColor> COLORS = EnumSet.of(ChatColor.BLACK, ChatColor.DARK_BLUE, ChatColor.DARK_GREEN, ChatColor.DARK_AQUA, ChatColor.DARK_RED, ChatColor.DARK_PURPLE, ChatColor.GOLD, ChatColor.GRAY, ChatColor.DARK_GRAY, ChatColor.BLUE, ChatColor.GREEN, ChatColor.AQUA, ChatColor.RED, ChatColor.LIGHT_PURPLE, ChatColor.YELLOW, ChatColor.WHITE);
+    private static final Set<ChatColor> FORMATS = EnumSet.of(ChatColor.BOLD, ChatColor.STRIKETHROUGH, ChatColor.UNDERLINE, ChatColor.ITALIC, ChatColor.RESET);
+    private static final Set<ChatColor> MAGIC = EnumSet.of(ChatColor.MAGIC);
+
     //Vanilla patterns used to strip existing formats
-    static final transient Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00a7+[0-9A-Fa-f]");
-    static final transient Pattern VANILLA_MAGIC_PATTERN = Pattern.compile("\u00a7+[Kk]");
-    static final transient Pattern VANILLA_FORMAT_PATTERN = Pattern.compile("\u00a7+[L-ORl-or]");
+    private static final Pattern STRIP_ALL_PATTERN = Pattern.compile("\u00a7+([0-9a-fk-orA-FK-OR])");
     //Essentials '&' convention colour codes
-    static final transient Pattern REPLACE_ALL_PATTERN = Pattern.compile("(?<!&)&([0-9a-fk-orA-FK-OR])");
-    static final transient Pattern REPLACE_COLOR_PATTERN = Pattern.compile("(?<!&)&([0-9a-fA-F])");
-    static final transient Pattern REPLACE_MAGIC_PATTERN = Pattern.compile("(?<!&)&([Kk])");
-    static final transient Pattern REPLACE_FORMAT_PATTERN = Pattern.compile("(?<!&)&([l-orL-OR])");
-    static final transient Pattern REPLACE_PATTERN = Pattern.compile("&&(?=[0-9a-fk-orA-FK-OR])");
+    private static final Pattern REPLACE_ALL_PATTERN = Pattern.compile("(&)?&([0-9a-fk-orA-FK-OR])");
     //Used to prepare xmpp output
-    static final transient Pattern LOGCOLOR_PATTERN = Pattern.compile("\\x1B\\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]");
-    static final transient Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-zA-Z]{2,3}(?:/\\S+)?)");
+    private static final Pattern LOGCOLOR_PATTERN = Pattern.compile("\\x1B\\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]");
+    private static final Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-zA-Z]{2,3}(?:/\\S+)?)");
     public static final Pattern IPPATTERN = Pattern.compile("^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$");
 
     //This method is used to simply strip the native minecraft colour codes
@@ -55,33 +57,88 @@ public class FormatUtil {
         if (input == null) {
             return null;
         }
-        return replaceColor(input, REPLACE_ALL_PATTERN);
+        return replaceColor(input, EnumSet.allOf(ChatColor.class));
     }
 
-    static String replaceColor(final String input, final Pattern pattern) {
-        return REPLACE_PATTERN.matcher(pattern.matcher(input).replaceAll("\u00a7$1")).replaceAll("&");
+    static String replaceColor(final String input, final Set<ChatColor> supported) {
+        StringBuffer builder = new StringBuffer();
+        Matcher matcher = REPLACE_ALL_PATTERN.matcher(input);
+        searchLoop: while (matcher.find()) {
+            boolean isEscaped = (matcher.group(1) != null);
+            if (!isEscaped) {
+                char code = matcher.group(2).toLowerCase(Locale.ROOT).charAt(0);
+                for (ChatColor color : supported) {
+                    if (color.getChar() == code) {
+                        matcher.appendReplacement(builder, "\u00a7$2");
+                        continue searchLoop;
+                    }
+                }
+            }
+            // Don't change & to section sign (or replace two &'s with one)
+            matcher.appendReplacement(builder, "&$2");
+        }
+        matcher.appendTail(builder);
+        return builder.toString();
+    }
+
+    static String stripColor(final String input, final Set<ChatColor> strip) {
+        StringBuffer builder = new StringBuffer();
+        Matcher matcher = STRIP_ALL_PATTERN.matcher(input);
+        searchLoop: while (matcher.find()) {
+            char code = matcher.group(1).toLowerCase(Locale.ROOT).charAt(0);
+            for (ChatColor color : strip) {
+                if (color.getChar() == code) {
+                    matcher.appendReplacement(builder, "");
+                    continue searchLoop;
+                }
+            }
+            // Don't replace
+            matcher.appendReplacement(builder, "$0");
+        }
+        matcher.appendTail(builder);
+        return builder.toString();
     }
 
     //This is the general permission sensitive message format function, does not touch urls.
-    public static String formatString(final IUser user, final String permBase, final String input) {
-        if (input == null) {
+    public static String formatString(final IUser user, final String permBase, String message) {
+        if (message == null) {
             return null;
         }
-        String message;
+        EnumSet<ChatColor> supported = EnumSet.noneOf(ChatColor.class);
         if (user.isAuthorized(permBase + ".color")) {
-            message = replaceColor(input, REPLACE_COLOR_PATTERN);
-        } else {
-            message = stripColor(input, VANILLA_COLOR_PATTERN);
-        }
-        if (user.isAuthorized(permBase + ".magic")) {
-            message = replaceColor(message, REPLACE_MAGIC_PATTERN);
-        } else {
-            message = stripColor(message, VANILLA_MAGIC_PATTERN);
+            supported.addAll(COLORS);
         }
         if (user.isAuthorized(permBase + ".format")) {
-            message = replaceColor(message, REPLACE_FORMAT_PATTERN);
-        } else {
-            message = stripColor(message, VANILLA_FORMAT_PATTERN);
+            supported.addAll(FORMATS);
+        }
+        if (user.isAuthorized(permBase + ".magic")) {
+            supported.addAll(MAGIC);
+        }
+        for (ChatColor chatColor : ChatColor.values()) {
+            String colorName = chatColor.name();
+            if (chatColor == ChatColor.MAGIC) {
+                // Bukkit's name doesn't match with vanilla's
+                colorName = "obfuscated";
+            }
+
+            final String node = permBase + "." + colorName.toLowerCase(Locale.ROOT);
+            // Only handle individual colors that are explicitly added or removed.
+            if (!user.isPermissionSet(node)) {
+                continue;
+            }
+            if (user.isAuthorized(node)) {
+                supported.add(chatColor);
+            } else {
+                supported.remove(chatColor);
+            }
+        }
+        EnumSet<ChatColor> strip = EnumSet.complementOf(supported);
+
+        if (!supported.isEmpty()) {
+            message = replaceColor(message, supported);
+        }
+        if (!strip.isEmpty()) {
+            message = stripColor(message, strip);
         }
         return message;
     }

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

@@ -16,6 +16,10 @@ import static com.earth2me.essentials.I18n.tl;
 
 
 public class LocationUtil {
+    // Water types used for TRANSPARENT_MATERIALS and is-water-safe config option
+    private static final Set<Material> WATER_TYPES =
+            EnumUtil.getAllMatching(Material.class, "WATER", "FLOWING_WATER");
+
     // The player can stand inside these materials
     private static final Set<Material> HOLLOW_MATERIALS = new HashSet<>();
     private static final Set<Material> TRANSPARENT_MATERIALS = new HashSet<>();
@@ -29,10 +33,15 @@ public class LocationUtil {
         }
 
         TRANSPARENT_MATERIALS.addAll(HOLLOW_MATERIALS);
-        TRANSPARENT_MATERIALS.add(Material.WATER);
-        try {
-            TRANSPARENT_MATERIALS.add(Material.valueOf("FLOWING_WATER"));
-        } catch (Exception ignored) {} // 1.13 WATER uses Levelled
+        TRANSPARENT_MATERIALS.addAll(WATER_TYPES);
+    }
+
+    public static void setIsWaterSafe(boolean isWaterSafe) {
+        if (isWaterSafe) {
+            HOLLOW_MATERIALS.addAll(WATER_TYPES);
+        } else {
+            HOLLOW_MATERIALS.removeAll(WATER_TYPES);
+        }
     }
 
     public static final int RADIUS = 3;

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

@@ -3,8 +3,12 @@ package com.earth2me.essentials.utils;
 import org.bukkit.Bukkit;
 import org.bukkit.DyeColor;
 import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.MaterialData;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.EnumSet;
 import java.util.Optional;
 import java.util.Set;
@@ -21,7 +25,8 @@ public class MaterialUtil {
     // includes TIPPED_ARROW which also has potion effects
     private static final Set<Material> PLAYER_HEADS;
     private static final Set<Material> POTIONS;
-    private static final Set<Material> SIGNS;
+    private static final Set<Material> SIGN_POSTS;
+    private static final Set<Material> WALL_SIGNS;
 
     public static final Material SPAWNER = EnumUtil.getMaterial("MOB_SPAWNER", "SPAWNER");
 
@@ -55,7 +60,14 @@ public class MaterialUtil {
         POTIONS = EnumUtil.getAllMatching(Material.class, "POTION", "SPLASH_POTION",
             "LINGERING_POTION", "TIPPED_ARROW");
 
-        SIGNS = EnumUtil.getAllMatching(Material.class, "SIGN", "SIGN_POST", "WALL_SIGN");
+        SIGN_POSTS = EnumUtil.getAllMatching(Material.class, "SIGN", "SIGN_POST",
+            "ACACIA_SIGN", "BIRCH_SIGN",
+            "DARK_OAK_SIGN", "JUNGLE_SIGN",
+            "OAK_SIGN", "SPRUCE_SIGN");
+
+        WALL_SIGNS = EnumUtil.getAllMatching(Material.class, "WALL_SIGN",
+            "ACACIA_WALL_SIGN", "BIRCH_WALL_SIGN", "DARK_OAK_WALL_SIGN", "JUNGLE_WALL_SIGN",
+            "OAK_WALL_SIGN", "SPRUCE_WALL_SIGN");
     }
 
     public static boolean isBed(Material material) {
@@ -94,8 +106,16 @@ public class MaterialUtil {
         return POTIONS.contains(material);
     }
 
+    public static boolean isSignPost(Material material) {
+        return SIGN_POSTS.contains(material);
+    }
+
+    public static boolean isWallSign(Material material) {
+        return WALL_SIGNS.contains(material);
+    }
+
     public static boolean isSign(Material material) {
-        return SIGNS.contains(material);
+        return isSignPost(material) || isWallSign(material);
     }
 
     public static boolean isSkull(Material material) {
@@ -108,10 +128,16 @@ public class MaterialUtil {
                 try {
                     return Bukkit.getUnsafe().fromLegacy(new MaterialData(material, damage));
                 } catch (NoSuchMethodError error) {
-                    return material;
+                    break;
                 }
             }
         }
+
+        try {
+            Method getMaterialFromId = Material.class.getDeclaredMethod("getMaterial", int.class);
+            return (Material) getMaterialFromId.invoke(null, id);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {}
+
         return null;
     }
 

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

@@ -2,6 +2,7 @@ package com.earth2me.essentials.utils;
 
 import java.util.Collection;
 import java.util.Locale;
+import java.util.UUID;
 import java.util.regex.Pattern;
 
 
@@ -73,6 +74,14 @@ public class StringUtil {
         return buf.toString();
     }
 
+    public static UUID toUUID(String input) {
+        try {
+            return UUID.fromString(input);
+        } catch (IllegalArgumentException ignored) {}
+
+        return null;
+    }
+
     private StringUtil() {
     }
 }

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

@@ -20,8 +20,13 @@ public class VersionUtil {
     public static final BukkitVersion v1_12_2_R01 = BukkitVersion.fromString("1.12.2-R0.1-SNAPSHOT");
     public static final BukkitVersion v1_13_0_R01 = BukkitVersion.fromString("1.13.0-R0.1-SNAPSHOT");
     public static final BukkitVersion v1_13_2_R01 = BukkitVersion.fromString("1.13.2-R0.1-SNAPSHOT");
+    public static final BukkitVersion v1_14_R01 = BukkitVersion.fromString("1.14-R0.1-SNAPSHOT");
+    public static final BukkitVersion v1_14_4_R01 = BukkitVersion.fromString("1.14.4-R0.1-SNAPSHOT");
+    public static final BukkitVersion v1_15_R01 = BukkitVersion.fromString("1.15-R0.1-SNAPSHOT");
+    public static final BukkitVersion v1_15_1_R01 = BukkitVersion.fromString("1.15.1-R0.1-SNAPSHOT");
+    public static final BukkitVersion v1_15_2_R01 = BukkitVersion.fromString("1.15.2-R0.1-SNAPSHOT");
 
-    private static final Set<BukkitVersion> supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01);
+    private static final Set<BukkitVersion> supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_4_R01, v1_15_2_R01);
 
     private static BukkitVersion serverVersion = null;
 
@@ -37,10 +42,11 @@ public class VersionUtil {
     }
 
     public static class BukkitVersion implements Comparable<BukkitVersion> {
-        private static final Pattern VERSION_PATTERN = Pattern.compile("^(\\d+)\\.(\\d+)\\.?([0-9]*)-R([\\d.]+)(?:-SNAPSHOT)?");
+        private static final Pattern VERSION_PATTERN = Pattern.compile("^(\\d+)\\.(\\d+)\\.?([0-9]*)?(?:-pre(\\d))?(?:-?R?([\\d.]+))?(?:-SNAPSHOT)?");
 
         private final int major;
         private final int minor;
+        private final int prerelease;
         private final int patch;
         private final double revision;
 
@@ -51,26 +57,30 @@ public class VersionUtil {
                 if (!Bukkit.getName().equals("Essentials Fake Server")) {
                     throw new IllegalArgumentException(string + " is not in valid version format. e.g. 1.8.8-R0.1");
                 }
-                matcher = VERSION_PATTERN.matcher(v1_13_2_R01.toString());
+                matcher = VERSION_PATTERN.matcher(v1_14_R01.toString());
                 Preconditions.checkArgument(matcher.matches(), string + " is not in valid version format. e.g. 1.8.8-R0.1");
             }
 
-            return from(matcher.group(1), matcher.group(2), matcher.group(3), matcher.group(4));
+            return from(matcher.group(1), matcher.group(2), matcher.group(3), matcher.groupCount() < 5 ? "" : matcher.group(5), matcher.group(4));
         }
 
-        private static BukkitVersion from(String major, String minor, String patch, String revision) {
-            if (patch.isEmpty()) patch = "0";
+        private static BukkitVersion from(String major, String minor, String patch, String revision, String prerelease) {
+            if (patch == null || patch.isEmpty()) patch = "0";
+            if (revision == null || revision.isEmpty()) revision = "0";
+            if (prerelease == null || prerelease.isEmpty()) prerelease = "-1";
             return new BukkitVersion(Integer.parseInt(major),
                 Integer.parseInt(minor),
                 Integer.parseInt(patch),
-                Double.parseDouble(revision));
+                Double.parseDouble(revision),
+                Integer.parseInt(prerelease));
         }
 
-        private BukkitVersion(int major, int minor, int patch, double revision) {
+        private BukkitVersion(int major, int minor, int patch, double revision, int prerelease) {
             this.major = major;
             this.minor = minor;
             this.patch = patch;
             this.revision = revision;
+            this.prerelease = prerelease;
         }
 
         public boolean isHigherThan(BukkitVersion o) {
@@ -105,6 +115,10 @@ public class VersionUtil {
             return revision;
         }
 
+        public int getPrerelease() {
+            return prerelease;
+        }
+
         @Override
         public boolean equals(Object o) {
             if (this == o) {
@@ -115,19 +129,27 @@ public class VersionUtil {
             }
             BukkitVersion that = (BukkitVersion) o;
             return major == that.major &&
-                    minor == that.minor &&
-                    patch == that.patch &&
-                    revision == that.revision;
+                minor == that.minor &&
+                patch == that.patch &&
+                revision == that.revision &&
+                prerelease == that.prerelease;
         }
 
         @Override
         public int hashCode() {
-            return Objects.hashCode(major, minor, patch, revision);
+            return Objects.hashCode(major, minor, patch, revision, prerelease);
         }
 
         @Override
         public String toString() {
-            return major + "." + minor + "." + patch + "-R" + revision;
+            StringBuilder sb = new StringBuilder(major + "." + minor);
+            if (patch != 0) {
+                sb.append(".").append(patch);
+            }
+            if (prerelease != -1) {
+                sb.append("-pre").append(prerelease);
+            }
+            return sb.append("-R").append(revision).toString();
         }
 
         @Override
@@ -147,7 +169,13 @@ public class VersionUtil {
                     } else if (patch > o.patch) {
                         return 1;
                     } else { // equal patch
-                        return Double.compare(revision, o.revision);
+                        if (prerelease < o.prerelease) {
+                            return -1;
+                        } else if (prerelease > o.prerelease) {
+                            return 1;
+                        } else { // equal prerelease
+                            return Double.compare(revision, o.revision);
+                        }
                     }
                 }
             }

Essentials/src/config.yml

@@ -32,6 +32,12 @@ nickname-prefix: '~'
 # The maximum length allowed in nicknames. The nickname prefix is included in this.
 max-nick-length: 15
 
+# A list of phrases that cannot be used in nicknames. You can include regular expressions here.
+# Users with essentials.nick.blacklist.bypass will be able to bypass this filter.
+nick-blacklist:
+#- Notch
+#- '^Dinnerbone'
+
 # When this option is enabled, nickname length checking will exclude color codes in player names.
 # ie: "&6Notch" has 7 characters (2 are part of a color code), a length of 5 is used when this option is set to true
 ignore-colors-in-max-nick-length: false
@@ -281,6 +287,12 @@ player-commands:
   - worth
   - xmpp
 
+# Use this option to force superperms-based permissions handler regardless of detected installed perms plugin.
+# This is useful if you want superperms-based permissions (with wildcards) for custom permissions plugins.
+# If you wish to use EssentialsX's built-in permissions using the `player-commands` section above, set this to false.
+# Default is true.
+use-bukkit-permissions: true
+
 # When this option is enabled, one-time use kits (ie. delay < 0) will be
 # removed from the /kit list when a player can no longer use it
 skip-used-one-time-kits-from-kit-list: false
@@ -405,6 +417,11 @@ cancel-afk-on-interact: true
 # Disable this to reduce server lag.
 cancel-afk-on-move: true
 
+# Should AFK players be ignored when other players are trying to sleep?
+# When this setting is false, players won't be able to skip the night if some players are AFK.
+# Users with the permission node essentials.sleepingignored will always be ignored.
+sleep-ignores-afk-players: true
+
 # Set the player's list name when they are AFK. This is none by default which specifies that Essentials 
 # should not interfere with the AFK player's list name.
 # You may use color codes, use {USERNAME} the player's name or {PLAYER} for the player's displayname.
@@ -475,16 +492,18 @@ mails-per-minute: 1000
 # Set to -1 to disable, and essentials.tempban.unlimited can be used to override.
 max-tempban-time: -1
 
-# Changes /reply functionality. If true, /r goes to the person you messaged last, otherwise the first person that messaged you. 
+# Changes the default /reply functionality. This can be changed on a per-player basis using /rtoggle.
+# If true, /r goes to the person you messaged last, otherwise the first person that messaged you.
 # If false, /r goes to the last person that messaged you.
 last-message-reply-recipient: true
 
-# If last-message-reply-recipient is true, this specifies the duration, in seconds, that would need to elapse for the 
+# If last-message-reply-recipient is enabled for a particular player,
+# this specifies the duration, in seconds, that would need to elapse for the
 # reply-recipient to update when receiving a message.
 # Default is 180 (3 minutes)
 last-message-reply-recipient-timeout: 180
 
-# Toggles whether or not clicking mobs with a milk bucket turns them into a baby.
+# Toggles whether or not left clicking mobs with a milk bucket turns them into a baby.
 milk-bucket-easter-egg: true
 
 # Toggles whether or not the fly status message should be sent to players on join
@@ -531,6 +550,9 @@ default-enabled-confirm-commands:
 #- pay
 #- clearinventory
 
+# Whether or not to teleport a player back to their previous position after they have been freed from jail.
+teleport-back-when-freed-from-jail: true
+
 # Set the timeout, in seconds for players to accept a tpa before the request is cancelled.
 # Set to 0 for no timeout.
 tpa-accept-cancellation: 120
@@ -543,6 +565,19 @@ allow-direct-hat: true
 # This doesn't affect running the command from the console, where a world is always required.
 allow-world-in-broadcastworld: true
 
+# Consider water blocks as "safe," therefore allowing players to teleport
+# using commands such as /home or /spawn to a location that is occupied
+# by water blocks
+is-water-safe: false
+
+# Should the usermap try to sanitise usernames before saving them?
+# You should only change this to false if you use Minecraft China.
+safe-usermap-names: true
+
+# Should Essentials output logs when a command block executes a command?
+# Example: CommandBlock at <x>,<y>,<z> issued server command: /<command>
+log-command-block-commands: true
+
 ############################################################
 # +------------------------------------------------------+ #
 # |                   EssentialsHome                     | #
@@ -579,6 +614,9 @@ sethome-multiple:
 # change the compass' direction to point towards their first home.
 compass-towards-home-perm: false
 
+# Set the maximum speed for projectiles spawned with /fireball.
+max-projectile-speed: 8
+
 ############################################################
 # +------------------------------------------------------+ #
 # |                    EssentialsEco                     | #
@@ -617,12 +655,6 @@ min-money: -10000
 # Enable this to log all interactions with trade/buy/sell signs and sell command.
 economy-log-enabled: false
 
-# Use this option to force superperms-based permissions handler regardless of detected installed perms plugin.
-# This is useful if you want superperms-based permissions (with wildcards) for custom permissions plugins.
-# If you wish to use EssentialsX' built-in permissions using the `player-commands` section above, set this to false.
-# Default is true. 
-use-bukkit-permissions: true
-
 # Minimum acceptable amount to be used in /pay.
 minimum-pay-amount: 0.001
 
@@ -681,10 +713,11 @@ chat:
   #format: '&7{PREFIX}&r {DISPLAYNAME}&r &7{SUFFIX}&r: {MESSAGE}'
 
   group-formats:
-  #  Default: '{WORLDNAME} {DISPLAYNAME}&7:&r {MESSAGE}'
-  #  Admins: '{WORLDNAME} &c[{GROUP}]&r {DISPLAYNAME}&7:&c {MESSAGE}'
+  #  default: '{WORLDNAME} {DISPLAYNAME}&7:&r {MESSAGE}'
+  #  admins: '{WORLDNAME} &c[{GROUP}]&r {DISPLAYNAME}&7:&c {MESSAGE}'
 
   # If you are using group formats make sure to remove the '#' to allow the setting to be read.
+  # Note: Group names are case-sensitive so you must match them up with your permission plugin.
 
 ############################################################
 # +------------------------------------------------------+ #
@@ -726,6 +759,22 @@ protect:
     # Monsters won't follow players.
     # permission essentials.protect.entitytarget.bypass disables this.
     entitytarget: false
+    # Prevent certain transformations.
+    transformation:
+      # Prevent creepers becoming charged when struck by lightning.
+      charged-creeper: false
+      # Prevent villagers becoming zombie villagers.
+      zombie-villager: false
+      # Prevent zombie villagers being cured.
+      villager: false
+      # Prevent villagers becoming witches when struck by lightning.
+      witch: false
+      # Prevent pigs becoming zombie pigmen when struck by lightning.
+      zombie-pigman: false
+      # Prevent zombies turning into drowneds, and husks turning into zombies.
+      drowned: false
+      # Prevent mooshrooms changing colour when struck by lightning.
+      mooshroom: false
     # Prevent the spawning of creatures.
     spawn:
       creeper: false
@@ -757,6 +806,7 @@ protect:
       bat: false
       witch: false
       horse: false
+      phantom: false
 
   # Maximum height the creeper should explode. -1 allows them to explode everywhere.
   # Set prevent.creeper-explosion to true, if you want to disable creeper explosions.
@@ -888,6 +938,9 @@ spawn-join-listener-priority: high
 # When users die, should they respawn at their first home or bed, instead of the spawnpoint?
 respawn-at-home: false
 
+# If no home is set, would you like to send the player to spawn? (Only applies to /home)
+spawn-if-no-home: true
+
 # Teleport all joining players to the spawnpoint
 spawn-on-join: false
 # The following value of `guests` states that all players in group `guests` will be teleported to spawn when joining.

Essentials/src/custom_items.yml

@@ -0,0 +1,8 @@
+# This file stores custom item aliases.
+# We recommend you use the `/itemdb alias` command to manage these.
+
+# NOTE: If you try and alias an item to another entry in this file, the alias won't work.
+aliases:
+  bluepaint: blue_dye
+  snad: sand
+  breakfast: cooked_porkchop

Essentials/src/kits.yml

@@ -5,6 +5,7 @@
 # All kit names should be lower case, and will be treated as lower in permissions/costs.
 # Syntax: - name[:durability] amount [enchantment:level]... [itemmeta:value]...
 # For Item Meta information visit http://wiki.ess3.net/wiki/Item_Meta
+# To make the kit execute a command, add /<command> to the items list. Use {PLAYER} to specify the player receiving the kit.
 # 'delay' refers to the cooldown between how often you can use each kit, measured in seconds.
 # Set delay to -1 for a one time kit.
 # For more information, visit http://wiki.ess3.net/wiki/Kits
@@ -23,6 +24,7 @@ kits:
       - dshovel 1 digspeed:3 name:Dwarf lore:Diggy|Diggy|Hole
       - lhelm 1 color:255,255,255 name:Top_Hat lore:Good_day,_Good_day
       - daxe:780 1
+      - /broadcast {PLAYER} just got some fancy tools!
   notch:
     delay: 6000
     items:

Essentials/src/messages.properties

@@ -1,7 +1,6 @@
 #X-Generator: crowdin.net
 #version: ${full.version}
 # Single quotes have to be doubled: ''
-# Translations start here
 # by:
 action=\u00a75* {0} \u00a75{1}
 addedToAccount=\u00a7a{0} has been added to your account.
@@ -19,7 +18,12 @@ antiBuildInteract=\u00a74You are not permitted to interact with\u00a7c {0}\u00a7
 antiBuildPlace=\u00a74You are not permitted to place\u00a7c {0} \u00a74here.
 antiBuildUse=\u00a74You are not permitted to use\u00a7c {0}\u00a74.
 autoAfkKickReason=You have been kicked for idling more than {0} minutes.
-backAfterDeath=\u00a76Use the /back command to return to your death point.
+autoTeleportDisabled=\u00a76You are no longer automatically approving teleport requests.
+autoTeleportDisabledFor=\u00a7c{0}\u00a76 is no longer automatically approving teleport requests.
+autoTeleportEnabled=\u00a76You are now automatically approving teleport requests.
+autoTeleportEnabledFor=\u00a7c{0}\u00a76 is now automatically approving teleport requests.
+backAfterDeath=\u00a76Use the\u00a7c /back\u00a76 command to return to your death point.
+backOther=\u00a76Returned\u00a7c {0}\u00a76 to previous location.
 backupDisabled=\u00a74An external backup script has not been configured.
 backupFinished=\u00a76Backup finished.
 backupStarted=\u00a76Backup started.
@@ -38,13 +42,12 @@ bedNull=\u00a7mbed\u00a7r
 bedSet=\u00a76Bed spawn set\!
 bigTreeFailure=\u00a74Big tree generation failure. Try again on grass or dirt.
 bigTreeSuccess=\u00a76Big tree spawned.
-blockList=\u00a76Essentials relayed the following commands to another plugin\:
+blockList=\u00a76EssentialsX is relaying the following commands to other plugins\:
+blockListEmpty=\u00a76EssentialsX is not relaying any commands to other plugins.
 bookAuthorSet=\u00a76Author of the book set to {0}.
 bookLocked=\u00a76This book is now locked.
 bookTitleSet=\u00a76Title of the book set to {0}.
-broadcast=\u00a7r\u00a76[\u00a74Broadcast\u00a76]\u00a7a {0}
-buildAlert=\u00a74You are not permitted to build.
-bukkitFormatChanged=Bukkit version format changed. Version not checked.
+broadcast=\u00a76[\u00a74Broadcast\u00a76]\u00a7a {0}
 burnMsg=\u00a76You set\u00a7c {0} \u00a76on fire for\u00a7c {1} seconds\u00a76.
 cannotStackMob=\u00a74You do not have permission to stack multiple mobs.
 canTalkAgain=\u00a76You can now talk again.
@@ -52,7 +55,6 @@ cantFindGeoIpDB=Can''t find GeoIP database\!
 cantGamemode=\u00a74You do not have permission to change to gamemode {0}
 cantReadGeoIpDB=Failed to read GeoIP database\!
 cantSpawnItem=\u00a74You are not allowed to spawn the item\u00a7c {0}\u00a74.
-chatTypeAdmin=[A]
 chatTypeLocal=[L]
 chatTypeSpy=[Spy]
 cleaned=Userfiles Cleaned.
@@ -63,7 +65,7 @@ commandCooldown=\u00a7cYou cannot type that command for {0}.
 commandFailed=Command {0} failed\:
 commandHelpFailedForPlugin=Error getting help for plugin\: {0}
 commandNotLoaded=\u00a74Command {0} is improperly loaded.
-compassBearing=\u00a76Bearing\:  {0} ({1} degrees).
+compassBearing=\u00a76Bearing\: {0} ({1} degrees).
 configFileMoveError=Failed to move config.yml to backup location.
 configFileRenameError=Failed to rename temp file to config.yml.
 confirmClear=\u00a77To \u00a7lCONFIRM\u00a77 inventory clear, please repeat command: \u00a76{0}
@@ -72,7 +74,6 @@ connectedPlayers=\u00a76Connected players\u00a7r
 connectionFailed=Failed to open connection.
 cooldownWithMessage=\u00a74Cooldown\: {0}
 coordsKeyword={0}, {1}, {2}
-corruptNodeInConfig=\u00a74Notice\: Your configuration file has a corrupt {0} node.
 couldNotFindTemplate=\u00a74Could not find template {0}
 createdKit=\u00a76Created kit \u00a7c{0} \u00a76with \u00a7c{1} \u00a76entries and delay \u00a7c{2}
 createKitFailed=\u00a74Error occurred whilst creating kit {0}.
@@ -89,6 +90,7 @@ defaultBanReason=The Ban Hammer has spoken\!
 deleteFileError=Could not delete file\: {0}
 deleteHome=\u00a76Home\u00a7c {0} \u00a76has been removed.
 deleteJail=\u00a76Jail\u00a7c {0} \u00a76has been removed.
+deleteKit=\u00a76Kit\u00a7c {0} \u00a76has been removed.
 deleteWarp=\u00a76Warp\u00a7c {0} \u00a76has been removed.
 deniedAccessCommand=\u00a7c{0} \u00a74was denied access to command.
 denyBookEdit=\u00a74You cannot unlock this book.
@@ -100,7 +102,8 @@ depthBelowSea=\u00a76You are\u00a7c {0} \u00a76block(s) below sea level.
 destinationNotSet=Destination not set\!
 disabled=disabled
 disabledToSpawnMob=\u00a74Spawning this mob was disabled in the config file.
-disableUnlimited=\u00a76Disabled unlimited placing of\u00a7c {0} \u00a76for {1}.
+disableUnlimited=\u00a76Disabled unlimited placing of\u00a7c {0} \u00a76for\u00a7c {1}\u00a76.
+disposal=Disposal
 distance=\u00a76Distance\: {0}
 dontMoveMessage=\u00a76Teleportation will commence in\u00a7c {0}\u00a76. Don''t move.
 downloadingGeoIp=Downloading GeoIP database... this might take a while (country\: 1.7 MB, city\: 30MB)
@@ -145,11 +148,12 @@ gcmax=\u00a76Maximum memory\:\u00a7c {0} MB.
 gctotal=\u00a76Allocated memory\:\u00a7c {0} MB.
 gcWorld=\u00a76{0} "\u00a7c{1}\u00a76"\: \u00a7c{2}\u00a76 chunks, \u00a7c{3}\u00a76 entities, \u00a7c{4}\u00a76 tiles.
 geoipJoinFormat=\u00a76Player \u00a7c{0} \u00a76comes from \u00a7c{1}\u00a76.
+geoipCantFind=\u00a76Player \u00a7c{0} \u00a76comes from \u00a7aan unknown country\u00a76.
 geoIpUrlEmpty=GeoIP download url is empty.
 geoIpUrlInvalid=GeoIP download url is invalid.
 givenSkull=\u00a76You have been given the skull of \u00a7c{0}\u00a76.
-giveSpawn=\u00a76Giving\u00a7c {0} \u00a76of\u00a7c {1} to\u00a7c {2}\u00a76.
-giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost.
+giveSpawn=\u00a76Giving\u00a7c {0} \u00a76of\u00a7c {1} \u00a76to\u00a7c {2}\u00a76.
+giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} {1} \u00a74was lost.
 godDisabledFor=\u00a7cdisabled\u00a76 for\u00a7c {0}
 godEnabledFor=\u00a7aenabled\u00a76 for\u00a7c {0}
 godMode=\u00a76God mode\u00a7c {0}\u00a76.
@@ -164,7 +168,7 @@ haveBeenReleased=\u00a76You have been released.
 heal=\u00a76You have been healed.
 healDead=\u00a74You cannot heal someone who is dead\!
 healOther=\u00a76Healed\u00a7c {0}\u00a76.
-helpConsole=To view help from the console, type ?.
+helpConsole=To view help from the console, type ''?''.
 helpFrom=\u00a76Commands from {0}\:
 helpLine=\u00a76/{0}\u00a7r\: {1}
 helpMatching=\u00a76Commands matching "\u00a7c{0}\u00a76"\:
@@ -201,12 +205,11 @@ invalidSignLine=\u00a74Line\u00a7c {0} \u00a74on sign is invalid.
 invalidSkull=\u00a74Please hold a player skull.
 invalidWarpName=\u00a74Invalid warp name\!
 invalidWorld=\u00a74Invalid world.
-inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
+inventoryClearFail=\u00a74Player\u00a7c {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
 inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76.
-inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
-inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
+inventoryClearingAllItems=\u00a76Cleared all inventory items from\u00a7c {0}\u00a76.
 inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
-inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
+inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from\u00a7c {2}\u00a76.
 is=is
 isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned.
 internalError=\u00a7cAn internal error occurred while attempting to perform this command.
@@ -214,15 +217,18 @@ itemCannotBeSold=\u00a74That item cannot be sold to the server.
 itemId=\u00a76ID\:\u00a7c {0}
 itemMustBeStacked=\u00a74Item must be traded in stacks. A quantity of 2s would be two stacks, etc.
 itemNames=\u00a76Item short names\:\u00a7r {0}
+itemnameClear=\u00a76You have cleared this item''s name.
+itemnameInvalidItem=\u00a7cYou need to hold an item to rename it.
+itemnameSuccess=\u00a76You have renamed your held item to "\u00a7c{0}\u00a76".
 itemNotEnough1=\u00a74You do not have enough of that item to sell.
-itemNotEnough2=\u00a76If you meant to sell all of your items of that type, use /sell itemname.
-itemNotEnough3=\u00a76/sell itemname -1 will sell all but one item, etc.
+itemNotEnough2=\u00a76If you meant to sell all of your items of that type, use\u00a7c /sell itemname\u00a76.
+itemNotEnough3=\u00a7c/sell itemname -1\u00a76 will sell all but one item, etc.
 itemsConverted=\u00a76Converted all items into blocks.
-itemsCsvNotLoaded=Could not load items.csv\!
+itemsCsvNotLoaded=Could not load {0}\!
 itemSellAir=You really tried to sell Air? Put an item in your hand.
 itemsNotConverted=\u00a74You have no items that can be converted into blocks.
 itemSold=\u00a7aSold for \u00a7c{0} \u00a7a({1} {2} at {3} each).
-itemSoldConsole=\u00a7a{0} \u00a7asold {1} for \u00a7a{2} \u00a7a({3} items at {4} each).
+itemSoldConsole=\u00a7e{0} \u00a7asold\u00a7e {1}\u00a7a for \u00a7e{2} \u00a7a({3} items at {4} each).
 itemSpawn=\u00a76Giving\u00a7c {0} \u00a76of\u00a7c {1}
 itemType=\u00a76Item\:\u00a7c {0}
 jailAlreadyIncarcerated=\u00a74Person is already in jail\:\u00a7c {0}
@@ -252,13 +258,13 @@ kitOnce=\u00a74You can''t use that kit again.
 kitReceive=\u00a76Received kit\u00a7c {0}\u00a76.
 kits=\u00a76Kits\:\u00a7r {0}
 kitTimed=\u00a74You can''t use that kit again for another\u00a7c {0}\u00a74.
-leatherSyntax=\u00a76Leather color syntax\: color\:<red>,<green>,<blue> eg\: color\:255,0,0 OR color\:<rgb int> eg\: color\:16777011
+leatherSyntax=\u00a76Leather color syntax\:\u00a7c color\:<red>,<green>,<blue> eg\: color\:255,0,0\u00a76 OR\u00a7c color\:<rgb int> eg\: color\:16777011
 lightningSmited=\u00a76Thou hast been smitten\!
 lightningUse=\u00a76Smiting\u00a7c {0}
 listAfkTag=\u00a77[AFK]\u00a7r
 listAmount=\u00a76There are \u00a7c{0}\u00a76 out of maximum \u00a7c{1}\u00a76 players online.
-listAmountHidden=\u00a76There are \u00a7c{0}\u00a76/{1}\u00a76 out of maximum \u00a7c{2}\u00a76 players online.
-listGroupTag=\u00a76{0}\u00a7r\: \u00a7r
+listAmountHidden=\u00a76There are \u00a7c{0}\u00a76/\u00a7c{1}\u00a76 out of maximum \u00a7c{2}\u00a76 players online.
+listGroupTag=\u00a76{0}\u00a7r\: 
 listHiddenTag=\u00a77[HIDDEN]\u00a7r
 loadWarpError=\u00a74Failed to load warp {0}.
 localFormat=[L]<{0}> {1}
@@ -271,8 +277,6 @@ mailMessage={0}
 mailSent=\u00a76Mail sent\!
 mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail\:
 mailTooLong=\u00a74Mail message too long. Try to keep it below 1000 characters.
-markedAsAway=\u00a76You are now marked as away.
-markedAsNotAway=\u00a76You are no longer marked as away.
 markMailAsRead=\u00a76To mark your mail as read, type\u00a7c /mail clear\u00a76.
 matchingIPAddress=\u00a76The following players previously logged in from that IP address\:
 maxHomes=\u00a74You cannot set more than\u00a7c {0} \u00a74homes.
@@ -289,12 +293,12 @@ mobsAvailable=\u00a76Mobs\:\u00a7r {0}
 mobSpawnError=\u00a74Error while changing mob spawner.
 mobSpawnLimit=Mob quantity limited to server limit.
 mobSpawnTarget=\u00a74Target block must be a mob spawner.
-moneyRecievedFrom=\u00a7a{0} has been received from {1}.
+moneyRecievedFrom=\u00a7a{0}\u00a76 has been received from\u00a7a {1}\u00a76.
 moneySentTo=\u00a7a{0} has been sent to {1}.
 month=month
 months=months
 moreThanZero=\u00a74Quantities must be greater than 0.
-moveSpeed=\u00a76Set {0} speed to\u00a7c {1} \u00a76for \u00a7c{2}\u00a76.
+moveSpeed=\u00a76Set\u00a7c {0}\u00a76 speed to\u00a7c {1} \u00a76for \u00a7c{2}\u00a76.
 msgDisabled=\u00a76Receiving messages \u00a7cdisabled\u00a76.
 msgDisabledFor=\u00a76Receiving messages \u00a7cdisabled \u00a76for \u00a7c{0}\u00a76.
 msgEnabled=\u00a76Receiving messages \u00a7cenabled\u00a76.
@@ -305,16 +309,21 @@ multipleCharges=\u00a74You cannot apply more than one charge to this firework.
 multiplePotionEffects=\u00a74You cannot apply more than one effect to this potion.
 mutedPlayer=\u00a76Player\u00a7c {0} \u00a76muted.
 mutedPlayerFor=\u00a76Player\u00a7c {0} \u00a76muted for\u00a7c {1}\u00a76.
+mutedPlayerForReason=\u00a76Player\u00a7c {0} \u00a76muted for\u00a7c {1}\u00a76. Reason: \u00a7c{2}
+mutedPlayerReason=\u00a76Player\u00a7c {0} \u00a76muted. Reason: \u00a7c{1}
 mutedUserSpeaks={0} tried to speak, but is muted: {1}
 muteExempt=\u00a74You may not mute that player.
 muteExemptOffline=\u00a74You may not mute offline players.
 muteNotify=\u00a7c{0} \u00a76has muted player \u00a7c{1}\u00a76.
 muteNotifyFor=\u00a7c{0} \u00a76has muted player \u00a7c{1}\u00a76 for\u00a7c {2}\u00a76.
+muteNotifyForReason=\u00a7c{0} \u00a76has muted player \u00a7c{1}\u00a76 for\u00a7c {2}\u00a76. Reason: \u00a7c{3}
+muteNotifyReason=\u00a7c{0} \u00a76has muted player \u00a7c{1}\u00a76. Reason: \u00a7c{2}
 nearbyPlayers=\u00a76Players nearby\:\u00a7r {0}
 negativeBalanceError=\u00a74User is not allowed to have a negative balance.
 nickChanged=\u00a76Nickname changed.
 nickDisplayName=\u00a74You have to enable change-displayname in Essentials config.
 nickInUse=\u00a74That name is already in use.
+nickNameBlacklist=\u00a74That nickname is not allowed.
 nickNamesAlpha=\u00a74Nicknames must be alphanumeric.
 nickNamesOnlyColorChanges=\u00a74Nicknames can only have their colors changed.
 nickNoMore=\u00a76You no longer have a nickname.
@@ -324,12 +333,10 @@ noAccessCommand=\u00a74You do not have access to that command.
 noAccessPermission=\u00a74You do not have permission to access that \u00a7c{0}\u00a74.
 noBreakBedrock=\u00a74You are not allowed to destroy bedrock.
 noDestroyPermission=\u00a74You do not have permission to destroy that \u00a7c{0}\u00a74.
-noDurability=\u00a74This item does not have a durability.
 northEast=NE
 north=N
 northWest=NW
 noGodWorldWarning=\u00a74Warning\! God mode in this world disabled.
-noHelpFound=\u00a74No matching commands.
 noHomeSetPlayer=\u00a76Player has not set a home.
 noIgnored=\u00a76You are not ignoring anyone.
 noJailsDefined=\u00a76No jails defined.
@@ -359,8 +366,6 @@ notEnoughExperience=\u00a74You do not have enough experience.
 notEnoughMoney=\u00a74You do not have sufficient funds.
 notFlying=not flying
 nothingInHand=\u00a74You have nothing in your hand.
-notRecommendedBukkit=\u00a74* \! * Bukkit version is not the recommended build for Essentials.
-notSupportedYet=Not supported yet.
 now=now
 noWarpsDefined=\u00a76No warps defined.
 nuke=\u00a75May death rain upon them.
@@ -380,17 +385,18 @@ payToggleOn=\u00a76You are now accepting payments.
 pendingTeleportCancelled=\u00a74Pending teleportation request cancelled.
 playerBanIpAddress=\u00a76Player\u00a7c {0} \u00a76banned IP address\u00a7c {1} \u00a76for\: \u00a7c{2}\u00a76.
 playerBanned=\u00a76Player\u00a7c {0} \u00a76banned\u00a7c {1} \u00a76for\: \u00a7c{2}\u00a76.
-playerInJail=\u00a74Player is already in jail\u00a7c {0}\u00a74.
 playerJailed=\u00a76Player\u00a7c {0} \u00a76jailed.
-playerJailedFor=\u00a76Player\u00a7c {0} \u00a76jailed for {1}.
-playerKicked=\u00a76Player\u00a7c {0} \u00a76kicked {1} for {2}.
+playerJailedFor=\u00a76Player\u00a7c {0} \u00a76jailed for\u00a7c {1}\u00a76.
+playerKicked=\u00a76Player\u00a7c {0} \u00a76kicked\u00a7c {1}\u00a76 for\u00a7c {2}\u00a76.
 playerMuted=\u00a76You have been muted\!
-playerMutedFor=\u00a76You have been muted for\u00a7c {0}.
+playerMutedFor=\u00a76You have been muted for\u00a7c {0}\u00a76.
+playerMutedForReason=\u00a76You have been muted for\u00a7c {0}\u00a76. Reason\: \u00a7c{1}
+playerMutedReason=\u00a76You have been muted\! Reason\: \u00a7c{0}
 playerNeverOnServer=\u00a74Player\u00a7c {0} \u00a74was never on this server.
 playerNotFound=\u00a74Player not found.
-playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76: \u00a7c{3}\u00a76.
-playerUnbanIpAddress=\u00a76Player\u00a7c {0} \u00a76unbanned IP\: {1}.
-playerUnbanned=\u00a76Player\u00a7c {0} \u00a76unbanned\u00a7c {1}.
+playerTempBanned=\u00a76Player \u00a7c{0}\u00a76 temporarily banned \u00a7c{1}\u00a76 for \u00a7c{2}\u00a76\: \u00a7c{3}\u00a76.
+playerUnbanIpAddress=\u00a76Player\u00a7c {0} \u00a76unbanned IP\:\u00a7c {1}
+playerUnbanned=\u00a76Player\u00a7c {0} \u00a76unbanned\u00a7c {1}
 playerUnmuted=\u00a76You have been unmuted.
 pong=Pong\!
 posPitch=\u00a76Pitch\: {0} (Head angle)
@@ -402,7 +408,7 @@ posZ=\u00a76Z\: {0} (+South <-> -North)
 potions=\u00a76Potions\:\u00a7r {0}\u00a76.
 powerToolAir=\u00a74Command can''t be attached to air.
 powerToolAlreadySet=\u00a74Command \u00a7c{0}\u00a74 is already assigned to \u00a7c{1}\u00a74.
-powerToolAttach=\u00a7c{0}\u00a76 command assigned to {1}.
+powerToolAttach=\u00a7c{0}\u00a76 command assigned to\u00a7c {1}\u00a76.
 powerToolClearAll=\u00a76All powertool commands have been cleared.
 powerToolList=\u00a76Item \u00a7c{1} \u00a76has the following commands\: \u00a7c{0}\u00a76.
 powerToolListEmpty=\u00a74Item \u00a7c{0} \u00a74has no commands assigned.
@@ -427,7 +433,7 @@ pWeatherPlayers=\u00a76These players have their own weather\:\u00a7r
 pWeatherReset=\u00a76Player weather has been reset for\: \u00a7c{0}
 pWeatherSet=\u00a76Player weather is set to \u00a7c{0}\u00a76 for\: \u00a7c{1}.
 questionFormat=\u00a72[Question]\u00a7r {0}
-radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}.
+radiusTooBig=\u00a74Radius is too big\! Maximum radius is\u00a7c {0}\u00a74.
 readNextPage=\u00a76Type\u00a7c /{0} {1} \u00a76to read the next page.
 realName=\u00a7f{0}\u00a7r\u00a76 is \u00a7f{1}
 recentlyForeverAlone=\u00a74{0} recently went offline.
@@ -436,7 +442,7 @@ recipeBadIndex=There is no recipe by that number.
 recipeFurnace=\u00a76Smelt\: \u00a7c{0}\u00a76.
 recipeGrid=\u00a7c{0}X \u00a76| \u00a7{1}X \u00a76| \u00a7{2}X
 recipeGridItem=\u00a7c{0}X \u00a76is \u00a7c{1}
-recipeMore=\u00a76Type /{0} \u00a7c{1}\u00a76 <number> to see other recipes for \u00a7c{2}\u00a76.
+recipeMore=\u00a76Type\u00a7c /{0} {1} <number>\u00a76 to see other recipes for \u00a7c{2}\u00a76.
 recipeNone=No recipes exist for {0}.
 recipeNothing=nothing
 recipeShapeless=\u00a76Combine \u00a7c{0}
@@ -447,14 +453,19 @@ repairAlreadyFixed=\u00a74This item does not need repairing.
 repairEnchanted=\u00a74You are not allowed to repair enchanted items.
 repairInvalidType=\u00a74This item cannot be repaired.
 repairNone=\u00a74There were no items that needed repairing.
+replyLastRecipientDisabled=\u00a76Replying to last message recipient \u00a7cdisabled\u00a76.
+replyLastRecipientDisabledFor=\u00a76Replying to last message recipient \u00a7cdisabled \u00a76for \u00a7c{0}\u00a76.
+replyLastRecipientEnabled=\u00a76Replying to last message recipient \u00a7cenabled\u00a76.
+replyLastRecipientEnabledFor=\u00a76Replying to last message recipient \u00a7cenabled \u00a76for \u00a7c{0}\u00a76.
 requestAccepted=\u00a76Teleport request accepted.
+requestAcceptedAuto=\u00a76Automatically accepted a teleport request from {0}.
 requestAcceptedFrom=\u00a7c{0} \u00a76accepted your teleport request.
+requestAcceptedFromAuto=\u00a7c{0} \u00a76accepted your teleport request automatically.
 requestDenied=\u00a76Teleport request denied.
 requestDeniedFrom=\u00a7c{0} \u00a76denied your teleport request.
 requestSent=\u00a76Request sent to\u00a7c {0}\u00a76.
 requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a74Teleport request has timed out.
-requiredBukkit=\u00a76* \! * You need at least build {0} of CraftBukkit, download it from http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76Balance has been reset to \u00a7c{0} \u00a76for all online players.
 resetBalAll=\u00a76Balance has been reset to \u00a7c{0} \u00a76for all players.
 returnPlayerToJailError=\u00a74Error occurred when trying to return player\u00a7c {0} \u00a74to jail\: \u00a7c{1}\u00a74\!
@@ -485,7 +496,7 @@ southWest=SW
 skullChanged=\u00a76Skull changed to \u00a7c{0}\u00a76.
 slimeMalformedSize=\u00a74Malformed size.
 socialSpy=\u00a76SocialSpy for \u00a7c{0}\u00a76\: \u00a7c{1}
-socialSpyMsgFormat=\u00a76[\u00a7c{0}\u00a76 -> \u00a7c{1}\u00a76] \u00a77{2}
+socialSpyMsgFormat=\u00a76[\u00a7c{0}\u00a77 -> \u00a7c{1}\u00a76] \u00a77{2}
 socialSpyMutedPrefix=\u00a7f[\u00a76SS\u00a7f] \u00a77(muted) \u00a7r
 socialSpyPrefix=\u00a7f[\u00a76SS\u00a7f] \u00a7r
 soloMob=\u00a74That mob likes to be alone.
@@ -497,31 +508,34 @@ sudoRun=\u00a76Forcing\u00a7c {0} \u00a76to run\:\u00a7r /{1}
 suicideMessage=\u00a76Goodbye cruel world...
 suicideSuccess=\u00a76Player \u00a7c{0} \u00a76took their own life.
 survival=survival
-takenFromAccount=\u00a7a{0} has been taken from your account.
-takenFromOthersAccount=\u00a7a{0} taken from {1}\u00a7a account. New balance\: {2}.
+takenFromAccount=\u00a7e{0}\u00a7a has been taken from your account.
+takenFromOthersAccount=\u00a7e{0}\u00a7a taken from\u00a7e {1}\u00a7a account. New balance\:\u00a7e {2}
 teleportAAll=\u00a76Teleport request sent to all players...
 teleportAll=\u00a76Teleporting all players...
 teleportationCommencing=\u00a76Teleportation commencing...
 teleportationDisabled=\u00a76Teleportation \u00a7cdisabled\u00a76.
 teleportationDisabledFor=\u00a76Teleportation \u00a7cdisabled \u00a76for \u00a7c{0}\u00a76.
+teleportationDisabledWarning=\u00a76You must enable teleportation before other players can teleport to you.
 teleportationEnabled=\u00a76Teleportation \u00a7cenabled\u00a76.
 teleportationEnabledFor=\u00a76Teleportation \u00a7cenabled \u00a76for \u00a7c{0}\u00a76.
 teleportAtoB=\u00a7c{0}\u00a76 teleported you to \u00a7c{1}\u00a76.
 teleportDisabled=\u00a7c{0} \u00a74has teleportation disabled.
 teleportHereRequest=\u00a7c{0}\u00a76 has requested that you teleport to them.
+teleportHome=\u00a76Teleporting to \u00a7c{0}\u00a76.
 teleporting=\u00a76Teleporting...
 teleportInvalidLocation=Value of coordinates cannot be over 30000000
 teleportNewPlayerError=\u00a74Failed to teleport new player\!
 teleportRequest=\u00a7c{0}\u00a76 has requested to teleport to you.
 teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled.
-teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled.
+teleportRequestCancelled=\u00a76Your teleport request to \u00a7c{0}\u00a76 was cancelled.
+teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with\u00a7c {0}\u00a76 cancelled.
 teleportRequestTimeoutInfo=\u00a76This request will timeout after\u00a7c {0} seconds\u00a76.
 teleportTop=\u00a76Teleporting to top.
 teleportToPlayer=\u00a76Teleporting to \u00a7c{0}\u00a76.
 tempbanExempt=\u00a74You may not tempban that player.
 tempbanExemptOffline=\u00a74You may not tempban offline players.
 tempbanJoin=You are banned from this server for {0}. Reason: {1}
-tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
+tempBanned=\u00a7cYou have been temporarily banned for\u00a7r {0}\:\n\u00a7r{2}
 thunder=\u00a76You\u00a7c {0} \u00a76thunder in your world.
 thunderDuration=\u00a76You\u00a7c {0} \u00a76thunder in your world for\u00a7c {1} \u00a76seconds.
 timeBeforeHeal=\u00a74Time before next heal\:\u00a7c {0}\u00a76.
@@ -555,6 +569,7 @@ unlimitedItemPermission=\u00a74No permission for unlimited item \u00a7c{0}\u00a7
 unlimitedItems=\u00a76Unlimited items\:\u00a7r
 unmutedPlayer=\u00a76Player\u00a7c {0} \u00a76unmuted.
 unsafeTeleportDestination=\u00a74The teleport destination is unsafe and teleport-safety is disabled.
+unsupportedFeature=\u00a74This feature is not supported on the current server version.
 unvanishedReload=\u00a74A reload has forced you to become visible.
 upgradingFilesError=Error while upgrading the files.
 uptime=\u00a76Uptime\:\u00a7c {0}
@@ -579,6 +594,7 @@ versionOutputUnsupportedPlugins=\u00a76You are running \u00a7dunsupported plugin
 versionMismatch=\u00a74Version mismatch\! Please update {0} to the same version.
 versionMismatchAll=\u00a74Version mismatch\! Please update all Essentials jars to the same version.
 voiceSilenced=\u00a76Your voice has been silenced\!
+voiceSilencedReason=\u00a76Your voice has been silenced\! Reason: \u00a7c{0}
 walking=walking
 warpDeleteError=\u00a74Problem deleting the warp file.
 warpingTo=\u00a76Warping to\u00a7c {0}\u00a76.
@@ -592,9 +608,9 @@ warpSet=\u00a76Warp\u00a7c {0} \u00a76set.
 warpUsePermission=\u00a74You do not have permission to use that warp.
 weatherInvalidWorld=World named {0} not found\!
 weatherStorm=\u00a76You set the weather to \u00a7cstorm\u00a76 in\u00a7c {0}\u00a76.
-weatherStormFor=\u00a76You set the weather to \u00a7cstorm\u00a76 in\u00a7c {0} \u00a76for {1} seconds.
+weatherStormFor=\u00a76You set the weather to \u00a7cstorm\u00a76 in\u00a7c {0} \u00a76for\u00a7c {1} seconds\u00a76.
 weatherSun=\u00a76You set the weather to \u00a7csun\u00a76 in\u00a7c {0}\u00a76.
-weatherSunFor=\u00a76You set the weather to \u00a7csun\u00a76 in\u00a7c {0} \u00a76for {1} seconds.
+weatherSunFor=\u00a76You set the weather to \u00a7csun\u00a76 in\u00a7c {0} \u00a76for \u00a7c{1} seconds\u00a76.
 west=W
 whoisAFK=\u00a76 - AFK\:\u00a7r {0}
 whoisAFKSince=\u00a76 - AFK\:\u00a7r {0} (Since {1})
@@ -611,10 +627,11 @@ whoisJail=\u00a76 - Jail\:\u00a7r {0}
 whoisLocation=\u00a76 - Location\:\u00a7r ({0}, {1}, {2}, {3})
 whoisMoney=\u00a76 - Money\:\u00a7r {0}
 whoisMuted=\u00a76 - Muted\:\u00a7r {0}
+whoisMutedReason=\u00a76 - Muted\:\u00a7r {0} \u00a76Reason\: \u00a7c{1}
 whoisNick=\u00a76 - Nick\:\u00a7r {0}
 whoisOp=\u00a76 - OP\:\u00a7r {0}
 whoisPlaytime=\u00a76 - Playtime\:\u00a7r {0}
-whoisTempBanned=\u00a76 - Ban expires:\u00a7r {0}
+whoisTempBanned=\u00a76 - Ban expires\:\u00a7r {0}
 whoisTop=\u00a76 \=\=\=\=\=\= WhoIs\:\u00a7c {0} \u00a76\=\=\=\=\=\=
 whoisUuid=\u00a76 - UUID\:\u00a7r {0}
 worth=\u00a7aStack of {0} worth \u00a7c{1}\u00a7a ({2} item(s) at {3} each)

Essentials/src/messages_bg.properties

@@ -0,0 +1,598 @@
+#X-Generator: crowdin.net
+#version: ${full.version}
+# Single quotes have to be doubled: ''
+# by:
+action=§5* {0} §5{1}
+addedToAccount=§a{0} бяха добавени към вашият акаунт.
+addedToOthersAccount=§a{0} бяха добавени към акаунта на {1}. Нов баланс\: {2}
+adventure=приключенски
+alertBroke=счупени\:
+alertFormat=§3[{0}] §r {1} §6 {2} at\: {3}
+alertPlaced=поставени\:
+alertUsed=използвани\:
+alphaNames=§4Имената на играчите могат да съдържат само букви, цифри и долни черти.
+antiBuildBreak=§4Нямате право да чупите блокчета§c {0} §4тук.
+antiBuildCraft=§4Нямате право да създавате§c {0}§4.
+antiBuildDrop=§4Нямате право да изхвърляте§c {0}§4.
+antiBuildInteract=§4Нямате право да взаимодействате с§c {0}§4.
+antiBuildPlace=§4Нямате право да поставяте§c {0} §4тук.
+antiBuildUse=§4Нямате право да използвате§c {0}§4.
+autoAfkKickReason=Вие бяхте изгонени поради повече от {0} минути бездействие.
+backAfterDeath=§6Използвайте командата /back, за да се върнете на мястото където сте умрели.
+backOther=§6Върнахте§c {0}§6 до предишното им местоположение.
+backupDisabled=§4Няма конфигуриран външен архивиращ скрипт.
+backupFinished=§6Архивирането е завършено.
+backupStarted=§6Създаване на архив.
+backUsageMsg=§6Връщане до предишната локация.
+balance=§aБаланс\:§c {0}
+balanceOther=§aБалансът на {0}§a\:§c {1}
+balanceTop=§6Топ богаташи ({0})
+banExempt=§4Не можете да ограничите този играч.
+banExemptOffline=§4Не можете да ограничавате офлайн играчи.
+banFormat=§cВие бяхте ограничени\:\n§r{0}
+banIpJoin=Вашият IP адрес е ограничен от този сървър. Причина\: {0}
+banJoin=Вие сте ограничени от този сървър. Причина\: {0}
+bed=§oлегло§r
+bedMissing=§4Вашето легло е незададено, липсващо или блокирано.
+bedNull=§mлегло§r
+bedSet=§6Локация на легло е зададена\!
+bigTreeFailure=§4Провал при създаване на голямо дърво. Опитайте върху пръст или трева.
+bigTreeSuccess=§6Създадено е голямо дърво.
+blockList=§6Essentials предаде следните команди на друг плъгин\:
+bookAuthorSet=§6Авторът на книгата е зададен на {0}.
+bookLocked=§6Книгата е заключена.
+bookTitleSet=§6Заглавието на книгата е зададено на {0}.
+broadcast=§r§6[§4Съобщение§6]§a {0}
+burnMsg=§6Подпалихте§c {0} §6за§c {1} секунди§6.
+cannotStackMob=§4Нямате право да групирате множество животни.
+canTalkAgain=§6Вече можете да говорите.
+cantFindGeoIpDB=Няма намерена GeoIP база данни\!
+cantGamemode=§4Нямате право да променяте режима си на {0}
+cantReadGeoIpDB=Грешка при прочитането на GeoIP базата данни\!
+cantSpawnItem=§4Нямате право да създадете предмета§c {0}§4.
+chatTypeLocal=[L]
+chatTypeSpy=[Шпионин]
+cleaned=Потребителските файлове са изчистени.
+cleaning=Изчистване на потребителските файлове.
+clearInventoryConfirmToggleOff=§6Вече няма да бъдете питани да потвърждение за триенето на инвентари.
+clearInventoryConfirmToggleOn=§6Вече ще да бъдете питани да потвърждение за триенето на инвентари.
+commandCooldown=§cНе можете да пишете тази команда за {0}.
+commandFailed=Неуспех при изпълнение на командата {0}\:
+commandHelpFailedForPlugin=Грешка при получаването на помощ за плъгина\: {0}
+commandNotLoaded=§4Командата {0} е грешно заредена.
+compassBearing=§6Посока\: {0} ({1} градуса).
+configFileMoveError=Грешка при прехвърлянето на config.yml в архива.
+configFileRenameError=Грешка при преименуването на временния файл на config.yml.
+confirmClear=§7За да §lпотвърдите§7 изчистването на инвентара, препишете командата\: §6{0}
+confirmPayment=§7За да §lПОТВЪРДИТЕ§7 плащането на §6{0}§7, моля повторете командата\: §6{1}
+connectedPlayers=§6Свързани играчи§r
+connectionFailed=Неуспешно отваряне на връзка.
+cooldownWithMessage=§4Изчакване\: {0}
+coordsKeyword={0}, {1}, {2}
+couldNotFindTemplate=§4Не може да се намери шаблон {0}
+createdKit=§6Създадохте кит §c{0} §6с §c{1} §6употреби и интервал от §c{2}
+createKitFailed=§4Грешка при създаването на кит {0}.
+createKitSeparator=§m-----------------------
+createKitSuccess=§6Създаден кит\: §f{0}\n§6Интервал\: §f{1}\n§6Връзка\: §f{2}\n§6Копирайте съдържанието от връзката отгоре във вашият kits.yml.
+creatingConfigFromTemplate=Създаване на конфигурация от шаблон\: {0}
+creatingEmptyConfig=Създаване на празна конфигурация\: {0}
+creative=творчески
+currency={0}{1}
+currentWorld=§6Текущ свят\:§c {0}
+day=ден
+days=дни
+defaultBanReason=Вие бяхте ограничени от този сървър\!
+deleteFileError=Не може да бъде изтрит файлът\: {0}
+deleteHome=§6Домът§c {0} §6беше премахнат.
+deleteJail=§6Затворът§c {0} §6беше премахнат.
+deleteWarp=§6Точката за телепортация§c {0} §6беше премахната.
+deniedAccessCommand=§c{0} §4беше отказан достъп до командата.
+denyBookEdit=§4Не можете да отключите тази книга.
+denyChangeAuthor=§4Не можете да промените авторът на тази книга.
+denyChangeTitle=§4Не можете да промените заглавието на книгата.
+depth=§6Вие сте на морско ниво.
+depthAboveSea=§6Вие сте на§c {0} §6блокче(та) над морското ниво.
+depthBelowSea=§6Вие сте на§c {0} §6блокче(та) под морското ниво.
+destinationNotSet=Дестинацията не е зададена\!
+disabled=изключен
+disabledToSpawnMob=§4Размножаването на това същество е изключено в конфигурационния файл.
+disableUnlimited=§6Изключихте безбройното слагане на §c {0} §6за {1}.
+distance=§6Разстояние\: {0}
+dontMoveMessage=§6Телепортацията ще се осъществи след§c {0}§6. Не се движете.
+downloadingGeoIp=Изтегля се GeoIP база данни... това може да отнеме време (държава\: 1.7 MB, град\: 30MB)
+duplicatedUserdata=Дублирани данни на играчи\: {0} и {1}.
+durability=§6На инструмента му остават §c{0}§6 използвания.
+east=И
+editBookContents=§eСега можете да редактирате съдържанието на тази книга.
+enabled=включен
+enableUnlimited=§6Даване на безброй количество от§c {0} §6на §c{1}§6.
+enchantmentApplied=§6Енчантът§c {0} §6беше приложен на предметът в ръката ви.
+enchantmentNotFound=§4Енчантът не намерен\!
+enchantmentPerm=§4Нямате правото за§c {0}§4.
+enchantmentRemoved=§6Енчантът§c {0} §6беше премахнат от предмета в ръката ви.
+enchantments=§6Енчанти\:§r {0}
+errorCallingCommand=Грешка при изпълняването на командата /{0}
+errorWithMessage=§cГрешка\:§4 {0}
+essentialsHelp1=Файлът е повреден и Essentials не може да го отвори. Essentials се изключва. Ако не можете да поправите сами, отидете на http\://tiny.cc/EssentialsChat
+essentialsHelp2=Файлът е повреден и Essentials не може да го отвори. Essentials се изключва. Ако не можете да поправите сами или напишете /essentialshelp в играта, или отидете на http\://tiny.cc/EssentialsChat
+essentialsReload=§6Essentials е презареден§c {0}.
+exp=§c{0} §6има§c {1} §6опит (ниво§c {2}§6) и им трябва§c {3} §6опит за да вдигнат ниво.
+expSet=§c{0} §6сега има§c {1} §6опит.
+extinguish=§6Вие се изгасихте.
+extinguishOthers=§6Изгасихте {0}§6.
+failedToCloseConfig=Грешка при затварянето на конфигурация {0}.
+failedToCreateConfig=Грешка при създаването на конфигурация {0}.
+failedToWriteConfig=Грешка при записа на конфигурация {0}.
+false=§4не§r
+feed=§6Вашият апетит беше заситен.
+feedOther=§6Заситихте апетита на §c{0}§6.
+fileRenameError=Грешка при реименуването на файла {0}\!
+fireworkColor=§4Бяха въведени невалидни параметри на заряд, първо трябва да се въведе цвят.
+fireworkEffectsCleared=§6Бяха премахнати всички ефекти от това което държите.
+fireworkSyntax=§6Параметри за фойерверк\:§c color\:<color> [fade\:<цвят>] [shape\:<форма>] [effect\:<ефект>]\n§6За да използвате няколко цвята/ефекта, разделете стойностите със запетая\: §cred,blue,pink\n§6Форми\:§c star, ball, large, creeper, burst §6Ефекти\:§c trail, twinkle.
+flying=лети
+flyMode=§6Зададохте режим на летене на§c {0} §6за {1}§6.
+foreverAlone=§4Няма на кого да отговорите.
+fullStack=§4Вече имате цял стак.
+gameMode=§6Зададохте режим на игра на§c {0} §6за §c{1}§6.
+gameModeInvalid=§4Трябва да посочите валиден играч/режим на игра.
+gcfree=§6Свободна памет\:§c {0} MB.
+gcmax=§6Максимум памет\:§c {0} MB.
+gctotal=§6Зададена памет\:§c {0} MB.
+gcWorld=§6{0} "§c{1}§6"\: §c{2}§6 разреза, §c{3}§6 създания, §c{4}§6 плочки.
+geoipJoinFormat=§6Играчът §c{0} §6идва от §c{1}§6.
+geoipCantFind=§6Играчът §c{0} §6идва от §aнеизвестна държава§6.
+geoIpUrlEmpty=Линкът за изтегляне на GeoIP е празен.
+geoIpUrlInvalid=Линкът за изтегляне на GeoIP е невалиден.
+givenSkull=§6Беше ви дадена главата на §c{0}§6.
+giveSpawn=§6Даване на§c {0} §6от§c {1} на§c {2}§6.
+giveSpawnFailure=§4Недостатъчно свободно място, §c{0} §c{1} §4беше загубено.
+godDisabledFor=§cизключен§6 за§c {0}
+godEnabledFor=§aвключен§6 за§c {0}
+godMode=§6Режим на неуязвимост§c {0}§6.
+groupDoesNotExist=§4Няма активни играчи от тази група\!
+groupNumber=§c{0}§f активни, за пълния списък\:§c /{1} {2}
+hatArmor=§4Не можете да използвате този предмет за шапка\!
+hatEmpty=§4Вие не носите шапка.
+hatFail=§4Трябва да имате нещо за обличане в ръката си.
+hatPlaced=§6Насладете се на новата си шапка\!
+hatRemoved=§6Вашата шапка беше премахната.
+haveBeenReleased=§6Вие бяхте освободени.
+heal=§6Вие бяхте изцелени.
+healDead=§4Не можете да излекувате мъртвец\!
+healOther=§6Изцелихте§c {0}§6.
+helpConsole=За да видите помощ в конзолата, напишете ''?''.
+helpFrom=§6Команди от {0}\:
+helpLine=§6/{0}§r\: {1}
+helpMatching=§6Команди съвпадащи с "§c{0}§6"\:
+helpOp=§4[Помощ]§r §6{0}\:§r {1}
+helpPlugin=§4{0}§r\: Помощ за плъгин\: /help {1}
+holdBook=§4Не държите книга в която може да се пише.
+holdFirework=§4Трябва да държите фойерверк, за да му добавите ефект.
+holdPotion=§4Трябва да държите отвара, за да и приложите ефект.
+holeInFloor=§4Има дупка в пода\!
+homes=§6Домове\:§r {0}
+homeSet=§6Вече имате дом на тази локация.
+hour=час
+hours=часа
+ignoredList=§6Игнорирани\:§r {0}
+ignoreExempt=§4Не можете да игнорирате този играч.
+ignorePlayer=§6От сега игнорирате играч§c {0}§6.
+illegalDate=Невалиден формат на дата.
+infoChapter=§6Изберете глава\:
+infoChapterPages=§e ---- §6{0} §e--§6 Страница §c{1}§6 of §c{2} §e----
+infoPages=§e ---- §6{2} §e--§6 Страница §c{0}§6/§c{1} §e----
+infoUnknownChapter=§4Непозната глава.
+insufficientFunds=§4Нямате достатъчно средства.
+invalidBanner=§4Невалиден синтаксис на банер.
+invalidCharge=§4Неправилен заряд.
+invalidFireworkFormat=§4Опцията §c{0} §4е не е валидна стойност за §c{1}§4.
+invalidHome=§4Дом с име§c {0} §4не съществува\!
+invalidHomeName=§4Няма дом с такова име\!
+invalidItemFlagMeta=§4Невалидна мета на опция за предмет\: §c{0}§4.
+invalidMob=§4Няма такъв вид същество.
+invalidNumber=Неправилно число.
+invalidPotion=§4Няма такава отвара.
+invalidPotionMeta=§4Невалидна мета на отвара\: §c{0}§4.
+invalidSignLine=§4Ред§c {0} §4на табелата е неправилен.
+invalidSkull=§4Трябва да държите глава на играч.
+invalidWarpName=§4Няма уарп с такова име\!
+invalidWorld=§4Няма такъв свят.
+inventoryClearFail=§4Играчът {0} §4няма§c {1} §4от§c {2}§4.
+inventoryClearingAllArmor=§6Премахнати са всички предмети и броня от инвентара на {0}§6.
+inventoryClearingAllItems=§6Премахнати са всички предмети от инвентара на {0}§6.
+inventoryClearingFromAll=§6Почистване на инвентарите на всички играчи...
+inventoryClearingStack=e§6Премахнати са§c {0} §6броя§c {1} §6fот {2}§6.
+is=e
+isIpBanned=§6IP адресът §c{0} §6е ограничен.
+internalError=Възникна грешка докато се опитвахте да изпълните тази команда.
+itemCannotBeSold=§4Този предмет не може да бъде продаден на сървъра.
+itemId=§6Номер\:§c {0}
+itemMustBeStacked=§4Предметите трябва да бъдат търгувани в стакове. Количество от 2s може да е два стака, т.н.
+itemNames=§6Кратки имена на предметите\:§r {0}
+itemNotEnough1=§4Нямате достатъчно от този предмет, за да продавате.
+itemsConverted=§6Превърнахте всички предмети в блокчета.
+itemsCsvNotLoaded=Не може да се зареди items.csv\!
+itemSellAir=Наистина ли опита да продадеш въздух? Сложете предмет в ръката си.
+itemsNotConverted=§4Нямате предмети, които могат да се превърнат в блокчета.
+itemSold=§aПродадено за §c{0} §a({1} {2} по {3} всеки).
+itemSpawn=§6Даване на§c {0} §6от§c {1}
+itemType=§6Предмет\:§c {0}
+jailAlreadyIncarcerated=§4Играчът е вече в затвор\:§c {0}
+jailList=§6Затвори\:§r {0}
+jailMessage=§4Бяхте хвърлени в затвора. Приятна почивка\!
+jailNotExist=§4Този затвор не съществува.
+jailReleased=§6Играчът §c{0}§6 е освободен.
+jailReleasedPlayerNotify=§6Вие бяхте освободен\!
+jailSentenceExtended=§6Времето в затвора бе удължено на §c{0}§6.
+jailSet=§6Затвор§c {0} §6беше зададен.
+jumpError=§4Ох, това ще навреди на компютъра ти.
+kickDefault=Бяхте изгонени от сървъра.
+kickedAll=§4Изгонихте всички играчи от сървъра.
+kickExempt=§4Не може да изгоните този играч.
+kill=§6Убихте§c {0}§6.
+killExempt=§4Не можете да убиете §c{0}§4.
+kitContains=§6Кит §c{0} §6съдържа\:
+kitCost=\ §7§o({0})§r
+kitDelay=§m{0}§r
+kitError=§4Няма китове.
+kitError2=§4Този кит е неправилно дефиниран. Свържете се с администратор.
+kitGiveTo=§6Даване на кит§c {0}§6 за §c{1}§6.
+kitInvFull=§4Вашият инвентар е пълен, поставяне на предметите на земята.
+kitItem=§6- §f{0}
+kitNotFound=§4Такъв кит не съществува.
+kitOnce=§4Не можете да използвате този кит отново.
+kitReceive=§6Получихте кит§c {0}§6.
+kits=§6Китове\:§r {0}
+kitTimed=§4Не можете да използвате използвате този кит за още§c {0}§4.
+lightningSmited=§6Бяхте покосени от мълния\!
+lightningUse=§6Ударихте§c {0}§6 с мълния.
+listAfkTag=§7[Неактивен]§r
+listAmount=§6Има §c{0}§6 от максимум §c{1}§6 играчи онлайн.
+listHiddenTag=§7[СКРИТ]§r
+loadWarpError=§4Грешка при зареждането на уарп {0}.
+localFormat=[L]<{0}> {1}
+mailClear=§6За да изчистите пощата си, напишете§c /mail clear§6.
+mailCleared=§6Пощата ви е почистена\!
+mailDelay=Твърде много писма бяха пратени в една минута. Максимум\: {0}
+mailFormat=§6[§r{0}§6] §r{1}
+mailMessage={0}
+mailSent=§6Писмото е изпратено\!
+mailSentTo=§6Следната поща беше пратена на §c{0}§6\:
+mailTooLong=§4Писмото е твърде дълго. Максимумът е 1000 знака.
+markMailAsRead=§6За да маркирате всички писма като прочетени, напишете§c /mail clear§6.
+matchingIPAddress=§6Следните играчи са влизали от този IP адрес\:
+maxHomes=§4Не можете да имате повече от§c {0} §4домове.
+maxMoney=§4Тази транзакция ще надвиши лимитът на сметката за този акаунт.
+mayNotJail=§4Не можете да затворите този играч\!
+mayNotJailOffline=§4Не може да затворите играчи извън линия.
+me=аз
+minimumPayAmount=§cМинималната сума която може да платите е {0}.
+minute=минута
+minutes=минути
+missingItems=§4Нямате §c{0}x {1}§4.
+mobDataList=§6Валидна дата на съществото\:§r {0}
+mobsAvailable=§6Същества\:§r {0}
+mobSpawnError=§4Грешка при сменянето на вида на размножителя.
+mobSpawnLimit=Броят на съществата беше намален до лимита на сървъра.
+mobSpawnTarget=§4Целта трябва да е размножител.
+moneySentTo=§a{0} бяха пратени на {1}.
+month=месец
+months=месеца
+moreThanZero=§4Сумата трябва да е повече от 0.
+msgDisabled=§cИзключихте§6 получаването на съобщения.
+msgDisabledFor=§cИзключихте§6 получаването на съобщения за §c{0}§6.
+msgEnabled=§cВключихте§6 получаването на съобщения.
+msgEnabledFor=§cВключихте§6 получаването на съобщения за §c{0}§6.
+msgFormat=§6[§c{0}§6 -> §c{1}§6] §r{2}
+msgIgnore=§cСъобщенията за {0} §4са изключени.
+multipleCharges=§4Не можете да зареждате фойерверка с повече от един заряд.
+multiplePotionEffects=§4Не можете да приложете повече от един ефект на тази отвара.
+mutedPlayer=§6Играчът§c {0} §6бе перманентно заглушен.
+mutedPlayerFor=§6Играчът§c {0} §6бе временно заглушен за§c {1}§6.
+mutedUserSpeaks={0} се опита да говори, но е заглушен\: {1}
+muteExempt=§4Не можете да заглушите този играч.
+muteExemptOffline=§4Не можете да заглушавате играчи извън линия.
+muteNotify=§c{0} §6заглуши §c{1}§6.
+muteNotifyFor=§c{0} §6заглуши §c{1}§6 за§c {2}§6.
+nearbyPlayers=§6Играчи наблизо\:§r {0}
+negativeBalanceError=§4Играчът няма право да има негативен баланс.
+nickChanged=§6Прякорът ви беше променен.
+nickDisplayName=§4Трябва да активирате change-displayname в Essentials конфигурацията.
+nickInUse=§4Това име вече се използва.
+nickNamesAlpha=§4Имената трябва да съдържат само букви и числа.
+nickNamesOnlyColorChanges=§4Само цветовете на имената могат да бъдат променяни.
+nickNoMore=§6Вече нямате прякор.
+nickSet=§6От сега вашият прякор е §c{0}§6.
+nickTooLong=§4Този прякор е твърде дълъг.
+noAccessCommand=§4Нямате достъп до тази команда.
+noAccessPermission=§4Нямате право да достъпите §c{0}§4.
+noBreakBedrock=§4Нямате право да чупите основен камък.
+noDestroyPermission=§4Нямате право да чупите §c{0}§4.
+northEast=СИ
+north=С
+northWest=СЗ
+noGodWorldWarning=§4Внимание\! Режимът на неуязвимост в този свят е изключен.
+noHomeSetPlayer=§6Играчът няма зададен дом.
+noIgnored=§6Не игнорирате никого.
+noJailsDefined=§6Няма съществуващ затвор.
+noKitGroup=§4Нямате достъп до този кит.
+noKitPermission=§4Нямате правото §c{0}§4, за да използвате този кит.
+noKits=§6Няма налични китове.
+noLocationFound=§4Няма открито местоположение.
+noMail=§6Нямате писма.
+noMatchingPlayers=§6Не са открити съответстващи играчи.
+noMetaFirework=§4Нямата право да прилагате мета на фойерверка.
+noMetaJson=JSON мета данните не са поддържани в тази версия на Bukkit.
+noMetaPerm=§4Нямате права да прилагате метата §c{0}§4 на този предмет.
+none=нищо
+noNewMail=§6Нямате нова поща.
+noPendingRequest=§4Нямате заявки за телепортация.
+noPerm=§4Нямате правото §c{0}§4.
+noPermissionSkull=§4Нямате правото да променяте главата.
+noPermToAFKMessage=§4Нямате право да задавате съобщение при неактивност.
+noPermToSpawnMob=§4Нямате право да разпространите това същество.
+noPlacePermission=§4Нямате права да поставяте блокчета около тази табела.
+noPotionEffectPerm=§4Нямате право да прилагате ефект §c{0} §4на тази отвара.
+noPowerTools=§6Нямате предмети със зададени команди.
+notAcceptingPay=§4{0} §4не приема плащания.
+notAllowedToQuestion=§4Нямате право да използвате въпросителен знак.
+notAllowedToShout=§4Нямате право да крещите.
+notEnoughExperience=§4Нямате достатъчно опит.
+notEnoughMoney=§4Нямате достатъчно средства.
+notFlying=не лети
+nothingInHand=§4Нямате нищо в ръката си.
+now=сега
+noWarpsDefined=§6Няма намерени уарпове.
+nuke=§5Нека смъртта да се разпростре над тях.
+numberRequired=Там трябва има число, глупчо.
+onlyDayNight=/time приема единствено day/night.
+onlyPlayers=§4Командата §c{0} §4може да се изпълни единствено в сървъра.
+onlyPlayerSkulls=§4Можете да задавате единствено собственика на главите (§c397\:3§4).
+onlySunStorm=§4/weather приема единствено sun/storm.
+openingDisposal=§6Отваряне на кошчето за боклук...
+orderBalances=§6Подреждане на баланските на§c {0} §6играчи, моля изчакайте...
+oversizedTempban=§4Не може да ограничите играч за този период от време.
+payConfirmToggleOff=§6Вече няма да бъдете питани за потвърждение на плащания.
+payConfirmToggleOn=§6Вече ще бъдете питани за потвърждение на плащания.
+payMustBePositive=§4Сумата трябва да е положителна.
+payToggleOff=§6Вече ще отхвърляте всички плащания.
+payToggleOn=§6Вече няма да отхвърляте всички плащания.
+pendingTeleportCancelled=§4Заявката за телепортация беше отказана.
+playerBanIpAddress=§6Играчът§c {0} §6ограничи IP адреса§c {1} §6за\: §c{2}§6.
+playerBanned=§6Играчът§c {0} §6ограничи§c {1} §6за\: §c{2}§6.
+playerJailed=§6Играчът§c {0} §6е освободен.
+playerMuted=§6Вие бяхте заглушени\!
+playerMutedFor=§6Вие бяхте заглушени за§c {0}.
+playerMutedForReason=§6Вие бяхте заглушени за§c {0}§6. Причина\: §c{1}
+playerNeverOnServer=§4Няма намерен играч с името§c {0}§4.
+playerNotFound=§4Играчът не е намерен.
+playerTempBanned=§6Играчът §c{0}§6 беше временно баннат §c{1}§6 за §c{2}§6\: §c{3}§6.
+playerUnmuted=§6Вие бяхте отглушени.
+pong=Понг\!
+posPitch=§6Височина\: {0} (Посока на главата)
+possibleWorlds=§6Възможни светове са номерата §c0§6 през §c{0}§6.
+posX=§6X\: {0} (+Изток <-> -Запад)
+posY=§6Y\: {0} (+Нагоре <-> -Надолу)
+posYaw=§6Yaw\: {0} (Въртене)
+posZ=§6Z\: {0} (+Юг <-> -Север)
+potions=§6Отвари\:§r {0}§6.
+powerToolAir=§4Командата не може да бъде назначена на въздух.
+powerToolAlreadySet=§4Командата §c{0}§4 е вече заложена на §c{1}§4.
+powerToolClearAll=§6Всички powertool команди бяха премахнати.
+powerToolList=§6Предметът §c{1} §6има назначени командите\: §c{0}§6.
+powerToolListEmpty=§4Предметът §c{0} §4няма назначени команди.
+powerToolNoSuchCommandAssigned=§4Командата §c{0}§4 не беше назначена на §c{1}§4.
+powerToolRemove=§6Командата §c{0}§6 беше премахната от §c{1}§6.
+powerToolRemoveAll=§6Всички команди бяха премахнати от §c{0}§6.
+powerToolsDisabled=§6Всичките ви предмети с команди бяха изключени.
+powerToolsEnabled=§6Всичките ви предмети с команди бяха включени.
+pTimeCurrent=§6Времето за §c{0}§6 е§c {1}§6.
+pTimeCurrentFixed=§6Времето за §c{0}§6 е зададено на§c {1}§6.
+pTimeNormal=§6Часовото време на §c{0}§6 е нормално и съвпада с това на сървъра.
+pTimeOthersPermission=§4Нямате право да задавате часът на другите играчи.
+pTimePlayers=§6Тези играчи имат собствено часово време\:§r
+pTimeReset=§6Часовото време беше рестартирано за\: §c{0}
+pTimeSet=§6Часовото време е зададено на §c{0}§6 за\: §c{1}.
+pTimeSetFixed=§6Часовото време за играча е зададено на §c{0}§6 за\: §c{1}.
+pWeatherCurrent=§6Времето на §c{0}§6 е§c {1}§6.
+pWeatherInvalidAlias=§4Неправилен тип на време
+pWeatherNormal=§6Времето на §c{0}§6 е нормално и съвпада с това на сървъра.
+pWeatherOthersPermission=§4Нямате право да задавате времето на другите играчи.
+pWeatherPlayers=§6Тези играчи имат собствено време\:§r
+pWeatherReset=§6Времето беше рестартирано за\: §c{0}
+pWeatherSet=§6Времето е зададено на §c{0}§6 за\: §c{1}.
+questionFormat=§2[Въпрос]§r {0}
+readNextPage=§6Напишете§c /{0} {1}§6, за да прочетете следващата страница.
+realName=§f{0}§r§6 е §f{1}
+recentlyForeverAlone=§4{0} наскоро излезе от игра.
+recipe=§6Рецептата за §c{0}§6 (§c{1}§6 от §c{2}§6)
+recipeBadIndex=Няма рецепта на този номер.
+recipeFurnace=§6Изпекохте\: §c{0}§6.
+recipeGrid=§c{0}X §6| §{1}X §6| §{2}X
+recipeGridItem=§c{0}X §6е §c{1}
+recipeNone=Няма съществуващи рецепти за {0}.
+recipeNothing=нищо
+recipeShapeless=§6Комбиниране на §c{0}
+recipeWhere=§6Къде\: {0}
+removed=§6Премахнати§c {0} §6същества.
+repair=§6Вие успешно поправихте вашите\: §c{0}§6.
+repairAlreadyFixed=§4Не е нужна поправка за този предмет.
+repairEnchanted=§4Не можете да поправяте енчантати предмети.
+repairInvalidType=§4Този предмет не може да бъде поправен.
+repairNone=§4Няма предмети които се нуждаят от поправка.
+replyLastRecipientDisabled=§6Отговарянето на последното съобщение е §cизключено§6.
+replyLastRecipientDisabledFor=§6Отговарянето на последното съобщение е §cизключено §6за §c{0}§6.
+replyLastRecipientEnabled=§6Отговарянето на последното съобщение е §aвключено§6.
+replyLastRecipientEnabledFor=§6Отговарянето на последното съобщение е §aвключено §6за §c{0}§6.
+requestAccepted=§6Заявката за телепорт е приета.
+requestAcceptedFrom=§c{0} §6прие вашата заявка за телепорт.
+requestDenied=§6Заявката за телепорт е отказана.
+requestDeniedFrom=§c{0} §6отказва вашата заявка за телепорт.
+requestSent=§6Изпратихте заявка на§c {0}§6.
+requestSentAlready=§4Вече сте пратили заявка за телепортация на {0}§4.
+requestTimedOut=§4Заявката за телепортация изтече.
+resetBal=§6Балансът бе рестартиран на §c{0} §6за всички активни играчи.
+resetBalAll=§6Балансът бе рестартиран на §c{0} §6за всички играчи.
+returnPlayerToJailError=§4Възникна грешка при опит да върнете играча§c {0} §4в затвора\: §c{1}§4\!
+runningPlayerMatch=§6Извършване на търсене за играчи подхождащи с ''§c{0}§6'' (може да отнеме малко време).
+second=секунда
+seconds=секунди
+seenAccounts=§6Играчът е също познат като\:§c {0}
+seenOffline=§6Играчът§c {0} §6е §4неактивен/на§6 от §c{1}§6.
+seenOnline=§6Играчът§c {0} §6е §4активен/на§6 от §c{1}§6.
+sellBulkPermission=§6Нямате право да продавате на куп.
+sellHandPermission=§6Нямате право да продавате предмета в ръката си.
+serverFull=Сървърът е пълен\!
+serverTotal=§6Общо играчи\:§c {0}
+serverUnsupported=Имате неподдържана версия на сървъра\!
+setBal=§aВашият баланс беше зададен на {0}.
+setBalOthers=§aЗададохте баланса на {0}§a на {1}.
+setSpawner=§6Променихте вида на размножителя на§c {0}§6.
+sheepMalformedColor=§4Неправилен цвят.
+shoutFormat=§6[Викане]§r {0}
+signFormatFail=§4[{0}]
+signFormatSuccess=§1[{0}]
+signFormatTemplate=[{0}]
+signProtectInvalidLocation=§4Нямате право да създавате табела тук.
+similarWarpExist=§4Вече съществува уарп със същото име.
+southEast=ЮИ
+south=Ю
+southWest=ЮЗ
+skullChanged=§6Черепът е променен на §c{0}§6.
+slimeMalformedSize=§4Неправилна големина.
+socialSpy=§6Режим на шпионин за §c{0}§6\: §c{1}
+socialSpyMutedPrefix=§f[§6СШ§f] §7(заглушен) §r
+socialSpyPrefix=§f[§6СШ§f] §r
+soloMob=§4Това създание обича да е само.
+spawned=размножено
+spawnSet=§6Спаун локацията е зададена за група§c {0}§6.
+spectator=наблюдател
+sudoExempt=§4Не можете да контролирате §c{0}.
+sudoRun=§6Принуждаване на§c {0} §6да напише\:§r /{1}
+suicideMessage=§6Сбогом, жесток свят...
+suicideSuccess=§6Играчът §c{0} §6се самоуби.
+survival=оцеляване
+teleportAAll=§6Беше изпратена покана за телепорт до всички играчи...
+teleportAll=§6Телепортиране на всички играчи...
+teleportationCommencing=§6Телепортацията започва...
+teleportationDisabled=§6Телепортацията е §cизключена§6.
+teleportationDisabledFor=§6Телепортацията е §cизключена §6за §c{0}§6.
+teleportationEnabled=§6Телепортацията е §aвключена§6.
+teleportationEnabledFor=§6Телепортацията е §aвключена §6за §c{0}§6.
+teleportAtoB=§c{0}§6 ви телепортира до §c{1}§6.
+teleportDisabled=§c{0} §4са с изключена телепортация.
+teleportHereRequest=§c{0}§6 заявиха да се телепортирате §cдо тях§6.
+teleporting=§6Телепортиране...
+teleportInvalidLocation=Стойността на координатите не може да превишава 30000000.
+teleportNewPlayerError=§4Не успяхте да телепортирате нов играч\!
+teleportRequest=§c{0}§6 заяви да се телепортира §cдо вас§6.
+teleportRequestAllCancelled=§6Всички други заявки за телепортация бяха отказани.
+teleportRequestTimeoutInfo=§6Тази заявка ще изтече след§c {0} секунди§6.
+teleportTop=§6Телепортиране до най-горната повърхност.
+teleportToPlayer=§6Телепортирате се до §c{0}§6.
+tempbanExempt=§4Не можете да баннете временно този играч.
+tempbanExemptOffline=§4Не можете баннете временно играчи.
+tempbanJoin=Вие бяхте временно баннати от този сървър {0}. Причина\: {1}
+thunder=§6Вие§c {0} §6буря във вашия свят.
+thunderDuration=§6Вие§c {0} §6буря във вашия свят за§c {1} §6секунди.
+timeBeforeHeal=§4Време преди следващото изцеление\:§c {0}§6.
+timeBeforeTeleport=§4Време преди следващата ви телепортация\:§c {0}§6.
+timeFormat=§c{0}§6 или §c{1}§6 или §c{2}§6
+timeSetPermission=§4Нямате право да задавате часа.
+timeSetWorldPermission=§4Нямате правото да задавате часа в света ''{0}''.
+timeWorldCurrent=§6Часовото време в§c {0} §6е §c{1}§6.
+timeWorldSet=§6Часовото време беше зададено на§c {0} §6в\: §c{1}§6.
+totalSellableAll=§aОбщата сума на всички предмети и блокове, които могат да се продадат, е §c{1}§a.
+totalSellableBlocks=§aОбщата сума на всички блокчета, които могат да се продадат, е §c{1}§a.
+totalWorthAll=§aПродадохте всички предмети и блокчета за общо §c{1}§a.
+totalWorthBlocks=§aПродадохте всички блокчета за общо §c{1}§a.
+tps=§6Текущ TPS \= {0}
+tradeSignEmpty=§4Тази търговска табела няма нищо налично за вас.
+tradeSignEmptyOwner=§4Няма нищо за събиране от тази търговска табела.
+treeFailure=§4Провал при създаване на дърво. Опитайте върху пръст или трева.
+treeSpawned=§6Създадено е дърво.
+true=§aда§r
+typeTpacancel=§6За да отмените, напишете §c/tpacancel§6.
+typeTpaccept=§6За да се телепортирате, напишете §c/tpaccept§6.
+typeTpdeny=§6За да откажете, напишете §c/tpdeny§6.
+typeWorldName=§6Можете също да напишете името на определен свят.
+unableToSpawnItem=§4Не можете да размножите §c{0}§4; това не е предмет, който може да се размножи.
+unableToSpawnMob=§4Неуспех при създаването на същество.
+unignorePlayer=§6Спряхте да игнорирате играч§c {0} §6.
+unknownItemId=§4Неизвестен номер на предмет\:§r {0}§4.
+unknownItemInList=§4Неизвестен предмет {0} в списък {1}.
+unknownItemName=§4Неизвестно име на предмет\: {0}.
+unlimitedItemPermission=§4Нямате право на безброй предмети§c {0}§4.
+unlimitedItems=§6Безбройни предмети\:§r
+unmutedPlayer=§6Играчът§c {0}§6 е отглушен.
+unsafeTeleportDestination=§4Дестинацията е опасна и защитата след телепортиране е изключена.
+unvanishedReload=§4Поради презареждане на сървъра сте отново видим.
+upgradingFilesError=Грешка при подновяването на файловете.
+uptime=§6Активно време\:§c {0}
+userAFK=§7{0} §5е неактивен и може да не отговори.
+userAFKWithMessage=§7{0} §5е неактивен и може да не отговори\: {1}
+userdataMoveBackError=Грешка при преместването на userdata/{0}.tmp към userdata/{1}\!
+userdataMoveError=Грешка при преместването на userdata/{0} към userdata/{1}.tmp\!
+userDoesNotExist=§4Играчът§c {0} §4не съществува.
+userIsAway=§7* {0} §7е неактивен.
+userIsAwayWithMessage=§7* {0} §7е неактивен.
+userIsNotAway=§7* {0} §7вече не е неактивен.
+userJailed=§6Вие бяхте затворени\!
+userUnknown=§4Внимание\: Играчът ''§c{0}§4'' никога не е влизал в сървъра.
+usingTempFolderForTesting=Използване на временна папка за тестване\:
+vanish=§6Невидимост за {0}§6\: {1}
+vanished=§6Сега сте напълно невидим за нормалните играчи и скрит от командите в сървъра.
+versionOutputVaultMissing=§4Vault не е инсталиран. Чатът и правата може да не работят.
+versionOutputFine=§6{0} версия\: §a{1}
+versionOutputWarn=§6{0} версия\: §a{1}
+versionOutputUnsupported=§d{0} §6версия\: §d{1}
+versionOutputUnsupportedPlugins=§6Имате §dнеподдържани плъгини§6\!
+versionMismatch=§4Несъвпадение на версията\! Моля обновете {0} на същата версия.
+versionMismatchAll=§4Несъвпадение на версията\! Моля обновете всички Essentials.jar файлове {0} на същата версия.
+voiceSilenced=§6Вие бяхте заглушени\!
+walking=вървене
+warpDeleteError=§4Проблем при изтриването на файла на уарпа.
+warpingTo=§6Телепортиране до§c {0}§6.
+warpList={0}
+warpListPermission=§4Нямате достъп до списъкът с уарпове.
+warpNotExist=§4Този уарп не съществува.
+warpOverwrite=§4Не можете да презапишете този уарп.
+warps=§6Уарпове\:§r {0}
+warpsCount=§6Има§c {0} §6уарпа. Показване на страница §c{1} §6от §c{2}§6.
+warpSet=§6Уарп§c {0} §6е създаден.
+warpUsePermission=§4Нямате право да използвате този уарп.
+weatherInvalidWorld=Свят наречен {0} не е открит\!
+weatherStorm=§6Зададохте времето на §cбурно§6 в§c {0}§6.
+weatherSun=§6Зададохте времето на §cслънчево§6 в§c {0}§6.
+weatherSunFor=§6Зададохте времето на §cслънчево§6 в§c {0}§6за {1} секунди.
+west=З
+whoisAFK=§6 - Неактивен/на\:§r {0}
+whoisAFKSince=§6 - Неактивен/на\:§r {0} (От {1})
+whoisBanned=§6 - Ограничен/а\:§r {0}
+whoisExp=§6 - Опит\:§r {0} (Ниво {1})
+whoisFly=§6 - Летателен режим\:§r {0} ({1})
+whoisGamemode=§6 - Режим на неуязвимост\:§r {0}
+whoisGeoLocation=§6 - Локация\:§r {0}
+whoisGod=§6 - Неуязвим\:§r {0}
+whoisHealth=§6 - Живот\:§r {0}/20
+whoisHunger=§6 - Глад\:§r {0}/20 (+{1} наситеност)
+whoisIPAddress=§6 - IP Адрес\:§r {0}
+whoisJail=§6 - Затворен/а\:§r {0}
+whoisLocation=§6 - Локация\:§r ({0}, {1}, {2}, {3})
+whoisMoney=§6 - Пари\:§r {0}
+whoisMuted=§6 - Заглушен/а\:§r {0}
+whoisMutedReason=§6 - Заглушен/а\:§r {0} §6Причина\: §c{1}
+whoisNick=§6 - Прякор\:§r {0}
+whoisOp=§6 - Оператор\:§r {0}
+whoisPlaytime=§6 - Играно време\:§r {0}
+whoisTempBanned=§6 - Забраната изтича след\:§r {0}
+whoisTop=§6 \=\=\=\=\=\= Кой е\:§c {0} §6\=\=\=\=\=\=
+whoisUuid=§6 - UUID\:§r {0}
+worth=§aСтак от {0} струва §c{1}§a ({2} предмет(а) по {3} всеки)
+worthMeta=§aСтак от {0} с метаданни на {1} струва §c{2}§a ({3} предмет(а) по {4} всеки)
+worthSet=§6Цената е зададена
+year=година
+years=години
+youAreHealed=§6Вие бяхте излекувани.
+youHaveNewMail=§6Имате§c {0} §6съобщения\! Напишете §c/mail read§6, за да прегледате пощата си.

Essentials/src/messages_bs.properties

@@ -0,0 +1,221 @@
+#X-Generator: crowdin.net
+#version: ${full.version}
+# Single quotes have to be doubled: ''
+# by:
+addedToAccount=§a{0} je dodano na vas racun.
+addedToOthersAccount=dodan §a {0} {1} §a račun. Novo ravnotežu\: {2}
+adventure=pustolovina
+alertBroke=slomio\:
+alertFormat=§3[{0}] §r {1} §6 {2} u\: {3}
+alertPlaced=postavljen\:
+alertUsed=upotrebljen\:
+antiBuildBreak=§7Nemas dozvolu da unistavas§3 {0} §7blokove ovdje.
+antiBuildCraft=§7Nemas dozvolu da stvoris§3 {0}§7.
+antiBuildDrop=§4Nemate pravo da padne§c {0}§4.
+antiBuildInteract=§4Nemate pravo da za interakciju sa §c {0}§4.
+antiBuildPlace=§4Nemate pravo da postavi§c {0} §4ovde.
+antiBuildUse=§4Nemate pravo da koriste§c {0}§4.
+autoAfkKickReason=Izbaceni ste za prazan hod vise od {0} minuta.
+backupDisabled=§7Jedna vanjska sigurnosna kopija nije konfigurirana.
+backupFinished=§7Backup je zavrsen.
+backupStarted=§7Backup je zapoceo.
+backUsageMsg=§7Vracanje na prethodnu lokaciju.
+balance=§aStanje na racunu\:§c {0}
+balanceOther=§aStanje na racunu od {0}§a\:§c {1}
+balanceTop=§6Top stanje na racunu ({0})
+banExempt=§4Nemozes banati tog igraca.
+banFormat=§cBanovani ste sa servera\!\!\nNe poksuavajte praviti nove acconte, inace nikada necete dobiti unban\nRazlog\:\n§r{0}
+bed=§oKrevet§r
+bedMissing=§4Tvoj krevet nije postavljen, nedostaje ili je blokiran.
+bedSet=§6Krevet je postavljen\!
+bigTreeFailure=§4Generacija velikog stabla neuspjela. Pokušaj ponovo na travi ili zemlji.
+bigTreeSuccess=§6Veliko stablo stvoreno.
+bookAuthorSet=§6Author knjige postavljen na {0}.
+bookLocked=§6Ova knjiga je sada zakljucana.
+bookTitleSet=§6Naslov knjige postavljen na {0}.
+burnMsg=§6Zapaslio si §c {0} §6na§c {1} sekundi§6.
+cannotStackMob=Nemas dozvolu.
+canTalkAgain=§6Sada opet mozes razgovarati.
+cantFindGeoIpDB=Nije moguce pronaci GeoIP\!
+cantReadGeoIpDB=Nije uspjeo citanje GeoIP\!
+cantSpawnItem=Nemas dozvolu za stvaranje §c {0}.
+cleaned=Baza igraca ociescena.
+cleaning=Ciscenje baze igraca.
+commandFailed=Naredba {0} nije uspjela\:
+commandHelpFailedForPlugin=Pogreska pri dobivanju pomoći za plugin\: {0}
+commandNotLoaded=Komanda {0} je uspjesno ucitana.
+configFileMoveError=Premjestiti config.yml na mjesto sigurnosne kopije nije uspjelo.
+configFileRenameError=Nije prava mjesavina varalica preminenovati u confiog.ym.
+connectionFailed=Neuspjesno povezivanje.
+defaultBanReason=Banan si sa servera\!
+deleteFileError=Nije moguce obrisati dokument\: {0}
+deleteHome=Kuca {0} je obrisana.
+deleteJail=Jail {0} je uklonjen.
+deleteWarp=Warp {0} je obrisan.
+deniedAccessCommand=§c{0} §4je bio zabranjen pristup naredbi.
+denyBookEdit=§4Ti ne mozes otkljucati ovu knjigu.
+denyChangeAuthor=§4Ti ne mozes promijeniti autora ove knjige.
+denyChangeTitle=§4Ti ne mozes promijeniti naslov ove knjige.
+depthAboveSea=§Vi ste§c {0} §6blokova iznad nadmorske visine.
+depthBelowSea=§6Vi ste§c {0} §6blok(ova) ispod razine mora.
+fireworkColor=&7Nepoznat vartromet morate prvo staviti boju.
+fireworkEffectsCleared=§6Uklonjeni su svi efekti iz itema u ruci.
+flyMode=&7Letenje je &3{0} &7za &3{1}&7.
+foreverAlone=§4Nemate nikoga kome možete odgovoriti.
+fullStack=§4Vec imas puni stack.
+gameMode=&6Postavjen gamemode &c {0} &6za &c{1}&6.
+gcfree=§6Slobodno memorije\: §c {0} MB.
+gcmax=§6Max memorije\: §c {0} MB.
+gctotal=&7Memorija\: &3{0} &7MB.
+geoipJoinFormat=&7Igrac &3{0} &7dolazi iz &3{1}&7.
+geoIpUrlEmpty=GeoIP preuzimanje datoteka Url adresa je prazna.
+geoIpUrlInvalid=GeoIP preuzimanje url nije valjan.
+godDisabledFor=§ciskljucen§6 za§c {0}
+godEnabledFor=§aukljuceno§6 za§c {0}
+godMode=&7GodMode &3{0}&7.
+groupDoesNotExist=§4Nitko nije online u ovoj grupi\!
+groupNumber=§c{0}§f online, za cijeli popis\: §c /{1} {2}
+hatArmor=§4Ne mozete koristiti ovaj item kao sesir\!
+hatEmpty=§4Trenutno ne nosis kapu.
+hatFail=§4Moras nesto nositi u ruci.
+hatPlaced=§6Uzivaj sa novom kapom\!
+hatRemoved=§6Vasa kapa je uklonjena.
+haveBeenReleased=&7Pusten si&7.
+heal=&7Izljecen si.
+healDead=&7Nemozes izljeciti nekoga tko je mrtav\!
+healOther=&7Izljecio si &3{0}&7.
+helpFrom=&7Komande od &3{0}&7\:
+helpMatching=&7Komande odgovarajuci "&3{0}&3"&7\:
+helpOp=&8[&3PomocOP&8] &3{0}&7\: &7{1}&7
+helpPlugin=§4{0}§r\: Plugin pomoc\: /help {1}
+holdBook=§4Nedrzis knjigu u kojoj se moze pisati.
+holdFirework=§4Moras drzati vatromet za dodavanje efekata.
+holdPotion=§4Moras drzati napitak da bi primjenio efekte.
+holeInFloor=§4Rupa u podu\!
+homes=&6Kuce\:&r {0}
+homeSet=§6Home postavljen na trenutnu lokaciju.
+hour=sat sati\nhour hours
+ignoredList=§6Ignoriran\:§r {0}
+ignorePlayer=§6Ignoriras igraca§c {0} §6od sad.
+illegalDate=Ilegalan oblik datuma.
+infoChapter=§6Odaberi poglavlje\:
+infoChapterPages=§e ---- §6{0} §e--§6 Stranica §c{1}§6 od §c{2} §e----
+infoPages=§e ---- §6{2} §e--§6 Stranica §c{0}§6/§c{1} §e----
+infoUnknownChapter=§4Nepoznato poglavlje.
+inventoryClearingAllArmor=&7Ocistcene sve inventori stvari i oklop od &3{0}&7.
+inventoryClearingFromAll=§6Ciscenje inventorija svih igraca...
+isIpBanned=&7IP &3{0} &7je banovan.
+kitOnce=Ne mozes ponovo koristiti taj kit.
+kitReceive=§6Dobio si kit§c {0}§6.
+kits=§6Kitovi\:§r {0}
+kitTimed=§4Ti ne mozes koristiti taj kit ponovno za jos§c {0}§4.
+listAmount=§6Online su §c{0}§6 od maksimalno §c{1}§6 igraca online.
+loadWarpError=&3Greska&7, nemozemo ucitati warp {0}.
+mailCleared=&7Email je obrisan\!
+mailSent=&7Email je poslan\!
+markMailAsRead=&7Ako zelis staviti da si procito email, napisi &3 /mail clear &7.
+matchingIPAddress=&7Sljedeci igraci ranije prijavljeni s te IP adrese\:
+maxHomes=§4Ti ne mozes postaviti vise od§c {0} §4kuca.
+missingItems=§4Ti nemas §c{0}x {1}§4.
+mobSpawnError=&7Greska u promjenjivanju spawnera.
+mobSpawnLimit=&7Mob kolicina je ogranicena na ovom serveru.
+mobSpawnTarget=&7Moras gledati u spawner da ga pretvoris u drugi spawner.
+moneySentTo=§a{0} je poslano do {1}.
+moreThanZero=&7Quantities mora biti veci od 0.
+multiplePotionEffects=&7Nije moguce primjeniti vise efekta ovaj napitak.
+mutedPlayer=&7Igrac &3{0} &7muted.
+mutedPlayerFor=&7Igrac&3 {0} &7je mutovan za &3{1}&7.
+muteExempt=&7Nemozes mute ovog igraca.
+muteNotify=&3{0} &7je mutovao igraca &3{1}&7.
+nearbyPlayers=&7Igraci u blizini\: &3{0}
+negativeBalanceError=&7Igrac nesmije imati negativne novce.
+nickChanged=&7Ime je promjenjeno.
+nickDisplayName=&7Moras promjeniti displayname u Essentials config.
+nickInUse=&7Ovo ime vec postoji.
+nickNamesAlpha=&7Ime mora imati slova iz abecede.
+nickNoMore=&7Nemas vise ime.
+noKitGroup=§4Nemas pristup ovome kitu.
+nuke=&7Bombe ce poceti padat.
+onlyDayNight=/Time samo podržava dan/noć.
+onlyPlayers=§4Samo igrači u igri mogu koristiti §c{0}§4.
+onlyPlayerSkulls=Možeš postaviti samo igračevu lubanju (§c397\:3§4).
+orderBalances=&7Ucitavamo stanja novaca &3{0} &figraca, molimo pricekajte...
+oversizedTempban=&7Nemozes banovati igraca na to vrijeme.
+pendingTeleportCancelled=&7Ponistio si teleport zahtijev.
+playerBanIpAddress=&7Igrac &3{0} &7je banovao IP Adresu &3{1} &7za\: &3{2}&7.
+playerBanned=&7Igrac &3{0} &7je banovao &3{1} &7, razlog\: &3{2}&7.
+playerJailed=§6Igrac§c {0} §6zatvoren.
+playerMuted=§6Mutan si\!
+playerNeverOnServer=&7Igrac &3{0} &7nikad nije bio na ovom serveru.
+playerNotFound=§4Igrac nije pronađen.
+playerUnmuted=§6Unmutan si.
+possibleWorlds=§6Moguci svjetovi su brojevi §c0§6 kroz §c{0}§6.
+powerToolAir=§4Command ne može biti prilozen zraku.
+powerToolAlreadySet=§4Command §c{0}§4 vec je dodijeljena §c{1}§4.
+powerToolClearAll=&7Sve moci sa te stvari su izbrisane.
+powerToolList=§6Item §c{1} §6ima sljedece naredbe\: §c{0}§6.
+pTimeCurrent=&3{0}&7 vrijeme je &3{1}&7.
+pTimeCurrentFixed=&3{0}&7vrijeme je popravljeno u &3{1}&7.
+pTimeNormal=&3{0}&7 vrijeme je normalno i odgovara na server.
+pTimePlayers=&7Ovi igraci imaju svoje vrijeme\: &r
+pTimeReset=&7Igracevo vrijeme je vraceno na\: &3{0}
+pTimeSet=&7Igracevo vrijeme je stavljeno na &3{0}&7 za\: &3{1}&7.
+pTimeSetFixed=&7Igracevo vrijeme je popravljeno na &3{0}&7 za\: &3{1}&7.
+pWeatherCurrent=&3{0}&7 vrijeme je &3{1}&7.
+pWeatherInvalidAlias=&7Greska, nemozemo naci ovakav nacin vremena
+pWeatherNormal=&3{0}&7 vrijeme je normalno i odgovara na server.
+pWeatherPlayers=&7Ovi igraci imaju svoje vrijeme\: &r
+pWeatherReset=&7Igracevo vrijeme je vraceno na\: &3{0}
+pWeatherSet=&7Igracevo vrijeme je stavljeno na &3{0}&7 za\: &3{1}&7.
+serverTotal=&7Server ukupno\: &3{0}
+setBal=&7Tvoj novac je postavljen na &3{0}.
+setBalOthers=&7Stavio si &3{0} &7novce za &3{1}&7.
+setSpawner=§6Promijenjen spawner tip to§c {0}§6.
+signProtectInvalidLocation=§4Nemas dozvolu da postavis sign ovdje.
+similarWarpExist=§4Warp sa slicnim imenom vec postoji.
+spawnSet=&7Spawn je postavljen na grupu &3 {0}&7.
+suicideSuccess=&7Igrac &3{0} &7je ubio sam sebe.
+teleportAAll=&7Teleport zahtjev je poslan svim igracima...
+teleportAll=&7Teleportiram sve igrace...
+teleportationCommencing=&7Teleporitanje dolazi...
+teleportationDisabled=&7Teleportacija &3iskljucena&7.
+teleportationDisabledFor=&7Teleportacija &3iskljucena&7 za &3{0}&7.
+teleportationEnabled=&7Teleportacija je &3ukljucena&7.
+teleportationEnabledFor=&7Teleportacija je &3ukljucena&7 za &3{0}&7.
+teleportAtoB=&3{0}&7 teleporan si do &3{1}&7.
+teleportDisabled=&3{0} &7ima teleportaciju iskljucenu.
+teleportHereRequest=&3{0}&7 ti je poslao zahtjev da se teleportiras do njega.
+teleporting=§6Teleportiranje...
+teleportNewPlayerError=&7Greska u teleportiranju novog igraca\!
+teleportRequest=&3{0}&7 vam je poslao zahtjev da se teleportira do tebe.
+teleportRequestTimeoutInfo=&7Ovaj zahtjev ce zavrsiti nakon &3{0} &7sekundi.
+teleportTop=&7Teleporitanje na vrh.
+teleportToPlayer=§6Teleportiranje do §c{0}§6.
+tempbanExempt=&7Nemozes privremeno banovati ovu osobu.
+timeBeforeHeal=&7Vrijeme prije novog ljecenja\:&3{0}&7.
+timeBeforeTeleport=&7Vrijeme nakon nove teleportacije\: &3{0}&7.
+timeFormat=&3{0}&7 ili &3{1} &7 ili &3{2}&7
+timeWorldCurrent=&7Trenutno vrijeme u &3{0} &7je &3{1}&7.
+timeWorldSet=&7Vrijeme je postavljeno sa &3{0}&7u\: &3{1}&7.
+warpingTo=&7Warpas se do &3{0}&7.
+warpListPermission=&7Nemas dozvolu da vidis listu warpova.
+warpNotExist=&7Ovaj warp ne postoji.
+warpOverwrite=&7Nemozes prepisati taj warp.
+warps=&7Warpovi\:&3 {0}
+warpsCount=&7Ovdje su &3{0} &7warpovi. Rezultati stranica &3{1} &7od &3{2}&7.
+warpSet=&7Warp &3{0} &7je postavljen.
+warpUsePermission=&7Nemas dozvolu za koristenje ovog warpa.
+weatherStorm=&7Stavio si vrijeme od &3oluje &7u &3{0}&7.
+weatherSun=&7Stavio si vrijeme od &3sunca &7u &3{0}&7.
+whoisBanned=§6 - Banovan\: §r {0}
+whoisFly=&7 - Nacin letenja\:&3 {0} ({1})
+whoisGeoLocation=&7Lokacija\: &3 {0}
+whoisHealth=&7 - Zdravlje\: &3 {0}/20
+whoisHunger=&7 - glad\: &3 {0}/20 (+{1} Zasicenje)
+whoisIPAddress=&7 - IP Adresa\: &3 {0}
+whoisMoney=&7 - Novac\: &3 {0}
+whoisMuted=&7 - Mutovan\:&3 {0}
+worth=§aStack {0} vrijednosti §c{1}§a ({2} stavke u {3} svaki)
+worthSet=§6Vrijednost je stavljena
+youAreHealed=§6Izlječen si.
+youHaveNewMail=§6Imaš§c {0} §6poruka\! Kucaj §c/mail read§6 da vidiš poštu.