From 69b874c8325f0a16dc18cea447c4e3edabd17349 Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Sun, 1 Nov 2015 01:58:25 +0100
Subject: [PATCH 001/117] Update AuthMePlayerListener.java

---
 .../xephi/authme/listener/AuthMePlayerListener.java   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index 04937fd4..51b7933b 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -143,13 +143,11 @@ public class AuthMePlayerListener implements Listener {
                 player.setWalkSpeed(0.0f);
                 player.setFlySpeed(0.0f);
             }
-            if (!event.getFrom().getBlock().equals(event.getTo().getBlock())) {
-                event.setTo(event.getFrom());
-            }
+            event.setTo(event.getFrom());
             return;
         }
 
-        if (Settings.getMovementRadius == 0) {
+        if (Settings.getMovementRadius <= 0) {
             return;
         }
 
@@ -218,7 +216,7 @@ public class AuthMePlayerListener implements Listener {
                 plugin.management.performJoin(player);
 
                 // Remove the join message while the player isn't logging in
-                if ((Settings.enableProtection || Settings.delayJoinMessage) && event.getJoinMessage() != null) {
+                if (Settings.delayJoinMessage && event.getJoinMessage() != null) {
                     joinMessage.put(name, event.getJoinMessage());
                     event.setJoinMessage(null);
                 }
@@ -378,7 +376,8 @@ public class AuthMePlayerListener implements Listener {
 
         plugin.management.performQuit(player, false);
 
-        if (!PlayerCache.getInstance().isAuthenticated(name) && Settings.enableProtection)
+        // TODO: rename delayjoinmessage setting
+        if (!PlayerCache.getInstance().isAuthenticated(name) && Settings.delayJoinMessages)
             event.setQuitMessage(null);
     }
 

From b2bd3b0ab74916fe6bd2395d4b6c42a64726af3f Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Sun, 1 Nov 2015 12:00:45 +0100
Subject: [PATCH 002/117] cleanup

---
 .../authme/commands/UnregisterCommand.java    | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/commands/UnregisterCommand.java b/src/main/java/fr/xephi/authme/commands/UnregisterCommand.java
index 9c881d02..b7b58c2f 100644
--- a/src/main/java/fr/xephi/authme/commands/UnregisterCommand.java
+++ b/src/main/java/fr/xephi/authme/commands/UnregisterCommand.java
@@ -1,40 +1,20 @@
 package fr.xephi.authme.commands;
 
-import java.security.NoSuchAlgorithmException;
-
-import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scheduler.BukkitTask;
-
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.Utils;
-import fr.xephi.authme.Utils.GroupType;
 import fr.xephi.authme.cache.auth.PlayerCache;
-import fr.xephi.authme.cache.backup.JsonCache;
-import fr.xephi.authme.cache.limbo.LimboCache;
-import fr.xephi.authme.events.SpawnTeleportEvent;
-import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.settings.Messages;
-import fr.xephi.authme.settings.Settings;
-import fr.xephi.authme.task.MessageTask;
-import fr.xephi.authme.task.TimeoutTask;
 
 public class UnregisterCommand implements CommandExecutor {
 
     private Messages m = Messages.getInstance();
     public AuthMe plugin;
-    private JsonCache playerCache;
 
     public UnregisterCommand(AuthMe plugin) {
         this.plugin = plugin;
-        this.playerCache = new JsonCache();
     }
 
     @Override

From d478973fa5bd27de67508016aa0a31c6993e2c52 Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Sun, 1 Nov 2015 13:23:47 +0100
Subject: [PATCH 003/117] Enhance join/leave message delay

---
 .../authme/commands/UnregisterCommand.java    |  1 +
 .../authme/listener/AuthMePlayerListener.java | 43 +++++++++----------
 .../fr/xephi/authme/settings/Settings.java    | 12 ++++--
 src/main/resources/config.yml                 |  4 +-
 4 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/commands/UnregisterCommand.java b/src/main/java/fr/xephi/authme/commands/UnregisterCommand.java
index b7b58c2f..4a879f1b 100644
--- a/src/main/java/fr/xephi/authme/commands/UnregisterCommand.java
+++ b/src/main/java/fr/xephi/authme/commands/UnregisterCommand.java
@@ -4,6 +4,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.settings.Messages;
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index 51b7933b..4504a11d 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -52,10 +52,11 @@ import fr.xephi.authme.settings.Settings;
 
 public class AuthMePlayerListener implements Listener {
 
+    public AuthMe plugin;
+    private Messages m = Messages.getInstance();
+
     public static ConcurrentHashMap<String, GameMode> gameMode = new ConcurrentHashMap<>();
     public static ConcurrentHashMap<String, String> joinMessage = new ConcurrentHashMap<>();
-    private Messages m = Messages.getInstance();
-    public AuthMe plugin;
     public static ConcurrentHashMap<String, Boolean> causeByAuthMe = new ConcurrentHashMap<>();
     private List<String> antibot = new ArrayList<>();
 
@@ -67,9 +68,16 @@ public class AuthMePlayerListener implements Listener {
         Player player = event.getPlayer();
         if (!Utils.checkAuth(player)) {
             String cmd = event.getMessage().split(" ")[0];
-            if (!Settings.isChatAllowed && !(Settings.allowCommands.contains(cmd))) {
-                event.setCancelled(true);
+            if (cmd.startsWith("/")) {
+                if (Settings.allowCommands.contains(cmd)) {
+                    return;
+                }
+            } else {
+                if (Settings.isChatAllowed) {
+                    return;
+                }
             }
+
             if (plugin.database.isAuthAvailable(player.getName().toLowerCase())) {
                 m.send(player, "login_msg");
             } else {
@@ -84,22 +92,14 @@ public class AuthMePlayerListener implements Listener {
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
     public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
-        String msg = event.getMessage();
-        if (msg.equalsIgnoreCase("/worldedit cui"))
-            return;
-
-        String cmd = msg.split(" ")[0];
-        if (cmd.equalsIgnoreCase("/login") || cmd.equalsIgnoreCase("/register") || cmd.equalsIgnoreCase("/l") || cmd.equalsIgnoreCase("/reg") || cmd.equalsIgnoreCase("/email") || cmd.equalsIgnoreCase("/captcha"))
-            return;
+        String cmd = event.getMessage().split(" ")[0];
         if (Settings.useEssentialsMotd && cmd.equalsIgnoreCase("/motd"))
             return;
         if (Settings.allowCommands.contains(cmd))
             return;
-
-        if (!Utils.checkAuth(event.getPlayer())) {
-            event.setMessage("/notloggedin");
-            event.setCancelled(true);
-        }
+        if (Utils.checkAuth(event.getPlayer()))
+            return;
+        event.setCancelled(true);
     }
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.NORMAL)
@@ -216,7 +216,7 @@ public class AuthMePlayerListener implements Listener {
                 plugin.management.performJoin(player);
 
                 // Remove the join message while the player isn't logging in
-                if (Settings.delayJoinMessage && event.getJoinMessage() != null) {
+                if (Settings.delayJoinLeaveMessages && event.getJoinMessage() != null) {
                     joinMessage.put(name, event.getJoinMessage());
                     event.setJoinMessage(null);
                 }
@@ -372,13 +372,12 @@ public class AuthMePlayerListener implements Listener {
         }
 
         Player player = event.getPlayer();
-        String name = player.getName().toLowerCase();
+
+        if (!Utils.checkAuth(player) && Settings.delayJoinLeaveMessages) {
+            event.setQuitMessage(null);
+        }
 
         plugin.management.performQuit(player, false);
-
-        // TODO: rename delayjoinmessage setting
-        if (!PlayerCache.getInstance().isAuthenticated(name) && Settings.delayJoinMessages)
-            event.setQuitMessage(null);
     }
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java
index ed951d1d..84672b38 100644
--- a/src/main/java/fr/xephi/authme/settings/Settings.java
+++ b/src/main/java/fr/xephi/authme/settings/Settings.java
@@ -76,7 +76,7 @@ public final class Settings extends YamlConfiguration {
             purgeLimitedCreative, purgeAntiXray, purgePermissions,
             enableProtection, enableAntiBot, recallEmail, useWelcomeMessage,
             broadcastWelcomeMessage, forceRegKick, forceRegLogin,
-            checkVeryGames, delayJoinMessage, noTeleport, applyBlindEffect,
+            checkVeryGames, delayJoinLeaveMessages, noTeleport, applyBlindEffect,
             customAttributes, generateImage, isRemoveSpeedEnabled, isMySQLWebsite;
 
     public static String getNickRegex, getUnloggedinGroup, getMySQLHost,
@@ -273,7 +273,7 @@ public final class Settings extends YamlConfiguration {
         getMaxLoginPerIp = configFile.getInt("settings.restrictions.maxLoginPerIp", 0);
         getMaxJoinPerIp = configFile.getInt("settings.restrictions.maxJoinPerIp", 0);
         checkVeryGames = configFile.getBoolean("VeryGames.enableIpCheck", false);
-        delayJoinMessage = configFile.getBoolean("settings.delayJoinMessage", false);
+        delayJoinLeaveMessages = configFile.getBoolean("settings.delayJoinLeaveMessage", false);
         noTeleport = configFile.getBoolean("settings.restrictions.noTeleport", false);
         crazyloginFileName = configFile.getString("Converter.CrazyLogin.fileName", "accounts.db");
         getPassRegex = configFile.getString("settings.restrictions.allowedPasswordCharacters", "[\\x21-\\x7E]*");
@@ -402,8 +402,12 @@ public final class Settings extends YamlConfiguration {
             set("settings.restrictions.allowedNicknameCharacters", "[a-zA-Z0-9_]*");
             changes = true;
         }
-        if (!contains("settings.delayJoinMessage")) {
-            set("settings.delayJoinMessage", false);
+        if (contains("settings.delayJoinMessage")) {
+            set("settings.delayJoinMessage", null);
+            changes = true;
+        }
+        if (!contains("settings.delayJoinLeaveMessages")) {
+            set("settings.delayJoinLeaveMessages", true);
             changes = true;
         }
         if (!contains("settings.restrictions.noTeleport")) {
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 6e3ad561..e991efc0 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -253,8 +253,8 @@ settings:
     useWelcomeMessage: true
     # Do we need to broadcast the welcome message to all server or only to the player? set true for server or false for player
     broadcastWelcomeMessage: false
-    # Do we need to delay the X has joined the game after /login ?
-    delayJoinMessage: false
+    # Do we need to delay the join/leave message to be displayed only when the player is authenticated ?
+    delayJoinLeaveMessages: true
     # Do we need to add potion effect Blinding before login/register ?
     applyBlindEffect: false
 ExternalBoardOptions:

From 49a9d3f51b04c1b33b60e27101e5dbcedd80e71c Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Sun, 1 Nov 2015 14:42:39 +0100
Subject: [PATCH 004/117] Update README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 056700d3..220a2ced 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
 <p align="center"><img src="http://i61.tinypic.com/291dm49.png"></p>
 <p align="center"><strong>The most used authentication plugin for CraftBukkit/Spigot!</strong></p>
 <hr>
+
+####Development history:
+[![Guava AuthMe History Video](http://img.youtube.com/vi/hJRzNfYyd9k/hqdefault.jpg)](https://www.youtube.com/watch?v=hJRzNfYyd9k)
+
 #####Development tools:
 
 - DEVELOPMENT TEAM REPO (<strong>please send PRs here!</strong>): <a href="https://github.com/AuthMe-Team/AuthMeReloaded">Github Development Page</a>

From 7cea79eefc2f136ece27a1a6525a26e8c57c0c0e Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Sun, 1 Nov 2015 13:34:24 +0100
Subject: [PATCH 005/117] cleanup

---
 src/main/java/fr/xephi/authme/AuthMe.java                      | 2 +-
 .../java/fr/xephi/authme/process/join/AsyncronousJoin.java     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index aae74c27..8371bbb4 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -109,7 +109,7 @@ public class AuthMe extends JavaPlugin {
     // In case we need to cache PlayerAuths, prevent connection before it's done
     private boolean canConnect = true;
 
-    public boolean isCanConnect() {
+    public boolean canConnect() {
 		return canConnect;
 	}
 
diff --git a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
index b52833e4..a35708ba 100644
--- a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
+++ b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
@@ -58,8 +58,7 @@ public class AsyncronousJoin {
             plugin.ess.getUser(player).setSocialSpyEnabled(false);
         }
 
-        if (!plugin.isCanConnect())
-        {
+        if (!plugin.canConnect()) {
         	final GameMode gM = AuthMePlayerListener.gameMode.get(name);
             sched.scheduleSyncDelayedTask(plugin, new Runnable() {
 

From 1897b1f5e6569b73217ed238b3dd433cdc387636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 15:31:15 +0100
Subject: [PATCH 006/117] Added dynamic command handler from Dungeon Maze

---
 .../dynamic/CommandArgumentDescription.java   |  91 ++
 .../commands/dynamic/CommandDescription.java  | 912 ++++++++++++++++++
 .../commands/dynamic/CommandHandler.java      | 205 ++++
 .../dynamic/CommandHandlerService.java        |  90 ++
 .../commands/dynamic/CommandManager.java      | 288 ++++++
 .../authme/commands/dynamic/CommandParts.java | 204 ++++
 .../commands/dynamic/CommandPermissions.java  | 182 ++++
 .../commands/dynamic/ExecutableCommand.java   |  17 +
 .../commands/dynamic/FoundCommandResult.java  | 151 +++
 .../executable/CheckUpdatesCommand.java       |  78 ++
 .../executable/CreateWorldCommand.java        | 140 +++
 .../executable/DungeonMazeCommand.java        |  28 +
 .../dynamic/executable/HelpCommand.java       |  37 +
 .../executable/InstallUpdateCommand.java      |  75 ++
 .../dynamic/executable/ListWorldCommand.java  |  67 ++
 .../dynamic/executable/LoadWorldCommand.java  |  75 ++
 .../dynamic/executable/ReloadCommand.java     |  75 ++
 .../executable/ReloadPermissionsCommand.java  |  56 ++
 .../dynamic/executable/RestartCommand.java    | 105 ++
 .../dynamic/executable/ServiceCommand.java    |  73 ++
 .../dynamic/executable/StatusCommand.java     | 180 ++++
 .../dynamic/executable/TeleportCommand.java   |  80 ++
 .../executable/UnloadWorldCommand.java        | 107 ++
 .../dynamic/executable/VersionCommand.java    |  80 ++
 .../commands/dynamic/help/HelpPrinter.java    | 189 ++++
 .../commands/dynamic/help/HelpProvider.java   | 114 +++
 .../dynamic/help/HelpSyntaxHelper.java        |  60 ++
 27 files changed, 3759 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/CommandArgumentDescription.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/CommandDescription.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/CommandHandler.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/CommandHandlerService.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/CommandManager.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/CommandParts.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/CommandPermissions.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/ExecutableCommand.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/FoundCommandResult.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/executable/CheckUpdatesCommand.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/executable/CreateWorldCommand.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/executable/DungeonMazeCommand.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/executable/HelpCommand.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/executable/InstallUpdateCommand.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/executable/ListWorldCommand.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/executable/LoadWorldCommand.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/executable/ReloadCommand.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/executable/ReloadPermissionsCommand.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/executable/RestartCommand.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/executable/ServiceCommand.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/executable/StatusCommand.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/executable/TeleportCommand.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/executable/UnloadWorldCommand.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/executable/VersionCommand.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/help/HelpPrinter.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/help/HelpProvider.java
 create mode 100644 src/main/java/fr/xephi/authme/commands/dynamic/help/HelpSyntaxHelper.java

diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/CommandArgumentDescription.java b/src/main/java/fr/xephi/authme/commands/dynamic/CommandArgumentDescription.java
new file mode 100644
index 00000000..5d021b65
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/CommandArgumentDescription.java
@@ -0,0 +1,91 @@
+package fr.xephi.authme.commands.dynamic;
+
+public class CommandArgumentDescription {
+
+    // TODO: Allow argument to consist of infinite parts. <label ...>
+
+    /** Argument label. */
+    private String label;
+    /** Argument description. */
+    private String description;
+    /** Defines whether the argument is optional. */
+    private boolean optional = false;
+
+    /**
+     * Constructor.
+     *
+     * @param label The argument label.
+     * @param description The argument description.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public CommandArgumentDescription(String label, String description) {
+        this(label, description, false);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param label The argument label.
+     * @param description The argument description.
+     * @param optional True if the argument is optional, false otherwise.
+     */
+    public CommandArgumentDescription(String label, String description, boolean optional) {
+        setLabel(label);
+        setDescription(description);
+        setOptional(optional);
+    }
+
+    /**
+     * Get the argument label.
+     *
+     * @return Argument label.
+     */
+    public String getLabel() {
+        return this.label;
+    }
+
+    /**
+     * Set the argument label.
+     *
+     * @param label Argument label.
+     */
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    /**
+     * Get the argument description.
+     *
+     * @return Argument description.
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Set the argument description.
+     *
+     * @param description Argument description.
+     */
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /**
+     * Check whether the argument is optional.
+     *
+     * @return True if the argument is optional, false otherwise.
+     */
+    public boolean isOptional() {
+        return optional;
+    }
+
+    /**
+     * Set whether the argument is optional.
+     *
+     * @param optional True if the argument is optional, false otherwise.
+     */
+    public void setOptional(boolean optional) {
+        this.optional = optional;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/CommandDescription.java b/src/main/java/fr/xephi/authme/commands/dynamic/CommandDescription.java
new file mode 100644
index 00000000..2ab78ac6
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/CommandDescription.java
@@ -0,0 +1,912 @@
+package fr.xephi.authme.commands.dynamic;
+
+import com.timvisee.dungeonmaze.util.StringUtils;
+import org.bukkit.command.CommandSender;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@SuppressWarnings("UnusedDeclaration")
+public class CommandDescription {
+
+    /** Defines the acceptable labels. */
+    private List<String> labels = new ArrayList<>();
+    /** Command description. */
+    private String description = "";
+    /** Detailed description. */
+    private String detailedDescription = "";
+    /** The executable command instance. */
+    private ExecutableCommand executableCommand;
+    /** The parent command. */
+    private CommandDescription parent = null;
+    /** The child labels. */
+    private List<CommandDescription> childs = new ArrayList<>();
+    /** The command arguments. */
+    private List<CommandArgumentDescription> arguments = new ArrayList<>();
+    /** Defines whether there is an argument maximum or not. */
+    private boolean noArgumentMaximum = false;
+    /** Defines the command permissions. */
+    private CommandPermissions permissions = new CommandPermissions();
+
+    /**
+     * Constructor.
+     *
+     * @param executableCommand The executable command, or null.
+     * @param label Command label.
+     * @param description Command description.
+     * @param detailedDescription Detailed comment description.
+     * @param parent Parent command.
+     */
+    public CommandDescription(ExecutableCommand executableCommand, String label, String description, String detailedDescription, CommandDescription parent) {
+        this(executableCommand, label, description, parent, detailedDescription, null);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param executableCommand The executable command, or null.
+     * @param labels List of command labels.
+     * @param description Command description.
+     * @param detailedDescription Detailed comment description.
+     * @param parent Parent command.
+     */
+    public CommandDescription(ExecutableCommand executableCommand, List<String> labels, String description, String detailedDescription, CommandDescription parent) {
+        this(executableCommand, labels, description, detailedDescription, parent, null);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param executableCommand The executable command, or null.
+     * @param label Command label.
+     * @param description Command description.
+     * @param parent Parent command.
+     * @param detailedDescription Detailed comment description.
+     * @param arguments Command arguments.
+     */
+    public CommandDescription(ExecutableCommand executableCommand, String label, String description, CommandDescription parent, String detailedDescription, List<CommandArgumentDescription> arguments) {
+        setExecutableCommand(executableCommand);
+        setLabel(label);
+        setDescription(description);
+        setDetailedDescription(detailedDescription);
+        setParent(parent);
+        setArguments(arguments);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param executableCommand The executable command, or null.
+     * @param labels List of command labels.
+     * @param description Command description.
+     * @param detailedDescription Detailed comment description.
+     * @param parent Parent command.
+     * @param arguments Command arguments.
+     */
+    public CommandDescription(ExecutableCommand executableCommand, List<String> labels, String description, String detailedDescription, CommandDescription parent, List<CommandArgumentDescription> arguments) {
+        setExecutableCommand(executableCommand);
+        setLabels(labels);
+        setDescription(description);
+        setDetailedDescription(detailedDescription);
+        setParent(parent);
+        setArguments(arguments);
+    }
+
+    /**
+     * Get the first relative command label.
+     *
+     * @return First relative command label.
+     */
+    public String getLabel() {
+        // Ensure there's any item in the command list
+        if(this.labels.size() == 0)
+            return "";
+
+        // Return the first command on the list
+        return this.labels.get(0);
+    }
+
+    /**
+     * Get the label most similar to the reference. The first label will be returned if no reference was supplied.
+     *
+     * @param reference The command reference.
+     *
+     * @return The most similar label, or the first label. An empty label will be returned if no label was set.
+     */
+    public String getLabel(CommandParts reference) {
+        // Ensure there's any item in the command list
+        if(this.labels.size() == 0)
+            return "";
+
+        // Return the first label if we can't use the reference
+        if(reference == null)
+            return this.labels.get(0);
+
+        // Get the correct label from the reference
+        String preferred = reference.get(getParentCount());
+
+        // Check whether the preferred label is in the label list
+        double currentDifference = -1;
+        String currentLabel = this.labels.get(0);
+        for(String entry : this.labels) {
+            double entryDifference = StringUtils.getDifference(entry, preferred);
+            if(entryDifference < currentDifference || currentDifference < 0) {
+                currentDifference = entryDifference;
+                currentLabel = entry;
+            }
+        }
+
+        // Return the most similar label
+        return currentLabel;
+    }
+
+    /**
+     * Get all relative command labels.
+     *
+     * @return All relative labels labels.
+     */
+    public List<String> getLabels() {
+        return this.labels;
+    }
+
+    /**
+     * Set the list of command labels.
+     *
+     * @param labels New list of command labels. Null to clear the list of labels.
+     */
+    public void setLabels(List<String> labels) {
+        // Check whether the command label list should be cleared
+        if(labels == null)
+            this.labels.clear();
+
+        else
+            this.labels = labels;
+    }
+
+    /**
+     * Set the command label, this will append the command label to already existing ones.
+     *
+     * @param commandLabel Command label to set or add.
+     */
+    public void setLabel(String commandLabel) {
+        setLabel(commandLabel, false);
+    }
+
+    /**
+     * Set the command label.
+     *
+     * @param commandLabel Command label to set.
+     * @param overwrite True to replace all old command labels, false to append this command label to the currently
+     *                  existing labels.
+     *
+     * @return Trie if the command label is added, or if it was added already. False on failure.
+     */
+    public boolean setLabel(String commandLabel, boolean overwrite) {
+        // Check whether this new command should overwrite the previous ones
+        if(!overwrite)
+            return addLabel(commandLabel);
+
+        // Replace all labels with this new one
+        this.labels.clear();
+        return this.labels.add(commandLabel);
+    }
+
+    /**
+     * Add a command label to the list.
+     *
+     * @param commandLabel Command label to add.
+     *
+     * @return True if the label was added, or if it was added already. False on error.
+     */
+    public boolean addLabel(String commandLabel) {
+        // Verify the label
+        if(!isValidLabel(commandLabel))
+            return false;
+
+        // Ensure this command isn't a duplicate
+        if(hasLabel(commandLabel))
+            return true;
+
+        // Add the command to the list
+        return this.labels.add(commandLabel);
+    }
+
+    /**
+     * Add a list of command labels.
+     *
+     * @param commandLabels List of command labels to add.
+     *
+     * @return True if succeed, false on failure.
+     */
+    public boolean addLabels(List<String> commandLabels) {
+        // Add each command label separately
+        for(String cmd : commandLabels)
+            if(!addLabel(cmd))
+                return false;
+        return true;
+    }
+
+    /**
+     * Check whether this command description has a specific command.
+     *
+     * @param commandLabel Command to check for.
+     *
+     * @return True if this command label equals to the param command.
+     */
+    public boolean hasLabel(String commandLabel) {
+        // Check whether any command matches with the argument
+        for(String entry : this.labels)
+            if(commandLabelEquals(entry, commandLabel))
+                return true;
+
+        // No match found, return false
+        return false;
+    }
+
+    /**
+     * Check whether this command description has a list of labels
+     * @param commandLabels List of labels
+     * @return True if all labels match, false otherwise
+     */
+    public boolean hasLabels(List<String> commandLabels) {
+        // Check if there's a match for every command
+        for(String cmd : commandLabels)
+            if(!hasLabel(cmd))
+                return false;
+
+        // There seems to be a match for every command, return true
+        return true;
+    }
+
+    /**
+     * Check whether this command label is applicable with a command reference. This doesn't check if the parent
+     * are suitable too.
+     *
+     * @param commandReference The command reference.
+     *
+     * @return True if the command reference is suitable to this command label, false otherwise.
+     */
+    public boolean isSuitableLabel(CommandParts commandReference) {
+        // Make sure the command reference is valid
+        if(commandReference.getCount() <= 0)
+            return false;
+
+        // Get the parent count
+        String element = commandReference.get(getParentCount());
+
+        // Check whether this command description has this command label
+        return hasLabel(element);
+    }
+
+    /**
+     * Check whether a label is valid to use.
+     *
+     * @param label The label to test.
+     *
+     * @return True if the label is valid to use, false otherwise.
+     */
+    public static boolean isValidLabel(String label) {
+        // Make sure the label isn't null
+        if(label == null)
+            return false;
+
+        // Trim the label
+        label = label.trim();
+
+        // Make sure the label is at least one character long
+        if(label.length() <= 0)
+            return false;
+
+        // Make sure the label doesn't contain any spaces, return the result
+        return !label.contains(" ");
+    }
+
+    /**
+     * Get the absolute command label, without a slash.
+     */
+    public String getAbsoluteLabel() {
+        return getAbsoluteLabel(false);
+    }
+
+    /**
+     * Get the absolute command label.
+     *
+     * @return Absolute command label.
+     */
+    public String getAbsoluteLabel(boolean includeSlash) {
+        return getAbsoluteLabel(includeSlash, null);
+    }
+
+    /**
+     * Get the absolute command label.
+     *
+     * @return Absolute command label.
+     */
+    public String getAbsoluteLabel(boolean includeSlash, CommandParts reference) {
+        // Get the command reference, and make sure it is valid
+        CommandParts out = getCommandReference(reference);
+        if(out == null)
+            return "";
+
+        // Return the result
+        return (includeSlash ? "/" : "") + out.toString();
+    }
+
+    /**
+     * Get the command reference.
+     *
+     * @param reference The reference to use as template, which is used to choose the most similar reference.
+     *
+     * @return Command reference.
+     */
+    public CommandParts getCommandReference(CommandParts reference) {
+        // Build the reference
+        List<String> referenceList = new ArrayList<>();
+
+        // Check whether this command has a parent, if so, add the absolute parent command
+        if(getParent() != null)
+            referenceList.addAll(getParent().getCommandReference(reference).getList());
+
+        // Get the current label
+        referenceList.add(getLabel(reference));
+
+        // Return the reference
+        return new CommandParts(referenceList);
+    }
+
+    /**
+     * Get the difference between this command and another command reference.
+     *
+     * @param other The other command reference.
+     *
+     * @return The command difference. Zero if there's no difference. A negative number on error.
+     */
+    public double getCommandDifference(CommandParts other) {
+        return getCommandDifference(other, false);
+    }
+
+    /**
+     * Get the difference between this command and another command reference.
+     *
+     * @param other The other command reference.
+     * @param fullCompare True to fully compare both command references.
+     *
+     * @return The command difference. Zero if there's no difference. A negative number on error.
+     */
+    public double getCommandDifference(CommandParts other, boolean fullCompare) {
+        // Make sure the reference is valid
+        if(other == null)
+            return -1;
+
+        // Get the command reference
+        CommandParts reference = getCommandReference(other);
+
+        // Compare the two references, return the result
+        return reference.getDifference(new CommandParts(other.getRange(0, reference.getCount())), fullCompare);
+    }
+
+    /**
+     * Get the executable command.
+     *
+     * @return The executable command.
+     */
+    public ExecutableCommand getExecutableCommand() {
+        return this.executableCommand;
+    }
+
+    /**
+     * Set the executable command.
+     *
+     * @param executableCommand The executable command.
+     */
+    public void setExecutableCommand(ExecutableCommand executableCommand) {
+        this.executableCommand = executableCommand;
+    }
+
+    /**
+     * Check whether this command is executable, based on the assigned executable command.
+     *
+     * @return True if this command is executable.
+     */
+    public boolean isExecutable() {
+        return this.executableCommand != null;
+    }
+
+    /**
+     * Execute the command, if possible.
+     *
+     * @param sender The command sender that triggered the execution of this command.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True on success, false on failure.
+     */
+    public boolean execute(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Make sure the command is executable
+        if(!isExecutable())
+            return false;
+
+        // Execute the command, return the result
+        return getExecutableCommand().executeCommand(sender, commandReference, commandArguments);
+    }
+
+    /**
+     * Get the parent command if this command description has a parent.
+     *
+     * @return Parent command, or null
+     */
+    public CommandDescription getParent() {
+        return this.parent;
+    }
+
+    /**
+     * Get the number of parent this description has.
+     *
+     * @return The number of parents.
+     */
+    public int getParentCount() {
+        // Check whether the this description has a parent
+        if(!hasParent())
+            return 0;
+
+        // Get the parent count of the parent, return the result
+        return getParent().getParentCount() + 1;
+    }
+
+    /**
+     * Set the parent command.
+     *
+     * @param parent Parent command.
+     *
+     * @return True on success, false on failure.
+     */
+    public boolean setParent(CommandDescription parent) {
+        // Make sure the parent is different
+        if(this.parent == parent)
+            return true;
+
+        // Set the parent
+        this.parent = parent;
+
+        // Make sure the parent isn't null
+        if(parent == null)
+            return true;
+
+        // Add this description as a child to the parent
+        return parent.addChild(this);
+    }
+
+    /**
+     * Check whether the plugin description has a parent command.
+     *
+     * @return True if the description has a parent command, false otherwise.
+     */
+    public boolean hasParent() {
+        return this.parent != null;
+    }
+
+    /**
+     * Get all command childs.
+     *
+     * @return Command childs.
+     */
+    public List<CommandDescription> getChilds() {
+        return this.childs;
+    }
+
+    /**
+     * Add a child to the command description.
+     *
+     * @param commandDescription The child to add.
+     *
+     * @return True on success, false on failure.
+     */
+    public boolean addChild(CommandDescription commandDescription) {
+        // Make sure the description is valid
+        if(commandDescription == null)
+            return false;
+        if(!commandDescription.isValid())
+            return false;
+
+        // Make sure the child doesn't exist already
+        if(isChild(commandDescription))
+            return true;
+
+        // The command description to add as a child
+        if(!this.childs.add(commandDescription))
+            return false;
+
+        // Set this description as parent on the child
+        return commandDescription.setParent(this);
+    }
+
+    /**
+     * Set the childs of this command.
+     *
+     * @param childs New command childs. Null to remove all childs.
+     */
+    public void setChilds(List<CommandDescription> childs) {
+        // Check whether the childs list should be cleared
+        if(childs == null)
+            this.childs.clear();
+
+        else
+            this.childs = childs;
+    }
+
+    /**
+     * Check whether this command has any child labels.
+     *
+     * @return True if this command has any child labels.
+     */
+    public boolean hasChilds() {
+        return (this.childs.size() != 0);
+    }
+
+    /**
+     * Check if this command description has a specific child.
+     *
+     * @param commandDescription The command description to check for.
+     *
+     * @return True if this command description has the specific child, false otherwise.
+     */
+    public boolean isChild(CommandDescription commandDescription) {
+        // Make sure the description is valid
+        if(commandDescription == null)
+            return false;
+        if(!commandDescription.isValid())
+            return false;
+
+        // Check whether this child exists, return the result
+        return this.childs.contains(commandDescription);
+    }
+
+    /**
+     * Add an argument.
+     *
+     * @param argument The argument to add.
+     *
+     * @return True if succeed, false if failed.
+     */
+    public boolean addArgument(CommandArgumentDescription argument) {
+        // Make sure the argument is valid
+        if(argument == null)
+            return false;
+
+        // Make sure the argument isn't added already
+        if(hasArgument(argument))
+            return true;
+
+        // Add the argument, return the result
+        return this.arguments.add(argument);
+    }
+
+    /**
+     * Get all command arguments.
+     *
+     * @return Command arguments.
+     */
+    public List<CommandArgumentDescription> getArguments() {
+        return this.arguments;
+    }
+
+    /**
+     * Set the arguments of this command.
+     *
+     * @param arguments New command arguments. Null to clear the list of arguments.
+     */
+    public void setArguments(List<CommandArgumentDescription> arguments) {
+        // Convert null into an empty argument list
+        if(arguments == null)
+            this.arguments.clear();
+
+        else
+            this.arguments = arguments;
+    }
+
+    /**
+     * Check whether an argument exists.
+     *
+     * @param argument The argument to check for.
+     *
+     * @return True if this argument already exists, false otherwise.
+     */
+    public boolean hasArgument(CommandArgumentDescription argument) {
+        // Make sure the argument is valid
+        if(argument == null)
+            return false;
+
+        // Check whether the argument exists, return the result
+        return this.arguments.contains(argument);
+    }
+
+    /**
+     * Check whether this command has any arguments.
+     *
+     * @return True if this command has any arguments.
+     */
+    public boolean hasArguments() {
+        return (this.arguments.size() != 0);
+    }
+
+    /**
+     * The minimum number of arguments required for this command.
+     *
+     * @return The minimum number of required arguments.
+     */
+    public int getMinimumArguments() {
+        // Get the number of required and optional arguments
+        int requiredArguments = 0;
+        int optionalArgument = 0;
+
+        // Loop through each argument
+        for(CommandArgumentDescription argument : this.arguments) {
+            // Check whether the command is optional
+            if(!argument.isOptional()) {
+                requiredArguments += optionalArgument + 1;
+                optionalArgument = 0;
+
+            } else
+                optionalArgument++;
+        }
+
+        // Return the number of required arguments
+        return requiredArguments;
+    }
+
+    /**
+     * Get the maximum number of arguments.
+     *
+     * @return The maximum number of arguments. A negative number will be returned if there's no maximum.
+     */
+    public int getMaximumArguments() {
+        // Check whether there is a maximum set
+        if(this.noArgumentMaximum)
+            return -1;
+
+        // Return the maximum based on the registered arguments
+        return this.arguments.size();
+    }
+
+    /**
+     * Set whether there is an argument maximum.
+     *
+     * @param maximumArguments True if there is an argument maximum, based on the number of registered arguments.
+     */
+    public void setMaximumArguments(boolean maximumArguments) {
+        this.noArgumentMaximum = !maximumArguments;
+    }
+
+    /**
+     * Get the command description.
+     *
+     * @return Command description.
+     */
+    public String getDescription() {
+        return hasDescription() ? this.description : this.detailedDescription;
+    }
+
+    /**
+     * Set the command description.
+     *
+     * @param description New command description. Null to reset the description.
+     */
+    public void setDescription(String description) {
+        if(description == null)
+            this.description = "";
+
+        else
+            this.description = description;
+    }
+
+    /**
+     * Check whether this command has any description.
+     *
+     * @return True if this command has any description.
+     */
+    public boolean hasDescription() {
+        return (this.description.trim().length() != 0);
+    }
+
+    /**
+     * Get the command detailed description.
+     *
+     * @return Command detailed description.
+     */
+    public String getDetailedDescription() {
+        return hasDetailedDescription() ? this.detailedDescription : this.description;
+    }
+
+    /**
+     * Set the command detailed description.
+     *
+     * @param detailedDescription New command description. Null to reset the description.
+     */
+    public void setDetailedDescription(String detailedDescription) {
+        if(detailedDescription == null)
+            this.detailedDescription = "";
+
+        else
+            this.detailedDescription = detailedDescription;
+    }
+
+    /**
+     * Check whether this command has any detailed description.
+     *
+     * @return True if this command has any detailed description.
+     */
+    public boolean hasDetailedDescription() {
+        return (this.detailedDescription.trim().length() != 0);
+    }
+
+    /**
+     * Find the best suitable command for a query reference.
+     *
+     * @param queryReference The query reference to find a command for.
+     *
+     * @return The command found, or null.
+     */
+    public FoundCommandResult findCommand(final CommandParts queryReference) {
+        // Make sure the command reference is valid
+        if(queryReference.getCount() <= 0)
+            return null;
+
+        // Check whether this description is for the last element in the command reference, if so return the current command
+        if(queryReference.getCount() <= getParentCount() + 1)
+            return new FoundCommandResult(
+                    this,
+                    getCommandReference(queryReference),
+                    new CommandParts(),
+                    queryReference);
+
+        // Get the new command reference and arguments
+        CommandParts newReference = new CommandParts(queryReference.getRange(0, getParentCount() + 1));
+        CommandParts newArguments = new CommandParts(queryReference.getRange(getParentCount() + 1));
+
+        // Handle the child's, if this command has any
+        if(getChilds().size() > 0) {
+            // Get a new instance of the child's list, and sort them by their difference in comparison to the query reference
+            List<CommandDescription> commandChilds = new ArrayList<>(getChilds());
+            Collections.sort(commandChilds, (o1, o2) -> Double.compare(
+                    o1.getCommandDifference(queryReference),
+                    o2.getCommandDifference(queryReference)));
+
+            // Get the difference of the first child in the list
+            double firstChildDifference = commandChilds.get(0).getCommandDifference(queryReference, true);
+
+            // Check if the reference perfectly suits the arguments of the current command if it doesn't perfectly suits a child command
+            if(firstChildDifference > 0.0)
+                if(getSuitableArgumentsDifference(queryReference) == 0)
+                    return new FoundCommandResult(this, newReference, newArguments, queryReference);
+
+            // Loop through each child
+            for(CommandDescription child : commandChilds) {
+                // Get the best suitable command
+                FoundCommandResult result = child.findCommand(queryReference);
+                if(result != null)
+                    return result;
+            }
+        }
+
+        // Check if the remaining command reference elements fit the arguments for this command
+        if(getSuitableArgumentsDifference(queryReference) >= 0)
+            return new FoundCommandResult(this, newReference, newArguments, queryReference);
+
+        // No command found, return null
+        return null;
+    }
+
+    /**
+     * Check whether there's any command description that matches the specified command reference.
+     *
+     * @param commandReference The command reference.
+     *
+     * @return True if so, false otherwise.
+     */
+    public boolean hasSuitableCommand(CommandParts commandReference) {
+        return findCommand(commandReference) != null;
+    }
+
+    /**
+     * Check if the remaining command reference elements are suitable with arguments of the current command description.
+     *
+     * @param commandReference The command reference.
+     *
+     * @return True if the arguments are suitable, false otherwise.
+     */
+    public boolean hasSuitableArguments(CommandParts commandReference) {
+        return getSuitableArgumentsDifference(commandReference) == 0;
+    }
+
+    /**
+     * Check if the remaining command reference elements are suitable with arguments of the current command description,
+     * and get the difference in argument count.
+     *
+     * @param commandReference The command reference.
+     *
+     * @return The difference in argument count between the reference and the actual command.
+     */
+    public int getSuitableArgumentsDifference(CommandParts commandReference) {
+        // Make sure the command reference is valid
+        if(commandReference.getCount() <= 0)
+            return -1;
+
+        // Get the remaining command reference element count
+        int remainingElementCount = commandReference.getCount() - getParentCount() - 1;
+
+        // Check if there are too less arguments
+        if(getMinimumArguments() > remainingElementCount)
+            return Math.abs(getMinimumArguments() - remainingElementCount);
+
+        // Check if there are too many arguments
+        if(getMaximumArguments() < remainingElementCount && getMaximumArguments() >= 0)
+            return Math.abs(remainingElementCount - getMaximumArguments());
+
+        // The arguments seem to be EQUALS, return the result
+        return 0;
+    }
+
+    /**
+     * Get the command permissions.
+     *
+     * @return The command permissions.
+     */
+    public CommandPermissions getCommandPermissions() {
+        return this.permissions;
+    }
+
+    /**
+     * Set the command permissions.
+     *
+     * @param commandPermissions The command permissions.
+     */
+    public void setCommandPermissions(CommandPermissions commandPermissions) {
+        this.permissions = commandPermissions;
+    }
+
+    /**
+     * Set the command permissions.
+     *
+     * @param permissionNode The permission node required.
+     * @param defaultPermission The default permission.
+     */
+    public void setCommandPermissions(String permissionNode, CommandPermissions.DefaultPermission defaultPermission) {
+        this.permissions = new CommandPermissions(permissionNode, defaultPermission);
+    }
+
+    /**
+     * Check whether two labels equal to each other.
+     *
+     * @param commandLabel The first command label.
+     * @param otherCommandLabel The other command label.
+     *
+     * @return True if the labels are equal to each other.
+     */
+    private static boolean commandLabelEquals(String commandLabel, String otherCommandLabel) {
+        // Trim the command labels from unwanted whitespaces
+        commandLabel = commandLabel.trim();
+        otherCommandLabel = otherCommandLabel.trim();
+
+        // Check whether the the two command labels are equal (case insensitive)
+        return (commandLabel.equalsIgnoreCase(otherCommandLabel));
+    }
+
+    /**
+     * Check whether the command description has been set up properly.
+     *
+     * @return True if the command description is valid, false otherwise.
+     */
+    public boolean isValid() {
+        // Make sure any command label is set
+        if(getLabels().size() == 0)
+            return false;
+
+        // Make sure the permissions are set up properly
+        if(this.permissions == null)
+            return false;
+
+        // Everything seems to be correct, return the result
+        return true;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/CommandHandler.java b/src/main/java/fr/xephi/authme/commands/dynamic/CommandHandler.java
new file mode 100644
index 00000000..e3a5808c
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/CommandHandler.java
@@ -0,0 +1,205 @@
+package fr.xephi.authme.commands.dynamic;
+
+import com.timvisee.dungeonmaze.command.help.HelpProvider;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class CommandHandler {
+
+    /** The command manager instance. */
+    private CommandManager commandManager;
+
+    /**
+     * Constructor.
+     *
+     * @param init True to immediately initialize.
+     */
+    public CommandHandler(boolean init) {
+        // Initialize
+        if(init)
+            init();
+    }
+
+    /**
+     * Initialize the command handler.
+     *
+     * @return True if succeed, false on failure. True will also be returned if the command handler was already
+     * initialized.
+     */
+    public boolean init() {
+        // Make sure the handler isn't initialized already
+        if(isInit())
+            return true;
+
+        // Initialize the command manager
+        this.commandManager = new CommandManager(false);
+        this.commandManager.registerCommands();
+
+        // Return the result
+        return true;
+    }
+
+    /**
+     * Check whether the command handler is initialized.
+     *
+     * @return True if the command handler is initialized.
+     */
+    public boolean isInit() {
+        return this.commandManager != null;
+    }
+
+    /**
+     * Destroy the command handler.
+     *
+     * @return True if the command handler was destroyed successfully, false otherwise. True will also be returned if
+     * the command handler wasn't initialized.
+     */
+    public boolean destroy() {
+        // Make sure the command handler is initialized
+        if(!isInit())
+            return true;
+
+        // Unset the command manager
+        this.commandManager = null;
+        return true;
+    }
+
+    /**
+     * Get the command manager.
+     *
+     * @return Command manager instance.
+     */
+    public CommandManager getCommandManager() {
+        return this.commandManager;
+    }
+
+    /**
+     * Process a command.
+     *
+     * @param sender The command sender (Bukkit).
+     * @param bukkitCommand The command (Bukkit).
+     * @param bukkitCommandLabel The command label (Bukkit).
+     * @param bukkitArgs The command arguments (Bukkit).
+     *
+     * @return True if the command was executed, false otherwise.
+     */
+    public boolean onCommand(CommandSender sender, @SuppressWarnings("UnusedParameters") org.bukkit.command.Command bukkitCommand, String bukkitCommandLabel, String[] bukkitArgs) {
+        // Process the arguments
+        List<String> args = processArguments(bukkitArgs);
+
+        // Create a command reference, and make sure at least one command part is available
+        CommandParts commandReference = new CommandParts(bukkitCommandLabel, args);
+        if(commandReference.getCount() == 0)
+            return false;
+
+        // Get a suitable command for this reference, and make sure it isn't null
+        FoundCommandResult result = this.commandManager.findCommand(commandReference);
+        if(result == null) {
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to parse Dungeon Maze command!");
+            return false;
+        }
+
+        // Get the base command
+        String baseCommand = commandReference.get(0);
+
+        // Make sure the difference between the command reference and the actual command isn't too big
+        final double commandDifference = result.getDifference();
+        if(commandDifference > 0.12) {
+            // Show the unknown command warning
+            sender.sendMessage(ChatColor.DARK_RED + "Unknown command!");
+
+            // Show a command suggestion if available and the difference isn't too big
+            if(commandDifference < 0.75)
+                if(result.getCommandDescription() != null)
+                    sender.sendMessage(ChatColor.YELLOW + "Did you mean " + ChatColor.GOLD + "/" + result.getCommandDescription().getCommandReference(commandReference) + ChatColor.YELLOW + "?");
+
+            // Show the help command
+            sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/" + baseCommand + " help" + ChatColor.YELLOW + " to view help.");
+            return true;
+        }
+
+        // Show a message when the command handler is assuming a command
+        if(commandDifference > 0) {
+            // Get the suggested command
+            CommandParts suggestedCommandParts = new CommandParts(result.getCommandDescription().getCommandReference(commandReference));
+
+            // Show the suggested command
+            sender.sendMessage(ChatColor.DARK_RED + "Unknown command, assuming " + ChatColor.GOLD + "/" + suggestedCommandParts +
+                    ChatColor.DARK_RED + "!");
+        }
+
+        // Make sure the command is executable
+        if(!result.isExecutable()) {
+            // Get the command reference
+            CommandParts helpCommandReference = new CommandParts(result.getCommandReference().getRange(1));
+
+            // Show the unknown command warning
+            sender.sendMessage(ChatColor.DARK_RED + "Invalid command!");
+
+            // Show the help command
+            sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/" + baseCommand + " help " + helpCommandReference + ChatColor.YELLOW + " to view help.");
+            return true;
+        }
+
+        // Make sure the command sender has permission
+        if(!result.hasPermission(sender)) {
+            // Show the no permissions warning
+            sender.sendMessage(ChatColor.DARK_RED + "You don't have permission to use this command!");
+            return true;
+        }
+
+        // Make sure the command sender has permission
+        if(!result.hasProperArguments()) {
+            // Get the command and the suggested command reference
+            CommandParts suggestedCommandReference = new CommandParts(result.getCommandDescription().getCommandReference(commandReference));
+            CommandParts helpCommandReference = new CommandParts(suggestedCommandReference.getRange(1));
+
+            // Show the invalid arguments warning
+            sender.sendMessage(ChatColor.DARK_RED + "Incorrect command arguments!");
+
+            // Show the command argument help
+            HelpProvider.showHelp(sender, commandReference, suggestedCommandReference, true, false, true, false, false, false);
+
+            // Show the command to use for detailed help
+            sender.sendMessage(ChatColor.GOLD + "Detailed help: " + ChatColor.WHITE + "/" + baseCommand + " help " + helpCommandReference);
+            return true;
+        }
+
+        // Execute the command if it's suitable
+        return result.executeCommand(sender);
+    }
+
+    /**
+     * Process the command arguments, and return them as an array list.
+     *
+     * @param args The command arguments to process.
+     *
+     * @return The processed command arguments.
+     */
+    private List<String> processArguments(String[] args) {
+        // Convert the array into a list of arguments
+        List<String> arguments = new ArrayList<>(Arrays.asList(args));
+
+        /// Remove all empty arguments
+        for(int i = 0; i < arguments.size(); i++) {
+            // Get the argument value
+            final String arg = arguments.get(i);
+
+            // Check whether the argument value is empty
+            if(arg.trim().length() == 0) {
+                // Remove the current argument
+                arguments.remove(i);
+
+                // Decrease the index by one, continue to the next argument
+                i--;
+            }
+        }
+
+        // Return the argument
+        return arguments;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/CommandHandlerService.java b/src/main/java/fr/xephi/authme/commands/dynamic/CommandHandlerService.java
new file mode 100644
index 00000000..7cd4dd11
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/CommandHandlerService.java
@@ -0,0 +1,90 @@
+package fr.xephi.authme.commands.dynamic;
+
+import com.timvisee.dungeonmaze.service.Service;
+
+public class CommandHandlerService extends Service {
+
+    /** Service name. */
+    private static final String SERVICE_NAME = "Command Handler";
+
+    /** Command handler instance. */
+    private CommandHandler commandHandler;
+
+    /**
+     * Initialize the service.
+     *
+     * @return True on success, false on failure. True will also be returned if the service was initialized already.
+     */
+    @Override
+    public boolean init() {
+        // Initialize the command handler
+        this.commandHandler = new CommandHandler(false);
+
+        // Initialize the command handler, return the result
+        return this.commandHandler.init();
+    }
+
+    /**
+     * Check whether the service is initialized.
+     *
+     * @return True if the service is initialized, false otherwise.
+     */
+    @Override
+    public boolean isInit() {
+        // Make sure the command handler is set
+        if(this.commandHandler == null)
+            return false;
+
+        // Check whether the command handler is initialized
+        return this.commandHandler.isInit();
+    }
+
+    /**
+     * Destroy the service. The destruction won't be forced.
+     *
+     * @param force True to force the destruction. This wil re-destroy the service even if it isn't initialized.
+     *              This will also force the initialization state to be set to false even if an error occurred while
+     *              destroying.
+     *
+     * @return True on success, false on failure. True will also be returned if the service wasn't initialized. False
+     * might be returned if force is set to true, even though the initialization state is set to false.
+     */
+    @Override
+    public boolean destroy(boolean force) {
+        // Make sure the command handler is initialized
+        if(!this.isInit() && !force)
+            return true;
+
+        // Destroy the command handler
+        if(this.commandHandler != null) {
+            if(!this.commandHandler.destroy()) {
+                if(force)
+                    this.commandHandler = null;
+                return false;
+            }
+        }
+
+        // Return the result
+        this.commandHandler = null;
+        return true;
+    }
+
+    /**
+     * Get the name of the service.
+     *
+     * @return Service name.
+     */
+    @Override
+    public String getName() {
+        return SERVICE_NAME;
+    }
+
+    /**
+     * Get the command handler.
+     *
+     * @return Command handler instance.
+     */
+    public CommandHandler getCommandHandler() {
+        return this.commandHandler;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/CommandManager.java b/src/main/java/fr/xephi/authme/commands/dynamic/CommandManager.java
new file mode 100644
index 00000000..ce14a7b0
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/CommandManager.java
@@ -0,0 +1,288 @@
+package fr.xephi.authme.commands.dynamic;
+
+import com.timvisee.dungeonmaze.command.executable.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@SuppressWarnings("UnusedDeclaration")
+public class CommandManager {
+
+    /** The list of commandDescriptions. */
+    private List<CommandDescription> commandDescriptions = new ArrayList<>();
+
+    /**
+     * Constructor.
+     *
+     * @param registerCommands True to register the commands, false otherwise.
+     */
+    public CommandManager(boolean registerCommands) {
+        // Register the commands
+        if(registerCommands)
+            registerCommands();
+    }
+
+    /**
+     * Register all commands.
+     */
+    @SuppressWarnings("SpellCheckingInspection")
+    public void registerCommands() {
+        // Register the base Dungeon Maze command
+        CommandDescription dungeonMazeCommand = new CommandDescription(
+                new DungeonMazeCommand(),
+                new ArrayList<String>() {{
+                    add("dungeonmaze");
+                    add("dm");
+                }},
+                "Main command",
+                "The main Dungeon Maze command. The root for all the other commands.", null);
+
+        // Register the help command
+        CommandDescription helpCommand = new CommandDescription(
+                new HelpCommand(),
+                new ArrayList<String>() {{
+                    add("help");
+                    add("hlp");
+                    add("h");
+                    add("sos");
+                    add("?");
+                }},
+                "View help",
+                "View detailed help pages about Dungeon Maze commands.",
+                dungeonMazeCommand);
+        helpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
+        helpCommand.setMaximumArguments(false);
+
+        // Register the create command
+        CommandDescription createWorldCommand = new CommandDescription(
+                new CreateWorldCommand(),
+                new ArrayList<String>() {{
+                    add("createworld");
+                    add("cw");
+                }},
+                "Create world",
+                "Create a new Dungeon Maze world, the name of the world must be unique.",
+                dungeonMazeCommand);
+        createWorldCommand.addArgument(new CommandArgumentDescription("world", "The name of the world to create.", false));
+        createWorldCommand.addArgument(new CommandArgumentDescription("preload", "True or False to preload the world on startup.", true));
+        createWorldCommand.setCommandPermissions("dungeonmaze.command.createworld", CommandPermissions.DefaultPermission.OP_ONLY);
+
+        // Register the teleport command
+        CommandDescription teleportCommand = new CommandDescription(
+                new TeleportCommand(),
+                new ArrayList<String>() {{
+                    add("teleport");
+                    add("tp");
+                    add("warp");
+                    add("goto");
+                    add("move");
+                }},
+                "Teleport to world",
+                "Teleports to any another world, such as a Dungeon Maze world." ,
+                dungeonMazeCommand);
+        teleportCommand.addArgument(new CommandArgumentDescription("world", "The name of the world to teleport to.", false));
+        teleportCommand.setCommandPermissions("dungeonmaze.command.teleport", CommandPermissions.DefaultPermission.OP_ONLY);
+
+        // Register the load world command
+        CommandDescription loadWorldCommand = new CommandDescription(
+                new LoadWorldCommand(),
+                new ArrayList<String>() {{
+                    add("loadworld");
+                    add("load");
+                }},
+                "Load a world",
+                "Load a world if it isn't loaded." ,
+                dungeonMazeCommand);
+        loadWorldCommand.addArgument(new CommandArgumentDescription("world", "The name of the world to load.", false));
+        loadWorldCommand.setCommandPermissions("dungeonmaze.command.loadworld", CommandPermissions.DefaultPermission.OP_ONLY);
+
+        // Register the unload world command
+        CommandDescription unloadWorldCommand = new CommandDescription(
+                new UnloadWorldCommand(),
+                new ArrayList<String>() {{
+                    add("unloadworld");
+                    add("unload");
+                }},
+                "Unload a world",
+                "Unload a loaded world." ,
+                dungeonMazeCommand);
+        unloadWorldCommand.addArgument(new CommandArgumentDescription("world", "The name of the world to unload.", false));
+        unloadWorldCommand.setCommandPermissions("dungeonmaze.command.unloadworld", CommandPermissions.DefaultPermission.OP_ONLY);
+
+        // Register the list world command
+        CommandDescription listWorldCommand = new CommandDescription(
+                new ListWorldCommand(),
+                new ArrayList<String>() {{
+                    add("listworlds");
+                    add("listworld");
+                    add("list");
+                    add("worlds");
+                    add("lw");
+                }},
+                "List Dungeon Mazes",
+                "Lists the available Dungeon Maze worlds and shows some additional information.",
+                dungeonMazeCommand);
+        listWorldCommand.setCommandPermissions("dungeonmaze.command.listworlds", CommandPermissions.DefaultPermission.OP_ONLY);
+
+        // Register the reload command
+        CommandDescription reloadCommand = new CommandDescription(
+                new ReloadCommand(),
+                new ArrayList<String>() {{
+                    add("reload");
+                    add("rld");
+                    add("r");
+                }},
+                "Reload Dungeon Maze",
+                "Reload the Dungeon Maze plugin.",
+                dungeonMazeCommand);
+        reloadCommand.setCommandPermissions("dungeonmaze.command.reload", CommandPermissions.DefaultPermission.OP_ONLY);
+        reloadCommand.addArgument(new CommandArgumentDescription("force", "True or False to force reload.", true));
+
+        // Register the reload permissions command
+        CommandDescription reloadPermissionsCommand = new CommandDescription(
+                new ReloadPermissionsCommand(),
+                new ArrayList<String>() {{
+                    add("reloadpermissions");
+                    add("reloadpermission");
+                    add("reloadperms");
+                    add("rp");
+                }},
+                "Reload permissions",
+                "Reload the permissions system and rehook the installed permissions system.",
+                dungeonMazeCommand);
+        reloadPermissionsCommand.setCommandPermissions("dungeonmaze.command.reloadpermissions", CommandPermissions.DefaultPermission.OP_ONLY);
+
+        // Register the restart command
+        CommandDescription restartCommand = new CommandDescription(
+                new RestartCommand(),
+                new ArrayList<String>() {{
+                    add("restart");
+                    add("rstrt");
+                }},
+                "Restart Dungeon Maze",
+                "Restart the Dungeon Maze plugin.",
+                dungeonMazeCommand);
+        restartCommand.setCommandPermissions("dungeonmaze.command.restart", CommandPermissions.DefaultPermission.OP_ONLY);
+        restartCommand.addArgument(new CommandArgumentDescription("force", "True or False to force restart.", true));
+
+        // Register the check updates command
+        CommandDescription checkUpdatesCommand = new CommandDescription(
+                new CheckUpdatesCommand(),
+                new ArrayList<String>() {{
+                    add("checkupdates");
+                    add("checkupdate");
+                    add("check");
+                    add("updates");
+                    add("update");
+                    add("cu");
+                }},
+                "Check updates",
+                "Check for available updates to install.",
+                dungeonMazeCommand);
+        checkUpdatesCommand.setCommandPermissions("dungeonmaze.command.checkupdates", CommandPermissions.DefaultPermission.OP_ONLY);
+
+        // Register the install update command
+        CommandDescription installUpdateCommand = new CommandDescription(
+                new InstallUpdateCommand(),
+                new ArrayList<String>() {{
+                    add("installupdates");
+                    add("installupdate");
+                    add("install");
+                    add("iu");
+                }},
+                "Install update",
+                "Try to install any availble update.",
+                dungeonMazeCommand);
+        installUpdateCommand.setCommandPermissions("dungeonmaze.command.installupdate", CommandPermissions.DefaultPermission.OP_ONLY);
+
+        // Register the status command
+        CommandDescription statusCommand = new CommandDescription(
+                new StatusCommand(),
+                new ArrayList<String>() {{
+                    add("status");
+                    add("stats");
+                    add("s");
+                }},
+                "Status info",
+                "Show detailed plugin status.",
+                dungeonMazeCommand);
+        statusCommand.setMaximumArguments(false);
+        statusCommand.setCommandPermissions("dungeonmaze.command.status", CommandPermissions.DefaultPermission.OP_ONLY);
+
+        // Register the status command
+        CommandDescription serviceCommand = new CommandDescription(
+                new ServiceCommand(),
+                new ArrayList<String>() {{
+                    add("services");
+                    add("service");
+                    add("serv");
+                }},
+                "Services command",
+                "Show detailed information about all the Dungeon Maze serivces.",
+                dungeonMazeCommand);
+        serviceCommand.setMaximumArguments(false);
+        serviceCommand.setCommandPermissions("dungeonmaze.command.services", CommandPermissions.DefaultPermission.OP_ONLY);
+
+        // Register the version command
+        CommandDescription versionCommand = new CommandDescription(
+                new VersionCommand(),
+                new ArrayList<String>() {{
+                    add("version");
+                    add("ver");
+                    add("v");
+                    add("about");
+                    add("info");
+                }},
+                "Version info",
+                "Show detailed information about the installed Dungeon Maze version, and shows the developers, contributors, license and other information.",
+                dungeonMazeCommand);
+        versionCommand.setMaximumArguments(false);
+
+        // Add the base command to the commands array
+        this.commandDescriptions.add(dungeonMazeCommand);
+    }
+
+    /**
+     * Get the list of command descriptions
+     *
+     * @return List of command descriptions.
+     */
+    public List<CommandDescription> getCommandDescriptions() {
+        return this.commandDescriptions;
+    }
+
+    /**
+     * Get the number of command description count.
+     *
+     * @return Command description count.
+     */
+    public int getCommandDescriptionCount() {
+        return this.getCommandDescriptions().size();
+    }
+
+    /**
+     * Find the best suitable command for the specified reference.
+     *
+     * @param queryReference The query reference to find a command for.
+     *
+     * @return The command found, or null.
+     */
+    public FoundCommandResult findCommand(CommandParts queryReference) {
+        // Make sure the command reference is valid
+        if(queryReference.getCount() <= 0)
+            return null;
+
+        // Get the base command description
+        for(CommandDescription commandDescription : this.commandDescriptions) {
+            // Check whether there's a command description available for the current command
+            if(!commandDescription.isSuitableLabel(queryReference))
+                continue;
+
+            // Find the command reference, return the result
+            return commandDescription.findCommand(queryReference);
+        }
+
+        // No applicable command description found, return false
+        return null;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/CommandParts.java b/src/main/java/fr/xephi/authme/commands/dynamic/CommandParts.java
new file mode 100644
index 00000000..6aca8240
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/CommandParts.java
@@ -0,0 +1,204 @@
+package fr.xephi.authme.commands.dynamic;
+
+import com.timvisee.dungeonmaze.util.ListUtils;
+import com.timvisee.dungeonmaze.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CommandParts {
+
+    /** The list of parts for this command. */
+    private List<String> parts = new ArrayList<>();
+
+    /**
+     * Constructor.
+     */
+    public CommandParts() { }
+
+    /**
+     * Constructor.
+     *
+     * @param part The part to add.
+     */
+    public CommandParts(String part) {
+        this.parts.add(part);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param commandParts The command parts instance.
+     */
+    public CommandParts(CommandParts commandParts) {
+        this.parts.addAll(commandParts.getList());
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param parts The list of parts.
+     */
+    public CommandParts(List<String> parts) {
+        this.parts.addAll(parts);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param base The base part.
+     * @param parts The list of additional parts.
+     */
+    public CommandParts(String base, List<String> parts) {
+        this.parts.add(base);
+        this.parts.addAll(parts);
+    }
+
+    /**
+     * Get the command parts.
+     *
+     * @return Command parts.
+     */
+    public List<String> getList() {
+        return this.parts;
+    }
+
+    /**
+     * Add a part.
+     *
+     * @param part The part to add.
+     *
+     * @return The result.
+     */
+    public boolean add(String part) {
+        return this.parts.add(part);
+    }
+
+    /**
+     * Add some parts.
+     *
+     * @param parts The parts to add.
+     *
+     * @return The result.
+     */
+    public boolean add(List<String> parts) {
+        return this.parts.addAll(parts);
+    }
+
+    /**
+     * Add some parts.
+     *
+     * @param parts The parts to add.
+     *
+     * @return The result.
+     */
+    public boolean add(String[] parts) {
+        for(String entry : parts)
+            add(entry);
+        return true;
+    }
+
+    /**
+     * Get the number of parts.
+     *
+     * @return Part count.
+     */
+    public int getCount() {
+        return this.parts.size();
+    }
+
+    /**
+     * Get a part by it's index.
+     *
+     * @param i Part index.
+     *
+     * @return The part.
+     */
+    public String get(int i) {
+        // Make sure the index is in-bound
+        if(i < 0 || i >= getCount())
+            return null;
+
+        // Get and return the argument
+        return this.parts.get(i);
+    }
+
+    /**
+     * Get a range of the parts starting at the specified index up to the end of the range.
+     *
+     * @param start The starting index.
+     *
+     * @return The parts range. Arguments that were out of bound are not included.
+     */
+    public List<String> getRange(int start) {
+        return getRange(start, getCount() - start);
+    }
+
+    /**
+     * Get a range of the parts.
+     *
+     * @param start The starting index.
+     * @param count The number of parts to get.
+     *
+     * @return The parts range. Parts that were out of bound are not included.
+     */
+    public List<String> getRange(int start, int count) {
+        // Create a new list to put the range into
+        List<String> elements = new ArrayList<>();
+
+        // Get the range
+        for(int i = start; i < start + count; i++) {
+            // Get the part and add it if it's valid
+            String element = get(i);
+            if(element != null)
+                elements.add(element);
+        }
+
+        // Return the list of parts
+        return elements;
+    }
+
+    /**
+     * Get the difference value between two references. This won't do a full compare, just the last reference parts instead.
+     *
+     * @param other The other reference.
+     *
+     * @return The result from zero to above. A negative number will be returned on error.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public double getDifference(CommandParts other) {
+        return getDifference(other, false);
+    }
+
+    /**
+     * Get the difference value between two references.
+     *
+     * @param other The other reference.
+     * @param fullCompare True to compare the full references as far as the range reaches.
+     *
+     * @return The result from zero to above. A negative number will be returned on error.
+     */
+    public double getDifference(CommandParts other, boolean fullCompare) {
+        // Make sure the other reference is correct
+        if(other == null)
+            return -1;
+
+        // Get the range to use
+        int range = Math.min(this.getCount(), other.getCount());
+
+        // Get and the difference
+        if(fullCompare)
+            return StringUtils.getDifference(this.toString(), other.toString());
+        return StringUtils.getDifference(this.getRange(range - 1, 1).toString(), other.getRange(range - 1, 1).toString());
+    }
+
+    /**
+     * Convert the parts to a string.
+     *
+     * @return The part as a string.
+     */
+    @Override
+    public String toString() {
+        return ListUtils.implode(this.parts, " ");
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/CommandPermissions.java b/src/main/java/fr/xephi/authme/commands/dynamic/CommandPermissions.java
new file mode 100644
index 00000000..2d79f056
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/CommandPermissions.java
@@ -0,0 +1,182 @@
+package fr.xephi.authme.commands.dynamic;
+
+import com.timvisee.dungeonmaze.Core;
+import com.timvisee.dungeonmaze.permission.PermissionsManager;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@SuppressWarnings("UnusedDeclaration")
+public class CommandPermissions {
+
+    /** Defines the permission nodes required to have permission to execute this command. */
+    private List<String> permissionNodes = new ArrayList<>();
+    /** Defines the default permission if the permission nodes couldn't be used. */
+    private DefaultPermission defaultPermission = DefaultPermission.NOT_ALLOWED;
+
+    /**
+     * Constructor.
+     */
+    public CommandPermissions() { }
+
+    /**
+     * Constructor.
+     *
+     * @param permissionNode The permission node required to execute a command.
+     * @param defaultPermission The default permission if the permission nodes couldn't be used.
+     */
+    public CommandPermissions(String permissionNode, DefaultPermission defaultPermission) {
+        this.permissionNodes.add(permissionNode);
+        this.defaultPermission = defaultPermission;
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param permissionNodes The permission nodes required to execute a command.
+     * @param defaultPermission The default permission if the permission nodes couldn't be used.
+     */
+    public CommandPermissions(List<String> permissionNodes, DefaultPermission defaultPermission) {
+        this.permissionNodes.addAll(permissionNodes);
+    }
+
+    /**
+     * Add a permission node required to execute this command.
+     *
+     * @param permissionNode The permission node to add.
+     *
+     * @return True on success, false on failure.
+     */
+    public boolean addPermissionNode(String permissionNode) {
+        // Trim the permission node
+        permissionNode = permissionNode.trim();
+
+        // Make sure the permission node is valid
+        if(permissionNode.length() == 0)
+            return false;
+
+        // Make sure this permission node hasn't been added already
+        if(hasPermissionNode(permissionNode))
+            return true;
+
+        // Add the permission node, return the result
+        return this.permissionNodes.add(permissionNode);
+    }
+
+    /**
+     * Check whether this command requires a specified permission node to execute.
+     *
+     * @param permissionNode The permission node to check for.
+     *
+     * @return True if this permission node is required, false if not.
+     */
+    public boolean hasPermissionNode(String permissionNode) {
+        return this.permissionNodes.contains(permissionNode);
+    }
+
+    /**
+     * Get the permission nodes required to execute this command.
+     *
+     * @return The permission nodes required to execute this command.
+     */
+    public List<String> getPermissionNodes() {
+        return this.permissionNodes;
+    }
+
+    /**
+     * Get the number of permission nodes set.
+     *
+     * @return Permission node count.
+     */
+    public int getPermissionNodeCount() {
+        return this.permissionNodes.size();
+    }
+
+    /**
+     * Set the permission nodes required to execute this command.
+     *
+     * @param permissionNodes The permission nodes required to execute this command.
+     */
+    public void setPermissionNodes(List<String> permissionNodes) {
+        this.permissionNodes = permissionNodes;
+    }
+
+    /**
+     * Check whether this command requires any permission to be executed. This is based on the getPermission() method.
+     *
+     * @return True if this command requires any permission to be executed by a player.
+     */
+    public boolean hasPermission(CommandSender sender) {
+        // Make sure any permission node is set
+        if(getPermissionNodeCount() == 0)
+            return true;
+
+        // Get the default permission
+        final boolean defaultPermission = getDefaultPermissionCommandSender(sender);
+
+        // Make sure the command sender is a player, if not use the default
+        if(!(sender instanceof Player))
+            return defaultPermission;
+
+        // Get the player instance
+        Player player = (Player) sender;
+
+        // Get the permissions manager, and make sure it's instance is valid
+        PermissionsManager permissionsManager = Core.getPermissionsManager();
+        if(permissionsManager == null)
+            return false;
+
+        // Check whether the player has permission, return the result
+        for(String node : this.permissionNodes)
+            if(!permissionsManager.hasPermission(player, node, defaultPermission))
+                return false;
+        return true;
+    }
+
+    /**
+     * Get the default permission if the permission nodes couldn't be used.
+     *
+     * @return The default permission.
+     */
+    public DefaultPermission getDefaultPermission() {
+        return this.defaultPermission;
+    }
+
+    /**
+     * Set the default permission used if the permission nodes couldn't be used.
+     *
+     * @param defaultPermission The default permission.
+     */
+    public void setDefaultPermission(DefaultPermission defaultPermission) {
+        this.defaultPermission = defaultPermission;
+    }
+
+    /**
+     * Get the default permission for a specified command sender.
+     *
+     * @param sender The command sender to get the default permission for.
+     *
+     * @return True if the command sender has permission by default, false otherwise.
+     */
+    public boolean getDefaultPermissionCommandSender(CommandSender sender) {
+        switch(getDefaultPermission()) {
+        case ALLOWED:
+            return true;
+
+        case OP_ONLY:
+            return sender.isOp();
+
+        case NOT_ALLOWED:
+        default:
+            return false;
+        }
+    }
+
+    public enum DefaultPermission {
+        NOT_ALLOWED,
+        OP_ONLY,
+        ALLOWED
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/ExecutableCommand.java b/src/main/java/fr/xephi/authme/commands/dynamic/ExecutableCommand.java
new file mode 100644
index 00000000..b9a89a58
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/ExecutableCommand.java
@@ -0,0 +1,17 @@
+package fr.xephi.authme.commands.dynamic;
+
+import org.bukkit.command.CommandSender;
+
+public abstract class ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    public abstract boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments);
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/FoundCommandResult.java b/src/main/java/fr/xephi/authme/commands/dynamic/FoundCommandResult.java
new file mode 100644
index 00000000..a64e825a
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/FoundCommandResult.java
@@ -0,0 +1,151 @@
+package fr.xephi.authme.commands.dynamic;
+
+import org.bukkit.command.CommandSender;
+
+public class FoundCommandResult {
+
+    /** The command description instance. */
+    private CommandDescription commandDescription;
+    /** The command reference. */
+    private CommandParts commandReference;
+    /** The command arguments. */
+    private CommandParts commandArguments;
+    /** The original search query reference. */
+    private CommandParts queryReference;
+
+    /**
+     * Constructor.
+     *
+     * @param commandDescription The command description.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     * @param queryReference The original query reference.
+     */
+    public FoundCommandResult(CommandDescription commandDescription, CommandParts commandReference, CommandParts commandArguments, CommandParts queryReference) {
+        this.commandDescription = commandDescription;
+        this.commandReference = commandReference;
+        this.commandArguments = commandArguments;
+        this.queryReference = queryReference;
+    }
+
+    /**
+     * Check whether the command was suitable.
+     *
+     * @return True if the command was suitable, false otherwise.
+     */
+    public boolean hasProperArguments() {
+        // Make sure the command description is set
+        if(this.commandDescription == null)
+            return false;
+
+        // Get and return the result
+        return getCommandDescription().getSuitableArgumentsDifference(this.queryReference) == 0;
+    }
+
+    /**
+     * Get the command description.
+     *
+     * @return Command description.
+     */
+    public CommandDescription getCommandDescription() {
+        return this.commandDescription;
+    }
+
+    /**
+     * Set the command description.
+     *
+     * @param commandDescription The command description.
+     *
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public void setCommandDescription(CommandDescription commandDescription) {
+        this.commandDescription = commandDescription;
+    }
+
+    /**
+     * Check whether the command is executable.
+     *
+     * @return True if the command is executable, false otherwise.
+     */
+    public boolean isExecutable() {
+        // Make sure the command description is valid
+        if(this.commandDescription == null)
+            return false;
+
+        // Check whether the command is executable, return the result
+        return this.commandDescription.isExecutable();
+    }
+
+    /**
+     * Execute the command.
+     *
+     * @param sender The command sender that executed the command.
+     *
+     * @return True on success, false on failure.
+     */
+    public boolean executeCommand(CommandSender sender) {
+        // Make sure the command description is valid
+        if(this.commandDescription == null)
+            return false;
+
+        // Execute the command
+        return this.commandDescription.execute(sender, this.commandReference, this.commandArguments);
+    }
+
+    /**
+     * Check whether a command sender has permission to execute the command.
+     *
+     * @param sender The command sender.
+     *
+     * @return True if the command sender has permission, false otherwise.
+     */
+    public boolean hasPermission(CommandSender sender) {
+        // Make sure the command description is valid
+        if(this.commandDescription == null)
+            return false;
+
+        // Get and return the permission
+        return this.commandDescription.getCommandPermissions().hasPermission(sender);
+    }
+
+    /**
+     * Get the command reference.
+     *
+     * @return The command reference.
+     */
+    public CommandParts getCommandReference() {
+        return this.commandReference;
+    }
+
+    /**
+     * Get the command arguments.
+     *
+     * @return The command arguments.
+     */
+    public CommandParts getCommandArguments() {
+        return this.commandArguments;
+    }
+
+    /**
+     * Get the original query reference.
+     *
+     * @return Original query reference.
+     */
+    public CommandParts getQueryReference() {
+        return this.queryReference;
+    }
+
+    /**
+     * Get the difference value between the original query and the result reference.
+     *
+     * @return The difference value.
+     */
+    public double getDifference() {
+        // Get the difference through the command found
+        if(this.commandDescription != null)
+            return this.commandDescription.getCommandDifference(this.queryReference);
+
+        // Get the difference from the query reference
+        return this.queryReference.getDifference(commandReference, true);
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/CheckUpdatesCommand.java b/src/main/java/fr/xephi/authme/commands/dynamic/executable/CheckUpdatesCommand.java
new file mode 100644
index 00000000..2e9040c0
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/executable/CheckUpdatesCommand.java
@@ -0,0 +1,78 @@
+package fr.xephi.authme.commands.dynamic.executable;
+
+import com.timvisee.dungeonmaze.Core;
+import com.timvisee.dungeonmaze.command.CommandParts;
+import com.timvisee.dungeonmaze.command.ExecutableCommand;
+import com.timvisee.dungeonmaze.update.UpdateCheckerService;
+import com.timvisee.dungeonmaze.update.bukkit.Updater;
+import com.timvisee.dungeonmaze.util.Profiler;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+public class CheckUpdatesCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Profile the process
+        Profiler p = new Profiler(true);
+
+        // Show a status message
+        sender.sendMessage(ChatColor.YELLOW + "Checking for Dungeon Maze updates...");
+
+        // Get the update checker service, shut it down and start it again to force an update check
+        UpdateCheckerService service = Core.getUpdateCheckerService();
+        service.shutdownUpdateChecker();
+        service.setupUpdateChecker();
+
+        // Get the update checker instance
+        Updater uc = service.getUpdateChecker();
+
+        // Show a status message
+        sender.sendMessage(ChatColor.YELLOW + "Update checking succeed, took " + p.getTimeFormatted() + "!");
+
+        // Get the version number of the new update
+        String newVer = uc.getLatestName();
+
+        // Make sure any update is available
+        if(uc.getResult() == Updater.UpdateResult.UPDATE_AVAILABLE) {
+            sender.sendMessage(ChatColor.GREEN + "New Dungeon Maze version available: " + String.valueOf(newVer));
+            return true;
+
+        } else if(uc.getResult() == Updater.UpdateResult.NO_UPDATE) {
+            sender.sendMessage(ChatColor.GREEN + "You are running the latest Dungeon Maze version!");
+            return true;
+        }
+
+        // Make sure the new version is compatible with the current bukkit version
+        if(uc.getResult() == Updater.UpdateResult.FAIL_NOVERSION) {
+            // Show a message
+            sender.sendMessage(ChatColor.GREEN + "New Dungeon Maze version available: " + String.valueOf(newVer));
+            sender.sendMessage(ChatColor.DARK_RED + "The new version is not compatible with your Bukkit version!");
+            sender.sendMessage(ChatColor.DARK_RED + "Please update your Bukkit to " +  uc.getLatestGameVersion() + " or higher!");
+            return true;
+        }
+
+        // Check whether the update was installed or not
+        if(uc.getResult() == Updater.UpdateResult.SUCCESS)
+            sender.sendMessage(ChatColor.GREEN + "New version installed (" + String.valueOf(newVer) + "). Server reboot required!");
+
+        else {
+            sender.sendMessage(ChatColor.GREEN + "New version found: " + String.valueOf(newVer));
+            //noinspection SpellCheckingInspection
+            sender.sendMessage(ChatColor.GREEN + "Use " + ChatColor.GOLD + "/dm installupdate" +
+                    ChatColor.GREEN + " to automatically install the new version!");
+        }
+
+        // Return the result
+        return true;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/CreateWorldCommand.java b/src/main/java/fr/xephi/authme/commands/dynamic/executable/CreateWorldCommand.java
new file mode 100644
index 00000000..a3787745
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/executable/CreateWorldCommand.java
@@ -0,0 +1,140 @@
+package fr.xephi.authme.commands.dynamic.executable;
+
+import com.timvisee.dungeonmaze.Core;
+import com.timvisee.dungeonmaze.DungeonMaze;
+import com.timvisee.dungeonmaze.command.CommandParts;
+import com.timvisee.dungeonmaze.command.ExecutableCommand;
+import com.timvisee.dungeonmaze.util.Profiler;
+import com.timvisee.dungeonmaze.world.WorldManager;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.WorldCreator;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class CreateWorldCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Get and trim the preferred world name
+        String worldName = commandArguments.get(0).trim();
+
+        // Validate the world name
+        if(!WorldManager.isValidWorldName(worldName)) {
+            sender.sendMessage(ChatColor.DARK_RED + worldName);
+            sender.sendMessage(ChatColor.DARK_RED + "The world name contains invalid characters!");
+            return true;
+        }
+
+        // Set whether the world should be preloaded
+        boolean preloadWorld = true;
+
+        // Get whether the world should be preloaded based on the arguments
+        if(commandArguments.getCount() >= 2) {
+            String arg = commandArguments.get(1);
+
+            // Check whether the argument equals 'force'
+            if(arg.equalsIgnoreCase("preload"))
+                preloadWorld = true;
+
+            else if(arg.equalsIgnoreCase("true") || arg.equalsIgnoreCase("t") || arg.equalsIgnoreCase("yes") || arg.equalsIgnoreCase("y"))
+                preloadWorld = true;
+
+            else if(arg.equalsIgnoreCase("false") || arg.equalsIgnoreCase("f") || arg.equalsIgnoreCase("no") || arg.equalsIgnoreCase("n"))
+                preloadWorld = false;
+
+            else {
+                sender.sendMessage(ChatColor.DARK_RED + arg);
+                sender.sendMessage(ChatColor.DARK_RED + "Invalid argument!");
+                return true;
+            }
+        }
+
+        // Get the world manager, and make sure it's valid
+        WorldManager worldManager = Core.getWorldManager();
+        boolean showWorldManagerError = false;
+        if(worldManager == null)
+            showWorldManagerError = true;
+        else if(!worldManager.isInit())
+            showWorldManagerError = true;
+        if(showWorldManagerError) {
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to create the world, world manager not available!");
+            return true;
+        }
+
+        // Make sure the world doesn't exist
+        if(worldManager.isWorld(worldName)) {
+            sender.sendMessage(ChatColor.DARK_RED + "The world " + ChatColor.GOLD + worldName + ChatColor.DARK_RED + " already exists!");
+            sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/" + commandReference.get(0) + " listworlds" + ChatColor.YELLOW + " to list all worlds.");
+            sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/" + commandReference.get(0) + " loadworld " + worldName + ChatColor.YELLOW + " to load the world.");
+            return true;
+        }
+
+        // Show a status message
+        sender.sendMessage(ChatColor.YELLOW + "Preparing the server...");
+
+        // Prepare the server for the new world
+        if(!worldManager.prepareDungeonMazeWorld(worldName, preloadWorld)) {
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to prepare the server!");
+            return true;
+        }
+
+        // Show a status message
+        sender.sendMessage(ChatColor.YELLOW + "Generating the " + DungeonMaze.PLUGIN_NAME + " " + ChatColor.GOLD + worldName + ChatColor.YELLOW + "...");
+        Bukkit.broadcastMessage(ChatColor.LIGHT_PURPLE + "Generating a new world, expecting lag for a while...");
+
+        // Profile the world generation
+        Profiler p = new Profiler(true);
+
+        // Create the world
+        // TODO: Put this in a separate function!
+        WorldCreator newWorld = new WorldCreator(worldName);
+        newWorld.generator(DungeonMaze.instance.getDungeonMazeGenerator());
+        World world = newWorld.createWorld();
+
+        // Force-save the level.dat file for the world, profile the process
+        Profiler pWorldSave = new Profiler(true);
+        try {
+            // Force-save the world, and show some status messages
+            Core.getLogger().info("Force saving the level.dat file for '" + world.getName() + "'...");
+            world.save();
+            Core.getLogger().info("World saved successfully, took " + pWorldSave.getTimeFormatted() + "!");
+
+        } catch(Exception ex) {
+            Core.getLogger().error("Failed to save the world after " + pWorldSave.getTimeFormatted() + "!");
+        }
+
+        // Make sure the world instance is valid
+        if(world == null) {
+            Bukkit.broadcastMessage(ChatColor.LIGHT_PURPLE + "World generation failed after " + p.getTimeFormatted() + "!");
+            sender.sendMessage(ChatColor.DARK_RED + "The " + DungeonMaze.PLUGIN_NAME + " " + ChatColor.GOLD + worldName + ChatColor.GREEN +
+                    " failed to generate after " + p.getTimeFormatted() + "!");
+            return true;
+        }
+
+        // Show a status message
+        Bukkit.broadcastMessage(ChatColor.LIGHT_PURPLE + "World generation finished, took " + p.getTimeFormatted() + "!");
+        sender.sendMessage(ChatColor.GREEN + "The " + DungeonMaze.PLUGIN_NAME + " " + ChatColor.GOLD + worldName + ChatColor.GREEN +
+                " has successfully been generated, took " + p.getTimeFormatted() + "!");
+
+        // If the command was executed by a player, teleport the player
+        if(sender instanceof Player) {
+            // Teleport the player
+            ((Player) sender).teleport(world.getSpawnLocation());
+            sender.sendMessage(ChatColor.GREEN + "You have been teleported to " + ChatColor.GOLD + worldName + ChatColor.GREEN + "!");
+        }
+
+        // Return the result
+        return true;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/DungeonMazeCommand.java b/src/main/java/fr/xephi/authme/commands/dynamic/executable/DungeonMazeCommand.java
new file mode 100644
index 00000000..f2d99171
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/executable/DungeonMazeCommand.java
@@ -0,0 +1,28 @@
+package fr.xephi.authme.commands.dynamic.executable;
+
+import com.timvisee.dungeonmaze.DungeonMaze;
+import com.timvisee.dungeonmaze.command.CommandParts;
+import com.timvisee.dungeonmaze.command.ExecutableCommand;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+public class DungeonMazeCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Show some version info
+        sender.sendMessage(ChatColor.GREEN + "This server is running " + DungeonMaze.PLUGIN_NAME + " v" + DungeonMaze.getVersionName() + "! " + ChatColor.RED + "<3");
+        sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/" + commandReference.get(0) + " help" + ChatColor.YELLOW + " to view help.");
+        sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/" + commandReference.get(0) + " about" + ChatColor.YELLOW + " to view about.");
+        return true;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/HelpCommand.java b/src/main/java/fr/xephi/authme/commands/dynamic/executable/HelpCommand.java
new file mode 100644
index 00000000..2c07f28d
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/executable/HelpCommand.java
@@ -0,0 +1,37 @@
+package fr.xephi.authme.commands.dynamic.executable;
+
+import com.timvisee.dungeonmaze.command.CommandParts;
+import com.timvisee.dungeonmaze.command.ExecutableCommand;
+import com.timvisee.dungeonmaze.command.help.HelpProvider;
+import org.bukkit.command.CommandSender;
+
+public class HelpCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Check whether quick help should be shown
+        boolean quickHelp = commandArguments.getCount() == 0;
+
+        // Set the proper command arguments for the quick help
+        if(quickHelp)
+            commandArguments = new CommandParts(commandReference.get(0));
+
+        // Show the new help
+        if(quickHelp)
+            HelpProvider.showHelp(sender, commandReference, commandArguments, false, false, false, false, false, true);
+        else
+            HelpProvider.showHelp(sender, commandReference, commandArguments);
+
+        // Return the result
+        return true;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/InstallUpdateCommand.java b/src/main/java/fr/xephi/authme/commands/dynamic/executable/InstallUpdateCommand.java
new file mode 100644
index 00000000..0bc0126e
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/executable/InstallUpdateCommand.java
@@ -0,0 +1,75 @@
+package fr.xephi.authme.commands.dynamic.executable;
+
+import com.timvisee.dungeonmaze.Core;
+import com.timvisee.dungeonmaze.command.CommandParts;
+import com.timvisee.dungeonmaze.command.ExecutableCommand;
+import com.timvisee.dungeonmaze.update.UpdateCheckerService;
+import com.timvisee.dungeonmaze.update.bukkit.Updater;
+import com.timvisee.dungeonmaze.util.Profiler;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+public class InstallUpdateCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Profile the process
+        Profiler p = new Profiler(true);
+
+        // Show a status message
+        sender.sendMessage(ChatColor.YELLOW + "Checking for Dungeon Maze updates...");
+
+        // Get the update checker service, shut it down and start it again to force an update check
+        UpdateCheckerService service = Core.getUpdateCheckerService();
+        service.shutdownUpdateChecker();
+        service.setupUpdateChecker();
+
+        // Get the update checker instance
+        Updater uc = service.getUpdateChecker();
+
+        // TODO: Automatically install the actual update!
+
+        // Show a status message
+        sender.sendMessage(ChatColor.YELLOW + "Update checking succeed, took " + p.getTimeFormatted() + "!");
+
+        // Get the version number of the new update
+        String newVer = uc.getLatestName();
+
+        // Make sure any update is available
+        if(uc.getResult() == Updater.UpdateResult.UPDATE_AVAILABLE) {
+            sender.sendMessage(ChatColor.GREEN + "New Dungeon Maze version available: " + String.valueOf(newVer));
+            return true;
+
+        } else if(uc.getResult() == Updater.UpdateResult.NO_UPDATE) {
+            sender.sendMessage(ChatColor.GREEN + "You are running the latest Dungeon Maze version!");
+            return true;
+        }
+
+        // Make sure the new version is compatible with the current bukkit version
+        if(uc.getResult() == Updater.UpdateResult.FAIL_NOVERSION) {
+            // Show a message
+            sender.sendMessage(ChatColor.GREEN + "New Dungeon Maze version available: " + String.valueOf(newVer));
+            sender.sendMessage(ChatColor.DARK_RED + "The new version is not compatible with your Bukkit version!");
+            sender.sendMessage(ChatColor.DARK_RED + "Please update your Bukkit to " +  uc.getLatestGameVersion() + " or higher!");
+            return true;
+        }
+
+        // Check whether the update was installed or not
+        if(uc.getResult() == Updater.UpdateResult.SUCCESS)
+            sender.sendMessage(ChatColor.GREEN + "New version installed (" + String.valueOf(newVer) + "). Server reboot required!");
+        else
+            sender.sendMessage(ChatColor.DARK_RED + "Automatic installation failed, please update manually!");
+
+        // Return the result
+        return true;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/ListWorldCommand.java b/src/main/java/fr/xephi/authme/commands/dynamic/executable/ListWorldCommand.java
new file mode 100644
index 00000000..cc4e5fb7
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/executable/ListWorldCommand.java
@@ -0,0 +1,67 @@
+package fr.xephi.authme.commands.dynamic.executable;
+
+import com.timvisee.dungeonmaze.Core;
+import com.timvisee.dungeonmaze.DungeonMaze;
+import com.timvisee.dungeonmaze.command.CommandParts;
+import com.timvisee.dungeonmaze.command.ExecutableCommand;
+import com.timvisee.dungeonmaze.world.WorldManager;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+import java.util.List;
+
+public class ListWorldCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Get the world manager and make sure it's valid
+        WorldManager worldManager = Core.getWorldManager();
+        if(worldManager == null) {
+            sender.sendMessage(ChatColor.DARK_RED + "Error, failed to list the worlds!");
+            return true;
+        }
+
+        // Get the list of Dungeon Maze worlds and other worlds
+        List<String> dungeonMazeWorlds = worldManager.getDungeonMazeWorlds();
+        List<String> otherWorlds = worldManager.getWorlds(true);
+
+        // Show the list of Dungeon Maze worlds
+        sender.sendMessage(ChatColor.GOLD + "==========[ \" + DungeonMaze.PLUGIN_NAME.toUpperCase() + \" WORLDS ]==========");
+        sender.sendMessage(ChatColor.GOLD + DungeonMaze.PLUGIN_NAME + " worlds:");
+        if(dungeonMazeWorlds.size() > 0) {
+            for(String worldName : dungeonMazeWorlds) {
+                if(worldManager.isDungeonMazeWorldLoaded(worldName))
+                    sender.sendMessage(ChatColor.WHITE + " " + worldName + ChatColor.GREEN + ChatColor.ITALIC + " (Loaded)");
+                else
+                    sender.sendMessage(ChatColor.WHITE + " " + worldName + ChatColor.GRAY + ChatColor.ITALIC + " (Not Loaded)");
+            }
+        } else
+            // No Dungeon Maze world available, show a message
+            sender.sendMessage(ChatColor.GRAY + "" + ChatColor.ITALIC + " No Dungeon Maze worlds available!");
+
+        // Show the list of other worlds
+        sender.sendMessage(ChatColor.GOLD + "Other worlds:");
+        if(otherWorlds.size() > 0) {
+            for(String worldName : otherWorlds) {
+                if(worldManager.isWorldLoaded(worldName))
+                    sender.sendMessage(ChatColor.WHITE + " " + worldName + ChatColor.GREEN + ChatColor.ITALIC + " (Loaded)");
+                else
+                    sender.sendMessage(ChatColor.WHITE + " " + worldName + ChatColor.GRAY + ChatColor.ITALIC + " (Not Loaded)");
+            }
+        } else
+            // No other world available, show a message
+            sender.sendMessage(ChatColor.GRAY + "" + ChatColor.ITALIC + " No other worlds available!");
+
+        // Return the result
+        return true;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/LoadWorldCommand.java b/src/main/java/fr/xephi/authme/commands/dynamic/executable/LoadWorldCommand.java
new file mode 100644
index 00000000..ea7cb979
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/executable/LoadWorldCommand.java
@@ -0,0 +1,75 @@
+package fr.xephi.authme.commands.dynamic.executable;
+
+import com.timvisee.dungeonmaze.Core;
+import com.timvisee.dungeonmaze.command.CommandParts;
+import com.timvisee.dungeonmaze.command.ExecutableCommand;
+import com.timvisee.dungeonmaze.util.Profiler;
+import com.timvisee.dungeonmaze.world.WorldManager;
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+
+public class LoadWorldCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Get and trim the preferred world name
+        String worldName = commandArguments.get(0).trim();
+
+        // Profile the world loading
+        Profiler p = new Profiler(true);
+
+        // Validate the world name
+        if(!WorldManager.isValidWorldName(worldName)) {
+            sender.sendMessage(ChatColor.DARK_RED + worldName);
+            sender.sendMessage(ChatColor.DARK_RED + "The world name contains invalid characters!");
+            return true;
+        }
+
+        // Get the world manager, and make sure it's valid
+        WorldManager worldManager = Core.getWorldManager();
+        boolean showWorldManagerError = false;
+        if(worldManager == null)
+            showWorldManagerError = true;
+        else if(!worldManager.isInit())
+            showWorldManagerError = true;
+        if(showWorldManagerError) {
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to load the world, world manager not available!");
+            return true;
+        }
+
+        // Make sure the world exists
+        if(!worldManager.isWorld(worldName)) {
+            sender.sendMessage(ChatColor.DARK_RED + "The world " + ChatColor.GOLD + worldName + ChatColor.DARK_RED + " doesn't exist!");
+            return true;
+        }
+
+        // Make sure the world isn't loaded already
+        if(worldManager.isWorldLoaded(worldName)) {
+            sender.sendMessage(ChatColor.GREEN + "The world " + ChatColor.GOLD + worldName + ChatColor.GREEN + " is already loaded!");
+            return true;
+        }
+
+        // Load the world, store the instance
+        World world = worldManager.loadWorld(worldName);
+
+        // Make sure the world was loaded
+        if(world == null) {
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to load the world!");
+            return true;
+        }
+
+        // Show a status message, return the result
+        sender.sendMessage(ChatColor.GREEN + "The world " + ChatColor.GOLD + worldName + ChatColor.GREEN + " has been loaded, took " + p.getTimeFormatted() + "!");
+        return true;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/ReloadCommand.java b/src/main/java/fr/xephi/authme/commands/dynamic/executable/ReloadCommand.java
new file mode 100644
index 00000000..69caed0d
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/executable/ReloadCommand.java
@@ -0,0 +1,75 @@
+package fr.xephi.authme.commands.dynamic.executable;
+
+import com.timvisee.dungeonmaze.Core;
+import com.timvisee.dungeonmaze.command.CommandParts;
+import com.timvisee.dungeonmaze.command.ExecutableCommand;
+import com.timvisee.dungeonmaze.config.ConfigHandler;
+import com.timvisee.dungeonmaze.util.Profiler;
+import com.timvisee.dungeonmaze.world.WorldManager;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+public class ReloadCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Profile the reload process
+        Profiler p = new Profiler(true);
+
+        // Show a status message
+        sender.sendMessage(ChatColor.YELLOW + "Reloading Dungeon Maze...");
+
+        /* // Set whether the reload is forced
+        boolean force = false;
+
+        // Get whether the reload should be forced from the command arguments
+        if(commandArguments.getCount() >= 1) {
+            String arg = commandArguments.get(0);
+
+            // Check whether the argument equals 'force'
+            if(arg.equalsIgnoreCase("force") || arg.equalsIgnoreCase("forced"))
+                force = true;
+
+            else if(arg.equalsIgnoreCase("true") || arg.equalsIgnoreCase("t") || arg.equalsIgnoreCase("yes") || arg.equalsIgnoreCase("y"))
+                force = true;
+
+            else if(arg.equalsIgnoreCase("false") || arg.equalsIgnoreCase("f") || arg.equalsIgnoreCase("no") || arg.equalsIgnoreCase("n"))
+                force = false;
+
+            else {
+                sender.sendMessage(ChatColor.DARK_RED + arg);
+                sender.sendMessage(ChatColor.DARK_RED + "Invalid argument!");
+                return true;
+            }
+        }*/
+
+        // Reload the configuration
+        ConfigHandler configHandler = Core.getConfigHandler();
+        if(configHandler != null) {
+            configHandler.load();
+            sender.sendMessage(ChatColor.YELLOW + "Reloaded the configuration!");
+        } else
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to reload the configuration!");
+
+        // Get the world manager to reload the world list, and make sure it's valid
+        WorldManager worldManager = Core.getWorldManager();
+        if(worldManager != null) {
+            worldManager.refresh();
+            sender.sendMessage(ChatColor.YELLOW + "Reloaded the worlds!");
+        } else
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to reload the worlds!");
+
+        // Dungeon Maze reloaded, show a status message
+        sender.sendMessage(ChatColor.GREEN + "Dungeon Maze has been reloaded successfully, took " + p.getTimeFormatted() + "!");
+        return true;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/ReloadPermissionsCommand.java b/src/main/java/fr/xephi/authme/commands/dynamic/executable/ReloadPermissionsCommand.java
new file mode 100644
index 00000000..6a39a162
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/executable/ReloadPermissionsCommand.java
@@ -0,0 +1,56 @@
+package fr.xephi.authme.commands.dynamic.executable;
+
+import com.timvisee.dungeonmaze.Core;
+import com.timvisee.dungeonmaze.command.CommandParts;
+import com.timvisee.dungeonmaze.command.ExecutableCommand;
+import com.timvisee.dungeonmaze.permission.PermissionsManager;
+import com.timvisee.dungeonmaze.util.Profiler;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+public class ReloadPermissionsCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Profile the permissions reload process
+        Profiler p = new Profiler(true);
+
+        // Show a status message
+        sender.sendMessage(ChatColor.YELLOW + "Reloading permissions...");
+        Core.getLogger().info("Reloading permissions...");
+
+        // Get the permissions manager and make sure it's valid
+        PermissionsManager permissionsManager = Core.getPermissionsManager();
+        if(permissionsManager == null) {
+            Core.getLogger().info("Failed to access the permissions manager after " + p.getTimeFormatted() + "!");
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to access the permissions manager after " + p.getTimeFormatted() + "!");
+            return true;
+        }
+
+        // Reload the permissions service, show an error on failure
+        if(!permissionsManager.reload()) {
+            Core.getLogger().info("Failed to reload permissions after " + p.getTimeFormatted() + "!");
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to reload permissions after " + p.getTimeFormatted() + "!");
+            return true;
+        }
+
+        // Show a success message
+        Core.getLogger().info("Permissions reloaded successfully, took " + p.getTimeFormatted() + "!");
+        sender.sendMessage(ChatColor.GREEN + "Permissions reloaded successfully, took " + p.getTimeFormatted() + "!");
+
+        // Get and show the permissions system being used
+        String permissionsSystem = ChatColor.GOLD + permissionsManager.getUsedPermissionsSystemType().getName();
+        Core.getLogger().info("Used permissions system: " + permissionsSystem);
+        sender.sendMessage(ChatColor.GREEN + "Used permissions system: " + permissionsSystem);
+        return true;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/RestartCommand.java b/src/main/java/fr/xephi/authme/commands/dynamic/executable/RestartCommand.java
new file mode 100644
index 00000000..b5d790ef
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/executable/RestartCommand.java
@@ -0,0 +1,105 @@
+package fr.xephi.authme.commands.dynamic.executable;
+
+import com.timvisee.dungeonmaze.Core;
+import com.timvisee.dungeonmaze.DungeonMaze;
+import com.timvisee.dungeonmaze.command.CommandParts;
+import com.timvisee.dungeonmaze.command.ExecutableCommand;
+import com.timvisee.dungeonmaze.util.Profiler;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+public class RestartCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Profile the restart process
+        Profiler p = new Profiler(true);
+
+        // Set whether the restart is forced
+        boolean force = false;
+
+        // Get whether the restart should be forced from the command arguments
+        if(commandArguments.getCount() >= 1) {
+            String arg = commandArguments.get(0);
+
+            // Check whether the argument equals 'force'
+            if(arg.equalsIgnoreCase("force") || arg.equalsIgnoreCase("forced"))
+                force = true;
+
+            else if(arg.equalsIgnoreCase("true") || arg.equalsIgnoreCase("t") || arg.equalsIgnoreCase("yes") || arg.equalsIgnoreCase("y"))
+                force = true;
+
+            else if(arg.equalsIgnoreCase("false") || arg.equalsIgnoreCase("f") || arg.equalsIgnoreCase("no") || arg.equalsIgnoreCase("n"))
+                force = false;
+
+            else {
+                sender.sendMessage(ChatColor.DARK_RED + arg);
+                sender.sendMessage(ChatColor.DARK_RED + "Invalid argument!");
+                return true;
+            }
+        }
+
+        // Show a restart warning
+        if(force) {
+            sender.sendMessage(ChatColor.YELLOW + "Force restarting Dungeon Maze...");
+            Core.getLogger().info("Force restarting Dungeon Maze...");
+        } else {
+            sender.sendMessage(ChatColor.YELLOW + "Restarting Dungeon Maze...");
+            Core.getLogger().info("Restarting Dungeon Maze...");
+        }
+
+        // Profile the Dungeon Maze Core destruction
+        Profiler stopCoreProfiler = new Profiler(true);
+
+        // Destroy the Dungeon Maze core
+        if(!DungeonMaze.instance.destroyCore(force)) {
+            // Failed to destroy the core, show a status message
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to stop the Dungeon Maze Core after " + stopCoreProfiler.getTimeFormatted() + "!");
+            sender.sendMessage(ChatColor.DARK_RED + "Please use " + ChatColor.GOLD + "/reload" + ChatColor.DARK_RED + " for plugin instability reasons!");
+            Core.getLogger().error("Failed to stop the core, after " + stopCoreProfiler.getTimeFormatted() + "!");
+
+            // Return if the restart isn't force
+            if(!force)
+                return true;
+        }
+
+        // Show a status message
+        sender.sendMessage(ChatColor.YELLOW + "Dungeon Maze Core stopped, took " + stopCoreProfiler.getTimeFormatted() + "!");
+
+        // Profile the core starting
+        Profiler startCoreProfiler = new Profiler(true);
+
+        // Initialize the core, show the result status
+        if(!DungeonMaze.instance.initCore()) {
+            // Core failed to initialize, show a status message
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to start the Dungeon Maze Core after " + startCoreProfiler.getTimeFormatted() + "!");
+            sender.sendMessage(ChatColor.DARK_RED + "Please use " + ChatColor.GOLD + "/reload" + ChatColor.DARK_RED + " for plugin instability reasons!");
+            Core.getLogger().error("Failed to start the core, after " + startCoreProfiler.getTimeFormatted() + "!");
+
+            // Return if the restart isn't forced
+            if(!force)
+                return true;
+        }
+
+        // Core initialized, show a status message
+        sender.sendMessage(ChatColor.YELLOW + "Dungeon Maze Core started, took " + startCoreProfiler.getTimeFormatted() + "!");
+
+        // Show a status message of the running services
+        final int runningServices = Core.instance.getServiceManager().getServiceCount(true);
+        final int totalServices = Core.instance.getServiceManager().getServiceCount();
+        sender.sendMessage(ChatColor.YELLOW + "Started " + ChatColor.GOLD + runningServices + ChatColor.YELLOW + " out of " + ChatColor.GOLD + totalServices + ChatColor.YELLOW + " Dungeon Maze services!");
+
+        // Dungeon Maze restarted, show a status message
+        sender.sendMessage(ChatColor.GREEN + "Dungeon Maze has been restarted successfully, took " + p.getTimeFormatted() + "!");
+        return true;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/ServiceCommand.java b/src/main/java/fr/xephi/authme/commands/dynamic/executable/ServiceCommand.java
new file mode 100644
index 00000000..e65b6d3a
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/executable/ServiceCommand.java
@@ -0,0 +1,73 @@
+package fr.xephi.authme.commands.dynamic.executable;
+
+import com.timvisee.dungeonmaze.Core;
+import com.timvisee.dungeonmaze.DungeonMaze;
+import com.timvisee.dungeonmaze.command.CommandParts;
+import com.timvisee.dungeonmaze.command.ExecutableCommand;
+import com.timvisee.dungeonmaze.service.Service;
+import com.timvisee.dungeonmaze.service.ServiceManager;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+import java.util.List;
+
+public class ServiceCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Print the status info header
+        sender.sendMessage(ChatColor.GOLD + "==========[ " + DungeonMaze.PLUGIN_NAME.toUpperCase() + " SERVICES ]==========");
+
+        // Get the service manager and make sure it's valid
+        ServiceManager serviceManager = Core.instance.getServiceManager();
+        if(serviceManager == null) {
+            sender.sendMessage(ChatColor.DARK_RED + "Error, failed to retrieve the services information!");
+            return true;
+        }
+
+        // Print the service count and the list of services
+        sender.sendMessage(ChatColor.GOLD + "Running Services: " + ChatColor.WHITE + serviceManager.getServiceCount(true) + ChatColor.GRAY + " / " + Core.instance.getServiceManager().getServiceCount());
+        printServices(sender);
+
+        // Return the result
+        return true;
+    }
+
+    /**
+     * Print all services.
+     *
+     * @param sender The command sender to print the services to.
+     */
+    public void printServices(CommandSender sender) {
+        // Get the service manager and make sure it's valid
+        ServiceManager serviceManager = Core.instance.getServiceManager();
+        if(serviceManager == null) {
+            sender.sendMessage(ChatColor.DARK_RED + "Error, failed to retrieve the services information!");
+            return;
+        }
+
+        // Get all the services
+        List<Service> services = serviceManager.getServices();
+
+        // Print the header
+        sender.sendMessage(ChatColor.GOLD + "Services:");
+
+        // Print all the services
+        for(Service service : services) {
+            // Check whether the service is initialized
+            if(service.isInit())
+                sender.sendMessage(ChatColor.WHITE + " " + service.getName() + " service " + ChatColor.GREEN + ChatColor.ITALIC + "(Loaded)");
+            else
+                sender.sendMessage(ChatColor.WHITE + " " + service.getName() + " service " + ChatColor.DARK_RED + ChatColor.ITALIC + "(Not loaded)");
+        }
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/StatusCommand.java b/src/main/java/fr/xephi/authme/commands/dynamic/executable/StatusCommand.java
new file mode 100644
index 00000000..4a5cff31
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/executable/StatusCommand.java
@@ -0,0 +1,180 @@
+package fr.xephi.authme.commands.dynamic.executable;
+
+import com.timvisee.dungeonmaze.Core;
+import com.timvisee.dungeonmaze.DungeonMaze;
+import com.timvisee.dungeonmaze.command.CommandParts;
+import com.timvisee.dungeonmaze.command.ExecutableCommand;
+import com.timvisee.dungeonmaze.permission.PermissionsManager;
+import com.timvisee.dungeonmaze.util.MinecraftUtils;
+import com.timvisee.dungeonmaze.util.SystemUtils;
+import com.timvisee.dungeonmaze.world.WorldManager;
+import com.timvisee.dungeonmaze.world.dungeon.chunk.grid.DungeonChunkGridManager;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class StatusCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Print the status info header
+        sender.sendMessage(ChatColor.GOLD + "==========[ " + DungeonMaze.PLUGIN_NAME.toUpperCase() + " STATUS ]==========");
+
+        // Get the world manager
+        WorldManager worldManager = Core.getWorldManager();
+
+        // Print the number of Dungeon Maze worlds
+        if(worldManager != null)
+            sender.sendMessage(ChatColor.GOLD + DungeonMaze.PLUGIN_NAME + " worlds: " + ChatColor.WHITE + worldManager.getDungeonMazeWorlds().size());
+        else
+            sender.sendMessage(ChatColor.GOLD + DungeonMaze.PLUGIN_NAME + " worlds: " + ChatColor.DARK_RED + ChatColor.ITALIC + "Unknown!");
+
+        // Print the Dungeon Maze player count
+        int playerCount = Bukkit.getOnlinePlayers().size();
+        int dungeonMazePlayerCount = 0;
+        if(worldManager != null) {
+            for(Player player : Bukkit.getOnlinePlayers())
+                if(worldManager.isDungeonMazeWorld(player.getWorld().getName()))
+                    dungeonMazePlayerCount++;
+
+            sender.sendMessage(ChatColor.GOLD + DungeonMaze.PLUGIN_NAME + " players: " + ChatColor.WHITE + dungeonMazePlayerCount + ChatColor.GRAY + " / " + playerCount);
+
+        } else
+            sender.sendMessage(ChatColor.GOLD + DungeonMaze.PLUGIN_NAME + " players: " + ChatColor.DARK_RED + ChatColor.ITALIC + "Unknown!");
+
+        // Get the permissions manager
+        PermissionsManager permissionsManager = Core.getPermissionsManager();
+
+        // Print the permissions manager status
+        if(permissionsManager != null) {
+            // Get the used permissions system
+            PermissionsManager.PermissionsSystemType type = permissionsManager.getUsedPermissionsSystemType();
+
+            if(!type.equals(PermissionsManager.PermissionsSystemType.NONE))
+                sender.sendMessage(ChatColor.GOLD + "Permissions System: " + ChatColor.GREEN + permissionsManager.getUsedPermissionsSystemType().getName());
+            else
+                sender.sendMessage(ChatColor.GOLD + "Permissions System: " + ChatColor.GRAY + ChatColor.ITALIC + permissionsManager.getUsedPermissionsSystemType().getName());
+        } else
+            sender.sendMessage(ChatColor.GOLD + "Permissions System: " + ChatColor.DARK_RED + ChatColor.ITALIC + "Unknown!");
+
+        // Get the dungeon chunk grid manager
+        DungeonChunkGridManager dungeonChunkGridManager = Core.getDungeonChunkGridManager();
+        if(dungeonChunkGridManager != null) {
+            int loadedChunks = dungeonChunkGridManager.getLoadedChunksCount();
+            int loadedGrids = dungeonChunkGridManager.getLoadedGridsCount();
+            sender.sendMessage(ChatColor.GOLD + "Loaded Dungeon Chunks: " + ChatColor.WHITE + loadedChunks + ChatColor.GRAY + " in " + ChatColor.WHITE + loadedGrids + ChatColor.GRAY + " grid" + (loadedGrids != 1 ? "s" : ""));
+        } else
+            sender.sendMessage(ChatColor.GOLD + "Loaded Dungeon Chunks: " + ChatColor.DARK_RED + ChatColor.ITALIC + "Unknown!");
+
+        // Print the service count
+        sender.sendMessage(ChatColor.GOLD + "Running Services: " + ChatColor.WHITE + Core.instance.getServiceManager().getServiceCount(true) + ChatColor.GRAY + " / " + Core.instance.getServiceManager().getServiceCount());
+
+        // Print the plugin runtime
+        printPluginRuntime(sender);
+
+        // Show the version status
+        sender.sendMessage(ChatColor.GOLD + "Version: " + ChatColor.WHITE + "Dungeon Maze v" + DungeonMaze.getVersionName() + ChatColor.GRAY + " (code: " + DungeonMaze.getVersionCode() + ")");
+
+        // Print the server status
+        printServerStatus(sender);
+
+        // Print the machine status
+        printMachineStatus(sender);
+        return true;
+    }
+
+    /**
+     * Print the plugin runtime.
+     *
+     * @param sender Command sender to print the runtime to.
+     */
+    public void printPluginRuntime(CommandSender sender) {
+        // Get the runtime
+        long runtime = new Date().getTime() - Core.getInitializationTime().getTime();
+
+        // Calculate the timings
+        int millis = (int) (runtime % 1000);
+        runtime/=1000;
+        int seconds = (int) (runtime % 60);
+        runtime/=60;
+        int minutes = (int) (runtime % 60);
+        runtime/=60;
+        int hours = (int) runtime;
+
+        // Create a double and triple digit formatter
+        DecimalFormat doubleDigit = new DecimalFormat("######00");
+        DecimalFormat tripleDigit = new DecimalFormat("000");
+
+        // Generate the timing string
+        StringBuilder runtimeStr = new StringBuilder(ChatColor.WHITE + doubleDigit.format(seconds) + ChatColor.GRAY + "." + ChatColor.WHITE + tripleDigit.format(millis));
+        String measurement = "Seconds";
+        if(minutes > 0 || hours > 0) {
+            runtimeStr.insert(0, ChatColor.WHITE + doubleDigit.format(minutes) + ChatColor.GRAY + ":");
+            measurement = "Minutes";
+            if(hours > 0) {
+                runtimeStr.insert(0, ChatColor.WHITE + doubleDigit.format(hours) + ChatColor.GRAY + ":");
+                measurement = "Hours";
+            }
+        }
+
+        // Print the runtime
+        sender.sendMessage(ChatColor.GOLD + "Runtime: " + ChatColor.WHITE + runtimeStr + " " + ChatColor.GRAY + measurement);
+    }
+
+    /**
+     * Print the server status.
+     *
+     * @param sender The command sender to print the status to.
+     */
+    public void printServerStatus(CommandSender sender) {
+        // Print the header
+        sender.sendMessage(ChatColor.GRAY + "" + ChatColor.ITALIC + "Server Status:");
+
+        // Print the server status
+        sender.sendMessage(ChatColor.GOLD + "Detected Minecraft Version: " + ChatColor.WHITE + MinecraftUtils.getMinecraftVersion());
+        sender.sendMessage(ChatColor.GOLD + "Detected Minecraft Server: " + ChatColor.WHITE + MinecraftUtils.getServerType().getName());
+        sender.sendMessage(ChatColor.GOLD + "Server Version: " + ChatColor.WHITE + Bukkit.getVersion());
+        sender.sendMessage(ChatColor.GOLD + "Bukkit Version: " + ChatColor.WHITE + Bukkit.getBukkitVersion());
+        sender.sendMessage(ChatColor.GOLD + "Running Plugins: " + ChatColor.WHITE + Bukkit.getPluginManager().getPlugins().length);
+
+        // Get the world manager
+        WorldManager worldManager = Core.getWorldManager();
+        if(worldManager != null)
+            sender.sendMessage(ChatColor.GOLD + "Loaded Worlds: " + ChatColor.WHITE + Bukkit.getWorlds().size() + ChatColor.GRAY + " / " + worldManager.getWorlds().size());
+
+        // Print the server time
+        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        sender.sendMessage(ChatColor.GOLD + "Server Time: " + ChatColor.WHITE + dateFormat.format(new Date()));
+    }
+
+    /**
+     * Print the machine status.
+     *
+     * @param sender The command sender to print the status to.
+     */
+    public void printMachineStatus(CommandSender sender) {
+        // Print the header
+        sender.sendMessage(ChatColor.GRAY + "" + ChatColor.ITALIC + "Machine Status:");
+
+        // Return the machine status
+        sender.sendMessage(ChatColor.GOLD + "OS Name: " + ChatColor.WHITE + System.getProperty("os.name"));
+        sender.sendMessage(ChatColor.GOLD + "OS Architecture: " + ChatColor.WHITE + SystemUtils.getSystemArchNumber() + "-bit" + ChatColor.GRAY + " (" + SystemUtils.getSystemArchFull() + ")");
+        sender.sendMessage(ChatColor.GOLD + "OS Version: " + ChatColor.WHITE + System.getProperty("os.version"));
+        sender.sendMessage(ChatColor.GOLD + "Java Version: " + ChatColor.WHITE + System.getProperty("java.version") + ChatColor.GRAY + " (" + System.getProperty("sun.arch.data.model") + "-bit)");
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/TeleportCommand.java b/src/main/java/fr/xephi/authme/commands/dynamic/executable/TeleportCommand.java
new file mode 100644
index 00000000..4b3a6dc3
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/executable/TeleportCommand.java
@@ -0,0 +1,80 @@
+package fr.xephi.authme.commands.dynamic.executable;
+
+import com.timvisee.dungeonmaze.Core;
+import com.timvisee.dungeonmaze.command.CommandParts;
+import com.timvisee.dungeonmaze.command.ExecutableCommand;
+import com.timvisee.dungeonmaze.world.WorldManager;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class TeleportCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Make sure the command is executed by an in-game player
+        if(!(sender instanceof Player)) {
+            sender.sendMessage(ChatColor.DARK_RED + "You need to be in-game to use this command!");
+            return true;
+        }
+
+        // Get the player and the world name to teleport to
+        Player player = (Player) sender;
+        String worldName = commandArguments.get(0);
+
+        // Get the world manager, and make sure it's valid
+        WorldManager worldManager = Core.getWorldManager();
+        boolean showWorldManagerError = false;
+        if(worldManager == null)
+            showWorldManagerError = true;
+        else if(!worldManager.isInit())
+            showWorldManagerError = true;
+        if(showWorldManagerError) {
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to teleport, world manager not available!");
+            return true;
+        }
+
+        // Make sure the world exists
+        if(!worldManager.isWorld(worldName)) {
+            sender.sendMessage(ChatColor.DARK_RED + worldName);
+            sender.sendMessage(ChatColor.DARK_RED + "This world doesn't exists!");
+            return true;
+        }
+
+        // Try to load the world
+        World world = worldManager.loadWorld(worldName);
+
+        // Make sure the world was loaded successfully
+        if(world == null) {
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to teleport, unable to load the world!");
+            return true;
+        }
+
+        // Get the spawn location to teleport the player to
+        Location spawn = world.getSpawnLocation();
+
+        // Force-set the location on Dungeon Maze worlds
+        // TODO: Fix this!
+        if(worldManager.isDungeonMazeWorld(worldName)) {
+            spawn.setX(4);
+            spawn.setY(68);
+            spawn.setZ(4);
+        }
+
+        // Teleport the player, show a status message and return true
+        player.teleport(spawn);
+        player.sendMessage(ChatColor.GREEN + "You have been teleported to " + ChatColor.GOLD + worldName + ChatColor.GREEN + "!");
+        return true;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/UnloadWorldCommand.java b/src/main/java/fr/xephi/authme/commands/dynamic/executable/UnloadWorldCommand.java
new file mode 100644
index 00000000..944c486d
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/executable/UnloadWorldCommand.java
@@ -0,0 +1,107 @@
+package fr.xephi.authme.commands.dynamic.executable;
+
+import com.timvisee.dungeonmaze.Core;
+import com.timvisee.dungeonmaze.command.CommandParts;
+import com.timvisee.dungeonmaze.command.ExecutableCommand;
+import com.timvisee.dungeonmaze.util.Profiler;
+import com.timvisee.dungeonmaze.world.WorldManager;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class UnloadWorldCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Get and trim the preferred world name
+        String worldName = commandArguments.get(0).trim();
+
+        // Profile the world unloading
+        Profiler p = new Profiler(true);
+
+        // Validate the world name
+        if(!WorldManager.isValidWorldName(worldName)) {
+            sender.sendMessage(ChatColor.DARK_RED + worldName);
+            sender.sendMessage(ChatColor.DARK_RED + "The world name contains invalid characters!");
+            return true;
+        }
+
+        // Get the world manager, and make sure it's valid
+        WorldManager worldManager = Core.getWorldManager();
+        boolean showWorldManagerError = false;
+        if(worldManager == null)
+            showWorldManagerError = true;
+        else if(!worldManager.isInit())
+            showWorldManagerError = true;
+        if(showWorldManagerError) {
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to unload the world, world manager not available!");
+            return true;
+        }
+
+        // Make sure the world exists
+        if(!worldManager.isWorld(worldName)) {
+            sender.sendMessage(ChatColor.DARK_RED + "The world " + ChatColor.GOLD + worldName + ChatColor.DARK_RED + " doesn't exist!");
+            return true;
+        }
+
+        // Make sure the world is loaded
+        if(!worldManager.isWorldLoaded(worldName)) {
+            sender.sendMessage(ChatColor.DARK_RED + "The world " + ChatColor.GOLD + worldName + ChatColor.DARK_RED + " isn't loaded!");
+            return true;
+        }
+
+        // Make sure the main world isn't unloaded
+        if(worldManager.isMainWorld(worldName)) {
+            sender.sendMessage(ChatColor.DARK_RED + "The main world can't be unloaded!");
+            return true;
+        }
+
+        // Get all players in the world
+        List<Player> players = Bukkit.getOnlinePlayers().stream().filter(player -> player.getWorld().getName().equals(worldName)).collect(Collectors.toList());
+        int playerCount = players.size();
+
+        // Teleport all players away
+        if(playerCount > 0) {
+            // Get the main world
+            World mainWorld = worldManager.getMainWorld();
+            Location mainWorldSpawn = mainWorld.getSpawnLocation();
+
+            // Teleport all players
+            for(Player player : players) {
+                // Teleport the player to the spawn of the main world
+                player.teleport(mainWorldSpawn);
+
+                // Show a message to the player
+                player.sendMessage(ChatColor.YELLOW + "The current world is being unloaded, you've been teleported!");
+            }
+
+            // Show a status message
+            sender.sendMessage(ChatColor.YELLOW + "Teleported " + ChatColor.GOLD + playerCount + ChatColor.YELLOW + " player" + (playerCount != 1 ? "s" : "") + " away!");
+        }
+
+        // Force the world to be loaded if it isn't already loaded
+        if(!worldManager.unloadWorld(worldName)) {
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to unload the world!");
+            return true;
+        }
+
+        // Show a status message, return the result
+        sender.sendMessage(ChatColor.GREEN + "The world " + ChatColor.GOLD + worldName + ChatColor.GREEN + " has been unloaded, took " + p.getTimeFormatted() + "!");
+        return true;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/VersionCommand.java b/src/main/java/fr/xephi/authme/commands/dynamic/executable/VersionCommand.java
new file mode 100644
index 00000000..17658f60
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/executable/VersionCommand.java
@@ -0,0 +1,80 @@
+package fr.xephi.authme.commands.dynamic.executable;
+
+import com.timvisee.dungeonmaze.DungeonMaze;
+import com.timvisee.dungeonmaze.command.CommandParts;
+import com.timvisee.dungeonmaze.command.ExecutableCommand;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class VersionCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Show some version info
+        sender.sendMessage(ChatColor.GOLD + "==========[ " + DungeonMaze.PLUGIN_NAME.toUpperCase() + " ABOUT ]==========");
+        sender.sendMessage(ChatColor.GOLD + "Version: " + ChatColor.WHITE + DungeonMaze.PLUGIN_NAME + " v" + DungeonMaze.getVersionName() + ChatColor.GRAY + " (code: " + DungeonMaze.getVersionCode() + ")");
+        sender.sendMessage(ChatColor.GOLD + "Developers:");
+        printDeveloper(sender, "Tim Visee", "timvisee", "Lead Developer");
+        printDeveloper(sender, "Xephi", "xephi", "Code Contributor");
+        printDeveloper(sender, "sgdc3", "sgdc3", "Code Contributor");
+        printDeveloper(sender, "Metonymia", "Metonymia", "Design Contributor");
+        sender.sendMessage(ChatColor.GOLD + "Website: " + ChatColor.WHITE + "http://timvisee.com/projects/bukkit/dungeon-maze/");
+        sender.sendMessage(ChatColor.GOLD + "License: " + ChatColor.WHITE + "GNU GPL v3.0" + ChatColor.GRAY + ChatColor.ITALIC + " (See LICENSE file)");
+        sender.sendMessage(ChatColor.GOLD + "Copyright: " + ChatColor.WHITE + "Copyright (c) Tim Visee 2015. All rights reserved.");
+        return true;
+    }
+
+    /**
+     * Print a developer with proper styling.
+     *
+     * @param sender The command sender.
+     * @param name The display name of the developer.
+     * @param minecraftName The Minecraft username of the developer, if available.
+     * @param function The function of the developer.
+     */
+    @SuppressWarnings("StringConcatenationInsideStringBufferAppend")
+    private void printDeveloper(CommandSender sender, String name, String minecraftName, String function) {
+        // Print the name
+        StringBuilder msg = new StringBuilder();
+        msg.append(" " + ChatColor.WHITE);
+        msg.append(name);
+
+        // Append the Minecraft name, if available
+        if(minecraftName.length() != 0)
+            msg.append(ChatColor.GRAY + " // " + ChatColor.WHITE + minecraftName);
+        msg.append(ChatColor.GRAY + "" + ChatColor.ITALIC + " (" + function + ")");
+
+        // Show the online status
+        if(minecraftName.length() != 0)
+            if(isPlayerOnline(minecraftName))
+                msg.append(ChatColor.GREEN + "" + ChatColor.ITALIC + " (In-Game)");
+
+        // Print the message
+        sender.sendMessage(msg.toString());
+    }
+
+    /**
+     * Check whether a player is online.
+     *
+     * @param minecraftName The Minecraft player name.
+     *
+     * @return True if the player is online, false otherwise.
+     */
+    private boolean isPlayerOnline(String minecraftName) {
+        for(Player player : Bukkit.getOnlinePlayers())
+            if(player.getName().equalsIgnoreCase(minecraftName))
+                return true;
+        return false;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/help/HelpPrinter.java b/src/main/java/fr/xephi/authme/commands/dynamic/help/HelpPrinter.java
new file mode 100644
index 00000000..28e685b8
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/help/HelpPrinter.java
@@ -0,0 +1,189 @@
+package fr.xephi.authme.commands.dynamic.help;
+
+import com.timvisee.dungeonmaze.Core;
+import com.timvisee.dungeonmaze.command.CommandArgumentDescription;
+import com.timvisee.dungeonmaze.command.CommandDescription;
+import com.timvisee.dungeonmaze.command.CommandParts;
+import com.timvisee.dungeonmaze.command.CommandPermissions;
+import com.timvisee.dungeonmaze.util.StringUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class HelpPrinter {
+
+    /**
+     * Print the command help information.
+     *
+     * @param sender The command sender to print the help to.
+     * @param command The command to print.
+     * @param commandReference The command reference used.
+     */
+    public static void printCommand(CommandSender sender, CommandDescription command, CommandParts commandReference) {
+        // Print the proper command syntax
+        sender.sendMessage(ChatColor.GOLD + "Command: " + HelpSyntaxHelper.getCommandSyntax(command, commandReference, null, true));
+    }
+
+    /**
+     * Print the command help description information. This will print both the short, as the detailed description if available.
+     *
+     * @param sender The command sender to print the help to.
+     * @param command The command to print the description help for.
+     */
+    public static void printCommandDescription(CommandSender sender, CommandDescription command) {
+        // Print the regular description, if available
+        if(command.hasDescription())
+            sender.sendMessage(ChatColor.GOLD + "Short Description: " + ChatColor.WHITE + command.getDescription());
+
+        // Print the detailed description, if available
+        if(command.hasDetailedDescription()) {
+            sender.sendMessage(ChatColor.GOLD + "Detailed Description:");
+            sender.sendMessage(ChatColor.WHITE + " " + command.getDetailedDescription());
+        }
+    }
+
+    /**
+     * Print the command help arguments information if available.
+     *
+     * @param sender The command sender to print the help to.
+     * @param command The command to print the argument help for.
+     */
+    @SuppressWarnings("StringConcatenationInsideStringBufferAppend")
+    public static void printArguments(CommandSender sender, CommandDescription command) {
+        // Make sure there are any commands to print
+        if(!command.hasArguments() && command.getMaximumArguments() >= 0)
+            return;
+
+        // Print the header
+        sender.sendMessage(ChatColor.GOLD + "Arguments:");
+
+        // Print each argument
+        for(CommandArgumentDescription arg : command.getArguments()) {
+            // Create a string builder to build the syntax in
+            StringBuilder argString = new StringBuilder();
+            argString.append(" " + ChatColor.YELLOW + ChatColor.ITALIC + arg.getLabel() + " : " + ChatColor.WHITE + arg.getDescription());
+
+            // Suffix a note if the command is optional
+            if(arg.isOptional())
+                argString.append(ChatColor.GRAY + "" + ChatColor.ITALIC + " (Optional)");
+
+            // Print the syntax
+            sender.sendMessage(argString.toString());
+        }
+
+        // Show the unlimited arguments argument
+        if(command.getMaximumArguments() < 0)
+            sender.sendMessage(" " + ChatColor.YELLOW + ChatColor.ITALIC + "... : " + ChatColor.WHITE + "Any additional arguments." + ChatColor.GRAY + ChatColor.ITALIC + " (Optional)");
+    }
+
+    /**
+     * Print the command help permissions information if available.
+     *
+     * @param sender The command sender to print the help to.
+     * @param command The command to print the permissions help for.
+     */
+    public static void printPermissions(CommandSender sender, CommandDescription command) {
+        // Get the permissions and make sure it isn't null
+        CommandPermissions permissions = command.getCommandPermissions();
+        if(permissions == null)
+            return;
+
+        // Make sure any permission node is set
+        if(permissions.getPermissionNodeCount() <= 0)
+            return;
+
+        // Print the header
+        sender.sendMessage(ChatColor.GOLD + "Permissions:");
+
+        // Print each node
+        for(String node : permissions.getPermissionNodes()) {
+            boolean nodePermission = true;
+            if(sender instanceof Player)
+                nodePermission = Core.getPermissionsManager().hasPermission((Player) sender, node, false);
+            final String nodePermsString = ChatColor.GRAY + (nodePermission ? ChatColor.ITALIC + " (Permission!)" : ChatColor.ITALIC + " (No Permission!)");
+            sender.sendMessage(" " + ChatColor.YELLOW + ChatColor.ITALIC + node + nodePermsString);
+        }
+
+        // Print the default permission
+        switch(permissions.getDefaultPermission()) {
+        case ALLOWED:
+            sender.sendMessage(ChatColor.GOLD + " Default: " + ChatColor.GRAY + ChatColor.ITALIC + "Permission!");
+            break;
+
+        case OP_ONLY:
+            final String defaultPermsString = ChatColor.GRAY + (permissions.getDefaultPermissionCommandSender(sender) ? ChatColor.ITALIC + " (Permission!)" : ChatColor.ITALIC + " (No Permission!)");
+            sender.sendMessage(ChatColor.GOLD + " Default: " + ChatColor.YELLOW + ChatColor.ITALIC + "OP's Only!" + defaultPermsString);
+            break;
+
+        case NOT_ALLOWED:
+        default:
+            sender.sendMessage(ChatColor.GOLD + " Default: " + ChatColor.GRAY + ChatColor.ITALIC + "No Permission!");
+            break;
+        }
+
+        // Print the permission result
+        if(permissions.hasPermission(sender))
+            sender.sendMessage(ChatColor.GOLD + " Result: " + ChatColor.GREEN + ChatColor.ITALIC + "Permission!");
+        else
+            sender.sendMessage(ChatColor.GOLD + " Result: " + ChatColor.DARK_RED + ChatColor.ITALIC + "No Permission!");
+    }
+
+    /**
+     * Print the command help alternatives information if available.
+     *
+     * @param sender The command sender to print the help to.
+     * @param command The command used.
+     * @param commandReference The original command reference used for this command.
+     */
+    public static void printAlternatives(CommandSender sender, CommandDescription command, CommandParts commandReference) {
+        // Make sure there are any alternatives
+        if(command.getLabels().size() <= 1)
+            return;
+
+        // Print the header
+        sender.sendMessage(ChatColor.GOLD + "Alternatives:");
+
+        // Get the label used
+        final String usedLabel = commandReference.get(command.getParentCount());
+
+        // Create a list of alternatives
+        List<String> alternatives = new ArrayList<>();
+        for(String entry : command.getLabels()) {
+            // Exclude the proper argument
+            if(entry.equalsIgnoreCase(usedLabel))
+                continue;
+            alternatives.add(entry);
+        }
+
+        // Sort the alternatives
+        Collections.sort(alternatives, (o1, o2) -> Double.compare(StringUtils.getDifference(usedLabel, o1), StringUtils.getDifference(usedLabel, o2)));
+
+        // Print each alternative with proper syntax
+        for(String alternative : alternatives)
+            sender.sendMessage(" " + HelpSyntaxHelper.getCommandSyntax(command, commandReference, alternative, true));
+    }
+
+    /**
+     * Print the command help child's information if available.
+     *
+     * @param sender The command sender to print the help to.
+     * @param command The command to print the help for.
+     * @param commandReference The original command reference used for this command.
+     */
+    public static void printChildren(CommandSender sender, CommandDescription command, CommandParts commandReference) {
+        // Make sure there are child's
+        if(command.getChilds().size() <= 0)
+            return;
+
+        // Print the header
+        sender.sendMessage(ChatColor.GOLD + "Commands:");
+
+        // Loop through each child
+        for(CommandDescription child : command.getChilds())
+            sender.sendMessage(" " + HelpSyntaxHelper.getCommandSyntax(child, commandReference, null, false) + ChatColor.GRAY + ChatColor.ITALIC + " : " + child.getDescription());
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/help/HelpProvider.java b/src/main/java/fr/xephi/authme/commands/dynamic/help/HelpProvider.java
new file mode 100644
index 00000000..9fb06600
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/help/HelpProvider.java
@@ -0,0 +1,114 @@
+package fr.xephi.authme.commands.dynamic.help;
+
+import com.timvisee.dungeonmaze.Core;
+import com.timvisee.dungeonmaze.command.*;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+public class HelpProvider {
+
+    /**
+     * Show help for a specific command.
+     *
+     * @param sender The command sender the help needs to be shown to.
+     * @param reference The command reference to the help command.
+     * @param helpQuery The query to show help for.
+     */
+    public static void showHelp(CommandSender sender, CommandParts reference, CommandParts helpQuery) {
+        showHelp(sender, reference, helpQuery, true, true, true, true, true, true);
+    }
+
+    /**
+     * Show help for a specific command.
+     *
+     * @param sender The command sender the help needs to be shown to.
+     * @param reference The command reference to the help command.
+     * @param helpQuery The query to show help for.
+     * @param showCommand True to show the command.
+     * @param showDescription True to show the command description, both the short and detailed description.
+     * @param showArguments True to show the command argument help.
+     * @param showPermissions True to show the command permission help.
+     * @param showAlternatives True to show the command alternatives.
+     * @param showCommands True to show the child commands.
+     */
+    public static void showHelp(CommandSender sender, CommandParts reference, CommandParts helpQuery, boolean showCommand, boolean showDescription, boolean showArguments, boolean showPermissions, boolean showAlternatives, boolean showCommands) {
+        // Find the command for this help query, one with and one without a prefixed base command
+        FoundCommandResult result = Core.getCommandHandler().getCommandManager().findCommand(new CommandParts(helpQuery.getList()));
+        CommandParts commandReferenceOther = new CommandParts(reference.get(0), helpQuery.getList());
+        FoundCommandResult resultOther = Core.getCommandHandler().getCommandManager().findCommand(commandReferenceOther);
+        if(resultOther != null) {
+            if(result == null)
+                result = resultOther;
+
+            else if(result.getDifference() > resultOther.getDifference())
+                result = resultOther;
+        }
+
+        // Make sure a result was found
+        if(result == null) {
+            // Show a warning message
+            sender.sendMessage(ChatColor.DARK_RED + "" + ChatColor.ITALIC + helpQuery);
+            sender.sendMessage(ChatColor.DARK_RED + "Couldn't show any help information for this help query.");
+            return;
+        }
+
+        // Get the command description, and make sure it's valid
+        CommandDescription command = result.getCommandDescription();
+        if(command == null) {
+            // Show a warning message
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to retrieve any help information!");
+            return;
+        }
+
+        // Get the proper command reference to use for the help page
+        CommandParts commandReference = command.getCommandReference(result.getQueryReference());
+
+        // Get the base command
+        String baseCommand = commandReference.get(0);
+
+        // Make sure the difference between the command reference and the actual command isn't too big
+        final double commandDifference = result.getDifference();
+        if(commandDifference > 0.20) {
+            // Show the unknown command warning
+            sender.sendMessage(ChatColor.DARK_RED + "No help found for '" + helpQuery + "'!");
+
+            // Get the suggested command
+            CommandParts suggestedCommandParts = new CommandParts(result.getCommandDescription().getCommandReference(commandReference).getRange(1));
+
+            // Show a command suggestion if available and the difference isn't too big
+            if(commandDifference < 0.75)
+                if(result.getCommandDescription() != null)
+                    sender.sendMessage(ChatColor.YELLOW + "Did you mean " + ChatColor.GOLD + "/" + baseCommand + " help " + suggestedCommandParts + ChatColor.YELLOW + "?");
+
+            // Show the help command
+            sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/" + baseCommand + " help" + ChatColor.YELLOW + " to view help.");
+            return;
+        }
+
+        // Show a message when the command handler is assuming a command
+        if(commandDifference > 0) {
+            // Get the suggested command
+            CommandParts suggestedCommandParts = new CommandParts(result.getCommandDescription().getCommandReference(commandReference).getRange(1));
+
+            // Show the suggested command
+            sender.sendMessage(ChatColor.DARK_RED + "No help found, assuming '" + ChatColor.GOLD + suggestedCommandParts + ChatColor.DARK_RED + "'!");
+        }
+
+        // Print the help header
+        sender.sendMessage(ChatColor.GOLD + "==========[ DUNGEON MAZE HELP ]==========");
+
+        // Print the command help information
+        if(showCommand)
+            HelpPrinter.printCommand(sender, command, commandReference);
+        if(showDescription)
+            HelpPrinter.printCommandDescription(sender, command);
+        if(showArguments)
+            HelpPrinter.printArguments(sender, command);
+        if(showPermissions)
+            HelpPrinter.printPermissions(sender, command);
+        if(showAlternatives)
+            HelpPrinter.printAlternatives(sender, command, commandReference);
+        if(showCommands)
+            HelpPrinter.printChildren(sender, command, commandReference);
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/help/HelpSyntaxHelper.java b/src/main/java/fr/xephi/authme/commands/dynamic/help/HelpSyntaxHelper.java
new file mode 100644
index 00000000..5dd84fda
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/commands/dynamic/help/HelpSyntaxHelper.java
@@ -0,0 +1,60 @@
+package fr.xephi.authme.commands.dynamic.help;
+
+import com.timvisee.dungeonmaze.command.CommandArgumentDescription;
+import com.timvisee.dungeonmaze.command.CommandDescription;
+import com.timvisee.dungeonmaze.command.CommandParts;
+import com.timvisee.dungeonmaze.util.ListUtils;
+import org.bukkit.ChatColor;
+
+public class HelpSyntaxHelper {
+
+    /**
+     * Get the proper syntax for a command.
+     *
+     * @param commandDescription The command to get the syntax for.
+     * @param commandReference The reference of the command.
+     * @param alternativeLabel The alternative label to use for this command syntax.
+     * @param highlight True to highlight the important parts of this command.
+     *
+     * @return The command with proper syntax.
+     */
+    @SuppressWarnings("StringConcatenationInsideStringBufferAppend")
+    public static String getCommandSyntax(CommandDescription commandDescription, CommandParts commandReference, String alternativeLabel, boolean highlight) {
+        // Create a string builder to build the command
+        StringBuilder sb = new StringBuilder();
+
+        // Set the color and prefix a slash
+        sb.append(ChatColor.WHITE + "/");
+
+        // Get the help command reference, and the command label
+        CommandParts helpCommandReference = commandDescription.getCommandReference(commandReference);
+        final String parentCommand = (new CommandParts(helpCommandReference.getRange(0, helpCommandReference.getCount() - 1))).toString();
+        String commandLabel = helpCommandReference.get(helpCommandReference.getCount() - 1);
+
+        // Check whether the alternative label should be used
+        if(alternativeLabel != null)
+            if(alternativeLabel.trim().length() > 0)
+                commandLabel = alternativeLabel;
+
+        // Show the important bit of the command, highlight this part if required
+        sb.append(ListUtils.implode(parentCommand, (highlight ? ChatColor.YELLOW + "" + ChatColor.BOLD : "") + commandLabel, " "));
+        if(highlight)
+            sb.append(ChatColor.YELLOW);
+
+        // Add each command arguments
+        for(CommandArgumentDescription arg : commandDescription.getArguments()) {
+            // Add the argument as optional or non-optional argument
+            if(!arg.isOptional())
+                sb.append(ChatColor.ITALIC + " <" + arg.getLabel() + ">");
+            else
+                sb.append(ChatColor.ITALIC + " [" + arg.getLabel() + "]");
+        }
+
+        // Add some dots if the command allows unlimited arguments
+        if(commandDescription.getMaximumArguments() < 0)
+            sb.append(ChatColor.ITALIC + " ...");
+
+        // Return the build command syntax
+        return sb.toString();
+    }
+}

From eeec8ca228a4283abe66c1e3916b8a0944d4832c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 15:34:13 +0100
Subject: [PATCH 007/117] Moved new command handler system to new package

---
 .../CommandArgumentDescription.java                    |  2 +-
 .../dynamic => command}/CommandDescription.java        |  2 +-
 .../{commands/dynamic => command}/CommandHandler.java  |  2 +-
 .../dynamic => command}/CommandHandlerService.java     |  2 +-
 .../{commands/dynamic => command}/CommandManager.java  |  2 +-
 .../{commands/dynamic => command}/CommandParts.java    |  2 +-
 .../dynamic => command}/CommandPermissions.java        |  2 +-
 .../dynamic => command}/ExecutableCommand.java         |  2 +-
 .../dynamic => command}/FoundCommandResult.java        |  2 +-
 .../executable/CheckUpdatesCommand.java                |  2 +-
 .../executable/CreateWorldCommand.java                 |  2 +-
 .../executable/DungeonMazeCommand.java                 |  2 +-
 .../dynamic => command}/executable/HelpCommand.java    |  2 +-
 .../executable/InstallUpdateCommand.java               |  2 +-
 .../executable/ListWorldCommand.java                   |  2 +-
 .../executable/LoadWorldCommand.java                   |  2 +-
 .../dynamic => command}/executable/ReloadCommand.java  |  2 +-
 .../executable/ReloadPermissionsCommand.java           |  2 +-
 .../dynamic => command}/executable/RestartCommand.java |  2 +-
 .../dynamic => command}/executable/ServiceCommand.java |  2 +-
 .../dynamic => command}/executable/StatusCommand.java  |  2 +-
 .../executable/TeleportCommand.java                    |  2 +-
 .../executable/UnloadWorldCommand.java                 |  2 +-
 .../dynamic => command}/executable/VersionCommand.java |  2 +-
 .../dynamic => command}/help/HelpPrinter.java          | 10 +++++-----
 .../dynamic => command}/help/HelpProvider.java         |  2 +-
 .../dynamic => command}/help/HelpSyntaxHelper.java     |  2 +-
 27 files changed, 31 insertions(+), 31 deletions(-)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/CommandArgumentDescription.java (98%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/CommandDescription.java (99%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/CommandHandler.java (99%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/CommandHandlerService.java (98%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/CommandManager.java (99%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/CommandParts.java (99%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/CommandPermissions.java (99%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/ExecutableCommand.java (92%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/FoundCommandResult.java (99%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/executable/CheckUpdatesCommand.java (98%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/executable/CreateWorldCommand.java (99%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/executable/DungeonMazeCommand.java (95%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/executable/HelpCommand.java (96%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/executable/InstallUpdateCommand.java (98%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/executable/ListWorldCommand.java (98%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/executable/LoadWorldCommand.java (98%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/executable/ReloadCommand.java (98%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/executable/ReloadPermissionsCommand.java (97%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/executable/RestartCommand.java (98%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/executable/ServiceCommand.java (98%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/executable/StatusCommand.java (99%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/executable/TeleportCommand.java (98%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/executable/UnloadWorldCommand.java (98%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/executable/VersionCommand.java (98%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/help/HelpPrinter.java (96%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/help/HelpProvider.java (99%)
 rename src/main/java/fr/xephi/authme/{commands/dynamic => command}/help/HelpSyntaxHelper.java (98%)

diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/CommandArgumentDescription.java b/src/main/java/fr/xephi/authme/command/CommandArgumentDescription.java
similarity index 98%
rename from src/main/java/fr/xephi/authme/commands/dynamic/CommandArgumentDescription.java
rename to src/main/java/fr/xephi/authme/command/CommandArgumentDescription.java
index 5d021b65..7efede29 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/CommandArgumentDescription.java
+++ b/src/main/java/fr/xephi/authme/command/CommandArgumentDescription.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic;
+package fr.xephi.authme.command;
 
 public class CommandArgumentDescription {
 
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/CommandDescription.java b/src/main/java/fr/xephi/authme/command/CommandDescription.java
similarity index 99%
rename from src/main/java/fr/xephi/authme/commands/dynamic/CommandDescription.java
rename to src/main/java/fr/xephi/authme/command/CommandDescription.java
index 2ab78ac6..01034a2d 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/CommandDescription.java
+++ b/src/main/java/fr/xephi/authme/command/CommandDescription.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic;
+package fr.xephi.authme.command;
 
 import com.timvisee.dungeonmaze.util.StringUtils;
 import org.bukkit.command.CommandSender;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/CommandHandler.java b/src/main/java/fr/xephi/authme/command/CommandHandler.java
similarity index 99%
rename from src/main/java/fr/xephi/authme/commands/dynamic/CommandHandler.java
rename to src/main/java/fr/xephi/authme/command/CommandHandler.java
index e3a5808c..0302255b 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/CommandHandler.java
+++ b/src/main/java/fr/xephi/authme/command/CommandHandler.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic;
+package fr.xephi.authme.command;
 
 import com.timvisee.dungeonmaze.command.help.HelpProvider;
 import org.bukkit.ChatColor;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/CommandHandlerService.java b/src/main/java/fr/xephi/authme/command/CommandHandlerService.java
similarity index 98%
rename from src/main/java/fr/xephi/authme/commands/dynamic/CommandHandlerService.java
rename to src/main/java/fr/xephi/authme/command/CommandHandlerService.java
index 7cd4dd11..f3fc2de5 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/CommandHandlerService.java
+++ b/src/main/java/fr/xephi/authme/command/CommandHandlerService.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic;
+package fr.xephi.authme.command;
 
 import com.timvisee.dungeonmaze.service.Service;
 
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
similarity index 99%
rename from src/main/java/fr/xephi/authme/commands/dynamic/CommandManager.java
rename to src/main/java/fr/xephi/authme/command/CommandManager.java
index ce14a7b0..912e7661 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic;
+package fr.xephi.authme.command;
 
 import com.timvisee.dungeonmaze.command.executable.*;
 
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/CommandParts.java b/src/main/java/fr/xephi/authme/command/CommandParts.java
similarity index 99%
rename from src/main/java/fr/xephi/authme/commands/dynamic/CommandParts.java
rename to src/main/java/fr/xephi/authme/command/CommandParts.java
index 6aca8240..fd2ef6b8 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/CommandParts.java
+++ b/src/main/java/fr/xephi/authme/command/CommandParts.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic;
+package fr.xephi.authme.command;
 
 import com.timvisee.dungeonmaze.util.ListUtils;
 import com.timvisee.dungeonmaze.util.StringUtils;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/CommandPermissions.java b/src/main/java/fr/xephi/authme/command/CommandPermissions.java
similarity index 99%
rename from src/main/java/fr/xephi/authme/commands/dynamic/CommandPermissions.java
rename to src/main/java/fr/xephi/authme/command/CommandPermissions.java
index 2d79f056..0955e48f 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/CommandPermissions.java
+++ b/src/main/java/fr/xephi/authme/command/CommandPermissions.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic;
+package fr.xephi.authme.command;
 
 import com.timvisee.dungeonmaze.Core;
 import com.timvisee.dungeonmaze.permission.PermissionsManager;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/ExecutableCommand.java b/src/main/java/fr/xephi/authme/command/ExecutableCommand.java
similarity index 92%
rename from src/main/java/fr/xephi/authme/commands/dynamic/ExecutableCommand.java
rename to src/main/java/fr/xephi/authme/command/ExecutableCommand.java
index b9a89a58..9550824b 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/ExecutableCommand.java
+++ b/src/main/java/fr/xephi/authme/command/ExecutableCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic;
+package fr.xephi.authme.command;
 
 import org.bukkit.command.CommandSender;
 
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/FoundCommandResult.java b/src/main/java/fr/xephi/authme/command/FoundCommandResult.java
similarity index 99%
rename from src/main/java/fr/xephi/authme/commands/dynamic/FoundCommandResult.java
rename to src/main/java/fr/xephi/authme/command/FoundCommandResult.java
index a64e825a..e959325a 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/FoundCommandResult.java
+++ b/src/main/java/fr/xephi/authme/command/FoundCommandResult.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic;
+package fr.xephi.authme.command;
 
 import org.bukkit.command.CommandSender;
 
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/CheckUpdatesCommand.java b/src/main/java/fr/xephi/authme/command/executable/CheckUpdatesCommand.java
similarity index 98%
rename from src/main/java/fr/xephi/authme/commands/dynamic/executable/CheckUpdatesCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/CheckUpdatesCommand.java
index 2e9040c0..65f92ad4 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/executable/CheckUpdatesCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/CheckUpdatesCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic.executable;
+package fr.xephi.authme.command.executable;
 
 import com.timvisee.dungeonmaze.Core;
 import com.timvisee.dungeonmaze.command.CommandParts;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/CreateWorldCommand.java b/src/main/java/fr/xephi/authme/command/executable/CreateWorldCommand.java
similarity index 99%
rename from src/main/java/fr/xephi/authme/commands/dynamic/executable/CreateWorldCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/CreateWorldCommand.java
index a3787745..60d99787 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/executable/CreateWorldCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/CreateWorldCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic.executable;
+package fr.xephi.authme.command.executable;
 
 import com.timvisee.dungeonmaze.Core;
 import com.timvisee.dungeonmaze.DungeonMaze;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/DungeonMazeCommand.java b/src/main/java/fr/xephi/authme/command/executable/DungeonMazeCommand.java
similarity index 95%
rename from src/main/java/fr/xephi/authme/commands/dynamic/executable/DungeonMazeCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/DungeonMazeCommand.java
index f2d99171..569a6286 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/executable/DungeonMazeCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/DungeonMazeCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic.executable;
+package fr.xephi.authme.command.executable;
 
 import com.timvisee.dungeonmaze.DungeonMaze;
 import com.timvisee.dungeonmaze.command.CommandParts;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/HelpCommand.java b/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
similarity index 96%
rename from src/main/java/fr/xephi/authme/commands/dynamic/executable/HelpCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
index 2c07f28d..fb4b299c 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/executable/HelpCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic.executable;
+package fr.xephi.authme.command.executable;
 
 import com.timvisee.dungeonmaze.command.CommandParts;
 import com.timvisee.dungeonmaze.command.ExecutableCommand;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/InstallUpdateCommand.java b/src/main/java/fr/xephi/authme/command/executable/InstallUpdateCommand.java
similarity index 98%
rename from src/main/java/fr/xephi/authme/commands/dynamic/executable/InstallUpdateCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/InstallUpdateCommand.java
index 0bc0126e..e796563d 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/executable/InstallUpdateCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/InstallUpdateCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic.executable;
+package fr.xephi.authme.command.executable;
 
 import com.timvisee.dungeonmaze.Core;
 import com.timvisee.dungeonmaze.command.CommandParts;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/ListWorldCommand.java b/src/main/java/fr/xephi/authme/command/executable/ListWorldCommand.java
similarity index 98%
rename from src/main/java/fr/xephi/authme/commands/dynamic/executable/ListWorldCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/ListWorldCommand.java
index cc4e5fb7..ff0b2976 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/executable/ListWorldCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/ListWorldCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic.executable;
+package fr.xephi.authme.command.executable;
 
 import com.timvisee.dungeonmaze.Core;
 import com.timvisee.dungeonmaze.DungeonMaze;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/LoadWorldCommand.java b/src/main/java/fr/xephi/authme/command/executable/LoadWorldCommand.java
similarity index 98%
rename from src/main/java/fr/xephi/authme/commands/dynamic/executable/LoadWorldCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/LoadWorldCommand.java
index ea7cb979..29174ecd 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/executable/LoadWorldCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/LoadWorldCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic.executable;
+package fr.xephi.authme.command.executable;
 
 import com.timvisee.dungeonmaze.Core;
 import com.timvisee.dungeonmaze.command.CommandParts;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/ReloadCommand.java b/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java
similarity index 98%
rename from src/main/java/fr/xephi/authme/commands/dynamic/executable/ReloadCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java
index 69caed0d..2335e7e7 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/executable/ReloadCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic.executable;
+package fr.xephi.authme.command.executable;
 
 import com.timvisee.dungeonmaze.Core;
 import com.timvisee.dungeonmaze.command.CommandParts;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/ReloadPermissionsCommand.java b/src/main/java/fr/xephi/authme/command/executable/ReloadPermissionsCommand.java
similarity index 97%
rename from src/main/java/fr/xephi/authme/commands/dynamic/executable/ReloadPermissionsCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/ReloadPermissionsCommand.java
index 6a39a162..b9f9088c 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/executable/ReloadPermissionsCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/ReloadPermissionsCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic.executable;
+package fr.xephi.authme.command.executable;
 
 import com.timvisee.dungeonmaze.Core;
 import com.timvisee.dungeonmaze.command.CommandParts;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/RestartCommand.java b/src/main/java/fr/xephi/authme/command/executable/RestartCommand.java
similarity index 98%
rename from src/main/java/fr/xephi/authme/commands/dynamic/executable/RestartCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/RestartCommand.java
index b5d790ef..dbc9d298 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/executable/RestartCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/RestartCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic.executable;
+package fr.xephi.authme.command.executable;
 
 import com.timvisee.dungeonmaze.Core;
 import com.timvisee.dungeonmaze.DungeonMaze;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/ServiceCommand.java b/src/main/java/fr/xephi/authme/command/executable/ServiceCommand.java
similarity index 98%
rename from src/main/java/fr/xephi/authme/commands/dynamic/executable/ServiceCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/ServiceCommand.java
index e65b6d3a..da89506b 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/executable/ServiceCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/ServiceCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic.executable;
+package fr.xephi.authme.command.executable;
 
 import com.timvisee.dungeonmaze.Core;
 import com.timvisee.dungeonmaze.DungeonMaze;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/StatusCommand.java b/src/main/java/fr/xephi/authme/command/executable/StatusCommand.java
similarity index 99%
rename from src/main/java/fr/xephi/authme/commands/dynamic/executable/StatusCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/StatusCommand.java
index 4a5cff31..d0bfc583 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/executable/StatusCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/StatusCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic.executable;
+package fr.xephi.authme.command.executable;
 
 import com.timvisee.dungeonmaze.Core;
 import com.timvisee.dungeonmaze.DungeonMaze;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/TeleportCommand.java b/src/main/java/fr/xephi/authme/command/executable/TeleportCommand.java
similarity index 98%
rename from src/main/java/fr/xephi/authme/commands/dynamic/executable/TeleportCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/TeleportCommand.java
index 4b3a6dc3..b1821cf5 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/executable/TeleportCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/TeleportCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic.executable;
+package fr.xephi.authme.command.executable;
 
 import com.timvisee.dungeonmaze.Core;
 import com.timvisee.dungeonmaze.command.CommandParts;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/UnloadWorldCommand.java b/src/main/java/fr/xephi/authme/command/executable/UnloadWorldCommand.java
similarity index 98%
rename from src/main/java/fr/xephi/authme/commands/dynamic/executable/UnloadWorldCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/UnloadWorldCommand.java
index 944c486d..815737b8 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/executable/UnloadWorldCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/UnloadWorldCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic.executable;
+package fr.xephi.authme.command.executable;
 
 import com.timvisee.dungeonmaze.Core;
 import com.timvisee.dungeonmaze.command.CommandParts;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/executable/VersionCommand.java b/src/main/java/fr/xephi/authme/command/executable/VersionCommand.java
similarity index 98%
rename from src/main/java/fr/xephi/authme/commands/dynamic/executable/VersionCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/VersionCommand.java
index 17658f60..7adc9229 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/executable/VersionCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/VersionCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic.executable;
+package fr.xephi.authme.command.executable;
 
 import com.timvisee.dungeonmaze.DungeonMaze;
 import com.timvisee.dungeonmaze.command.CommandParts;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/help/HelpPrinter.java b/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
similarity index 96%
rename from src/main/java/fr/xephi/authme/commands/dynamic/help/HelpPrinter.java
rename to src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
index 28e685b8..73948920 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/help/HelpPrinter.java
+++ b/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
@@ -1,10 +1,10 @@
-package fr.xephi.authme.commands.dynamic.help;
+package fr.xephi.authme.command.help;
 
 import com.timvisee.dungeonmaze.Core;
-import com.timvisee.dungeonmaze.command.CommandArgumentDescription;
-import com.timvisee.dungeonmaze.command.CommandDescription;
-import com.timvisee.dungeonmaze.command.CommandParts;
-import com.timvisee.dungeonmaze.command.CommandPermissions;
+import fr.xephi.authme.commands.CommandArgumentDescription;
+import fr.xephi.authme.commands.CommandDescription;
+import fr.xephi.authme.commands.CommandParts;
+import fr.xephi.authme.commands.CommandPermissions;
 import com.timvisee.dungeonmaze.util.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/help/HelpProvider.java b/src/main/java/fr/xephi/authme/command/help/HelpProvider.java
similarity index 99%
rename from src/main/java/fr/xephi/authme/commands/dynamic/help/HelpProvider.java
rename to src/main/java/fr/xephi/authme/command/help/HelpProvider.java
index 9fb06600..a887ead9 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/help/HelpProvider.java
+++ b/src/main/java/fr/xephi/authme/command/help/HelpProvider.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic.help;
+package fr.xephi.authme.command.help;
 
 import com.timvisee.dungeonmaze.Core;
 import com.timvisee.dungeonmaze.command.*;
diff --git a/src/main/java/fr/xephi/authme/commands/dynamic/help/HelpSyntaxHelper.java b/src/main/java/fr/xephi/authme/command/help/HelpSyntaxHelper.java
similarity index 98%
rename from src/main/java/fr/xephi/authme/commands/dynamic/help/HelpSyntaxHelper.java
rename to src/main/java/fr/xephi/authme/command/help/HelpSyntaxHelper.java
index 5dd84fda..ef1f8d39 100644
--- a/src/main/java/fr/xephi/authme/commands/dynamic/help/HelpSyntaxHelper.java
+++ b/src/main/java/fr/xephi/authme/command/help/HelpSyntaxHelper.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.commands.dynamic.help;
+package fr.xephi.authme.command.help;
 
 import com.timvisee.dungeonmaze.command.CommandArgumentDescription;
 import com.timvisee.dungeonmaze.command.CommandDescription;

From ab8eee3be91e63a85027e7380a84242ce4e326dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 15:38:49 +0100
Subject: [PATCH 008/117] Added string utilities class, fixed some imports

---
 .../authme/command/help/HelpPrinter.java      |  8 ++++----
 .../fr/xephi/authme/util/StringUtils.java     | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/fr/xephi/authme/util/StringUtils.java

diff --git a/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java b/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
index 73948920..d3d8f78d 100644
--- a/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
+++ b/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
@@ -1,10 +1,10 @@
 package fr.xephi.authme.command.help;
 
 import com.timvisee.dungeonmaze.Core;
-import fr.xephi.authme.commands.CommandArgumentDescription;
-import fr.xephi.authme.commands.CommandDescription;
-import fr.xephi.authme.commands.CommandParts;
-import fr.xephi.authme.commands.CommandPermissions;
+import fr.xephi.authme.command.CommandArgumentDescription;
+import fr.xephi.authme.command.CommandDescription;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.CommandPermissions;
 import com.timvisee.dungeonmaze.util.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
diff --git a/src/main/java/fr/xephi/authme/util/StringUtils.java b/src/main/java/fr/xephi/authme/util/StringUtils.java
new file mode 100644
index 00000000..92b14c5c
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/util/StringUtils.java
@@ -0,0 +1,19 @@
+package fr.xephi.authme.util;
+
+import net.ricecode.similarity.LevenshteinDistanceStrategy;
+import net.ricecode.similarity.StringSimilarityService;
+import net.ricecode.similarity.StringSimilarityServiceImpl;
+
+public class StringUtils {
+
+    public static double getDifference(String first, String second) {
+        if(first == null || second == null)
+            return 1.0;
+
+        StringSimilarityService service = new StringSimilarityServiceImpl(new LevenshteinDistanceStrategy());
+
+        double score = service.score(first, second);
+
+        return Math.abs(score - 1.0);
+    }
+}

From c156c988aa21ab54ef9a4e9c072f5e710627cca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 15:40:15 +0100
Subject: [PATCH 009/117] Improved string utils class, added javaDocs

---
 .../java/fr/xephi/authme/util/StringUtils.java    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/util/StringUtils.java b/src/main/java/fr/xephi/authme/util/StringUtils.java
index 92b14c5c..eab7ea15 100644
--- a/src/main/java/fr/xephi/authme/util/StringUtils.java
+++ b/src/main/java/fr/xephi/authme/util/StringUtils.java
@@ -6,14 +6,23 @@ import net.ricecode.similarity.StringSimilarityServiceImpl;
 
 public class StringUtils {
 
+    /**
+     * Get the difference of two strings.
+     *
+     * @param first First string.
+     * @param second Second string.
+     *
+     * @return The difference value.
+     */
     public static double getDifference(String first, String second) {
+        // Make sure the strings are valid.
         if(first == null || second == null)
             return 1.0;
 
+        // Create a string similarity service instance, to allow comparison
         StringSimilarityService service = new StringSimilarityServiceImpl(new LevenshteinDistanceStrategy());
 
-        double score = service.score(first, second);
-
-        return Math.abs(score - 1.0);
+        // Determine the difference value, return the result
+        return Math.abs(service.score(first, second) - 1.0);
     }
 }

From 80e66198db112fa9d637e14b42d40aaac6b37b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 15:51:28 +0100
Subject: [PATCH 010/117] Added list utilities class

---
 .../java/fr/xephi/authme/util/ListUtils.java  | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/util/ListUtils.java

diff --git a/src/main/java/fr/xephi/authme/util/ListUtils.java b/src/main/java/fr/xephi/authme/util/ListUtils.java
new file mode 100644
index 00000000..5adcfef0
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/util/ListUtils.java
@@ -0,0 +1,75 @@
+package fr.xephi.authme.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ListUtils {
+
+    /**
+     * Implode a list of elements into a single string, with a specified separator.
+     *
+     * @param elements The elements to implode.
+     * @param separator The separator to use.
+     *
+     * @return The result string.
+     */
+    public static String implode(List<String> elements, String separator) {
+        // Create a string builder
+        StringBuilder sb = new StringBuilder();
+
+        // Append each element
+        for(String element : elements) {
+            // Make sure the element isn't empty
+            if(element.trim().length() == 0)
+                continue;
+
+            // Prefix the separator if it isn't the first element
+            if(sb.length() > 0)
+                sb.append(separator);
+
+            // Append the element
+            sb.append(element);
+        }
+
+        // Return the result
+        return sb.toString();
+    }
+
+    /**
+     * Implode two lists of elements into a single string, with a specified separator.
+     *
+     * @param elements The first list of elements to implode.
+     * @param otherElements The second list of elements to implode.
+     * @param separator The separator to use.
+     *
+     * @return The result string.
+     */
+    public static String implode(List<String> elements, List<String> otherElements, String separator) {
+        // Combine the lists
+        List<String> combined = new ArrayList<>();
+        combined.addAll(elements);
+        combined.addAll(otherElements);
+
+        // Implode and return the result
+        return implode(combined, separator);
+    }
+
+    /**
+     * Implode two elements into a single string, with a specified separator.
+     *
+     * @param element The first element to implode.
+     * @param otherElement The second element to implode.
+     * @param separator The separator to use.
+     *
+     * @return The result string.
+     */
+    public static String implode(String element, String otherElement, String separator) {
+        // Combine the lists
+        List<String> combined = new ArrayList<>();
+        combined.add(element);
+        combined.add(otherElement);
+
+        // Implode and return the result
+        return implode(combined, separator);
+    }
+}

From 8105b3f07218642b8cea776809ef4ee0edaec9a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 15:51:50 +0100
Subject: [PATCH 011/117] Added missing dependency

---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index dcd0d36f..47b6bb2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -502,5 +502,12 @@
 			<optional>true</optional>
 		</dependency>
 
+        <!-- String comparison library. Used for dynamic help system. -->
+        <dependency>
+            <groupId>net.ricecode</groupId>
+            <artifactId>string-similarity</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
 	</dependencies>
 </project>

From 96d220881793c3436f94cefe589c5ee19f5d2a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 16:01:44 +0100
Subject: [PATCH 012/117] Fixed HelpPrinter class

---
 .../fr/xephi/authme/command/help/HelpPrinter.java  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java b/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
index d3d8f78d..18ec476e 100644
--- a/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
+++ b/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
@@ -1,17 +1,18 @@
 package fr.xephi.authme.command.help;
 
-import com.timvisee.dungeonmaze.Core;
+import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandArgumentDescription;
 import fr.xephi.authme.command.CommandDescription;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.CommandPermissions;
-import com.timvisee.dungeonmaze.util.StringUtils;
+import fr.xephi.authme.util.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 public class HelpPrinter {
@@ -103,7 +104,7 @@ public class HelpPrinter {
         for(String node : permissions.getPermissionNodes()) {
             boolean nodePermission = true;
             if(sender instanceof Player)
-                nodePermission = Core.getPermissionsManager().hasPermission((Player) sender, node, false);
+                nodePermission = AuthMe.getInstance().authmePermissible((Player) sender, node);
             final String nodePermsString = ChatColor.GRAY + (nodePermission ? ChatColor.ITALIC + " (Permission!)" : ChatColor.ITALIC + " (No Permission!)");
             sender.sendMessage(" " + ChatColor.YELLOW + ChatColor.ITALIC + node + nodePermsString);
         }
@@ -160,7 +161,12 @@ public class HelpPrinter {
         }
 
         // Sort the alternatives
-        Collections.sort(alternatives, (o1, o2) -> Double.compare(StringUtils.getDifference(usedLabel, o1), StringUtils.getDifference(usedLabel, o2)));
+        Collections.sort(alternatives, new Comparator<String>() {
+            @Override
+            public int compare(String o1, String o2) {
+                return Double.compare(StringUtils.getDifference(usedLabel, o1), StringUtils.getDifference(usedLabel, o2));
+            }
+        });
 
         // Print each alternative with proper syntax
         for(String alternative : alternatives)

From 59d8ced86d8fd5128dd0eeaae095a5d4ca10ea88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 16:01:59 +0100
Subject: [PATCH 013/117] Fixed imports of HelpSyntaxHelper class

---
 .../fr/xephi/authme/command/help/HelpSyntaxHelper.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/help/HelpSyntaxHelper.java b/src/main/java/fr/xephi/authme/command/help/HelpSyntaxHelper.java
index ef1f8d39..492a4f14 100644
--- a/src/main/java/fr/xephi/authme/command/help/HelpSyntaxHelper.java
+++ b/src/main/java/fr/xephi/authme/command/help/HelpSyntaxHelper.java
@@ -1,9 +1,9 @@
 package fr.xephi.authme.command.help;
 
-import com.timvisee.dungeonmaze.command.CommandArgumentDescription;
-import com.timvisee.dungeonmaze.command.CommandDescription;
-import com.timvisee.dungeonmaze.command.CommandParts;
-import com.timvisee.dungeonmaze.util.ListUtils;
+import fr.xephi.authme.command.CommandArgumentDescription;
+import fr.xephi.authme.command.CommandDescription;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.util.ListUtils;
 import org.bukkit.ChatColor;
 
 public class HelpSyntaxHelper {

From 690c7d95327e75997eace615dac1061cff5bcb3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 16:13:34 +0100
Subject: [PATCH 014/117] Added CommandHandler instance

---
 src/main/java/fr/xephi/authme/AuthMe.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index aae74c27..8bfe1169 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -11,6 +11,7 @@ import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
+import fr.xephi.authme.command.CommandHandler;
 import org.apache.logging.log4j.LogManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -77,6 +78,9 @@ public class AuthMe extends JavaPlugin {
     private static Server server;
     private Logger authmeLogger;
 
+    // TODO: Move this to a better place! -- timvisee
+    private CommandHandler commandHandler = null;
+
     public Management management;
     public NewAPI api;
     public SendMailSSL mail;
@@ -140,6 +144,10 @@ public class AuthMe extends JavaPlugin {
         authmeLogger = Logger.getLogger("AuthMe");
         authme = this;
 
+        // Set up and initialize the command handler
+        this.commandHandler = new CommandHandler(false);
+        this.commandHandler.init();
+
         // TODO: split the plugin in more modules
         moduleManager = new ModuleManager(this);
         @SuppressWarnings("unused")
@@ -808,4 +816,13 @@ public class AuthMe extends JavaPlugin {
     public String getCountryName(String ip) {
         return Utils.getCountryName(ip);
     }
+
+    /**
+     * Get the command handler instance.
+     *
+     * @return Command handler.
+     */
+    public CommandHandler getCommandHandler() {
+        return this.commandHandler;
+    }
 }

From aff503c11cad3881a5f0584ae9542c1e07ee3d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 16:13:49 +0100
Subject: [PATCH 015/117] Fixed HelpProvider class

---
 .../java/fr/xephi/authme/command/help/HelpProvider.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/help/HelpProvider.java b/src/main/java/fr/xephi/authme/command/help/HelpProvider.java
index a887ead9..42696493 100644
--- a/src/main/java/fr/xephi/authme/command/help/HelpProvider.java
+++ b/src/main/java/fr/xephi/authme/command/help/HelpProvider.java
@@ -1,7 +1,7 @@
 package fr.xephi.authme.command.help;
 
-import com.timvisee.dungeonmaze.Core;
-import com.timvisee.dungeonmaze.command.*;
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.*;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
@@ -33,9 +33,9 @@ public class HelpProvider {
      */
     public static void showHelp(CommandSender sender, CommandParts reference, CommandParts helpQuery, boolean showCommand, boolean showDescription, boolean showArguments, boolean showPermissions, boolean showAlternatives, boolean showCommands) {
         // Find the command for this help query, one with and one without a prefixed base command
-        FoundCommandResult result = Core.getCommandHandler().getCommandManager().findCommand(new CommandParts(helpQuery.getList()));
+        FoundCommandResult result = AuthMe.getInstance().getCommandHandler().getCommandManager().findCommand(new CommandParts(helpQuery.getList()));
         CommandParts commandReferenceOther = new CommandParts(reference.get(0), helpQuery.getList());
-        FoundCommandResult resultOther = Core.getCommandHandler().getCommandManager().findCommand(commandReferenceOther);
+        FoundCommandResult resultOther = AuthMe.getInstance().getCommandHandler().getCommandManager().findCommand(commandReferenceOther);
         if(resultOther != null) {
             if(result == null)
                 result = resultOther;

From 8b4d8a489c767c18bb8b67acdd729cd82a8858a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 16:16:48 +0100
Subject: [PATCH 016/117] Fixed and improved CommandDescriptor class

---
 .../authme/command/CommandDescription.java    | 52 +++++++++++--------
 .../authme/command/help/HelpPrinter.java      |  4 +-
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandDescription.java b/src/main/java/fr/xephi/authme/command/CommandDescription.java
index 01034a2d..018ac79b 100644
--- a/src/main/java/fr/xephi/authme/command/CommandDescription.java
+++ b/src/main/java/fr/xephi/authme/command/CommandDescription.java
@@ -1,10 +1,11 @@
 package fr.xephi.authme.command;
 
-import com.timvisee.dungeonmaze.util.StringUtils;
+import fr.xephi.authme.util.StringUtils;
 import org.bukkit.command.CommandSender;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 @SuppressWarnings("UnusedDeclaration")
@@ -21,7 +22,7 @@ public class CommandDescription {
     /** The parent command. */
     private CommandDescription parent = null;
     /** The child labels. */
-    private List<CommandDescription> childs = new ArrayList<>();
+    private List<CommandDescription> children = new ArrayList<>();
     /** The command arguments. */
     private List<CommandArgumentDescription> arguments = new ArrayList<>();
     /** Defines whether there is an argument maximum or not. */
@@ -487,12 +488,12 @@ public class CommandDescription {
     }
 
     /**
-     * Get all command childs.
+     * Get all command children.
      *
-     * @return Command childs.
+     * @return Command children.
      */
-    public List<CommandDescription> getChilds() {
-        return this.childs;
+    public List<CommandDescription> getChildren() {
+        return this.children;
     }
 
     /**
@@ -514,7 +515,7 @@ public class CommandDescription {
             return true;
 
         // The command description to add as a child
-        if(!this.childs.add(commandDescription))
+        if(!this.children.add(commandDescription))
             return false;
 
         // Set this description as parent on the child
@@ -522,17 +523,17 @@ public class CommandDescription {
     }
 
     /**
-     * Set the childs of this command.
+     * Set the children of this command.
      *
-     * @param childs New command childs. Null to remove all childs.
+     * @param children New command children. Null to remove all children.
      */
-    public void setChilds(List<CommandDescription> childs) {
-        // Check whether the childs list should be cleared
-        if(childs == null)
-            this.childs.clear();
+    public void setChildren(List<CommandDescription> children) {
+        // Check whether the children list should be cleared
+        if(children == null)
+            this.children.clear();
 
         else
-            this.childs = childs;
+            this.children = children;
     }
 
     /**
@@ -541,7 +542,7 @@ public class CommandDescription {
      * @return True if this command has any child labels.
      */
     public boolean hasChilds() {
-        return (this.childs.size() != 0);
+        return (this.children.size() != 0);
     }
 
     /**
@@ -559,7 +560,7 @@ public class CommandDescription {
             return false;
 
         // Check whether this child exists, return the result
-        return this.childs.contains(commandDescription);
+        return this.children.contains(commandDescription);
     }
 
     /**
@@ -765,15 +766,20 @@ public class CommandDescription {
         CommandParts newArguments = new CommandParts(queryReference.getRange(getParentCount() + 1));
 
         // Handle the child's, if this command has any
-        if(getChilds().size() > 0) {
+        if(getChildren().size() > 0) {
             // Get a new instance of the child's list, and sort them by their difference in comparison to the query reference
-            List<CommandDescription> commandChilds = new ArrayList<>(getChilds());
-            Collections.sort(commandChilds, (o1, o2) -> Double.compare(
-                    o1.getCommandDifference(queryReference),
-                    o2.getCommandDifference(queryReference)));
+            List<CommandDescription> commandChildren = new ArrayList<>(getChildren());
+            Collections.sort(commandChildren, new Comparator<CommandDescription>() {
+                @Override
+                public int compare(CommandDescription o1, CommandDescription o2) {
+                    return Double.compare(
+                            o1.getCommandDifference(queryReference),
+                            o2.getCommandDifference(queryReference));
+                }
+            });
 
             // Get the difference of the first child in the list
-            double firstChildDifference = commandChilds.get(0).getCommandDifference(queryReference, true);
+            double firstChildDifference = commandChildren.get(0).getCommandDifference(queryReference, true);
 
             // Check if the reference perfectly suits the arguments of the current command if it doesn't perfectly suits a child command
             if(firstChildDifference > 0.0)
@@ -781,7 +787,7 @@ public class CommandDescription {
                     return new FoundCommandResult(this, newReference, newArguments, queryReference);
 
             // Loop through each child
-            for(CommandDescription child : commandChilds) {
+            for(CommandDescription child : commandChildren) {
                 // Get the best suitable command
                 FoundCommandResult result = child.findCommand(queryReference);
                 if(result != null)
diff --git a/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java b/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
index 18ec476e..17aeb163 100644
--- a/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
+++ b/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
@@ -182,14 +182,14 @@ public class HelpPrinter {
      */
     public static void printChildren(CommandSender sender, CommandDescription command, CommandParts commandReference) {
         // Make sure there are child's
-        if(command.getChilds().size() <= 0)
+        if(command.getChildren().size() <= 0)
             return;
 
         // Print the header
         sender.sendMessage(ChatColor.GOLD + "Commands:");
 
         // Loop through each child
-        for(CommandDescription child : command.getChilds())
+        for(CommandDescription child : command.getChildren())
             sender.sendMessage(" " + HelpSyntaxHelper.getCommandSyntax(child, commandReference, null, false) + ChatColor.GRAY + ChatColor.ITALIC + " : " + child.getDescription());
     }
 }

From 5a0ffab6c22881a28db80d711ee28f5e2a415a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 16:17:16 +0100
Subject: [PATCH 017/117] Fixed import in CommandHandler class

---
 src/main/java/fr/xephi/authme/command/CommandHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandHandler.java b/src/main/java/fr/xephi/authme/command/CommandHandler.java
index 0302255b..d9638314 100644
--- a/src/main/java/fr/xephi/authme/command/CommandHandler.java
+++ b/src/main/java/fr/xephi/authme/command/CommandHandler.java
@@ -1,6 +1,6 @@
 package fr.xephi.authme.command;
 
-import com.timvisee.dungeonmaze.command.help.HelpProvider;
+import fr.xephi.authme.command.help.HelpProvider;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 

From a4461dd564899061b69966846c7527ffc63bbc99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 16:17:57 +0100
Subject: [PATCH 018/117] Ignore unused method

---
 src/main/java/fr/xephi/authme/command/CommandHandler.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/fr/xephi/authme/command/CommandHandler.java b/src/main/java/fr/xephi/authme/command/CommandHandler.java
index d9638314..7dfa0ab0 100644
--- a/src/main/java/fr/xephi/authme/command/CommandHandler.java
+++ b/src/main/java/fr/xephi/authme/command/CommandHandler.java
@@ -87,6 +87,7 @@ public class CommandHandler {
      *
      * @return True if the command was executed, false otherwise.
      */
+    @SuppressWarnings("unused")
     public boolean onCommand(CommandSender sender, @SuppressWarnings("UnusedParameters") org.bukkit.command.Command bukkitCommand, String bukkitCommandLabel, String[] bukkitArgs) {
         // Process the arguments
         List<String> args = processArguments(bukkitArgs);

From c1931209585a65dae0ed211137c4e9e3b55dad32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 16:18:29 +0100
Subject: [PATCH 019/117] Fixed imports for CommandParts class

---
 src/main/java/fr/xephi/authme/command/CommandParts.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandParts.java b/src/main/java/fr/xephi/authme/command/CommandParts.java
index fd2ef6b8..6f9f8559 100644
--- a/src/main/java/fr/xephi/authme/command/CommandParts.java
+++ b/src/main/java/fr/xephi/authme/command/CommandParts.java
@@ -1,7 +1,7 @@
 package fr.xephi.authme.command;
 
-import com.timvisee.dungeonmaze.util.ListUtils;
-import com.timvisee.dungeonmaze.util.StringUtils;
+import fr.xephi.authme.util.ListUtils;
+import fr.xephi.authme.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;

From 7962d6b9feb10949c48fc8a58e24d66ed33fcbaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 16:19:56 +0100
Subject: [PATCH 020/117] Fixed CommandPermissions class

---
 .../xephi/authme/command/CommandPermissions.java  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandPermissions.java b/src/main/java/fr/xephi/authme/command/CommandPermissions.java
index 0955e48f..3ebe5baa 100644
--- a/src/main/java/fr/xephi/authme/command/CommandPermissions.java
+++ b/src/main/java/fr/xephi/authme/command/CommandPermissions.java
@@ -1,7 +1,8 @@
 package fr.xephi.authme.command;
 
-import com.timvisee.dungeonmaze.Core;
-import com.timvisee.dungeonmaze.permission.PermissionsManager;
+//import com.timvisee.dungeonmaze.Core;
+//import com.timvisee.dungeonmaze.permission.PermissionsManager;
+import fr.xephi.authme.AuthMe;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -123,14 +124,14 @@ public class CommandPermissions {
         // Get the player instance
         Player player = (Player) sender;
 
-        // Get the permissions manager, and make sure it's instance is valid
-        PermissionsManager permissionsManager = Core.getPermissionsManager();
-        if(permissionsManager == null)
-            return false;
+//        // Get the permissions manager, and make sure it's instance is valid
+//        PermissionsManager permissionsManager = Core.getPermissionsManager();
+//        if(permissionsManager == null)
+//            return false;
 
         // Check whether the player has permission, return the result
         for(String node : this.permissionNodes)
-            if(!permissionsManager.hasPermission(player, node, defaultPermission))
+            if(!AuthMe.getInstance().authmePermissible(player, node))
                 return false;
         return true;
     }

From 802053f0456a9c00be17f030257ba5fb86f2f84f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 16:21:24 +0100
Subject: [PATCH 021/117] Removed unused service class

---
 .../authme/command/CommandHandlerService.java | 90 -------------------
 1 file changed, 90 deletions(-)
 delete mode 100644 src/main/java/fr/xephi/authme/command/CommandHandlerService.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandHandlerService.java b/src/main/java/fr/xephi/authme/command/CommandHandlerService.java
deleted file mode 100644
index f3fc2de5..00000000
--- a/src/main/java/fr/xephi/authme/command/CommandHandlerService.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package fr.xephi.authme.command;
-
-import com.timvisee.dungeonmaze.service.Service;
-
-public class CommandHandlerService extends Service {
-
-    /** Service name. */
-    private static final String SERVICE_NAME = "Command Handler";
-
-    /** Command handler instance. */
-    private CommandHandler commandHandler;
-
-    /**
-     * Initialize the service.
-     *
-     * @return True on success, false on failure. True will also be returned if the service was initialized already.
-     */
-    @Override
-    public boolean init() {
-        // Initialize the command handler
-        this.commandHandler = new CommandHandler(false);
-
-        // Initialize the command handler, return the result
-        return this.commandHandler.init();
-    }
-
-    /**
-     * Check whether the service is initialized.
-     *
-     * @return True if the service is initialized, false otherwise.
-     */
-    @Override
-    public boolean isInit() {
-        // Make sure the command handler is set
-        if(this.commandHandler == null)
-            return false;
-
-        // Check whether the command handler is initialized
-        return this.commandHandler.isInit();
-    }
-
-    /**
-     * Destroy the service. The destruction won't be forced.
-     *
-     * @param force True to force the destruction. This wil re-destroy the service even if it isn't initialized.
-     *              This will also force the initialization state to be set to false even if an error occurred while
-     *              destroying.
-     *
-     * @return True on success, false on failure. True will also be returned if the service wasn't initialized. False
-     * might be returned if force is set to true, even though the initialization state is set to false.
-     */
-    @Override
-    public boolean destroy(boolean force) {
-        // Make sure the command handler is initialized
-        if(!this.isInit() && !force)
-            return true;
-
-        // Destroy the command handler
-        if(this.commandHandler != null) {
-            if(!this.commandHandler.destroy()) {
-                if(force)
-                    this.commandHandler = null;
-                return false;
-            }
-        }
-
-        // Return the result
-        this.commandHandler = null;
-        return true;
-    }
-
-    /**
-     * Get the name of the service.
-     *
-     * @return Service name.
-     */
-    @Override
-    public String getName() {
-        return SERVICE_NAME;
-    }
-
-    /**
-     * Get the command handler.
-     *
-     * @return Command handler instance.
-     */
-    public CommandHandler getCommandHandler() {
-        return this.commandHandler;
-    }
-}

From 2e5e3f25e3a50a571a605def85b7755e1d0efe83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 16:34:13 +0100
Subject: [PATCH 022/117] Fixed imports of HelpCommand class

---
 .../fr/xephi/authme/command/executable/HelpCommand.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java b/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
index fb4b299c..3ddcb5a5 100644
--- a/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
@@ -1,8 +1,8 @@
 package fr.xephi.authme.command.executable;
 
-import com.timvisee.dungeonmaze.command.CommandParts;
-import com.timvisee.dungeonmaze.command.ExecutableCommand;
-import com.timvisee.dungeonmaze.command.help.HelpProvider;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.command.help.HelpProvider;
 import org.bukkit.command.CommandSender;
 
 public class HelpCommand extends ExecutableCommand {

From 59d02e1497dd28011d9a0bc86ec9658da6a79028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 16:34:36 +0100
Subject: [PATCH 023/117] Created base command for /authme

---
 .../{DungeonMazeCommand.java => AuthMeCommand.java}    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename src/main/java/fr/xephi/authme/command/executable/{DungeonMazeCommand.java => AuthMeCommand.java} (75%)

diff --git a/src/main/java/fr/xephi/authme/command/executable/DungeonMazeCommand.java b/src/main/java/fr/xephi/authme/command/executable/AuthMeCommand.java
similarity index 75%
rename from src/main/java/fr/xephi/authme/command/executable/DungeonMazeCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/AuthMeCommand.java
index 569a6286..a2b159e4 100644
--- a/src/main/java/fr/xephi/authme/command/executable/DungeonMazeCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/AuthMeCommand.java
@@ -1,12 +1,11 @@
 package fr.xephi.authme.command.executable;
 
-import com.timvisee.dungeonmaze.DungeonMaze;
-import com.timvisee.dungeonmaze.command.CommandParts;
-import com.timvisee.dungeonmaze.command.ExecutableCommand;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
-public class DungeonMazeCommand extends ExecutableCommand {
+public class AuthMeCommand extends ExecutableCommand {
 
     /**
      * Execute the command.
@@ -20,7 +19,8 @@ public class DungeonMazeCommand extends ExecutableCommand {
     @Override
     public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // Show some version info
-        sender.sendMessage(ChatColor.GREEN + "This server is running " + DungeonMaze.PLUGIN_NAME + " v" + DungeonMaze.getVersionName() + "! " + ChatColor.RED + "<3");
+        // TODO: Use plugin name and version constants here!
+        sender.sendMessage(ChatColor.GREEN + "This server is running AuthMeReloaded v1.0! " + ChatColor.RED + "<3");
         sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/" + commandReference.get(0) + " help" + ChatColor.YELLOW + " to view help.");
         sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/" + commandReference.get(0) + " about" + ChatColor.YELLOW + " to view about.");
         return true;

From 756469449e0f70f885638ddfe2701e97394f72a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 16:36:05 +0100
Subject: [PATCH 024/117] Updated command manager

---
 .../xephi/authme/command/CommandManager.java  | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 912e7661..624b07e7 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -1,6 +1,6 @@
 package fr.xephi.authme.command;
 
-import com.timvisee.dungeonmaze.command.executable.*;
+import fr.xephi.authme.command.executable.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,14 +28,13 @@ public class CommandManager {
     @SuppressWarnings("SpellCheckingInspection")
     public void registerCommands() {
         // Register the base Dungeon Maze command
-        CommandDescription dungeonMazeCommand = new CommandDescription(
-                new DungeonMazeCommand(),
+        CommandDescription authMeCommand = new CommandDescription(
+                new AuthMeCommand(),
                 new ArrayList<String>() {{
-                    add("dungeonmaze");
-                    add("dm");
+                    add("authme");
                 }},
                 "Main command",
-                "The main Dungeon Maze command. The root for all the other commands.", null);
+                "The main AuthMeReloaded command. The root for all the other commands.", null);
 
         // Register the help command
         CommandDescription helpCommand = new CommandDescription(
@@ -48,12 +47,12 @@ public class CommandManager {
                     add("?");
                 }},
                 "View help",
-                "View detailed help pages about Dungeon Maze commands.",
-                dungeonMazeCommand);
+                "View detailed help pages about AuthMeReloaded commands.",
+                authMeCommand);
         helpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
         helpCommand.setMaximumArguments(false);
 
-        // Register the create command
+        /*// Register the create command
         CommandDescription createWorldCommand = new CommandDescription(
                 new CreateWorldCommand(),
                 new ArrayList<String>() {{
@@ -236,10 +235,10 @@ public class CommandManager {
                 "Version info",
                 "Show detailed information about the installed Dungeon Maze version, and shows the developers, contributors, license and other information.",
                 dungeonMazeCommand);
-        versionCommand.setMaximumArguments(false);
+        versionCommand.setMaximumArguments(false);*/
 
-        // Add the base command to the commands array
-        this.commandDescriptions.add(dungeonMazeCommand);
+        // Add the base commands to the commands array
+        this.commandDescriptions.add(authMeCommand);
     }
 
     /**

From 2b8fdc65f0357f24a53ce7ab5ae41554514cde93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 16:54:23 +0100
Subject: [PATCH 025/117] Removed unused commands

---
 .../executable/CheckUpdatesCommand.java       |  78 --------
 .../executable/CreateWorldCommand.java        | 140 --------------
 .../executable/InstallUpdateCommand.java      |  75 --------
 .../command/executable/ListWorldCommand.java  |  67 -------
 .../command/executable/LoadWorldCommand.java  |  75 --------
 .../command/executable/ReloadCommand.java     |  75 --------
 .../executable/ReloadPermissionsCommand.java  |  56 ------
 .../command/executable/RestartCommand.java    | 105 ----------
 .../command/executable/ServiceCommand.java    |  73 -------
 .../command/executable/StatusCommand.java     | 180 ------------------
 .../command/executable/TeleportCommand.java   |  80 --------
 .../executable/UnloadWorldCommand.java        | 107 -----------
 .../command/executable/VersionCommand.java    |  80 --------
 13 files changed, 1191 deletions(-)
 delete mode 100644 src/main/java/fr/xephi/authme/command/executable/CheckUpdatesCommand.java
 delete mode 100644 src/main/java/fr/xephi/authme/command/executable/CreateWorldCommand.java
 delete mode 100644 src/main/java/fr/xephi/authme/command/executable/InstallUpdateCommand.java
 delete mode 100644 src/main/java/fr/xephi/authme/command/executable/ListWorldCommand.java
 delete mode 100644 src/main/java/fr/xephi/authme/command/executable/LoadWorldCommand.java
 delete mode 100644 src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java
 delete mode 100644 src/main/java/fr/xephi/authme/command/executable/ReloadPermissionsCommand.java
 delete mode 100644 src/main/java/fr/xephi/authme/command/executable/RestartCommand.java
 delete mode 100644 src/main/java/fr/xephi/authme/command/executable/ServiceCommand.java
 delete mode 100644 src/main/java/fr/xephi/authme/command/executable/StatusCommand.java
 delete mode 100644 src/main/java/fr/xephi/authme/command/executable/TeleportCommand.java
 delete mode 100644 src/main/java/fr/xephi/authme/command/executable/UnloadWorldCommand.java
 delete mode 100644 src/main/java/fr/xephi/authme/command/executable/VersionCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/executable/CheckUpdatesCommand.java b/src/main/java/fr/xephi/authme/command/executable/CheckUpdatesCommand.java
deleted file mode 100644
index 65f92ad4..00000000
--- a/src/main/java/fr/xephi/authme/command/executable/CheckUpdatesCommand.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package fr.xephi.authme.command.executable;
-
-import com.timvisee.dungeonmaze.Core;
-import com.timvisee.dungeonmaze.command.CommandParts;
-import com.timvisee.dungeonmaze.command.ExecutableCommand;
-import com.timvisee.dungeonmaze.update.UpdateCheckerService;
-import com.timvisee.dungeonmaze.update.bukkit.Updater;
-import com.timvisee.dungeonmaze.util.Profiler;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
-public class CheckUpdatesCommand extends ExecutableCommand {
-
-    /**
-     * Execute the command.
-     *
-     * @param sender           The command sender.
-     * @param commandReference The command reference.
-     * @param commandArguments The command arguments.
-     *
-     * @return True if the command was executed successfully, false otherwise.
-     */
-    @Override
-    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
-        // Profile the process
-        Profiler p = new Profiler(true);
-
-        // Show a status message
-        sender.sendMessage(ChatColor.YELLOW + "Checking for Dungeon Maze updates...");
-
-        // Get the update checker service, shut it down and start it again to force an update check
-        UpdateCheckerService service = Core.getUpdateCheckerService();
-        service.shutdownUpdateChecker();
-        service.setupUpdateChecker();
-
-        // Get the update checker instance
-        Updater uc = service.getUpdateChecker();
-
-        // Show a status message
-        sender.sendMessage(ChatColor.YELLOW + "Update checking succeed, took " + p.getTimeFormatted() + "!");
-
-        // Get the version number of the new update
-        String newVer = uc.getLatestName();
-
-        // Make sure any update is available
-        if(uc.getResult() == Updater.UpdateResult.UPDATE_AVAILABLE) {
-            sender.sendMessage(ChatColor.GREEN + "New Dungeon Maze version available: " + String.valueOf(newVer));
-            return true;
-
-        } else if(uc.getResult() == Updater.UpdateResult.NO_UPDATE) {
-            sender.sendMessage(ChatColor.GREEN + "You are running the latest Dungeon Maze version!");
-            return true;
-        }
-
-        // Make sure the new version is compatible with the current bukkit version
-        if(uc.getResult() == Updater.UpdateResult.FAIL_NOVERSION) {
-            // Show a message
-            sender.sendMessage(ChatColor.GREEN + "New Dungeon Maze version available: " + String.valueOf(newVer));
-            sender.sendMessage(ChatColor.DARK_RED + "The new version is not compatible with your Bukkit version!");
-            sender.sendMessage(ChatColor.DARK_RED + "Please update your Bukkit to " +  uc.getLatestGameVersion() + " or higher!");
-            return true;
-        }
-
-        // Check whether the update was installed or not
-        if(uc.getResult() == Updater.UpdateResult.SUCCESS)
-            sender.sendMessage(ChatColor.GREEN + "New version installed (" + String.valueOf(newVer) + "). Server reboot required!");
-
-        else {
-            sender.sendMessage(ChatColor.GREEN + "New version found: " + String.valueOf(newVer));
-            //noinspection SpellCheckingInspection
-            sender.sendMessage(ChatColor.GREEN + "Use " + ChatColor.GOLD + "/dm installupdate" +
-                    ChatColor.GREEN + " to automatically install the new version!");
-        }
-
-        // Return the result
-        return true;
-    }
-}
diff --git a/src/main/java/fr/xephi/authme/command/executable/CreateWorldCommand.java b/src/main/java/fr/xephi/authme/command/executable/CreateWorldCommand.java
deleted file mode 100644
index 60d99787..00000000
--- a/src/main/java/fr/xephi/authme/command/executable/CreateWorldCommand.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package fr.xephi.authme.command.executable;
-
-import com.timvisee.dungeonmaze.Core;
-import com.timvisee.dungeonmaze.DungeonMaze;
-import com.timvisee.dungeonmaze.command.CommandParts;
-import com.timvisee.dungeonmaze.command.ExecutableCommand;
-import com.timvisee.dungeonmaze.util.Profiler;
-import com.timvisee.dungeonmaze.world.WorldManager;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.WorldCreator;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-public class CreateWorldCommand extends ExecutableCommand {
-
-    /**
-     * Execute the command.
-     *
-     * @param sender The command sender.
-     * @param commandReference The command reference.
-     * @param commandArguments The command arguments.
-     *
-     * @return True if the command was executed successfully, false otherwise.
-     */
-    @Override
-    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
-        // Get and trim the preferred world name
-        String worldName = commandArguments.get(0).trim();
-
-        // Validate the world name
-        if(!WorldManager.isValidWorldName(worldName)) {
-            sender.sendMessage(ChatColor.DARK_RED + worldName);
-            sender.sendMessage(ChatColor.DARK_RED + "The world name contains invalid characters!");
-            return true;
-        }
-
-        // Set whether the world should be preloaded
-        boolean preloadWorld = true;
-
-        // Get whether the world should be preloaded based on the arguments
-        if(commandArguments.getCount() >= 2) {
-            String arg = commandArguments.get(1);
-
-            // Check whether the argument equals 'force'
-            if(arg.equalsIgnoreCase("preload"))
-                preloadWorld = true;
-
-            else if(arg.equalsIgnoreCase("true") || arg.equalsIgnoreCase("t") || arg.equalsIgnoreCase("yes") || arg.equalsIgnoreCase("y"))
-                preloadWorld = true;
-
-            else if(arg.equalsIgnoreCase("false") || arg.equalsIgnoreCase("f") || arg.equalsIgnoreCase("no") || arg.equalsIgnoreCase("n"))
-                preloadWorld = false;
-
-            else {
-                sender.sendMessage(ChatColor.DARK_RED + arg);
-                sender.sendMessage(ChatColor.DARK_RED + "Invalid argument!");
-                return true;
-            }
-        }
-
-        // Get the world manager, and make sure it's valid
-        WorldManager worldManager = Core.getWorldManager();
-        boolean showWorldManagerError = false;
-        if(worldManager == null)
-            showWorldManagerError = true;
-        else if(!worldManager.isInit())
-            showWorldManagerError = true;
-        if(showWorldManagerError) {
-            sender.sendMessage(ChatColor.DARK_RED + "Failed to create the world, world manager not available!");
-            return true;
-        }
-
-        // Make sure the world doesn't exist
-        if(worldManager.isWorld(worldName)) {
-            sender.sendMessage(ChatColor.DARK_RED + "The world " + ChatColor.GOLD + worldName + ChatColor.DARK_RED + " already exists!");
-            sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/" + commandReference.get(0) + " listworlds" + ChatColor.YELLOW + " to list all worlds.");
-            sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/" + commandReference.get(0) + " loadworld " + worldName + ChatColor.YELLOW + " to load the world.");
-            return true;
-        }
-
-        // Show a status message
-        sender.sendMessage(ChatColor.YELLOW + "Preparing the server...");
-
-        // Prepare the server for the new world
-        if(!worldManager.prepareDungeonMazeWorld(worldName, preloadWorld)) {
-            sender.sendMessage(ChatColor.DARK_RED + "Failed to prepare the server!");
-            return true;
-        }
-
-        // Show a status message
-        sender.sendMessage(ChatColor.YELLOW + "Generating the " + DungeonMaze.PLUGIN_NAME + " " + ChatColor.GOLD + worldName + ChatColor.YELLOW + "...");
-        Bukkit.broadcastMessage(ChatColor.LIGHT_PURPLE + "Generating a new world, expecting lag for a while...");
-
-        // Profile the world generation
-        Profiler p = new Profiler(true);
-
-        // Create the world
-        // TODO: Put this in a separate function!
-        WorldCreator newWorld = new WorldCreator(worldName);
-        newWorld.generator(DungeonMaze.instance.getDungeonMazeGenerator());
-        World world = newWorld.createWorld();
-
-        // Force-save the level.dat file for the world, profile the process
-        Profiler pWorldSave = new Profiler(true);
-        try {
-            // Force-save the world, and show some status messages
-            Core.getLogger().info("Force saving the level.dat file for '" + world.getName() + "'...");
-            world.save();
-            Core.getLogger().info("World saved successfully, took " + pWorldSave.getTimeFormatted() + "!");
-
-        } catch(Exception ex) {
-            Core.getLogger().error("Failed to save the world after " + pWorldSave.getTimeFormatted() + "!");
-        }
-
-        // Make sure the world instance is valid
-        if(world == null) {
-            Bukkit.broadcastMessage(ChatColor.LIGHT_PURPLE + "World generation failed after " + p.getTimeFormatted() + "!");
-            sender.sendMessage(ChatColor.DARK_RED + "The " + DungeonMaze.PLUGIN_NAME + " " + ChatColor.GOLD + worldName + ChatColor.GREEN +
-                    " failed to generate after " + p.getTimeFormatted() + "!");
-            return true;
-        }
-
-        // Show a status message
-        Bukkit.broadcastMessage(ChatColor.LIGHT_PURPLE + "World generation finished, took " + p.getTimeFormatted() + "!");
-        sender.sendMessage(ChatColor.GREEN + "The " + DungeonMaze.PLUGIN_NAME + " " + ChatColor.GOLD + worldName + ChatColor.GREEN +
-                " has successfully been generated, took " + p.getTimeFormatted() + "!");
-
-        // If the command was executed by a player, teleport the player
-        if(sender instanceof Player) {
-            // Teleport the player
-            ((Player) sender).teleport(world.getSpawnLocation());
-            sender.sendMessage(ChatColor.GREEN + "You have been teleported to " + ChatColor.GOLD + worldName + ChatColor.GREEN + "!");
-        }
-
-        // Return the result
-        return true;
-    }
-}
diff --git a/src/main/java/fr/xephi/authme/command/executable/InstallUpdateCommand.java b/src/main/java/fr/xephi/authme/command/executable/InstallUpdateCommand.java
deleted file mode 100644
index e796563d..00000000
--- a/src/main/java/fr/xephi/authme/command/executable/InstallUpdateCommand.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package fr.xephi.authme.command.executable;
-
-import com.timvisee.dungeonmaze.Core;
-import com.timvisee.dungeonmaze.command.CommandParts;
-import com.timvisee.dungeonmaze.command.ExecutableCommand;
-import com.timvisee.dungeonmaze.update.UpdateCheckerService;
-import com.timvisee.dungeonmaze.update.bukkit.Updater;
-import com.timvisee.dungeonmaze.util.Profiler;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
-public class InstallUpdateCommand extends ExecutableCommand {
-
-    /**
-     * Execute the command.
-     *
-     * @param sender           The command sender.
-     * @param commandReference The command reference.
-     * @param commandArguments The command arguments.
-     *
-     * @return True if the command was executed successfully, false otherwise.
-     */
-    @Override
-    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
-        // Profile the process
-        Profiler p = new Profiler(true);
-
-        // Show a status message
-        sender.sendMessage(ChatColor.YELLOW + "Checking for Dungeon Maze updates...");
-
-        // Get the update checker service, shut it down and start it again to force an update check
-        UpdateCheckerService service = Core.getUpdateCheckerService();
-        service.shutdownUpdateChecker();
-        service.setupUpdateChecker();
-
-        // Get the update checker instance
-        Updater uc = service.getUpdateChecker();
-
-        // TODO: Automatically install the actual update!
-
-        // Show a status message
-        sender.sendMessage(ChatColor.YELLOW + "Update checking succeed, took " + p.getTimeFormatted() + "!");
-
-        // Get the version number of the new update
-        String newVer = uc.getLatestName();
-
-        // Make sure any update is available
-        if(uc.getResult() == Updater.UpdateResult.UPDATE_AVAILABLE) {
-            sender.sendMessage(ChatColor.GREEN + "New Dungeon Maze version available: " + String.valueOf(newVer));
-            return true;
-
-        } else if(uc.getResult() == Updater.UpdateResult.NO_UPDATE) {
-            sender.sendMessage(ChatColor.GREEN + "You are running the latest Dungeon Maze version!");
-            return true;
-        }
-
-        // Make sure the new version is compatible with the current bukkit version
-        if(uc.getResult() == Updater.UpdateResult.FAIL_NOVERSION) {
-            // Show a message
-            sender.sendMessage(ChatColor.GREEN + "New Dungeon Maze version available: " + String.valueOf(newVer));
-            sender.sendMessage(ChatColor.DARK_RED + "The new version is not compatible with your Bukkit version!");
-            sender.sendMessage(ChatColor.DARK_RED + "Please update your Bukkit to " +  uc.getLatestGameVersion() + " or higher!");
-            return true;
-        }
-
-        // Check whether the update was installed or not
-        if(uc.getResult() == Updater.UpdateResult.SUCCESS)
-            sender.sendMessage(ChatColor.GREEN + "New version installed (" + String.valueOf(newVer) + "). Server reboot required!");
-        else
-            sender.sendMessage(ChatColor.DARK_RED + "Automatic installation failed, please update manually!");
-
-        // Return the result
-        return true;
-    }
-}
diff --git a/src/main/java/fr/xephi/authme/command/executable/ListWorldCommand.java b/src/main/java/fr/xephi/authme/command/executable/ListWorldCommand.java
deleted file mode 100644
index ff0b2976..00000000
--- a/src/main/java/fr/xephi/authme/command/executable/ListWorldCommand.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package fr.xephi.authme.command.executable;
-
-import com.timvisee.dungeonmaze.Core;
-import com.timvisee.dungeonmaze.DungeonMaze;
-import com.timvisee.dungeonmaze.command.CommandParts;
-import com.timvisee.dungeonmaze.command.ExecutableCommand;
-import com.timvisee.dungeonmaze.world.WorldManager;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
-import java.util.List;
-
-public class ListWorldCommand extends ExecutableCommand {
-
-    /**
-     * Execute the command.
-     *
-     * @param sender           The command sender.
-     * @param commandReference The command reference.
-     * @param commandArguments The command arguments.
-     *
-     * @return True if the command was executed successfully, false otherwise.
-     */
-    @Override
-    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
-        // Get the world manager and make sure it's valid
-        WorldManager worldManager = Core.getWorldManager();
-        if(worldManager == null) {
-            sender.sendMessage(ChatColor.DARK_RED + "Error, failed to list the worlds!");
-            return true;
-        }
-
-        // Get the list of Dungeon Maze worlds and other worlds
-        List<String> dungeonMazeWorlds = worldManager.getDungeonMazeWorlds();
-        List<String> otherWorlds = worldManager.getWorlds(true);
-
-        // Show the list of Dungeon Maze worlds
-        sender.sendMessage(ChatColor.GOLD + "==========[ \" + DungeonMaze.PLUGIN_NAME.toUpperCase() + \" WORLDS ]==========");
-        sender.sendMessage(ChatColor.GOLD + DungeonMaze.PLUGIN_NAME + " worlds:");
-        if(dungeonMazeWorlds.size() > 0) {
-            for(String worldName : dungeonMazeWorlds) {
-                if(worldManager.isDungeonMazeWorldLoaded(worldName))
-                    sender.sendMessage(ChatColor.WHITE + " " + worldName + ChatColor.GREEN + ChatColor.ITALIC + " (Loaded)");
-                else
-                    sender.sendMessage(ChatColor.WHITE + " " + worldName + ChatColor.GRAY + ChatColor.ITALIC + " (Not Loaded)");
-            }
-        } else
-            // No Dungeon Maze world available, show a message
-            sender.sendMessage(ChatColor.GRAY + "" + ChatColor.ITALIC + " No Dungeon Maze worlds available!");
-
-        // Show the list of other worlds
-        sender.sendMessage(ChatColor.GOLD + "Other worlds:");
-        if(otherWorlds.size() > 0) {
-            for(String worldName : otherWorlds) {
-                if(worldManager.isWorldLoaded(worldName))
-                    sender.sendMessage(ChatColor.WHITE + " " + worldName + ChatColor.GREEN + ChatColor.ITALIC + " (Loaded)");
-                else
-                    sender.sendMessage(ChatColor.WHITE + " " + worldName + ChatColor.GRAY + ChatColor.ITALIC + " (Not Loaded)");
-            }
-        } else
-            // No other world available, show a message
-            sender.sendMessage(ChatColor.GRAY + "" + ChatColor.ITALIC + " No other worlds available!");
-
-        // Return the result
-        return true;
-    }
-}
diff --git a/src/main/java/fr/xephi/authme/command/executable/LoadWorldCommand.java b/src/main/java/fr/xephi/authme/command/executable/LoadWorldCommand.java
deleted file mode 100644
index 29174ecd..00000000
--- a/src/main/java/fr/xephi/authme/command/executable/LoadWorldCommand.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package fr.xephi.authme.command.executable;
-
-import com.timvisee.dungeonmaze.Core;
-import com.timvisee.dungeonmaze.command.CommandParts;
-import com.timvisee.dungeonmaze.command.ExecutableCommand;
-import com.timvisee.dungeonmaze.util.Profiler;
-import com.timvisee.dungeonmaze.world.WorldManager;
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-
-public class LoadWorldCommand extends ExecutableCommand {
-
-    /**
-     * Execute the command.
-     *
-     * @param sender The command sender.
-     * @param commandReference The command reference.
-     * @param commandArguments The command arguments.
-     *
-     * @return True if the command was executed successfully, false otherwise.
-     */
-    @Override
-    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
-        // Get and trim the preferred world name
-        String worldName = commandArguments.get(0).trim();
-
-        // Profile the world loading
-        Profiler p = new Profiler(true);
-
-        // Validate the world name
-        if(!WorldManager.isValidWorldName(worldName)) {
-            sender.sendMessage(ChatColor.DARK_RED + worldName);
-            sender.sendMessage(ChatColor.DARK_RED + "The world name contains invalid characters!");
-            return true;
-        }
-
-        // Get the world manager, and make sure it's valid
-        WorldManager worldManager = Core.getWorldManager();
-        boolean showWorldManagerError = false;
-        if(worldManager == null)
-            showWorldManagerError = true;
-        else if(!worldManager.isInit())
-            showWorldManagerError = true;
-        if(showWorldManagerError) {
-            sender.sendMessage(ChatColor.DARK_RED + "Failed to load the world, world manager not available!");
-            return true;
-        }
-
-        // Make sure the world exists
-        if(!worldManager.isWorld(worldName)) {
-            sender.sendMessage(ChatColor.DARK_RED + "The world " + ChatColor.GOLD + worldName + ChatColor.DARK_RED + " doesn't exist!");
-            return true;
-        }
-
-        // Make sure the world isn't loaded already
-        if(worldManager.isWorldLoaded(worldName)) {
-            sender.sendMessage(ChatColor.GREEN + "The world " + ChatColor.GOLD + worldName + ChatColor.GREEN + " is already loaded!");
-            return true;
-        }
-
-        // Load the world, store the instance
-        World world = worldManager.loadWorld(worldName);
-
-        // Make sure the world was loaded
-        if(world == null) {
-            sender.sendMessage(ChatColor.DARK_RED + "Failed to load the world!");
-            return true;
-        }
-
-        // Show a status message, return the result
-        sender.sendMessage(ChatColor.GREEN + "The world " + ChatColor.GOLD + worldName + ChatColor.GREEN + " has been loaded, took " + p.getTimeFormatted() + "!");
-        return true;
-    }
-}
diff --git a/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java b/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java
deleted file mode 100644
index 2335e7e7..00000000
--- a/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package fr.xephi.authme.command.executable;
-
-import com.timvisee.dungeonmaze.Core;
-import com.timvisee.dungeonmaze.command.CommandParts;
-import com.timvisee.dungeonmaze.command.ExecutableCommand;
-import com.timvisee.dungeonmaze.config.ConfigHandler;
-import com.timvisee.dungeonmaze.util.Profiler;
-import com.timvisee.dungeonmaze.world.WorldManager;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
-public class ReloadCommand extends ExecutableCommand {
-
-    /**
-     * Execute the command.
-     *
-     * @param sender           The command sender.
-     * @param commandReference The command reference.
-     * @param commandArguments The command arguments.
-     *
-     * @return True if the command was executed successfully, false otherwise.
-     */
-    @Override
-    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
-        // Profile the reload process
-        Profiler p = new Profiler(true);
-
-        // Show a status message
-        sender.sendMessage(ChatColor.YELLOW + "Reloading Dungeon Maze...");
-
-        /* // Set whether the reload is forced
-        boolean force = false;
-
-        // Get whether the reload should be forced from the command arguments
-        if(commandArguments.getCount() >= 1) {
-            String arg = commandArguments.get(0);
-
-            // Check whether the argument equals 'force'
-            if(arg.equalsIgnoreCase("force") || arg.equalsIgnoreCase("forced"))
-                force = true;
-
-            else if(arg.equalsIgnoreCase("true") || arg.equalsIgnoreCase("t") || arg.equalsIgnoreCase("yes") || arg.equalsIgnoreCase("y"))
-                force = true;
-
-            else if(arg.equalsIgnoreCase("false") || arg.equalsIgnoreCase("f") || arg.equalsIgnoreCase("no") || arg.equalsIgnoreCase("n"))
-                force = false;
-
-            else {
-                sender.sendMessage(ChatColor.DARK_RED + arg);
-                sender.sendMessage(ChatColor.DARK_RED + "Invalid argument!");
-                return true;
-            }
-        }*/
-
-        // Reload the configuration
-        ConfigHandler configHandler = Core.getConfigHandler();
-        if(configHandler != null) {
-            configHandler.load();
-            sender.sendMessage(ChatColor.YELLOW + "Reloaded the configuration!");
-        } else
-            sender.sendMessage(ChatColor.DARK_RED + "Failed to reload the configuration!");
-
-        // Get the world manager to reload the world list, and make sure it's valid
-        WorldManager worldManager = Core.getWorldManager();
-        if(worldManager != null) {
-            worldManager.refresh();
-            sender.sendMessage(ChatColor.YELLOW + "Reloaded the worlds!");
-        } else
-            sender.sendMessage(ChatColor.DARK_RED + "Failed to reload the worlds!");
-
-        // Dungeon Maze reloaded, show a status message
-        sender.sendMessage(ChatColor.GREEN + "Dungeon Maze has been reloaded successfully, took " + p.getTimeFormatted() + "!");
-        return true;
-    }
-}
diff --git a/src/main/java/fr/xephi/authme/command/executable/ReloadPermissionsCommand.java b/src/main/java/fr/xephi/authme/command/executable/ReloadPermissionsCommand.java
deleted file mode 100644
index b9f9088c..00000000
--- a/src/main/java/fr/xephi/authme/command/executable/ReloadPermissionsCommand.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package fr.xephi.authme.command.executable;
-
-import com.timvisee.dungeonmaze.Core;
-import com.timvisee.dungeonmaze.command.CommandParts;
-import com.timvisee.dungeonmaze.command.ExecutableCommand;
-import com.timvisee.dungeonmaze.permission.PermissionsManager;
-import com.timvisee.dungeonmaze.util.Profiler;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
-public class ReloadPermissionsCommand extends ExecutableCommand {
-
-    /**
-     * Execute the command.
-     *
-     * @param sender           The command sender.
-     * @param commandReference The command reference.
-     * @param commandArguments The command arguments.
-     *
-     * @return True if the command was executed successfully, false otherwise.
-     */
-    @Override
-    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
-        // Profile the permissions reload process
-        Profiler p = new Profiler(true);
-
-        // Show a status message
-        sender.sendMessage(ChatColor.YELLOW + "Reloading permissions...");
-        Core.getLogger().info("Reloading permissions...");
-
-        // Get the permissions manager and make sure it's valid
-        PermissionsManager permissionsManager = Core.getPermissionsManager();
-        if(permissionsManager == null) {
-            Core.getLogger().info("Failed to access the permissions manager after " + p.getTimeFormatted() + "!");
-            sender.sendMessage(ChatColor.DARK_RED + "Failed to access the permissions manager after " + p.getTimeFormatted() + "!");
-            return true;
-        }
-
-        // Reload the permissions service, show an error on failure
-        if(!permissionsManager.reload()) {
-            Core.getLogger().info("Failed to reload permissions after " + p.getTimeFormatted() + "!");
-            sender.sendMessage(ChatColor.DARK_RED + "Failed to reload permissions after " + p.getTimeFormatted() + "!");
-            return true;
-        }
-
-        // Show a success message
-        Core.getLogger().info("Permissions reloaded successfully, took " + p.getTimeFormatted() + "!");
-        sender.sendMessage(ChatColor.GREEN + "Permissions reloaded successfully, took " + p.getTimeFormatted() + "!");
-
-        // Get and show the permissions system being used
-        String permissionsSystem = ChatColor.GOLD + permissionsManager.getUsedPermissionsSystemType().getName();
-        Core.getLogger().info("Used permissions system: " + permissionsSystem);
-        sender.sendMessage(ChatColor.GREEN + "Used permissions system: " + permissionsSystem);
-        return true;
-    }
-}
diff --git a/src/main/java/fr/xephi/authme/command/executable/RestartCommand.java b/src/main/java/fr/xephi/authme/command/executable/RestartCommand.java
deleted file mode 100644
index dbc9d298..00000000
--- a/src/main/java/fr/xephi/authme/command/executable/RestartCommand.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package fr.xephi.authme.command.executable;
-
-import com.timvisee.dungeonmaze.Core;
-import com.timvisee.dungeonmaze.DungeonMaze;
-import com.timvisee.dungeonmaze.command.CommandParts;
-import com.timvisee.dungeonmaze.command.ExecutableCommand;
-import com.timvisee.dungeonmaze.util.Profiler;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
-public class RestartCommand extends ExecutableCommand {
-
-    /**
-     * Execute the command.
-     *
-     * @param sender           The command sender.
-     * @param commandReference The command reference.
-     * @param commandArguments The command arguments.
-     *
-     * @return True if the command was executed successfully, false otherwise.
-     */
-    @Override
-    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
-        // Profile the restart process
-        Profiler p = new Profiler(true);
-
-        // Set whether the restart is forced
-        boolean force = false;
-
-        // Get whether the restart should be forced from the command arguments
-        if(commandArguments.getCount() >= 1) {
-            String arg = commandArguments.get(0);
-
-            // Check whether the argument equals 'force'
-            if(arg.equalsIgnoreCase("force") || arg.equalsIgnoreCase("forced"))
-                force = true;
-
-            else if(arg.equalsIgnoreCase("true") || arg.equalsIgnoreCase("t") || arg.equalsIgnoreCase("yes") || arg.equalsIgnoreCase("y"))
-                force = true;
-
-            else if(arg.equalsIgnoreCase("false") || arg.equalsIgnoreCase("f") || arg.equalsIgnoreCase("no") || arg.equalsIgnoreCase("n"))
-                force = false;
-
-            else {
-                sender.sendMessage(ChatColor.DARK_RED + arg);
-                sender.sendMessage(ChatColor.DARK_RED + "Invalid argument!");
-                return true;
-            }
-        }
-
-        // Show a restart warning
-        if(force) {
-            sender.sendMessage(ChatColor.YELLOW + "Force restarting Dungeon Maze...");
-            Core.getLogger().info("Force restarting Dungeon Maze...");
-        } else {
-            sender.sendMessage(ChatColor.YELLOW + "Restarting Dungeon Maze...");
-            Core.getLogger().info("Restarting Dungeon Maze...");
-        }
-
-        // Profile the Dungeon Maze Core destruction
-        Profiler stopCoreProfiler = new Profiler(true);
-
-        // Destroy the Dungeon Maze core
-        if(!DungeonMaze.instance.destroyCore(force)) {
-            // Failed to destroy the core, show a status message
-            sender.sendMessage(ChatColor.DARK_RED + "Failed to stop the Dungeon Maze Core after " + stopCoreProfiler.getTimeFormatted() + "!");
-            sender.sendMessage(ChatColor.DARK_RED + "Please use " + ChatColor.GOLD + "/reload" + ChatColor.DARK_RED + " for plugin instability reasons!");
-            Core.getLogger().error("Failed to stop the core, after " + stopCoreProfiler.getTimeFormatted() + "!");
-
-            // Return if the restart isn't force
-            if(!force)
-                return true;
-        }
-
-        // Show a status message
-        sender.sendMessage(ChatColor.YELLOW + "Dungeon Maze Core stopped, took " + stopCoreProfiler.getTimeFormatted() + "!");
-
-        // Profile the core starting
-        Profiler startCoreProfiler = new Profiler(true);
-
-        // Initialize the core, show the result status
-        if(!DungeonMaze.instance.initCore()) {
-            // Core failed to initialize, show a status message
-            sender.sendMessage(ChatColor.DARK_RED + "Failed to start the Dungeon Maze Core after " + startCoreProfiler.getTimeFormatted() + "!");
-            sender.sendMessage(ChatColor.DARK_RED + "Please use " + ChatColor.GOLD + "/reload" + ChatColor.DARK_RED + " for plugin instability reasons!");
-            Core.getLogger().error("Failed to start the core, after " + startCoreProfiler.getTimeFormatted() + "!");
-
-            // Return if the restart isn't forced
-            if(!force)
-                return true;
-        }
-
-        // Core initialized, show a status message
-        sender.sendMessage(ChatColor.YELLOW + "Dungeon Maze Core started, took " + startCoreProfiler.getTimeFormatted() + "!");
-
-        // Show a status message of the running services
-        final int runningServices = Core.instance.getServiceManager().getServiceCount(true);
-        final int totalServices = Core.instance.getServiceManager().getServiceCount();
-        sender.sendMessage(ChatColor.YELLOW + "Started " + ChatColor.GOLD + runningServices + ChatColor.YELLOW + " out of " + ChatColor.GOLD + totalServices + ChatColor.YELLOW + " Dungeon Maze services!");
-
-        // Dungeon Maze restarted, show a status message
-        sender.sendMessage(ChatColor.GREEN + "Dungeon Maze has been restarted successfully, took " + p.getTimeFormatted() + "!");
-        return true;
-    }
-}
diff --git a/src/main/java/fr/xephi/authme/command/executable/ServiceCommand.java b/src/main/java/fr/xephi/authme/command/executable/ServiceCommand.java
deleted file mode 100644
index da89506b..00000000
--- a/src/main/java/fr/xephi/authme/command/executable/ServiceCommand.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package fr.xephi.authme.command.executable;
-
-import com.timvisee.dungeonmaze.Core;
-import com.timvisee.dungeonmaze.DungeonMaze;
-import com.timvisee.dungeonmaze.command.CommandParts;
-import com.timvisee.dungeonmaze.command.ExecutableCommand;
-import com.timvisee.dungeonmaze.service.Service;
-import com.timvisee.dungeonmaze.service.ServiceManager;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
-import java.util.List;
-
-public class ServiceCommand extends ExecutableCommand {
-
-    /**
-     * Execute the command.
-     *
-     * @param sender           The command sender.
-     * @param commandReference The command reference.
-     * @param commandArguments The command arguments.
-     *
-     * @return True if the command was executed successfully, false otherwise.
-     */
-    @Override
-    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
-        // Print the status info header
-        sender.sendMessage(ChatColor.GOLD + "==========[ " + DungeonMaze.PLUGIN_NAME.toUpperCase() + " SERVICES ]==========");
-
-        // Get the service manager and make sure it's valid
-        ServiceManager serviceManager = Core.instance.getServiceManager();
-        if(serviceManager == null) {
-            sender.sendMessage(ChatColor.DARK_RED + "Error, failed to retrieve the services information!");
-            return true;
-        }
-
-        // Print the service count and the list of services
-        sender.sendMessage(ChatColor.GOLD + "Running Services: " + ChatColor.WHITE + serviceManager.getServiceCount(true) + ChatColor.GRAY + " / " + Core.instance.getServiceManager().getServiceCount());
-        printServices(sender);
-
-        // Return the result
-        return true;
-    }
-
-    /**
-     * Print all services.
-     *
-     * @param sender The command sender to print the services to.
-     */
-    public void printServices(CommandSender sender) {
-        // Get the service manager and make sure it's valid
-        ServiceManager serviceManager = Core.instance.getServiceManager();
-        if(serviceManager == null) {
-            sender.sendMessage(ChatColor.DARK_RED + "Error, failed to retrieve the services information!");
-            return;
-        }
-
-        // Get all the services
-        List<Service> services = serviceManager.getServices();
-
-        // Print the header
-        sender.sendMessage(ChatColor.GOLD + "Services:");
-
-        // Print all the services
-        for(Service service : services) {
-            // Check whether the service is initialized
-            if(service.isInit())
-                sender.sendMessage(ChatColor.WHITE + " " + service.getName() + " service " + ChatColor.GREEN + ChatColor.ITALIC + "(Loaded)");
-            else
-                sender.sendMessage(ChatColor.WHITE + " " + service.getName() + " service " + ChatColor.DARK_RED + ChatColor.ITALIC + "(Not loaded)");
-        }
-    }
-}
diff --git a/src/main/java/fr/xephi/authme/command/executable/StatusCommand.java b/src/main/java/fr/xephi/authme/command/executable/StatusCommand.java
deleted file mode 100644
index d0bfc583..00000000
--- a/src/main/java/fr/xephi/authme/command/executable/StatusCommand.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package fr.xephi.authme.command.executable;
-
-import com.timvisee.dungeonmaze.Core;
-import com.timvisee.dungeonmaze.DungeonMaze;
-import com.timvisee.dungeonmaze.command.CommandParts;
-import com.timvisee.dungeonmaze.command.ExecutableCommand;
-import com.timvisee.dungeonmaze.permission.PermissionsManager;
-import com.timvisee.dungeonmaze.util.MinecraftUtils;
-import com.timvisee.dungeonmaze.util.SystemUtils;
-import com.timvisee.dungeonmaze.world.WorldManager;
-import com.timvisee.dungeonmaze.world.dungeon.chunk.grid.DungeonChunkGridManager;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class StatusCommand extends ExecutableCommand {
-
-    /**
-     * Execute the command.
-     *
-     * @param sender           The command sender.
-     * @param commandReference The command reference.
-     * @param commandArguments The command arguments.
-     *
-     * @return True if the command was executed successfully, false otherwise.
-     */
-    @Override
-    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
-        // Print the status info header
-        sender.sendMessage(ChatColor.GOLD + "==========[ " + DungeonMaze.PLUGIN_NAME.toUpperCase() + " STATUS ]==========");
-
-        // Get the world manager
-        WorldManager worldManager = Core.getWorldManager();
-
-        // Print the number of Dungeon Maze worlds
-        if(worldManager != null)
-            sender.sendMessage(ChatColor.GOLD + DungeonMaze.PLUGIN_NAME + " worlds: " + ChatColor.WHITE + worldManager.getDungeonMazeWorlds().size());
-        else
-            sender.sendMessage(ChatColor.GOLD + DungeonMaze.PLUGIN_NAME + " worlds: " + ChatColor.DARK_RED + ChatColor.ITALIC + "Unknown!");
-
-        // Print the Dungeon Maze player count
-        int playerCount = Bukkit.getOnlinePlayers().size();
-        int dungeonMazePlayerCount = 0;
-        if(worldManager != null) {
-            for(Player player : Bukkit.getOnlinePlayers())
-                if(worldManager.isDungeonMazeWorld(player.getWorld().getName()))
-                    dungeonMazePlayerCount++;
-
-            sender.sendMessage(ChatColor.GOLD + DungeonMaze.PLUGIN_NAME + " players: " + ChatColor.WHITE + dungeonMazePlayerCount + ChatColor.GRAY + " / " + playerCount);
-
-        } else
-            sender.sendMessage(ChatColor.GOLD + DungeonMaze.PLUGIN_NAME + " players: " + ChatColor.DARK_RED + ChatColor.ITALIC + "Unknown!");
-
-        // Get the permissions manager
-        PermissionsManager permissionsManager = Core.getPermissionsManager();
-
-        // Print the permissions manager status
-        if(permissionsManager != null) {
-            // Get the used permissions system
-            PermissionsManager.PermissionsSystemType type = permissionsManager.getUsedPermissionsSystemType();
-
-            if(!type.equals(PermissionsManager.PermissionsSystemType.NONE))
-                sender.sendMessage(ChatColor.GOLD + "Permissions System: " + ChatColor.GREEN + permissionsManager.getUsedPermissionsSystemType().getName());
-            else
-                sender.sendMessage(ChatColor.GOLD + "Permissions System: " + ChatColor.GRAY + ChatColor.ITALIC + permissionsManager.getUsedPermissionsSystemType().getName());
-        } else
-            sender.sendMessage(ChatColor.GOLD + "Permissions System: " + ChatColor.DARK_RED + ChatColor.ITALIC + "Unknown!");
-
-        // Get the dungeon chunk grid manager
-        DungeonChunkGridManager dungeonChunkGridManager = Core.getDungeonChunkGridManager();
-        if(dungeonChunkGridManager != null) {
-            int loadedChunks = dungeonChunkGridManager.getLoadedChunksCount();
-            int loadedGrids = dungeonChunkGridManager.getLoadedGridsCount();
-            sender.sendMessage(ChatColor.GOLD + "Loaded Dungeon Chunks: " + ChatColor.WHITE + loadedChunks + ChatColor.GRAY + " in " + ChatColor.WHITE + loadedGrids + ChatColor.GRAY + " grid" + (loadedGrids != 1 ? "s" : ""));
-        } else
-            sender.sendMessage(ChatColor.GOLD + "Loaded Dungeon Chunks: " + ChatColor.DARK_RED + ChatColor.ITALIC + "Unknown!");
-
-        // Print the service count
-        sender.sendMessage(ChatColor.GOLD + "Running Services: " + ChatColor.WHITE + Core.instance.getServiceManager().getServiceCount(true) + ChatColor.GRAY + " / " + Core.instance.getServiceManager().getServiceCount());
-
-        // Print the plugin runtime
-        printPluginRuntime(sender);
-
-        // Show the version status
-        sender.sendMessage(ChatColor.GOLD + "Version: " + ChatColor.WHITE + "Dungeon Maze v" + DungeonMaze.getVersionName() + ChatColor.GRAY + " (code: " + DungeonMaze.getVersionCode() + ")");
-
-        // Print the server status
-        printServerStatus(sender);
-
-        // Print the machine status
-        printMachineStatus(sender);
-        return true;
-    }
-
-    /**
-     * Print the plugin runtime.
-     *
-     * @param sender Command sender to print the runtime to.
-     */
-    public void printPluginRuntime(CommandSender sender) {
-        // Get the runtime
-        long runtime = new Date().getTime() - Core.getInitializationTime().getTime();
-
-        // Calculate the timings
-        int millis = (int) (runtime % 1000);
-        runtime/=1000;
-        int seconds = (int) (runtime % 60);
-        runtime/=60;
-        int minutes = (int) (runtime % 60);
-        runtime/=60;
-        int hours = (int) runtime;
-
-        // Create a double and triple digit formatter
-        DecimalFormat doubleDigit = new DecimalFormat("######00");
-        DecimalFormat tripleDigit = new DecimalFormat("000");
-
-        // Generate the timing string
-        StringBuilder runtimeStr = new StringBuilder(ChatColor.WHITE + doubleDigit.format(seconds) + ChatColor.GRAY + "." + ChatColor.WHITE + tripleDigit.format(millis));
-        String measurement = "Seconds";
-        if(minutes > 0 || hours > 0) {
-            runtimeStr.insert(0, ChatColor.WHITE + doubleDigit.format(minutes) + ChatColor.GRAY + ":");
-            measurement = "Minutes";
-            if(hours > 0) {
-                runtimeStr.insert(0, ChatColor.WHITE + doubleDigit.format(hours) + ChatColor.GRAY + ":");
-                measurement = "Hours";
-            }
-        }
-
-        // Print the runtime
-        sender.sendMessage(ChatColor.GOLD + "Runtime: " + ChatColor.WHITE + runtimeStr + " " + ChatColor.GRAY + measurement);
-    }
-
-    /**
-     * Print the server status.
-     *
-     * @param sender The command sender to print the status to.
-     */
-    public void printServerStatus(CommandSender sender) {
-        // Print the header
-        sender.sendMessage(ChatColor.GRAY + "" + ChatColor.ITALIC + "Server Status:");
-
-        // Print the server status
-        sender.sendMessage(ChatColor.GOLD + "Detected Minecraft Version: " + ChatColor.WHITE + MinecraftUtils.getMinecraftVersion());
-        sender.sendMessage(ChatColor.GOLD + "Detected Minecraft Server: " + ChatColor.WHITE + MinecraftUtils.getServerType().getName());
-        sender.sendMessage(ChatColor.GOLD + "Server Version: " + ChatColor.WHITE + Bukkit.getVersion());
-        sender.sendMessage(ChatColor.GOLD + "Bukkit Version: " + ChatColor.WHITE + Bukkit.getBukkitVersion());
-        sender.sendMessage(ChatColor.GOLD + "Running Plugins: " + ChatColor.WHITE + Bukkit.getPluginManager().getPlugins().length);
-
-        // Get the world manager
-        WorldManager worldManager = Core.getWorldManager();
-        if(worldManager != null)
-            sender.sendMessage(ChatColor.GOLD + "Loaded Worlds: " + ChatColor.WHITE + Bukkit.getWorlds().size() + ChatColor.GRAY + " / " + worldManager.getWorlds().size());
-
-        // Print the server time
-        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        sender.sendMessage(ChatColor.GOLD + "Server Time: " + ChatColor.WHITE + dateFormat.format(new Date()));
-    }
-
-    /**
-     * Print the machine status.
-     *
-     * @param sender The command sender to print the status to.
-     */
-    public void printMachineStatus(CommandSender sender) {
-        // Print the header
-        sender.sendMessage(ChatColor.GRAY + "" + ChatColor.ITALIC + "Machine Status:");
-
-        // Return the machine status
-        sender.sendMessage(ChatColor.GOLD + "OS Name: " + ChatColor.WHITE + System.getProperty("os.name"));
-        sender.sendMessage(ChatColor.GOLD + "OS Architecture: " + ChatColor.WHITE + SystemUtils.getSystemArchNumber() + "-bit" + ChatColor.GRAY + " (" + SystemUtils.getSystemArchFull() + ")");
-        sender.sendMessage(ChatColor.GOLD + "OS Version: " + ChatColor.WHITE + System.getProperty("os.version"));
-        sender.sendMessage(ChatColor.GOLD + "Java Version: " + ChatColor.WHITE + System.getProperty("java.version") + ChatColor.GRAY + " (" + System.getProperty("sun.arch.data.model") + "-bit)");
-    }
-}
diff --git a/src/main/java/fr/xephi/authme/command/executable/TeleportCommand.java b/src/main/java/fr/xephi/authme/command/executable/TeleportCommand.java
deleted file mode 100644
index b1821cf5..00000000
--- a/src/main/java/fr/xephi/authme/command/executable/TeleportCommand.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package fr.xephi.authme.command.executable;
-
-import com.timvisee.dungeonmaze.Core;
-import com.timvisee.dungeonmaze.command.CommandParts;
-import com.timvisee.dungeonmaze.command.ExecutableCommand;
-import com.timvisee.dungeonmaze.world.WorldManager;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-public class TeleportCommand extends ExecutableCommand {
-
-    /**
-     * Execute the command.
-     *
-     * @param sender           The command sender.
-     * @param commandReference The command reference.
-     * @param commandArguments The command arguments.
-     *
-     * @return True if the command was executed successfully, false otherwise.
-     */
-    @Override
-    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
-        // Make sure the command is executed by an in-game player
-        if(!(sender instanceof Player)) {
-            sender.sendMessage(ChatColor.DARK_RED + "You need to be in-game to use this command!");
-            return true;
-        }
-
-        // Get the player and the world name to teleport to
-        Player player = (Player) sender;
-        String worldName = commandArguments.get(0);
-
-        // Get the world manager, and make sure it's valid
-        WorldManager worldManager = Core.getWorldManager();
-        boolean showWorldManagerError = false;
-        if(worldManager == null)
-            showWorldManagerError = true;
-        else if(!worldManager.isInit())
-            showWorldManagerError = true;
-        if(showWorldManagerError) {
-            sender.sendMessage(ChatColor.DARK_RED + "Failed to teleport, world manager not available!");
-            return true;
-        }
-
-        // Make sure the world exists
-        if(!worldManager.isWorld(worldName)) {
-            sender.sendMessage(ChatColor.DARK_RED + worldName);
-            sender.sendMessage(ChatColor.DARK_RED + "This world doesn't exists!");
-            return true;
-        }
-
-        // Try to load the world
-        World world = worldManager.loadWorld(worldName);
-
-        // Make sure the world was loaded successfully
-        if(world == null) {
-            sender.sendMessage(ChatColor.DARK_RED + "Failed to teleport, unable to load the world!");
-            return true;
-        }
-
-        // Get the spawn location to teleport the player to
-        Location spawn = world.getSpawnLocation();
-
-        // Force-set the location on Dungeon Maze worlds
-        // TODO: Fix this!
-        if(worldManager.isDungeonMazeWorld(worldName)) {
-            spawn.setX(4);
-            spawn.setY(68);
-            spawn.setZ(4);
-        }
-
-        // Teleport the player, show a status message and return true
-        player.teleport(spawn);
-        player.sendMessage(ChatColor.GREEN + "You have been teleported to " + ChatColor.GOLD + worldName + ChatColor.GREEN + "!");
-        return true;
-    }
-}
diff --git a/src/main/java/fr/xephi/authme/command/executable/UnloadWorldCommand.java b/src/main/java/fr/xephi/authme/command/executable/UnloadWorldCommand.java
deleted file mode 100644
index 815737b8..00000000
--- a/src/main/java/fr/xephi/authme/command/executable/UnloadWorldCommand.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package fr.xephi.authme.command.executable;
-
-import com.timvisee.dungeonmaze.Core;
-import com.timvisee.dungeonmaze.command.CommandParts;
-import com.timvisee.dungeonmaze.command.ExecutableCommand;
-import com.timvisee.dungeonmaze.util.Profiler;
-import com.timvisee.dungeonmaze.world.WorldManager;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class UnloadWorldCommand extends ExecutableCommand {
-
-    /**
-     * Execute the command.
-     *
-     * @param sender The command sender.
-     * @param commandReference The command reference.
-     * @param commandArguments The command arguments.
-     *
-     * @return True if the command was executed successfully, false otherwise.
-     */
-    @Override
-    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
-        // Get and trim the preferred world name
-        String worldName = commandArguments.get(0).trim();
-
-        // Profile the world unloading
-        Profiler p = new Profiler(true);
-
-        // Validate the world name
-        if(!WorldManager.isValidWorldName(worldName)) {
-            sender.sendMessage(ChatColor.DARK_RED + worldName);
-            sender.sendMessage(ChatColor.DARK_RED + "The world name contains invalid characters!");
-            return true;
-        }
-
-        // Get the world manager, and make sure it's valid
-        WorldManager worldManager = Core.getWorldManager();
-        boolean showWorldManagerError = false;
-        if(worldManager == null)
-            showWorldManagerError = true;
-        else if(!worldManager.isInit())
-            showWorldManagerError = true;
-        if(showWorldManagerError) {
-            sender.sendMessage(ChatColor.DARK_RED + "Failed to unload the world, world manager not available!");
-            return true;
-        }
-
-        // Make sure the world exists
-        if(!worldManager.isWorld(worldName)) {
-            sender.sendMessage(ChatColor.DARK_RED + "The world " + ChatColor.GOLD + worldName + ChatColor.DARK_RED + " doesn't exist!");
-            return true;
-        }
-
-        // Make sure the world is loaded
-        if(!worldManager.isWorldLoaded(worldName)) {
-            sender.sendMessage(ChatColor.DARK_RED + "The world " + ChatColor.GOLD + worldName + ChatColor.DARK_RED + " isn't loaded!");
-            return true;
-        }
-
-        // Make sure the main world isn't unloaded
-        if(worldManager.isMainWorld(worldName)) {
-            sender.sendMessage(ChatColor.DARK_RED + "The main world can't be unloaded!");
-            return true;
-        }
-
-        // Get all players in the world
-        List<Player> players = Bukkit.getOnlinePlayers().stream().filter(player -> player.getWorld().getName().equals(worldName)).collect(Collectors.toList());
-        int playerCount = players.size();
-
-        // Teleport all players away
-        if(playerCount > 0) {
-            // Get the main world
-            World mainWorld = worldManager.getMainWorld();
-            Location mainWorldSpawn = mainWorld.getSpawnLocation();
-
-            // Teleport all players
-            for(Player player : players) {
-                // Teleport the player to the spawn of the main world
-                player.teleport(mainWorldSpawn);
-
-                // Show a message to the player
-                player.sendMessage(ChatColor.YELLOW + "The current world is being unloaded, you've been teleported!");
-            }
-
-            // Show a status message
-            sender.sendMessage(ChatColor.YELLOW + "Teleported " + ChatColor.GOLD + playerCount + ChatColor.YELLOW + " player" + (playerCount != 1 ? "s" : "") + " away!");
-        }
-
-        // Force the world to be loaded if it isn't already loaded
-        if(!worldManager.unloadWorld(worldName)) {
-            sender.sendMessage(ChatColor.DARK_RED + "Failed to unload the world!");
-            return true;
-        }
-
-        // Show a status message, return the result
-        sender.sendMessage(ChatColor.GREEN + "The world " + ChatColor.GOLD + worldName + ChatColor.GREEN + " has been unloaded, took " + p.getTimeFormatted() + "!");
-        return true;
-    }
-}
diff --git a/src/main/java/fr/xephi/authme/command/executable/VersionCommand.java b/src/main/java/fr/xephi/authme/command/executable/VersionCommand.java
deleted file mode 100644
index 7adc9229..00000000
--- a/src/main/java/fr/xephi/authme/command/executable/VersionCommand.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package fr.xephi.authme.command.executable;
-
-import com.timvisee.dungeonmaze.DungeonMaze;
-import com.timvisee.dungeonmaze.command.CommandParts;
-import com.timvisee.dungeonmaze.command.ExecutableCommand;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-public class VersionCommand extends ExecutableCommand {
-
-    /**
-     * Execute the command.
-     *
-     * @param sender           The command sender.
-     * @param commandReference The command reference.
-     * @param commandArguments The command arguments.
-     *
-     * @return True if the command was executed successfully, false otherwise.
-     */
-    @Override
-    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
-        // Show some version info
-        sender.sendMessage(ChatColor.GOLD + "==========[ " + DungeonMaze.PLUGIN_NAME.toUpperCase() + " ABOUT ]==========");
-        sender.sendMessage(ChatColor.GOLD + "Version: " + ChatColor.WHITE + DungeonMaze.PLUGIN_NAME + " v" + DungeonMaze.getVersionName() + ChatColor.GRAY + " (code: " + DungeonMaze.getVersionCode() + ")");
-        sender.sendMessage(ChatColor.GOLD + "Developers:");
-        printDeveloper(sender, "Tim Visee", "timvisee", "Lead Developer");
-        printDeveloper(sender, "Xephi", "xephi", "Code Contributor");
-        printDeveloper(sender, "sgdc3", "sgdc3", "Code Contributor");
-        printDeveloper(sender, "Metonymia", "Metonymia", "Design Contributor");
-        sender.sendMessage(ChatColor.GOLD + "Website: " + ChatColor.WHITE + "http://timvisee.com/projects/bukkit/dungeon-maze/");
-        sender.sendMessage(ChatColor.GOLD + "License: " + ChatColor.WHITE + "GNU GPL v3.0" + ChatColor.GRAY + ChatColor.ITALIC + " (See LICENSE file)");
-        sender.sendMessage(ChatColor.GOLD + "Copyright: " + ChatColor.WHITE + "Copyright (c) Tim Visee 2015. All rights reserved.");
-        return true;
-    }
-
-    /**
-     * Print a developer with proper styling.
-     *
-     * @param sender The command sender.
-     * @param name The display name of the developer.
-     * @param minecraftName The Minecraft username of the developer, if available.
-     * @param function The function of the developer.
-     */
-    @SuppressWarnings("StringConcatenationInsideStringBufferAppend")
-    private void printDeveloper(CommandSender sender, String name, String minecraftName, String function) {
-        // Print the name
-        StringBuilder msg = new StringBuilder();
-        msg.append(" " + ChatColor.WHITE);
-        msg.append(name);
-
-        // Append the Minecraft name, if available
-        if(minecraftName.length() != 0)
-            msg.append(ChatColor.GRAY + " // " + ChatColor.WHITE + minecraftName);
-        msg.append(ChatColor.GRAY + "" + ChatColor.ITALIC + " (" + function + ")");
-
-        // Show the online status
-        if(minecraftName.length() != 0)
-            if(isPlayerOnline(minecraftName))
-                msg.append(ChatColor.GREEN + "" + ChatColor.ITALIC + " (In-Game)");
-
-        // Print the message
-        sender.sendMessage(msg.toString());
-    }
-
-    /**
-     * Check whether a player is online.
-     *
-     * @param minecraftName The Minecraft player name.
-     *
-     * @return True if the player is online, false otherwise.
-     */
-    private boolean isPlayerOnline(String minecraftName) {
-        for(Player player : Bukkit.getOnlinePlayers())
-            if(player.getName().equalsIgnoreCase(minecraftName))
-                return true;
-        return false;
-    }
-}

From 7463d123e9c2a4e96e6e461676f530f928b6f184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 16:54:42 +0100
Subject: [PATCH 026/117] Disabled legacy /authme command

---
 src/main/java/fr/xephi/authme/AuthMe.java | 25 ++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 8bfe1169..4ce12c4c 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -17,6 +17,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.World;
+import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginManager;
@@ -335,8 +336,9 @@ public class AuthMe extends JavaPlugin {
         pm.registerEvents(new AuthMeEntityListener(this), this);
         pm.registerEvents(new AuthMeServerListener(this), this);
 
+        // TODO: This is moving to AuthMe.onCommand();
         // Register commands
-        getCommand("authme").setExecutor(new AdminCommand(this));
+        //getCommand("authme").setExecutor(new AdminCommand(this));
         getCommand("register").setExecutor(new RegisterCommand(this));
         getCommand("login").setExecutor(new LoginCommand(this));
         getCommand("changepassword").setExecutor(new ChangePasswordCommand(this));
@@ -825,4 +827,25 @@ public class AuthMe extends JavaPlugin {
     public CommandHandler getCommandHandler() {
         return this.commandHandler;
     }
+
+    /**
+     * Handle Bukkit commands.
+     *
+     * @param sender The command sender (Bukkit).
+     * @param cmd The command (Bukkit).
+     * @param commandLabel The command label (Bukkit).
+     * @param args The command arguments (Bukkit).
+     *
+     * @return True if the command was executed, false otherwise.
+     */
+    @Override
+    public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
+        // Get the command handler, and make sure it's valid
+        CommandHandler commandHandler = this.getCommandHandler();
+        if(commandHandler == null)
+            return false;
+
+        // Handle the command, return the result
+        return commandHandler.onCommand(sender, cmd, commandLabel, args);
+    }
 }

From 2fcb5f11837a3abd80b6ba6095d6f63b4b81f972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 16:58:13 +0100
Subject: [PATCH 027/117] Added plugin name and version constants, implemented
 these

---
 src/main/java/fr/xephi/authme/AuthMe.java     | 26 +++++++++++++++++++
 .../command/executable/AuthMeCommand.java     |  3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 4ce12c4c..f3ff8778 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -75,6 +75,14 @@ import net.minelink.ctplus.CombatTagPlus;
 
 public class AuthMe extends JavaPlugin {
 
+    /** Defines the name of the plugin. */
+    // TODO: Create a getter method for this constant, and make it private
+    public static final String PLUGIN_NAME = "AuthMeReloaded";
+    /** Defines the current AuthMeReloaded version name. */
+    private static final String PLUGIN_VERSION_NAME = "5.1-SNAPSHOT";
+    /** Defines the current AuthMeReloaded version code. */
+    private static final int PLUGIN_VERSION_CODE = 100; // Increase this number by one when an update is released
+
     private static AuthMe authme;
     private static Server server;
     private Logger authmeLogger;
@@ -848,4 +856,22 @@ public class AuthMe extends JavaPlugin {
         // Handle the command, return the result
         return commandHandler.onCommand(sender, cmd, commandLabel, args);
     }
+
+    /**
+     * Get the current installed AuthMeReloaded version name.
+     *
+     * @return The version name of the currently installed AuthMeReloaded instance.
+     */
+    public static String getVersionName() {
+        return PLUGIN_VERSION_NAME;
+    }
+
+    /**
+     * Get the current installed AuthMeReloaded version code.
+     *
+     * @return The version code of the currently installed AuthMeReloaded instance.
+     */
+    public static int getVersionCode() {
+        return PLUGIN_VERSION_CODE;
+    }
 }
diff --git a/src/main/java/fr/xephi/authme/command/executable/AuthMeCommand.java b/src/main/java/fr/xephi/authme/command/executable/AuthMeCommand.java
index a2b159e4..8f1edd84 100644
--- a/src/main/java/fr/xephi/authme/command/executable/AuthMeCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/AuthMeCommand.java
@@ -1,5 +1,6 @@
 package fr.xephi.authme.command.executable;
 
+import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import org.bukkit.ChatColor;
@@ -20,7 +21,7 @@ public class AuthMeCommand extends ExecutableCommand {
     public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // Show some version info
         // TODO: Use plugin name and version constants here!
-        sender.sendMessage(ChatColor.GREEN + "This server is running AuthMeReloaded v1.0! " + ChatColor.RED + "<3");
+        sender.sendMessage(ChatColor.GREEN + "This server is running " + AuthMe.PLUGIN_NAME + " v" + AuthMe.getVersionName() + "! " + ChatColor.RED + "<3");
         sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/" + commandReference.get(0) + " help" + ChatColor.YELLOW + " to view help.");
         sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/" + commandReference.get(0) + " about" + ChatColor.YELLOW + " to view about.");
         return true;

From 53a2e8f9f0915eaf2b39d81eeea9237001b48649 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 16:59:07 +0100
Subject: [PATCH 028/117] Implemented plugin name in help page header

---
 src/main/java/fr/xephi/authme/command/help/HelpProvider.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/fr/xephi/authme/command/help/HelpProvider.java b/src/main/java/fr/xephi/authme/command/help/HelpProvider.java
index 42696493..000f721e 100644
--- a/src/main/java/fr/xephi/authme/command/help/HelpProvider.java
+++ b/src/main/java/fr/xephi/authme/command/help/HelpProvider.java
@@ -95,7 +95,7 @@ public class HelpProvider {
         }
 
         // Print the help header
-        sender.sendMessage(ChatColor.GOLD + "==========[ DUNGEON MAZE HELP ]==========");
+        sender.sendMessage(ChatColor.GOLD + "==========[ " + AuthMe.PLUGIN_NAME.toUpperCase() + " HELP ]==========");
 
         // Print the command help information
         if(showCommand)

From c30792f2782c24edcfce6cf51ef5b91ef9d43c80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 17:06:36 +0100
Subject: [PATCH 029/117] Implemented version command

---
 .../xephi/authme/command/CommandManager.java  |  8 +-
 .../command/executable/VersionCommand.java    | 79 +++++++++++++++++++
 2 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/VersionCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 624b07e7..c735f400 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -220,7 +220,7 @@ public class CommandManager {
                 "Show detailed information about all the Dungeon Maze serivces.",
                 dungeonMazeCommand);
         serviceCommand.setMaximumArguments(false);
-        serviceCommand.setCommandPermissions("dungeonmaze.command.services", CommandPermissions.DefaultPermission.OP_ONLY);
+        serviceCommand.setCommandPermissions("dungeonmaze.command.services", CommandPermissions.DefaultPermission.OP_ONLY);*/
 
         // Register the version command
         CommandDescription versionCommand = new CommandDescription(
@@ -233,9 +233,9 @@ public class CommandManager {
                     add("info");
                 }},
                 "Version info",
-                "Show detailed information about the installed Dungeon Maze version, and shows the developers, contributors, license and other information.",
-                dungeonMazeCommand);
-        versionCommand.setMaximumArguments(false);*/
+                "Show detailed information about the installed AuthMeReloaded version, and shows the developers, contributors, license and other information.",
+                authMeCommand);
+        versionCommand.setMaximumArguments(false);
 
         // Add the base commands to the commands array
         this.commandDescriptions.add(authMeCommand);
diff --git a/src/main/java/fr/xephi/authme/command/executable/VersionCommand.java b/src/main/java/fr/xephi/authme/command/executable/VersionCommand.java
new file mode 100644
index 00000000..fc243c7d
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/VersionCommand.java
@@ -0,0 +1,79 @@
+package fr.xephi.authme.command.executable;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class VersionCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Show some version info
+        sender.sendMessage(ChatColor.GOLD + "==========[ " + AuthMe.PLUGIN_NAME.toUpperCase() + " ABOUT ]==========");
+        sender.sendMessage(ChatColor.GOLD + "Version: " + ChatColor.WHITE + AuthMe.PLUGIN_NAME + " v" + AuthMe.getVersionName() + ChatColor.GRAY + " (code: " + AuthMe.getVersionCode() + ")");
+        sender.sendMessage(ChatColor.GOLD + "Developers:");
+        printDeveloper(sender, "Xephi", "xephi", "Lead Developer");
+        printDeveloper(sender, "Sgdc3", "sgdc3", "Code Contributor");
+        printDeveloper(sender, "Tim Visee", "timvisee", "Code Contributor");
+        sender.sendMessage(ChatColor.GOLD + "Website: " + ChatColor.WHITE + "http://dev.bukkit.org/bukkit-plugins/authme-reloaded/");
+        sender.sendMessage(ChatColor.GOLD + "License: " + ChatColor.WHITE + "GNU GPL v3.0" + ChatColor.GRAY + ChatColor.ITALIC + " (See LICENSE file)");
+        sender.sendMessage(ChatColor.GOLD + "Copyright: " + ChatColor.WHITE + "Copyright (c) Xephi 2015. All rights reserved.");
+        return true;
+    }
+
+    /**
+     * Print a developer with proper styling.
+     *
+     * @param sender The command sender.
+     * @param name The display name of the developer.
+     * @param minecraftName The Minecraft username of the developer, if available.
+     * @param function The function of the developer.
+     */
+    @SuppressWarnings("StringConcatenationInsideStringBufferAppend")
+    private void printDeveloper(CommandSender sender, String name, String minecraftName, String function) {
+        // Print the name
+        StringBuilder msg = new StringBuilder();
+        msg.append(" " + ChatColor.WHITE);
+        msg.append(name);
+
+        // Append the Minecraft name, if available
+        if(minecraftName.length() != 0)
+            msg.append(ChatColor.GRAY + " // " + ChatColor.WHITE + minecraftName);
+        msg.append(ChatColor.GRAY + "" + ChatColor.ITALIC + " (" + function + ")");
+
+        // Show the online status
+        if(minecraftName.length() != 0)
+            if(isPlayerOnline(minecraftName))
+                msg.append(ChatColor.GREEN + "" + ChatColor.ITALIC + " (In-Game)");
+
+        // Print the message
+        sender.sendMessage(msg.toString());
+    }
+
+    /**
+     * Check whether a player is online.
+     *
+     * @param minecraftName The Minecraft player name.
+     *
+     * @return True if the player is online, false otherwise.
+     */
+    private boolean isPlayerOnline(String minecraftName) {
+        for(Player player : Bukkit.getOnlinePlayers())
+            if(player.getName().equalsIgnoreCase(minecraftName))
+                return true;
+        return false;
+    }
+}

From 40c7ef95e5a75d382a35098c9d7e6f2375001684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 17:08:23 +0100
Subject: [PATCH 030/117] Added Profiler class

---
 .../java/fr/xephi/authme/util/Profiler.java   | 132 ++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/util/Profiler.java

diff --git a/src/main/java/fr/xephi/authme/util/Profiler.java b/src/main/java/fr/xephi/authme/util/Profiler.java
new file mode 100644
index 00000000..04255f4a
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/util/Profiler.java
@@ -0,0 +1,132 @@
+package fr.xephi.authme.util;
+
+import java.text.DecimalFormat;
+
+@SuppressWarnings("UnusedDeclaration")
+public class Profiler {
+
+    /** Defines the past time in milliseconds. */
+    private long time = 0;
+    /** Defines the time in milliseconds the profiler last started at. */
+    private long start = -1;
+
+    /**
+     * Constructor. This won't start the profiler immediately.
+     */
+    public Profiler() {
+        this(false);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param start True to immediately start the profiler.
+     */
+    public Profiler(boolean start) {
+        // Should the timer be started
+        if(start)
+            start();
+    }
+
+    /**
+     * Start the profiler.
+     *
+     * @return True if the profiler was started, false otherwise possibly due to an error.
+     * True will also be returned if the profiler was started already.
+     */
+    public boolean start() {
+        // Make sure the timer isn't started already
+        if(isActive())
+            return true;
+
+        // Set the start time
+        this.start = System.currentTimeMillis();
+        return true;
+    }
+
+    /**
+     * This will start the profiler if it's not active, or will stop the profiler if it's currently active.
+     *
+     * @return True if the profiler has been started, false if the profiler has been stopped.
+     */
+    public boolean pause() {
+        // Toggle the profiler state
+        if(isStarted())
+            stop();
+        else
+            start();
+
+        // Return the result
+        return isStarted();
+    }
+
+    /**
+     * Stop the profiler if it's active.
+     *
+     * @return True will be returned if the profiler was stopped while it was active. False will be returned if the
+     * profiler was stopped already.
+     */
+    public boolean stop() {
+        // Make sure the profiler is active
+        if(!isActive())
+            return false;
+
+        // Stop the profiler, calculate the passed time
+        this.time += System.currentTimeMillis() - this.start;
+        this.start = -1;
+        return true;
+    }
+
+    /**
+     * Check whether the profiler has been started. The profiler doesn't need to be active right now.
+     *
+     * @return True if the profiler was started, false otherwise.
+     */
+    public boolean isStarted() {
+        return isActive() || this.time > 0;
+    }
+
+    /**
+     * Check whether the profiler is currently active.
+     *
+     * @return True if the profiler is active, false otherwise.
+     */
+    public boolean isActive() {
+        return this.start >= 0;
+    }
+
+    /**
+     * Get the passed time in milliseconds.
+     *
+     * @return The passed time in milliseconds.
+     */
+    public long getTime() {
+        // Check whether the profiler is currently active
+        if(isActive())
+            return this.time + (System.currentTimeMillis() - this.start);
+        return this.time;
+    }
+
+    /**
+     * Get the passed time in a formatted string.
+     *
+     * @return The passed time in a formatted string.
+     */
+    public String getTimeFormatted() {
+        // Get the passed time
+        long time = getTime();
+
+        // Return the time if it's less than one millisecond
+        if(time <= 0)
+            return "<1 ms";
+
+        // Return the time in milliseconds
+        if(time < 1000)
+            return time + " ms";
+
+        // Convert the time into seconds with a single decimal
+        double timeSeconds = ((double) time) / 1000;
+        DecimalFormat df = new DecimalFormat("#0.0");
+        return df.format(timeSeconds) + " s";
+    }
+}

From 0781bc16d12a4628b8429dc517f27dd3a0ceab17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 17:12:50 +0100
Subject: [PATCH 031/117] Implemented reload command

---
 .../xephi/authme/command/CommandManager.java  | 13 ++---
 .../command/executable/ReloadCommand.java     | 55 +++++++++++++++++++
 2 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index c735f400..12bb42d2 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -121,7 +121,7 @@ public class CommandManager {
                 "List Dungeon Mazes",
                 "Lists the available Dungeon Maze worlds and shows some additional information.",
                 dungeonMazeCommand);
-        listWorldCommand.setCommandPermissions("dungeonmaze.command.listworlds", CommandPermissions.DefaultPermission.OP_ONLY);
+        listWorldCommand.setCommandPermissions("dungeonmaze.command.listworlds", CommandPermissions.DefaultPermission.OP_ONLY);*/
 
         // Register the reload command
         CommandDescription reloadCommand = new CommandDescription(
@@ -131,13 +131,12 @@ public class CommandManager {
                     add("rld");
                     add("r");
                 }},
-                "Reload Dungeon Maze",
-                "Reload the Dungeon Maze plugin.",
-                dungeonMazeCommand);
-        reloadCommand.setCommandPermissions("dungeonmaze.command.reload", CommandPermissions.DefaultPermission.OP_ONLY);
-        reloadCommand.addArgument(new CommandArgumentDescription("force", "True or False to force reload.", true));
+                "Reload AuthMeReloaded",
+                "Reload the AuthMeReloaded plugin.",
+                authMeCommand);
+        reloadCommand.setCommandPermissions("authme.admin.reload", CommandPermissions.DefaultPermission.OP_ONLY);
 
-        // Register the reload permissions command
+        /* // Register the reload permissions command
         CommandDescription reloadPermissionsCommand = new CommandDescription(
                 new ReloadPermissionsCommand(),
                 new ArrayList<String>() {{
diff --git a/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java b/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java
new file mode 100644
index 00000000..da0e6dfa
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java
@@ -0,0 +1,55 @@
+package fr.xephi.authme.command.executable;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+
+import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Profiler;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+public class ReloadCommand extends ExecutableCommand {
+
+    /** AuthMe plugin instance. */
+    private AuthMe plugin = AuthMe.getInstance();
+    /** Messages instance. */
+    private Messages m = Messages.getInstance();
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Profile the reload process
+        Profiler p = new Profiler(true);
+
+        // Show a status message
+        sender.sendMessage(ChatColor.YELLOW + "Reloading Dungeon Maze...");
+
+        try {
+            Settings.reload();
+            plugin.getModuleManager().reloadModules();
+            m.reloadMessages();
+            plugin.setupDatabase();
+        } catch (Exception e) {
+            ConsoleLogger.showError("Fatal error occurred! Authme instance ABORTED!");
+            ConsoleLogger.writeStackTrace(e);
+            plugin.stopOrUnload();
+            return false;
+        }
+        m.send(sender, "reload");
+
+        // Dungeon Maze reloaded, show a status message
+        sender.sendMessage(ChatColor.GREEN + "Dungeon Maze has been reloaded successfully, took " + p.getTimeFormatted() + "!");
+        return true;
+    }
+}

From d583a3f339aaa6666ab9baa2483a28350d2130f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 17:19:50 +0100
Subject: [PATCH 032/117] Improved reload command

---
 .../command/executable/ReloadCommand.java     | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java b/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java
index da0e6dfa..427998b4 100644
--- a/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java
@@ -8,16 +8,11 @@ import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.util.Profiler;
-import org.bukkit.ChatColor;
+//import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
 public class ReloadCommand extends ExecutableCommand {
 
-    /** AuthMe plugin instance. */
-    private AuthMe plugin = AuthMe.getInstance();
-    /** Messages instance. */
-    private Messages m = Messages.getInstance();
-
     /**
      * Execute the command.
      *
@@ -32,13 +27,18 @@ public class ReloadCommand extends ExecutableCommand {
         // Profile the reload process
         Profiler p = new Profiler(true);
 
+        // AuthMe plugin instance
+        AuthMe plugin = AuthMe.getInstance();
+        // Messages instance
+        Messages m = Messages.getInstance();
+
         // Show a status message
-        sender.sendMessage(ChatColor.YELLOW + "Reloading Dungeon Maze...");
+        //sender.sendMessage(ChatColor.YELLOW + "Reloading AuthMeReloaded...");
 
         try {
             Settings.reload();
             plugin.getModuleManager().reloadModules();
-            m.reloadMessages();
+            Messages.getInstance().reloadMessages();
             plugin.setupDatabase();
         } catch (Exception e) {
             ConsoleLogger.showError("Fatal error occurred! Authme instance ABORTED!");
@@ -46,10 +46,12 @@ public class ReloadCommand extends ExecutableCommand {
             plugin.stopOrUnload();
             return false;
         }
+
+        // Show a status message
         m.send(sender, "reload");
 
-        // Dungeon Maze reloaded, show a status message
-        sender.sendMessage(ChatColor.GREEN + "Dungeon Maze has been reloaded successfully, took " + p.getTimeFormatted() + "!");
+        // AuthMeReloaded reloaded, show a status message
+        //sender.sendMessage(ChatColor.GREEN + "AuthMeReloaded has been reloaded successfully, took " + p.getTimeFormatted() + "!");
         return true;
     }
 }

From 085f19355d2169b0c1eca393f4c65896389c6a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 17:31:22 +0100
Subject: [PATCH 033/117] Improved grammar in reload command

---
 .../java/fr/xephi/authme/command/executable/ReloadCommand.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java b/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java
index 427998b4..e646ccf7 100644
--- a/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java
@@ -41,7 +41,7 @@ public class ReloadCommand extends ExecutableCommand {
             Messages.getInstance().reloadMessages();
             plugin.setupDatabase();
         } catch (Exception e) {
-            ConsoleLogger.showError("Fatal error occurred! Authme instance ABORTED!");
+            ConsoleLogger.showError("Fatal error occurred! AuthMe instance ABORTED!");
             ConsoleLogger.writeStackTrace(e);
             plugin.stopOrUnload();
             return false;

From 1a62cecd58d72476212ca2ac7fc0676903134b8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 17:34:35 +0100
Subject: [PATCH 034/117] Implemented the purge command

---
 .../xephi/authme/command/CommandManager.java  | 13 ++++
 .../command/executable/PurgeCommand.java      | 72 +++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/PurgeCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 12bb42d2..93bd6606 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -123,6 +123,19 @@ public class CommandManager {
                 dungeonMazeCommand);
         listWorldCommand.setCommandPermissions("dungeonmaze.command.listworlds", CommandPermissions.DefaultPermission.OP_ONLY);*/
 
+        // Register the purge command
+        CommandDescription purgeCommand = new CommandDescription(
+                new ReloadCommand(),
+                new ArrayList<String>() {{
+                    add("purge");
+                    add("delete");
+                }},
+                "Purge AuthMeReloaded data",
+                "Purge old AuthMeReloaded data longer than the specified amount of days ago.",
+                authMeCommand);
+        purgeCommand.setCommandPermissions("authme.admin.purge", CommandPermissions.DefaultPermission.OP_ONLY);
+        purgeCommand.addArgument(new CommandArgumentDescription("days", "Number of days", false));
+
         // Register the reload command
         CommandDescription reloadCommand = new CommandDescription(
                 new ReloadCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/PurgeCommand.java b/src/main/java/fr/xephi/authme/command/executable/PurgeCommand.java
new file mode 100644
index 00000000..3dbca4eb
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/PurgeCommand.java
@@ -0,0 +1,72 @@
+package fr.xephi.authme.command.executable;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.Settings;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+import java.util.Calendar;
+import java.util.List;
+
+public class PurgeCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        AuthMe plugin = AuthMe.getInstance();
+
+        // Get the days parameter
+        String daysStr = commandArguments.get(0);
+
+        // Convert the days string to an integer value, and make sure it's valid
+        int days;
+        try {
+            days = Integer.valueOf(daysStr);
+        } catch(Exception ex) {
+            sender.sendMessage(ChatColor.RED + "The value you've entered is invalid!");
+            return true;
+        }
+
+        // Validate the value
+        if(days < 30) {
+            sender.sendMessage(ChatColor.RED + "You can only purge data older than 30 days");
+            return true;
+        }
+
+        // Create a calender instance to determine the date
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.DATE, -days);
+        long until = calendar.getTimeInMillis();
+
+        // Purge the data, get the purged values
+        List<String> purged = plugin.database.autoPurgeDatabase(until);
+
+        // Show a status message
+        sender.sendMessage(ChatColor.GOLD + "Deleted " + purged.size() + " user accounts");
+
+        // Purge other data
+        if(Settings.purgeEssentialsFile && plugin.ess != null)
+            plugin.dataManager.purgeEssentials(purged);
+        if(Settings.purgePlayerDat)
+            plugin.dataManager.purgeDat(purged);
+        if(Settings.purgeLimitedCreative)
+            plugin.dataManager.purgeLimitedCreative(purged);
+        if(Settings.purgeAntiXray)
+            plugin.dataManager.purgeAntiXray(purged);
+
+        // Show a status message
+        sender.sendMessage(ChatColor.GREEN + "[AuthMe] Database has been purged correctly");
+        return true;
+    }
+}

From a2e33402f9ff45c0c258f1596cc385add27fb205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 17:37:40 +0100
Subject: [PATCH 035/117] Fixed invalid command reference

---
 src/main/java/fr/xephi/authme/command/CommandManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 93bd6606..715c3637 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -125,7 +125,7 @@ public class CommandManager {
 
         // Register the purge command
         CommandDescription purgeCommand = new CommandDescription(
-                new ReloadCommand(),
+                new PurgeCommand(),
                 new ArrayList<String>() {{
                     add("purge");
                     add("delete");

From 39d6fdd05d058bfcde182b5929d80566ba4c38cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 17:42:46 +0100
Subject: [PATCH 036/117] Implemented lastlogin command

---
 .../xephi/authme/command/CommandManager.java  | 13 ++++
 .../command/executable/LastLoginCommand.java  | 74 +++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/LastLoginCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 715c3637..1a62a036 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -123,6 +123,19 @@ public class CommandManager {
                 dungeonMazeCommand);
         listWorldCommand.setCommandPermissions("dungeonmaze.command.listworlds", CommandPermissions.DefaultPermission.OP_ONLY);*/
 
+        // Register the purge command
+        CommandDescription lastLoginCommand = new CommandDescription(
+                new LastLoginCommand(),
+                new ArrayList<String>() {{
+                    add("lastlogin");
+                    add("ll");
+                }},
+                "Player's last login",
+                "View the date of the specified players last login",
+                authMeCommand);
+        lastLoginCommand.setCommandPermissions("authme.admin.lastlogin", CommandPermissions.DefaultPermission.OP_ONLY);
+        lastLoginCommand.addArgument(new CommandArgumentDescription("player", "Player name", true));
+
         // Register the purge command
         CommandDescription purgeCommand = new CommandDescription(
                 new PurgeCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/LastLoginCommand.java b/src/main/java/fr/xephi/authme/command/executable/LastLoginCommand.java
new file mode 100644
index 00000000..cc184cbb
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/LastLoginCommand.java
@@ -0,0 +1,74 @@
+package fr.xephi.authme.command.executable;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Profiler;
+import org.bukkit.command.CommandSender;
+
+//import org.bukkit.ChatColor;
+import java.util.Date;
+
+public class LastLoginCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Profile the reload process
+        Profiler p = new Profiler(true);
+
+        // AuthMe plugin instance
+        AuthMe plugin = AuthMe.getInstance();
+        // Messages instance
+        Messages m = Messages.getInstance();
+
+        // Get the player
+        String playerName = sender.getName();
+        if(commandArguments.getCount() >= 1)
+            playerName = commandArguments.get(0);
+
+        // Validate the player
+        PlayerAuth auth;
+        try {
+            auth = plugin.database.getAuth(args[1].toLowerCase());
+        } catch (NullPointerException e) {
+            m.send(sender, "unknown_user");
+            return true;
+        }
+        if (auth == null) {
+            m.send(sender, "user_unknown");
+            return true;
+        }
+
+        // Get the last login date
+        long lastLogin = auth.getLastLogin();
+        Date date = new Date(lastLogin);
+
+        // Get the difference
+        final long diff = System.currentTimeMillis() - lastLogin;
+
+        // Build the message
+        final String msg = (int) (diff / 86400000) + " days " + (int) (diff / 3600000 % 24) + " hours " + (int) (diff / 60000 % 60) + " mins " + (int) (diff / 1000 % 60) + " secs.";
+
+        // Get the player's last IP
+        String lastIP = auth.getIp();
+
+        // Show the player status
+        sender.sendMessage("[AuthMe] " + args[1] + " last login : " + date.toString());
+        sender.sendMessage("[AuthMe] The player " + auth.getNickname() + " is unlogged since " + msg);
+        sender.sendMessage("[AuthMe] Last Player's IP: " + lastIP);
+        return true;
+    }
+}

From 1fd64bc0659dc92a26709a17bf102d7234a96edb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 17:43:10 +0100
Subject: [PATCH 037/117] Fixed issue, removed unused imports

---
 .../xephi/authme/command/executable/LastLoginCommand.java  | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/executable/LastLoginCommand.java b/src/main/java/fr/xephi/authme/command/executable/LastLoginCommand.java
index cc184cbb..def95148 100644
--- a/src/main/java/fr/xephi/authme/command/executable/LastLoginCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/LastLoginCommand.java
@@ -1,16 +1,13 @@
 package fr.xephi.authme.command.executable;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
-import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.util.Profiler;
 import org.bukkit.command.CommandSender;
 
-//import org.bukkit.ChatColor;
 import java.util.Date;
 
 public class LastLoginCommand extends ExecutableCommand {
@@ -42,7 +39,7 @@ public class LastLoginCommand extends ExecutableCommand {
         // Validate the player
         PlayerAuth auth;
         try {
-            auth = plugin.database.getAuth(args[1].toLowerCase());
+            auth = plugin.database.getAuth(playerName.toLowerCase());
         } catch (NullPointerException e) {
             m.send(sender, "unknown_user");
             return true;
@@ -66,7 +63,7 @@ public class LastLoginCommand extends ExecutableCommand {
         String lastIP = auth.getIp();
 
         // Show the player status
-        sender.sendMessage("[AuthMe] " + args[1] + " last login : " + date.toString());
+        sender.sendMessage("[AuthMe] " + playerName + " last login : " + date.toString());
         sender.sendMessage("[AuthMe] The player " + auth.getNickname() + " is unlogged since " + msg);
         sender.sendMessage("[AuthMe] Last Player's IP: " + lastIP);
         return true;

From 4ae5b0be1e86fadcdeba8493f6e3cf16accc9775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 17:44:34 +0100
Subject: [PATCH 038/117] Removed unused code

---
 .../fr/xephi/authme/command/executable/LastLoginCommand.java  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/executable/LastLoginCommand.java b/src/main/java/fr/xephi/authme/command/executable/LastLoginCommand.java
index def95148..749ec34c 100644
--- a/src/main/java/fr/xephi/authme/command/executable/LastLoginCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/LastLoginCommand.java
@@ -5,7 +5,6 @@ import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
-import fr.xephi.authme.util.Profiler;
 import org.bukkit.command.CommandSender;
 
 import java.util.Date;
@@ -23,9 +22,6 @@ public class LastLoginCommand extends ExecutableCommand {
      */
     @Override
     public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
-        // Profile the reload process
-        Profiler p = new Profiler(true);
-
         // AuthMe plugin instance
         AuthMe plugin = AuthMe.getInstance();
         // Messages instance

From 9e65eaa0485c5c09418fcf60310844f56e4c077a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 17:50:06 +0100
Subject: [PATCH 039/117] Implemented accounts command

---
 .../xephi/authme/command/CommandManager.java  |  13 +++
 .../command/executable/AccountsCommand.java   | 110 ++++++++++++++++++
 2 files changed, 123 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/AccountsCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 1a62a036..2b6740a5 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -136,6 +136,19 @@ public class CommandManager {
         lastLoginCommand.setCommandPermissions("authme.admin.lastlogin", CommandPermissions.DefaultPermission.OP_ONLY);
         lastLoginCommand.addArgument(new CommandArgumentDescription("player", "Player name", true));
 
+        // Register the accounts command
+        CommandDescription accountsCommand = new CommandDescription(
+                new AccountsCommand(),
+                new ArrayList<String>() {{
+                    add("accounts");
+                    add("account");
+                }},
+                "Display player accounts",
+                "Display all accounts of a player by it's player name or IP.",
+                authMeCommand);
+        accountsCommand.setCommandPermissions("authme.admin.accounts", CommandPermissions.DefaultPermission.OP_ONLY);
+        accountsCommand.addArgument(new CommandArgumentDescription("player", "Player name or IP", true));
+
         // Register the purge command
         CommandDescription purgeCommand = new CommandDescription(
                 new PurgeCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/AccountsCommand.java b/src/main/java/fr/xephi/authme/command/executable/AccountsCommand.java
new file mode 100644
index 00000000..9bace568
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/AccountsCommand.java
@@ -0,0 +1,110 @@
+package fr.xephi.authme.command.executable;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.Messages;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
+import java.util.List;
+
+public class AccountsCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(final CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+        // Messages instance
+        final Messages m = Messages.getInstance();
+
+        // Get the player query
+        String playerQuery = sender.getName();
+        if(commandArguments.getCount() >= 1)
+            playerQuery = commandArguments.get(0);
+        final String playerQueryFinal = playerQuery;
+
+        // Command logic
+        if (!playerQuery.contains(".")) {
+            Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
+
+                @Override
+                public void run() {
+                    PlayerAuth auth;
+                    StringBuilder message = new StringBuilder("[AuthMe] ");
+                    try {
+                        auth = plugin.database.getAuth(playerQueryFinal.toLowerCase());
+                    } catch (NullPointerException npe) {
+                        m.send(sender, "unknown_user");
+                        return;
+                    }
+                    if (auth == null) {
+                        m.send(sender, "unknown_user");
+                        return;
+                    }
+                    List<String> accountList = plugin.database.getAllAuthsByName(auth);
+                    if (accountList == null || accountList.isEmpty()) {
+                        m.send(sender, "user_unknown");
+                        return;
+                    }
+                    if (accountList.size() == 1) {
+                        sender.sendMessage("[AuthMe] " + playerQueryFinal + " is a single account player");
+                        return;
+                    }
+                    int i = 0;
+                    for (String account : accountList) {
+                        i++;
+                        message.append(account);
+                        if (i != accountList.size()) {
+                            message.append(", ");
+                        } else {
+                            message.append(".");
+                        }
+                    }
+                    sender.sendMessage("[AuthMe] " + playerQueryFinal + " has " + String.valueOf(accountList.size()) + " accounts");
+                    sender.sendMessage(message.toString());
+                }
+            });
+            return true;
+        } else {
+            Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
+                @Override
+                public void run() {
+                    StringBuilder message = new StringBuilder("[AuthMe] ");
+                    List<String> accountList = plugin.database.getAllAuthsByIp(playerQueryFinal);
+                    if (accountList == null || accountList.isEmpty()) {
+                        sender.sendMessage("[AuthMe] This IP does not exist in the database");
+                        return;
+                    }
+                    if (accountList.size() == 1) {
+                        sender.sendMessage("[AuthMe] " + playerQueryFinal + " is a single account player");
+                        return;
+                    }
+                    int i = 0;
+                    for (String account : accountList) {
+                        i++;
+                        message.append(account);
+                        if (i != accountList.size()) {
+                            message.append(", ");
+                        } else {
+                            message.append(".");
+                        }
+                    }
+                    sender.sendMessage("[AuthMe] " + playerQueryFinal + " has " + String.valueOf(accountList.size()) + " accounts");
+                    sender.sendMessage(message.toString());
+                }
+            });
+            return true;
+        }
+    }
+}

From 93e9ef18d260eb5175aacbf51d37c0ad8e592af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 17:51:29 +0100
Subject: [PATCH 040/117] Organized executable commands package

---
 src/main/java/fr/xephi/authme/command/CommandManager.java       | 1 +
 .../authme/command/executable/{ => authme}/AccountsCommand.java | 2 +-
 .../authme/command/executable/{ => authme}/HelpCommand.java     | 2 +-
 .../command/executable/{ => authme}/LastLoginCommand.java       | 2 +-
 .../authme/command/executable/{ => authme}/PurgeCommand.java    | 2 +-
 .../authme/command/executable/{ => authme}/ReloadCommand.java   | 2 +-
 .../authme/command/executable/{ => authme}/VersionCommand.java  | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)
 rename src/main/java/fr/xephi/authme/command/executable/{ => authme}/AccountsCommand.java (98%)
 rename src/main/java/fr/xephi/authme/command/executable/{ => authme}/HelpCommand.java (96%)
 rename src/main/java/fr/xephi/authme/command/executable/{ => authme}/LastLoginCommand.java (97%)
 rename src/main/java/fr/xephi/authme/command/executable/{ => authme}/PurgeCommand.java (97%)
 rename src/main/java/fr/xephi/authme/command/executable/{ => authme}/ReloadCommand.java (97%)
 rename src/main/java/fr/xephi/authme/command/executable/{ => authme}/VersionCommand.java (98%)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 2b6740a5..20086600 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -1,6 +1,7 @@
 package fr.xephi.authme.command;
 
 import fr.xephi.authme.command.executable.*;
+import fr.xephi.authme.command.executable.authme.*;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/fr/xephi/authme/command/executable/AccountsCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
similarity index 98%
rename from src/main/java/fr/xephi/authme/command/executable/AccountsCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
index 9bace568..3634d3f7 100644
--- a/src/main/java/fr/xephi/authme/command/executable/AccountsCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.command.executable;
+package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
diff --git a/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/HelpCommand.java
similarity index 96%
rename from src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/authme/HelpCommand.java
index 3ddcb5a5..b892b7fe 100644
--- a/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/HelpCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.command.executable;
+package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
diff --git a/src/main/java/fr/xephi/authme/command/executable/LastLoginCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java
similarity index 97%
rename from src/main/java/fr/xephi/authme/command/executable/LastLoginCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java
index 749ec34c..6218ad0d 100644
--- a/src/main/java/fr/xephi/authme/command/executable/LastLoginCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.command.executable;
+package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
diff --git a/src/main/java/fr/xephi/authme/command/executable/PurgeCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java
similarity index 97%
rename from src/main/java/fr/xephi/authme/command/executable/PurgeCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java
index 3dbca4eb..d207d34e 100644
--- a/src/main/java/fr/xephi/authme/command/executable/PurgeCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.command.executable;
+package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
diff --git a/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java
similarity index 97%
rename from src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java
index e646ccf7..4364e928 100644
--- a/src/main/java/fr/xephi/authme/command/executable/ReloadCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.command.executable;
+package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
diff --git a/src/main/java/fr/xephi/authme/command/executable/VersionCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java
similarity index 98%
rename from src/main/java/fr/xephi/authme/command/executable/VersionCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java
index fc243c7d..aaa823f4 100644
--- a/src/main/java/fr/xephi/authme/command/executable/VersionCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.command.executable;
+package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;

From 89c3c6ed5bd9d1ba326e717b6140c07b984b3178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 17:56:10 +0100
Subject: [PATCH 041/117] Implemented register command

---
 .../xephi/authme/command/CommandManager.java  | 14 +++
 .../executable/authme/RegisterCommand.java    | 91 +++++++++++++++++++
 2 files changed, 105 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 20086600..878ed7e0 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -124,6 +124,20 @@ public class CommandManager {
                 dungeonMazeCommand);
         listWorldCommand.setCommandPermissions("dungeonmaze.command.listworlds", CommandPermissions.DefaultPermission.OP_ONLY);*/
 
+        // Register the register command
+        CommandDescription registerCommand = new CommandDescription(
+                new RegisterCommand(),
+                new ArrayList<String>() {{
+                    add("register");
+                    add("reg");
+                }},
+                "Register a player",
+                "Register the specified player with the specified password.",
+                authMeCommand);
+        registerCommand.setCommandPermissions("authme.admin.register", CommandPermissions.DefaultPermission.OP_ONLY);
+        registerCommand.addArgument(new CommandArgumentDescription("player", "Player name", false));
+        registerCommand.addArgument(new CommandArgumentDescription("password", "Password", false));
+
         // Register the purge command
         CommandDescription lastLoginCommand = new CommandDescription(
                 new LastLoginCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java
new file mode 100644
index 00000000..ee4d8494
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java
@@ -0,0 +1,91 @@
+package fr.xephi.authme.command.executable.authme;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.security.PasswordSecurity;
+import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.settings.Settings;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
+import java.security.NoSuchAlgorithmException;
+
+public class RegisterCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(final CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+        // Messages instance
+        final Messages m = Messages.getInstance();
+
+        // Get the player name and password
+        final String playerName = commandArguments.get(0);
+        final String playerPass = commandArguments.get(1);
+        final String playerNameLowerCase = playerName.toLowerCase();
+        final String playerPassLowerCase = playerPass.toLowerCase();
+
+        // Command logic
+        if (playerPassLowerCase.contains("delete") || playerPassLowerCase.contains("where") || playerPassLowerCase.contains("insert") || playerPassLowerCase.contains("modify") || playerPassLowerCase.contains("from") || playerPassLowerCase.contains("select") || playerPassLowerCase.contains(";") || playerPassLowerCase.contains("null") || !playerPassLowerCase.matches(Settings.getPassRegex)) {
+            m.send(sender, "password_error");
+            return true;
+        }
+        if (playerPassLowerCase.equalsIgnoreCase(playerName)) {
+            m.send(sender, "password_error_nick");
+            return true;
+        }
+        if (playerPassLowerCase.length() < Settings.getPasswordMinLen || playerPassLowerCase.length() > Settings.passwordMaxLength) {
+            m.send(sender, "pass_len");
+            return true;
+        }
+        if (!Settings.unsafePasswords.isEmpty()) {
+            if (Settings.unsafePasswords.contains(playerPassLowerCase)) {
+                m.send(sender, "password_error_unsafe");
+                return true;
+            }
+        }
+        plugin.getServer().getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+            @SuppressWarnings("deprecation")
+            @Override
+            public void run() {
+                try {
+                    if (plugin.database.isAuthAvailable(playerNameLowerCase)) {
+                        m.send(sender, "user_regged");
+                        return;
+                    }
+                    String hash = PasswordSecurity.getHash(Settings.getPasswordHash, playerPassLowerCase, playerNameLowerCase);
+                    PlayerAuth auth = new PlayerAuth(playerNameLowerCase, hash, "192.168.0.1", 0L, "your@email.com", playerName);
+                    if (PasswordSecurity.userSalt.containsKey(playerNameLowerCase) && PasswordSecurity.userSalt.get(playerNameLowerCase) != null)
+                        auth.setSalt(PasswordSecurity.userSalt.get(playerNameLowerCase));
+                    else auth.setSalt("");
+                    if (!plugin.database.saveAuth(auth)) {
+                        m.send(sender, "error");
+                        return;
+                    }
+                    plugin.database.setUnlogged(playerNameLowerCase);
+                    if (Bukkit.getPlayerExact(playerName) != null)
+                        Bukkit.getPlayerExact(playerName).kickPlayer("An admin just registered you, please log again");
+                    m.send(sender, "registered");
+                    ConsoleLogger.info(playerNameLowerCase + " registered");
+                } catch (NoSuchAlgorithmException ex) {
+                    ConsoleLogger.showError(ex.getMessage());
+                    m.send(sender, "error");
+                }
+
+            }
+        });
+        return true;
+    }
+}

From 19f4af3e8554f975392e7e78d1d3a62da5b3cce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:02:26 +0100
Subject: [PATCH 042/117] Implemented getemail command Various other
 improvements.

---
 .../xephi/authme/command/CommandManager.java  | 15 +++++++
 .../executable/authme/AccountsCommand.java    |  1 +
 .../executable/authme/GetEmailCommand.java    | 45 +++++++++++++++++++
 .../executable/authme/LastLoginCommand.java   |  1 +
 .../executable/authme/RegisterCommand.java    |  1 +
 .../executable/authme/ReloadCommand.java      |  1 +
 6 files changed, 64 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 878ed7e0..bba25bcd 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -164,6 +164,21 @@ public class CommandManager {
         accountsCommand.setCommandPermissions("authme.admin.accounts", CommandPermissions.DefaultPermission.OP_ONLY);
         accountsCommand.addArgument(new CommandArgumentDescription("player", "Player name or IP", true));
 
+        // Register the getemail command
+        CommandDescription getEmailCommand = new CommandDescription(
+                new RegisterCommand(),
+                new ArrayList<String>() {{
+                    add("getemail");
+                    add("getmail");
+                    add("email");
+                    add("mail");
+                }},
+                "Display player's email",
+                "Display the email address of the specified player if set.",
+                authMeCommand);
+        getEmailCommand.setCommandPermissions("authme.admin.getemail", CommandPermissions.DefaultPermission.OP_ONLY);
+        getEmailCommand.addArgument(new CommandArgumentDescription("player", "Player name", true));
+
         // Register the purge command
         CommandDescription purgeCommand = new CommandDescription(
                 new PurgeCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
index 3634d3f7..fddf078a 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
@@ -25,6 +25,7 @@ public class AccountsCommand extends ExecutableCommand {
     public boolean executeCommand(final CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // AuthMe plugin instance
         final AuthMe plugin = AuthMe.getInstance();
+
         // Messages instance
         final Messages m = Messages.getInstance();
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java
new file mode 100644
index 00000000..76d5423c
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java
@@ -0,0 +1,45 @@
+package fr.xephi.authme.command.executable.authme;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.Messages;
+import org.bukkit.command.CommandSender;
+
+public class GetEmailCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        AuthMe plugin = AuthMe.getInstance();
+
+        // Messages instance
+        Messages m = Messages.getInstance();
+
+        // Get the player name
+        String playerName = sender.getName();
+        if(commandArguments.getCount() >= 1)
+            playerName = commandArguments.get(0);
+
+        // Get the authenticated user
+        PlayerAuth auth = plugin.database.getAuth(playerName.toLowerCase());
+        if (auth == null) {
+            m.send(sender, "unknown_user");
+            return true;
+        }
+
+        // Show the email address
+        sender.sendMessage("[AuthMe] " + playerName + "'s email: " + auth.getEmail());
+        return true;
+    }
+}
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java
index 6218ad0d..121a4c15 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java
@@ -24,6 +24,7 @@ public class LastLoginCommand extends ExecutableCommand {
     public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // AuthMe plugin instance
         AuthMe plugin = AuthMe.getInstance();
+
         // Messages instance
         Messages m = Messages.getInstance();
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java
index ee4d8494..782cc787 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java
@@ -28,6 +28,7 @@ public class RegisterCommand extends ExecutableCommand {
     public boolean executeCommand(final CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // AuthMe plugin instance
         final AuthMe plugin = AuthMe.getInstance();
+
         // Messages instance
         final Messages m = Messages.getInstance();
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java
index 4364e928..1d1dea02 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java
@@ -29,6 +29,7 @@ public class ReloadCommand extends ExecutableCommand {
 
         // AuthMe plugin instance
         AuthMe plugin = AuthMe.getInstance();
+
         // Messages instance
         Messages m = Messages.getInstance();
 

From bc0f1b4bb980140205fa77020775df1980c35a13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:06:09 +0100
Subject: [PATCH 043/117] Implemented the setmail command

---
 .../xephi/authme/command/CommandManager.java  | 18 +++++-
 .../executable/authme/SetEmailCommand.java    | 63 +++++++++++++++++++
 2 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index bba25bcd..404810c8 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -166,7 +166,7 @@ public class CommandManager {
 
         // Register the getemail command
         CommandDescription getEmailCommand = new CommandDescription(
-                new RegisterCommand(),
+                new GetEmailCommand(),
                 new ArrayList<String>() {{
                     add("getemail");
                     add("getmail");
@@ -179,6 +179,22 @@ public class CommandManager {
         getEmailCommand.setCommandPermissions("authme.admin.getemail", CommandPermissions.DefaultPermission.OP_ONLY);
         getEmailCommand.addArgument(new CommandArgumentDescription("player", "Player name", true));
 
+        // Register the setemail command
+        CommandDescription setEmailCommand = new CommandDescription(
+                new SetEmailCommand(),
+                new ArrayList<String>() {{
+                    add("chgemail");
+                    add("chgmail");
+                    add("setemail");
+                    add("setmail");
+                }},
+                "Change player's email",
+                "Change the email address of the specified player.",
+                authMeCommand);
+        setEmailCommand.setCommandPermissions("authme.admin.chgemail", CommandPermissions.DefaultPermission.OP_ONLY);
+        setEmailCommand.addArgument(new CommandArgumentDescription("player", "Player name", false));
+        setEmailCommand.addArgument(new CommandArgumentDescription("email", "Player email", false));
+
         // Register the purge command
         CommandDescription purgeCommand = new CommandDescription(
                 new PurgeCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java
new file mode 100644
index 00000000..ffe8d950
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java
@@ -0,0 +1,63 @@
+package fr.xephi.authme.command.executable.authme;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.settings.Settings;
+import org.bukkit.command.CommandSender;
+
+public class SetEmailCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        AuthMe plugin = AuthMe.getInstance();
+
+        // Messages instance
+        Messages m = Messages.getInstance();
+
+        // Get the player name and email address
+        String playerName = commandArguments.get(0);
+        String playerEmail = commandArguments.get(1);
+
+        // Validate the email address
+        if (!Settings.isEmailCorrect(playerEmail)) {
+            m.send(sender, "email_invalid");
+            return true;
+        }
+
+        // Validate the user
+        PlayerAuth auth = plugin.database.getAuth(playerName.toLowerCase());
+        if (auth == null) {
+            m.send(sender, "unknown_user");
+            return true;
+        }
+
+        // Set the email address
+        auth.setEmail(playerEmail);
+        if (!plugin.database.updateEmail(auth)) {
+            m.send(sender, "error");
+            return true;
+        }
+
+        // Update the player cache
+        if (PlayerCache.getInstance().getAuth(playerName.toLowerCase()) != null)
+            PlayerCache.getInstance().updatePlayer(auth);
+
+        // Show a status message
+        m.send(sender, "email_changed");
+        return true;
+    }
+}

From 79dd26da0f55d9af05c0d9f021d48e09944e199a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:10:24 +0100
Subject: [PATCH 044/117] Implemented the setspawn command

---
 .../xephi/authme/command/CommandManager.java  | 12 ++++++
 .../executable/authme/SetSpawnCommand.java    | 39 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/authme/SetSpawnCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 404810c8..39776fe8 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -195,6 +195,18 @@ public class CommandManager {
         setEmailCommand.addArgument(new CommandArgumentDescription("player", "Player name", false));
         setEmailCommand.addArgument(new CommandArgumentDescription("email", "Player email", false));
 
+        // Register the setspawn command
+        CommandDescription setSpawnCommand = new CommandDescription(
+                new SetSpawnCommand(),
+                new ArrayList<String>() {{
+                    add("setspawn");
+                    add("chgspawn");
+                }},
+                "Change the spawn",
+                "Change the player's spawn to your current position.",
+                authMeCommand);
+        setSpawnCommand.setCommandPermissions("authme.admin.setspawn", CommandPermissions.DefaultPermission.OP_ONLY);
+
         // Register the purge command
         CommandDescription purgeCommand = new CommandDescription(
                 new PurgeCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/SetSpawnCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/SetSpawnCommand.java
new file mode 100644
index 00000000..ada37f41
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/SetSpawnCommand.java
@@ -0,0 +1,39 @@
+package fr.xephi.authme.command.executable.authme;
+
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.Spawn;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class SetSpawnCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Make sure the command executor is a player
+        try {
+            if (sender instanceof Player) {
+                if (Spawn.getInstance().setSpawn(((Player) sender).getLocation())) {
+                    sender.sendMessage("[AuthMe] Correctly defined new spawn point");
+                } else {
+                    sender.sendMessage("[AuthMe] SetSpawn has failed, please retry");
+                }
+            } else {
+                sender.sendMessage("[AuthMe] Please use that command in game");
+            }
+        } catch (NullPointerException ex) {
+            ConsoleLogger.showError(ex.getMessage());
+        }
+        return true;
+    }
+}

From ff909d0c3117369e86b9c7c5c493d0daff1125c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:12:15 +0100
Subject: [PATCH 045/117] Implemented the setfirstspawn command

---
 .../xephi/authme/command/CommandManager.java  | 12 +++++++
 .../authme/SetFirstSpawnCommand.java          | 36 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/authme/SetFirstSpawnCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 39776fe8..19545c34 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -207,6 +207,18 @@ public class CommandManager {
                 authMeCommand);
         setSpawnCommand.setCommandPermissions("authme.admin.setspawn", CommandPermissions.DefaultPermission.OP_ONLY);
 
+        // Register the setfirstspawn command
+        CommandDescription setFirstSpawnCommand = new CommandDescription(
+                new SetFirstSpawnCommand(),
+                new ArrayList<String>() {{
+                    add("setfirstspawn");
+                    add("chgfirstspawn");
+                }},
+                "Change the first spawn",
+                "Change the first player's spawn to your current position.",
+                authMeCommand);
+        setFirstSpawnCommand.setCommandPermissions("authme.admin.setfirstspawn", CommandPermissions.DefaultPermission.OP_ONLY);
+
         // Register the purge command
         CommandDescription purgeCommand = new CommandDescription(
                 new PurgeCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/SetFirstSpawnCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/SetFirstSpawnCommand.java
new file mode 100644
index 00000000..c51aa6f7
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/SetFirstSpawnCommand.java
@@ -0,0 +1,36 @@
+package fr.xephi.authme.command.executable.authme;
+
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.Spawn;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class SetFirstSpawnCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        try {
+            if (sender instanceof Player) {
+                if (Spawn.getInstance().setFirstSpawn(((Player) sender).getLocation()))
+                    sender.sendMessage("[AuthMe] Correctly defined new first spawn point");
+                else sender.sendMessage("[AuthMe] SetFirstSpawn has failed, please retry");
+            } else {
+                sender.sendMessage("[AuthMe] Please use that command in game");
+            }
+        } catch (NullPointerException ex) {
+            ConsoleLogger.showError(ex.getMessage());
+        }
+        return true;
+    }
+}

From 17c103a7b2054b1d4ea8160084423f5d493517c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:13:36 +0100
Subject: [PATCH 046/117] Changed some command descriptions

---
 src/main/java/fr/xephi/authme/command/CommandManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 19545c34..d08fe26b 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -226,7 +226,7 @@ public class CommandManager {
                     add("purge");
                     add("delete");
                 }},
-                "Purge AuthMeReloaded data",
+                "Purge old data",
                 "Purge old AuthMeReloaded data longer than the specified amount of days ago.",
                 authMeCommand);
         purgeCommand.setCommandPermissions("authme.admin.purge", CommandPermissions.DefaultPermission.OP_ONLY);
@@ -240,7 +240,7 @@ public class CommandManager {
                     add("rld");
                     add("r");
                 }},
-                "Reload AuthMeReloaded",
+                "Reload plugin",
                 "Reload the AuthMeReloaded plugin.",
                 authMeCommand);
         reloadCommand.setCommandPermissions("authme.admin.reload", CommandPermissions.DefaultPermission.OP_ONLY);

From 4ff8cb8c5999de179a24c785887c6ff25df13803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:17:13 +0100
Subject: [PATCH 047/117] Implemented the purgebannedplayers command

---
 .../xephi/authme/command/CommandManager.java  | 14 ++++++
 .../authme/PurgeBannedPlayersCommand.java     | 50 +++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index d08fe26b..bf1d10b6 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -232,6 +232,20 @@ public class CommandManager {
         purgeCommand.setCommandPermissions("authme.admin.purge", CommandPermissions.DefaultPermission.OP_ONLY);
         purgeCommand.addArgument(new CommandArgumentDescription("days", "Number of days", false));
 
+        // Register the purgebannedplayers command
+        CommandDescription purgeBannedPlayersCommand = new CommandDescription(
+                new PurgeBannedPlayersCommand(),
+                new ArrayList<String>() {{
+                    add("purgebannedplayers");
+                    add("purgebannedplayer");
+                    add("deletebannedplayers");
+                    add("deletebannedplayer");
+                }},
+                "Purge banned palyers data",
+                "Purge all AuthMeReloaded data for banned players.",
+                authMeCommand);
+        purgeBannedPlayersCommand.setCommandPermissions("authme.admin.purgebannedplayers", CommandPermissions.DefaultPermission.OP_ONLY);
+
         // Register the reload command
         CommandDescription reloadCommand = new CommandDescription(
                 new ReloadCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java
new file mode 100644
index 00000000..32c2937c
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java
@@ -0,0 +1,50 @@
+package fr.xephi.authme.command.executable.authme;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.Settings;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PurgeBannedPlayersCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Get the list of banned players
+        List<String> bannedPlayers = new ArrayList<>();
+        for (OfflinePlayer offlinePlayer : plugin.getServer().getBannedPlayers()) {
+            bannedPlayers.add(offlinePlayer.getName().toLowerCase());
+        }
+
+        // Purge the banned players
+        plugin.database.purgeBanned(bannedPlayers);
+        if (Settings.purgeEssentialsFile && plugin.ess != null)
+            plugin.dataManager.purgeEssentials(bannedPlayers);
+        if (Settings.purgePlayerDat)
+            plugin.dataManager.purgeDat(bannedPlayers);
+        if (Settings.purgeLimitedCreative)
+            plugin.dataManager.purgeLimitedCreative(bannedPlayers);
+        if (Settings.purgeAntiXray)
+            plugin.dataManager.purgeAntiXray(bannedPlayers);
+
+        // Show a status message
+        sender.sendMessage("[AuthMe] Database has been purged correctly");
+        return true;
+    }
+}

From c9eef4f1745f6f4e4570491b59e3f16910617336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:19:36 +0100
Subject: [PATCH 048/117] Implemented the spawn command

---
 .../xephi/authme/command/CommandManager.java  | 12 ++++++
 .../executable/authme/SpawnCommand.java       | 37 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/authme/SpawnCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index bf1d10b6..5d48133d 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -195,6 +195,18 @@ public class CommandManager {
         setEmailCommand.addArgument(new CommandArgumentDescription("player", "Player name", false));
         setEmailCommand.addArgument(new CommandArgumentDescription("email", "Player email", false));
 
+        // Register the spawn command
+        CommandDescription spawnCommand = new CommandDescription(
+                new SpawnCommand(),
+                new ArrayList<String>() {{
+                    add("spawn");
+                    add("home");
+                }},
+                "Teleport to spawn",
+                "Teleport to the spawn.",
+                authMeCommand);
+        spawnCommand.setCommandPermissions("authme.admin.spawn", CommandPermissions.DefaultPermission.OP_ONLY);
+
         // Register the setspawn command
         CommandDescription setSpawnCommand = new CommandDescription(
                 new SetSpawnCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/SpawnCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/SpawnCommand.java
new file mode 100644
index 00000000..4e68fb9f
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/SpawnCommand.java
@@ -0,0 +1,37 @@
+package fr.xephi.authme.command.executable.authme;
+
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.Spawn;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class SpawnCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Make sure the command executor is a player
+        try {
+            if (sender instanceof Player) {
+                if (Spawn.getInstance().getSpawn() != null)
+                    ((Player) sender).teleport(Spawn.getInstance().getSpawn());
+                else sender.sendMessage("[AuthMe] Spawn has failed, please try to define the spawn");
+            } else {
+                sender.sendMessage("[AuthMe] Please use that command in game");
+            }
+        } catch (NullPointerException ex) {
+            ConsoleLogger.showError(ex.getMessage());
+        }
+        return true;
+    }
+}

From 8ead129423add129a39aac5fabc37aadb3655475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:23:03 +0100
Subject: [PATCH 049/117] Implemented the firstspawn command

---
 .../xephi/authme/command/CommandManager.java  | 12 ++++++
 .../executable/authme/FirstSpawnCommand.java  | 37 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 5d48133d..02e77267 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -219,6 +219,18 @@ public class CommandManager {
                 authMeCommand);
         setSpawnCommand.setCommandPermissions("authme.admin.setspawn", CommandPermissions.DefaultPermission.OP_ONLY);
 
+        // Register the firstspawn command
+        CommandDescription firstSpawnCommand = new CommandDescription(
+                new FirstSpawnCommand(),
+                new ArrayList<String>() {{
+                    add("firstspawn");
+                    add("firsthome");
+                }},
+                "Teleport to first spawn",
+                "Teleport to the first spawn.",
+                authMeCommand);
+        firstSpawnCommand.setCommandPermissions("authme.admin.firstspawn", CommandPermissions.DefaultPermission.OP_ONLY);
+
         // Register the setfirstspawn command
         CommandDescription setFirstSpawnCommand = new CommandDescription(
                 new SetFirstSpawnCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java
new file mode 100644
index 00000000..4cf5789d
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java
@@ -0,0 +1,37 @@
+package fr.xephi.authme.command.executable.authme;
+
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.Spawn;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class FirstSpawnCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // Make sure the command executor is a player
+        try {
+            if (sender instanceof Player) {
+                if (Spawn.getInstance().getFirstSpawn() != null)
+                    ((Player) sender).teleport(Spawn.getInstance().getFirstSpawn());
+                else sender.sendMessage("[AuthMe] First spawn has failed, please try to define the first spawn");
+            } else {
+                sender.sendMessage("[AuthMe] Please use that command in game");
+            }
+        } catch (NullPointerException ex) {
+            ConsoleLogger.showError(ex.getMessage());
+        }
+        return true;
+    }
+}

From 2d935d5fefed342ff586b241a9c677b7b8616848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:27:25 +0100
Subject: [PATCH 050/117] Implemented the changepassword command

---
 .../xephi/authme/command/CommandManager.java  |  15 +++
 .../authme/ChangePasswordCommand.java         | 100 ++++++++++++++++++
 2 files changed, 115 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 02e77267..aaae7e6a 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -138,6 +138,21 @@ public class CommandManager {
         registerCommand.addArgument(new CommandArgumentDescription("player", "Player name", false));
         registerCommand.addArgument(new CommandArgumentDescription("password", "Password", false));
 
+        // Register the changepassword command
+        CommandDescription changePasswordCommand = new CommandDescription(
+                new RegisterCommand(),
+                new ArrayList<String>() {{
+                    add("changepassword");
+                    add("changepass");
+                    add("cp");
+                }},
+                "Change player's password",
+                "Change the password of a player.",
+                authMeCommand);
+        changePasswordCommand.setCommandPermissions("authme.admin.changepassword", CommandPermissions.DefaultPermission.OP_ONLY);
+        changePasswordCommand.addArgument(new CommandArgumentDescription("player", "Player name", false));
+        changePasswordCommand.addArgument(new CommandArgumentDescription("password", "New password", false));
+
         // Register the purge command
         CommandDescription lastLoginCommand = new CommandDescription(
                 new LastLoginCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordCommand.java
new file mode 100644
index 00000000..4e2a0c2a
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordCommand.java
@@ -0,0 +1,100 @@
+package fr.xephi.authme.command.executable.authme;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.security.PasswordSecurity;
+import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.settings.Settings;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
+import java.security.NoSuchAlgorithmException;
+
+public class ChangePasswordCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(final CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Messages instance
+        final Messages m = Messages.getInstance();
+
+        // Get the player and password
+        String playerName = commandArguments.get(0);
+        final String playerPass = commandArguments.get(1);
+
+        // Validate the password
+        String playerPassLowerCase = playerPass.toLowerCase();
+        if (playerPassLowerCase.contains("delete") || playerPassLowerCase.contains("where") || playerPassLowerCase.contains("insert") || playerPassLowerCase.contains("modify") || playerPassLowerCase.contains("from") || playerPassLowerCase.contains("select") || playerPassLowerCase.contains(";") || playerPassLowerCase.contains("null") || !playerPassLowerCase.matches(Settings.getPassRegex)) {
+            m.send(sender, "password_error");
+            return true;
+        }
+        if (playerPassLowerCase.equalsIgnoreCase(playerName)) {
+            m.send(sender, "password_error_nick");
+            return true;
+        }
+        if (playerPassLowerCase.length() < Settings.getPasswordMinLen || playerPassLowerCase.length() > Settings.passwordMaxLength) {
+            m.send(sender, "pass_len");
+            return true;
+        }
+        if (!Settings.unsafePasswords.isEmpty()) {
+            if (Settings.unsafePasswords.contains(playerPassLowerCase)) {
+                m.send(sender, "password_error_unsafe");
+                return true;
+            }
+        }
+
+        // Set the password
+        final String playerNameLowerCase = playerName.toLowerCase();
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+            @Override
+            public void run() {
+                String hash;
+                try {
+                    hash = PasswordSecurity.getHash(Settings.getPasswordHash, playerPass, playerNameLowerCase);
+                } catch (NoSuchAlgorithmException e) {
+                    m.send(sender, "error");
+                    return;
+                }
+                PlayerAuth auth = null;
+                if (PlayerCache.getInstance().isAuthenticated(playerNameLowerCase)) {
+                    auth = PlayerCache.getInstance().getAuth(playerNameLowerCase);
+                } else if (plugin.database.isAuthAvailable(playerNameLowerCase)) {
+                    auth = plugin.database.getAuth(playerNameLowerCase);
+                }
+                if (auth == null) {
+                    m.send(sender, "unknown_user");
+                    return;
+                }
+                auth.setHash(hash);
+                if (PasswordSecurity.userSalt.containsKey(playerNameLowerCase)) {
+                    auth.setSalt(PasswordSecurity.userSalt.get(playerNameLowerCase));
+                    plugin.database.updateSalt(auth);
+                }
+                if (!plugin.database.updatePassword(auth)) {
+                    m.send(sender, "error");
+                    return;
+                }
+                sender.sendMessage("pwd_changed");
+                ConsoleLogger.info(playerNameLowerCase + "'s password changed");
+            }
+
+        });
+        return true;
+    }
+}

From e4d46ae9b9a5359e1c53ead08d05c331308b9b61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:30:29 +0100
Subject: [PATCH 051/117] Implemented the unregister command

---
 .../xephi/authme/command/CommandManager.java  | 15 +++
 .../executable/authme/UnregisterCommand.java  | 98 +++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index aaae7e6a..b03e9e5f 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -138,6 +138,21 @@ public class CommandManager {
         registerCommand.addArgument(new CommandArgumentDescription("player", "Player name", false));
         registerCommand.addArgument(new CommandArgumentDescription("password", "Password", false));
 
+        // Register the unregister command
+        CommandDescription unregisterCommand = new CommandDescription(
+                new UnregisterCommand(),
+                new ArrayList<String>() {{
+                    add("unregister");
+                    add("unreg");
+                    add("delete");
+                    add("del");
+                }},
+                "Unregister a player",
+                "Unregister the specified player.",
+                authMeCommand);
+        unregisterCommand.setCommandPermissions("authme.admin.unregister", CommandPermissions.DefaultPermission.OP_ONLY);
+        unregisterCommand.addArgument(new CommandArgumentDescription("player", "Player name", false));
+
         // Register the changepassword command
         CommandDescription changePasswordCommand = new CommandDescription(
                 new RegisterCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
new file mode 100644
index 00000000..e04b8889
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
@@ -0,0 +1,98 @@
+package fr.xephi.authme.command.executable.authme;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.Utils;
+import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.cache.limbo.LimboCache;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.events.SpawnTeleportEvent;
+import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.task.MessageTask;
+import fr.xephi.authme.task.TimeoutTask;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.scheduler.BukkitTask;
+
+public class UnregisterCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(final CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Messages instance
+        final Messages m = Messages.getInstance();
+
+        // Get the player name
+        String playerName = commandArguments.get(0);
+        String playerNameLowerCase = playerName.toLowerCase();
+
+        // Make sure the user is valid
+        if (!plugin.database.isAuthAvailable(playerNameLowerCase)) {
+            m.send(sender, "user_unknown");
+            return true;
+        }
+
+        // Remove the player
+        if (!plugin.database.removeAuth(playerNameLowerCase)) {
+            m.send(sender, "error");
+            return true;
+        }
+
+        // Unregister the player
+        @SuppressWarnings("deprecation")
+        Player target = Bukkit.getPlayer(playerNameLowerCase);
+        PlayerCache.getInstance().removePlayer(playerNameLowerCase);
+        Utils.setGroup(target, Utils.GroupType.UNREGISTERED);
+        if (target != null) {
+            if (target.isOnline()) {
+                if (Settings.isTeleportToSpawnEnabled && !Settings.noTeleport) {
+                    Location spawn = plugin.getSpawnLocation(target);
+                    SpawnTeleportEvent tpEvent = new SpawnTeleportEvent(target, target.getLocation(), spawn, false);
+                    plugin.getServer().getPluginManager().callEvent(tpEvent);
+                    if (!tpEvent.isCancelled()) {
+                        target.teleport(tpEvent.getTo());
+                    }
+                }
+                LimboCache.getInstance().addLimboPlayer(target);
+                int delay = Settings.getRegistrationTimeout * 20;
+                int interval = Settings.getWarnMessageInterval;
+                BukkitScheduler scheduler = sender.getServer().getScheduler();
+                if (delay != 0) {
+                    BukkitTask id = scheduler.runTaskLaterAsynchronously(plugin, new TimeoutTask(plugin, playerNameLowerCase, target), delay);
+                    LimboCache.getInstance().getLimboPlayer(playerNameLowerCase).setTimeoutTaskId(id);
+                }
+                LimboCache.getInstance().getLimboPlayer(playerNameLowerCase).setMessageTaskId(scheduler.runTaskAsynchronously(plugin, new MessageTask(plugin, playerNameLowerCase, m.send("reg_msg"), interval)));
+                if (Settings.applyBlindEffect)
+                    target.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, Settings.getRegistrationTimeout * 20, 2));
+                if (!Settings.isMovementAllowed && Settings.isRemoveSpeedEnabled) {
+                    target.setWalkSpeed(0.0f);
+                    target.setFlySpeed(0.0f);
+                }
+                m.send(target, "unregistered");
+            }
+        }
+
+        // Show a status message
+        m.send(sender, "unregistered");
+        ConsoleLogger.info(playerName + " unregistered");
+        return true;
+    }
+}

From 559072b3c642f4b60c6ca48a87a948d9a2d0ce23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:35:40 +0100
Subject: [PATCH 052/117] Implemented the purgelastposition command

---
 .../xephi/authme/command/CommandManager.java  | 17 +++++
 .../authme/PurgeLastPositionCommand.java      | 64 +++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index b03e9e5f..0b600944 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -286,6 +286,23 @@ public class CommandManager {
         purgeCommand.setCommandPermissions("authme.admin.purge", CommandPermissions.DefaultPermission.OP_ONLY);
         purgeCommand.addArgument(new CommandArgumentDescription("days", "Number of days", false));
 
+        // Register the purgelastposition command
+        CommandDescription purgeLastPositionCommand = new CommandDescription(
+                new PurgeLastPositionCommand(),
+                new ArrayList<String>() {{
+                    add("purgelastposition");
+                    add("purgelastpos");
+                    add("resetposition");
+                    add("resetpos");
+                    add("resetlastposition");
+                    add("resetlastpos");
+                }},
+                "Purge player's last position",
+                "Purge the last know position of the specified player.",
+                authMeCommand);
+        purgeLastPositionCommand.setCommandPermissions("authme.admin.purgelastpos", CommandPermissions.DefaultPermission.OP_ONLY);
+        purgeLastPositionCommand.addArgument(new CommandArgumentDescription("player", "Player name", true));
+
         // Register the purgebannedplayers command
         CommandDescription purgeBannedPlayersCommand = new CommandDescription(
                 new PurgeBannedPlayersCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java
new file mode 100644
index 00000000..e74e6651
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java
@@ -0,0 +1,64 @@
+package fr.xephi.authme.command.executable.authme;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.Messages;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class PurgeLastPositionCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(final CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Messages instance
+        final Messages m = Messages.getInstance();
+
+        // Get the player
+        String playerName = sender.getName();
+        if(commandArguments.getCount() >= 1)
+            playerName = commandArguments.get(0);
+        String playerNameLowerCase = playerName.toLowerCase();
+
+        // Purge the last position of the player
+        try {
+            // Get the user auth and make sure the user exists
+            PlayerAuth auth = plugin.database.getAuth(playerNameLowerCase);
+            if (auth == null) {
+                m.send(sender, "unknown_user");
+                return true;
+            }
+
+            // Set the last position
+            auth.setQuitLocX(0D);
+            auth.setQuitLocY(0D);
+            auth.setQuitLocZ(0D);
+            auth.setWorld("world");
+            plugin.database.updateQuitLoc(auth);
+
+            // Show a status message
+            sender.sendMessage(playerNameLowerCase + "'s last position location is now reset");
+
+        } catch (Exception e) {
+            ConsoleLogger.showError("An error occurred while trying to reset location or player do not exist, please see below: ");
+            ConsoleLogger.showError(e.getMessage());
+            if (sender instanceof Player)
+                sender.sendMessage("An error occurred while trying to reset location or player do not exist, please see logs");
+        }
+        return true;
+    }
+}

From e3a6c73b587c5273cf48e1bc858acc50ab2a0143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:41:03 +0100
Subject: [PATCH 053/117] Implemented the switchantibot command

---
 src/main/java/fr/xephi/authme/AuthMe.java     |  4 ++
 .../xephi/authme/command/CommandManager.java  | 14 ++++++
 .../authme/SwitchAntiBotCommand.java          | 46 +++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/authme/SwitchAntiBotCommand.java

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index f3ff8778..ec141717 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -721,6 +721,10 @@ public class AuthMe extends JavaPlugin {
         Settings.switchAntiBotMod(mode);
     }
 
+    public boolean getAntiBotModMode() {
+        return this.antibotMod;
+    }
+
     private void recallEmail() {
         if (!Settings.recallEmail)
             return;
diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 0b600944..61cf6fec 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -317,6 +317,20 @@ public class CommandManager {
                 authMeCommand);
         purgeBannedPlayersCommand.setCommandPermissions("authme.admin.purgebannedplayers", CommandPermissions.DefaultPermission.OP_ONLY);
 
+        // Register the switchantibot command
+        CommandDescription switchAntiBotCommand = new CommandDescription(
+                new PurgeLastPositionCommand(),
+                new ArrayList<String>() {{
+                    add("switchantibot");
+                    add("toggleantibot");
+                    add("antibot");
+                }},
+                "Switch AntiBot mode",
+                "Switch or toggle the AntiBot mode to the specified state.",
+                authMeCommand);
+        switchAntiBotCommand.setCommandPermissions("authme.admin.switchantibot", CommandPermissions.DefaultPermission.OP_ONLY);
+        switchAntiBotCommand.addArgument(new CommandArgumentDescription("mode", "ON / OFF", true));
+
         // Register the reload command
         CommandDescription reloadCommand = new CommandDescription(
                 new ReloadCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/SwitchAntiBotCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/SwitchAntiBotCommand.java
new file mode 100644
index 00000000..2b888e7e
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/SwitchAntiBotCommand.java
@@ -0,0 +1,46 @@
+package fr.xephi.authme.command.executable.authme;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import org.bukkit.command.CommandSender;
+
+public class SwitchAntiBotCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(final CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Get the new state
+        String newState = plugin.getAntiBotModMode() ? "OFF" : "ON";
+        if(commandArguments.getCount() >= 1)
+            newState = commandArguments.get(0);
+
+        // Enable the mod
+        if(newState.equalsIgnoreCase("ON")) {
+            plugin.switchAntiBotMod(true);
+            sender.sendMessage("[AuthMe] AntiBotMod enabled");
+            return true;
+        }
+
+        // Disable the mod
+        if(newState.equalsIgnoreCase("OFF")) {
+            plugin.switchAntiBotMod(false);
+            sender.sendMessage("[AuthMe] AntiBotMod disabled");
+            return true;
+        }
+
+        // Invalid command arguments, return false
+        return false;
+    }
+}

From c4c54cd13403bede070b1c95515c36aa3886c26a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:43:09 +0100
Subject: [PATCH 054/117] Fixed invalid command reference

---
 src/main/java/fr/xephi/authme/command/CommandManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 61cf6fec..6a061b93 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -319,7 +319,7 @@ public class CommandManager {
 
         // Register the switchantibot command
         CommandDescription switchAntiBotCommand = new CommandDescription(
-                new PurgeLastPositionCommand(),
+                new SwitchAntiBotCommand(),
                 new ArrayList<String>() {{
                     add("switchantibot");
                     add("toggleantibot");

From c11ca35774c3130293eb89527f46131ee91674df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:46:57 +0100
Subject: [PATCH 055/117] Improved the switchantibot command

---
 .../executable/authme/SwitchAntiBotCommand.java    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/SwitchAntiBotCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/SwitchAntiBotCommand.java
index 2b888e7e..b3adf430 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/SwitchAntiBotCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/SwitchAntiBotCommand.java
@@ -3,6 +3,8 @@ package fr.xephi.authme.command.executable.authme;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.command.help.HelpProvider;
+import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
 public class SwitchAntiBotCommand extends ExecutableCommand {
@@ -40,7 +42,15 @@ public class SwitchAntiBotCommand extends ExecutableCommand {
             return true;
         }
 
-        // Invalid command arguments, return false
-        return false;
+        // Show the invalid arguments warning
+        sender.sendMessage(ChatColor.DARK_RED + "Invalid AntiBot mode!");
+
+        // Show the command argument help
+        HelpProvider.showHelp(sender, commandReference, commandReference, true, false, true, false, false, false);
+
+        // Show the command to use for detailed help
+        CommandParts helpCommandReference = new CommandParts(commandReference.getRange(1));
+        sender.sendMessage(ChatColor.GOLD + "Detailed help: " + ChatColor.WHITE + "/" + commandReference.get(0) + " help " + helpCommandReference);
+        return true;
     }
 }

From 14eb8e28cf928d18b85340f8be84f2c49ae874be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:54:03 +0100
Subject: [PATCH 056/117] Implemented getip command

---
 .../xephi/authme/command/CommandManager.java  | 13 ++++++
 .../executable/authme/GetIpCommand.java       | 41 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 6a061b93..0040b677 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -225,6 +225,19 @@ public class CommandManager {
         setEmailCommand.addArgument(new CommandArgumentDescription("player", "Player name", false));
         setEmailCommand.addArgument(new CommandArgumentDescription("email", "Player email", false));
 
+        // Register the getip command
+        CommandDescription getIpCommand = new CommandDescription(
+                new GetIpCommand(),
+                new ArrayList<String>() {{
+                    add("getip");
+                    add("ip");
+                }},
+                "Get player's IP",
+                "Get the IP address of the specified online player.",
+                authMeCommand);
+        getIpCommand.setCommandPermissions("authme.admin.getip", CommandPermissions.DefaultPermission.OP_ONLY);
+        getIpCommand.addArgument(new CommandArgumentDescription("player", "Online player name", false));
+
         // Register the spawn command
         CommandDescription spawnCommand = new CommandDescription(
                 new SpawnCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java
new file mode 100644
index 00000000..d67b7d63
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java
@@ -0,0 +1,41 @@
+package fr.xephi.authme.command.executable.authme;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class GetIpCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Get the player query
+        String playerName = sender.getName();
+        if(commandArguments.getCount() >= 1)
+            playerName = commandArguments.get(0);
+
+        @SuppressWarnings("deprecation")
+        Player player = Bukkit.getPlayer(playerName);
+        if (player == null) {
+            sender.sendMessage("This player is not actually online");
+            return true;
+        }
+        sender.sendMessage(player.getName() + "'s actual IP is : " + player.getAddress().getAddress().getHostAddress() + ":" + player.getAddress().getPort());
+        sender.sendMessage(player.getName() + "'s real IP is : " + plugin.getIP(player));
+        return true;
+    }
+}

From afd46edb393c6d98efc0b014ae423ffb00e64135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:57:28 +0100
Subject: [PATCH 057/117] Implemented the forcelogin command

---
 .../xephi/authme/command/CommandManager.java  | 15 +++++-
 .../executable/authme/ForceLoginCommand.java  | 51 +++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/authme/ForceLoginCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 0040b677..70b147d4 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -236,7 +236,20 @@ public class CommandManager {
                 "Get the IP address of the specified online player.",
                 authMeCommand);
         getIpCommand.setCommandPermissions("authme.admin.getip", CommandPermissions.DefaultPermission.OP_ONLY);
-        getIpCommand.addArgument(new CommandArgumentDescription("player", "Online player name", false));
+        getIpCommand.addArgument(new CommandArgumentDescription("player", "Online player name", true));
+
+        // Register the forcelogin command
+        CommandDescription forceLoginCommand = new CommandDescription(
+                new ForceLoginCommand(),
+                new ArrayList<String>() {{
+                    add("forcelogin");
+                    add("login");
+                }},
+                "Force login player",
+                "Force the specified player to login.",
+                authMeCommand);
+        forceLoginCommand.setCommandPermissions("authme.admin.forcelogin", CommandPermissions.DefaultPermission.OP_ONLY);
+        forceLoginCommand.addArgument(new CommandArgumentDescription("player", "Online player name", true));
 
         // Register the spawn command
         CommandDescription spawnCommand = new CommandDescription(
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ForceLoginCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ForceLoginCommand.java
new file mode 100644
index 00000000..e4f285be
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/ForceLoginCommand.java
@@ -0,0 +1,51 @@
+package fr.xephi.authme.command.executable.authme;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class ForceLoginCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Get the player query
+        String playerName = sender.getName();
+        if(commandArguments.getCount() >= 1)
+            playerName = commandArguments.get(0);
+
+        // Command logic
+        try {
+            @SuppressWarnings("deprecation")
+            Player player = Bukkit.getPlayer(playerName);
+            if (player == null || !player.isOnline()) {
+                sender.sendMessage("Player needs to be online!");
+                return true;
+            }
+            if (!plugin.authmePermissible(player, "authme.canbeforced")) {
+                sender.sendMessage("You cannot force login for the player " + playerName + "!");
+                return true;
+            }
+            plugin.management.performLogin(player, "dontneed", true);
+            sender.sendMessage("Force Login for " + playerName + " performed!");
+        } catch (Exception e) {
+            sender.sendMessage("An error occurred while trying to get that player!");
+        }
+
+        return true;
+    }
+}

From 443e9954af360fa7edc8449fea496a6ca47d19d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:58:22 +0100
Subject: [PATCH 058/117] Moved some code around

---
 .../xephi/authme/command/CommandManager.java  | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 70b147d4..8d952fd5 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -153,6 +153,19 @@ public class CommandManager {
         unregisterCommand.setCommandPermissions("authme.admin.unregister", CommandPermissions.DefaultPermission.OP_ONLY);
         unregisterCommand.addArgument(new CommandArgumentDescription("player", "Player name", false));
 
+        // Register the forcelogin command
+        CommandDescription forceLoginCommand = new CommandDescription(
+                new ForceLoginCommand(),
+                new ArrayList<String>() {{
+                    add("forcelogin");
+                    add("login");
+                }},
+                "Force login player",
+                "Force the specified player to login.",
+                authMeCommand);
+        forceLoginCommand.setCommandPermissions("authme.admin.forcelogin", CommandPermissions.DefaultPermission.OP_ONLY);
+        forceLoginCommand.addArgument(new CommandArgumentDescription("player", "Online player name", true));
+
         // Register the changepassword command
         CommandDescription changePasswordCommand = new CommandDescription(
                 new RegisterCommand(),
@@ -238,19 +251,6 @@ public class CommandManager {
         getIpCommand.setCommandPermissions("authme.admin.getip", CommandPermissions.DefaultPermission.OP_ONLY);
         getIpCommand.addArgument(new CommandArgumentDescription("player", "Online player name", true));
 
-        // Register the forcelogin command
-        CommandDescription forceLoginCommand = new CommandDescription(
-                new ForceLoginCommand(),
-                new ArrayList<String>() {{
-                    add("forcelogin");
-                    add("login");
-                }},
-                "Force login player",
-                "Force the specified player to login.",
-                authMeCommand);
-        forceLoginCommand.setCommandPermissions("authme.admin.forcelogin", CommandPermissions.DefaultPermission.OP_ONLY);
-        forceLoginCommand.addArgument(new CommandArgumentDescription("player", "Online player name", true));
-
         // Register the spawn command
         CommandDescription spawnCommand = new CommandDescription(
                 new SpawnCommand(),

From b4d710840de576a96e75968f943f104eb7ae10b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 18:58:41 +0100
Subject: [PATCH 059/117] Removed some unused code

---
 .../xephi/authme/command/CommandManager.java  | 156 ------------------
 1 file changed, 156 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 8d952fd5..996ff901 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -53,77 +53,6 @@ public class CommandManager {
         helpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
         helpCommand.setMaximumArguments(false);
 
-        /*// Register the create command
-        CommandDescription createWorldCommand = new CommandDescription(
-                new CreateWorldCommand(),
-                new ArrayList<String>() {{
-                    add("createworld");
-                    add("cw");
-                }},
-                "Create world",
-                "Create a new Dungeon Maze world, the name of the world must be unique.",
-                dungeonMazeCommand);
-        createWorldCommand.addArgument(new CommandArgumentDescription("world", "The name of the world to create.", false));
-        createWorldCommand.addArgument(new CommandArgumentDescription("preload", "True or False to preload the world on startup.", true));
-        createWorldCommand.setCommandPermissions("dungeonmaze.command.createworld", CommandPermissions.DefaultPermission.OP_ONLY);
-
-        // Register the teleport command
-        CommandDescription teleportCommand = new CommandDescription(
-                new TeleportCommand(),
-                new ArrayList<String>() {{
-                    add("teleport");
-                    add("tp");
-                    add("warp");
-                    add("goto");
-                    add("move");
-                }},
-                "Teleport to world",
-                "Teleports to any another world, such as a Dungeon Maze world." ,
-                dungeonMazeCommand);
-        teleportCommand.addArgument(new CommandArgumentDescription("world", "The name of the world to teleport to.", false));
-        teleportCommand.setCommandPermissions("dungeonmaze.command.teleport", CommandPermissions.DefaultPermission.OP_ONLY);
-
-        // Register the load world command
-        CommandDescription loadWorldCommand = new CommandDescription(
-                new LoadWorldCommand(),
-                new ArrayList<String>() {{
-                    add("loadworld");
-                    add("load");
-                }},
-                "Load a world",
-                "Load a world if it isn't loaded." ,
-                dungeonMazeCommand);
-        loadWorldCommand.addArgument(new CommandArgumentDescription("world", "The name of the world to load.", false));
-        loadWorldCommand.setCommandPermissions("dungeonmaze.command.loadworld", CommandPermissions.DefaultPermission.OP_ONLY);
-
-        // Register the unload world command
-        CommandDescription unloadWorldCommand = new CommandDescription(
-                new UnloadWorldCommand(),
-                new ArrayList<String>() {{
-                    add("unloadworld");
-                    add("unload");
-                }},
-                "Unload a world",
-                "Unload a loaded world." ,
-                dungeonMazeCommand);
-        unloadWorldCommand.addArgument(new CommandArgumentDescription("world", "The name of the world to unload.", false));
-        unloadWorldCommand.setCommandPermissions("dungeonmaze.command.unloadworld", CommandPermissions.DefaultPermission.OP_ONLY);
-
-        // Register the list world command
-        CommandDescription listWorldCommand = new CommandDescription(
-                new ListWorldCommand(),
-                new ArrayList<String>() {{
-                    add("listworlds");
-                    add("listworld");
-                    add("list");
-                    add("worlds");
-                    add("lw");
-                }},
-                "List Dungeon Mazes",
-                "Lists the available Dungeon Maze worlds and shows some additional information.",
-                dungeonMazeCommand);
-        listWorldCommand.setCommandPermissions("dungeonmaze.command.listworlds", CommandPermissions.DefaultPermission.OP_ONLY);*/
-
         // Register the register command
         CommandDescription registerCommand = new CommandDescription(
                 new RegisterCommand(),
@@ -370,91 +299,6 @@ public class CommandManager {
                 authMeCommand);
         reloadCommand.setCommandPermissions("authme.admin.reload", CommandPermissions.DefaultPermission.OP_ONLY);
 
-        /* // Register the reload permissions command
-        CommandDescription reloadPermissionsCommand = new CommandDescription(
-                new ReloadPermissionsCommand(),
-                new ArrayList<String>() {{
-                    add("reloadpermissions");
-                    add("reloadpermission");
-                    add("reloadperms");
-                    add("rp");
-                }},
-                "Reload permissions",
-                "Reload the permissions system and rehook the installed permissions system.",
-                dungeonMazeCommand);
-        reloadPermissionsCommand.setCommandPermissions("dungeonmaze.command.reloadpermissions", CommandPermissions.DefaultPermission.OP_ONLY);
-
-        // Register the restart command
-        CommandDescription restartCommand = new CommandDescription(
-                new RestartCommand(),
-                new ArrayList<String>() {{
-                    add("restart");
-                    add("rstrt");
-                }},
-                "Restart Dungeon Maze",
-                "Restart the Dungeon Maze plugin.",
-                dungeonMazeCommand);
-        restartCommand.setCommandPermissions("dungeonmaze.command.restart", CommandPermissions.DefaultPermission.OP_ONLY);
-        restartCommand.addArgument(new CommandArgumentDescription("force", "True or False to force restart.", true));
-
-        // Register the check updates command
-        CommandDescription checkUpdatesCommand = new CommandDescription(
-                new CheckUpdatesCommand(),
-                new ArrayList<String>() {{
-                    add("checkupdates");
-                    add("checkupdate");
-                    add("check");
-                    add("updates");
-                    add("update");
-                    add("cu");
-                }},
-                "Check updates",
-                "Check for available updates to install.",
-                dungeonMazeCommand);
-        checkUpdatesCommand.setCommandPermissions("dungeonmaze.command.checkupdates", CommandPermissions.DefaultPermission.OP_ONLY);
-
-        // Register the install update command
-        CommandDescription installUpdateCommand = new CommandDescription(
-                new InstallUpdateCommand(),
-                new ArrayList<String>() {{
-                    add("installupdates");
-                    add("installupdate");
-                    add("install");
-                    add("iu");
-                }},
-                "Install update",
-                "Try to install any availble update.",
-                dungeonMazeCommand);
-        installUpdateCommand.setCommandPermissions("dungeonmaze.command.installupdate", CommandPermissions.DefaultPermission.OP_ONLY);
-
-        // Register the status command
-        CommandDescription statusCommand = new CommandDescription(
-                new StatusCommand(),
-                new ArrayList<String>() {{
-                    add("status");
-                    add("stats");
-                    add("s");
-                }},
-                "Status info",
-                "Show detailed plugin status.",
-                dungeonMazeCommand);
-        statusCommand.setMaximumArguments(false);
-        statusCommand.setCommandPermissions("dungeonmaze.command.status", CommandPermissions.DefaultPermission.OP_ONLY);
-
-        // Register the status command
-        CommandDescription serviceCommand = new CommandDescription(
-                new ServiceCommand(),
-                new ArrayList<String>() {{
-                    add("services");
-                    add("service");
-                    add("serv");
-                }},
-                "Services command",
-                "Show detailed information about all the Dungeon Maze serivces.",
-                dungeonMazeCommand);
-        serviceCommand.setMaximumArguments(false);
-        serviceCommand.setCommandPermissions("dungeonmaze.command.services", CommandPermissions.DefaultPermission.OP_ONLY);*/
-
         // Register the version command
         CommandDescription versionCommand = new CommandDescription(
                 new VersionCommand(),

From 913ba56343d5595a830cecb632ad8b343e0d2aad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 19:03:23 +0100
Subject: [PATCH 060/117] Implemented the base of the resetname command

---
 .../xephi/authme/command/CommandManager.java  | 12 ++++++
 .../executable/authme/ResetNameCommand.java   | 42 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 996ff901..e9668c7a 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -286,6 +286,18 @@ public class CommandManager {
         switchAntiBotCommand.setCommandPermissions("authme.admin.switchantibot", CommandPermissions.DefaultPermission.OP_ONLY);
         switchAntiBotCommand.addArgument(new CommandArgumentDescription("mode", "ON / OFF", true));
 
+//        // Register the resetname command
+//        CommandDescription resetNameCommand = new CommandDescription(
+//                new SwitchAntiBotCommand(),
+//                new ArrayList<String>() {{
+//                    add("resetname");
+//                    add("resetnames");
+//                }},
+//                "Reset name",
+//                "Reset name",
+//                authMeCommand);
+//        resetNameCommand.setCommandPermissions("authme.admin.resetname", CommandPermissions.DefaultPermission.OP_ONLY);
+
         // Register the reload command
         CommandDescription reloadCommand = new CommandDescription(
                 new ReloadCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java
new file mode 100644
index 00000000..900cd0b9
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java
@@ -0,0 +1,42 @@
+package fr.xephi.authme.command.executable.authme;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
+import java.util.List;
+
+public class ResetNameCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender           The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Command logic
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+            @Override
+            public void run() {
+                List<PlayerAuth> authentications = plugin.database.getAllAuths();
+                for(PlayerAuth auth : authentications) {
+                    auth.setRealName("Player");
+                    plugin.database.updateSession(auth);
+                }
+            }
+        });
+
+        return true;
+    }
+}

From 0ca60299adaf2473e1ee9cf41273d5c653b1913e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 19:06:43 +0100
Subject: [PATCH 061/117] Some minor command description changes

---
 .../fr/xephi/authme/command/CommandManager.java     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index e9668c7a..ae9a74bb 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -35,7 +35,7 @@ public class CommandManager {
                     add("authme");
                 }},
                 "Main command",
-                "The main AuthMeReloaded command. The root for all the other commands.", null);
+                "The main AuthMeReloaded command. The root for all admin commands.", null);
 
         // Register the help command
         CommandDescription helpCommand = new CommandDescription(
@@ -89,8 +89,8 @@ public class CommandManager {
                     add("forcelogin");
                     add("login");
                 }},
-                "Force login player",
-                "Force the specified player to login.",
+                "Enforce login player",
+                "Enforce the specified player to login.",
                 authMeCommand);
         forceLoginCommand.setCommandPermissions("authme.admin.forcelogin", CommandPermissions.DefaultPermission.OP_ONLY);
         forceLoginCommand.addArgument(new CommandArgumentDescription("player", "Online player name", true));
@@ -99,6 +99,7 @@ public class CommandManager {
         CommandDescription changePasswordCommand = new CommandDescription(
                 new RegisterCommand(),
                 new ArrayList<String>() {{
+                    add("password");
                     add("changepassword");
                     add("changepass");
                     add("cp");
@@ -108,7 +109,7 @@ public class CommandManager {
                 authMeCommand);
         changePasswordCommand.setCommandPermissions("authme.admin.changepassword", CommandPermissions.DefaultPermission.OP_ONLY);
         changePasswordCommand.addArgument(new CommandArgumentDescription("player", "Player name", false));
-        changePasswordCommand.addArgument(new CommandArgumentDescription("password", "New password", false));
+        changePasswordCommand.addArgument(new CommandArgumentDescription("pwd", "New password", false));
 
         // Register the purge command
         CommandDescription lastLoginCommand = new CommandDescription(
@@ -245,10 +246,10 @@ public class CommandManager {
         CommandDescription purgeLastPositionCommand = new CommandDescription(
                 new PurgeLastPositionCommand(),
                 new ArrayList<String>() {{
+                    add("resetpos");
                     add("purgelastposition");
                     add("purgelastpos");
                     add("resetposition");
-                    add("resetpos");
                     add("resetlastposition");
                     add("resetlastpos");
                 }},
@@ -288,7 +289,7 @@ public class CommandManager {
 
 //        // Register the resetname command
 //        CommandDescription resetNameCommand = new CommandDescription(
-//                new SwitchAntiBotCommand(),
+//                new ResetNameCommand(),
 //                new ArrayList<String>() {{
 //                    add("resetname");
 //                    add("resetnames");

From 6e222c1bc9a806958adb51df7cd0b16afccce881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 19:13:55 +0100
Subject: [PATCH 062/117] Implemented the login command

---
 src/main/java/fr/xephi/authme/AuthMe.java     |  2 +-
 .../xephi/authme/command/CommandManager.java  | 56 +++++++++++--------
 .../executable/login/LoginCommand.java        | 50 +++++++++++++++++
 3 files changed, 85 insertions(+), 23 deletions(-)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index ec141717..aa3f6137 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -348,7 +348,7 @@ public class AuthMe extends JavaPlugin {
         // Register commands
         //getCommand("authme").setExecutor(new AdminCommand(this));
         getCommand("register").setExecutor(new RegisterCommand(this));
-        getCommand("login").setExecutor(new LoginCommand(this));
+        //getCommand("login").setExecutor(new LoginCommand(this));
         getCommand("changepassword").setExecutor(new ChangePasswordCommand(this));
         getCommand("logout").setExecutor(new LogoutCommand(this));
         getCommand("unregister").setExecutor(new UnregisterCommand(this));
diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index ae9a74bb..c3309cea 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -2,6 +2,7 @@ package fr.xephi.authme.command;
 
 import fr.xephi.authme.command.executable.*;
 import fr.xephi.authme.command.executable.authme.*;
+import fr.xephi.authme.command.executable.login.LoginCommand;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,7 +30,7 @@ public class CommandManager {
     @SuppressWarnings("SpellCheckingInspection")
     public void registerCommands() {
         // Register the base Dungeon Maze command
-        CommandDescription authMeCommand = new CommandDescription(
+        CommandDescription authMeBaseCommand = new CommandDescription(
                 new AuthMeCommand(),
                 new ArrayList<String>() {{
                     add("authme");
@@ -49,7 +50,7 @@ public class CommandManager {
                 }},
                 "View help",
                 "View detailed help pages about AuthMeReloaded commands.",
-                authMeCommand);
+                authMeBaseCommand);
         helpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
         helpCommand.setMaximumArguments(false);
 
@@ -62,7 +63,7 @@ public class CommandManager {
                 }},
                 "Register a player",
                 "Register the specified player with the specified password.",
-                authMeCommand);
+                authMeBaseCommand);
         registerCommand.setCommandPermissions("authme.admin.register", CommandPermissions.DefaultPermission.OP_ONLY);
         registerCommand.addArgument(new CommandArgumentDescription("player", "Player name", false));
         registerCommand.addArgument(new CommandArgumentDescription("password", "Password", false));
@@ -78,7 +79,7 @@ public class CommandManager {
                 }},
                 "Unregister a player",
                 "Unregister the specified player.",
-                authMeCommand);
+                authMeBaseCommand);
         unregisterCommand.setCommandPermissions("authme.admin.unregister", CommandPermissions.DefaultPermission.OP_ONLY);
         unregisterCommand.addArgument(new CommandArgumentDescription("player", "Player name", false));
 
@@ -91,7 +92,7 @@ public class CommandManager {
                 }},
                 "Enforce login player",
                 "Enforce the specified player to login.",
-                authMeCommand);
+                authMeBaseCommand);
         forceLoginCommand.setCommandPermissions("authme.admin.forcelogin", CommandPermissions.DefaultPermission.OP_ONLY);
         forceLoginCommand.addArgument(new CommandArgumentDescription("player", "Online player name", true));
 
@@ -106,7 +107,7 @@ public class CommandManager {
                 }},
                 "Change player's password",
                 "Change the password of a player.",
-                authMeCommand);
+                authMeBaseCommand);
         changePasswordCommand.setCommandPermissions("authme.admin.changepassword", CommandPermissions.DefaultPermission.OP_ONLY);
         changePasswordCommand.addArgument(new CommandArgumentDescription("player", "Player name", false));
         changePasswordCommand.addArgument(new CommandArgumentDescription("pwd", "New password", false));
@@ -120,7 +121,7 @@ public class CommandManager {
                 }},
                 "Player's last login",
                 "View the date of the specified players last login",
-                authMeCommand);
+                authMeBaseCommand);
         lastLoginCommand.setCommandPermissions("authme.admin.lastlogin", CommandPermissions.DefaultPermission.OP_ONLY);
         lastLoginCommand.addArgument(new CommandArgumentDescription("player", "Player name", true));
 
@@ -133,7 +134,7 @@ public class CommandManager {
                 }},
                 "Display player accounts",
                 "Display all accounts of a player by it's player name or IP.",
-                authMeCommand);
+                authMeBaseCommand);
         accountsCommand.setCommandPermissions("authme.admin.accounts", CommandPermissions.DefaultPermission.OP_ONLY);
         accountsCommand.addArgument(new CommandArgumentDescription("player", "Player name or IP", true));
 
@@ -148,7 +149,7 @@ public class CommandManager {
                 }},
                 "Display player's email",
                 "Display the email address of the specified player if set.",
-                authMeCommand);
+                authMeBaseCommand);
         getEmailCommand.setCommandPermissions("authme.admin.getemail", CommandPermissions.DefaultPermission.OP_ONLY);
         getEmailCommand.addArgument(new CommandArgumentDescription("player", "Player name", true));
 
@@ -163,7 +164,7 @@ public class CommandManager {
                 }},
                 "Change player's email",
                 "Change the email address of the specified player.",
-                authMeCommand);
+                authMeBaseCommand);
         setEmailCommand.setCommandPermissions("authme.admin.chgemail", CommandPermissions.DefaultPermission.OP_ONLY);
         setEmailCommand.addArgument(new CommandArgumentDescription("player", "Player name", false));
         setEmailCommand.addArgument(new CommandArgumentDescription("email", "Player email", false));
@@ -177,7 +178,7 @@ public class CommandManager {
                 }},
                 "Get player's IP",
                 "Get the IP address of the specified online player.",
-                authMeCommand);
+                authMeBaseCommand);
         getIpCommand.setCommandPermissions("authme.admin.getip", CommandPermissions.DefaultPermission.OP_ONLY);
         getIpCommand.addArgument(new CommandArgumentDescription("player", "Online player name", true));
 
@@ -190,7 +191,7 @@ public class CommandManager {
                 }},
                 "Teleport to spawn",
                 "Teleport to the spawn.",
-                authMeCommand);
+                authMeBaseCommand);
         spawnCommand.setCommandPermissions("authme.admin.spawn", CommandPermissions.DefaultPermission.OP_ONLY);
 
         // Register the setspawn command
@@ -202,7 +203,7 @@ public class CommandManager {
                 }},
                 "Change the spawn",
                 "Change the player's spawn to your current position.",
-                authMeCommand);
+                authMeBaseCommand);
         setSpawnCommand.setCommandPermissions("authme.admin.setspawn", CommandPermissions.DefaultPermission.OP_ONLY);
 
         // Register the firstspawn command
@@ -214,7 +215,7 @@ public class CommandManager {
                 }},
                 "Teleport to first spawn",
                 "Teleport to the first spawn.",
-                authMeCommand);
+                authMeBaseCommand);
         firstSpawnCommand.setCommandPermissions("authme.admin.firstspawn", CommandPermissions.DefaultPermission.OP_ONLY);
 
         // Register the setfirstspawn command
@@ -226,7 +227,7 @@ public class CommandManager {
                 }},
                 "Change the first spawn",
                 "Change the first player's spawn to your current position.",
-                authMeCommand);
+                authMeBaseCommand);
         setFirstSpawnCommand.setCommandPermissions("authme.admin.setfirstspawn", CommandPermissions.DefaultPermission.OP_ONLY);
 
         // Register the purge command
@@ -238,7 +239,7 @@ public class CommandManager {
                 }},
                 "Purge old data",
                 "Purge old AuthMeReloaded data longer than the specified amount of days ago.",
-                authMeCommand);
+                authMeBaseCommand);
         purgeCommand.setCommandPermissions("authme.admin.purge", CommandPermissions.DefaultPermission.OP_ONLY);
         purgeCommand.addArgument(new CommandArgumentDescription("days", "Number of days", false));
 
@@ -255,7 +256,7 @@ public class CommandManager {
                 }},
                 "Purge player's last position",
                 "Purge the last know position of the specified player.",
-                authMeCommand);
+                authMeBaseCommand);
         purgeLastPositionCommand.setCommandPermissions("authme.admin.purgelastpos", CommandPermissions.DefaultPermission.OP_ONLY);
         purgeLastPositionCommand.addArgument(new CommandArgumentDescription("player", "Player name", true));
 
@@ -270,7 +271,7 @@ public class CommandManager {
                 }},
                 "Purge banned palyers data",
                 "Purge all AuthMeReloaded data for banned players.",
-                authMeCommand);
+                authMeBaseCommand);
         purgeBannedPlayersCommand.setCommandPermissions("authme.admin.purgebannedplayers", CommandPermissions.DefaultPermission.OP_ONLY);
 
         // Register the switchantibot command
@@ -283,7 +284,7 @@ public class CommandManager {
                 }},
                 "Switch AntiBot mode",
                 "Switch or toggle the AntiBot mode to the specified state.",
-                authMeCommand);
+                authMeBaseCommand);
         switchAntiBotCommand.setCommandPermissions("authme.admin.switchantibot", CommandPermissions.DefaultPermission.OP_ONLY);
         switchAntiBotCommand.addArgument(new CommandArgumentDescription("mode", "ON / OFF", true));
 
@@ -309,7 +310,7 @@ public class CommandManager {
                 }},
                 "Reload plugin",
                 "Reload the AuthMeReloaded plugin.",
-                authMeCommand);
+                authMeBaseCommand);
         reloadCommand.setCommandPermissions("authme.admin.reload", CommandPermissions.DefaultPermission.OP_ONLY);
 
         // Register the version command
@@ -324,11 +325,22 @@ public class CommandManager {
                 }},
                 "Version info",
                 "Show detailed information about the installed AuthMeReloaded version, and shows the developers, contributors, license and other information.",
-                authMeCommand);
+                authMeBaseCommand);
         versionCommand.setMaximumArguments(false);
 
+        // Register the base Dungeon Maze command
+        CommandDescription loginBaseCommand = new CommandDescription(
+                new LoginCommand(),
+                new ArrayList<String>() {{
+                    add("authme");
+                }},
+                "Login command",
+                "Command to login using AuthMeReloaded.", null);
+        loginBaseCommand.addArgument(new CommandArgumentDescription("password", "Login password", true));
+
         // Add the base commands to the commands array
-        this.commandDescriptions.add(authMeCommand);
+        this.commandDescriptions.add(authMeBaseCommand);
+        this.commandDescriptions.add(loginBaseCommand);
     }
 
     /**
diff --git a/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java b/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java
new file mode 100644
index 00000000..4d775ecd
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java
@@ -0,0 +1,50 @@
+package fr.xephi.authme.command.executable.login;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.Messages;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class LoginCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Messages instance
+        final Messages m = Messages.getInstance();
+
+        // Make sure the current command executor is a player
+        if(!(sender instanceof Player)) {
+            return true;
+        }
+
+        // Get the player instance
+        final Player player = (Player) sender;
+
+        // Make sure the password is set
+        if(commandArguments.getCount() == 0) {
+            m.send(player, "usage_log");
+            return true;
+        }
+
+        // Get the password
+        String playerPass = commandArguments.get(0);
+
+        // Login the player
+        plugin.management.performLogin(player, playerPass, false);
+        return true;
+    }
+}

From 9d386ed80a3276d65d3a77a6ba69d24fc9b774ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 19:15:56 +0100
Subject: [PATCH 063/117] Fixed invalid login command label

---
 src/main/java/fr/xephi/authme/command/CommandHandler.java | 3 ++-
 src/main/java/fr/xephi/authme/command/CommandManager.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandHandler.java b/src/main/java/fr/xephi/authme/command/CommandHandler.java
index 7dfa0ab0..1eb46ca0 100644
--- a/src/main/java/fr/xephi/authme/command/CommandHandler.java
+++ b/src/main/java/fr/xephi/authme/command/CommandHandler.java
@@ -1,5 +1,6 @@
 package fr.xephi.authme.command;
 
+import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.help.HelpProvider;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -100,7 +101,7 @@ public class CommandHandler {
         // Get a suitable command for this reference, and make sure it isn't null
         FoundCommandResult result = this.commandManager.findCommand(commandReference);
         if(result == null) {
-            sender.sendMessage(ChatColor.DARK_RED + "Failed to parse Dungeon Maze command!");
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to parse " + AuthMe.PLUGIN_NAME + " command!");
             return false;
         }
 
diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index c3309cea..dd65d5d3 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -332,7 +332,7 @@ public class CommandManager {
         CommandDescription loginBaseCommand = new CommandDescription(
                 new LoginCommand(),
                 new ArrayList<String>() {{
-                    add("authme");
+                    add("login");
                 }},
                 "Login command",
                 "Command to login using AuthMeReloaded.", null);

From bade9d5d5e6c783b21d92353a5085fba3e82bd51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 19:18:00 +0100
Subject: [PATCH 064/117] Fixed invalid permissions for login command

---
 src/main/java/fr/xephi/authme/command/CommandManager.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index dd65d5d3..3f4ba5a1 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -336,6 +336,7 @@ public class CommandManager {
                 }},
                 "Login command",
                 "Command to login using AuthMeReloaded.", null);
+        loginBaseCommand.setCommandPermissions("authme.login", CommandPermissions.DefaultPermission.ALLOWED);
         loginBaseCommand.addArgument(new CommandArgumentDescription("password", "Login password", true));
 
         // Add the base commands to the commands array

From 7700799e82e21ae236ec0d70b3f13862fd09991a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 19:19:50 +0100
Subject: [PATCH 065/117] Forced the password parameter for login command

---
 src/main/java/fr/xephi/authme/command/CommandManager.java   | 2 +-
 .../xephi/authme/command/executable/login/LoginCommand.java | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 3f4ba5a1..95a0a9d4 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -337,7 +337,7 @@ public class CommandManager {
                 "Login command",
                 "Command to login using AuthMeReloaded.", null);
         loginBaseCommand.setCommandPermissions("authme.login", CommandPermissions.DefaultPermission.ALLOWED);
-        loginBaseCommand.addArgument(new CommandArgumentDescription("password", "Login password", true));
+        loginBaseCommand.addArgument(new CommandArgumentDescription("password", "Login password", false));
 
         // Add the base commands to the commands array
         this.commandDescriptions.add(authMeBaseCommand);
diff --git a/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java b/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java
index 4d775ecd..3d0a86d5 100644
--- a/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java
@@ -34,12 +34,6 @@ public class LoginCommand extends ExecutableCommand {
         // Get the player instance
         final Player player = (Player) sender;
 
-        // Make sure the password is set
-        if(commandArguments.getCount() == 0) {
-            m.send(player, "usage_log");
-            return true;
-        }
-
         // Get the password
         String playerPass = commandArguments.get(0);
 

From 67ad35075466953a9345f6c4102a9e37e7bd67d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 19:26:04 +0100
Subject: [PATCH 066/117] Moved help command

---
 .../authme/command/executable/{authme => }/HelpCommand.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/main/java/fr/xephi/authme/command/executable/{authme => }/HelpCommand.java (96%)

diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/HelpCommand.java b/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
similarity index 96%
rename from src/main/java/fr/xephi/authme/command/executable/authme/HelpCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
index b892b7fe..3ddcb5a5 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/HelpCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.command.executable.authme;
+package fr.xephi.authme.command.executable;
 
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;

From f67cb02d233627fb20b3eb46efc9c15b20899fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 20:16:35 +0100
Subject: [PATCH 067/117] Added help command for login

---
 .../xephi/authme/command/CommandManager.java  | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 95a0a9d4..696e4658 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -39,7 +39,7 @@ public class CommandManager {
                 "The main AuthMeReloaded command. The root for all admin commands.", null);
 
         // Register the help command
-        CommandDescription helpCommand = new CommandDescription(
+        CommandDescription authMeHelpCommand = new CommandDescription(
                 new HelpCommand(),
                 new ArrayList<String>() {{
                     add("help");
@@ -51,8 +51,8 @@ public class CommandManager {
                 "View help",
                 "View detailed help pages about AuthMeReloaded commands.",
                 authMeBaseCommand);
-        helpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
-        helpCommand.setMaximumArguments(false);
+        authMeHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
+        authMeHelpCommand.setMaximumArguments(false);
 
         // Register the register command
         CommandDescription registerCommand = new CommandDescription(
@@ -339,6 +339,22 @@ public class CommandManager {
         loginBaseCommand.setCommandPermissions("authme.login", CommandPermissions.DefaultPermission.ALLOWED);
         loginBaseCommand.addArgument(new CommandArgumentDescription("password", "Login password", false));
 
+        // Register the help command
+        CommandDescription loginHelpCommand = new CommandDescription(
+                new HelpCommand(),
+                new ArrayList<String>() {{
+                    add("help");
+                    add("hlp");
+                    add("h");
+                    add("sos");
+                    add("?");
+                }},
+                "View help",
+                "View detailed help pages about AuthMeReloaded login commands.",
+                loginBaseCommand);
+        loginHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
+        loginHelpCommand.setMaximumArguments(false);
+
         // Add the base commands to the commands array
         this.commandDescriptions.add(authMeBaseCommand);
         this.commandDescriptions.add(loginBaseCommand);

From 1fad2b401c8651355c08196104841ed7a1811a05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 20:17:52 +0100
Subject: [PATCH 068/117] Removed unused code

---
 .../xephi/authme/command/executable/login/LoginCommand.java   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java b/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java
index 3d0a86d5..22b57dcd 100644
--- a/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java
@@ -3,7 +3,6 @@ package fr.xephi.authme.command.executable.login;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-import fr.xephi.authme.settings.Messages;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -23,9 +22,6 @@ public class LoginCommand extends ExecutableCommand {
         // AuthMe plugin instance
         final AuthMe plugin = AuthMe.getInstance();
 
-        // Messages instance
-        final Messages m = Messages.getInstance();
-
         // Make sure the current command executor is a player
         if(!(sender instanceof Player)) {
             return true;

From 45fe939239cdfff9f02ed787d4863187ec5b4bea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 20:35:41 +0100
Subject: [PATCH 069/117] Improved Dutch language pack

---
 src/main/resources/messages/messages_nl.yml | 66 ++++++++++-----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/main/resources/messages/messages_nl.yml b/src/main/resources/messages/messages_nl.yml
index acd42a2c..f1c585e2 100644
--- a/src/main/resources/messages/messages_nl.yml
+++ b/src/main/resources/messages/messages_nl.yml
@@ -1,56 +1,56 @@
-unknown_user: Gebruiker is niet gevonden in database
-unsafe_spawn: De locatie waar je de vorige keer het spel verlied was gevaarlijk, je bent geteleporteert naar de Spawn
+unknown_user: Gebruiker is niet gevonden in de database
+unsafe_spawn: De locatie waar je de vorige keer het spel verliet was gevaarlijk, je bent geteleporteerd naar de spawn
 not_logged_in: '&cNiet ingelogt!'
 reg_voluntarily: Je kunt je gebruikersnaam registreren met "/register <wachtwoord> <herhaalWachtwoord>"
 usage_log: '&cGebruik: /login <wachtwoord>'
 wrong_pwd: '&cFout wachtwoord'
 unregistered: '&cRegistratie succesvol ongedaan gemaakt!'
 reg_disabled: '&cRegistratie is uitgeschakeld'
-valid_session: '&cSessie ingelogt'
-login: '&cSuccesvol ingelogt!'
-password_error_nick: '&fYou can''t use your name as password'
-password_error_unsafe: '&fYou can''t use unsafe passwords'
+valid_session: '&cSessie ingelogd'
+login: '&cSuccesvol ingelogd!'
+password_error_nick: '&fJe kunt je gebruikersnaam niet als wachtwoord gebruiken'
+password_error_unsafe: '&fJe kunt geen onveilige wachtwoorden gebruiken'
 vb_nonActiv: Je accound is nog niet geactiveerd, controleer je mailbox!
 user_regged: '&cGebruikersnaam is al geregistreerd'
 usage_reg: '&cGebruik: /register <wachtwoord> <herhaalWachtwoord>'
 max_reg: Je hebt de maximale registraties van jouw account overschreden.
 no_perm: '&cGeen toegang!'
-error: Error; neem contact op met een ADMIN!
+error: Error: neem contact op met een administrator!
 login_msg: '&cLog in met "/login <wachtwoord>"'
 reg_msg: '&cRegistreer met "/register <wachtwoord> <herhaalWachtwoord>"'
 usage_unreg: '&cGebruik: /unregister password'
 pwd_changed: '&cWachtwoord aangepast!'
 user_unknown: '&cGebruikersnaam niet geregistreerd'
 password_error: Wachtwoord incorrect!
-invalid_session: Sessie beschadigt, wacht tot de sessie is verlopen en join opnieuw.
+invalid_session: Sessie beschadigd, wacht tot de sessie is verlopen en verbindt opnieuw.
 reg_only: Alleen voor geregistreerde spelers! Bezoek http://example.com om te registreren
-logged_in: '&cJe bent al ingelogt!'
-logout: '&cJe bent succesvol uitgelogt'
+logged_in: '&cJe bent al ingelogd!'
+logout: '&cJe bent succesvol uitgelogd'
 same_nick: Er is al iemand met jou gebruikersnaam online.
 registered: '&cSuccesvol geregistreerd!'
 pass_len: Je gekozen wachtwoord voldoet niet aan de minimum of maximum lengte
 reload: Configuratie en database is opnieuw opgestard
-timeout: Login time-out; het duurde telang voor je je inlogde.
+timeout: Login time-out: het duurde telang voor je je inlogde.
 usage_changepassword: 'Gebruik: /changepassword <oudWachtwoord> <nieuwWachtwoord>'
-name_len: '&cJouw gebruikersnaam is te kort'
-regex: '&cJouw gebruikersnaam bestaat uit illegale tekens. tegestaan chars: REG_EX'
-add_email: '&cVoeg uw email toe Alstublieft met: /email add jouw wachtwoord herhaalwachtwoord'
-recovery_email: '&cWachtwoord vergeten? gebruik alstublieft  /email recovery <Jouwemail>'
-usage_captcha: '&cGebruik: /captcha <deCaptcha>'
-wrong_captcha: '&cverkeerde Captcha, Gebruik alstublieft : /captcha THE_CAPTCHA'
-valid_captcha: '&cJouw captcha is geldig!'
-kick_forvip: '&cA VIP Gebruiker ga naar de volledige server!'
-kick_fullserver: '&cDe server is eigenlijk vol, Sorry!'
-usage_email_add: '&fGebruik: /email add <email> <herhaalEmail> '
-usage_email_change: '&fGebruik: /email change <oudeEmail> <nieuweEmail> '
-usage_email_recovery: '&fGebruik: /email recovery <Email>'
-new_email_invalid: '[AuthMe] Nieuw email ongeldig!'
-old_email_invalid: '[AuthMe] Oud email ongeldig!'
-email_invalid: '[AuthMe] ongeldig Email'
-email_added: '[AuthMe] Bevestig jouw Email !'
-email_confirm: '[AuthMe] Bevestig jouw Email !'
-email_changed: '[AuthMe] Email Veranderd !'
-email_send: '[AuthMe] Herstel Email Verzonden !'
-country_banned: 'Your country is banned from this server'
-antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!'
-antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped'
+name_len: '&cJe gebruikersnaam is te kort'
+regex: '&cJouw gebruikersnaam bevat illegale tekens. Toegestaane karakters: REG_EX'
+add_email: '&cVoeg uw E-mail alstublieft toe met: /email add <E-mail> <wachtwoord> <herhaalWachtwoord>'
+recovery_email: '&cWachtwoord vergeten? Gebruik alstublieft "/email recovery <E-mail>"'
+usage_captcha: '&cGebruik: /captcha <captcha>'
+wrong_captcha: '&cVerkeerde Captcha, gebruik alstublieft: /captcha THE_CAPTCHA'
+valid_captcha: '&cDe captcha is geldig!'
+kick_forvip: '&cEen VIP Gebruiker ga naar de volledige server!'
+kick_fullserver: '&cDe server is vol, sorry!'
+usage_email_add: '&fGebruik: /email add <E-mail> <herhaalE-mail>'
+usage_email_change: '&fGebruik: /email change <oudeE-mail> <nieuweE-mail>'
+usage_email_recovery: '&fGebruik: /email recovery <E-mail>'
+new_email_invalid: '[AuthMe] Nieuwe E-mail ongeldig!'
+old_email_invalid: '[AuthMe] Oude E-mail ongeldig!'
+email_invalid: '[AuthMe] Ongeldige E-mail'
+email_added: '[AuthMe] Bevestig jouw E-mail!'
+email_confirm: '[AuthMe] Bevestig jouw E-mail!'
+email_changed: '[AuthMe] Email Veranderd!'
+email_send: '[AuthMe] Herstel E-mail Verzonden!'
+country_banned: 'Jouw land is geband op deze server'
+antibot_auto_enabled: '[AuthMe] AntiBotMod automatisch aangezet vanewge veel verbindingen!'
+antibot_auto_disabled: '[AuthMe] AntiBotMod automatisch uitgezet na %m minuten, hopelijk is de invasie gestopt'

From ae76759dc0e197cb286a6484d1b8c22029cce62e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 20:50:25 +0100
Subject: [PATCH 070/117] Implemented the register command

---
 .../xephi/authme/command/CommandManager.java  | 31 +++++++++
 .../executable/register/RegisterCommand.java  | 69 +++++++++++++++++++
 2 files changed, 100 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 696e4658..82c5d173 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -355,9 +355,40 @@ public class CommandManager {
         loginHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
         loginHelpCommand.setMaximumArguments(false);
 
+        // Register the base register command
+        CommandDescription registerBaseCommand = new CommandDescription(
+                new RegisterCommand(),
+                new ArrayList<String>() {{
+                    add("register");
+                    add("reg");
+                }},
+                "Registration command",
+                "Command to register using AuthMeReloaded.", null);
+        registerBaseCommand.setCommandPermissions("authme.register", CommandPermissions.DefaultPermission.ALLOWED);
+        registerBaseCommand.addArgument(new CommandArgumentDescription("password", "Password", false));
+        registerBaseCommand.addArgument(new CommandArgumentDescription("verifyPassword", "Verify password", false));
+        registerBaseCommand.setMaximumArguments(false);
+
+        // Register the help command
+        CommandDescription registerHelpCommand = new CommandDescription(
+                new HelpCommand(),
+                new ArrayList<String>() {{
+                    add("help");
+                    add("hlp");
+                    add("h");
+                    add("sos");
+                    add("?");
+                }},
+                "View help",
+                "View detailed help pages about AuthMeReloaded register commands.",
+                registerBaseCommand);
+        registerHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
+        registerHelpCommand.setMaximumArguments(false);
+
         // Add the base commands to the commands array
         this.commandDescriptions.add(authMeBaseCommand);
         this.commandDescriptions.add(loginBaseCommand);
+        this.commandDescriptions.add(registerBaseCommand);
     }
 
     /**
diff --git a/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java
new file mode 100644
index 00000000..b08190fc
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java
@@ -0,0 +1,69 @@
+package fr.xephi.authme.command.executable.register;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.security.RandomString;
+import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.settings.Settings;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class RegisterCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Messages instance
+        final Messages m = Messages.getInstance();
+
+        // Make sure the sender is a player
+        if (!(sender instanceof Player)) {
+            sender.sendMessage("Player Only! Use 'authme register <playername> <password>' instead");
+            return true;
+        }
+
+        // Make sure the command arguments are valid
+        final Player player = (Player) sender;
+        if (commandArguments.getCount() == 0 || (Settings.getEnablePasswordVerifier && commandArguments.getCount() < 2)) {
+            m.send(player, "usage_reg");
+            return true;
+        }
+
+        if (Settings.emailRegistration && !Settings.getmailAccount.isEmpty()) {
+            if (Settings.doubleEmailCheck) {
+                if (commandArguments.getCount() < 2 || !commandArguments.get(0).equals(commandArguments.get(1))) {
+                    m.send(player, "usage_reg");
+                    return true;
+                }
+            }
+            final String email = commandArguments.get(0);
+            if (!Settings.isEmailCorrect(email)) {
+                m.send(player, "email_invalid");
+                return true;
+            }
+            RandomString rand = new RandomString(Settings.getRecoveryPassLength);
+            final String thePass = rand.nextString();
+            plugin.management.performRegister(player, thePass, email);
+            return true;
+        }
+        if (commandArguments.getCount() > 1 && Settings.getEnablePasswordVerifier)
+            if (!commandArguments.get(0).equals(commandArguments.get(1))) {
+                m.send(player, "password_error");
+                return true;
+            }
+        plugin.management.performRegister(player, commandArguments.get(0), "");
+        return true;
+    }
+}

From 5093e8ff780330241d6c23a92ec7611f173830c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 20:51:16 +0100
Subject: [PATCH 071/117] Implemented the register command (2)

---
 src/main/java/fr/xephi/authme/AuthMe.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index aa3f6137..d0e499e8 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -347,7 +347,7 @@ public class AuthMe extends JavaPlugin {
         // TODO: This is moving to AuthMe.onCommand();
         // Register commands
         //getCommand("authme").setExecutor(new AdminCommand(this));
-        getCommand("register").setExecutor(new RegisterCommand(this));
+        //getCommand("register").setExecutor(new RegisterCommand(this));
         //getCommand("login").setExecutor(new LoginCommand(this));
         getCommand("changepassword").setExecutor(new ChangePasswordCommand(this));
         getCommand("logout").setExecutor(new LogoutCommand(this));

From a36553f75f17236761ab6509250846713ba5e715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 20:57:13 +0100
Subject: [PATCH 072/117] Implemented the changepassword command

---
 src/main/java/fr/xephi/authme/AuthMe.java     |  2 +-
 .../xephi/authme/command/CommandManager.java  | 33 +++++++++
 .../changepassword/ChangePasswordCommand.java | 74 +++++++++++++++++++
 3 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index d0e499e8..e18baf0d 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -349,7 +349,7 @@ public class AuthMe extends JavaPlugin {
         //getCommand("authme").setExecutor(new AdminCommand(this));
         //getCommand("register").setExecutor(new RegisterCommand(this));
         //getCommand("login").setExecutor(new LoginCommand(this));
-        getCommand("changepassword").setExecutor(new ChangePasswordCommand(this));
+        //getCommand("changepassword").setExecutor(new ChangePasswordCommand(this));
         getCommand("logout").setExecutor(new LogoutCommand(this));
         getCommand("unregister").setExecutor(new UnregisterCommand(this));
         getCommand("email").setExecutor(new EmailCommand(this));
diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 82c5d173..5510f40e 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -2,6 +2,8 @@ package fr.xephi.authme.command;
 
 import fr.xephi.authme.command.executable.*;
 import fr.xephi.authme.command.executable.authme.*;
+import fr.xephi.authme.command.executable.changepassword.*;
+import fr.xephi.authme.command.executable.changepassword.ChangePasswordCommand;
 import fr.xephi.authme.command.executable.login.LoginCommand;
 
 import java.util.ArrayList;
@@ -385,10 +387,41 @@ public class CommandManager {
         registerHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
         registerHelpCommand.setMaximumArguments(false);
 
+        // Register the base changepassword command
+        CommandDescription changePasswordBaseCommand = new CommandDescription(
+                new ChangePasswordCommand(),
+                new ArrayList<String>() {{
+                    add("changepassword");
+                    add("changepass");
+                }},
+                "Change password command",
+                "Command to change your password using AuthMeReloaded.", null);
+        changePasswordBaseCommand.setCommandPermissions("authme.changepassword", CommandPermissions.DefaultPermission.ALLOWED);
+        changePasswordBaseCommand.addArgument(new CommandArgumentDescription("password", "Password", false));
+        changePasswordBaseCommand.addArgument(new CommandArgumentDescription("verifyPassword", "Verify password", false));
+        changePasswordBaseCommand.setMaximumArguments(false);
+
+        // Register the help command
+        CommandDescription changePasswordHelpCommand = new CommandDescription(
+                new HelpCommand(),
+                new ArrayList<String>() {{
+                    add("help");
+                    add("hlp");
+                    add("h");
+                    add("sos");
+                    add("?");
+                }},
+                "View help",
+                "View detailed help pages about AuthMeReloaded register commands.",
+                changePasswordBaseCommand);
+        changePasswordHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
+        changePasswordHelpCommand.setMaximumArguments(false);
+
         // Add the base commands to the commands array
         this.commandDescriptions.add(authMeBaseCommand);
         this.commandDescriptions.add(loginBaseCommand);
         this.commandDescriptions.add(registerBaseCommand);
+        this.commandDescriptions.add(changePasswordBaseCommand);
     }
 
     /**
diff --git a/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java b/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java
new file mode 100644
index 00000000..bebba5b4
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java
@@ -0,0 +1,74 @@
+package fr.xephi.authme.command.executable.changepassword;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.task.ChangePasswordTask;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class ChangePasswordCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Messages instance
+        final Messages m = Messages.getInstance();
+
+        // Get the passwords
+        String playerPass = commandArguments.get(0);
+        String playerPassVerify = commandArguments.get(1);
+
+        // Make sure the current command executor is a player
+        if(!(sender instanceof Player)) {
+            return true;
+        }
+
+        // Get the player instance and make sure it's authenticated
+        Player player = (Player) sender;
+        String name = player.getName().toLowerCase();
+        if (!PlayerCache.getInstance().isAuthenticated(name)) {
+            m.send(player, "not_logged_in");
+            return true;
+        }
+
+        // Make sure the password is allowed
+        String playerPassLowerCase = playerPass.toLowerCase();
+        if (playerPassLowerCase.contains("delete") || playerPassLowerCase.contains("where") || playerPassLowerCase.contains("insert") || playerPassLowerCase.contains("modify") || playerPassLowerCase.contains("from") || playerPassLowerCase.contains("select") || playerPassLowerCase.contains(";") || playerPassLowerCase.contains("null") || !playerPassLowerCase.matches(Settings.getPassRegex)) {
+            m.send(player, "password_error");
+            return true;
+        }
+        if (playerPassLowerCase.equalsIgnoreCase(name)) {
+            m.send(player, "password_error_nick");
+            return true;
+        }
+        if (playerPassLowerCase.length() < Settings.getPasswordMinLen || playerPassLowerCase.length() > Settings.passwordMaxLength) {
+            m.send(player, "pass_len");
+            return true;
+        }
+        if (!Settings.unsafePasswords.isEmpty()) {
+            if (Settings.unsafePasswords.contains(playerPassLowerCase)) {
+                m.send(player, "password_error_unsafe");
+                return true;
+            }
+        }
+
+        // Set the password
+        plugin.getServer().getScheduler().runTaskAsynchronously(plugin, new ChangePasswordTask(plugin, player, playerPass, playerPassVerify));
+        return true;
+    }
+}

From ebd25e16a09b8ed34eb8d6fc1e19b66f06f2fdc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 20:57:33 +0100
Subject: [PATCH 073/117] Moved authme command

---
 src/main/java/fr/xephi/authme/command/CommandManager.java       | 1 -
 .../authme/command/executable/{ => authme}/AuthMeCommand.java   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename src/main/java/fr/xephi/authme/command/executable/{ => authme}/AuthMeCommand.java (96%)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 5510f40e..a2d548a7 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -2,7 +2,6 @@ package fr.xephi.authme.command;
 
 import fr.xephi.authme.command.executable.*;
 import fr.xephi.authme.command.executable.authme.*;
-import fr.xephi.authme.command.executable.changepassword.*;
 import fr.xephi.authme.command.executable.changepassword.ChangePasswordCommand;
 import fr.xephi.authme.command.executable.login.LoginCommand;
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/AuthMeCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/AuthMeCommand.java
similarity index 96%
rename from src/main/java/fr/xephi/authme/command/executable/AuthMeCommand.java
rename to src/main/java/fr/xephi/authme/command/executable/authme/AuthMeCommand.java
index 8f1edd84..06f66fae 100644
--- a/src/main/java/fr/xephi/authme/command/executable/AuthMeCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/AuthMeCommand.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme.command.executable;
+package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;

From ebefca73b744370fbe9a75619e6699f6b4c6d3bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 21:00:41 +0100
Subject: [PATCH 074/117] Implemented the logout command

---
 src/main/java/fr/xephi/authme/AuthMe.java     |  2 +-
 .../xephi/authme/command/CommandManager.java  | 28 ++++++++++++++
 .../executable/logout/LogoutCommand.java      | 37 +++++++++++++++++++
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/logout/LogoutCommand.java

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index e18baf0d..37b95967 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -350,7 +350,7 @@ public class AuthMe extends JavaPlugin {
         //getCommand("register").setExecutor(new RegisterCommand(this));
         //getCommand("login").setExecutor(new LoginCommand(this));
         //getCommand("changepassword").setExecutor(new ChangePasswordCommand(this));
-        getCommand("logout").setExecutor(new LogoutCommand(this));
+        //getCommand("logout").setExecutor(new LogoutCommand(this));
         getCommand("unregister").setExecutor(new UnregisterCommand(this));
         getCommand("email").setExecutor(new EmailCommand(this));
         getCommand("captcha").setExecutor(new CaptchaCommand(this));
diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index a2d548a7..7f06492e 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -4,6 +4,7 @@ import fr.xephi.authme.command.executable.*;
 import fr.xephi.authme.command.executable.authme.*;
 import fr.xephi.authme.command.executable.changepassword.ChangePasswordCommand;
 import fr.xephi.authme.command.executable.login.LoginCommand;
+import fr.xephi.authme.command.executable.logout.LogoutCommand;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -356,6 +357,32 @@ public class CommandManager {
         loginHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
         loginHelpCommand.setMaximumArguments(false);
 
+        // Register the base logout command
+        CommandDescription logoutBaseCommand = new CommandDescription(
+                new LogoutCommand(),
+                new ArrayList<String>() {{
+                    add("logout");
+                }},
+                "Logout command",
+                "Command to logout using AuthMeReloaded.", null);
+        logoutBaseCommand.setCommandPermissions("authme.logout", CommandPermissions.DefaultPermission.ALLOWED);
+
+        // Register the help command
+        CommandDescription logoutHelpCommand = new CommandDescription(
+                new HelpCommand(),
+                new ArrayList<String>() {{
+                    add("help");
+                    add("hlp");
+                    add("h");
+                    add("sos");
+                    add("?");
+                }},
+                "View help",
+                "View detailed help pages about AuthMeReloaded register commands.",
+                logoutBaseCommand);
+        logoutHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
+        logoutHelpCommand.setMaximumArguments(false);
+
         // Register the base register command
         CommandDescription registerBaseCommand = new CommandDescription(
                 new RegisterCommand(),
@@ -419,6 +446,7 @@ public class CommandManager {
         // Add the base commands to the commands array
         this.commandDescriptions.add(authMeBaseCommand);
         this.commandDescriptions.add(loginBaseCommand);
+        this.commandDescriptions.add(logoutBaseCommand);
         this.commandDescriptions.add(registerBaseCommand);
         this.commandDescriptions.add(changePasswordBaseCommand);
     }
diff --git a/src/main/java/fr/xephi/authme/command/executable/logout/LogoutCommand.java b/src/main/java/fr/xephi/authme/command/executable/logout/LogoutCommand.java
new file mode 100644
index 00000000..95b5ab9c
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/logout/LogoutCommand.java
@@ -0,0 +1,37 @@
+package fr.xephi.authme.command.executable.logout;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class LogoutCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Make sure the current command executor is a player
+        if(!(sender instanceof Player)) {
+            return true;
+        }
+
+        // Get the player instance
+        final Player player = (Player) sender;
+
+        // Logout the player
+        plugin.management.performLogout(player);
+        return true;
+    }
+}

From 7f63056cc955114e1f07f9ca95475674ac2f0b5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 21:06:19 +0100
Subject: [PATCH 075/117] Implemented the unregister command

---
 src/main/java/fr/xephi/authme/AuthMe.java     |  2 +-
 .../xephi/authme/command/CommandManager.java  | 30 +++++++++++
 .../unregister/UnregisterCommand.java         | 52 +++++++++++++++++++
 3 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 37b95967..50743503 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -351,7 +351,7 @@ public class AuthMe extends JavaPlugin {
         //getCommand("login").setExecutor(new LoginCommand(this));
         //getCommand("changepassword").setExecutor(new ChangePasswordCommand(this));
         //getCommand("logout").setExecutor(new LogoutCommand(this));
-        getCommand("unregister").setExecutor(new UnregisterCommand(this));
+        //getCommand("unregister").setExecutor(new UnregisterCommand(this));
         getCommand("email").setExecutor(new EmailCommand(this));
         getCommand("captcha").setExecutor(new CaptchaCommand(this));
         getCommand("converter").setExecutor(new ConverterCommand(this));
diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 7f06492e..864d098b 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -413,6 +413,35 @@ public class CommandManager {
         registerHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
         registerHelpCommand.setMaximumArguments(false);
 
+        // Register the base unregister command
+        CommandDescription unregisterBaseCommand = new CommandDescription(
+                new RegisterCommand(),
+                new ArrayList<String>() {{
+                    add("unregister");
+                    add("unreg");
+                }},
+                "Unregistration command",
+                "Command to unregister using AuthMeReloaded.", null);
+        unregisterBaseCommand.setCommandPermissions("authme.unregister", CommandPermissions.DefaultPermission.ALLOWED);
+        unregisterBaseCommand.addArgument(new CommandArgumentDescription("password", "Password", false));
+        unregisterBaseCommand.setMaximumArguments(false);
+
+        // Register the help command
+        CommandDescription unregisterHelpCommand = new CommandDescription(
+                new HelpCommand(),
+                new ArrayList<String>() {{
+                    add("help");
+                    add("hlp");
+                    add("h");
+                    add("sos");
+                    add("?");
+                }},
+                "View help",
+                "View detailed help pages about AuthMeReloaded register commands.",
+                unregisterBaseCommand);
+        unregisterHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
+        unregisterHelpCommand.setMaximumArguments(false);
+
         // Register the base changepassword command
         CommandDescription changePasswordBaseCommand = new CommandDescription(
                 new ChangePasswordCommand(),
@@ -448,6 +477,7 @@ public class CommandManager {
         this.commandDescriptions.add(loginBaseCommand);
         this.commandDescriptions.add(logoutBaseCommand);
         this.commandDescriptions.add(registerBaseCommand);
+        this.commandDescriptions.add(unregisterBaseCommand);
         this.commandDescriptions.add(changePasswordBaseCommand);
     }
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java
new file mode 100644
index 00000000..20055203
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java
@@ -0,0 +1,52 @@
+package fr.xephi.authme.command.executable.unregister;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.Messages;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class UnregisterCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Messages instance
+        final Messages m = Messages.getInstance();
+
+        // Make sure the current command executor is a player
+        if(!(sender instanceof Player)) {
+            return true;
+        }
+
+        // Get the password
+        String playerPass = commandArguments.get(0);
+
+        // Get the player instance and name
+        final Player player = (Player) sender;
+        final String playerNameLowerCase = player.getName().toLowerCase();
+
+        // Make sure the player is authenticated
+        if (!PlayerCache.getInstance().isAuthenticated(playerNameLowerCase)) {
+            m.send(player, "not_logged_in");
+            return true;
+        }
+
+        // Unregister the player
+        plugin.management.performUnregister(player, playerPass, false);
+        return true;
+    }
+}

From 4c536a52043da84a606f2fc75fe8cd327beb6a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 21:20:08 +0100
Subject: [PATCH 076/117] Implemented the email add command

---
 src/main/java/fr/xephi/authme/AuthMe.java     |  2 +-
 .../xephi/authme/command/CommandManager.java  | 50 ++++++++++-
 .../executable/email/AddEmailCommand.java     | 90 +++++++++++++++++++
 3 files changed, 137 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 50743503..92db8257 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -352,7 +352,7 @@ public class AuthMe extends JavaPlugin {
         //getCommand("changepassword").setExecutor(new ChangePasswordCommand(this));
         //getCommand("logout").setExecutor(new LogoutCommand(this));
         //getCommand("unregister").setExecutor(new UnregisterCommand(this));
-        getCommand("email").setExecutor(new EmailCommand(this));
+        //getCommand("email").setExecutor(new EmailCommand(this));
         getCommand("captcha").setExecutor(new CaptchaCommand(this));
         getCommand("converter").setExecutor(new ConverterCommand(this));
 
diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 864d098b..28b11b6d 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -3,6 +3,7 @@ package fr.xephi.authme.command;
 import fr.xephi.authme.command.executable.*;
 import fr.xephi.authme.command.executable.authme.*;
 import fr.xephi.authme.command.executable.changepassword.ChangePasswordCommand;
+import fr.xephi.authme.command.executable.email.AddEmailCommand;
 import fr.xephi.authme.command.executable.login.LoginCommand;
 import fr.xephi.authme.command.executable.logout.LogoutCommand;
 
@@ -31,7 +32,7 @@ public class CommandManager {
      */
     @SuppressWarnings("SpellCheckingInspection")
     public void registerCommands() {
-        // Register the base Dungeon Maze command
+        // Register the base AuthMe Reloaded command
         CommandDescription authMeBaseCommand = new CommandDescription(
                 new AuthMeCommand(),
                 new ArrayList<String>() {{
@@ -378,7 +379,7 @@ public class CommandManager {
                     add("?");
                 }},
                 "View help",
-                "View detailed help pages about AuthMeReloaded register commands.",
+                "View detailed help pages about AuthMeReloaded logout commands.",
                 logoutBaseCommand);
         logoutHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
         logoutHelpCommand.setMaximumArguments(false);
@@ -437,7 +438,7 @@ public class CommandManager {
                     add("?");
                 }},
                 "View help",
-                "View detailed help pages about AuthMeReloaded register commands.",
+                "View detailed help pages about AuthMeReloaded unregister commands.",
                 unregisterBaseCommand);
         unregisterHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
         unregisterHelpCommand.setMaximumArguments(false);
@@ -467,11 +468,51 @@ public class CommandManager {
                     add("?");
                 }},
                 "View help",
-                "View detailed help pages about AuthMeReloaded register commands.",
+                "View detailed help pages about AuthMeReloaded change password commands.",
                 changePasswordBaseCommand);
         changePasswordHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
         changePasswordHelpCommand.setMaximumArguments(false);
 
+        // Register the base Dungeon Maze command
+        CommandDescription emailBaseCommand = new CommandDescription(
+                new HelpCommand(),
+                new ArrayList<String>() {{
+                    add("email");
+                    add("mail");
+                }},
+                "E-mail command",
+                "The AuthMe Reloaded E-mail command. The root for all E-mail commands.", null);
+
+        // Register the help command
+        CommandDescription addEmailCommand = new CommandDescription(
+                new AddEmailCommand(),
+                new ArrayList<String>() {{
+                    add("add");
+                    add("addemail");
+                    add("addmail");
+                }},
+                "Add E-mail",
+                "Add a new E-Mail address to your account.",
+                emailBaseCommand);
+        addEmailCommand.addArgument(new CommandArgumentDescription("email", "Email address", false));
+        addEmailCommand.addArgument(new CommandArgumentDescription("verifyEmail", "Email address verification", false));
+
+        // Register the help command
+        CommandDescription emailHelpCommand = new CommandDescription(
+                new HelpCommand(),
+                new ArrayList<String>() {{
+                    add("help");
+                    add("hlp");
+                    add("h");
+                    add("sos");
+                    add("?");
+                }},
+                "View help",
+                "View detailed help pages about AuthMeReloaded help commands.",
+                emailBaseCommand);
+        emailHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
+        emailHelpCommand.setMaximumArguments(false);
+
         // Add the base commands to the commands array
         this.commandDescriptions.add(authMeBaseCommand);
         this.commandDescriptions.add(loginBaseCommand);
@@ -479,6 +520,7 @@ public class CommandManager {
         this.commandDescriptions.add(registerBaseCommand);
         this.commandDescriptions.add(unregisterBaseCommand);
         this.commandDescriptions.add(changePasswordBaseCommand);
+        this.commandDescriptions.add(emailBaseCommand);
     }
 
     /**
diff --git a/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java
new file mode 100644
index 00000000..3fa8e0f2
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java
@@ -0,0 +1,90 @@
+package fr.xephi.authme.command.executable.email;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.settings.Settings;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class AddEmailCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Messages instance
+        final Messages m = Messages.getInstance();
+
+        // Get the parameter values
+        String playerMail = commandArguments.get(0);
+        String playerMailVerify = commandArguments.get(1);
+
+        // Make sure the current command executor is a player
+        if(!(sender instanceof Player)) {
+            return true;
+        }
+
+        // Get the player instance and name
+        final Player player = (Player) sender;
+        final String playerName = player.getName();
+
+        // Command logic
+        if (Settings.getmaxRegPerEmail > 0) {
+            if (!plugin.authmePermissible(sender, "authme.allow2accounts") && plugin.database.getAllAuthsByEmail(playerMail).size() >= Settings.getmaxRegPerEmail) {
+                m.send(player, "max_reg");
+                return true;
+            }
+        }
+
+        if (playerMail.equals(playerMailVerify) && PlayerCache.getInstance().isAuthenticated(playerName)) {
+            PlayerAuth auth = PlayerCache.getInstance().getAuth(playerName);
+
+            if (auth.getEmail() == null || (!auth.getEmail().equals("your@email.com") && !auth.getEmail().isEmpty())) {
+                m.send(player, "usage_email_change");
+                return true;
+            }
+
+            if (!Settings.isEmailCorrect(playerMail)) {
+                m.send(player, "email_invalid");
+                return true;
+            }
+
+            auth.setEmail(playerMail);
+
+            if (!plugin.database.updateEmail(auth)) {
+                m.send(player, "error");
+                return true;
+            }
+
+            PlayerCache.getInstance().updatePlayer(auth);
+            m.send(player, "email_added");
+            player.sendMessage(auth.getEmail());
+
+        } else if (PlayerCache.getInstance().isAuthenticated(playerName)) {
+            m.send(player, "email_confirm");
+
+        } else {
+            if (!plugin.database.isAuthAvailable(playerName)) {
+                m.send(player, "login_msg");
+            } else {
+                m.send(player, "reg_email_msg");
+            }
+        }
+
+        return true;
+    }
+}

From b10d3d39740e4f07c743c5ee13d49d069405095f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 21:26:00 +0100
Subject: [PATCH 077/117] Implemented the email change command

---
 .../xephi/authme/command/CommandManager.java  | 19 +++-
 .../executable/email/ChangeEmailCommand.java  | 88 +++++++++++++++++++
 2 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 28b11b6d..413ab767 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -4,6 +4,7 @@ import fr.xephi.authme.command.executable.*;
 import fr.xephi.authme.command.executable.authme.*;
 import fr.xephi.authme.command.executable.changepassword.ChangePasswordCommand;
 import fr.xephi.authme.command.executable.email.AddEmailCommand;
+import fr.xephi.authme.command.executable.email.ChangeEmailCommand;
 import fr.xephi.authme.command.executable.login.LoginCommand;
 import fr.xephi.authme.command.executable.logout.LogoutCommand;
 
@@ -483,7 +484,7 @@ public class CommandManager {
                 "E-mail command",
                 "The AuthMe Reloaded E-mail command. The root for all E-mail commands.", null);
 
-        // Register the help command
+        // Register the add command
         CommandDescription addEmailCommand = new CommandDescription(
                 new AddEmailCommand(),
                 new ArrayList<String>() {{
@@ -492,11 +493,25 @@ public class CommandManager {
                     add("addmail");
                 }},
                 "Add E-mail",
-                "Add a new E-Mail address to your account.",
+                "Add an new E-Mail address to your account.",
                 emailBaseCommand);
         addEmailCommand.addArgument(new CommandArgumentDescription("email", "Email address", false));
         addEmailCommand.addArgument(new CommandArgumentDescription("verifyEmail", "Email address verification", false));
 
+        // Register the change command
+        CommandDescription changeEmailCommand = new CommandDescription(
+                new ChangeEmailCommand(),
+                new ArrayList<String>() {{
+                    add("change");
+                    add("changeemail");
+                    add("changemail");
+                }},
+                "Change E-mail",
+                "Change an E-Mail address of your account.",
+                emailBaseCommand);
+        changeEmailCommand.addArgument(new CommandArgumentDescription("oldEmail", "Old email address", false));
+        changeEmailCommand.addArgument(new CommandArgumentDescription("newEmail", "New email address", false));
+
         // Register the help command
         CommandDescription emailHelpCommand = new CommandDescription(
                 new HelpCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java
new file mode 100644
index 00000000..aad9bc22
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java
@@ -0,0 +1,88 @@
+package fr.xephi.authme.command.executable.email;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.settings.Settings;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.Arrays;
+
+public class ChangeEmailCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Messages instance
+        final Messages m = Messages.getInstance();
+
+        // Get the parameter values
+        String playerMailOld = commandArguments.get(0);
+        String playerMailNew = commandArguments.get(1);
+
+        // Make sure the current command executor is a player
+        if(!(sender instanceof Player)) {
+            return true;
+        }
+
+        // Get the player instance and name
+        final Player player = (Player) sender;
+        final String playerName = player.getName();
+
+        // Command logic
+        if (Settings.getmaxRegPerEmail > 0) {
+            if (!plugin.authmePermissible(sender, "authme.allow2accounts") && plugin.database.getAllAuthsByEmail(playerMailNew).size() >= Settings.getmaxRegPerEmail) {
+                m.send(player, "max_reg");
+                return true;
+            }
+        }
+        if (PlayerCache.getInstance().isAuthenticated(playerName)) {
+            PlayerAuth auth = PlayerCache.getInstance().getAuth(playerName);
+            if (auth.getEmail() == null || auth.getEmail().equals("your@email.com") || auth.getEmail().isEmpty()) {
+                m.send(player, "usage_email_add");
+                return true;
+            }
+            if (!playerMailOld.equals(auth.getEmail())) {
+                m.send(player, "old_email_invalid");
+                return true;
+            }
+            if (!Settings.isEmailCorrect(playerMailNew)) {
+                m.send(player, "new_email_invalid");
+                return true;
+            }
+            auth.setEmail(playerMailNew);
+            if (!plugin.database.updateEmail(auth)) {
+                m.send(player, "error");
+                return true;
+            }
+            PlayerCache.getInstance().updatePlayer(auth);
+            m.send(player, "email_changed");
+            player.sendMessage(Arrays.toString(m.send("email_defined")) + auth.getEmail());
+        } else if (PlayerCache.getInstance().isAuthenticated(playerName)) {
+            m.send(player, "email_confirm");
+        } else {
+            if (!plugin.database.isAuthAvailable(playerName)) {
+                m.send(player, "login_msg");
+            } else {
+                m.send(player, "reg_email_msg");
+            }
+        }
+
+        return true;
+    }
+}

From 3e16866b236da5f1e88bd57d2fea68c14a02547e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 21:28:17 +0100
Subject: [PATCH 078/117] Implemented the email recover command

---
 .../xephi/authme/command/CommandManager.java  | 15 +++
 .../executable/email/RecoverEmailCommand.java | 95 +++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 413ab767..bd1868c8 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -5,6 +5,7 @@ import fr.xephi.authme.command.executable.authme.*;
 import fr.xephi.authme.command.executable.changepassword.ChangePasswordCommand;
 import fr.xephi.authme.command.executable.email.AddEmailCommand;
 import fr.xephi.authme.command.executable.email.ChangeEmailCommand;
+import fr.xephi.authme.command.executable.email.RecoverEmailCommand;
 import fr.xephi.authme.command.executable.login.LoginCommand;
 import fr.xephi.authme.command.executable.logout.LogoutCommand;
 
@@ -512,6 +513,20 @@ public class CommandManager {
         changeEmailCommand.addArgument(new CommandArgumentDescription("oldEmail", "Old email address", false));
         changeEmailCommand.addArgument(new CommandArgumentDescription("newEmail", "New email address", false));
 
+        // Register the recover command
+        CommandDescription recoverEmailCommand = new CommandDescription(
+                new RecoverEmailCommand(),
+                new ArrayList<String>() {{
+                    add("recover");
+                    add("recovery");
+                    add("recoveremail");
+                    add("recovermail");
+                }},
+                "Recover using E-mail",
+                "Recover your account using an E-mail address.",
+                emailBaseCommand);
+        recoverEmailCommand.addArgument(new CommandArgumentDescription("email", "Email address", false));
+
         // Register the help command
         CommandDescription emailHelpCommand = new CommandDescription(
                 new HelpCommand(),
diff --git a/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java
new file mode 100644
index 00000000..2680613b
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java
@@ -0,0 +1,95 @@
+package fr.xephi.authme.command.executable.email;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.security.PasswordSecurity;
+import fr.xephi.authme.security.RandomString;
+import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.settings.Settings;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.security.NoSuchAlgorithmException;
+
+public class RecoverEmailCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Messages instance
+        final Messages m = Messages.getInstance();
+
+        // Get the parameter values
+        String playerMail = commandArguments.get(0);
+
+        // Make sure the current command executor is a player
+        if(!(sender instanceof Player)) {
+            return true;
+        }
+
+        // Get the player instance and name
+        final Player player = (Player) sender;
+        final String playerName = player.getName();
+
+        // Command logic
+        if (plugin.mail == null) {
+            m.send(player, "error");
+            return true;
+        }
+        if (plugin.database.isAuthAvailable(playerName)) {
+            if (PlayerCache.getInstance().isAuthenticated(playerName)) {
+                m.send(player, "logged_in");
+                return true;
+            }
+            try {
+                RandomString rand = new RandomString(Settings.getRecoveryPassLength);
+                String thePass = rand.nextString();
+                String hashNew = PasswordSecurity.getHash(Settings.getPasswordHash, thePass, playerName);
+                PlayerAuth auth;
+                if (PlayerCache.getInstance().isAuthenticated(playerName)) {
+                    auth = PlayerCache.getInstance().getAuth(playerName);
+                } else if (plugin.database.isAuthAvailable(playerName)) {
+                    auth = plugin.database.getAuth(playerName);
+                } else {
+                    m.send(player, "unknown_user");
+                    return true;
+                }
+                if (Settings.getmailAccount.equals("") || Settings.getmailAccount.isEmpty()) {
+                    m.send(player, "error");
+                    return true;
+                }
+
+                if (!playerMail.equalsIgnoreCase(auth.getEmail()) || playerMail.equalsIgnoreCase("your@email.com") || auth.getEmail().equalsIgnoreCase("your@email.com")) {
+                    m.send(player, "email_invalid");
+                    return true;
+                }
+                auth.setHash(hashNew);
+                plugin.database.updatePassword(auth);
+                plugin.mail.main(auth, thePass);
+                m.send(player, "email_send");
+            } catch (NoSuchAlgorithmException | NoClassDefFoundError ex) {
+                ConsoleLogger.showError(ex.getMessage());
+                m.send(sender, "error");
+            }
+        } else {
+            m.send(player, "reg_email_msg");
+        }
+
+        return true;
+    }
+}

From bd6a95c3a8e040251e9b20fdbf9e5b2eeb13062d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 21:36:56 +0100
Subject: [PATCH 079/117] Implemented the captcha command, fixed permissions
 for email commands Implemented the captcha command. Fixed missing permission
 configurations for all email commands.

---
 src/main/java/fr/xephi/authme/AuthMe.java     |  2 +-
 .../xephi/authme/command/CommandManager.java  | 33 ++++++++
 .../executable/captcha/CaptchaCommand.java    | 84 +++++++++++++++++++
 3 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 92db8257..c8593371 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -353,7 +353,7 @@ public class AuthMe extends JavaPlugin {
         //getCommand("logout").setExecutor(new LogoutCommand(this));
         //getCommand("unregister").setExecutor(new UnregisterCommand(this));
         //getCommand("email").setExecutor(new EmailCommand(this));
-        getCommand("captcha").setExecutor(new CaptchaCommand(this));
+        //getCommand("captcha").setExecutor(new CaptchaCommand(this));
         getCommand("converter").setExecutor(new ConverterCommand(this));
 
         // Purge on start if enabled
diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index bd1868c8..23d55c52 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -496,6 +496,7 @@ public class CommandManager {
                 "Add E-mail",
                 "Add an new E-Mail address to your account.",
                 emailBaseCommand);
+        addEmailCommand.setCommandPermissions("authme.email.add", CommandPermissions.DefaultPermission.ALLOWED);
         addEmailCommand.addArgument(new CommandArgumentDescription("email", "Email address", false));
         addEmailCommand.addArgument(new CommandArgumentDescription("verifyEmail", "Email address verification", false));
 
@@ -510,6 +511,7 @@ public class CommandManager {
                 "Change E-mail",
                 "Change an E-Mail address of your account.",
                 emailBaseCommand);
+        changeEmailCommand.setCommandPermissions("authme.email.change", CommandPermissions.DefaultPermission.ALLOWED);
         changeEmailCommand.addArgument(new CommandArgumentDescription("oldEmail", "Old email address", false));
         changeEmailCommand.addArgument(new CommandArgumentDescription("newEmail", "New email address", false));
 
@@ -525,6 +527,7 @@ public class CommandManager {
                 "Recover using E-mail",
                 "Recover your account using an E-mail address.",
                 emailBaseCommand);
+        recoverEmailCommand.setCommandPermissions("authme.email.recover", CommandPermissions.DefaultPermission.ALLOWED);
         recoverEmailCommand.addArgument(new CommandArgumentDescription("email", "Email address", false));
 
         // Register the help command
@@ -543,6 +546,35 @@ public class CommandManager {
         emailHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
         emailHelpCommand.setMaximumArguments(false);
 
+        // Register the base captcha command
+        CommandDescription captchaBaseCommand = new CommandDescription(
+                new ChangePasswordCommand(),
+                new ArrayList<String>() {{
+                    add("captcha");
+                    add("capt");
+                }},
+                "Captcha command",
+                "Captcha command for AuthMeReloaded.", null);
+        captchaBaseCommand.setCommandPermissions("authme.captcha", CommandPermissions.DefaultPermission.ALLOWED);
+        captchaBaseCommand.addArgument(new CommandArgumentDescription("captcha", "The captcha", false));
+        captchaBaseCommand.setMaximumArguments(false);
+
+        // Register the help command
+        CommandDescription captchaHelpCommand = new CommandDescription(
+                new HelpCommand(),
+                new ArrayList<String>() {{
+                    add("help");
+                    add("hlp");
+                    add("h");
+                    add("sos");
+                    add("?");
+                }},
+                "View help",
+                "View detailed help pages about AuthMeReloaded change captcha commands.",
+                captchaBaseCommand);
+        captchaHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
+        captchaHelpCommand.setMaximumArguments(false);
+
         // Add the base commands to the commands array
         this.commandDescriptions.add(authMeBaseCommand);
         this.commandDescriptions.add(loginBaseCommand);
@@ -551,6 +583,7 @@ public class CommandManager {
         this.commandDescriptions.add(unregisterBaseCommand);
         this.commandDescriptions.add(changePasswordBaseCommand);
         this.commandDescriptions.add(emailBaseCommand);
+        this.commandDescriptions.add(captchaBaseCommand);
     }
 
     /**
diff --git a/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java b/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java
new file mode 100644
index 00000000..0b156287
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java
@@ -0,0 +1,84 @@
+package fr.xephi.authme.command.executable.captcha;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.security.RandomString;
+import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.settings.Settings;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class CaptchaCommand extends ExecutableCommand {
+
+    /**
+     * RandomString instance, for captcha generation.
+     */
+    public static RandomString randStr = new RandomString(Settings.captchaLength);
+
+    /**
+     * Execute the command.
+     *
+     * @param sender The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Messages instance
+        final Messages m = Messages.getInstance();
+
+        // Get the parameter values
+        String captcha = commandArguments.get(0);
+
+        // Make sure the current command executor is a player
+        if(!(sender instanceof Player)) {
+            return true;
+        }
+
+        // Get the player instance and name
+        final Player player = (Player) sender;
+        final String playerNameLowerCase = player.getName().toLowerCase();
+
+        // Command logic
+        if (PlayerCache.getInstance().isAuthenticated(playerNameLowerCase)) {
+            m.send(player, "logged_in");
+            return true;
+        }
+
+        if (!Settings.useCaptcha) {
+            m.send(player, "usage_log");
+            return true;
+        }
+
+        if (!plugin.cap.containsKey(playerNameLowerCase)) {
+            m.send(player, "usage_log");
+            return true;
+        }
+
+        if (Settings.useCaptcha && !captcha.equals(plugin.cap.get(playerNameLowerCase))) {
+            plugin.cap.remove(playerNameLowerCase);
+            plugin.cap.put(playerNameLowerCase, randStr.nextString());
+            for (String s : m.send("wrong_captcha")) {
+                player.sendMessage(s.replace("THE_CAPTCHA", plugin.cap.get(playerNameLowerCase)));
+            }
+            return true;
+        }
+
+        try {
+            plugin.captcha.remove(playerNameLowerCase);
+            plugin.cap.remove(playerNameLowerCase);
+        } catch (NullPointerException ignored) { }
+
+        // Show a status message
+        m.send(player, "valid_captcha");
+        m.send(player, "login_msg");
+        return true;
+    }
+}

From dc0129d980e56f41e6b236eec4d6ff93406eaeba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 21:44:13 +0100
Subject: [PATCH 080/117] Implemented convert command

---
 src/main/java/fr/xephi/authme/AuthMe.java     |   4 +-
 .../xephi/authme/command/CommandManager.java  |  31 +++++
 .../converter/ConverterCommand.java           | 108 ++++++++++++++++++
 3 files changed, 141 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index c8593371..390ce879 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -344,7 +344,7 @@ public class AuthMe extends JavaPlugin {
         pm.registerEvents(new AuthMeEntityListener(this), this);
         pm.registerEvents(new AuthMeServerListener(this), this);
 
-        // TODO: This is moving to AuthMe.onCommand();
+        // TODO: This is moved to CommandManager.registerCommands() handled by AuthMe.onCommand() -- timvisee
         // Register commands
         //getCommand("authme").setExecutor(new AdminCommand(this));
         //getCommand("register").setExecutor(new RegisterCommand(this));
@@ -354,7 +354,7 @@ public class AuthMe extends JavaPlugin {
         //getCommand("unregister").setExecutor(new UnregisterCommand(this));
         //getCommand("email").setExecutor(new EmailCommand(this));
         //getCommand("captcha").setExecutor(new CaptchaCommand(this));
-        getCommand("converter").setExecutor(new ConverterCommand(this));
+        //getCommand("converter").setExecutor(new ConverterCommand(this));
 
         // Purge on start if enabled
         autoPurge();
diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 23d55c52..df5fc41e 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -575,6 +575,36 @@ public class CommandManager {
         captchaHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
         captchaHelpCommand.setMaximumArguments(false);
 
+        // Register the base converter command
+        CommandDescription converterBaseCommand = new CommandDescription(
+                new ChangePasswordCommand(),
+                new ArrayList<String>() {{
+                    add("convert");
+                    add("converter");
+                    add("conv");
+                }},
+                "Convert command",
+                "Convert command for AuthMeReloaded.", null);
+        converterBaseCommand.setCommandPermissions("authme.converter", CommandPermissions.DefaultPermission.ALLOWED);
+        converterBaseCommand.addArgument(new CommandArgumentDescription("job", "Conversion job: flattosql / flattosqlite /| xauth / crazylogin / rakamak / royalauth / vauth / sqltoflat", false));
+        converterBaseCommand.setMaximumArguments(false);
+
+        // Register the help command
+        CommandDescription converterHelpCommand = new CommandDescription(
+                new HelpCommand(),
+                new ArrayList<String>() {{
+                    add("help");
+                    add("hlp");
+                    add("h");
+                    add("sos");
+                    add("?");
+                }},
+                "View help",
+                "View detailed help pages about AuthMeReloaded change captcha commands.",
+                converterBaseCommand);
+        converterHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
+        converterHelpCommand.setMaximumArguments(false);
+
         // Add the base commands to the commands array
         this.commandDescriptions.add(authMeBaseCommand);
         this.commandDescriptions.add(loginBaseCommand);
@@ -584,6 +614,7 @@ public class CommandManager {
         this.commandDescriptions.add(changePasswordBaseCommand);
         this.commandDescriptions.add(emailBaseCommand);
         this.commandDescriptions.add(captchaBaseCommand);
+        this.commandDescriptions.add(converterBaseCommand);
     }
 
     /**
diff --git a/src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java b/src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java
new file mode 100644
index 00000000..42e599f8
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java
@@ -0,0 +1,108 @@
+package fr.xephi.authme.command.executable.converter;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.converter.*;
+import fr.xephi.authme.settings.Messages;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class ConverterCommand extends ExecutableCommand {
+
+    /**
+     * Execute the command.
+     *
+     * @param sender The command sender.
+     * @param commandReference The command reference.
+     * @param commandArguments The command arguments.
+     *
+     * @return True if the command was executed successfully, false otherwise.
+     */
+    @Override
+    public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Messages instance
+        final Messages m = Messages.getInstance();
+
+        // Get the conversion job
+        String job = commandArguments.get(0);
+
+        // Determine the job type
+        ConvertType jobType = ConvertType.fromName(job);
+        if (jobType == null) {
+            m.send(sender, "error");
+            return true;
+        }
+
+        // Get the proper converter instance
+        Converter converter = null;
+        switch (jobType) {
+        case ftsql:
+            converter = new FlatToSql();
+            break;
+        case ftsqlite:
+            converter = new FlatToSqlite(sender);
+            break;
+        case xauth:
+            converter = new xAuthConverter(plugin, sender);
+            break;
+        case crazylogin:
+            converter = new CrazyLoginConverter(plugin, sender);
+            break;
+        case rakamak:
+            converter = new RakamakConverter(plugin, sender);
+            break;
+        case royalauth:
+            converter = new RoyalAuthConverter(plugin);
+            break;
+        case vauth:
+            converter = new vAuthConverter(plugin, sender);
+            break;
+        case sqltoflat:
+            converter = new SqlToFlat(plugin, sender);
+            break;
+        default:
+            break;
+        }
+
+        // Run the convert job
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, converter);
+
+        // Show a status message
+        sender.sendMessage("[AuthMe] Successfully converted from " + jobType.getName());
+        return true;
+    }
+
+    public enum ConvertType {
+        ftsql("flattosql"),
+        ftsqlite("flattosqlite"),
+        xauth("xauth"),
+        crazylogin("crazylogin"),
+        rakamak("rakamak"),
+        royalauth("royalauth"),
+        vauth("vauth"),
+        sqltoflat("sqltoflat");
+
+        String name;
+
+        ConvertType(String name) {
+            this.name = name;
+        }
+
+        String getName() {
+            return this.name;
+        }
+
+        public static ConvertType fromName(String name) {
+            for (ConvertType type : ConvertType.values()) {
+                if (type.getName().equalsIgnoreCase(name))
+                    return type;
+            }
+            return null;
+        }
+    }
+}

From ffd6d8e52509420d93cd6233285e8dbe1ac2b8e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 21:46:13 +0100
Subject: [PATCH 081/117] Fixed invalid command references

---
 src/main/java/fr/xephi/authme/command/CommandManager.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index df5fc41e..ea84e4f0 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -2,7 +2,9 @@ package fr.xephi.authme.command;
 
 import fr.xephi.authme.command.executable.*;
 import fr.xephi.authme.command.executable.authme.*;
+import fr.xephi.authme.command.executable.captcha.CaptchaCommand;
 import fr.xephi.authme.command.executable.changepassword.ChangePasswordCommand;
+import fr.xephi.authme.command.executable.converter.ConverterCommand;
 import fr.xephi.authme.command.executable.email.AddEmailCommand;
 import fr.xephi.authme.command.executable.email.ChangeEmailCommand;
 import fr.xephi.authme.command.executable.email.RecoverEmailCommand;
@@ -418,7 +420,7 @@ public class CommandManager {
 
         // Register the base unregister command
         CommandDescription unregisterBaseCommand = new CommandDescription(
-                new RegisterCommand(),
+                new UnregisterCommand(),
                 new ArrayList<String>() {{
                     add("unregister");
                     add("unreg");
@@ -548,7 +550,7 @@ public class CommandManager {
 
         // Register the base captcha command
         CommandDescription captchaBaseCommand = new CommandDescription(
-                new ChangePasswordCommand(),
+                new CaptchaCommand(),
                 new ArrayList<String>() {{
                     add("captcha");
                     add("capt");
@@ -577,7 +579,7 @@ public class CommandManager {
 
         // Register the base converter command
         CommandDescription converterBaseCommand = new CommandDescription(
-                new ChangePasswordCommand(),
+                new ConverterCommand(),
                 new ArrayList<String>() {{
                     add("convert");
                     add("converter");

From 40fc2c893d55265822281ccb88255114738465c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 21:49:47 +0100
Subject: [PATCH 082/117] Fixed captcha command dependency initializing too
 early

---
 .../authme/command/executable/captcha/CaptchaCommand.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java b/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java
index 0b156287..0b2d6371 100644
--- a/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java
@@ -12,11 +12,6 @@ import org.bukkit.entity.Player;
 
 public class CaptchaCommand extends ExecutableCommand {
 
-    /**
-     * RandomString instance, for captcha generation.
-     */
-    public static RandomString randStr = new RandomString(Settings.captchaLength);
-
     /**
      * Execute the command.
      *
@@ -34,6 +29,9 @@ public class CaptchaCommand extends ExecutableCommand {
         // Messages instance
         final Messages m = Messages.getInstance();
 
+        // Random string instance, for captcha generation (I think) -- timvisee
+        RandomString randStr = new RandomString(Settings.captchaLength);
+
         // Get the parameter values
         String captcha = commandArguments.get(0);
 

From 39c35fd342c799325e39529c54a044fc21fecfa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 22:06:50 +0100
Subject: [PATCH 083/117] Fixed invalid command references

---
 .../fr/xephi/authme/command/CommandManager.java  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index ea84e4f0..3ce26e96 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -2,8 +2,11 @@ package fr.xephi.authme.command;
 
 import fr.xephi.authme.command.executable.*;
 import fr.xephi.authme.command.executable.authme.*;
+import fr.xephi.authme.command.executable.authme.ChangePasswordCommand;
+import fr.xephi.authme.command.executable.authme.RegisterCommand;
+import fr.xephi.authme.command.executable.authme.UnregisterCommand;
 import fr.xephi.authme.command.executable.captcha.CaptchaCommand;
-import fr.xephi.authme.command.executable.changepassword.ChangePasswordCommand;
+import fr.xephi.authme.command.executable.changepassword.*;
 import fr.xephi.authme.command.executable.converter.ConverterCommand;
 import fr.xephi.authme.command.executable.email.AddEmailCommand;
 import fr.xephi.authme.command.executable.email.ChangeEmailCommand;
@@ -105,7 +108,7 @@ public class CommandManager {
 
         // Register the changepassword command
         CommandDescription changePasswordCommand = new CommandDescription(
-                new RegisterCommand(),
+                new ChangePasswordCommand(),
                 new ArrayList<String>() {{
                     add("password");
                     add("changepassword");
@@ -390,7 +393,7 @@ public class CommandManager {
 
         // Register the base register command
         CommandDescription registerBaseCommand = new CommandDescription(
-                new RegisterCommand(),
+                new fr.xephi.authme.command.executable.register.RegisterCommand(),
                 new ArrayList<String>() {{
                     add("register");
                     add("reg");
@@ -420,7 +423,7 @@ public class CommandManager {
 
         // Register the base unregister command
         CommandDescription unregisterBaseCommand = new CommandDescription(
-                new UnregisterCommand(),
+                new fr.xephi.authme.command.executable.unregister.UnregisterCommand(),
                 new ArrayList<String>() {{
                     add("unregister");
                     add("unreg");
@@ -429,7 +432,6 @@ public class CommandManager {
                 "Command to unregister using AuthMeReloaded.", null);
         unregisterBaseCommand.setCommandPermissions("authme.unregister", CommandPermissions.DefaultPermission.ALLOWED);
         unregisterBaseCommand.addArgument(new CommandArgumentDescription("password", "Password", false));
-        unregisterBaseCommand.setMaximumArguments(false);
 
         // Register the help command
         CommandDescription unregisterHelpCommand = new CommandDescription(
@@ -449,7 +451,7 @@ public class CommandManager {
 
         // Register the base changepassword command
         CommandDescription changePasswordBaseCommand = new CommandDescription(
-                new ChangePasswordCommand(),
+                new fr.xephi.authme.command.executable.changepassword.ChangePasswordCommand(),
                 new ArrayList<String>() {{
                     add("changepassword");
                     add("changepass");
@@ -581,8 +583,8 @@ public class CommandManager {
         CommandDescription converterBaseCommand = new CommandDescription(
                 new ConverterCommand(),
                 new ArrayList<String>() {{
-                    add("convert");
                     add("converter");
+                    add("convert");
                     add("conv");
                 }},
                 "Convert command",

From a187bd61caa2ef7ab3bca18b94ea2e34aec9e02b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 22:06:59 +0100
Subject: [PATCH 084/117] Removed unused import

---
 src/main/java/fr/xephi/authme/command/CommandManager.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 3ce26e96..4ce4a02e 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -6,7 +6,6 @@ import fr.xephi.authme.command.executable.authme.ChangePasswordCommand;
 import fr.xephi.authme.command.executable.authme.RegisterCommand;
 import fr.xephi.authme.command.executable.authme.UnregisterCommand;
 import fr.xephi.authme.command.executable.captcha.CaptchaCommand;
-import fr.xephi.authme.command.executable.changepassword.*;
 import fr.xephi.authme.command.executable.converter.ConverterCommand;
 import fr.xephi.authme.command.executable.email.AddEmailCommand;
 import fr.xephi.authme.command.executable.email.ChangeEmailCommand;

From efeef0e1e9dbece1c21f0546f20370d1678923e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 22:12:09 +0100
Subject: [PATCH 085/117] Fixed default permissions

---
 src/main/java/fr/xephi/authme/command/CommandManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 4ce4a02e..a7426f4c 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -588,7 +588,7 @@ public class CommandManager {
                 }},
                 "Convert command",
                 "Convert command for AuthMeReloaded.", null);
-        converterBaseCommand.setCommandPermissions("authme.converter", CommandPermissions.DefaultPermission.ALLOWED);
+        converterBaseCommand.setCommandPermissions("authme.converter", CommandPermissions.DefaultPermission.OP_ONLY);
         converterBaseCommand.addArgument(new CommandArgumentDescription("job", "Conversion job: flattosql / flattosqlite /| xauth / crazylogin / rakamak / royalauth / vauth / sqltoflat", false));
         converterBaseCommand.setMaximumArguments(false);
 

From 386b80babc76361f40ea5ae5210f2efbae4ecd8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 22:14:10 +0100
Subject: [PATCH 086/117] Moved a command configuration

---
 .../xephi/authme/command/CommandManager.java  | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index a7426f4c..8f60a4c0 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -488,6 +488,22 @@ public class CommandManager {
                 "E-mail command",
                 "The AuthMe Reloaded E-mail command. The root for all E-mail commands.", null);
 
+        // Register the help command
+        CommandDescription emailHelpCommand = new CommandDescription(
+                new HelpCommand(),
+                new ArrayList<String>() {{
+                    add("help");
+                    add("hlp");
+                    add("h");
+                    add("sos");
+                    add("?");
+                }},
+                "View help",
+                "View detailed help pages about AuthMeReloaded help commands.",
+                emailBaseCommand);
+        emailHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
+        emailHelpCommand.setMaximumArguments(false);
+
         // Register the add command
         CommandDescription addEmailCommand = new CommandDescription(
                 new AddEmailCommand(),
@@ -533,22 +549,6 @@ public class CommandManager {
         recoverEmailCommand.setCommandPermissions("authme.email.recover", CommandPermissions.DefaultPermission.ALLOWED);
         recoverEmailCommand.addArgument(new CommandArgumentDescription("email", "Email address", false));
 
-        // Register the help command
-        CommandDescription emailHelpCommand = new CommandDescription(
-                new HelpCommand(),
-                new ArrayList<String>() {{
-                    add("help");
-                    add("hlp");
-                    add("h");
-                    add("sos");
-                    add("?");
-                }},
-                "View help",
-                "View detailed help pages about AuthMeReloaded help commands.",
-                emailBaseCommand);
-        emailHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
-        emailHelpCommand.setMaximumArguments(false);
-
         // Register the base captcha command
         CommandDescription captchaBaseCommand = new CommandDescription(
                 new CaptchaCommand(),

From 5a6f6751a7e97f6521979b8fa7b1f2069a35bf9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 22:27:31 +0100
Subject: [PATCH 087/117] Changed r command to register

---
 src/main/java/fr/xephi/authme/command/CommandManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 8f60a4c0..ed139ed5 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -69,6 +69,7 @@ public class CommandManager {
                 new ArrayList<String>() {{
                     add("register");
                     add("reg");
+                    add("r");
                 }},
                 "Register a player",
                 "Register the specified player with the specified password.",
@@ -83,6 +84,7 @@ public class CommandManager {
                 new ArrayList<String>() {{
                     add("unregister");
                     add("unreg");
+                    add("unr");
                     add("delete");
                     add("del");
                 }},
@@ -315,7 +317,6 @@ public class CommandManager {
                 new ArrayList<String>() {{
                     add("reload");
                     add("rld");
-                    add("r");
                 }},
                 "Reload plugin",
                 "Reload the AuthMeReloaded plugin.",

From aae78fe9ef008c294e6093c4a71f2684eb89603e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 22:37:48 +0100
Subject: [PATCH 088/117] Fixed grammar

---
 src/main/java/fr/xephi/authme/SendMailSSL.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/SendMailSSL.java b/src/main/java/fr/xephi/authme/SendMailSSL.java
index baac1955..5bf44b52 100644
--- a/src/main/java/fr/xephi/authme/SendMailSSL.java
+++ b/src/main/java/fr/xephi/authme/SendMailSSL.java
@@ -113,9 +113,9 @@ public class SendMailSSL {
                         file.delete();
 
                 } catch (RuntimeException e) {
-                    ConsoleLogger.showError("Some error occured while trying to send a email to " + mail);
+                    ConsoleLogger.showError("Some error occurred while trying to send a email to " + mail);
                 } catch (Exception e) {
-                    ConsoleLogger.showError("Some error occured while trying to send a email to " + mail);
+                    ConsoleLogger.showError("Some error occurred while trying to send a email to " + mail);
                 }
             }
 

From 6089d481a99929c6298964ae942aee482f028e18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 22:38:07 +0100
Subject: [PATCH 089/117] Collapsed catch block

---
 src/main/java/fr/xephi/authme/SendMailSSL.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/SendMailSSL.java b/src/main/java/fr/xephi/authme/SendMailSSL.java
index 5bf44b52..6c1eb23a 100644
--- a/src/main/java/fr/xephi/authme/SendMailSSL.java
+++ b/src/main/java/fr/xephi/authme/SendMailSSL.java
@@ -112,9 +112,7 @@ public class SendMailSSL {
                     if (file != null)
                         file.delete();
 
-                } catch (RuntimeException e) {
-                    ConsoleLogger.showError("Some error occurred while trying to send a email to " + mail);
-                } catch (Exception e) {
+                } catch(Exception e) {
                     ConsoleLogger.showError("Some error occurred while trying to send a email to " + mail);
                 }
             }

From 67a40a6fd0c5858498b1fa26fde0d84c8d7b0833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 22:38:27 +0100
Subject: [PATCH 090/117] Print a stack trace on STMP error

---
 src/main/java/fr/xephi/authme/SendMailSSL.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/fr/xephi/authme/SendMailSSL.java b/src/main/java/fr/xephi/authme/SendMailSSL.java
index 6c1eb23a..2239f0db 100644
--- a/src/main/java/fr/xephi/authme/SendMailSSL.java
+++ b/src/main/java/fr/xephi/authme/SendMailSSL.java
@@ -113,6 +113,8 @@ public class SendMailSSL {
                         file.delete();
 
                 } catch(Exception e) {
+                    // Print the stack trace
+                    e.printStackTrace();
                     ConsoleLogger.showError("Some error occurred while trying to send a email to " + mail);
                 }
             }

From d69651026d388b61513bd794761eece2b41fad7b Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Sun, 1 Nov 2015 22:41:26 +0100
Subject: [PATCH 091/117] Fix head rotation

---
 .../xephi/authme/listener/AuthMePlayerListener.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index 4504a11d..70ee50b0 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -139,12 +139,14 @@ public class AuthMePlayerListener implements Listener {
             return;
 
         if (!Settings.isMovementAllowed) {
-            if (Settings.isRemoveSpeedEnabled) {
-                player.setWalkSpeed(0.0f);
-                player.setFlySpeed(0.0f);
+            if (event.getFrom().distance(event.getTo()) > 0) {
+                if (Settings.isRemoveSpeedEnabled) {
+                    player.setWalkSpeed(0.0f);
+                    player.setFlySpeed(0.0f);
+                }
+                event.setTo(event.getFrom());
+                return;
             }
-            event.setTo(event.getFrom());
-            return;
         }
 
         if (Settings.getMovementRadius <= 0) {

From d401ad1dabe80344c140806b29ead42d5f1bd51b Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Sun, 1 Nov 2015 22:43:48 +0100
Subject: [PATCH 092/117] I'm so stupid

---
 src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index 70ee50b0..1ef4c3d6 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -77,6 +77,7 @@ public class AuthMePlayerListener implements Listener {
                     return;
                 }
             }
+            event.setCancelled(true);
 
             if (plugin.database.isAuthAvailable(player.getName().toLowerCase())) {
                 m.send(player, "login_msg");

From 1f888abc12dd79309551ad09ff13a588f10fc129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 22:54:37 +0100
Subject: [PATCH 093/117] Updated javax mail implementation

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 47b6bb2a..16fda3ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,9 +206,9 @@
 
 		<!-- Java Email Implementation -->
 		<dependency>
-			<groupId>com.sun.mail</groupId>
-			<artifactId>javax.mail</artifactId>
-			<version>1.5.4</version>
+			<groupId>javax.mail</groupId>
+			<artifactId>javax.mail-api</artifactId>
+			<version>1.5.1</version>
 			<scope>compile</scope>
 			<exclusions>
 				<exclusion>

From 0fbeefc4888fd09a81eeaca2299f14e764c241b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 23:16:09 +0100
Subject: [PATCH 094/117] Reverted javax mail implementation

---
 pom.xml                                                     | 6 +++---
 .../command/executable/email/RecoverEmailCommand.java       | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 16fda3ff..47b6bb2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,9 +206,9 @@
 
 		<!-- Java Email Implementation -->
 		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>javax.mail-api</artifactId>
-			<version>1.5.1</version>
+			<groupId>com.sun.mail</groupId>
+			<artifactId>javax.mail</artifactId>
+			<version>1.5.4</version>
 			<scope>compile</scope>
 			<exclusions>
 				<exclusion>
diff --git a/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java
index 2680613b..13628f90 100644
--- a/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java
@@ -83,6 +83,7 @@ public class RecoverEmailCommand extends ExecutableCommand {
                 plugin.mail.main(auth, thePass);
                 m.send(player, "email_send");
             } catch (NoSuchAlgorithmException | NoClassDefFoundError ex) {
+                ex.printStackTrace();
                 ConsoleLogger.showError(ex.getMessage());
                 m.send(sender, "error");
             }

From 3643afdea3ded4b1809406e3903f4456e86dabf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 23:29:47 +0100
Subject: [PATCH 095/117] Moved Utils class to util package

---
 src/main/java/fr/xephi/authme/AuthMe.java              | 10 +---------
 src/main/java/fr/xephi/authme/DataManager.java         |  1 +
 src/main/java/fr/xephi/authme/api/API.java             |  2 +-
 src/main/java/fr/xephi/authme/api/NewAPI.java          |  2 +-
 .../java/fr/xephi/authme/cache/backup/JsonCache.java   |  2 +-
 .../command/executable/authme/UnregisterCommand.java   |  2 +-
 .../java/fr/xephi/authme/commands/AdminCommand.java    |  4 ++--
 .../fr/xephi/authme/datasource/CacheDataSource.java    |  2 +-
 .../fr/xephi/authme/listener/AuthMeBlockListener.java  |  2 +-
 .../fr/xephi/authme/listener/AuthMeEntityListener.java |  2 +-
 .../fr/xephi/authme/listener/AuthMePlayerListener.java |  2 +-
 .../xephi/authme/listener/AuthMePlayerListener16.java  |  2 +-
 .../xephi/authme/listener/AuthMePlayerListener18.java  |  2 +-
 .../fr/xephi/authme/listener/AuthMeServerListener.java |  2 +-
 .../fr/xephi/authme/process/join/AsyncronousJoin.java  |  4 ++--
 .../xephi/authme/process/login/AsyncronousLogin.java   |  2 +-
 .../process/login/ProcessSyncronousPlayerLogin.java    |  4 ++--
 .../xephi/authme/process/logout/AsyncronousLogout.java |  4 ++--
 .../fr/xephi/authme/process/quit/AsyncronousQuit.java  |  2 +-
 .../register/ProcessSyncronousEmailRegister.java       |  2 +-
 .../register/ProcessSyncronousPasswordRegister.java    |  2 +-
 .../process/unregister/AsyncronousUnregister.java      |  4 ++--
 src/main/java/fr/xephi/authme/task/MessageTask.java    |  2 +-
 src/main/java/fr/xephi/authme/{ => util}/Utils.java    |  4 +++-
 24 files changed, 31 insertions(+), 36 deletions(-)
 rename src/main/java/fr/xephi/authme/{ => util}/Utils.java (99%)

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 390ce879..ce737377 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -12,6 +12,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import fr.xephi.authme.command.CommandHandler;
+import fr.xephi.authme.util.Utils;
 import org.apache.logging.log4j.LogManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -37,15 +38,6 @@ import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.backup.JsonCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
 import fr.xephi.authme.cache.limbo.LimboPlayer;
-import fr.xephi.authme.commands.AdminCommand;
-import fr.xephi.authme.commands.CaptchaCommand;
-import fr.xephi.authme.commands.ChangePasswordCommand;
-import fr.xephi.authme.commands.ConverterCommand;
-import fr.xephi.authme.commands.EmailCommand;
-import fr.xephi.authme.commands.LoginCommand;
-import fr.xephi.authme.commands.LogoutCommand;
-import fr.xephi.authme.commands.RegisterCommand;
-import fr.xephi.authme.commands.UnregisterCommand;
 import fr.xephi.authme.converter.Converter;
 import fr.xephi.authme.converter.ForceFlatToSqlite;
 import fr.xephi.authme.datasource.CacheDataSource;
diff --git a/src/main/java/fr/xephi/authme/DataManager.java b/src/main/java/fr/xephi/authme/DataManager.java
index 2d08489d..2f1459cc 100644
--- a/src/main/java/fr/xephi/authme/DataManager.java
+++ b/src/main/java/fr/xephi/authme/DataManager.java
@@ -7,6 +7,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
+import fr.xephi.authme.util.Utils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/fr/xephi/authme/api/API.java b/src/main/java/fr/xephi/authme/api/API.java
index 79eaeaff..eeb6a9cf 100644
--- a/src/main/java/fr/xephi/authme/api/API.java
+++ b/src/main/java/fr/xephi/authme/api/API.java
@@ -9,7 +9,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.Utils;
+import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.security.PasswordSecurity;
diff --git a/src/main/java/fr/xephi/authme/api/NewAPI.java b/src/main/java/fr/xephi/authme/api/NewAPI.java
index e1426f6f..b965abaf 100644
--- a/src/main/java/fr/xephi/authme/api/NewAPI.java
+++ b/src/main/java/fr/xephi/authme/api/NewAPI.java
@@ -9,7 +9,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.Utils;
+import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.security.PasswordSecurity;
diff --git a/src/main/java/fr/xephi/authme/cache/backup/JsonCache.java b/src/main/java/fr/xephi/authme/cache/backup/JsonCache.java
index 837bf45a..d2b3ae24 100644
--- a/src/main/java/fr/xephi/authme/cache/backup/JsonCache.java
+++ b/src/main/java/fr/xephi/authme/cache/backup/JsonCache.java
@@ -19,7 +19,7 @@ import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.Utils;
+import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.settings.Settings;
 
 public class JsonCache {
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
index e04b8889..c2893eba 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
@@ -2,7 +2,7 @@ package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.Utils;
+import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
 import fr.xephi.authme.command.CommandParts;
diff --git a/src/main/java/fr/xephi/authme/commands/AdminCommand.java b/src/main/java/fr/xephi/authme/commands/AdminCommand.java
index a5c77430..c868ea98 100644
--- a/src/main/java/fr/xephi/authme/commands/AdminCommand.java
+++ b/src/main/java/fr/xephi/authme/commands/AdminCommand.java
@@ -20,8 +20,8 @@ import org.bukkit.scheduler.BukkitTask;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.Utils;
-import fr.xephi.authme.Utils.GroupType;
+import fr.xephi.authme.util.Utils;
+import fr.xephi.authme.util.Utils.GroupType;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
diff --git a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
index 12d52c2e..e9f0638d 100644
--- a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
+++ b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
@@ -10,7 +10,7 @@ import java.util.concurrent.Executors;
 import org.bukkit.entity.Player;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.Utils;
+import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMeBlockListener.java b/src/main/java/fr/xephi/authme/listener/AuthMeBlockListener.java
index 3708b702..c8bb7b0b 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMeBlockListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMeBlockListener.java
@@ -7,7 +7,7 @@ import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.Utils;
+import fr.xephi.authme.util.Utils;
 
 public class AuthMeBlockListener implements Listener {
 
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java b/src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java
index 51b953fc..1a26a084 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java
@@ -20,7 +20,7 @@ import org.bukkit.event.entity.ProjectileLaunchEvent;
 import org.bukkit.projectiles.ProjectileSource;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.Utils;
+import fr.xephi.authme.util.Utils;
 
 public class AuthMeEntityListener implements Listener {
 
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index 4504a11d..9d12310f 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -42,7 +42,7 @@ import com.google.common.io.ByteStreams;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.Utils;
+import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener16.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener16.java
index d535e351..86560a3b 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener16.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener16.java
@@ -7,7 +7,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerEditBookEvent;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.Utils;
+import fr.xephi.authme.util.Utils;
 
 public class AuthMePlayerListener16 implements Listener {
 
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener18.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener18.java
index 0ca2fb78..27a00e71 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener18.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener18.java
@@ -7,7 +7,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerInteractAtEntityEvent;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.Utils;
+import fr.xephi.authme.util.Utils;
 
 public class AuthMePlayerListener18 implements Listener {
 
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java
index bde28732..92d67ab2 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java
@@ -9,7 +9,7 @@ import org.bukkit.event.server.ServerListPingEvent;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.Utils;
+import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 
diff --git a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
index b52833e4..0feb468a 100644
--- a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
+++ b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
@@ -13,8 +13,8 @@ import org.bukkit.scheduler.BukkitTask;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.Utils;
-import fr.xephi.authme.Utils.GroupType;
+import fr.xephi.authme.util.Utils;
+import fr.xephi.authme.util.Utils.GroupType;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
diff --git a/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java b/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java
index a3b43791..e35b1708 100644
--- a/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java
+++ b/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java
@@ -9,7 +9,7 @@ import org.bukkit.scheduler.BukkitTask;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.Utils;
+import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
diff --git a/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java b/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java
index 00322f68..daeb6112 100644
--- a/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java
+++ b/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java
@@ -8,8 +8,8 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.potion.PotionEffectType;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.Utils;
-import fr.xephi.authme.Utils.GroupType;
+import fr.xephi.authme.util.Utils;
+import fr.xephi.authme.util.Utils.GroupType;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.backup.JsonCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
diff --git a/src/main/java/fr/xephi/authme/process/logout/AsyncronousLogout.java b/src/main/java/fr/xephi/authme/process/logout/AsyncronousLogout.java
index 0d4e4002..dca7d2ca 100644
--- a/src/main/java/fr/xephi/authme/process/logout/AsyncronousLogout.java
+++ b/src/main/java/fr/xephi/authme/process/logout/AsyncronousLogout.java
@@ -5,8 +5,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitScheduler;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.Utils;
-import fr.xephi.authme.Utils.GroupType;
+import fr.xephi.authme.util.Utils;
+import fr.xephi.authme.util.Utils.GroupType;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
diff --git a/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java b/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java
index 26917e63..0591666f 100644
--- a/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java
+++ b/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java
@@ -6,7 +6,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitTask;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.Utils;
+import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java
index 280daa29..652038c8 100644
--- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java
@@ -6,7 +6,7 @@ import org.bukkit.scheduler.BukkitTask;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.Utils;
+import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.limbo.LimboCache;
 import fr.xephi.authme.cache.limbo.LimboPlayer;
 import fr.xephi.authme.settings.Messages;
diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java
index 02ffe2a1..25ebcdc2 100644
--- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java
@@ -10,7 +10,7 @@ import org.bukkit.scheduler.BukkitTask;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.Utils;
+import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.limbo.LimboCache;
 import fr.xephi.authme.cache.limbo.LimboPlayer;
 import fr.xephi.authme.events.AuthMeTeleportEvent;
diff --git a/src/main/java/fr/xephi/authme/process/unregister/AsyncronousUnregister.java b/src/main/java/fr/xephi/authme/process/unregister/AsyncronousUnregister.java
index 1822eac8..31547939 100644
--- a/src/main/java/fr/xephi/authme/process/unregister/AsyncronousUnregister.java
+++ b/src/main/java/fr/xephi/authme/process/unregister/AsyncronousUnregister.java
@@ -11,8 +11,8 @@ import org.bukkit.scheduler.BukkitTask;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.Utils;
-import fr.xephi.authme.Utils.GroupType;
+import fr.xephi.authme.util.Utils;
+import fr.xephi.authme.util.Utils.GroupType;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.backup.JsonCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
diff --git a/src/main/java/fr/xephi/authme/task/MessageTask.java b/src/main/java/fr/xephi/authme/task/MessageTask.java
index bbef229f..53c1510a 100644
--- a/src/main/java/fr/xephi/authme/task/MessageTask.java
+++ b/src/main/java/fr/xephi/authme/task/MessageTask.java
@@ -4,7 +4,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitTask;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.Utils;
+import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
 
diff --git a/src/main/java/fr/xephi/authme/Utils.java b/src/main/java/fr/xephi/authme/util/Utils.java
similarity index 99%
rename from src/main/java/fr/xephi/authme/Utils.java
rename to src/main/java/fr/xephi/authme/util/Utils.java
index 75d8ca61..a833d907 100644
--- a/src/main/java/fr/xephi/authme/Utils.java
+++ b/src/main/java/fr/xephi/authme/util/Utils.java
@@ -1,4 +1,4 @@
-package fr.xephi.authme;
+package fr.xephi.authme.util;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -12,6 +12,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.zip.GZIPInputStream;
 
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;

From 175da3f6fcc4ef10be196882bb0337190304ee0d Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Sun, 1 Nov 2015 23:35:10 +0100
Subject: [PATCH 096/117] Cleanup!

---
 pom.xml                                       | 13 +++++-----
 src/main/java/fr/xephi/authme/AuthMe.java     | 11 +-------
 .../authme/command/CommandDescription.java    |  7 ++---
 .../xephi/authme/command/CommandHandler.java  | 11 ++++----
 .../xephi/authme/command/CommandManager.java  | 26 +++++++++++++++----
 .../fr/xephi/authme/command/CommandParts.java |  6 ++---
 .../authme/command/CommandPermissions.java    | 11 ++++----
 .../command/executable/HelpCommand.java       |  3 ++-
 .../executable/authme/AccountsCommand.java    |  9 ++++---
 .../executable/authme/AuthMeCommand.java      |  5 ++--
 .../authme/ChangePasswordCommand.java         |  9 ++++---
 .../executable/authme/FirstSpawnCommand.java  |  5 ++--
 .../executable/authme/ForceLoginCommand.java  |  7 ++---
 .../executable/authme/GetEmailCommand.java    |  3 ++-
 .../executable/authme/GetIpCommand.java       |  7 ++---
 .../executable/authme/LastLoginCommand.java   |  7 ++---
 .../authme/PurgeBannedPlayersCommand.java     | 11 ++++----
 .../executable/authme/PurgeCommand.java       | 11 ++++----
 .../authme/PurgeLastPositionCommand.java      |  5 ++--
 .../executable/authme/RegisterCommand.java    |  9 ++++---
 .../executable/authme/ReloadCommand.java      |  6 ++---
 .../executable/authme/ResetNameCommand.java   |  9 ++++---
 .../executable/authme/SetEmailCommand.java    |  3 ++-
 .../authme/SetFirstSpawnCommand.java          |  5 ++--
 .../executable/authme/SetSpawnCommand.java    |  5 ++--
 .../executable/authme/SpawnCommand.java       |  5 ++--
 .../authme/SwitchAntiBotCommand.java          |  5 ++--
 .../executable/authme/UnregisterCommand.java  | 17 ++++++------
 .../executable/authme/VersionCommand.java     |  7 ++---
 .../executable/captcha/CaptchaCommand.java    |  5 ++--
 .../changepassword/ChangePasswordCommand.java |  5 ++--
 .../converter/ConverterCommand.java           | 16 +++++++++---
 .../executable/email/AddEmailCommand.java     |  5 ++--
 .../executable/email/ChangeEmailCommand.java  |  9 ++++---
 .../executable/email/RecoverEmailCommand.java |  9 ++++---
 .../executable/login/LoginCommand.java        |  5 ++--
 .../executable/logout/LogoutCommand.java      |  5 ++--
 .../executable/register/RegisterCommand.java  |  5 ++--
 .../unregister/UnregisterCommand.java         |  5 ++--
 .../authme/command/help/HelpPrinter.java      | 17 ++++++------
 .../authme/command/help/HelpProvider.java     |  7 +++--
 .../authme/command/help/HelpSyntaxHelper.java |  3 ++-
 42 files changed, 194 insertions(+), 140 deletions(-)

diff --git a/pom.xml b/pom.xml
index 47b6bb2a..ecb05302 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,12 +210,13 @@
 			<artifactId>javax.mail</artifactId>
 			<version>1.5.4</version>
 			<scope>compile</scope>
-			<exclusions>
-				<exclusion>
-					<artifactId>activation</artifactId>
-					<groupId>javax.activation</groupId>
-				</exclusion>
-			</exclusions>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.mail</groupId>
+			<artifactId>javax.mail-api</artifactId>
+			<version>1.5.4</version>
+			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>
 
diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 1bceb5a5..5bdf0f4e 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -11,7 +11,6 @@ import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
-import fr.xephi.authme.command.CommandHandler;
 import org.apache.logging.log4j.LogManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -37,15 +36,7 @@ import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.backup.JsonCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
 import fr.xephi.authme.cache.limbo.LimboPlayer;
-import fr.xephi.authme.commands.AdminCommand;
-import fr.xephi.authme.commands.CaptchaCommand;
-import fr.xephi.authme.commands.ChangePasswordCommand;
-import fr.xephi.authme.commands.ConverterCommand;
-import fr.xephi.authme.commands.EmailCommand;
-import fr.xephi.authme.commands.LoginCommand;
-import fr.xephi.authme.commands.LogoutCommand;
-import fr.xephi.authme.commands.RegisterCommand;
-import fr.xephi.authme.commands.UnregisterCommand;
+import fr.xephi.authme.command.CommandHandler;
 import fr.xephi.authme.converter.Converter;
 import fr.xephi.authme.converter.ForceFlatToSqlite;
 import fr.xephi.authme.datasource.CacheDataSource;
diff --git a/src/main/java/fr/xephi/authme/command/CommandDescription.java b/src/main/java/fr/xephi/authme/command/CommandDescription.java
index 018ac79b..be635d42 100644
--- a/src/main/java/fr/xephi/authme/command/CommandDescription.java
+++ b/src/main/java/fr/xephi/authme/command/CommandDescription.java
@@ -1,13 +1,14 @@
 package fr.xephi.authme.command;
 
-import fr.xephi.authme.util.StringUtils;
-import org.bukkit.command.CommandSender;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import org.bukkit.command.CommandSender;
+
+import fr.xephi.authme.util.StringUtils;
+
 @SuppressWarnings("UnusedDeclaration")
 public class CommandDescription {
 
diff --git a/src/main/java/fr/xephi/authme/command/CommandHandler.java b/src/main/java/fr/xephi/authme/command/CommandHandler.java
index 1eb46ca0..f11ced44 100644
--- a/src/main/java/fr/xephi/authme/command/CommandHandler.java
+++ b/src/main/java/fr/xephi/authme/command/CommandHandler.java
@@ -1,14 +1,15 @@
 package fr.xephi.authme.command;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.command.help.HelpProvider;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.help.HelpProvider;
+
 public class CommandHandler {
 
     /** The command manager instance. */
diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index ed139ed5..09aa84cf 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -1,10 +1,29 @@
 package fr.xephi.authme.command;
 
-import fr.xephi.authme.command.executable.*;
-import fr.xephi.authme.command.executable.authme.*;
+import java.util.ArrayList;
+import java.util.List;
+
+import fr.xephi.authme.command.executable.HelpCommand;
+import fr.xephi.authme.command.executable.authme.AccountsCommand;
+import fr.xephi.authme.command.executable.authme.AuthMeCommand;
 import fr.xephi.authme.command.executable.authme.ChangePasswordCommand;
+import fr.xephi.authme.command.executable.authme.FirstSpawnCommand;
+import fr.xephi.authme.command.executable.authme.ForceLoginCommand;
+import fr.xephi.authme.command.executable.authme.GetEmailCommand;
+import fr.xephi.authme.command.executable.authme.GetIpCommand;
+import fr.xephi.authme.command.executable.authme.LastLoginCommand;
+import fr.xephi.authme.command.executable.authme.PurgeBannedPlayersCommand;
+import fr.xephi.authme.command.executable.authme.PurgeCommand;
+import fr.xephi.authme.command.executable.authme.PurgeLastPositionCommand;
 import fr.xephi.authme.command.executable.authme.RegisterCommand;
+import fr.xephi.authme.command.executable.authme.ReloadCommand;
+import fr.xephi.authme.command.executable.authme.SetEmailCommand;
+import fr.xephi.authme.command.executable.authme.SetFirstSpawnCommand;
+import fr.xephi.authme.command.executable.authme.SetSpawnCommand;
+import fr.xephi.authme.command.executable.authme.SpawnCommand;
+import fr.xephi.authme.command.executable.authme.SwitchAntiBotCommand;
 import fr.xephi.authme.command.executable.authme.UnregisterCommand;
+import fr.xephi.authme.command.executable.authme.VersionCommand;
 import fr.xephi.authme.command.executable.captcha.CaptchaCommand;
 import fr.xephi.authme.command.executable.converter.ConverterCommand;
 import fr.xephi.authme.command.executable.email.AddEmailCommand;
@@ -13,9 +32,6 @@ import fr.xephi.authme.command.executable.email.RecoverEmailCommand;
 import fr.xephi.authme.command.executable.login.LoginCommand;
 import fr.xephi.authme.command.executable.logout.LogoutCommand;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @SuppressWarnings("UnusedDeclaration")
 public class CommandManager {
 
diff --git a/src/main/java/fr/xephi/authme/command/CommandParts.java b/src/main/java/fr/xephi/authme/command/CommandParts.java
index 6f9f8559..732e9199 100644
--- a/src/main/java/fr/xephi/authme/command/CommandParts.java
+++ b/src/main/java/fr/xephi/authme/command/CommandParts.java
@@ -1,11 +1,11 @@
 package fr.xephi.authme.command;
 
-import fr.xephi.authme.util.ListUtils;
-import fr.xephi.authme.util.StringUtils;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import fr.xephi.authme.util.ListUtils;
+import fr.xephi.authme.util.StringUtils;
+
 public class CommandParts {
 
     /** The list of parts for this command. */
diff --git a/src/main/java/fr/xephi/authme/command/CommandPermissions.java b/src/main/java/fr/xephi/authme/command/CommandPermissions.java
index 3ebe5baa..7628ea44 100644
--- a/src/main/java/fr/xephi/authme/command/CommandPermissions.java
+++ b/src/main/java/fr/xephi/authme/command/CommandPermissions.java
@@ -1,13 +1,14 @@
 package fr.xephi.authme.command;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 //import com.timvisee.dungeonmaze.Core;
 //import com.timvisee.dungeonmaze.permission.PermissionsManager;
 import fr.xephi.authme.AuthMe;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
 
 @SuppressWarnings("UnusedDeclaration")
 public class CommandPermissions {
diff --git a/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java b/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
index 3ddcb5a5..831db024 100644
--- a/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
@@ -1,9 +1,10 @@
 package fr.xephi.authme.command.executable;
 
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.command.help.HelpProvider;
-import org.bukkit.command.CommandSender;
 
 public class HelpCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
index fddf078a..aa8753c4 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
@@ -1,14 +1,15 @@
 package fr.xephi.authme.command.executable.authme;
 
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-
-import java.util.List;
 
 public class AccountsCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/AuthMeCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/AuthMeCommand.java
index 06f66fae..72ff623f 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/AuthMeCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/AuthMeCommand.java
@@ -1,10 +1,11 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
 
 public class AuthMeCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordCommand.java
index 4e2a0c2a..d226a436 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordCommand.java
@@ -1,5 +1,10 @@
 package fr.xephi.authme.command.executable.authme;
 
+import java.security.NoSuchAlgorithmException;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
@@ -9,10 +14,6 @@ import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-
-import java.security.NoSuchAlgorithmException;
 
 public class ChangePasswordCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java
index 4cf5789d..99907080 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java
@@ -1,11 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Spawn;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class FirstSpawnCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ForceLoginCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ForceLoginCommand.java
index e4f285be..17c5d8a4 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/ForceLoginCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/ForceLoginCommand.java
@@ -1,11 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class ForceLoginCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java
index 76d5423c..1ed99ff9 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java
@@ -1,11 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
-import org.bukkit.command.CommandSender;
 
 public class GetEmailCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java
index d67b7d63..61a4c2b6 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java
@@ -1,11 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class GetIpCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java
index 121a4c15..1cef6e56 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java
@@ -1,13 +1,14 @@
 package fr.xephi.authme.command.executable.authme;
 
+import java.util.Date;
+
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
-import org.bukkit.command.CommandSender;
-
-import java.util.Date;
 
 public class LastLoginCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java
index 32c2937c..ad966b44 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java
@@ -1,14 +1,15 @@
 package fr.xephi.authme.command.executable.authme;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.CommandSender;
-
-import java.util.ArrayList;
-import java.util.List;
 
 public class PurgeBannedPlayersCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java
index d207d34e..e2f855e6 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java
@@ -1,14 +1,15 @@
 package fr.xephi.authme.command.executable.authme;
 
+import java.util.Calendar;
+import java.util.List;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
-import java.util.Calendar;
-import java.util.List;
 
 public class PurgeCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java
index e74e6651..c7ea009b 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java
@@ -1,13 +1,14 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class PurgeLastPositionCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java
index 782cc787..7a51fd3c 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java
@@ -1,5 +1,10 @@
 package fr.xephi.authme.command.executable.authme;
 
+import java.security.NoSuchAlgorithmException;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
@@ -8,10 +13,6 @@ import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-
-import java.security.NoSuchAlgorithmException;
 
 public class RegisterCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java
index 1d1dea02..cfc7b113 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java
@@ -1,15 +1,15 @@
 package fr.xephi.authme.command.executable.authme;
 
+//import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.util.Profiler;
-//import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
 
 public class ReloadCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java
index 900cd0b9..4715c00d 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java
@@ -1,13 +1,14 @@
 package fr.xephi.authme.command.executable.authme;
 
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-
-import java.util.List;
 
 public class ResetNameCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java
index ffe8d950..8011de24 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java
@@ -1,5 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
@@ -7,7 +9,6 @@ import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.command.CommandSender;
 
 public class SetEmailCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/SetFirstSpawnCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/SetFirstSpawnCommand.java
index c51aa6f7..f8c469d7 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/SetFirstSpawnCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/SetFirstSpawnCommand.java
@@ -1,11 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Spawn;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class SetFirstSpawnCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/SetSpawnCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/SetSpawnCommand.java
index ada37f41..7d65d666 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/SetSpawnCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/SetSpawnCommand.java
@@ -1,11 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Spawn;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class SetSpawnCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/SpawnCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/SpawnCommand.java
index 4e68fb9f..250e9d2f 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/SpawnCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/SpawnCommand.java
@@ -1,11 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Spawn;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class SpawnCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/SwitchAntiBotCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/SwitchAntiBotCommand.java
index b3adf430..a9e34662 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/SwitchAntiBotCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/SwitchAntiBotCommand.java
@@ -1,11 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.command.help.HelpProvider;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
 
 public class SwitchAntiBotCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
index e04b8889..176fda08 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
@@ -1,5 +1,14 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.scheduler.BukkitTask;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.Utils;
@@ -12,14 +21,6 @@ import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.MessageTask;
 import fr.xephi.authme.task.TimeoutTask;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scheduler.BukkitTask;
 
 public class UnregisterCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java
index aaa823f4..e49b6115 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java
@@ -1,13 +1,14 @@
 package fr.xephi.authme.command.executable.authme;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.command.CommandParts;
-import fr.xephi.authme.command.ExecutableCommand;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+
 public class VersionCommand extends ExecutableCommand {
 
     /**
diff --git a/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java b/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java
index 0b2d6371..81f4c50f 100644
--- a/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java
@@ -1,5 +1,8 @@
 package fr.xephi.authme.command.executable.captcha;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.command.CommandParts;
@@ -7,8 +10,6 @@ import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class CaptchaCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java b/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java
index bebba5b4..20649792 100644
--- a/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java
@@ -1,5 +1,8 @@
 package fr.xephi.authme.command.executable.changepassword;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.command.CommandParts;
@@ -7,8 +10,6 @@ import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.ChangePasswordTask;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class ChangePasswordCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java b/src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java
index 42e599f8..a593dc3a 100644
--- a/src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java
@@ -1,13 +1,21 @@
 package fr.xephi.authme.command.executable.converter;
 
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-import fr.xephi.authme.converter.*;
+import fr.xephi.authme.converter.Converter;
+import fr.xephi.authme.converter.CrazyLoginConverter;
+import fr.xephi.authme.converter.FlatToSql;
+import fr.xephi.authme.converter.FlatToSqlite;
+import fr.xephi.authme.converter.RakamakConverter;
+import fr.xephi.authme.converter.RoyalAuthConverter;
+import fr.xephi.authme.converter.SqlToFlat;
+import fr.xephi.authme.converter.vAuthConverter;
+import fr.xephi.authme.converter.xAuthConverter;
 import fr.xephi.authme.settings.Messages;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class ConverterCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java
index 3fa8e0f2..f91e6a24 100644
--- a/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java
@@ -1,5 +1,8 @@
 package fr.xephi.authme.command.executable.email;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
@@ -7,8 +10,6 @@ import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class AddEmailCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java
index aad9bc22..b7f71736 100644
--- a/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java
@@ -1,5 +1,10 @@
 package fr.xephi.authme.command.executable.email;
 
+import java.util.Arrays;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
@@ -7,10 +12,6 @@ import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.Arrays;
 
 public class ChangeEmailCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java
index 13628f90..26e74165 100644
--- a/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java
@@ -1,5 +1,10 @@
 package fr.xephi.authme.command.executable.email;
 
+import java.security.NoSuchAlgorithmException;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
@@ -10,10 +15,6 @@ import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.security.NoSuchAlgorithmException;
 
 public class RecoverEmailCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java b/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java
index 22b57dcd..edb34910 100644
--- a/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java
@@ -1,10 +1,11 @@
 package fr.xephi.authme.command.executable.login;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class LoginCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/logout/LogoutCommand.java b/src/main/java/fr/xephi/authme/command/executable/logout/LogoutCommand.java
index 95b5ab9c..0dfcbaf4 100644
--- a/src/main/java/fr/xephi/authme/command/executable/logout/LogoutCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/logout/LogoutCommand.java
@@ -1,10 +1,11 @@
 package fr.xephi.authme.command.executable.logout;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class LogoutCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java
index b08190fc..45e3c470 100644
--- a/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java
@@ -1,13 +1,14 @@
 package fr.xephi.authme.command.executable.register;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class RegisterCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java
index 20055203..66af5abc 100644
--- a/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java
@@ -1,12 +1,13 @@
 package fr.xephi.authme.command.executable.unregister;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class UnregisterCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java b/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
index 17aeb163..4f28eb29 100644
--- a/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
+++ b/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
@@ -1,19 +1,20 @@
 package fr.xephi.authme.command.help;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandArgumentDescription;
 import fr.xephi.authme.command.CommandDescription;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.CommandPermissions;
 import fr.xephi.authme.util.StringUtils;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
 
 public class HelpPrinter {
 
diff --git a/src/main/java/fr/xephi/authme/command/help/HelpProvider.java b/src/main/java/fr/xephi/authme/command/help/HelpProvider.java
index 000f721e..4cf27c6d 100644
--- a/src/main/java/fr/xephi/authme/command/help/HelpProvider.java
+++ b/src/main/java/fr/xephi/authme/command/help/HelpProvider.java
@@ -1,10 +1,13 @@
 package fr.xephi.authme.command.help;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.command.*;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandDescription;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.FoundCommandResult;
+
 public class HelpProvider {
 
     /**
diff --git a/src/main/java/fr/xephi/authme/command/help/HelpSyntaxHelper.java b/src/main/java/fr/xephi/authme/command/help/HelpSyntaxHelper.java
index 492a4f14..b2c40875 100644
--- a/src/main/java/fr/xephi/authme/command/help/HelpSyntaxHelper.java
+++ b/src/main/java/fr/xephi/authme/command/help/HelpSyntaxHelper.java
@@ -1,10 +1,11 @@
 package fr.xephi.authme.command.help;
 
+import org.bukkit.ChatColor;
+
 import fr.xephi.authme.command.CommandArgumentDescription;
 import fr.xephi.authme.command.CommandDescription;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.util.ListUtils;
-import org.bukkit.ChatColor;
 
 public class HelpSyntaxHelper {
 

From da9cfc93d34d694cc5ac6b66d588b89f147e7130 Mon Sep 17 00:00:00 2001
From: DNx5 <dani.narianto@gmail.com>
Date: Mon, 2 Nov 2015 05:51:07 +0700
Subject: [PATCH 097/117] cleanup command pre process

---
 .../authme/listener/AuthMePlayerListener.java | 37 ++++++--------
 .../fr/xephi/authme/settings/Settings.java    | 51 +++++++++----------
 2 files changed, 39 insertions(+), 49 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index 3f087319..6cbfb2da 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -66,35 +66,30 @@ public class AuthMePlayerListener implements Listener {
 
     private void handleChat(AsyncPlayerChatEvent event) {
         Player player = event.getPlayer();
-        if (!Utils.checkAuth(player)) {
-            String cmd = event.getMessage().split(" ")[0];
-            if (cmd.startsWith("/")) {
-                if (Settings.allowCommands.contains(cmd)) {
-                    return;
-                }
-            } else {
-                if (Settings.isChatAllowed) {
-                    return;
-                }
-            }
-            event.setCancelled(true);
+        if (Utils.checkAuth(player))
+            return;
 
-            if (plugin.database.isAuthAvailable(player.getName().toLowerCase())) {
-                m.send(player, "login_msg");
+        if (Settings.isChatAllowed) {
+            return;
+        }
+        event.setCancelled(true);
+
+        if (plugin.database.isAuthAvailable(player.getName().toLowerCase())) {
+            m.send(player, "login_msg");
+        } else {
+            if (Settings.emailRegistration) {
+                m.send(player, "reg_email_msg");
             } else {
-                if (Settings.emailRegistration) {
-                    m.send(player, "reg_email_msg");
-                } else {
-                    m.send(player, "reg_msg");
-                }
+                m.send(player, "reg_msg");
             }
         }
+
     }
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
     public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
-        String cmd = event.getMessage().split(" ")[0];
-        if (Settings.useEssentialsMotd && cmd.equalsIgnoreCase("/motd"))
+        String cmd = event.getMessage().split(" ")[0].toLowerCase();
+        if (Settings.useEssentialsMotd && cmd.equals("/motd"))
             return;
         if (Settings.allowCommands.contains(cmd))
             return;
diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java
index 84672b38..a2886ccf 100644
--- a/src/main/java/fr/xephi/authme/settings/Settings.java
+++ b/src/main/java/fr/xephi/authme/settings/Settings.java
@@ -1,22 +1,16 @@
 package fr.xephi.authme.settings;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.bukkit.configuration.file.YamlConfiguration;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.datasource.DataSource.DataSourceType;
 import fr.xephi.authme.security.HashAlgorithm;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 public final class Settings extends YamlConfiguration {
 
@@ -193,21 +187,22 @@ public final class Settings extends YamlConfiguration {
         backupWindowsPath = configFile.getString("BackupSystem.MysqlWindowsPath", "C:\\Program Files\\MySQL\\MySQL Server 5.1\\");
         isStopEnabled = configFile.getBoolean("Security.SQLProblem.stopServer", true);
         reloadSupport = configFile.getBoolean("Security.ReloadCommand.useReloadCommandSupport", true);
-        allowCommands = configFile.getStringList("settings.restrictions.allowCommands");
-        if (configFile.contains("allowCommands")) {
-            if (!allowCommands.contains("/login"))
-                allowCommands.add("/login");
-            if (!allowCommands.contains("/register"))
-                allowCommands.add("/register");
-            if (!allowCommands.contains("/l"))
-                allowCommands.add("/l");
-            if (!allowCommands.contains("/reg"))
-                allowCommands.add("/reg");
-            if (!allowCommands.contains("/email"))
-                allowCommands.add("/email");
-            if (!allowCommands.contains("/captcha"))
-                allowCommands.add("/captcha");
+        allowCommands = new ArrayList<>();
+        for (String cmd : configFile.getStringList("settings.restrictions.allowCommands")) {
+            allowCommands.add(cmd.toLowerCase());
         }
+        if (!allowCommands.contains("/login"))
+            allowCommands.add("/login");
+        if (!allowCommands.contains("/register"))
+            allowCommands.add("/register");
+        if (!allowCommands.contains("/l"))
+            allowCommands.add("/l");
+        if (!allowCommands.contains("/reg"))
+            allowCommands.add("/reg");
+        if (!allowCommands.contains("/email"))
+            allowCommands.add("/email");
+        if (!allowCommands.contains("/captcha"))
+            allowCommands.add("/captcha");
         rakamakUsers = configFile.getString("Converter.Rakamak.fileName", "users.rak");
         rakamakUsersIp = configFile.getString("Converter.Rakamak.ipFileName", "UsersIp.rak");
         rakamakUseIp = configFile.getBoolean("Converter.Rakamak.useIp", false);
@@ -491,8 +486,8 @@ public final class Settings extends YamlConfiguration {
             changes = true;
         }
         if (!contains("DataSource.mySQLQueryCache")) {
-        	set("DataSource.mySQLWebsite", false);
-        	changes = true;
+            set("DataSource.mySQLWebsite", false);
+            changes = true;
         }
 
         if (changes) {

From 5e7c5560cf2713d26fb01a57193c8a51406b3b4e Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Mon, 2 Nov 2015 00:09:34 +0100
Subject: [PATCH 098/117] Cleanup2: The Revenge

---
 src/main/java/fr/xephi/authme/AuthMe.java                    | 3 +--
 src/main/java/fr/xephi/authme/DataManager.java               | 2 +-
 src/main/java/fr/xephi/authme/api/API.java                   | 2 +-
 src/main/java/fr/xephi/authme/api/NewAPI.java                | 2 +-
 src/main/java/fr/xephi/authme/cache/backup/JsonCache.java    | 2 +-
 src/main/java/fr/xephi/authme/command/CommandManager.java    | 2 +-
 .../authme/command/executable/authme/ReloadCommand.java      | 5 +++--
 .../authme/command/executable/authme/UnregisterCommand.java  | 2 +-
 src/main/java/fr/xephi/authme/commands/AdminCommand.java     | 4 ++--
 .../java/fr/xephi/authme/datasource/CacheDataSource.java     | 2 +-
 .../java/fr/xephi/authme/listener/AuthMePlayerListener.java  | 2 +-
 .../java/fr/xephi/authme/listener/AuthMeServerListener.java  | 2 +-
 .../java/fr/xephi/authme/process/join/AsyncronousJoin.java   | 4 ++--
 .../java/fr/xephi/authme/process/login/AsyncronousLogin.java | 2 +-
 .../authme/process/login/ProcessSyncronousPlayerLogin.java   | 4 ++--
 .../fr/xephi/authme/process/logout/AsyncronousLogout.java    | 4 ++--
 .../java/fr/xephi/authme/process/quit/AsyncronousQuit.java   | 2 +-
 .../process/register/ProcessSyncronousEmailRegister.java     | 2 +-
 .../process/register/ProcessSyncronousPasswordRegister.java  | 2 +-
 .../authme/process/unregister/AsyncronousUnregister.java     | 4 ++--
 src/main/java/fr/xephi/authme/task/MessageTask.java          | 2 +-
 src/main/java/fr/xephi/authme/util/Utils.java                | 4 ++--
 22 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 981b4eaa..dbf99b6c 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -11,8 +11,6 @@ import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
-import fr.xephi.authme.command.CommandHandler;
-import fr.xephi.authme.util.Utils;
 import org.apache.logging.log4j.LogManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -63,6 +61,7 @@ import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.OtherAccounts;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.Spawn;
+import fr.xephi.authme.util.Utils;
 import net.milkbowl.vault.permission.Permission;
 import net.minelink.ctplus.CombatTagPlus;
 
diff --git a/src/main/java/fr/xephi/authme/DataManager.java b/src/main/java/fr/xephi/authme/DataManager.java
index 2f1459cc..95a9ab53 100644
--- a/src/main/java/fr/xephi/authme/DataManager.java
+++ b/src/main/java/fr/xephi/authme/DataManager.java
@@ -7,12 +7,12 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import fr.xephi.authme.util.Utils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Utils;
 import net.milkbowl.vault.permission.Permission;
 
 public class DataManager {
diff --git a/src/main/java/fr/xephi/authme/api/API.java b/src/main/java/fr/xephi/authme/api/API.java
index eeb6a9cf..96dcc2a6 100644
--- a/src/main/java/fr/xephi/authme/api/API.java
+++ b/src/main/java/fr/xephi/authme/api/API.java
@@ -9,11 +9,11 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Utils;
 
 public class API {
 
diff --git a/src/main/java/fr/xephi/authme/api/NewAPI.java b/src/main/java/fr/xephi/authme/api/NewAPI.java
index b965abaf..6c48286a 100644
--- a/src/main/java/fr/xephi/authme/api/NewAPI.java
+++ b/src/main/java/fr/xephi/authme/api/NewAPI.java
@@ -9,11 +9,11 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Utils;
 
 public class NewAPI {
 
diff --git a/src/main/java/fr/xephi/authme/cache/backup/JsonCache.java b/src/main/java/fr/xephi/authme/cache/backup/JsonCache.java
index d2b3ae24..31c647cb 100644
--- a/src/main/java/fr/xephi/authme/cache/backup/JsonCache.java
+++ b/src/main/java/fr/xephi/authme/cache/backup/JsonCache.java
@@ -19,8 +19,8 @@ import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Utils;
 
 public class JsonCache {
 
diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 09aa84cf..694fd780 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -52,7 +52,7 @@ public class CommandManager {
     /**
      * Register all commands.
      */
-    @SuppressWarnings("SpellCheckingInspection")
+    @SuppressWarnings({ "SpellCheckingInspection", "serial" })
     public void registerCommands() {
         // Register the base AuthMe Reloaded command
         CommandDescription authMeBaseCommand = new CommandDescription(
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java
index cfc7b113..4cb450d0 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java
@@ -34,7 +34,7 @@ public class ReloadCommand extends ExecutableCommand {
         Messages m = Messages.getInstance();
 
         // Show a status message
-        //sender.sendMessage(ChatColor.YELLOW + "Reloading AuthMeReloaded...");
+        // sender.sendMessage(ChatColor.YELLOW + "Reloading AuthMeReloaded...");
 
         try {
             Settings.reload();
@@ -49,10 +49,11 @@ public class ReloadCommand extends ExecutableCommand {
         }
 
         // Show a status message
+        // TODO: add the profiler result
         m.send(sender, "reload");
 
         // AuthMeReloaded reloaded, show a status message
-        //sender.sendMessage(ChatColor.GREEN + "AuthMeReloaded has been reloaded successfully, took " + p.getTimeFormatted() + "!");
+        // sender.sendMessage(ChatColor.GREEN + "AuthMeReloaded has been reloaded successfully, took " + p.getTimeFormatted() + "!");
         return true;
     }
 }
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
index a0c99942..4bb057e5 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
@@ -11,7 +11,6 @@ import org.bukkit.scheduler.BukkitTask;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
 import fr.xephi.authme.command.CommandParts;
@@ -21,6 +20,7 @@ import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.MessageTask;
 import fr.xephi.authme.task.TimeoutTask;
+import fr.xephi.authme.util.Utils;
 
 public class UnregisterCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/commands/AdminCommand.java b/src/main/java/fr/xephi/authme/commands/AdminCommand.java
index c868ea98..f482f19b 100644
--- a/src/main/java/fr/xephi/authme/commands/AdminCommand.java
+++ b/src/main/java/fr/xephi/authme/commands/AdminCommand.java
@@ -20,8 +20,6 @@ import org.bukkit.scheduler.BukkitTask;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.util.Utils;
-import fr.xephi.authme.util.Utils.GroupType;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
@@ -32,6 +30,8 @@ import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.Spawn;
 import fr.xephi.authme.task.MessageTask;
 import fr.xephi.authme.task.TimeoutTask;
+import fr.xephi.authme.util.Utils;
+import fr.xephi.authme.util.Utils.GroupType;
 
 public class AdminCommand implements CommandExecutor {
 
diff --git a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
index e9f0638d..0032b9a0 100644
--- a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
+++ b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
@@ -10,9 +10,9 @@ import java.util.concurrent.Executors;
 import org.bukkit.entity.Player;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.util.Utils;
 
 public class CacheDataSource implements DataSource {
 
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index 6cbfb2da..479b8692 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -42,13 +42,13 @@ import com.google.common.io.ByteStreams;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
 import fr.xephi.authme.cache.limbo.LimboPlayer;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Utils;
 
 public class AuthMePlayerListener implements Listener {
 
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java
index 92d67ab2..a493080a 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java
@@ -9,9 +9,9 @@ import org.bukkit.event.server.ServerListPingEvent;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Utils;
 
 public class AuthMeServerListener implements Listener {
 
diff --git a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
index 8aaf53ed..04317f77 100644
--- a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
+++ b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
@@ -13,8 +13,6 @@ import org.bukkit.scheduler.BukkitTask;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.util.Utils;
-import fr.xephi.authme.util.Utils.GroupType;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
@@ -28,6 +26,8 @@ import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.Spawn;
 import fr.xephi.authme.task.MessageTask;
 import fr.xephi.authme.task.TimeoutTask;
+import fr.xephi.authme.util.Utils;
+import fr.xephi.authme.util.Utils.GroupType;
 
 public class AsyncronousJoin {
 
diff --git a/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java b/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java
index e35b1708..4879ea8b 100644
--- a/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java
+++ b/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java
@@ -9,7 +9,6 @@ import org.bukkit.scheduler.BukkitTask;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
@@ -21,6 +20,7 @@ import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.MessageTask;
+import fr.xephi.authme.util.Utils;
 
 public class AsyncronousLogin {
 
diff --git a/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java b/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java
index daeb6112..ec35d128 100644
--- a/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java
+++ b/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java
@@ -8,8 +8,6 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.potion.PotionEffectType;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.util.Utils;
-import fr.xephi.authme.util.Utils.GroupType;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.backup.JsonCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
@@ -21,6 +19,8 @@ import fr.xephi.authme.events.RestoreInventoryEvent;
 import fr.xephi.authme.events.SpawnTeleportEvent;
 import fr.xephi.authme.listener.AuthMePlayerListener;
 import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Utils;
+import fr.xephi.authme.util.Utils.GroupType;
 
 public class ProcessSyncronousPlayerLogin implements Runnable {
 
diff --git a/src/main/java/fr/xephi/authme/process/logout/AsyncronousLogout.java b/src/main/java/fr/xephi/authme/process/logout/AsyncronousLogout.java
index dca7d2ca..e8bfd6ab 100644
--- a/src/main/java/fr/xephi/authme/process/logout/AsyncronousLogout.java
+++ b/src/main/java/fr/xephi/authme/process/logout/AsyncronousLogout.java
@@ -5,8 +5,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitScheduler;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.util.Utils;
-import fr.xephi.authme.util.Utils.GroupType;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
@@ -14,6 +12,8 @@ import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.events.AuthMeTeleportEvent;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Utils;
+import fr.xephi.authme.util.Utils.GroupType;
 
 public class AsyncronousLogout {
 
diff --git a/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java b/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java
index 0591666f..3085fb4e 100644
--- a/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java
+++ b/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java
@@ -6,7 +6,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitTask;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
@@ -14,6 +13,7 @@ import fr.xephi.authme.cache.limbo.LimboPlayer;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.listener.AuthMePlayerListener;
 import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Utils;
 
 public class AsyncronousQuit {
 
diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java
index 652038c8..0b1a723d 100644
--- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java
@@ -6,13 +6,13 @@ import org.bukkit.scheduler.BukkitTask;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.limbo.LimboCache;
 import fr.xephi.authme.cache.limbo.LimboPlayer;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.MessageTask;
 import fr.xephi.authme.task.TimeoutTask;
+import fr.xephi.authme.util.Utils;
 
 public class ProcessSyncronousEmailRegister implements Runnable {
 
diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java
index 25ebcdc2..56b7158b 100644
--- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java
@@ -10,7 +10,6 @@ import org.bukkit.scheduler.BukkitTask;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.limbo.LimboCache;
 import fr.xephi.authme.cache.limbo.LimboPlayer;
 import fr.xephi.authme.events.AuthMeTeleportEvent;
@@ -21,6 +20,7 @@ import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.MessageTask;
 import fr.xephi.authme.task.TimeoutTask;
+import fr.xephi.authme.util.Utils;
 
 public class ProcessSyncronousPasswordRegister implements Runnable {
 
diff --git a/src/main/java/fr/xephi/authme/process/unregister/AsyncronousUnregister.java b/src/main/java/fr/xephi/authme/process/unregister/AsyncronousUnregister.java
index 31547939..71a79688 100644
--- a/src/main/java/fr/xephi/authme/process/unregister/AsyncronousUnregister.java
+++ b/src/main/java/fr/xephi/authme/process/unregister/AsyncronousUnregister.java
@@ -11,8 +11,6 @@ import org.bukkit.scheduler.BukkitTask;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.util.Utils;
-import fr.xephi.authme.util.Utils.GroupType;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.backup.JsonCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
@@ -22,6 +20,8 @@ import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.MessageTask;
 import fr.xephi.authme.task.TimeoutTask;
+import fr.xephi.authme.util.Utils;
+import fr.xephi.authme.util.Utils.GroupType;
 
 public class AsyncronousUnregister {
 
diff --git a/src/main/java/fr/xephi/authme/task/MessageTask.java b/src/main/java/fr/xephi/authme/task/MessageTask.java
index 53c1510a..7c92b1c9 100644
--- a/src/main/java/fr/xephi/authme/task/MessageTask.java
+++ b/src/main/java/fr/xephi/authme/task/MessageTask.java
@@ -4,9 +4,9 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitTask;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
+import fr.xephi.authme.util.Utils;
 
 public class MessageTask implements Runnable {
 
diff --git a/src/main/java/fr/xephi/authme/util/Utils.java b/src/main/java/fr/xephi/authme/util/Utils.java
index a833d907..76915420 100644
--- a/src/main/java/fr/xephi/authme/util/Utils.java
+++ b/src/main/java/fr/xephi/authme/util/Utils.java
@@ -12,8 +12,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.zip.GZIPInputStream;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -23,6 +21,8 @@ import org.bukkit.entity.Player;
 
 import com.maxmind.geoip.LookupService;
 
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
 import fr.xephi.authme.cache.limbo.LimboPlayer;

From 7b4ea381ef50c33d902e83d55568afcd2e5b0a2c Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Mon, 2 Nov 2015 01:47:32 +0100
Subject: [PATCH 099/117] Update team

---
 team.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/team.txt b/team.txt
index 427516ce..e1c7e860 100644
--- a/team.txt
+++ b/team.txt
@@ -1,13 +1,14 @@
 AuthMe-Team:
 
 Active staff:
-Xephi (Xephi59) - Leader, Main developer (temporary inactive)
+Xephi (Xephi59) - Leader, Main developer
 DNx5 - Developer
 games647 - Developer
+TimVisee - Developer
 Gabriele C. (sgdc3) - Project Manager, Contributor
 
 Staff to contact:
-CryLegend - Contributor, AuthMeBridge Developer (Need activation)
+CryLegend - Contributor, AuthMeBridge Developer (Needs activation)
 
 External Contributors:
 Gnat008 - Contributor

From 2cd7bc8512c6f9420418c778a1cc44e617bffadc Mon Sep 17 00:00:00 2001
From: vanhec_a <alexandre.vanhecke@epitech.eu>
Date: Mon, 2 Nov 2015 10:16:01 +0100
Subject: [PATCH 100/117] Check a boolean is a quickest way than check database
 :)

---
 .../java/fr/xephi/authme/listener/AuthMePlayerListener.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index 479b8692..cf0eefc0 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -66,12 +66,12 @@ public class AuthMePlayerListener implements Listener {
 
     private void handleChat(AsyncPlayerChatEvent event) {
         Player player = event.getPlayer();
+
+        if (Settings.isChatAllowed)
+            return;
         if (Utils.checkAuth(player))
             return;
 
-        if (Settings.isChatAllowed) {
-            return;
-        }
         event.setCancelled(true);
 
         if (plugin.database.isAuthAvailable(player.getName().toLowerCase())) {

From 4fd8d6e0cda78681456fecc77fbc1d2bbfe9ba24 Mon Sep 17 00:00:00 2001
From: Xephi <xephirot59@gmail.com>
Date: Mon, 2 Nov 2015 10:25:53 +0100
Subject: [PATCH 101/117] Don't use SuppressWarnings please :3

---
 .../fr/xephi/authme/command/CommandArgumentDescription.java    | 1 -
 src/main/java/fr/xephi/authme/command/CommandDescription.java  | 1 -
 src/main/java/fr/xephi/authme/command/CommandHandler.java      | 3 +--
 src/main/java/fr/xephi/authme/command/CommandManager.java      | 3 +--
 src/main/java/fr/xephi/authme/command/CommandParts.java        | 1 -
 src/main/java/fr/xephi/authme/command/CommandPermissions.java  | 1 -
 src/main/java/fr/xephi/authme/command/FoundCommandResult.java  | 1 -
 7 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandArgumentDescription.java b/src/main/java/fr/xephi/authme/command/CommandArgumentDescription.java
index 7efede29..a5ea63d0 100644
--- a/src/main/java/fr/xephi/authme/command/CommandArgumentDescription.java
+++ b/src/main/java/fr/xephi/authme/command/CommandArgumentDescription.java
@@ -17,7 +17,6 @@ public class CommandArgumentDescription {
      * @param label The argument label.
      * @param description The argument description.
      */
-    @SuppressWarnings("UnusedDeclaration")
     public CommandArgumentDescription(String label, String description) {
         this(label, description, false);
     }
diff --git a/src/main/java/fr/xephi/authme/command/CommandDescription.java b/src/main/java/fr/xephi/authme/command/CommandDescription.java
index be635d42..302a6e6c 100644
--- a/src/main/java/fr/xephi/authme/command/CommandDescription.java
+++ b/src/main/java/fr/xephi/authme/command/CommandDescription.java
@@ -9,7 +9,6 @@ import org.bukkit.command.CommandSender;
 
 import fr.xephi.authme.util.StringUtils;
 
-@SuppressWarnings("UnusedDeclaration")
 public class CommandDescription {
 
     /** Defines the acceptable labels. */
diff --git a/src/main/java/fr/xephi/authme/command/CommandHandler.java b/src/main/java/fr/xephi/authme/command/CommandHandler.java
index f11ced44..063f8935 100644
--- a/src/main/java/fr/xephi/authme/command/CommandHandler.java
+++ b/src/main/java/fr/xephi/authme/command/CommandHandler.java
@@ -89,8 +89,7 @@ public class CommandHandler {
      *
      * @return True if the command was executed, false otherwise.
      */
-    @SuppressWarnings("unused")
-    public boolean onCommand(CommandSender sender, @SuppressWarnings("UnusedParameters") org.bukkit.command.Command bukkitCommand, String bukkitCommandLabel, String[] bukkitArgs) {
+    public boolean onCommand(CommandSender sender, org.bukkit.command.Command bukkitCommand, String bukkitCommandLabel, String[] bukkitArgs) {
         // Process the arguments
         List<String> args = processArguments(bukkitArgs);
 
diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index 694fd780..83aa4c43 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -32,7 +32,6 @@ import fr.xephi.authme.command.executable.email.RecoverEmailCommand;
 import fr.xephi.authme.command.executable.login.LoginCommand;
 import fr.xephi.authme.command.executable.logout.LogoutCommand;
 
-@SuppressWarnings("UnusedDeclaration")
 public class CommandManager {
 
     /** The list of commandDescriptions. */
@@ -52,7 +51,7 @@ public class CommandManager {
     /**
      * Register all commands.
      */
-    @SuppressWarnings({ "SpellCheckingInspection", "serial" })
+    @SuppressWarnings({ "serial" })
     public void registerCommands() {
         // Register the base AuthMe Reloaded command
         CommandDescription authMeBaseCommand = new CommandDescription(
diff --git a/src/main/java/fr/xephi/authme/command/CommandParts.java b/src/main/java/fr/xephi/authme/command/CommandParts.java
index 732e9199..6e833482 100644
--- a/src/main/java/fr/xephi/authme/command/CommandParts.java
+++ b/src/main/java/fr/xephi/authme/command/CommandParts.java
@@ -165,7 +165,6 @@ public class CommandParts {
      *
      * @return The result from zero to above. A negative number will be returned on error.
      */
-    @SuppressWarnings("UnusedDeclaration")
     public double getDifference(CommandParts other) {
         return getDifference(other, false);
     }
diff --git a/src/main/java/fr/xephi/authme/command/CommandPermissions.java b/src/main/java/fr/xephi/authme/command/CommandPermissions.java
index 7628ea44..89007835 100644
--- a/src/main/java/fr/xephi/authme/command/CommandPermissions.java
+++ b/src/main/java/fr/xephi/authme/command/CommandPermissions.java
@@ -10,7 +10,6 @@ import org.bukkit.entity.Player;
 //import com.timvisee.dungeonmaze.permission.PermissionsManager;
 import fr.xephi.authme.AuthMe;
 
-@SuppressWarnings("UnusedDeclaration")
 public class CommandPermissions {
 
     /** Defines the permission nodes required to have permission to execute this command. */
diff --git a/src/main/java/fr/xephi/authme/command/FoundCommandResult.java b/src/main/java/fr/xephi/authme/command/FoundCommandResult.java
index e959325a..207cf8dc 100644
--- a/src/main/java/fr/xephi/authme/command/FoundCommandResult.java
+++ b/src/main/java/fr/xephi/authme/command/FoundCommandResult.java
@@ -57,7 +57,6 @@ public class FoundCommandResult {
      * @param commandDescription The command description.
      *
      */
-    @SuppressWarnings("UnusedDeclaration")
     public void setCommandDescription(CommandDescription commandDescription) {
         this.commandDescription = commandDescription;
     }

From 9bcc210428f1b53106b20dfcd9f547b5d1024941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Mon, 2 Nov 2015 13:22:43 +0100
Subject: [PATCH 102/117] Updated developer in version command according to
 team.txt

---
 .../authme/command/executable/authme/VersionCommand.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java
index e49b6115..45e1e3df 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java
@@ -26,9 +26,11 @@ public class VersionCommand extends ExecutableCommand {
         sender.sendMessage(ChatColor.GOLD + "==========[ " + AuthMe.PLUGIN_NAME.toUpperCase() + " ABOUT ]==========");
         sender.sendMessage(ChatColor.GOLD + "Version: " + ChatColor.WHITE + AuthMe.PLUGIN_NAME + " v" + AuthMe.getVersionName() + ChatColor.GRAY + " (code: " + AuthMe.getVersionCode() + ")");
         sender.sendMessage(ChatColor.GOLD + "Developers:");
-        printDeveloper(sender, "Xephi", "xephi", "Lead Developer");
-        printDeveloper(sender, "Sgdc3", "sgdc3", "Code Contributor");
-        printDeveloper(sender, "Tim Visee", "timvisee", "Code Contributor");
+        printDeveloper(sender, "Xephi", "xephi59", "Lead Developer");
+        printDeveloper(sender, "DNx5", "DNx5", "Developer");
+        printDeveloper(sender, "games647", "games647", "Developer");
+        printDeveloper(sender, "Tim Visee", "timvisee", "Developer");
+        printDeveloper(sender, "Sgdc3", "sgdc3", "Project manager, Contributor");
         sender.sendMessage(ChatColor.GOLD + "Website: " + ChatColor.WHITE + "http://dev.bukkit.org/bukkit-plugins/authme-reloaded/");
         sender.sendMessage(ChatColor.GOLD + "License: " + ChatColor.WHITE + "GNU GPL v3.0" + ChatColor.GRAY + ChatColor.ITALIC + " (See LICENSE file)");
         sender.sendMessage(ChatColor.GOLD + "Copyright: " + ChatColor.WHITE + "Copyright (c) Xephi 2015. All rights reserved.");

From f90104ca2de4bbdb3e9665802041c4f391d91a6e Mon Sep 17 00:00:00 2001
From: DNx5 <dani.narianto@gmail.com>
Date: Tue, 3 Nov 2015 01:53:01 +0700
Subject: [PATCH 103/117] update player move event listener.

---
 .../java/fr/xephi/authme/listener/AuthMePlayerListener.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index cf0eefc0..1a7c4add 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -130,6 +130,9 @@ public class AuthMePlayerListener implements Listener {
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     public void onPlayerMove(PlayerMoveEvent event) {
+        if (Settings.isMovementAllowed && Settings.getMovementRadius <= 0)
+            return;
+
         Player player = event.getPlayer();
         if (Utils.checkAuth(player))
             return;

From 6cc0cd62f586bcc08a4280e2addf6113e2827fbc Mon Sep 17 00:00:00 2001
From: DNx5 <dani.narianto@gmail.com>
Date: Tue, 3 Nov 2015 02:01:24 +0700
Subject: [PATCH 104/117] move set join message outside task.

---
 .../authme/listener/AuthMePlayerListener.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index 1a7c4add..10b2b388 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -201,8 +201,16 @@ public class AuthMePlayerListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onPlayerJoin(final PlayerJoinEvent event) {
-        if (event.getPlayer() == null) {
+        if (event.getPlayer() == null)
             return;
+
+        final Player player = event.getPlayer();
+        String name = player.getName().toLowerCase();
+
+        // Remove the join message while the player isn't logging in
+        if (Settings.delayJoinLeaveMessages && event.getJoinMessage() != null) {
+            joinMessage.put(name, event.getJoinMessage());
+            event.setJoinMessage(null);
         }
 
         // Shedule login task so works after the prelogin
@@ -211,16 +219,7 @@ public class AuthMePlayerListener implements Listener {
 
             @Override
             public void run() {
-                Player player = event.getPlayer();
-                String name = player.getName().toLowerCase();
-
                 plugin.management.performJoin(player);
-
-                // Remove the join message while the player isn't logging in
-                if (Settings.delayJoinLeaveMessages && event.getJoinMessage() != null) {
-                    joinMessage.put(name, event.getJoinMessage());
-                    event.setJoinMessage(null);
-                }
             }
         });
     }

From 6d4682793620eab0e8d744305e743c79ab18b075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Mon, 2 Nov 2015 20:20:59 +0100
Subject: [PATCH 105/117] Removed unused TODO

---
 .../fr/xephi/authme/command/executable/authme/AuthMeCommand.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/AuthMeCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/AuthMeCommand.java
index 72ff623f..8edb818e 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/AuthMeCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/AuthMeCommand.java
@@ -21,7 +21,6 @@ public class AuthMeCommand extends ExecutableCommand {
     @Override
     public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // Show some version info
-        // TODO: Use plugin name and version constants here!
         sender.sendMessage(ChatColor.GREEN + "This server is running " + AuthMe.PLUGIN_NAME + " v" + AuthMe.getVersionName() + "! " + ChatColor.RED + "<3");
         sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/" + commandReference.get(0) + " help" + ChatColor.YELLOW + " to view help.");
         sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/" + commandReference.get(0) + " about" + ChatColor.YELLOW + " to view about.");

From 872856e7291393458094cd4fa0464dc58da0a995 Mon Sep 17 00:00:00 2001
From: DNx5 <dani.narianto@gmail.com>
Date: Tue, 3 Nov 2015 03:42:02 +0700
Subject: [PATCH 106/117] create teleportTospawn method in Utils class

---
 .../executable/authme/UnregisterCommand.java  | 62 ++++++-------
 .../xephi/authme/commands/AdminCommand.java   | 86 +++++++++----------
 .../process/logout/AsyncronousLogout.java     | 22 ++---
 .../ProcessSyncronousPasswordRegister.java    | 21 +----
 .../unregister/AsyncronousUnregister.java     | 25 +-----
 src/main/java/fr/xephi/authme/util/Utils.java | 13 +++
 6 files changed, 92 insertions(+), 137 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
index 4bb057e5..e7ea7216 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
@@ -1,14 +1,5 @@
 package fr.xephi.authme.command.executable.authme;
 
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scheduler.BukkitTask;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerCache;
@@ -21,6 +12,14 @@ import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.MessageTask;
 import fr.xephi.authme.task.TimeoutTask;
 import fr.xephi.authme.util.Utils;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.scheduler.BukkitTask;
 
 public class UnregisterCommand extends ExecutableCommand {
 
@@ -30,7 +29,6 @@ public class UnregisterCommand extends ExecutableCommand {
      * @param sender           The command sender.
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
-     *
      * @return True if the command was executed successfully, false otherwise.
      */
     @Override
@@ -62,33 +60,25 @@ public class UnregisterCommand extends ExecutableCommand {
         Player target = Bukkit.getPlayer(playerNameLowerCase);
         PlayerCache.getInstance().removePlayer(playerNameLowerCase);
         Utils.setGroup(target, Utils.GroupType.UNREGISTERED);
-        if (target != null) {
-            if (target.isOnline()) {
-                if (Settings.isTeleportToSpawnEnabled && !Settings.noTeleport) {
-                    Location spawn = plugin.getSpawnLocation(target);
-                    SpawnTeleportEvent tpEvent = new SpawnTeleportEvent(target, target.getLocation(), spawn, false);
-                    plugin.getServer().getPluginManager().callEvent(tpEvent);
-                    if (!tpEvent.isCancelled()) {
-                        target.teleport(tpEvent.getTo());
-                    }
-                }
-                LimboCache.getInstance().addLimboPlayer(target);
-                int delay = Settings.getRegistrationTimeout * 20;
-                int interval = Settings.getWarnMessageInterval;
-                BukkitScheduler scheduler = sender.getServer().getScheduler();
-                if (delay != 0) {
-                    BukkitTask id = scheduler.runTaskLaterAsynchronously(plugin, new TimeoutTask(plugin, playerNameLowerCase, target), delay);
-                    LimboCache.getInstance().getLimboPlayer(playerNameLowerCase).setTimeoutTaskId(id);
-                }
-                LimboCache.getInstance().getLimboPlayer(playerNameLowerCase).setMessageTaskId(scheduler.runTaskAsynchronously(plugin, new MessageTask(plugin, playerNameLowerCase, m.send("reg_msg"), interval)));
-                if (Settings.applyBlindEffect)
-                    target.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, Settings.getRegistrationTimeout * 20, 2));
-                if (!Settings.isMovementAllowed && Settings.isRemoveSpeedEnabled) {
-                    target.setWalkSpeed(0.0f);
-                    target.setFlySpeed(0.0f);
-                }
-                m.send(target, "unregistered");
+        if (target != null && target.isOnline()) {
+            Utils.teleportToSpawn(target);
+            LimboCache.getInstance().addLimboPlayer(target);
+            int delay = Settings.getRegistrationTimeout * 20;
+            int interval = Settings.getWarnMessageInterval;
+            BukkitScheduler scheduler = sender.getServer().getScheduler();
+            if (delay != 0) {
+                BukkitTask id = scheduler.runTaskLaterAsynchronously(plugin, new TimeoutTask(plugin, playerNameLowerCase, target), delay);
+                LimboCache.getInstance().getLimboPlayer(playerNameLowerCase).setTimeoutTaskId(id);
             }
+            LimboCache.getInstance().getLimboPlayer(playerNameLowerCase).setMessageTaskId(scheduler.runTaskAsynchronously(plugin, new MessageTask(plugin, playerNameLowerCase, m.send("reg_msg"), interval)));
+            if (Settings.applyBlindEffect)
+                target.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, Settings.getRegistrationTimeout * 20, 2));
+            if (!Settings.isMovementAllowed && Settings.isRemoveSpeedEnabled) {
+                target.setWalkSpeed(0.0f);
+                target.setFlySpeed(0.0f);
+            }
+            m.send(target, "unregistered");
+
         }
 
         // Show a status message
diff --git a/src/main/java/fr/xephi/authme/commands/AdminCommand.java b/src/main/java/fr/xephi/authme/commands/AdminCommand.java
index f482f19b..5b0345cc 100644
--- a/src/main/java/fr/xephi/authme/commands/AdminCommand.java
+++ b/src/main/java/fr/xephi/authme/commands/AdminCommand.java
@@ -1,23 +1,5 @@
 package fr.xephi.authme.commands;
 
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scheduler.BukkitTask;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
@@ -32,6 +14,23 @@ import fr.xephi.authme.task.MessageTask;
 import fr.xephi.authme.task.TimeoutTask;
 import fr.xephi.authme.util.Utils;
 import fr.xephi.authme.util.Utils.GroupType;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.scheduler.BukkitTask;
+
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
 
 public class AdminCommand implements CommandExecutor {
 
@@ -274,7 +273,7 @@ public class AdminCommand implements CommandExecutor {
                         }
                         plugin.database.setUnlogged(name);
                         if (Bukkit.getPlayerExact(realName) != null)
-                        	Bukkit.getPlayerExact(realName).kickPlayer("An admin just registered you, please log again");
+                            Bukkit.getPlayerExact(realName).kickPlayer("An admin just registered you, please log again");
                         m.send(sender, "registered");
                         ConsoleLogger.info(name + " registered");
                     } catch (NoSuchAlgorithmException ex) {
@@ -472,33 +471,32 @@ public class AdminCommand implements CommandExecutor {
             Player target = Bukkit.getPlayer(name);
             PlayerCache.getInstance().removePlayer(name);
             Utils.setGroup(target, GroupType.UNREGISTERED);
-            if (target != null) {
-                if (target.isOnline()) {
-                    if (Settings.isTeleportToSpawnEnabled && !Settings.noTeleport) {
-                        Location spawn = plugin.getSpawnLocation(target);
-                        SpawnTeleportEvent tpEvent = new SpawnTeleportEvent(target, target.getLocation(), spawn, false);
-                        plugin.getServer().getPluginManager().callEvent(tpEvent);
-                        if (!tpEvent.isCancelled()) {
-                            target.teleport(tpEvent.getTo());
-                        }
+            if (target != null && target.isOnline()) {
+                if (Settings.isTeleportToSpawnEnabled && !Settings.noTeleport) {
+                    Location spawn = plugin.getSpawnLocation(target);
+                    SpawnTeleportEvent tpEvent = new SpawnTeleportEvent(target, target.getLocation(), spawn, false);
+                    plugin.getServer().getPluginManager().callEvent(tpEvent);
+                    if (!tpEvent.isCancelled()) {
+                        target.teleport(tpEvent.getTo());
                     }
-                    LimboCache.getInstance().addLimboPlayer(target);
-                    int delay = Settings.getRegistrationTimeout * 20;
-                    int interval = Settings.getWarnMessageInterval;
-                    BukkitScheduler sched = sender.getServer().getScheduler();
-                    if (delay != 0) {
-                        BukkitTask id = sched.runTaskLaterAsynchronously(plugin, new TimeoutTask(plugin, name, target), delay);
-                        LimboCache.getInstance().getLimboPlayer(name).setTimeoutTaskId(id);
-                    }
-                    LimboCache.getInstance().getLimboPlayer(name).setMessageTaskId(sched.runTaskAsynchronously(plugin, new MessageTask(plugin, name, m.send("reg_msg"), interval)));
-                    if (Settings.applyBlindEffect)
-                        target.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, Settings.getRegistrationTimeout * 20, 2));
-                    if (!Settings.isMovementAllowed && Settings.isRemoveSpeedEnabled) {
-                        target.setWalkSpeed(0.0f);
-                        target.setFlySpeed(0.0f);
-                    }
-                    m.send(target, "unregistered");
                 }
+                LimboCache.getInstance().addLimboPlayer(target);
+                int delay = Settings.getRegistrationTimeout * 20;
+                int interval = Settings.getWarnMessageInterval;
+                BukkitScheduler sched = sender.getServer().getScheduler();
+                if (delay != 0) {
+                    BukkitTask id = sched.runTaskLaterAsynchronously(plugin, new TimeoutTask(plugin, name, target), delay);
+                    LimboCache.getInstance().getLimboPlayer(name).setTimeoutTaskId(id);
+                }
+                LimboCache.getInstance().getLimboPlayer(name).setMessageTaskId(sched.runTaskAsynchronously(plugin, new MessageTask(plugin, name, m.send("reg_msg"), interval)));
+                if (Settings.applyBlindEffect)
+                    target.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, Settings.getRegistrationTimeout * 20, 2));
+                if (!Settings.isMovementAllowed && Settings.isRemoveSpeedEnabled) {
+                    target.setWalkSpeed(0.0f);
+                    target.setFlySpeed(0.0f);
+                }
+                m.send(target, "unregistered");
+
             }
             m.send(sender, "unregistered");
             ConsoleLogger.info(args[1] + " unregistered");
diff --git a/src/main/java/fr/xephi/authme/process/logout/AsyncronousLogout.java b/src/main/java/fr/xephi/authme/process/logout/AsyncronousLogout.java
index e8bfd6ab..b0b4670e 100644
--- a/src/main/java/fr/xephi/authme/process/logout/AsyncronousLogout.java
+++ b/src/main/java/fr/xephi/authme/process/logout/AsyncronousLogout.java
@@ -55,22 +55,12 @@ public class AsyncronousLogout {
 
         PlayerCache.getInstance().removePlayer(name);
         database.setUnlogged(name);
-        if (Settings.isTeleportToSpawnEnabled && !Settings.noTeleport) {
-            Location spawnLoc = plugin.getSpawnLocation(p);
-            final AuthMeTeleportEvent tpEvent = new AuthMeTeleportEvent(p, spawnLoc);
-            sched.scheduleSyncDelayedTask(plugin, new Runnable() {
-
-                @Override
-                public void run() {
-                    plugin.getServer().getPluginManager().callEvent(tpEvent);
-                    if (!tpEvent.isCancelled()) {
-                        if (tpEvent.getTo() != null)
-                            p.teleport(tpEvent.getTo());
-                    }
-                }
-            });
-        }
-
+        sched.scheduleSyncDelayedTask(plugin, new Runnable() {
+            @Override
+            public void run() {
+                Utils.teleportToSpawn(p);
+            }
+        });
         if (LimboCache.getInstance().hasLimboPlayer(name))
             LimboCache.getInstance().deleteLimboPlayer(name);
         LimboCache.getInstance().addLimboPlayer(player);
diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java
index 56b7158b..8bdb946f 100644
--- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java
@@ -48,17 +48,7 @@ public class ProcessSyncronousPasswordRegister implements Runnable {
     }
 
     protected void forceLogin(Player player) {
-        if (Settings.isTeleportToSpawnEnabled && !Settings.noTeleport) {
-            Location spawnLoc = plugin.getSpawnLocation(player);
-            AuthMeTeleportEvent tpEvent = new AuthMeTeleportEvent(player, spawnLoc);
-            plugin.getServer().getPluginManager().callEvent(tpEvent);
-            if (!tpEvent.isCancelled()) {
-                if (!tpEvent.getTo().getWorld().getChunkAt(tpEvent.getTo()).isLoaded()) {
-                    tpEvent.getTo().getWorld().getChunkAt(tpEvent.getTo()).load();
-                }
-                player.teleport(tpEvent.getTo());
-            }
-        }
+        Utils.teleportToSpawn(player);
         if (LimboCache.getInstance().hasLimboPlayer(name))
             LimboCache.getInstance().deleteLimboPlayer(name);
         LimboCache.getInstance().addLimboPlayer(player);
@@ -81,14 +71,7 @@ public class ProcessSyncronousPasswordRegister implements Runnable {
         LimboPlayer limbo = LimboCache.getInstance().getLimboPlayer(name);
         if (limbo != null) {
             player.setGameMode(limbo.getGameMode());
-            if (Settings.isTeleportToSpawnEnabled && !Settings.noTeleport) {
-                Location loca = plugin.getSpawnLocation(player);
-                RegisterTeleportEvent tpEvent = new RegisterTeleportEvent(player, loca);
-                plugin.getServer().getPluginManager().callEvent(tpEvent);
-                if (!tpEvent.isCancelled() && tpEvent.getTo() != null) {
-                    player.teleport(tpEvent.getTo());
-                }
-            }
+            Utils.teleportToSpawn(player);
 
             if (Settings.protectInventoryBeforeLogInEnabled && plugin.inventoryProtector != null) {
                 RestoreInventoryEvent event = new RestoreInventoryEvent(player);
diff --git a/src/main/java/fr/xephi/authme/process/unregister/AsyncronousUnregister.java b/src/main/java/fr/xephi/authme/process/unregister/AsyncronousUnregister.java
index 71a79688..e635b755 100644
--- a/src/main/java/fr/xephi/authme/process/unregister/AsyncronousUnregister.java
+++ b/src/main/java/fr/xephi/authme/process/unregister/AsyncronousUnregister.java
@@ -55,15 +55,7 @@ public class AsyncronousUnregister {
                     return;
                 }
                 if (Settings.isForcedRegistrationEnabled) {
-                    if (Settings.isTeleportToSpawnEnabled && !Settings.noTeleport) {
-                        Location spawn = plugin.getSpawnLocation(player);
-                        SpawnTeleportEvent tpEvent = new SpawnTeleportEvent(player, player.getLocation(), spawn, false);
-                        plugin.getServer().getPluginManager().callEvent(tpEvent);
-                        if (!tpEvent.isCancelled()) {
-                            player.teleport(tpEvent.getTo());
-                        }
-                    }
-
+                    Utils.teleportToSpawn(player);
                     player.saveData();
                     PlayerCache.getInstance().removePlayer(player.getName().toLowerCase());
                     if (!Settings.getRegisteredGroup.isEmpty())
@@ -98,22 +90,11 @@ public class AsyncronousUnregister {
                 }
                 m.send(player, "unregistered");
                 ConsoleLogger.info(player.getDisplayName() + " unregistered himself");
-                if (Settings.isTeleportToSpawnEnabled && !Settings.noTeleport) {
-                    Location spawn = plugin.getSpawnLocation(player);
-                    SpawnTeleportEvent tpEvent = new SpawnTeleportEvent(player, player.getLocation(), spawn, false);
-                    plugin.getServer().getPluginManager().callEvent(tpEvent);
-                    if (!tpEvent.isCancelled()) {
-                        if (!tpEvent.getTo().getWorld().getChunkAt(tpEvent.getTo()).isLoaded()) {
-                            tpEvent.getTo().getWorld().getChunkAt(tpEvent.getTo()).load();
-                        }
-                        player.teleport(tpEvent.getTo());
-                    }
-                }
-                return;
+                Utils.teleportToSpawn(player);
             } else {
                 m.send(player, "wrong_pwd");
             }
-        } catch (NoSuchAlgorithmException ex) {
+        } catch (NoSuchAlgorithmException ignored) {
         }
     }
 }
diff --git a/src/main/java/fr/xephi/authme/util/Utils.java b/src/main/java/fr/xephi/authme/util/Utils.java
index 76915420..f417824e 100644
--- a/src/main/java/fr/xephi/authme/util/Utils.java
+++ b/src/main/java/fr/xephi/authme/util/Utils.java
@@ -12,6 +12,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.zip.GZIPInputStream;
 
+import fr.xephi.authme.events.SpawnTeleportEvent;
+import fr.xephi.authme.settings.Spawn;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -297,4 +299,15 @@ public class Utils {
             return false;
         }
     }
+
+    public static void teleportToSpawn(Player player) {
+        if (Settings.isTeleportToSpawnEnabled && !Settings.noTeleport) {
+            Location spawn = plugin.getSpawnLocation(player);
+            AuthMeTeleportEvent tpEvent = new AuthMeTeleportEvent(player, spawn);
+            plugin.getServer().getPluginManager().callEvent(tpEvent);
+            if (!tpEvent.isCancelled()) {
+                player.teleport(tpEvent.getTo());
+            }
+        }
+    }
 }

From 3ede8f0daeeacd35225e4a5f09d8559eacb96345 Mon Sep 17 00:00:00 2001
From: DNx5 <dani.narianto@gmail.com>
Date: Tue, 3 Nov 2015 03:56:20 +0700
Subject: [PATCH 107/117] let bukkit load the chunk

---
 src/main/java/fr/xephi/authme/util/Utils.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/util/Utils.java b/src/main/java/fr/xephi/authme/util/Utils.java
index f417824e..7d26c949 100644
--- a/src/main/java/fr/xephi/authme/util/Utils.java
+++ b/src/main/java/fr/xephi/authme/util/Utils.java
@@ -216,17 +216,15 @@ public class Utils {
         if (theWorld == null)
             theWorld = pl.getWorld();
         final World world = theWorld;
-        final Location locat = new Location(world, x, y, z);
+        final Location loc = new Location(world, x, y, z);
 
         Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
 
             @Override
             public void run() {
-                AuthMeTeleportEvent tpEvent = new AuthMeTeleportEvent(pl, locat);
+                AuthMeTeleportEvent tpEvent = new AuthMeTeleportEvent(pl, loc);
                 plugin.getServer().getPluginManager().callEvent(tpEvent);
                 if (!tpEvent.isCancelled()) {
-                    if (!tpEvent.getTo().getChunk().isLoaded())
-                        tpEvent.getTo().getChunk().load();
                     pl.teleport(tpEvent.getTo());
                 }
             }

From 56aca7f473beb6bc8e146a86e74cc0e66f5a7d55 Mon Sep 17 00:00:00 2001
From: DNx5 <dani.narianto@gmail.com>
Date: Tue, 3 Nov 2015 07:37:00 +0700
Subject: [PATCH 108/117] this is enough.

---
 .../fr/xephi/authme/datasource/MySQL.java     | 98 +++++++------------
 src/main/resources/config.yml                 |  2 +-
 2 files changed, 37 insertions(+), 63 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/datasource/MySQL.java b/src/main/java/fr/xephi/authme/datasource/MySQL.java
index 45c0f036..8fdc2371 100644
--- a/src/main/java/fr/xephi/authme/datasource/MySQL.java
+++ b/src/main/java/fr/xephi/authme/datasource/MySQL.java
@@ -1,26 +1,18 @@
 package fr.xephi.authme.datasource;
 
-import java.sql.Blob;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.Bukkit;
-
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import com.zaxxer.hikari.pool.PoolInitializationException;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.security.HashAlgorithm;
 import fr.xephi.authme.settings.Settings;
-
+
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
+
 public class MySQL implements DataSource {
 
     private String host;
@@ -108,19 +100,18 @@ public class MySQL implements DataSource {
         config.setJdbcUrl("jdbc:mysql://" + this.host + ":" + this.port + "/" + this.database);
         config.setUsername(this.username);
         config.setPassword(this.password);
-        if (Settings.isMySQLWebsite)
-        {
+        if (Settings.isMySQLWebsite) {
             config.addDataSourceProperty("cachePrepStmts", "false");
-        }
-        else {
+        } else {
             config.addDataSourceProperty("cachePrepStmts", "true");
             config.addDataSourceProperty("prepStmtCacheSize", "250");
             config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
         }
         config.addDataSourceProperty("autoReconnect", false);
-        config.setInitializationFailFast(true); // Don't start the plugin if the database is unavariable
+        config.setInitializationFailFast(true); // Don't start the plugin if the database is unavailable
         config.setMaxLifetime(180000); // 3 Min
         config.setIdleTimeout(60000); // 1 Min
+        config.setMinimumIdle(2);
         config.setMaximumPoolSize(maxConnections);
         ds = new HikariDataSource(config);
         ConsoleLogger.info("Connection arguments loaded, Hikari ConnectionPool ready!");
@@ -136,24 +127,7 @@ public class MySQL implements DataSource {
     }
 
     private synchronized Connection getConnection() throws SQLException {
-    	if (!ds.isClosed())
-    	{
-            Connection con;
-            con = ds.getConnection();
-            return con;
-    	}
-    	ConsoleLogger.showError("Can't open a database connection!");
-    	if (Settings.isStopEnabled)
-    	{
-    		ConsoleLogger.showError("Server will ShuttingDown for Security reason");
-    		Bukkit.getScheduler().scheduleSyncDelayedTask(AuthMe.getInstance(), new Runnable(){
-				@Override
-				public void run() {
-					AuthMe.getInstance().getServer().shutdown();
-				}
-    		});
-    	}
-    	return null;
+        return ds.getConnection();
     }
 
     private synchronized void setupConnection() throws SQLException {
@@ -162,7 +136,7 @@ public class MySQL implements DataSource {
         ResultSet rs = null;
         try {
             if ((con = getConnection()) == null)
-            	return;
+                return;
             st = con.createStatement();
             st.executeUpdate("CREATE TABLE IF NOT EXISTS " + tableName + " (" + columnID + " INTEGER AUTO_INCREMENT," + columnName + " VARCHAR(255) NOT NULL UNIQUE," + columnPassword + " VARCHAR(255) NOT NULL," + columnIp + " VARCHAR(40) NOT NULL DEFAULT '127.0.0.1'," + columnLastLogin + " BIGINT NOT NULL DEFAULT '" + System.currentTimeMillis() + "'," + lastlocX + " DOUBLE NOT NULL DEFAULT '0.0'," + lastlocY + " DOUBLE NOT NULL DEFAULT '0.0'," + lastlocZ + " DOUBLE NOT NULL DEFAULT '0.0'," + lastlocWorld + " VARCHAR(255) NOT NULL DEFAULT '" + Settings.defaultWorld + "'," + columnEmail + " VARCHAR(255) DEFAULT 'your@email.com'," + columnLogged + " SMALLINT NOT NULL DEFAULT '0'," + "CONSTRAINT table_const_prim PRIMARY KEY (" + columnID + "));");
             rs = con.getMetaData().getColumns(null, null, tableName, columnPassword);
@@ -210,7 +184,7 @@ public class MySQL implements DataSource {
                 st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + columnRealName + " VARCHAR(255) NOT NULL DEFAULT 'Player' AFTER " + columnLogged + ";");
             }
             if (Settings.isMySQLWebsite)
-            	st.execute("SET GLOBAL query_cache_size = 0; SET GLOBAL query_cache_type = 0;");
+                st.execute("SET GLOBAL query_cache_size = 0; SET GLOBAL query_cache_type = 0;");
         } finally {
             close(rs);
             close(st);
@@ -226,7 +200,7 @@ public class MySQL implements DataSource {
         ResultSet rs = null;
         try {
             if ((con = getConnection()) == null)
-            	return true;
+                return true;
             pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE LOWER(" + columnName + ")=LOWER(?);");
             pst.setString(1, user);
             rs = pst.executeQuery();
@@ -250,7 +224,7 @@ public class MySQL implements DataSource {
         int id;
         try {
             if ((con = getConnection()) == null)
-            	return null;
+                return null;
             pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE LOWER(" + columnName + ")=LOWER(?);");
             pst.setString(1, user);
             rs = pst.executeQuery();
@@ -301,7 +275,7 @@ public class MySQL implements DataSource {
         ResultSet rs = null;
         try {
             if ((con = getConnection()) == null)
-            	return false;
+                return false;
             if ((columnSalt == null || columnSalt.isEmpty()) || (auth.getSalt() == null || auth.getSalt().isEmpty())) {
                 pst = con.prepareStatement("INSERT INTO " + tableName + "(" + columnName + "," + columnPassword + "," + columnIp + "," + columnLastLogin + "," + columnRealName + ") VALUES (?,?,?,?,?);");
                 pst.setString(1, auth.getNickname());
@@ -508,7 +482,7 @@ public class MySQL implements DataSource {
         ResultSet rs = null;
         try {
             if ((con = getConnection()) == null)
-            	return false;
+                return false;
             pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnPassword + "=? WHERE LOWER(" + columnName + ")=?;");
             pst.setString(1, auth.getHash());
             pst.setString(2, auth.getNickname());
@@ -552,7 +526,7 @@ public class MySQL implements DataSource {
         PreparedStatement pst = null;
         try {
             if ((con = getConnection()) == null)
-            	return false;
+                return false;
             pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnIp + "=?, " + columnLastLogin + "=?, " + columnRealName + "=? WHERE LOWER(" + columnName + ")=?;");
             pst.setString(1, auth.getIp());
             pst.setLong(2, auth.getLastLogin());
@@ -575,7 +549,7 @@ public class MySQL implements DataSource {
         PreparedStatement pst = null;
         try {
             if ((con = getConnection()) == null)
-            	return 0;
+                return 0;
             pst = con.prepareStatement("DELETE FROM " + tableName + " WHERE " + columnLastLogin + "<?;");
             pst.setLong(1, until);
             return pst.executeUpdate();
@@ -596,7 +570,7 @@ public class MySQL implements DataSource {
         List<String> list = new ArrayList<>();
         try {
             if ((con = getConnection()) == null)
-            	return list;
+                return list;
             pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE " + columnLastLogin + "<?;");
             pst.setLong(1, until);
             rs = pst.executeQuery();
@@ -624,7 +598,7 @@ public class MySQL implements DataSource {
         PreparedStatement pst = null;
         try {
             if ((con = getConnection()) == null)
-            	return false;
+                return false;
             if (Settings.getPasswordHash == HashAlgorithm.XENFORO) {
                 int id;
                 ResultSet rs;
@@ -661,7 +635,7 @@ public class MySQL implements DataSource {
         PreparedStatement pst = null;
         try {
             if ((con = getConnection()) == null)
-            	return false;
+                return false;
             pst = con.prepareStatement("UPDATE " + tableName + " SET " + lastlocX + " =?, " + lastlocY + "=?, " + lastlocZ + "=?, " + lastlocWorld + "=? WHERE LOWER(" + columnName + ")=?;");
             pst.setDouble(1, auth.getQuitLocX());
             pst.setDouble(2, auth.getQuitLocY());
@@ -687,7 +661,7 @@ public class MySQL implements DataSource {
         int countIp = 0;
         try {
             if ((con = getConnection()) == null)
-            	return 0;
+                return 0;
             pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE " + columnIp + "=?;");
             pst.setString(1, ip);
             rs = pst.executeQuery();
@@ -711,7 +685,7 @@ public class MySQL implements DataSource {
         PreparedStatement pst = null;
         try {
             if ((con = getConnection()) == null)
-            	return false;
+                return false;
             pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnEmail + " =? WHERE LOWER(" + columnName + ")=?;");
             pst.setString(1, auth.getEmail());
             pst.setString(2, auth.getNickname());
@@ -735,7 +709,7 @@ public class MySQL implements DataSource {
         PreparedStatement pst = null;
         try {
             if ((con = getConnection()) == null)
-            	return false;
+                return false;
             pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnSalt + " =? WHERE LOWER(" + columnName + ")=?;");
             pst.setString(1, auth.getSalt());
             pst.setString(2, auth.getNickname());
@@ -789,7 +763,7 @@ public class MySQL implements DataSource {
         List<String> countIp = new ArrayList<>();
         try {
             if ((con = getConnection()) == null)
-            	return countIp;
+                return countIp;
             pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE " + columnIp + "=?;");
             pst.setString(1, auth.getIp());
             rs = pst.executeQuery();
@@ -815,7 +789,7 @@ public class MySQL implements DataSource {
         List<String> countIp = new ArrayList<>();
         try {
             if ((con = getConnection()) == null)
-            	return countIp;
+                return countIp;
             pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE " + columnIp + "=?;");
             pst.setString(1, ip);
             rs = pst.executeQuery();
@@ -841,7 +815,7 @@ public class MySQL implements DataSource {
         List<String> countEmail = new ArrayList<>();
         try {
             if ((con = getConnection()) == null)
-            	return countEmail;
+                return countEmail;
             pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE " + columnEmail + "=?;");
             pst.setString(1, email);
             rs = pst.executeQuery();
@@ -865,7 +839,7 @@ public class MySQL implements DataSource {
         PreparedStatement pst = null;
         try {
             if ((con = getConnection()) == null)
-            	return;
+                return;
             for (String name : banned) {
                 pst = con.prepareStatement("DELETE FROM " + tableName + " WHERE LOWER(" + columnName + ")=?;");
                 pst.setString(1, name);
@@ -891,7 +865,7 @@ public class MySQL implements DataSource {
         ResultSet rs = null;
         try {
             if ((con = getConnection()) == null)
-            	return false;
+                return false;
             pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE LOWER(" + columnName + ")=?;");
             pst.setString(1, user);
             rs = pst.executeQuery();
@@ -914,7 +888,7 @@ public class MySQL implements DataSource {
         PreparedStatement pst = null;
         try {
             if ((con = getConnection()) == null)
-            	return;
+                return;
             pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnLogged + "=? WHERE LOWER(" + columnName + ")=?;");
             pst.setInt(1, 1);
             pst.setString(2, user);
@@ -934,7 +908,7 @@ public class MySQL implements DataSource {
         if (user != null)
             try {
                 if ((con = getConnection()) == null)
-                	return;
+                    return;
                 pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnLogged + "=? WHERE LOWER(" + columnName + ")=?;");
                 pst.setInt(1, 0);
                 pst.setString(2, user);
@@ -953,7 +927,7 @@ public class MySQL implements DataSource {
         PreparedStatement pst = null;
         try {
             if ((con = getConnection()) == null)
-            	return;
+                return;
             pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnLogged + "=? WHERE " + columnLogged + "=?;");
             pst.setInt(1, 0);
             pst.setInt(2, 1);
@@ -974,7 +948,7 @@ public class MySQL implements DataSource {
         ResultSet rs;
         try {
             if ((con = getConnection()) == null)
-            	return result;
+                return result;
             pst = con.prepareStatement("SELECT COUNT(*) FROM " + tableName + ";");
             rs = pst.executeQuery();
             if (rs != null && rs.next()) {
@@ -996,7 +970,7 @@ public class MySQL implements DataSource {
         PreparedStatement pst = null;
         try {
             if ((con = getConnection()) == null)
-            	return;
+                return;
             pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnName + "=? WHERE LOWER(" + columnName + ")=?;");
             pst.setString(1, newone);
             pst.setString(2, oldone);
@@ -1017,7 +991,7 @@ public class MySQL implements DataSource {
         ResultSet rs = null;
         try {
             if ((con = getConnection()) == null)
-            	return auths;
+                return auths;
             pst = con.prepareStatement("SELECT * FROM " + tableName + ";");
             rs = pst.executeQuery();
             while (rs.next()) {
@@ -1068,7 +1042,7 @@ public class MySQL implements DataSource {
         ResultSet rs = null;
         try {
             if ((con = getConnection()) == null)
-            	return auths;
+                return auths;
             pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE " + columnLogged + "=1;");
             rs = pst.executeQuery();
             while (rs.next()) {
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index e991efc0..671abc50 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -10,7 +10,7 @@ DataSource:
     # Database Port
     mySQLPort: '3306'
     # MySql Max Connections
-    mySQLMaxConections: 25
+    mySQLMaxConections: 8
     # Username about Database Connection Infos
     mySQLUsername: authme
     # Password about Database Connection Infos

From d73ac92ba3f024b8eea4c57bfddbf650213a93be Mon Sep 17 00:00:00 2001
From: DNx5 <dani.narianto@gmail.com>
Date: Tue, 3 Nov 2015 07:59:42 +0700
Subject: [PATCH 109/117] sqlite max connection update.

---
 src/main/java/fr/xephi/authme/datasource/SQLite_HIKARI.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/datasource/SQLite_HIKARI.java b/src/main/java/fr/xephi/authme/datasource/SQLite_HIKARI.java
index 4caecf26..5e531f3c 100644
--- a/src/main/java/fr/xephi/authme/datasource/SQLite_HIKARI.java
+++ b/src/main/java/fr/xephi/authme/datasource/SQLite_HIKARI.java
@@ -83,10 +83,10 @@ public class SQLite_HIKARI implements DataSource {
         config.setPoolName("AuthMeSQLitePool");
         config.setDriverClassName("org.sqlite.JDBC"); // RuntimeException
         config.setJdbcUrl("jdbc:sqlite:plugins/AuthMe/" + database + ".db");
-        config.setConnectionTestQuery("SELECT 1");
         config.setMaxLifetime(180000); // 3 Min
         config.setIdleTimeout(60000); // 1 Min
-        config.setMaximumPoolSize(50); // 50 (including idle connections)
+        config.setMinimumIdle(2);
+        config.setMaximumPoolSize(8); // don't set too much
         ds = new HikariDataSource(config);
         ConsoleLogger.info("Connection arguments loaded, Hikari ConnectionPool ready!");
     }

From 1562cb76156c3b778f535f70a45466c132be6ea7 Mon Sep 17 00:00:00 2001
From: DNx5 <dani.narianto@gmail.com>
Date: Tue, 3 Nov 2015 10:54:26 +0700
Subject: [PATCH 110/117] missed return statement.

---
 src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
index 04317f77..f4831e96 100644
--- a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
+++ b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
@@ -70,6 +70,7 @@ public class AsyncronousJoin {
                 }
 
             });
+            return;
         }
 
         final String ip = plugin.getIP(player);

From ce432aa25aa1678eb95f9c9d032b1da17a8a106d Mon Sep 17 00:00:00 2001
From: DNx5 <dani.narianto@gmail.com>
Date: Tue, 3 Nov 2015 12:38:24 +0700
Subject: [PATCH 111/117] add exception to datasource method signature.

---
 .../executable/authme/AccountsCommand.java    |  14 ++-
 .../executable/email/ChangeEmailCommand.java  |  98 +++++++++--------
 .../xephi/authme/commands/AdminCommand.java   |  12 +-
 .../authme/datasource/CacheDataSource.java    |  46 ++++----
 .../xephi/authme/datasource/DataSource.java   |   5 +-
 .../fr/xephi/authme/datasource/MySQL.java     |  11 +-
 .../authme/datasource/SQLite_HIKARI.java      |  20 +---
 .../fr/xephi/authme/process/Management.java   |   4 +-
 ...ronousRegister.java => AsyncRegister.java} | 103 ++++++++----------
 ...ter.java => ProcessSyncEmailRegister.java} |   4 +-
 10 files changed, 154 insertions(+), 163 deletions(-)
 rename src/main/java/fr/xephi/authme/process/register/{AsyncronousRegister.java => AsyncRegister.java} (62%)
 rename src/main/java/fr/xephi/authme/process/register/{ProcessSyncronousEmailRegister.java => ProcessSyncEmailRegister.java} (93%)

diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
index aa8753c4..abe06661 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
@@ -2,6 +2,7 @@ package fr.xephi.authme.command.executable.authme;
 
 import java.util.List;
 
+import fr.xephi.authme.ConsoleLogger;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 
@@ -79,11 +80,20 @@ public class AccountsCommand extends ExecutableCommand {
             });
             return true;
         } else {
-            Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
+            Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
                 @Override
                 public void run() {
+                    List<String> accountList;
+                    try {
+                        accountList = plugin.database.getAllAuthsByIp(playerQueryFinal);
+                    } catch (Exception e) {
+                        ConsoleLogger.showError(e.getMessage());
+                        ConsoleLogger.writeStackTrace(e);
+                        m.send(sender, "error");
+                        return;
+                    }
+
                     StringBuilder message = new StringBuilder("[AuthMe] ");
-                    List<String> accountList = plugin.database.getAllAuthsByIp(playerQueryFinal);
                     if (accountList == null || accountList.isEmpty()) {
                         sender.sendMessage("[AuthMe] This IP does not exist in the database");
                         return;
diff --git a/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java
index b7f71736..0b5d7e3c 100644
--- a/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java
@@ -1,27 +1,26 @@
 package fr.xephi.authme.command.executable.email;
 
-import java.util.Arrays;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
 import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.Arrays;
 
 public class ChangeEmailCommand extends ExecutableCommand {
 
     /**
      * Execute the command.
      *
-     * @param sender The command sender.
+     * @param sender           The command sender.
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
-     *
      * @return True if the command was executed successfully, false otherwise.
      */
     @Override
@@ -37,7 +36,7 @@ public class ChangeEmailCommand extends ExecutableCommand {
         String playerMailNew = commandArguments.get(1);
 
         // Make sure the current command executor is a player
-        if(!(sender instanceof Player)) {
+        if (!(sender instanceof Player)) {
             return true;
         }
 
@@ -46,44 +45,51 @@ public class ChangeEmailCommand extends ExecutableCommand {
         final String playerName = player.getName();
 
         // Command logic
-        if (Settings.getmaxRegPerEmail > 0) {
-            if (!plugin.authmePermissible(sender, "authme.allow2accounts") && plugin.database.getAllAuthsByEmail(playerMailNew).size() >= Settings.getmaxRegPerEmail) {
-                m.send(player, "max_reg");
-                return true;
-            }
-        }
-        if (PlayerCache.getInstance().isAuthenticated(playerName)) {
-            PlayerAuth auth = PlayerCache.getInstance().getAuth(playerName);
-            if (auth.getEmail() == null || auth.getEmail().equals("your@email.com") || auth.getEmail().isEmpty()) {
-                m.send(player, "usage_email_add");
-                return true;
-            }
-            if (!playerMailOld.equals(auth.getEmail())) {
-                m.send(player, "old_email_invalid");
-                return true;
-            }
-            if (!Settings.isEmailCorrect(playerMailNew)) {
-                m.send(player, "new_email_invalid");
-                return true;
-            }
-            auth.setEmail(playerMailNew);
-            if (!plugin.database.updateEmail(auth)) {
-                m.send(player, "error");
-                return true;
-            }
-            PlayerCache.getInstance().updatePlayer(auth);
-            m.send(player, "email_changed");
-            player.sendMessage(Arrays.toString(m.send("email_defined")) + auth.getEmail());
-        } else if (PlayerCache.getInstance().isAuthenticated(playerName)) {
-            m.send(player, "email_confirm");
-        } else {
-            if (!plugin.database.isAuthAvailable(playerName)) {
-                m.send(player, "login_msg");
-            } else {
-                m.send(player, "reg_email_msg");
-            }
-        }
 
-        return true;
+        try {
+            if (Settings.getmaxRegPerEmail > 0) {
+                if (!plugin.authmePermissible(sender, "authme.allow2accounts") && plugin.database.getAllAuthsByEmail(playerMailNew).size() >= Settings.getmaxRegPerEmail) {
+                    m.send(player, "max_reg");
+                    return true;
+                }
+            }
+            if (PlayerCache.getInstance().isAuthenticated(playerName)) {
+                PlayerAuth auth = PlayerCache.getInstance().getAuth(playerName);
+                if (auth.getEmail() == null || auth.getEmail().equals("your@email.com") || auth.getEmail().isEmpty()) {
+                    m.send(player, "usage_email_add");
+                    return true;
+                }
+                if (!playerMailOld.equals(auth.getEmail())) {
+                    m.send(player, "old_email_invalid");
+                    return true;
+                }
+                if (!Settings.isEmailCorrect(playerMailNew)) {
+                    m.send(player, "new_email_invalid");
+                    return true;
+                }
+                auth.setEmail(playerMailNew);
+                if (!plugin.database.updateEmail(auth)) {
+                    m.send(player, "error");
+                    return true;
+                }
+                PlayerCache.getInstance().updatePlayer(auth);
+                m.send(player, "email_changed");
+                player.sendMessage(Arrays.toString(m.send("email_defined")) + auth.getEmail());
+            } else if (PlayerCache.getInstance().isAuthenticated(playerName)) {
+                m.send(player, "email_confirm");
+            } else {
+                if (!plugin.database.isAuthAvailable(playerName)) {
+                    m.send(player, "login_msg");
+                } else {
+                    m.send(player, "reg_email_msg");
+                }
+            }
+            return true;
+        } catch (Exception e) {
+            ConsoleLogger.showError(e.getMessage());
+            ConsoleLogger.writeStackTrace(e);
+            m.send(sender, "error");
+            return false;
+        }
     }
 }
diff --git a/src/main/java/fr/xephi/authme/commands/AdminCommand.java b/src/main/java/fr/xephi/authme/commands/AdminCommand.java
index 5b0345cc..fa27ee31 100644
--- a/src/main/java/fr/xephi/authme/commands/AdminCommand.java
+++ b/src/main/java/fr/xephi/authme/commands/AdminCommand.java
@@ -194,7 +194,7 @@ public class AdminCommand implements CommandExecutor {
                 return true;
             } else {
                 final String[] arguments = args;
-                Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
+                Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
                     @Override
                     public void run() {
                         StringBuilder message = new StringBuilder("[AuthMe] ");
@@ -202,7 +202,15 @@ public class AdminCommand implements CommandExecutor {
                             sender.sendMessage("[AuthMe] Please put a valid IP");
                             return;
                         }
-                        List<String> accountList = plugin.database.getAllAuthsByIp(arguments[1]);
+                        List<String> accountList = null;
+                        try {
+                            accountList = plugin.database.getAllAuthsByIp(arguments[1]);
+                        } catch (Exception e) {
+                            ConsoleLogger.showError(e.getMessage());
+                            ConsoleLogger.writeStackTrace(e);
+                            m.send(sender, "error");
+                            return;
+                        }
                         if (accountList == null || accountList.isEmpty()) {
                             sender.sendMessage("[AuthMe] This IP does not exist in the database");
                             return;
diff --git a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
index 0032b9a0..40ed684c 100644
--- a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
+++ b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
@@ -1,18 +1,18 @@
 package fr.xephi.authme.datasource;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.bukkit.entity.Player;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.util.Utils;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public class CacheDataSource implements DataSource {
 
@@ -281,25 +281,21 @@ public class CacheDataSource implements DataSource {
     }
 
     @Override
-    public synchronized List<String> getAllAuthsByIp(String ip) {
-        List<String> result = new ArrayList<>();
-        for (Map.Entry<String, PlayerAuth> stringPlayerAuthEntry : cache.entrySet()) {
-            PlayerAuth p = stringPlayerAuthEntry.getValue();
-            if (p.getIp().equals(ip))
-                result.add(p.getNickname());
-        }
-        return result;
+    public synchronized List<String> getAllAuthsByIp(final String ip) throws Exception {
+        return exec.submit(new Callable<List<String>>() {
+            public List<String> call() throws Exception {
+                return source.getAllAuthsByIp(ip);
+            }
+        }).get();
     }
 
     @Override
-    public synchronized List<String> getAllAuthsByEmail(String email) {
-        List<String> result = new ArrayList<>();
-        for (Map.Entry<String, PlayerAuth> stringPlayerAuthEntry : cache.entrySet()) {
-            PlayerAuth p = stringPlayerAuthEntry.getValue();
-            if (p.getEmail().equals(email))
-                result.add(p.getNickname());
-        }
-        return result;
+    public synchronized List<String> getAllAuthsByEmail(final String email) throws Exception {
+        return exec.submit(new Callable<List<String>>() {
+            public List<String> call() throws Exception {
+                return source.getAllAuthsByEmail(email);
+            }
+        }).get();
     }
 
     @Override
diff --git a/src/main/java/fr/xephi/authme/datasource/DataSource.java b/src/main/java/fr/xephi/authme/datasource/DataSource.java
index 184a4fe9..40c3c883 100644
--- a/src/main/java/fr/xephi/authme/datasource/DataSource.java
+++ b/src/main/java/fr/xephi/authme/datasource/DataSource.java
@@ -1,5 +1,6 @@
 package fr.xephi.authme.datasource;
 
+import java.sql.SQLException;
 import java.util.List;
 
 import fr.xephi.authme.cache.auth.PlayerAuth;
@@ -35,9 +36,9 @@ public interface DataSource {
 
     List<String> getAllAuthsByName(PlayerAuth auth);
 
-    List<String> getAllAuthsByIp(String ip);
+    List<String> getAllAuthsByIp(String ip) throws Exception;
 
-    List<String> getAllAuthsByEmail(String email);
+    List<String> getAllAuthsByEmail(String email) throws Exception;
 
     boolean updateEmail(PlayerAuth auth);
 
diff --git a/src/main/java/fr/xephi/authme/datasource/MySQL.java b/src/main/java/fr/xephi/authme/datasource/MySQL.java
index 8fdc2371..e0479468 100644
--- a/src/main/java/fr/xephi/authme/datasource/MySQL.java
+++ b/src/main/java/fr/xephi/authme/datasource/MySQL.java
@@ -751,6 +751,7 @@ public class MySQL implements DataSource {
                 o.close();
             } catch (Exception ex) {
                 ConsoleLogger.showError(ex.getMessage());
+                ConsoleLogger.writeStackTrace(ex);
             }
         }
     }
@@ -808,14 +809,13 @@ public class MySQL implements DataSource {
     }
 
     @Override
-    public synchronized List<String> getAllAuthsByEmail(String email) {
-        Connection con = null;
+    public synchronized List<String> getAllAuthsByEmail(String email) throws SQLException {
+        final Connection con = getConnection();
         PreparedStatement pst = null;
         ResultSet rs = null;
         List<String> countEmail = new ArrayList<>();
+
         try {
-            if ((con = getConnection()) == null)
-                return countEmail;
             pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE " + columnEmail + "=?;");
             pst.setString(1, email);
             rs = pst.executeQuery();
@@ -823,9 +823,6 @@ public class MySQL implements DataSource {
                 countEmail.add(rs.getString(columnName));
             }
             return countEmail;
-        } catch (Exception ex) {
-            ConsoleLogger.showError(ex.getMessage());
-            return new ArrayList<>();
         } finally {
             close(rs);
             close(pst);
diff --git a/src/main/java/fr/xephi/authme/datasource/SQLite_HIKARI.java b/src/main/java/fr/xephi/authme/datasource/SQLite_HIKARI.java
index 5e531f3c..87af9fe9 100644
--- a/src/main/java/fr/xephi/authme/datasource/SQLite_HIKARI.java
+++ b/src/main/java/fr/xephi/authme/datasource/SQLite_HIKARI.java
@@ -472,13 +472,12 @@ public class SQLite_HIKARI implements DataSource {
     }
 
     @Override
-    public List<String> getAllAuthsByIp(String ip) {
-        Connection con = null;
+    public List<String> getAllAuthsByIp(String ip) throws SQLException {
+        final Connection con = getConnection();
         PreparedStatement pst = null;
         ResultSet rs = null;
         List<String> countIp = new ArrayList<>();
         try {
-            con = getConnection();
             pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE " + columnIp + "=?;");
             pst.setString(1, ip);
             rs = pst.executeQuery();
@@ -486,11 +485,6 @@ public class SQLite_HIKARI implements DataSource {
                 countIp.add(rs.getString(columnName));
             }
             return countIp;
-        } catch (SQLException ex) {
-            ConsoleLogger.showError(ex.getMessage());
-            return new ArrayList<>();
-        } catch (NullPointerException npe) {
-            return new ArrayList<>();
         } finally {
             close(rs);
             close(pst);
@@ -499,13 +493,12 @@ public class SQLite_HIKARI implements DataSource {
     }
 
     @Override
-    public List<String> getAllAuthsByEmail(String email) {
-        Connection con = null;
+    public List<String> getAllAuthsByEmail(String email) throws SQLException {
+        final Connection con = getConnection();
         PreparedStatement pst = null;
         ResultSet rs = null;
         List<String> countEmail = new ArrayList<>();
         try {
-            con = getConnection();
             pst = con.prepareStatement("SELECT * FROM " + tableName + " WHERE " + columnEmail + "=?;");
             pst.setString(1, email);
             rs = pst.executeQuery();
@@ -513,11 +506,6 @@ public class SQLite_HIKARI implements DataSource {
                 countEmail.add(rs.getString(columnName));
             }
             return countEmail;
-        } catch (SQLException ex) {
-            ConsoleLogger.showError(ex.getMessage());
-            return new ArrayList<>();
-        } catch (NullPointerException npe) {
-            return new ArrayList<>();
         } finally {
             close(rs);
             close(pst);
diff --git a/src/main/java/fr/xephi/authme/process/Management.java b/src/main/java/fr/xephi/authme/process/Management.java
index 1276012a..f32ae857 100644
--- a/src/main/java/fr/xephi/authme/process/Management.java
+++ b/src/main/java/fr/xephi/authme/process/Management.java
@@ -9,7 +9,7 @@ import fr.xephi.authme.process.join.AsyncronousJoin;
 import fr.xephi.authme.process.login.AsyncronousLogin;
 import fr.xephi.authme.process.logout.AsyncronousLogout;
 import fr.xephi.authme.process.quit.AsyncronousQuit;
-import fr.xephi.authme.process.register.AsyncronousRegister;
+import fr.xephi.authme.process.register.AsyncRegister;
 import fr.xephi.authme.process.unregister.AsyncronousUnregister;
 import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.settings.Settings;
@@ -46,7 +46,7 @@ public class Management {
 
             @Override
             public void run() {
-                new AsyncronousRegister(player, password, email, plugin, plugin.database).process();
+                new AsyncRegister(player, password, email, plugin, plugin.database).process();
             }
         });
     }
diff --git a/src/main/java/fr/xephi/authme/process/register/AsyncronousRegister.java b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
similarity index 62%
rename from src/main/java/fr/xephi/authme/process/register/AsyncronousRegister.java
rename to src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
index cc516697..9f5bdf77 100644
--- a/src/main/java/fr/xephi/authme/process/register/AsyncronousRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
@@ -1,10 +1,5 @@
 package fr.xephi.authme.process.register;
 
-import java.security.NoSuchAlgorithmException;
-import java.util.Date;
-
-import org.bukkit.entity.Player;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
@@ -13,95 +8,90 @@ import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
+import org.bukkit.entity.Player;
 
-public class AsyncronousRegister {
+import java.security.NoSuchAlgorithmException;
+import java.util.Date;
+
+public class AsyncRegister {
 
     protected Player player;
     protected String name;
     protected String password;
     protected String email = "";
-    protected boolean allowRegister;
     private AuthMe plugin;
     private DataSource database;
     private Messages m = Messages.getInstance();
 
-    public AsyncronousRegister(Player player, String password, String email,
-            AuthMe plugin, DataSource data) {
+    public AsyncRegister(Player player, String password, String email,
+                         AuthMe plugin, DataSource data) {
         this.player = player;
         this.password = password;
         name = player.getName().toLowerCase();
         this.email = email;
         this.plugin = plugin;
         this.database = data;
-        this.allowRegister = true;
     }
 
     protected String getIp() {
         return plugin.getIP(player);
     }
 
-    protected void preRegister() {
+    protected boolean preRegisterCheck() throws Exception {
         String lowpass = password.toLowerCase();
         if (PlayerCache.getInstance().isAuthenticated(name)) {
             m.send(player, "logged_in");
-            allowRegister = false;
-        }
-
-        else if (!Settings.isRegistrationEnabled) {
+            return false;
+        } else if (!Settings.isRegistrationEnabled) {
             m.send(player, "reg_disabled");
-            allowRegister = false;
-        }
-
-        else if (lowpass.contains("delete") || lowpass.contains("where") || lowpass.contains("insert") || lowpass.contains("modify") || lowpass.contains("from") || lowpass.contains("select") || lowpass.contains(";") || lowpass.contains("null") || !lowpass.matches(Settings.getPassRegex)) {
+            return false;
+        } else if (lowpass.contains("delete") || lowpass.contains("where") || lowpass.contains("insert") || lowpass.contains("modify") || lowpass.contains("from") || lowpass.contains("select") || lowpass.contains(";") || lowpass.contains("null") || !lowpass.matches(Settings.getPassRegex)) {
             m.send(player, "password_error");
-            allowRegister = false;
-        }
-
-        else if (lowpass.equalsIgnoreCase(player.getName())) {
+            return false;
+        } else if (lowpass.equalsIgnoreCase(player.getName())) {
             m.send(player, "password_error_nick");
-            allowRegister = false;
-        }
-
-        else if (password.length() < Settings.getPasswordMinLen || password.length() > Settings.passwordMaxLength) {
+            return false;
+        } else if (password.length() < Settings.getPasswordMinLen || password.length() > Settings.passwordMaxLength) {
             m.send(player, "pass_len");
-            allowRegister = false;
-        }
-
-        else if (!Settings.unsafePasswords.isEmpty() && Settings.unsafePasswords.contains(password.toLowerCase())) {
+            return false;
+        } else if (!Settings.unsafePasswords.isEmpty() && Settings.unsafePasswords.contains(password.toLowerCase())) {
             m.send(player, "password_error_unsafe");
-            allowRegister = false;
+            return false;
         } else if (database.isAuthAvailable(name)) {
             m.send(player, "user_regged");
-            allowRegister = false;
-        }
-
-        else if (Settings.getmaxRegPerIp > 0) {
+            return false;
+        } else if (Settings.getmaxRegPerIp > 0) {
             if (!plugin.authmePermissible(player, "authme.allow2accounts") && database.getAllAuthsByIp(getIp()).size() >= Settings.getmaxRegPerIp && !getIp().equalsIgnoreCase("127.0.0.1") && !getIp().equalsIgnoreCase("localhost")) {
                 m.send(player, "max_reg");
-                allowRegister = false;
+                return false;
             }
         }
-
+        return true;
     }
 
     public void process() {
-        preRegister();
-        if (!allowRegister)
-            return;
-        if (!email.isEmpty() && !email.equals("")) {
-            if (Settings.getmaxRegPerEmail > 0) {
-                if (!plugin.authmePermissible(player, "authme.allow2accounts") && database.getAllAuthsByEmail(email).size() >= Settings.getmaxRegPerEmail) {
-                    m.send(player, "max_reg");
-                    return;
+        try {
+            if (!preRegisterCheck())
+                return;
+            if (!email.isEmpty() && !email.equals("")) {
+                if (Settings.getmaxRegPerEmail > 0) {
+                    if (!plugin.authmePermissible(player, "authme.allow2accounts") && database.getAllAuthsByEmail(email).size() >= Settings.getmaxRegPerEmail) {
+                        m.send(player, "max_reg");
+                        return;
+                    }
                 }
+                emailRegister();
+                return;
             }
-            emailRegister();
-            return;
+            passwordRegister();
+        } catch (Exception e) {
+            ConsoleLogger.showError(e.getMessage());
+            ConsoleLogger.writeStackTrace(e);
+            m.send(player, "error");
         }
-        passwordRegister();
     }
 
-    protected void emailRegister() {
+    protected void emailRegister() throws Exception {
         if (Settings.getmaxRegPerEmail > 0) {
             if (!plugin.authmePermissible(player, "authme.allow2accounts") && database.getAllAuthsByEmail(email).size() >= Settings.getmaxRegPerEmail) {
                 m.send(player, "max_reg");
@@ -109,14 +99,8 @@ public class AsyncronousRegister {
             }
         }
         PlayerAuth auth;
-        try {
-            final String hashnew = PasswordSecurity.getHash(Settings.getPasswordHash, password, name);
-            auth = new PlayerAuth(name, hashnew, getIp(), 0, (int) player.getLocation().getX(), (int) player.getLocation().getY(), (int) player.getLocation().getZ(), player.getLocation().getWorld().getName(), email, player.getName());
-        } catch (NoSuchAlgorithmException e) {
-            ConsoleLogger.showError(e.getMessage());
-            m.send(player, "error");
-            return;
-        }
+        final String hashnew = PasswordSecurity.getHash(Settings.getPasswordHash, password, name);
+        auth = new PlayerAuth(name, hashnew, getIp(), 0, (int) player.getLocation().getX(), (int) player.getLocation().getY(), (int) player.getLocation().getZ(), player.getLocation().getWorld().getName(), email, player.getName());
         if (PasswordSecurity.userSalt.containsKey(name)) {
             auth.setSalt(PasswordSecurity.userSalt.get(name));
         }
@@ -124,8 +108,9 @@ public class AsyncronousRegister {
         database.updateEmail(auth);
         database.updateSession(auth);
         plugin.mail.main(auth, password);
-        ProcessSyncronousEmailRegister syncronous = new ProcessSyncronousEmailRegister(player, plugin);
+        ProcessSyncEmailRegister syncronous = new ProcessSyncEmailRegister(player, plugin);
         plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, syncronous);
+
     }
 
     protected void passwordRegister() {
diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java
similarity index 93%
rename from src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java
rename to src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java
index 0b1a723d..683320a1 100644
--- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java
@@ -14,14 +14,14 @@ import fr.xephi.authme.task.MessageTask;
 import fr.xephi.authme.task.TimeoutTask;
 import fr.xephi.authme.util.Utils;
 
-public class ProcessSyncronousEmailRegister implements Runnable {
+public class ProcessSyncEmailRegister implements Runnable {
 
     protected Player player;
     protected String name;
     private AuthMe plugin;
     private Messages m = Messages.getInstance();
 
-    public ProcessSyncronousEmailRegister(Player player, AuthMe plugin) {
+    public ProcessSyncEmailRegister(Player player, AuthMe plugin) {
         this.player = player;
         this.name = player.getName().toLowerCase();
         this.plugin = plugin;

From e3166c68076637325f109164e114409a516a99aa Mon Sep 17 00:00:00 2001
From: DNx5 <dani.narianto@gmail.com>
Date: Tue, 3 Nov 2015 12:52:07 +0700
Subject: [PATCH 112/117] update management class

---
 .../fr/xephi/authme/process/Management.java   | 66 +++++++++----------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/process/Management.java b/src/main/java/fr/xephi/authme/process/Management.java
index f32ae857..350d9bfe 100644
--- a/src/main/java/fr/xephi/authme/process/Management.java
+++ b/src/main/java/fr/xephi/authme/process/Management.java
@@ -1,10 +1,7 @@
 package fr.xephi.authme.process;
 
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.PluginManager;
-
 import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.process.email.AsyncChangeEmail;
 import fr.xephi.authme.process.join.AsyncronousJoin;
 import fr.xephi.authme.process.login.AsyncronousLogin;
 import fr.xephi.authme.process.logout.AsyncronousLogout;
@@ -13,83 +10,84 @@ import fr.xephi.authme.process.register.AsyncRegister;
 import fr.xephi.authme.process.unregister.AsyncronousUnregister;
 import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.settings.Settings;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitScheduler;
 
 /**
- *
  * @authors Xephi59,
- *          <a href="http://dev.bukkit.org/profiles/Possible/">Possible</a>
- *
+ * <a href="http://dev.bukkit.org/profiles/Possible/">Possible</a>
  */
 public class Management {
 
-    public AuthMe plugin;
+    private final AuthMe pl;
+    private final BukkitScheduler sched;
     public static RandomString rdm = new RandomString(Settings.captchaLength);
-    public PluginManager pm;
 
     public Management(AuthMe plugin) {
-        this.plugin = plugin;
-        this.pm = plugin.getServer().getPluginManager();
+        this.pl = plugin;
+        this.sched = pl.getServer().getScheduler();
     }
 
     public void performLogin(final Player player, final String password, final boolean forceLogin) {
-        Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+        sched.runTaskAsynchronously(pl, new Runnable() {
 
             @Override
             public void run() {
-                new AsyncronousLogin(player, password, forceLogin, plugin, plugin.database).process();
-            }
-        });
-    }
-
-    public void performRegister(final Player player, final String password, final String email) {
-        Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-            @Override
-            public void run() {
-                new AsyncRegister(player, password, email, plugin, plugin.database).process();
+                new AsyncronousLogin(player, password, forceLogin, pl, pl.database).process();
             }
         });
     }
 
     public void performLogout(final Player player) {
-        Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+        sched.runTaskAsynchronously(pl, new Runnable() {
 
             @Override
             public void run() {
-                new AsyncronousLogout(player, plugin, plugin.database).process();
+                new AsyncronousLogout(player, pl, pl.database).process();
             }
         });
     }
 
-    public void performQuit(final Player player, final boolean isKick) {
-        Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+    public void performRegister(final Player player, final String password, final String email) {
+        sched.runTaskAsynchronously(pl, new Runnable() {
 
             @Override
             public void run() {
-                new AsyncronousQuit(player, plugin, plugin.database, isKick).process();
+                new AsyncRegister(player, password, email, pl, pl.database).process();
             }
+        });
+    }
 
+    public void performUnregister(final Player player, final String password, final boolean force) {
+        sched.runTaskAsynchronously(pl, new Runnable() {
+
+            @Override
+            public void run() {
+                new AsyncronousUnregister(player, password, force, pl).process();
+            }
         });
     }
 
     public void performJoin(final Player player) {
-        Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+        sched.runTaskAsynchronously(pl, new Runnable() {
 
             @Override
             public void run() {
-                new AsyncronousJoin(player, plugin, plugin.database).process();
+                new AsyncronousJoin(player, pl, pl.database).process();
             }
 
         });
     }
 
-	public void performUnregister(final Player player, final String password, final boolean force) {
-        Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+    public void performQuit(final Player player, final boolean isKick) {
+        sched.runTaskAsynchronously(pl, new Runnable() {
 
             @Override
             public void run() {
-                new AsyncronousUnregister(player, password, force, plugin).process();
+                new AsyncronousQuit(player, pl, pl.database, isKick).process();
             }
+
         });
-	}
+    }
+
 }

From 4cbd8aad31648c519308a1cea6a424edbb8cbc06 Mon Sep 17 00:00:00 2001
From: DNx5 <dani.narianto@gmail.com>
Date: Tue, 3 Nov 2015 14:08:51 +0700
Subject: [PATCH 113/117] update ConsoleLogger

---
 .../java/fr/xephi/authme/ConsoleLogger.java   | 47 +++++++++----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/ConsoleLogger.java b/src/main/java/fr/xephi/authme/ConsoleLogger.java
index b7e75790..e791e352 100644
--- a/src/main/java/fr/xephi/authme/ConsoleLogger.java
+++ b/src/main/java/fr/xephi/authme/ConsoleLogger.java
@@ -1,5 +1,9 @@
 package fr.xephi.authme;
 
+import com.google.common.base.Throwables;
+import fr.xephi.authme.api.NewAPI;
+import fr.xephi.authme.settings.Settings;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
@@ -8,39 +12,30 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.logging.Logger;
 
-import com.google.common.base.Throwables;
-
-import fr.xephi.authme.api.NewAPI;
-import fr.xephi.authme.settings.Settings;
-
 public class ConsoleLogger {
 
     private static final Logger log = AuthMe.getInstance().getLogger();
     private static final DateFormat df = new SimpleDateFormat("[MM-dd HH:mm:ss]");
 
     public static void info(String message) {
-        if (AuthMe.getInstance().isEnabled()) {
-            log.info("[AuthMe] " + message);
-            if (Settings.useLogging) {
-                String dateTime;
-                synchronized (df) {
-                    dateTime = df.format(new Date());
-                }
-                writeLog(dateTime + " " + message);
+        log.info("[AuthMe] " + message);
+        if (Settings.useLogging) {
+            String dateTime;
+            synchronized (df) {
+                dateTime = df.format(new Date());
             }
+            writeLog(dateTime + " " + message);
         }
     }
 
     public static void showError(String message) {
-        if (AuthMe.getInstance().isEnabled()) {
-            log.warning("[AuthMe] " + message);
-            if (Settings.useLogging) {
-                String dateTime;
-                synchronized (df) {
-                    dateTime = df.format(new Date());
-                }
-                writeLog(dateTime + " ERROR: " + message);
+        log.warning("[AuthMe] " + message);
+        if (Settings.useLogging) {
+            String dateTime;
+            synchronized (df) {
+                dateTime = df.format(new Date());
             }
+            writeLog(dateTime + " ERROR: " + message);
         }
     }
 
@@ -54,10 +49,12 @@ public class ConsoleLogger {
     }
 
     public static void writeStackTrace(Exception ex) {
-        String dateTime;
-        synchronized (df) {
-            dateTime = df.format(new Date());
+        if (Settings.useLogging) {
+            String dateTime;
+            synchronized (df) {
+                dateTime = df.format(new Date());
+            }
+            writeLog(dateTime + " " + Throwables.getStackTraceAsString(ex));
         }
-        writeLog(dateTime + " " + Throwables.getStackTraceAsString(ex));
     }
 }

From f6a91085bddd42f0d55ac22b1a917094aa2b33e5 Mon Sep 17 00:00:00 2001
From: DNx5 <dani.narianto@gmail.com>
Date: Tue, 3 Nov 2015 14:16:57 +0700
Subject: [PATCH 114/117] added  async change email process

---
 .../process/email/AsyncChangeEmail.java       | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java

diff --git a/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java b/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java
new file mode 100644
index 00000000..fcdd01ea
--- /dev/null
+++ b/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java
@@ -0,0 +1,83 @@
+package fr.xephi.authme.process.email;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.settings.Settings;
+import org.bukkit.entity.Player;
+
+import java.util.Arrays;
+
+public class AsyncChangeEmail {
+
+    private final Player player;
+    private final AuthMe plugin;
+    private final String oldEmail;
+    private final String newEmail;
+    private final String newEmailVerify;
+    private final Messages m;
+
+    public AsyncChangeEmail(Player player, AuthMe plugin, String oldEmail, String newEmail, String newEmailVerify) {
+        this.player = player;
+        this.plugin = plugin;
+        this.oldEmail = oldEmail;
+        this.newEmail = newEmail;
+        this.newEmailVerify = newEmailVerify;
+        this.m = Messages.getInstance();
+    }
+
+    public AsyncChangeEmail(Player player, AuthMe plugin, String oldEmail, String newEmail) {
+        this(player, plugin, oldEmail, newEmail, newEmail);
+    }
+
+    public void process() {
+        try {
+            String playerName = player.getName().toLowerCase();
+
+            if (Settings.getmaxRegPerEmail > 0) {
+                if (!plugin.authmePermissible(player, "authme.allow2accounts") && plugin.database.getAllAuthsByEmail(newEmail).size() >= Settings.getmaxRegPerEmail) {
+                    m.send(player, "max_reg");
+                    return;
+                }
+            }
+
+            if (PlayerCache.getInstance().isAuthenticated(playerName)) {
+                if (!newEmail.equals(newEmailVerify)) {
+                    m.send(player, "email_confirm");
+                    return;
+                }
+                PlayerAuth auth = PlayerCache.getInstance().getAuth(playerName);
+                if (oldEmail != null) {
+                    if (auth.getEmail() == null || auth.getEmail().equals("your@email.com") || auth.getEmail().isEmpty()) {
+                        m.send(player, "usage_email_add");
+                        return;
+                    }
+                    if (!oldEmail.equals(auth.getEmail())) {
+                        m.send(player, "old_email_invalid");
+                        return;
+                    }
+                }
+                if (!Settings.isEmailCorrect(newEmail)) {
+                    m.send(player, "new_email_invalid");
+                    return;
+                }
+                String old = auth.getEmail();
+                auth.setEmail(newEmail);
+                if (!plugin.database.updateEmail(auth)) {
+                    m.send(player, "error");
+                    auth.setEmail(old);
+                    return;
+                }
+                PlayerCache.getInstance().updatePlayer(auth);
+                m.send(player, "email_changed");
+                player.sendMessage(Arrays.toString(m.send("email_defined")) + auth.getEmail());
+            }
+        } catch (Exception e) {
+            ConsoleLogger.showError(e.getMessage());
+            ConsoleLogger.writeStackTrace(e);
+            m.send(player, "error");
+        }
+    }
+}

From 4eb94787ac70757ffdc2f2277b5bec6b39f5d048 Mon Sep 17 00:00:00 2001
From: DNx5 <dani.narianto@gmail.com>
Date: Tue, 3 Nov 2015 14:22:32 +0700
Subject: [PATCH 115/117] implement async change email into management class.

---
 .../fr/xephi/authme/process/Management.java   | 47 +++++++++++++------
 .../process/email/AsyncChangeEmail.java       |  6 +++
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/process/Management.java b/src/main/java/fr/xephi/authme/process/Management.java
index 350d9bfe..ccd88b21 100644
--- a/src/main/java/fr/xephi/authme/process/Management.java
+++ b/src/main/java/fr/xephi/authme/process/Management.java
@@ -19,75 +19,92 @@ import org.bukkit.scheduler.BukkitScheduler;
  */
 public class Management {
 
-    private final AuthMe pl;
+    private final AuthMe plugin;
     private final BukkitScheduler sched;
     public static RandomString rdm = new RandomString(Settings.captchaLength);
 
     public Management(AuthMe plugin) {
-        this.pl = plugin;
-        this.sched = pl.getServer().getScheduler();
+        this.plugin = plugin;
+        this.sched = this.plugin.getServer().getScheduler();
     }
 
     public void performLogin(final Player player, final String password, final boolean forceLogin) {
-        sched.runTaskAsynchronously(pl, new Runnable() {
+        sched.runTaskAsynchronously(plugin, new Runnable() {
 
             @Override
             public void run() {
-                new AsyncronousLogin(player, password, forceLogin, pl, pl.database).process();
+                new AsyncronousLogin(player, password, forceLogin, plugin, plugin.database).process();
             }
         });
     }
 
     public void performLogout(final Player player) {
-        sched.runTaskAsynchronously(pl, new Runnable() {
+        sched.runTaskAsynchronously(plugin, new Runnable() {
 
             @Override
             public void run() {
-                new AsyncronousLogout(player, pl, pl.database).process();
+                new AsyncronousLogout(player, plugin, plugin.database).process();
             }
         });
     }
 
     public void performRegister(final Player player, final String password, final String email) {
-        sched.runTaskAsynchronously(pl, new Runnable() {
+        sched.runTaskAsynchronously(plugin, new Runnable() {
 
             @Override
             public void run() {
-                new AsyncRegister(player, password, email, pl, pl.database).process();
+                new AsyncRegister(player, password, email, plugin, plugin.database).process();
             }
         });
     }
 
     public void performUnregister(final Player player, final String password, final boolean force) {
-        sched.runTaskAsynchronously(pl, new Runnable() {
+        sched.runTaskAsynchronously(plugin, new Runnable() {
 
             @Override
             public void run() {
-                new AsyncronousUnregister(player, password, force, pl).process();
+                new AsyncronousUnregister(player, password, force, plugin).process();
             }
         });
     }
 
     public void performJoin(final Player player) {
-        sched.runTaskAsynchronously(pl, new Runnable() {
+        sched.runTaskAsynchronously(plugin, new Runnable() {
 
             @Override
             public void run() {
-                new AsyncronousJoin(player, pl, pl.database).process();
+                new AsyncronousJoin(player, plugin, plugin.database).process();
             }
 
         });
     }
 
     public void performQuit(final Player player, final boolean isKick) {
-        sched.runTaskAsynchronously(pl, new Runnable() {
+        sched.runTaskAsynchronously(plugin, new Runnable() {
 
             @Override
             public void run() {
-                new AsyncronousQuit(player, pl, pl.database, isKick).process();
+                new AsyncronousQuit(player, plugin, plugin.database, isKick).process();
             }
 
         });
     }
 
+    public void performAddEmail(final Player player, final String newEmail, final String newEmailVerify) {
+        sched.runTaskAsynchronously(plugin, new Runnable() {
+            @Override
+            public void run() {
+                new AsyncChangeEmail(player, plugin, null, newEmail, newEmailVerify).process();
+            }
+        });
+    }
+
+    public void performChangeEmail(final Player player, final String oldEmail, final String newEmail) {
+        sched.runTaskAsynchronously(plugin, new Runnable() {
+            @Override
+            public void run() {
+                new AsyncChangeEmail(player, plugin, oldEmail, newEmail).process();
+            }
+        });
+    }
 }
diff --git a/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java b/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java
index fcdd01ea..8735aedf 100644
--- a/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java
+++ b/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java
@@ -73,6 +73,12 @@ public class AsyncChangeEmail {
                 PlayerCache.getInstance().updatePlayer(auth);
                 m.send(player, "email_changed");
                 player.sendMessage(Arrays.toString(m.send("email_defined")) + auth.getEmail());
+            } else {
+                if (!plugin.database.isAuthAvailable(playerName)) {
+                    m.send(player, "login_msg");
+                } else {
+                    m.send(player, "reg_email_msg");
+                }
             }
         } catch (Exception e) {
             ConsoleLogger.showError(e.getMessage());

From 375162ab67cdcb1d20a363759afce180ad909885 Mon Sep 17 00:00:00 2001
From: DNx5 <dani.narianto@gmail.com>
Date: Tue, 3 Nov 2015 14:41:05 +0700
Subject: [PATCH 116/117] update email commands to use new async process

---
 .../executable/email/AddEmailCommand.java     | 58 ++----------
 .../executable/email/ChangeEmailCommand.java  | 54 +----------
 .../xephi/authme/commands/EmailCommand.java   | 91 ++-----------------
 .../authme/datasource/CacheDataSource.java    | 27 ++----
 .../fr/xephi/authme/datasource/MySQL.java     |  1 +
 .../process/email/AsyncChangeEmail.java       | 12 ++-
 6 files changed, 37 insertions(+), 206 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java
index f91e6a24..d73e4397 100644
--- a/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java
@@ -1,25 +1,20 @@
 package fr.xephi.authme.command.executable.email;
 
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.cache.auth.PlayerAuth;
-import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
-import fr.xephi.authme.settings.Settings;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 public class AddEmailCommand extends ExecutableCommand {
 
     /**
      * Execute the command.
      *
-     * @param sender The command sender.
+     * @param sender           The command sender.
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
-     *
      * @return True if the command was executed successfully, false otherwise.
      */
     @Override
@@ -35,57 +30,16 @@ public class AddEmailCommand extends ExecutableCommand {
         String playerMailVerify = commandArguments.get(1);
 
         // Make sure the current command executor is a player
-        if(!(sender instanceof Player)) {
+        if (!(sender instanceof Player)) {
             return true;
         }
 
         // Get the player instance and name
         final Player player = (Player) sender;
-        final String playerName = player.getName();
+        final String playerName = player.getName().toLowerCase();
 
         // Command logic
-        if (Settings.getmaxRegPerEmail > 0) {
-            if (!plugin.authmePermissible(sender, "authme.allow2accounts") && plugin.database.getAllAuthsByEmail(playerMail).size() >= Settings.getmaxRegPerEmail) {
-                m.send(player, "max_reg");
-                return true;
-            }
-        }
-
-        if (playerMail.equals(playerMailVerify) && PlayerCache.getInstance().isAuthenticated(playerName)) {
-            PlayerAuth auth = PlayerCache.getInstance().getAuth(playerName);
-
-            if (auth.getEmail() == null || (!auth.getEmail().equals("your@email.com") && !auth.getEmail().isEmpty())) {
-                m.send(player, "usage_email_change");
-                return true;
-            }
-
-            if (!Settings.isEmailCorrect(playerMail)) {
-                m.send(player, "email_invalid");
-                return true;
-            }
-
-            auth.setEmail(playerMail);
-
-            if (!plugin.database.updateEmail(auth)) {
-                m.send(player, "error");
-                return true;
-            }
-
-            PlayerCache.getInstance().updatePlayer(auth);
-            m.send(player, "email_added");
-            player.sendMessage(auth.getEmail());
-
-        } else if (PlayerCache.getInstance().isAuthenticated(playerName)) {
-            m.send(player, "email_confirm");
-
-        } else {
-            if (!plugin.database.isAuthAvailable(playerName)) {
-                m.send(player, "login_msg");
-            } else {
-                m.send(player, "reg_email_msg");
-            }
-        }
-
+        plugin.management.performAddEmail(player, playerMail, playerMailVerify);
         return true;
     }
 }
diff --git a/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java
index 0b5d7e3c..fe6a4be2 100644
--- a/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java
@@ -1,18 +1,12 @@
 package fr.xephi.authme.command.executable.email;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.cache.auth.PlayerAuth;
-import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
-import fr.xephi.authme.settings.Settings;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.Arrays;
-
 public class ChangeEmailCommand extends ExecutableCommand {
 
     /**
@@ -45,51 +39,7 @@ public class ChangeEmailCommand extends ExecutableCommand {
         final String playerName = player.getName();
 
         // Command logic
-
-        try {
-            if (Settings.getmaxRegPerEmail > 0) {
-                if (!plugin.authmePermissible(sender, "authme.allow2accounts") && plugin.database.getAllAuthsByEmail(playerMailNew).size() >= Settings.getmaxRegPerEmail) {
-                    m.send(player, "max_reg");
-                    return true;
-                }
-            }
-            if (PlayerCache.getInstance().isAuthenticated(playerName)) {
-                PlayerAuth auth = PlayerCache.getInstance().getAuth(playerName);
-                if (auth.getEmail() == null || auth.getEmail().equals("your@email.com") || auth.getEmail().isEmpty()) {
-                    m.send(player, "usage_email_add");
-                    return true;
-                }
-                if (!playerMailOld.equals(auth.getEmail())) {
-                    m.send(player, "old_email_invalid");
-                    return true;
-                }
-                if (!Settings.isEmailCorrect(playerMailNew)) {
-                    m.send(player, "new_email_invalid");
-                    return true;
-                }
-                auth.setEmail(playerMailNew);
-                if (!plugin.database.updateEmail(auth)) {
-                    m.send(player, "error");
-                    return true;
-                }
-                PlayerCache.getInstance().updatePlayer(auth);
-                m.send(player, "email_changed");
-                player.sendMessage(Arrays.toString(m.send("email_defined")) + auth.getEmail());
-            } else if (PlayerCache.getInstance().isAuthenticated(playerName)) {
-                m.send(player, "email_confirm");
-            } else {
-                if (!plugin.database.isAuthAvailable(playerName)) {
-                    m.send(player, "login_msg");
-                } else {
-                    m.send(player, "reg_email_msg");
-                }
-            }
-            return true;
-        } catch (Exception e) {
-            ConsoleLogger.showError(e.getMessage());
-            ConsoleLogger.writeStackTrace(e);
-            m.send(sender, "error");
-            return false;
-        }
+        plugin.management.performChangeEmail(player, playerMailOld, playerMailNew);
+        return true;
     }
 }
diff --git a/src/main/java/fr/xephi/authme/commands/EmailCommand.java b/src/main/java/fr/xephi/authme/commands/EmailCommand.java
index 241d543d..c59bcbc3 100644
--- a/src/main/java/fr/xephi/authme/commands/EmailCommand.java
+++ b/src/main/java/fr/xephi/authme/commands/EmailCommand.java
@@ -1,13 +1,5 @@
 package fr.xephi.authme.commands;
 
-import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
@@ -16,9 +8,14 @@ import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.security.NoSuchAlgorithmException;
 
 /**
- *
  * @author Xephi59
  */
 public class EmailCommand implements CommandExecutor {
@@ -32,7 +29,7 @@ public class EmailCommand implements CommandExecutor {
 
     @Override
     public boolean onCommand(CommandSender sender, Command cmnd, String label,
-            String[] args) {
+                             String[] args) {
         if (!(sender instanceof Player)) {
             return true;
         }
@@ -57,81 +54,13 @@ public class EmailCommand implements CommandExecutor {
                 m.send(player, "usage_email_add");
                 return true;
             }
-            if (Settings.getmaxRegPerEmail > 0) {
-                if (!plugin.authmePermissible(sender, "authme.allow2accounts") && plugin.database.getAllAuthsByEmail(args[1]).size() >= Settings.getmaxRegPerEmail) {
-                    m.send(player, "max_reg");
-                    return true;
-                }
-            }
-            if (args[1].equals(args[2]) && PlayerCache.getInstance().isAuthenticated(name)) {
-                PlayerAuth auth = PlayerCache.getInstance().getAuth(name);
-                if (auth.getEmail() == null || (!auth.getEmail().equals("your@email.com") && !auth.getEmail().isEmpty())) {
-                    m.send(player, "usage_email_change");
-                    return true;
-                }
-                if (!Settings.isEmailCorrect(args[1])) {
-                    m.send(player, "email_invalid");
-                    return true;
-                }
-                auth.setEmail(args[1]);
-                if (!plugin.database.updateEmail(auth)) {
-                    m.send(player, "error");
-                    return true;
-                }
-                PlayerCache.getInstance().updatePlayer(auth);
-                m.send(player, "email_added");
-                player.sendMessage(auth.getEmail());
-            } else if (PlayerCache.getInstance().isAuthenticated(name)) {
-                m.send(player, "email_confirm");
-            } else {
-                if (!plugin.database.isAuthAvailable(name)) {
-                    m.send(player, "login_msg");
-                } else {
-                    m.send(player, "reg_email_msg");
-                }
-            }
+            plugin.management.performAddEmail(player, args[1], args[2]);
         } else if (args[0].equalsIgnoreCase("change")) {
             if (args.length != 3) {
                 m.send(player, "usage_email_change");
                 return true;
             }
-            if (Settings.getmaxRegPerEmail > 0) {
-                if (!plugin.authmePermissible(sender, "authme.allow2accounts") && plugin.database.getAllAuthsByEmail(args[2]).size() >= Settings.getmaxRegPerEmail) {
-                    m.send(player, "max_reg");
-                    return true;
-                }
-            }
-            if (PlayerCache.getInstance().isAuthenticated(name)) {
-                PlayerAuth auth = PlayerCache.getInstance().getAuth(name);
-                if (auth.getEmail() == null || auth.getEmail().equals("your@email.com") || auth.getEmail().isEmpty()) {
-                    m.send(player, "usage_email_add");
-                    return true;
-                }
-                if (!args[1].equals(auth.getEmail())) {
-                    m.send(player, "old_email_invalid");
-                    return true;
-                }
-                if (!Settings.isEmailCorrect(args[2])) {
-                    m.send(player, "new_email_invalid");
-                    return true;
-                }
-                auth.setEmail(args[2]);
-                if (!plugin.database.updateEmail(auth)) {
-                    m.send(player, "error");
-                    return true;
-                }
-                PlayerCache.getInstance().updatePlayer(auth);
-                m.send(player, "email_changed");
-                player.sendMessage(Arrays.toString(m.send("email_defined")) + auth.getEmail());
-            } else if (PlayerCache.getInstance().isAuthenticated(name)) {
-                m.send(player, "email_confirm");
-            } else {
-                if (!plugin.database.isAuthAvailable(name)) {
-                    m.send(player, "login_msg");
-                } else {
-                    m.send(player, "reg_email_msg");
-                }
-            }
+            plugin.management.performChangeEmail(player, args[1], args[2]);
         }
         if (args[0].equalsIgnoreCase("recovery")) {
             if (args.length != 2) {
@@ -151,7 +80,7 @@ public class EmailCommand implements CommandExecutor {
                     RandomString rand = new RandomString(Settings.getRecoveryPassLength);
                     String thePass = rand.nextString();
                     String hashnew = PasswordSecurity.getHash(Settings.getPasswordHash, thePass, name);
-                    PlayerAuth auth = null;
+                    PlayerAuth auth;
                     if (PlayerCache.getInstance().isAuthenticated(name)) {
                         auth = PlayerCache.getInstance().getAuth(name);
                     } else if (plugin.database.isAuthAvailable(name)) {
diff --git a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
index 40ed684c..dc2ec02c 100644
--- a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
+++ b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
@@ -9,10 +9,7 @@ import org.bukkit.entity.Player;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.*;
 
 public class CacheDataSource implements DataSource {
 
@@ -229,23 +226,15 @@ public class CacheDataSource implements DataSource {
 
     @Override
     public synchronized boolean updateEmail(final PlayerAuth auth) {
-        if (!cache.containsKey(auth.getNickname())) {
+        try {
+            return exec.submit(new Callable<Boolean>() {
+                public Boolean call() {
+                    return source.updateEmail(auth);
+                }
+            }).get();
+        } catch (Exception e) {
             return false;
         }
-        PlayerAuth cachedAuth = cache.get(auth.getNickname());
-        final String oldEmail = cachedAuth.getEmail();
-        cachedAuth.setEmail(auth.getEmail());
-        exec.execute(new Runnable() {
-            @Override
-            public void run() {
-                if (!source.updateEmail(auth)) {
-                    if (cache.containsKey(auth.getNickname())) {
-                        cache.get(auth.getNickname()).setEmail(oldEmail);
-                    }
-                }
-            }
-        });
-        return true;
     }
 
     @Override
diff --git a/src/main/java/fr/xephi/authme/datasource/MySQL.java b/src/main/java/fr/xephi/authme/datasource/MySQL.java
index e0479468..f20d99ef 100644
--- a/src/main/java/fr/xephi/authme/datasource/MySQL.java
+++ b/src/main/java/fr/xephi/authme/datasource/MySQL.java
@@ -692,6 +692,7 @@ public class MySQL implements DataSource {
             pst.executeUpdate();
         } catch (Exception ex) {
             ConsoleLogger.showError(ex.getMessage());
+            ConsoleLogger.writeStackTrace(ex);
             return false;
         } finally {
             close(pst);
diff --git a/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java b/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java
index 8735aedf..93f6f22a 100644
--- a/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java
+++ b/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java
@@ -71,13 +71,21 @@ public class AsyncChangeEmail {
                     return;
                 }
                 PlayerCache.getInstance().updatePlayer(auth);
+                if (oldEmail == null) {
+                    m.send(player, "email_added");
+                    player.sendMessage(auth.getEmail());
+                    return;
+                }
                 m.send(player, "email_changed");
                 player.sendMessage(Arrays.toString(m.send("email_defined")) + auth.getEmail());
             } else {
-                if (!plugin.database.isAuthAvailable(playerName)) {
+                if (plugin.database.isAuthAvailable(playerName)) {
                     m.send(player, "login_msg");
                 } else {
-                    m.send(player, "reg_email_msg");
+                    if (Settings.emailRegistration)
+                        m.send(player, "reg_email_msg");
+                    else
+                        m.send(player, "reg_msg");
                 }
             }
         } catch (Exception e) {

From 76fa63118415df4b6d60925dec54b07e8cc01297 Mon Sep 17 00:00:00 2001
From: Xephi <xephirot59@gmail.com>
Date: Tue, 3 Nov 2015 15:23:02 +0100
Subject: [PATCH 117/117] Disable Hikari Cache definitively

---
 src/main/java/fr/xephi/authme/datasource/MySQL.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/datasource/MySQL.java b/src/main/java/fr/xephi/authme/datasource/MySQL.java
index 8fdc2371..940d9263 100644
--- a/src/main/java/fr/xephi/authme/datasource/MySQL.java
+++ b/src/main/java/fr/xephi/authme/datasource/MySQL.java
@@ -100,13 +100,7 @@ public class MySQL implements DataSource {
         config.setJdbcUrl("jdbc:mysql://" + this.host + ":" + this.port + "/" + this.database);
         config.setUsername(this.username);
         config.setPassword(this.password);
-        if (Settings.isMySQLWebsite) {
-            config.addDataSourceProperty("cachePrepStmts", "false");
-        } else {
-            config.addDataSourceProperty("cachePrepStmts", "true");
-            config.addDataSourceProperty("prepStmtCacheSize", "250");
-            config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
-        }
+        config.addDataSourceProperty("cachePrepStmts", "false");
         config.addDataSourceProperty("autoReconnect", false);
         config.setInitializationFailFast(true); // Don't start the plugin if the database is unavailable
         config.setMaxLifetime(180000); // 3 Min