Merge pull request #279 from AuthMe-Team/master

Merge from team repo

.editorconfig

@@ -0,0 +1,13 @@
+# Top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# Set the charset, and space indention
+[*.java]
+charset = utf-8
+indent_style = space
+indent_size = 4

.floo

@@ -0,0 +1,3 @@
+{
+    "url": "https://floobits.com/AuthMe-Team/AuthMeReloaded"
+}

.flooignore

@@ -0,0 +1,123 @@
+### Java ###
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+#*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
+
+*.iml
+
+## Directory-based project format:
+.idea/
+# if you remove the above rule, at least ignore the following:
+
+# User-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# .idea/dictionaries
+
+# Sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+# .idea/uiDesigner.xml
+
+# Gradle:
+# .idea/gradle.xml
+# .idea/libraries
+
+# Mongo Explorer plugin:
+# .idea/mongoSettings.xml
+
+## File-based project format:
+*.ipr
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
+
+### Maven ###
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+
+
+### NetBeans ###
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+nb-configuration.xml
+.nb-gradle/

.gitignore

@@ -1,12 +1,7 @@
-# Created by https://www.gitignore.io
-
-### Java ###
+### Java files ###
 *.class
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
+# Package Files
 #*.jar
 *.war
 *.ear
@@ -15,40 +10,27 @@
 hs_err_pid*
 
 
+
 ### Intellij ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
-
+# Ignore project files
 *.iml
 
-## Directory-based project format:
-.idea/
-# if you remove the above rule, at least ignore the following:
+# Ignore IDEA directory
+.idea/*
 
-# User-specific stuff:
-# .idea/workspace.xml
-# .idea/tasks.xml
-# .idea/dictionaries
+# Include the project's code style settings file
+!.idea/codeStyleSettings.xml
 
-# Sensitive or high-churn files:
-# .idea/dataSources.ids
-# .idea/dataSources.xml
-# .idea/sqlDataSources.xml
-# .idea/dynamic.xml
-# .idea/uiDesigner.xml
+# Include the project's dictionary
+!.idea/dictionaries/
+!.idea/dictionaries/*
 
-# Gradle:
-# .idea/gradle.xml
-# .idea/libraries
-
-# Mongo Explorer plugin:
-# .idea/mongoSettings.xml
-
-## File-based project format:
+# File-based project format:
 *.ipr
 *.iws
 
-## Plugin-specific files:
-
+### Plugin-specific files: ###
 # IntelliJ
 /out/
 
@@ -64,6 +46,7 @@ crashlytics.properties
 crashlytics-build.properties
 
 
+
 ### Eclipse ###
 *.pydevproject
 .metadata
@@ -103,6 +86,7 @@ local.properties
 .texlipse
 
 
+
 ### Maven ###
 target/
 pom.xml.tag
@@ -114,6 +98,7 @@ dependency-reduced-pom.xml
 buildNumber.properties
 
 
+
 ### NetBeans ###
 nbproject/private/
 build/
@@ -123,3 +108,9 @@ nbdist/
 nbactions.xml
 nb-configuration.xml
 .nb-gradle/
+
+
+
+### Git ###
+# Don't exclude the .gitignore itself
+!.gitignore

.idea/codeStyleSettings.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="AUTODETECT_INDENTS" value="false" />
+        <option name="LINE_SEPARATOR" value="&#10;" />
+        <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />
+        <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Project" />
+  </component>
+</project>

.idea/dictionaries/Tim.xml

@@ -0,0 +1,7 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="Tim">
+    <words>
+      <w>authme</w>
+    </words>
+  </dictionary>
+</component>

README.md

@@ -47,8 +47,7 @@ McStats: http://mcstats.org/plugin/AuthMe
 #####Running Requirements:
 >- Java 1.7 (should work also with Java 1.8)
 >- Spigot or CraftBukkit (1.7.10 or 1.8.X)
->- Vault
->- Protocollib
+>- ProtocolLib (optional, required by the protectInventory feature)
 
 <hr>
 ###Plugin Description:
@@ -129,7 +128,7 @@ typing commands or use the inventory. It can also kick players with uncommon lon
 <hr>
 
 #####Donate
-<p>Do you like my work? Do you want to buy me a coffee? :)<br>
+<p>Do you like our work? Do you want to buy us a coffee? :)<br>
 EUR: <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=QLMM9SNCX825Y"><img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif"></a>
 USD: <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=PWQMYCP2SAH6L"><img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif"></a></p>
 

src/main/java/fr/xephi/authme/AntiBot.java

@@ -0,0 +1,99 @@
+package fr.xephi.authme;
+
+import fr.xephi.authme.permission.UserPermission;
+import fr.xephi.authme.settings.MessageKey;
+import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Wrapper;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The AntiBot Service Management class.
+ */
+public class AntiBot {
+
+    private static final Wrapper wrapper = Wrapper.getInstance();
+    private static final AuthMe plugin = wrapper.getAuthMe();
+    private static final Messages messages = wrapper.getMessages();
+    private static final List<String> antibotPlayers = new ArrayList<>();
+    private static AntiBotStatus antiBotStatus = AntiBotStatus.DISABLED;
+
+    public static void setupAntiBotService() {
+        if (!Settings.enableAntiBot) {
+            return;
+        }
+        Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
+            @Override
+            public void run() {
+                antiBotStatus = AntiBotStatus.LISTENING;
+            }
+        }, 2400);
+    }
+
+    public static void overrideAntiBotStatus(boolean activated) {
+        if (antiBotStatus == AntiBotStatus.DISABLED) {
+            return;
+        }
+        if (activated) {
+            antiBotStatus = AntiBotStatus.ACTIVE;
+        } else {
+            antiBotStatus = AntiBotStatus.LISTENING;
+        }
+    }
+
+    public static AntiBotStatus getAntiBotStatus() {
+        return antiBotStatus;
+    }
+
+    public static void activateAntiBot() {
+        antiBotStatus = AntiBotStatus.ACTIVE;
+        for (String s : messages.retrieve(MessageKey.ANTIBOT_AUTO_ENABLED_MESSAGE)) {
+            Bukkit.broadcastMessage(s);
+        }
+
+        wrapper.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
+            @Override
+            public void run() {
+                if (antiBotStatus == AntiBotStatus.ACTIVE) {
+                    antiBotStatus = AntiBotStatus.LISTENING;
+                    antibotPlayers.clear();
+                    for (String s : messages.retrieve(MessageKey.ANTIBOT_AUTO_DISABLED_MESSAGE)) {
+                        Bukkit.broadcastMessage(s.replace("%m", "" + Settings.antiBotDuration));
+                    }
+                }
+            }
+        }, Settings.antiBotDuration * 1200);
+    }
+
+    public static void checkAntiBot(final Player player) {
+        if (antiBotStatus == AntiBotStatus.ACTIVE || antiBotStatus == AntiBotStatus.DISABLED) {
+            return;
+        }
+        if (plugin.getPermissionsManager().hasPermission(player, UserPermission.BYPASS_ANTIBOT)) {
+            return;
+        }
+
+        antibotPlayers.add(player.getName().toLowerCase());
+        if (antibotPlayers.size() > Settings.antiBotSensibility) {
+            activateAntiBot();
+            return;
+        }
+        Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
+            @Override
+            public void run() {
+                antibotPlayers.remove(player.getName().toLowerCase());
+            }
+        }, 300);
+    }
+
+    public enum AntiBotStatus {
+        LISTENING,
+        DISABLED,
+        ACTIVE
+    }
+
+}

src/main/java/fr/xephi/authme/ConsoleFilter.java

@@ -4,14 +4,23 @@ import java.util.logging.Filter;
 import java.util.logging.LogRecord;
 
 /**
+ * Console filter Class
  *
  * @author Xephi59
+ * @version $Revision: 1.0 $
  */
 public class ConsoleFilter implements Filter {
 
     public ConsoleFilter() {
     }
 
+    /**
+     * Method isLoggable.
+     *
+     * @param record LogRecord
+     *
+     * @return boolean * @see java.util.logging.Filter#isLoggable(LogRecord)
+     */
     @Override
     public boolean isLoggable(LogRecord record) {
         try {
@@ -22,8 +31,8 @@ public class ConsoleFilter implements Filter {
                 return true;
             if (!logM.contains("/login ") && !logM.contains("/l ") && !logM.contains("/reg ") && !logM.contains("/changepassword ") && !logM.contains("/unregister ") && !logM.contains("/authme register ") && !logM.contains("/authme changepassword ") && !logM.contains("/authme reg ") && !logM.contains("/authme cp ") && !logM.contains("/register "))
                 return true;
-            String playername = record.getMessage().split(" ")[0];
-            record.setMessage(playername + " issued an AuthMe command!");
+            String playerName = record.getMessage().split(" ")[0];
+            record.setMessage(playerName + " issued an AuthMe command!");
             return true;
         } catch (NullPointerException npe) {
             return true;

src/main/java/fr/xephi/authme/ConsoleLogger.java

@@ -1,61 +1,82 @@
 package fr.xephi.authme;
 
+import com.google.common.base.Throwables;
+import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.StringUtils;
+import fr.xephi.authme.util.Wrapper;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.logging.Logger;
 
-import com.google.common.base.Throwables;
+/**
+ * The plugin's static logger.
+ */
+public final class ConsoleLogger {
 
-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 Wrapper wrapper = Wrapper.getInstance();
     private static final DateFormat df = new SimpleDateFormat("[MM-dd HH:mm:ss]");
 
+    private ConsoleLogger() {
+        // Service class
+    }
+
+    /**
+     * Print an info message.
+     *
+     * @param message String
+     */
     public static void info(String message) {
-        log.info("[AuthMe] " + message);
-        if (Settings.useLogging) {
-            String dateTime;
-            synchronized (df) {
-                dateTime = df.format(new Date());
-            }
-            writeLog(dateTime + " " + message);
+        wrapper.getLogger().info(message);
+        if (!Settings.useLogging) {
+            return;
         }
+        writeLog("" + message);
     }
 
+    /**
+     * Print an error message.
+     *
+     * @param message String
+     */
     public static void showError(String message) {
-        log.warning("[AuthMe] " + message);
-        if (Settings.useLogging) {
-            String dateTime;
-            synchronized (df) {
-                dateTime = df.format(new Date());
-            }
-            writeLog(dateTime + " ERROR: " + message);
+        wrapper.getLogger().warning(message);
+        if (!Settings.useLogging) {
+            return;
         }
+        writeLog("ERROR: " + message);
     }
 
-    public static void writeLog(String message) {
+    /**
+     * Write a message into the log file with a TimeStamp.
+     *
+     * @param message String
+     */
+    private static void writeLog(String message) {
+        String dateTime;
+        synchronized (df) {
+            dateTime = df.format(new Date());
+        }
         try {
-            Files.write(Settings.LOG_FILE.toPath(), (message + NewAPI.newline).getBytes(),
-                    StandardOpenOption.APPEND,
-                    StandardOpenOption.CREATE);
+            Files.write(Settings.LOG_FILE.toPath(), (dateTime + ": " + message + StringUtils.newline).getBytes(),
+                StandardOpenOption.APPEND,
+                StandardOpenOption.CREATE);
         } catch (IOException ignored) {
         }
     }
 
+    /**
+     * Write a StackTrace into the log.
+     *
+     * @param ex Exception
+     */
     public static void writeStackTrace(Exception ex) {
-        if (Settings.useLogging) {
-            String dateTime;
-            synchronized (df) {
-                dateTime = df.format(new Date());
-            }
-            writeLog(dateTime + " " + Throwables.getStackTraceAsString(ex));
+        if (!Settings.useLogging) {
+            return;
         }
+        writeLog("" + Throwables.getStackTraceAsString(ex));
     }
 }

src/main/java/fr/xephi/authme/DataManager.java

@@ -1,196 +1,269 @@
-package fr.xephi.authme;
-
-import java.io.File;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-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 {
-
-    public AuthMe plugin;
-
-    public DataManager(AuthMe plugin) {
-        this.plugin = plugin;
-    }
-
-    public void run() {
-    }
-
-    public synchronized OfflinePlayer getOfflinePlayer(final String name) {
-        ExecutorService executor = Executors.newSingleThreadExecutor();
-        Future<OfflinePlayer> result = executor.submit(new Callable<OfflinePlayer>() {
-
-            public synchronized OfflinePlayer call() throws Exception {
-                OfflinePlayer result = null;
-                try {
-                    for (OfflinePlayer op : Bukkit.getOfflinePlayers())
-                        if (op.getName().equalsIgnoreCase(name)) {
-                            result = op;
-                            break;
-                        }
-                } catch (Exception e) {
-                }
-                return result;
-            }
-        });
-        try {
-            return result.get();
-        } catch (Exception e) {
-            return (null);
-        } finally {
-            executor.shutdown();
-        }
-    }
-
-    public synchronized void purgeAntiXray(List<String> cleared) {
-        int i = 0;
-        for (String name : cleared) {
-            try {
-                org.bukkit.OfflinePlayer player = getOfflinePlayer(name);
-                if (player == null)
-                    continue;
-                String playerName = player.getName();
-                File playerFile = new File("." + File.separator + "plugins" + File.separator + "AntiXRayData" + File.separator + "PlayerData" + File.separator + playerName);
-                if (playerFile.exists()) {
-                    playerFile.delete();
-                    i++;
-                }
-            } catch (Exception e) {
-            }
-        }
-        ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " AntiXRayData Files");
-    }
-
-    public synchronized void purgeLimitedCreative(List<String> cleared) {
-        int i = 0;
-        for (String name : cleared) {
-            try {
-                org.bukkit.OfflinePlayer player = getOfflinePlayer(name);
-                if (player == null)
-                    continue;
-                String playerName = player.getName();
-                File playerFile = new File("." + File.separator + "plugins" + File.separator + "LimitedCreative" + File.separator + "inventories" + File.separator + playerName + ".yml");
-                if (playerFile.exists()) {
-                    playerFile.delete();
-                    i++;
-                }
-                playerFile = new File("." + File.separator + "plugins" + File.separator + "LimitedCreative" + File.separator + "inventories" + File.separator + playerName + "_creative.yml");
-                if (playerFile.exists()) {
-                    playerFile.delete();
-                    i++;
-                }
-                playerFile = new File("." + File.separator + "plugins" + File.separator + "LimitedCreative" + File.separator + "inventories" + File.separator + playerName + "_adventure.yml");
-                if (playerFile.exists()) {
-                    playerFile.delete();
-                    i++;
-                }
-            } catch (Exception e) {
-            }
-        }
-        ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " LimitedCreative Survival, Creative and Adventure files");
-    }
-
-    public synchronized void purgeDat(List<String> cleared) {
-        int i = 0;
-        for (String name : cleared) {
-            try {
-                org.bukkit.OfflinePlayer player = getOfflinePlayer(name);
-                if (player == null) {
-                    continue;
-                }
-
-                try {
-                    File playerFile = new File(plugin.getServer().getWorldContainer() + File.separator + Settings.defaultWorld + File.separator + "players" + File.separator + player.getUniqueId() + ".dat");
-                    playerFile.delete();
-                    i++;
-                } catch(Exception ignore) {
-                    File playerFile = new File(plugin.getServer().getWorldContainer() + File.separator + Settings.defaultWorld + File.separator + "players" + File.separator + player.getName() + ".dat");
-                    if (playerFile.exists()) {
-                        playerFile.delete();
-                        i++;
-                    }
-                }
-            } catch (Exception ignore) {
-            }
-        }
-        ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " .dat Files");
-    }
-
-    @SuppressWarnings("deprecation")
-    public void purgeEssentials(List<String> cleared) {
-        int i = 0;
-        for (String name : cleared) {
-            try {
-                File playerFile = new File(plugin.ess.getDataFolder() + File.separator + "userdata" + File.separator + plugin.getServer().getOfflinePlayer(name).getUniqueId() + ".yml");                    
-                playerFile.delete();
-                i++;
-            } catch (Exception e) {
-                File playerFile = new File(plugin.ess.getDataFolder() + File.separator + "userdata" + File.separator + name + ".yml");
-                if (playerFile.exists()) {
-                    playerFile.delete();
-                    i++;
-                }
-            }
-        }
-        ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " EssentialsFiles");
-    }
-
-    public synchronized void purgePermissions(List<String> cleared,
-            Permission permission) {
-        int i = 0;
-        for (String name : cleared) {
-            try {
-                OfflinePlayer p = this.getOfflinePlayer(name);
-                for (String group : permission.getPlayerGroups((Player) p)) {
-                    permission.playerRemoveGroup(null, p, group);
-                }
-                i++;
-            } catch (Exception e) {
-            }
-        }
-        ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " Permissions");
-    }
-
-    public boolean isOnline(Player player, final String name) {
-        if (player.isOnline())
-            return true;
-        ExecutorService executor = Executors.newSingleThreadExecutor();
-        Future<Boolean> result = executor.submit(new Callable<Boolean>() {
-
-            @Override
-            public synchronized Boolean call() throws Exception {
-                for (OfflinePlayer op : Utils.getOnlinePlayers())
-                    if (op.getName().equalsIgnoreCase(name)) {
-                        return true;
-                    }
-                return false;
-            }
-        });
-        try {
-            return result.get();
-        } catch (Exception e) {
-            return false;
-        } finally {
-            executor.shutdown();
-        }
-    }
-
-    public Player getOnlinePlayerLower(String name) {
-        name = name.toLowerCase();
-        for (Player player : Utils.getOnlinePlayers()) {
-            if (player.getName().equalsIgnoreCase(name))
-                return player;
-        }
-        return null;
-    }
-}
+package fr.xephi.authme;
+
+import fr.xephi.authme.permission.PermissionsManager;
+import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Utils;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+
+import java.io.File;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+/**
+ */
+public class DataManager {
+
+    public final AuthMe plugin;
+
+    /**
+     * Constructor for DataManager.
+     *
+     * @param plugin AuthMe
+     */
+    public DataManager(AuthMe plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Method getOfflinePlayer.
+     *
+     * @param name String
+     *
+     * @return OfflinePlayer
+     */
+    public synchronized OfflinePlayer getOfflinePlayer(final String name) {
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        Future<OfflinePlayer> result = executor.submit(new Callable<OfflinePlayer>() {
+
+            public synchronized OfflinePlayer call() throws Exception {
+                OfflinePlayer result = null;
+                try {
+                    for (OfflinePlayer op : Bukkit.getOfflinePlayers())
+                        if (op.getName().equalsIgnoreCase(name)) {
+                            result = op;
+                            break;
+                        }
+                } catch (Exception ignored) {
+                }
+                return result;
+            }
+        });
+        try {
+            return result.get();
+        } catch (Exception e) {
+            return (null);
+        } finally {
+            executor.shutdown();
+        }
+    }
+
+    /**
+     * Method purgeAntiXray.
+     *
+     * @param cleared List<String>
+     */
+    public synchronized void purgeAntiXray(List<String> cleared) {
+        int i = 0;
+        for (String name : cleared) {
+            try {
+                org.bukkit.OfflinePlayer player = getOfflinePlayer(name);
+                if (player == null)
+                    continue;
+                String playerName = player.getName();
+                File playerFile = new File("." + File.separator + "plugins" + File.separator + "AntiXRayData" + File.separator + "PlayerData" + File.separator + playerName);
+                if (playerFile.exists()) {
+                    //noinspection ResultOfMethodCallIgnored
+                    playerFile.delete();
+                    i++;
+                }
+            } catch (Exception ignored) {
+            }
+        }
+        ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " AntiXRayData Files");
+    }
+
+    /**
+     * Method purgeLimitedCreative.
+     *
+     * @param cleared List<String>
+     */
+    public synchronized void purgeLimitedCreative(List<String> cleared) {
+        int i = 0;
+        for (String name : cleared) {
+            try {
+                org.bukkit.OfflinePlayer player = getOfflinePlayer(name);
+                if (player == null)
+                    continue;
+                String playerName = player.getName();
+                File playerFile = new File("." + File.separator + "plugins" + File.separator + "LimitedCreative" + File.separator + "inventories" + File.separator + playerName + ".yml");
+                if (playerFile.exists()) {
+                    //noinspection ResultOfMethodCallIgnored
+                    playerFile.delete();
+                    i++;
+                }
+                playerFile = new File("." + File.separator + "plugins" + File.separator + "LimitedCreative" + File.separator + "inventories" + File.separator + playerName + "_creative.yml");
+                if (playerFile.exists()) {
+                    //noinspection ResultOfMethodCallIgnored
+                    playerFile.delete();
+                    i++;
+                }
+                playerFile = new File("." + File.separator + "plugins" + File.separator + "LimitedCreative" + File.separator + "inventories" + File.separator + playerName + "_adventure.yml");
+                if (playerFile.exists()) {
+                    //noinspection ResultOfMethodCallIgnored
+                    playerFile.delete();
+                    i++;
+                }
+            } catch (Exception ignored) {
+            }
+        }
+        ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " LimitedCreative Survival, Creative and Adventure files");
+    }
+
+    /**
+     * Method purgeDat.
+     *
+     * @param cleared List<String>
+     */
+    public synchronized void purgeDat(List<String> cleared) {
+        int i = 0;
+        for (String name : cleared) {
+            try {
+                org.bukkit.OfflinePlayer player = getOfflinePlayer(name);
+                if (player == null) {
+                    continue;
+                }
+
+                try {
+                    File playerFile = new File(plugin.getServer().getWorldContainer() + File.separator + Settings.defaultWorld + File.separator + "players" + File.separator + player.getUniqueId() + ".dat");
+                    //noinspection ResultOfMethodCallIgnored
+                    playerFile.delete();
+                    i++;
+                } catch (Exception ignore) {
+                    File playerFile = new File(plugin.getServer().getWorldContainer() + File.separator + Settings.defaultWorld + File.separator + "players" + File.separator + player.getName() + ".dat");
+                    if (playerFile.exists()) {
+                        //noinspection ResultOfMethodCallIgnored
+                        playerFile.delete();
+                        i++;
+                    }
+                }
+            } catch (Exception ignore) {
+            }
+        }
+        ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " .dat Files");
+    }
+
+    /**
+     * Method purgeEssentials.
+     *
+     * @param cleared List<String>
+     */
+    @SuppressWarnings("deprecation")
+    public void purgeEssentials(List<String> cleared) {
+        int i = 0;
+        for (String name : cleared) {
+            try {
+                File playerFile = new File(plugin.ess.getDataFolder() + File.separator + "userdata" + File.separator + plugin.getServer().getOfflinePlayer(name).getUniqueId() + ".yml");
+                //noinspection ResultOfMethodCallIgnored
+                playerFile.delete();
+                i++;
+            } catch (Exception e) {
+                File playerFile = new File(plugin.ess.getDataFolder() + File.separator + "userdata" + File.separator + name + ".yml");
+                if (playerFile.exists()) {
+                    //noinspection ResultOfMethodCallIgnored
+                    playerFile.delete();
+                    i++;
+                }
+            }
+        }
+        ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " EssentialsFiles");
+    }
+
+    // TODO: What is this method for? Is it correct?
+
+    /**
+     * @param cleared Cleared players.
+     */
+    public synchronized void purgePermissions(List<String> cleared) {
+        // Get the permissions manager, and make sure it's valid
+        PermissionsManager permsMan = this.plugin.getPermissionsManager();
+        if (permsMan == null)
+            ConsoleLogger.showError("Unable to access permissions manager instance!");
+        assert permsMan != null;
+
+        int i = 0;
+        for (String name : cleared) {
+            try {
+                permsMan.removeAllGroups(this.getOnlinePlayerLower(name.toLowerCase()));
+                i++;
+            } catch (Exception ignored) {
+            }
+        }
+        ConsoleLogger.info("AutoPurgeDatabase : Removed " + i + " permissions");
+
+        /*int i = 0;
+        for (String name : cleared) {
+            try {
+                OfflinePlayer p = this.getOfflinePlayer(name);
+                for (String group : permission.getPlayerGroups((Player) p)) {
+                    permission.playerRemoveGroup(null, p, group);
+                }
+                i++;
+            } catch (Exception e) {
+            }
+        }
+        ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " Permissions");*/
+    }
+
+    /**
+     * Method isOnline.
+     *
+     * @param player Player
+     * @param name   String
+     *
+     * @return boolean
+     */
+    public boolean isOnline(Player player, final String name) {
+        if (player.isOnline())
+            return true;
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        Future<Boolean> result = executor.submit(new Callable<Boolean>() {
+
+            @Override
+            public synchronized Boolean call() throws Exception {
+                for (OfflinePlayer op : Utils.getOnlinePlayers())
+                    if (op.getName().equalsIgnoreCase(name)) {
+                        return true;
+                    }
+                return false;
+            }
+        });
+        try {
+            return result.get();
+        } catch (Exception e) {
+            return false;
+        } finally {
+            executor.shutdown();
+        }
+    }
+
+    /**
+     * Method getOnlinePlayerLower.
+     *
+     * @param name String
+     *
+     * @return Player
+     */
+    public Player getOnlinePlayerLower(String name) {
+        name = name.toLowerCase();
+        for (Player player : Utils.getOnlinePlayers()) {
+            if (player.getName().equalsIgnoreCase(name))
+                return player;
+        }
+        return null;
+    }
+}

src/main/java/fr/xephi/authme/ImageGenerator.java

@@ -1,30 +1,40 @@
-package fr.xephi.authme;
-
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-
-public class ImageGenerator {
-
-    private String pass;
-    public ImageGenerator(String pass) {
-        this.pass = pass;
-    }
-
-    public BufferedImage generateImage() {
-        BufferedImage image = new BufferedImage(200, 60, BufferedImage.TYPE_BYTE_INDEXED);
-        Graphics2D graphics = image.createGraphics();
-        graphics.setColor(Color.BLACK);
-        graphics.fillRect(0, 0, 200, 40);
-        GradientPaint gradientPaint = new GradientPaint(10, 5, Color.WHITE, 20, 10, Color.WHITE, true);
-        graphics.setPaint(gradientPaint);
-        Font font = new Font("Comic Sans MS", Font.BOLD, 30);
-        graphics.setFont(font);
-        graphics.drawString(pass, 5, 30);
-        graphics.dispose();
-        image.flush();
-        return image;
-    }
-}
+package fr.xephi.authme;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+
+/**
+ */
+public class ImageGenerator {
+
+    private final String pass;
+
+    /**
+     * Constructor for ImageGenerator.
+     *
+     * @param pass String
+     */
+    public ImageGenerator(String pass) {
+        this.pass = pass;
+    }
+
+    /**
+     * Method generateImage.
+     *
+     * @return BufferedImage
+     */
+    public BufferedImage generateImage() {
+        BufferedImage image = new BufferedImage(200, 60, BufferedImage.TYPE_BYTE_INDEXED);
+        Graphics2D graphics = image.createGraphics();
+        graphics.setColor(Color.BLACK);
+        graphics.fillRect(0, 0, 200, 40);
+        GradientPaint gradientPaint = new GradientPaint(10, 5, Color.WHITE, 20, 10, Color.WHITE, true);
+        graphics.setPaint(gradientPaint);
+        Font font = new Font("Comic Sans MS", Font.BOLD, 30);
+        graphics.setFont(font);
+        graphics.drawString(pass, 5, 30);
+        graphics.dispose();
+        image.flush();
+        return image;
+    }
+}

src/main/java/fr/xephi/authme/Log4JFilter.java

@@ -1,5 +1,6 @@
 package fr.xephi.authme;
 
+import fr.xephi.authme.util.StringUtils;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.core.LogEvent;
@@ -7,79 +8,90 @@ import org.apache.logging.log4j.core.Logger;
 import org.apache.logging.log4j.message.Message;
 
 /**
+ * Implements a filter for Log4j to skip sensitive AuthMe commands.
  *
  * @author Xephi59
+ * @version $Revision: 1.0 $
  */
 public class Log4JFilter implements org.apache.logging.log4j.core.Filter {
 
+    /**
+     * List of commands (lower-case) to skip.
+     */
+    private static final String[] COMMANDS_TO_SKIP = {"/login ", "/l ", "/reg ", "/changepassword ",
+        "/unregister ", "/authme register ", "/authme changepassword ", "/authme reg ", "/authme cp ",
+        "/register "};
+
+    /**
+     * Constructor.
+     */
     public Log4JFilter() {
     }
 
+    /**
+     * Validates a Message instance and returns the {@link Result} value
+     * depending depending on whether the message contains sensitive AuthMe
+     * data.
+     *
+     * @param message the Message object to verify
+     *
+     * @return the Result value
+     */
+    private static Result validateMessage(Message message) {
+        if (message == null) {
+            return Result.NEUTRAL;
+        }
+        return validateMessage(message.getFormattedMessage());
+    }
+
+    /**
+     * Validates a message and returns the {@link Result} value depending
+     * depending on whether the message contains sensitive AuthMe data.
+     *
+     * @param message the message to verify
+     *
+     * @return the Result value
+     */
+    private static Result validateMessage(String message) {
+        if (message == null) {
+            return Result.NEUTRAL;
+        }
+
+        String lowerMessage = message.toLowerCase();
+        if (lowerMessage.contains("issued server command:")
+            && StringUtils.containsAny(lowerMessage, COMMANDS_TO_SKIP)) {
+            return Result.DENY;
+        }
+        return Result.NEUTRAL;
+    }
+
     @Override
     public Result filter(LogEvent record) {
-        try {
-            if (record == null || record.getMessage() == null)
-                return Result.NEUTRAL;
-            String logM = record.getMessage().getFormattedMessage().toLowerCase();
-            if (!logM.contains("issued server command:"))
-                return Result.NEUTRAL;
-            if (!logM.contains("/login ") && !logM.contains("/l ") && !logM.contains("/reg ") && !logM.contains("/changepassword ") && !logM.contains("/unregister ") && !logM.contains("/authme register ") && !logM.contains("/authme changepassword ") && !logM.contains("/authme reg ") && !logM.contains("/authme cp ") && !logM.contains("/register "))
-                return Result.NEUTRAL;
-            return Result.DENY;
-        } catch (NullPointerException npe) {
+        if (record == null) {
             return Result.NEUTRAL;
         }
+        return validateMessage(record.getMessage());
     }
 
     @Override
     public Result filter(Logger arg0, Level arg1, Marker arg2, String message,
-            Object... arg4) {
-        try {
-            if (message == null)
-                return Result.NEUTRAL;
-            String logM = message.toLowerCase();
-            if (!logM.contains("issued server command:"))
-                return Result.NEUTRAL;
-            if (!logM.contains("/login ") && !logM.contains("/l ") && !logM.contains("/reg ") && !logM.contains("/changepassword ") && !logM.contains("/unregister ") && !logM.contains("/authme register ") && !logM.contains("/authme changepassword ") && !logM.contains("/authme reg ") && !logM.contains("/authme cp ") && !logM.contains("/register "))
-                return Result.NEUTRAL;
-            return Result.DENY;
-        } catch (NullPointerException npe) {
-            return Result.NEUTRAL;
-        }
+                         Object... arg4) {
+        return validateMessage(message);
     }
 
     @Override
     public Result filter(Logger arg0, Level arg1, Marker arg2, Object message,
-            Throwable arg4) {
-        try {
-            if (message == null)
-                return Result.NEUTRAL;
-            String logM = message.toString().toLowerCase();
-            if (!logM.contains("issued server command:"))
-                return Result.NEUTRAL;
-            if (!logM.contains("/login ") && !logM.contains("/l ") && !logM.contains("/reg ") && !logM.contains("/changepassword ") && !logM.contains("/unregister ") && !logM.contains("/authme register ") && !logM.contains("/authme changepassword ") && !logM.contains("/authme reg ") && !logM.contains("/authme cp ") && !logM.contains("/register "))
-                return Result.NEUTRAL;
-            return Result.DENY;
-        } catch (NullPointerException npe) {
+                         Throwable arg4) {
+        if (message == null) {
             return Result.NEUTRAL;
         }
+        return validateMessage(message.toString());
     }
 
     @Override
     public Result filter(Logger arg0, Level arg1, Marker arg2, Message message,
-            Throwable arg4) {
-        try {
-            if (message == null)
-                return Result.NEUTRAL;
-            String logM = message.getFormattedMessage().toLowerCase();
-            if (!logM.contains("issued server command:"))
-                return Result.NEUTRAL;
-            if (!logM.contains("/login ") && !logM.contains("/l ") && !logM.contains("/reg ") && !logM.contains("/changepassword ") && !logM.contains("/unregister ") && !logM.contains("/authme register ") && !logM.contains("/authme changepassword ") && !logM.contains("/authme reg ") && !logM.contains("/authme cp ") && !logM.contains("/register "))
-                return Result.NEUTRAL;
-            return Result.DENY;
-        } catch (NullPointerException npe) {
-            return Result.NEUTRAL;
-        }
+                         Throwable arg4) {
+        return validateMessage(message);
     }
 
     @Override

src/main/java/fr/xephi/authme/PerformBackup.java

@@ -1,35 +1,71 @@
 package fr.xephi.authme;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 import fr.xephi.authme.settings.Settings;
 
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 /**
+ * The backup management class
  *
  * @author stefano
+ * @version $Revision: 1.0 $
  */
 public class PerformBackup {
 
-    private String dbName = Settings.getMySQLDatabase;
-    private String dbUserName = Settings.getMySQLUsername;
-    private String dbPassword = Settings.getMySQLPassword;
-    private String tblname = Settings.getMySQLTablename;
-    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd_HH-mm");
-    String dateString = format.format(new Date());
-    private String path = AuthMe.getInstance().getDataFolder() + File.separator + "backups" + File.separator + "backup" + dateString;
+    final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd_HH-mm");
+    final String dateString = format.format(new Date());
+    private final String dbName = Settings.getMySQLDatabase;
+    private final String dbUserName = Settings.getMySQLUsername;
+    private final String dbPassword = Settings.getMySQLPassword;
+    private final String tblname = Settings.getMySQLTablename;
+    private final String path = AuthMe.getInstance().getDataFolder() + File.separator + "backups" + File.separator + "backup" + dateString;
     private AuthMe instance;
 
+    /**
+     * Constructor for PerformBackup.
+     *
+     * @param instance AuthMe
+     */
     public PerformBackup(AuthMe instance) {
         this.setInstance(instance);
     }
 
+    /**
+     * Perform a backup with the given reason.
+     *
+     * @param cause BackupCause The cause of the backup.
+     */
+    public void doBackup(BackupCause cause) {
+        if (!Settings.isBackupActivated) {
+            ConsoleLogger.showError("Can't perform a Backup: disabled in configuration. Cause of the Backup: " + cause.name());
+        }
+        // Check whether a backup should be made at the specified point in time
+        switch (cause) {
+            case START:
+                if (!Settings.isBackupOnStart)
+                    return;
+            case STOP:
+                if (!Settings.isBackupOnStop)
+                    return;
+            case COMMAND:
+            case OTHER:
+        }
+
+        // Do backup and check return value!
+        if (doBackup()) {
+            ConsoleLogger.info("A backup has been performed successfully. Cause of the Backup: " + cause.name());
+        } else {
+            ConsoleLogger.showError("Error while performing a backup! Cause of the Backup: " + cause.name());
+        }
+    }
+
+    /**
+     * Method doBackup.
+     *
+     * @return boolean
+     */
     public boolean doBackup() {
 
         switch (Settings.getDataSource) {
@@ -44,6 +80,11 @@ public class PerformBackup {
         return false;
     }
 
+    /**
+     * Method MySqlBackup.
+     *
+     * @return boolean
+     */
     private boolean MySqlBackup() {
         File dirBackup = new File(AuthMe.getInstance().getDataFolder() + "/backups");
 
@@ -83,6 +124,13 @@ public class PerformBackup {
         return false;
     }
 
+    /**
+     * Method FileBackup.
+     *
+     * @param backend String
+     *
+     * @return boolean
+     */
     private boolean FileBackup(String backend) {
         File dirBackup = new File(AuthMe.getInstance().getDataFolder() + "/backups");
 
@@ -99,13 +147,16 @@ public class PerformBackup {
         return false;
     }
 
-    /*
-     * Check if we are under Windows and correct location of mysqldump.exe
-     * otherwise return error.
+    /**
+     * Method checkWindows.
+     *
+     * @param windowsPath String
+     *
+     * @return boolean
      */
     private boolean checkWindows(String windowsPath) {
         String isWin = System.getProperty("os.name").toLowerCase();
-        if (isWin.indexOf("win") >= 0) {
+        if (isWin.contains("win")) {
             if (new File(windowsPath + "\\bin\\mysqldump.exe").exists()) {
                 return true;
             } else {
@@ -116,7 +167,17 @@ public class PerformBackup {
     }
 
     /*
-     * Copyr src bytefile into dst file
+     * Check if we are under Windows and correct location of mysqldump.exe
+     * otherwise return error.
+     */
+
+    /**
+     * Method copy.
+     *
+     * @param src File
+     * @param dst File
+     *
+     * @throws IOException
      */
     void copy(File src, File dst) throws IOException {
         InputStream in = new FileInputStream(src);
@@ -132,12 +193,36 @@ public class PerformBackup {
         out.close();
     }
 
-    public void setInstance(AuthMe instance) {
-        this.instance = instance;
-    }
+    /*
+     * Copyr src bytefile into dst file
+     */
 
+    /**
+     * Method getInstance.
+     *
+     * @return AuthMe
+     */
     public AuthMe getInstance() {
         return instance;
     }
 
+    /**
+     * Method setInstance.
+     *
+     * @param instance AuthMe
+     */
+    public void setInstance(AuthMe instance) {
+        this.instance = instance;
+    }
+
+    /**
+     * Possible backup causes.
+     */
+    public enum BackupCause {
+        START,
+        STOP,
+        COMMAND,
+        OTHER,
+    }
+
 }

src/main/java/fr/xephi/authme/SendMailSSL.java

@@ -1,39 +1,48 @@
 package fr.xephi.authme;
 
-import java.io.File;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.settings.Settings;
+import org.apache.commons.mail.HtmlEmail;
+import org.bukkit.Bukkit;
 
 import javax.activation.DataSource;
 import javax.activation.FileDataSource;
 import javax.imageio.ImageIO;
-
-import org.apache.commons.mail.HtmlEmail;
-import org.bukkit.Bukkit;
-
-import fr.xephi.authme.cache.auth.PlayerAuth;
-import fr.xephi.authme.settings.Settings;
+import java.io.File;
 
 /**
- *
  * @author Xephi59
+ * @version $Revision: 1.0 $
  */
 public class SendMailSSL {
 
-    public AuthMe plugin;
+    public final AuthMe plugin;
 
+    /**
+     * Constructor for SendMailSSL.
+     *
+     * @param plugin AuthMe
+     */
     public SendMailSSL(AuthMe plugin) {
         this.plugin = plugin;
     }
 
+    /**
+     * Method main.
+     *
+     * @param auth    PlayerAuth
+     * @param newPass String
+     */
     public void main(final PlayerAuth auth, final String newPass) {
-        String sendername;
+        String senderName;
 
         if (Settings.getmailSenderName == null || Settings.getmailSenderName.isEmpty()) {
-            sendername = Settings.getmailAccount;
+            senderName = Settings.getmailAccount;
         } else {
-            sendername = Settings.getmailSenderName;
+            senderName = Settings.getmailSenderName;
         }
 
-        final String sender = sendername;
+        final String sender = senderName;
         final int port = Settings.getMailPort;
         final String acc = Settings.getmailAccount;
         final String subject = Settings.getMailSubject;
@@ -81,6 +90,7 @@ public class SendMailSSL {
                         ConsoleLogger.showError("Fail to send a mail to " + mail);
                     }
                     if (file != null)
+                        //noinspection ResultOfMethodCallIgnored
                         file.delete();
 
                 } catch (Exception e) {

src/main/java/fr/xephi/authme/api/API.java

@@ -1,25 +1,31 @@
 package fr.xephi.authme.api;
 
-import java.security.NoSuchAlgorithmException;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.Plugin;
-
 import fr.xephi.authme.AuthMe;
 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;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.Plugin;
 
+import java.security.NoSuchAlgorithmException;
+
+/**
+ */
 public class API {
 
     public static final String newline = System.getProperty("line.separator");
     public static AuthMe instance;
 
+    /**
+     * Constructor for API.
+     *
+     * @param instance AuthMe
+     */
     @Deprecated
     public API(AuthMe instance) {
         API.instance = instance;
@@ -42,14 +48,9 @@ public class API {
         return instance;
     }
 
-    @Deprecated
-    public AuthMe getPlugin() {
-        return instance;
-    }
-
     /**
-     *
      * @param player
+     *
      * @return true if player is authenticate
      */
     @Deprecated
@@ -58,28 +59,8 @@ public class API {
     }
 
     /**
-     *
      * @param player
-     * @return true if player is a npc
-     */
-    @Deprecated
-    public boolean isaNPC(Player player) {
-        return Utils.isNPC(player);
-    }
-
-    /**
      *
-     * @param player
-     * @return true if player is a npc
-     */
-    @Deprecated
-    public boolean isNPC(Player player) {
-        return Utils.isNPC(player);
-    }
-
-    /**
-     *
-     * @param player
      * @return true if the player is unrestricted
      */
     @Deprecated
@@ -87,6 +68,13 @@ public class API {
         return Utils.isUnrestricted(player);
     }
 
+    /**
+     * Method getLastLocation.
+     *
+     * @param player Player
+     *
+     * @return Location
+     */
     @Deprecated
     public static Location getLastLocation(Player player) {
         try {
@@ -104,19 +92,26 @@ public class API {
         }
     }
 
+    /**
+     * Method setPlayerInventory.
+     *
+     * @param player  Player
+     * @param content ItemStack[]
+     * @param armor   ItemStack[]
+     */
     @Deprecated
     public static void setPlayerInventory(Player player, ItemStack[] content,
-            ItemStack[] armor) {
+                                          ItemStack[] armor) {
         try {
             player.getInventory().setContents(content);
             player.getInventory().setArmorContents(armor);
-        } catch (NullPointerException npe) {
+        } catch (NullPointerException ignored) {
         }
     }
 
     /**
-     *
      * @param playerName
+     *
      * @return true if player is registered
      */
     @Deprecated
@@ -126,13 +121,14 @@ public class API {
     }
 
     /**
-     * @param String
-     *            playerName, String passwordToCheck
+     * @param playerName      String
+     * @param passwordToCheck String
+     *
      * @return true if the password is correct , false else
      */
     @Deprecated
     public static boolean checkPassword(String playerName,
-            String passwordToCheck) {
+                                        String passwordToCheck) {
         if (!isRegistered(playerName))
             return false;
         String player = playerName.toLowerCase();
@@ -147,8 +143,9 @@ public class API {
     /**
      * Register a player
      *
-     * @param String
-     *            playerName, String password
+     * @param playerName String
+     * @param password   String
+     *
      * @return true if the player is register correctly
      */
     @Deprecated
@@ -160,10 +157,7 @@ public class API {
                 return false;
             }
             PlayerAuth auth = new PlayerAuth(name, hash, "198.18.0.1", 0, "your@email.com", playerName);
-            if (!instance.database.saveAuth(auth)) {
-                return false;
-            }
-            return true;
+            return instance.database.saveAuth(auth);
         } catch (NoSuchAlgorithmException ex) {
             return false;
         }
@@ -172,12 +166,41 @@ public class API {
     /**
      * Force a player to login
      *
-     * @param Player
-     *            player
+     * @param player *            player
      */
     @Deprecated
     public static void forceLogin(Player player) {
         instance.management.performLogin(player, "dontneed", true);
     }
 
+    /**
+     * Method getPlugin.
+     *
+     * @return AuthMe
+     */
+    @Deprecated
+    public AuthMe getPlugin() {
+        return instance;
+    }
+
+    /**
+     * @param player
+     *
+     * @return true if player is a npc
+     */
+    @Deprecated
+    public boolean isaNPC(Player player) {
+        return Utils.isNPC(player);
+    }
+
+    /**
+     * @param player
+     *
+     * @return true if player is a npc
+     */
+    @Deprecated
+    public boolean isNPC(Player player) {
+        return Utils.isNPC(player);
+    }
+
 }

src/main/java/fr/xephi/authme/api/NewAPI.java

@@ -1,32 +1,42 @@
 package fr.xephi.authme.api;
 
-import java.security.NoSuchAlgorithmException;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
 import fr.xephi.authme.AuthMe;
 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;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 
+import java.security.NoSuchAlgorithmException;
+
+/**
+ */
 public class NewAPI {
 
-    public static final String newline = System.getProperty("line.separator");
     public static NewAPI singleton;
-    public AuthMe plugin;
+    public final AuthMe plugin;
 
+    /**
+     * Constructor for NewAPI.
+     *
+     * @param plugin AuthMe
+     */
     public NewAPI(AuthMe plugin) {
         this.plugin = plugin;
     }
 
-    public NewAPI(Server serv) {
-        this.plugin = (AuthMe) serv.getPluginManager().getPlugin("AuthMe");
+    /**
+     * Constructor for NewAPI.
+     *
+     * @param server Server
+     */
+    public NewAPI(Server server) {
+        this.plugin = (AuthMe) server.getPluginManager().getPlugin("AuthMe");
     }
 
     /**
@@ -46,13 +56,18 @@ public class NewAPI {
         return singleton;
     }
 
+    /**
+     * Method getPlugin.
+     *
+     * @return AuthMe
+     */
     public AuthMe getPlugin() {
         return plugin;
     }
 
     /**
-     *
      * @param player
+     *
      * @return true if player is authenticate
      */
     public boolean isAuthenticated(Player player) {
@@ -60,8 +75,8 @@ public class NewAPI {
     }
 
     /**
-     *
      * @param player
+     *
      * @return true if player is a npc
      */
     public boolean isNPC(Player player) {
@@ -69,14 +84,21 @@ public class NewAPI {
     }
 
     /**
-     *
      * @param player
+     *
      * @return true if the player is unrestricted
      */
     public boolean isUnrestricted(Player player) {
         return Utils.isUnrestricted(player);
     }
 
+    /**
+     * Method getLastLocation.
+     *
+     * @param player Player
+     *
+     * @return Location
+     */
     public Location getLastLocation(Player player) {
         try {
             PlayerAuth auth = PlayerCache.getInstance().getAuth(player.getName().toLowerCase());
@@ -93,8 +115,8 @@ public class NewAPI {
     }
 
     /**
-     *
      * @param playerName
+     *
      * @return true if player is registered
      */
     public boolean isRegistered(String playerName) {
@@ -103,8 +125,9 @@ public class NewAPI {
     }
 
     /**
-     * @param String
-     *            playerName, String passwordToCheck
+     * @param playerName      String
+     * @param passwordToCheck String
+     *
      * @return true if the password is correct , false else
      */
     public boolean checkPassword(String playerName, String passwordToCheck) {
@@ -122,8 +145,9 @@ public class NewAPI {
     /**
      * Register a player
      *
-     * @param String
-     *            playerName, String password
+     * @param playerName String
+     * @param password   String
+     *
      * @return true if the player is register correctly
      */
     public boolean registerPlayer(String playerName, String password) {
@@ -143,8 +167,7 @@ public class NewAPI {
     /**
      * Force a player to login
      *
-     * @param Player
-     *            player
+     * @param player *            player
      */
     public void forceLogin(Player player) {
         plugin.management.performLogin(player, "dontneed", true);
@@ -153,35 +176,28 @@ public class NewAPI {
     /**
      * Force a player to logout
      *
-     * @param Player
-     * 			player
+     * @param player * 			player
      */
-    public void forceLogout(Player player)
-    {
-    	plugin.management.performLogout(player);
+    public void forceLogout(Player player) {
+        plugin.management.performLogout(player);
     }
 
     /**
      * Force a player to register
      *
-     * @param Player
-     * 			player
-     * @param String
-     * 			password
+     * @param player   * 			player
+     * @param password String
      */
-    public void forceRegister(Player player, String password)
-    {
-    	plugin.management.performRegister(player, password, null);
+    public void forceRegister(Player player, String password) {
+        plugin.management.performRegister(player, password, null);
     }
 
     /**
      * Force a player to unregister
      *
-     * @param Player
-     * 			player
+     * @param player * 			player
      */
-    public void forceUnregister(Player player)
-    {
-    	plugin.management.performUnregister(player, "", true);
+    public void forceUnregister(Player player) {
+        plugin.management.performUnregister(player, "", true);
     }
 }

src/main/java/fr/xephi/authme/cache/auth/PlayerAuth.java

@@ -3,62 +3,167 @@ package fr.xephi.authme.cache.auth;
 import fr.xephi.authme.security.HashAlgorithm;
 import fr.xephi.authme.settings.Settings;
 
+/**
+ */
 public class PlayerAuth {
 
-    private String nickname = "";
-    private String hash = "";
-    private String ip = "192.168.0.1";
-    private long lastLogin = 0;
-    private double x = 0;
-    private double y = 0;
-    private double z = 0;
-    private String world = "world";
-    private String salt = "";
-    private String vBhash = null;
-    private int groupId = -1;
-    private String email = "your@email.com";
+    private String nickname;
+    private String hash;
+    private String ip;
+    private long lastLogin;
+    private double x;
+    private double y;
+    private double z;
+    private String world;
+    private String salt;
+    private int groupId;
+    private String email;
     private String realName;
 
-    public PlayerAuth(String nickname, String hash, String ip, long lastLogin,
-            String email, String realName) {
-        this.nickname = nickname;
-        this.hash = hash;
-        this.ip = ip;
-        this.lastLogin = lastLogin;
-        this.email = email;
-        this.realName = realName;
+    /**
+     *
+     */
+    public PlayerAuth(String serialized)
+    {
+    	this.unserialize(serialized);
     }
 
-    public PlayerAuth(String nickname, double x, double y, double z,
-            String world, String realName) {
-        this.nickname = nickname;
-        this.x = x;
-        this.y = y;
-        this.z = z;
-        this.world = world;
-        this.realName = realName;
-        this.lastLogin = System.currentTimeMillis();
-
+    /**
+     * Constructor for PlayerAuth.
+     *
+     * @param nickname  String
+     * @param ip        String
+     * @param lastLogin long
+     * @param realName  String
+     */
+    public PlayerAuth(String nickname, String ip, long lastLogin, String realName) {
+        this(nickname, "", "", -1, ip, lastLogin, 0, 0, 0, "world", "your@email.com", realName);
     }
 
-    public PlayerAuth(String nickname, String hash, String ip, long lastLogin,
-            double x, double y, double z, String world, String email,
-            String realName) {
-        this.nickname = nickname;
-        this.hash = hash;
-        this.ip = ip;
-        this.lastLogin = lastLogin;
-        this.x = x;
-        this.y = y;
-        this.z = z;
-        this.world = world;
-        this.email = email;
-        this.realName = realName;
+    /**
+     * Constructor for PlayerAuth.
+     *
+     * @param nickname String
+     * @param x        double
+     * @param y        double
+     * @param z        double
+     * @param world    String
+     * @param realName String
+     */
+    public PlayerAuth(String nickname, double x, double y, double z, String world, String realName) {
+        this(nickname, "", "", -1, "127.0.0.1", System.currentTimeMillis(), x, y, z, world, "your@email.com", realName);
     }
 
-    public PlayerAuth(String nickname, String hash, String salt, int groupId,
-            String ip, long lastLogin, double x, double y, double z,
-            String world, String email, String realName) {
+    /**
+     * Constructor for PlayerAuth.
+     *
+     * @param nickname  String
+     * @param hash      String
+     * @param ip        String
+     * @param lastLogin long
+     * @param realName  String
+     */
+    public PlayerAuth(String nickname, String hash, String ip, long lastLogin, String realName) {
+        this(nickname, hash, "", -1, ip, lastLogin, 0, 0, 0, "world", "your@email.com", realName);
+    }
+
+    /**
+     * Constructor for PlayerAuth.
+     *
+     * @param nickname  String
+     * @param hash      String
+     * @param ip        String
+     * @param lastLogin long
+     * @param email     String
+     * @param realName  String
+     */
+    public PlayerAuth(String nickname, String hash, String ip, long lastLogin, String email, String realName) {
+        this(nickname, hash, "", -1, ip, lastLogin, 0, 0, 0, "world", email, realName);
+    }
+
+    /**
+     * Constructor for PlayerAuth.
+     *
+     * @param nickname  String
+     * @param hash      String
+     * @param salt      String
+     * @param ip        String
+     * @param lastLogin long
+     * @param realName  String
+     */
+    public PlayerAuth(String nickname, String hash, String salt, String ip, long lastLogin, String realName) {
+        this(nickname, hash, salt, -1, ip, lastLogin, 0, 0, 0, "world", "your@email.com", realName);
+    }
+
+    /**
+     * Constructor for PlayerAuth.
+     *
+     * @param nickname  String
+     * @param hash      String
+     * @param ip        String
+     * @param lastLogin long
+     * @param x         double
+     * @param y         double
+     * @param z         double
+     * @param world     String
+     * @param email     String
+     * @param realName  String
+     */
+    public PlayerAuth(String nickname, String hash, String ip, long lastLogin, double x, double y, double z, String world, String email, String realName) {
+        this(nickname, hash, "", -1, ip, lastLogin, x, y, z, world, email, realName);
+    }
+
+    /**
+     * Constructor for PlayerAuth.
+     *
+     * @param nickname  String
+     * @param hash      String
+     * @param salt      String
+     * @param ip        String
+     * @param lastLogin long
+     * @param x         double
+     * @param y         double
+     * @param z         double
+     * @param world     String
+     * @param email     String
+     * @param realName  String
+     */
+    public PlayerAuth(String nickname, String hash, String salt, String ip, long lastLogin, double x, double y, double z, String world, String email, String realName) {
+        this(nickname, hash, salt, -1, ip, lastLogin, x, y, z, world, email, realName);
+    }
+
+    /**
+     * Constructor for PlayerAuth.
+     *
+     * @param nickname  String
+     * @param hash      String
+     * @param salt      String
+     * @param groupId   int
+     * @param ip        String
+     * @param lastLogin long
+     * @param realName  String
+     */
+    public PlayerAuth(String nickname, String hash, String salt, int groupId, String ip, long lastLogin, String realName) {
+        this(nickname, hash, salt, groupId, ip, lastLogin, 0, 0, 0, "world", "your@email.com", realName);
+    }
+
+    /**
+     * Constructor for PlayerAuth.
+     *
+     * @param nickname  String
+     * @param hash      String
+     * @param salt      String
+     * @param groupId   int
+     * @param ip        String
+     * @param lastLogin long
+     * @param x         double
+     * @param y         double
+     * @param z         double
+     * @param world     String
+     * @param email     String
+     * @param realName  String
+     */
+    public PlayerAuth(String nickname, String hash, String salt, int groupId, String ip, long lastLogin, double x, double y, double z, String world, String email, String realName) {
         this.nickname = nickname;
         this.hash = hash;
         this.ip = ip;
@@ -73,182 +178,11 @@ public class PlayerAuth {
         this.realName = realName;
     }
 
-    public PlayerAuth(String nickname, String hash, String salt, int groupId,
-            String ip, long lastLogin, String realName) {
-        this.nickname = nickname;
-        this.hash = hash;
-        this.ip = ip;
-        this.lastLogin = lastLogin;
-        this.salt = salt;
-        this.groupId = groupId;
-        this.realName = realName;
-    }
-
-    public PlayerAuth(String nickname, String hash, String salt, String ip,
-            long lastLogin, String realName) {
-        this.nickname = nickname;
-        this.hash = hash;
-        this.ip = ip;
-        this.lastLogin = lastLogin;
-        this.salt = salt;
-        this.realName = realName;
-    }
-
-    public PlayerAuth(String nickname, String hash, String salt, String ip,
-            long lastLogin, double x, double y, double z, String world,
-            String email, String realName) {
-        this.nickname = nickname;
-        this.hash = hash;
-        this.ip = ip;
-        this.lastLogin = lastLogin;
-        this.x = x;
-        this.y = y;
-        this.z = z;
-        this.world = world;
-        this.salt = salt;
-        this.email = email;
-        this.realName = realName;
-    }
-
-    public PlayerAuth(String nickname, String ip, long lastLogin,
-            String realName) {
-        this.nickname = nickname;
-        this.ip = ip;
-        this.lastLogin = lastLogin;
-        this.realName = realName;
-    }
-
-    public PlayerAuth(String nickname, String hash, String ip, long lastLogin,
-            String realName) {
-        this.nickname = nickname;
-        this.ip = ip;
-        this.lastLogin = lastLogin;
-        this.hash = hash;
-        this.realName = realName;
-    }
-
-    public String getIp() {
-        if (ip == null || ip.isEmpty())
-            ip = "127.0.0.1";
-        return ip;
-    }
-
-    public String getNickname() {
-        return nickname;
-    }
-
-    public String getHash() {
-        if (Settings.getPasswordHash == HashAlgorithm.MD5VB) {
-            if (salt != null && !salt.isEmpty() && Settings.getPasswordHash == HashAlgorithm.MD5VB) {
-                vBhash = "$MD5vb$" + salt + "$" + hash;
-                return vBhash;
-            }
-        }
-        return hash;
-    }
-
-    public String getSalt() {
-        return this.salt;
-    }
-
-    public int getGroupId() {
-        return groupId;
-    }
-
-    public double getQuitLocX() {
-        return x;
-    }
-
-    public double getQuitLocY() {
-        return y;
-    }
-
-    public double getQuitLocZ() {
-        return z;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setQuitLocX(double d) {
-        this.x = d;
-    }
-
-    public void setQuitLocY(double d) {
-        this.y = d;
-    }
-
-    public void setQuitLocZ(double d) {
-        this.z = d;
-    }
-
-    public long getLastLogin() {
-        try {
-            if (Long.valueOf(lastLogin) == null)
-                lastLogin = 0L;
-        } catch (NullPointerException e) {
-            lastLogin = 0L;
-        }
-        return lastLogin;
-    }
-
-    public void setHash(String hash) {
-        this.hash = hash;
-    }
-
-    public void setIp(String ip) {
-        this.ip = ip;
-    }
-
-    public void setLastLogin(long lastLogin) {
-        this.lastLogin = lastLogin;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public void setSalt(String salt) {
-        this.salt = salt;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof PlayerAuth)) {
-            return false;
-        }
-        PlayerAuth other = (PlayerAuth) obj;
-        return other.getIp().equals(this.ip) && other.getNickname().equals(this.nickname);
-    }
-
-    @Override
-    public int hashCode() {
-        int hashCode = 7;
-        hashCode = 71 * hashCode + (this.nickname != null ? this.nickname.hashCode() : 0);
-        hashCode = 71 * hashCode + (this.ip != null ? this.ip.hashCode() : 0);
-        return hashCode;
-    }
-
-    public void setWorld(String world) {
-        this.world = world;
-    }
-
-    public String getWorld() {
-        return world;
-    }
-
-    @Override
-    public String toString() {
-        String s = "Player : " + nickname + " | " + realName + " ! IP : " + ip + " ! LastLogin : " + lastLogin + " ! LastPosition : " + x + "," + y + "," + z + "," + world + " ! Email : " + email + " ! Hash : " + hash + " ! Salt : " + salt;
-        return s;
-
-    }
-
-    public void setName(String nickname) {
-        this.nickname = nickname;
-    }
-
+    /**
+     * Method set.
+     *
+     * @param auth PlayerAuth
+     */
     public void set(PlayerAuth auth) {
         this.setEmail(auth.getEmail());
         this.setHash(auth.getHash());
@@ -263,12 +197,304 @@ public class PlayerAuth {
         this.setRealName(auth.getRealName());
     }
 
+    /**
+     * Method setName.
+     *
+     * @param nickname String
+     */
+    public void setName(String nickname) {
+        this.nickname = nickname;
+    }
+
+    /**
+     * Method getNickname.
+     *
+     * @return String
+     */
+    public String getNickname() {
+        return nickname;
+    }
+
+    /**
+     * Method getRealName.
+     *
+     * @return String
+     */
     public String getRealName() {
         return realName;
     }
 
+    /**
+     * Method setRealName.
+     *
+     * @param realName String
+     */
     public void setRealName(String realName) {
         this.realName = realName;
     }
 
+    /**
+     * Method getGroupId.
+     *
+     * @return int
+     */
+    public int getGroupId() {
+        return groupId;
+    }
+
+    /**
+     * Method getQuitLocX.
+     *
+     * @return double
+     */
+    public double getQuitLocX() {
+        return x;
+    }
+
+    /**
+     * Method setQuitLocX.
+     *
+     * @param d double
+     */
+    public void setQuitLocX(double d) {
+        this.x = d;
+    }
+
+    /**
+     * Method getQuitLocY.
+     *
+     * @return double
+     */
+    public double getQuitLocY() {
+        return y;
+    }
+
+    /**
+     * Method setQuitLocY.
+     *
+     * @param d double
+     */
+    public void setQuitLocY(double d) {
+        this.y = d;
+    }
+
+    /**
+     * Method getQuitLocZ.
+     *
+     * @return double
+     */
+    public double getQuitLocZ() {
+        return z;
+    }
+
+    /**
+     * Method setQuitLocZ.
+     *
+     * @param d double
+     */
+    public void setQuitLocZ(double d) {
+        this.z = d;
+    }
+
+    /**
+     * Method getWorld.
+     *
+     * @return String
+     */
+    public String getWorld() {
+        return world;
+    }
+
+    /**
+     * Method setWorld.
+     *
+     * @param world String
+     */
+    public void setWorld(String world) {
+        this.world = world;
+    }
+
+    /**
+     * Method getIp.
+     *
+     * @return String
+     */
+    public String getIp() {
+        return ip;
+    }
+
+    /**
+     * Method setIp.
+     *
+     * @param ip String
+     */
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    /**
+     * Method getLastLogin.
+     *
+     * @return long
+     */
+    public long getLastLogin() {
+        return lastLogin;
+    }
+
+    /**
+     * Method setLastLogin.
+     *
+     * @param lastLogin long
+     */
+    public void setLastLogin(long lastLogin) {
+        this.lastLogin = lastLogin;
+    }
+
+    /**
+     * Method getEmail.
+     *
+     * @return String
+     */
+    public String getEmail() {
+        return email;
+    }
+
+    /**
+     * Method setEmail.
+     *
+     * @param email String
+     */
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    /**
+     * Method getSalt.
+     *
+     * @return String
+     */
+    public String getSalt() {
+        return this.salt;
+    }
+
+    /**
+     * Method setSalt.
+     *
+     * @param salt String
+     */
+    public void setSalt(String salt) {
+        this.salt = salt;
+    }
+
+    /**
+     * Method getHash.
+     *
+     * @return String
+     */
+    public String getHash() {
+        if (Settings.getPasswordHash == HashAlgorithm.MD5VB) {
+            if (salt != null && !salt.isEmpty() && Settings.getPasswordHash == HashAlgorithm.MD5VB) {
+                return "$MD5vb$" + salt + "$" + hash;
+            }
+        }
+        return hash;
+    }
+
+    /**
+     * Method setHash.
+     *
+     * @param hash String
+     */
+    public void setHash(String hash) {
+        this.hash = hash;
+    }
+
+    /**
+     * Method equals.
+     *
+     * @param obj Object
+     *
+     * @return boolean
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof PlayerAuth)) {
+            return false;
+        }
+        PlayerAuth other = (PlayerAuth) obj;
+        return other.getIp().equals(this.ip) && other.getNickname().equals(this.nickname);
+    }
+
+    /**
+     * Method hashCode.
+     *
+     * @return int
+     */
+    @Override
+    public int hashCode() {
+        int hashCode = 7;
+        hashCode = 71 * hashCode + (this.nickname != null ? this.nickname.hashCode() : 0);
+        hashCode = 71 * hashCode + (this.ip != null ? this.ip.hashCode() : 0);
+        return hashCode;
+    }
+
+    /**
+     * Method toString.
+     *
+     * @return String
+     */
+    @Override
+    public String toString() {
+        return ("Player : " + nickname + " | " + realName
+            + " ! IP : " + ip
+            + " ! LastLogin : " + lastLogin
+            + " ! LastPosition : " + x + "," + y + "," + z + "," + world
+            + " ! Email : " + email
+            + " ! Hash : " + hash
+            + " ! Salt : " + salt);
+    }
+
+    /**
+     * Method to serialize playerauth
+     *
+     * @return String
+     */
+    public String serialize()
+    {
+    	StringBuilder str = new StringBuilder();
+    	str.append(this.nickname).append(';');
+    	str.append(this.realName).append(';');
+    	str.append(this.ip).append(';');
+    	str.append(this.email).append(';');
+    	str.append(this.hash).append(';');
+    	str.append(this.salt).append(';');
+    	str.append(this.groupId).append(';');
+    	str.append(this.lastLogin).append(';');
+    	str.append(this.world).append(';');
+    	str.append(this.x).append(';');
+    	str.append(this.y).append(';');
+    	str.append(this.z);
+    	return str.toString();
+    }
+
+    /**
+     * Method to unserialize playerauth
+     *
+     */
+    public void unserialize(String str)
+    {
+    	String[] args = str.split(";");
+    	this.nickname = args[0];
+    	this.realName = args[1];
+    	this.ip = args[2];
+    	this.email = args[3];
+    	this.hash = args[4];
+    	this.salt = args[5];
+    	this.groupId = Integer.parseInt(args[6]);
+    	this.lastLogin = Long.parseLong(args[7]);
+    	this.world = args[8];
+    	this.x = Double.parseDouble(args[9]);
+    	this.y = Double.parseDouble(args[10]);
+    	this.z = Double.parseDouble(args[11]);
+    }
 }

src/main/java/fr/xephi/authme/cache/auth/PlayerCache.java

@@ -2,36 +2,22 @@ package fr.xephi.authme.cache.auth;
 
 import java.util.concurrent.ConcurrentHashMap;
 
+/**
+ */
 public class PlayerCache {
 
-    private volatile static PlayerCache singleton = null;
-    private ConcurrentHashMap<String, PlayerAuth> cache;
+    private volatile static PlayerCache singleton;
+    private final ConcurrentHashMap<String, PlayerAuth> cache;
 
     private PlayerCache() {
         cache = new ConcurrentHashMap<>();
     }
 
-    public void addPlayer(PlayerAuth auth) {
-        cache.put(auth.getNickname().toLowerCase(), auth);
-    }
-
-    public void updatePlayer(PlayerAuth auth) {
-        cache.remove(auth.getNickname().toLowerCase());
-        cache.put(auth.getNickname().toLowerCase(), auth);
-    }
-
-    public void removePlayer(String user) {
-        cache.remove(user.toLowerCase());
-    }
-
-    public boolean isAuthenticated(String user) {
-        return cache.containsKey(user.toLowerCase());
-    }
-
-    public PlayerAuth getAuth(String user) {
-        return cache.get(user.toLowerCase());
-    }
-
+    /**
+     * Method getInstance.
+     *
+     * @return PlayerCache
+     */
     public static PlayerCache getInstance() {
         if (singleton == null) {
             singleton = new PlayerCache();
@@ -39,10 +25,70 @@ public class PlayerCache {
         return singleton;
     }
 
+    /**
+     * Method addPlayer.
+     *
+     * @param auth PlayerAuth
+     */
+    public void addPlayer(PlayerAuth auth) {
+        cache.put(auth.getNickname().toLowerCase(), auth);
+    }
+
+    /**
+     * Method updatePlayer.
+     *
+     * @param auth PlayerAuth
+     */
+    public void updatePlayer(PlayerAuth auth) {
+        cache.remove(auth.getNickname().toLowerCase());
+        cache.put(auth.getNickname().toLowerCase(), auth);
+    }
+
+    /**
+     * Method removePlayer.
+     *
+     * @param user String
+     */
+    public void removePlayer(String user) {
+        cache.remove(user.toLowerCase());
+    }
+
+    /**
+     * Method isAuthenticated.
+     *
+     * @param user String
+     *
+     * @return boolean
+     */
+    public boolean isAuthenticated(String user) {
+        return cache.containsKey(user.toLowerCase());
+    }
+
+    /**
+     * Method getAuth.
+     *
+     * @param user String
+     *
+     * @return PlayerAuth
+     */
+    public PlayerAuth getAuth(String user) {
+        return cache.get(user.toLowerCase());
+    }
+
+    /**
+     * Method getLogged.
+     *
+     * @return int
+     */
     public int getLogged() {
         return cache.size();
     }
 
+    /**
+     * Method getCache.
+     *
+     * @return ConcurrentHashMap<String,PlayerAuth>
+     */
     public ConcurrentHashMap<String, PlayerAuth> getCache() {
         return this.cache;
     }

src/main/java/fr/xephi/authme/cache/backup/DataFileCache.java

@@ -1,25 +1,49 @@
 package fr.xephi.authme.cache.backup;
 
+/**
+ */
 public class DataFileCache {
 
-    private String group;
-    private boolean operator;
-    private boolean flying;
+    private final String group;
+    private final boolean operator;
+    private final boolean flying;
 
+    /**
+     * Constructor for DataFileCache.
+     *
+     * @param group    String
+     * @param operator boolean
+     * @param flying   boolean
+     */
     public DataFileCache(String group, boolean operator, boolean flying) {
         this.group = group;
         this.operator = operator;
         this.flying = flying;
     }
 
+    /**
+     * Method getGroup.
+     *
+     * @return String
+     */
     public String getGroup() {
         return group;
     }
 
+    /**
+     * Method getOperator.
+     *
+     * @return boolean
+     */
     public boolean getOperator() {
         return operator;
     }
 
+    /**
+     * Method isFlying.
+     *
+     * @return boolean
+     */
     public boolean isFlying() {
         return flying;
     }

src/main/java/fr/xephi/authme/cache/backup/JsonCache.java

@@ -1,27 +1,19 @@
 package fr.xephi.authme.cache.backup;
 
+import com.google.common.base.Charsets;
+import com.google.common.io.Files;
+import com.google.gson.*;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Utils;
+import org.bukkit.entity.Player;
+
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Type;
 
-import org.bukkit.entity.Player;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-
-import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.settings.Settings;
-import fr.xephi.authme.util.Utils;
-
+/**
+ */
 public class JsonCache {
 
     private final Gson gson;
@@ -33,12 +25,18 @@ public class JsonCache {
             ConsoleLogger.showError("Failed to create cache directory.");
         }
         gson = new GsonBuilder()
-                .registerTypeAdapter(DataFileCache.class, new PlayerDataSerializer())
-                .registerTypeAdapter(DataFileCache.class, new PlayerDataDeserializer())
-                .setPrettyPrinting()
-                .create();
+            .registerTypeAdapter(DataFileCache.class, new PlayerDataSerializer())
+            .registerTypeAdapter(DataFileCache.class, new PlayerDataDeserializer())
+            .setPrettyPrinting()
+            .create();
     }
 
+    /**
+     * Method createCache.
+     *
+     * @param player     Player
+     * @param playerData DataFileCache
+     */
     public void createCache(Player player, DataFileCache playerData) {
         if (player == null) {
             return;
@@ -68,6 +66,13 @@ public class JsonCache {
         }
     }
 
+    /**
+     * Method readCache.
+     *
+     * @param player Player
+     *
+     * @return DataFileCache
+     */
     public DataFileCache readCache(Player player) {
         String path;
         try {
@@ -90,19 +95,57 @@ public class JsonCache {
         }
     }
 
-    private class PlayerDataSerializer implements JsonSerializer<DataFileCache> {
-        @Override
-        public JsonElement serialize(DataFileCache dataFileCache, Type type, JsonSerializationContext jsonSerializationContext) {
-            JsonObject jsonObject = new JsonObject();
-            jsonObject.addProperty("group", dataFileCache.getGroup());
-            jsonObject.addProperty("operator", dataFileCache.getOperator());
-            jsonObject.addProperty("flying", dataFileCache.isFlying());
-
-            return jsonObject;
+    /**
+     * Method removeCache.
+     *
+     * @param player Player
+     */
+    public void removeCache(Player player) {
+        String path;
+        try {
+            path = player.getUniqueId().toString();
+        } catch (Exception | Error e) {
+            path = player.getName().toLowerCase();
+        }
+        File file = new File(cacheDir, path);
+        if (file.exists()) {
+            Utils.purgeDirectory(file);
+            if (!file.delete()) {
+                ConsoleLogger.showError("Failed to remove" + player.getName() + "cache.");
+            }
         }
     }
 
+    /**
+     * Method doesCacheExist.
+     *
+     * @param player Player
+     *
+     * @return boolean
+     */
+    public boolean doesCacheExist(Player player) {
+        String path;
+        try {
+            path = player.getUniqueId().toString();
+        } catch (Exception | Error e) {
+            path = player.getName().toLowerCase();
+        }
+        File file = new File(cacheDir, path + File.separator + "cache.json");
+        return file.exists();
+    }
+
+    /**
+     */
     private static class PlayerDataDeserializer implements JsonDeserializer<DataFileCache> {
+        /**
+         * Method deserialize.
+         *
+         * @param jsonElement                JsonElement
+         * @param type                       Type
+         * @param jsonDeserializationContext JsonDeserializationContext
+         *
+         * @return DataFileCache * @throws JsonParseException * @see com.google.gson.JsonDeserializer#deserialize(JsonElement, Type, JsonDeserializationContext)
+         */
         @Override
         public DataFileCache deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
             JsonObject jsonObject = jsonElement.getAsJsonObject();
@@ -128,31 +171,27 @@ public class JsonCache {
         }
     }
 
-    public void removeCache(Player player) {
-        String path;
-        try {
-            path = player.getUniqueId().toString();
-        } catch (Exception | Error e) {
-            path = player.getName().toLowerCase();
-        }
-        File file = new File(cacheDir, path);
-        if (file.exists()) {
-            Utils.purgeDirectory(file);
-            if (!file.delete()) {
-                ConsoleLogger.showError("Failed to remove" + player.getName() + "cache.");
-            }
-        }
-    }
+    /**
+     */
+    private class PlayerDataSerializer implements JsonSerializer<DataFileCache> {
+        /**
+         * Method serialize.
+         *
+         * @param dataFileCache            DataFileCache
+         * @param type                     Type
+         * @param jsonSerializationContext JsonSerializationContext
+         *
+         * @return JsonElement
+         */
+        @Override
+        public JsonElement serialize(DataFileCache dataFileCache, Type type, JsonSerializationContext jsonSerializationContext) {
+            JsonObject jsonObject = new JsonObject();
+            jsonObject.addProperty("group", dataFileCache.getGroup());
+            jsonObject.addProperty("operator", dataFileCache.getOperator());
+            jsonObject.addProperty("flying", dataFileCache.isFlying());
 
-    public boolean doesCacheExist(Player player) {
-        String path;
-        try {
-            path = player.getUniqueId().toString();
-        } catch (Exception | Error e) {
-            path = player.getName().toLowerCase();
+            return jsonObject;
         }
-        File file = new File(cacheDir, path + File.separator + "cache.json");
-        return file.exists();
     }
 
 }

src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java

@@ -1,33 +1,56 @@
 package fr.xephi.authme.cache.limbo;
 
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.backup.DataFileCache;
 import fr.xephi.authme.cache.backup.JsonCache;
 import fr.xephi.authme.events.ResetInventoryEvent;
-import fr.xephi.authme.events.StoreInventoryEvent;
+import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.settings.Settings;
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
 
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ */
 public class LimboCache {
 
     private volatile static LimboCache singleton;
-    public ConcurrentHashMap<String, LimboPlayer> cache;
-    private JsonCache playerData;
-    public AuthMe plugin;
+    public final ConcurrentHashMap<String, LimboPlayer> cache;
+    public final AuthMe plugin;
+    private final JsonCache playerData;
 
+    /**
+     * Constructor for LimboCache.
+     *
+     * @param plugin AuthMe
+     */
     private LimboCache(AuthMe plugin) {
         this.plugin = plugin;
         this.cache = new ConcurrentHashMap<>();
         this.playerData = new JsonCache();
     }
 
+    /**
+     * Method getInstance.
+     *
+     * @return LimboCache
+     */
+    public static LimboCache getInstance() {
+        if (singleton == null) {
+            singleton = new LimboCache(AuthMe.getInstance());
+        }
+        return singleton;
+    }
+
+    /**
+     * Add a limbo player.
+     *
+     * @param player Player instance to add.
+     */
     public void addLimboPlayer(Player player) {
         String name = player.getName().toLowerCase();
         Location loc = player.getLocation();
@@ -36,14 +59,13 @@ public class LimboCache {
         String playerGroup = "";
         boolean flying = false;
 
-        if (playerData.doesCacheExist(player)) {
-            final StoreInventoryEvent event = new StoreInventoryEvent(player, playerData);
-            Bukkit.getServer().getPluginManager().callEvent(event);
-            if (!event.isCancelled() && event.getInventory() != null && event.getArmor() != null) {
-                player.getInventory().setContents(event.getInventory());
-                player.getInventory().setArmorContents(event.getArmor());
-            }
+        // Get the permissions manager, and make sure it's valid
+        PermissionsManager permsMan = this.plugin.getPermissionsManager();
+        if (permsMan == null)
+            ConsoleLogger.showError("Unable to access permissions manager!");
+        assert permsMan != null;
 
+        if (playerData.doesCacheExist(player)) {
             DataFileCache cache = playerData.readCache(player);
             if (cache != null) {
                 playerGroup = cache.getGroup();
@@ -51,23 +73,12 @@ public class LimboCache {
                 flying = cache.isFlying();
             }
         } else {
-            StoreInventoryEvent event = new StoreInventoryEvent(player);
-            Bukkit.getServer().getPluginManager().callEvent(event);
-            if (!event.isCancelled() && event.getInventory() != null && event.getArmor() != null) {
-                player.getInventory().setContents(event.getInventory());
-                player.getInventory().setArmorContents(event.getArmor());
-            }
-
             operator = player.isOp();
             flying = player.isFlying();
-            if (plugin.permission != null) {
-                try {
-                    playerGroup = plugin.permission.getPrimaryGroup(player);
-                } catch (UnsupportedOperationException e) {
-                    ConsoleLogger.showError("Your permission system (" + plugin.permission.getName() + ") do not support Group system with that config... unhook!");
-                    plugin.permission = null;
-                }
-            }
+
+            // Check whether groups are supported
+            if (permsMan.hasGroupSupport())
+                playerGroup = permsMan.getPrimaryGroup(player);
         }
 
         if (Settings.isForceSurvivalModeEnabled) {
@@ -90,29 +101,52 @@ public class LimboCache {
         cache.put(name, new LimboPlayer(name, loc, gameMode, operator, playerGroup, flying));
     }
 
+    /**
+     * Method addLimboPlayer.
+     *
+     * @param player Player
+     * @param group  String
+     */
     public void addLimboPlayer(Player player, String group) {
         cache.put(player.getName().toLowerCase(), new LimboPlayer(player.getName().toLowerCase(), group));
     }
 
+    /**
+     * Method deleteLimboPlayer.
+     *
+     * @param name String
+     */
     public void deleteLimboPlayer(String name) {
         cache.remove(name);
     }
 
+    /**
+     * Method getLimboPlayer.
+     *
+     * @param name String
+     *
+     * @return LimboPlayer
+     */
     public LimboPlayer getLimboPlayer(String name) {
         return cache.get(name);
     }
 
+    /**
+     * Method hasLimboPlayer.
+     *
+     * @param name String
+     *
+     * @return boolean
+     */
     public boolean hasLimboPlayer(String name) {
         return cache.containsKey(name);
     }
 
-    public static LimboCache getInstance() {
-        if (singleton == null) {
-            singleton = new LimboCache(AuthMe.getInstance());
-        }
-        return singleton;
-    }
-
+    /**
+     * Method updateLimboPlayer.
+     *
+     * @param player Player
+     */
     public void updateLimboPlayer(Player player) {
         if (this.hasLimboPlayer(player.getName().toLowerCase())) {
             this.deleteLimboPlayer(player.getName().toLowerCase());

src/main/java/fr/xephi/authme/cache/limbo/LimboPlayer.java

@@ -4,9 +4,11 @@ import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.scheduler.BukkitTask;
 
+/**
+ */
 public class LimboPlayer {
 
-    private String name;
+    private final String name;
     private Location loc = null;
     private BukkitTask timeoutTaskId = null;
     private BukkitTask messageTaskId = null;
@@ -15,8 +17,18 @@ public class LimboPlayer {
     private String group = "";
     private boolean flying = false;
 
+    /**
+     * Constructor for LimboPlayer.
+     *
+     * @param name     String
+     * @param loc      Location
+     * @param gameMode GameMode
+     * @param operator boolean
+     * @param group    String
+     * @param flying   boolean
+     */
     public LimboPlayer(String name, Location loc, GameMode gameMode,
-            boolean operator, String group, boolean flying) {
+                       boolean operator, String group, boolean flying) {
         this.name = name;
         this.loc = loc;
         this.gameMode = gameMode;
@@ -25,51 +37,107 @@ public class LimboPlayer {
         this.flying = flying;
     }
 
+    /**
+     * Constructor for LimboPlayer.
+     *
+     * @param name  String
+     * @param group String
+     */
     public LimboPlayer(String name, String group) {
         this.name = name;
         this.group = group;
     }
 
+    /**
+     * Method getName.
+     *
+     * @return String
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * Method getLoc.
+     *
+     * @return Location
+     */
     public Location getLoc() {
         return loc;
     }
 
+    /**
+     * Method getGameMode.
+     *
+     * @return GameMode
+     */
     public GameMode getGameMode() {
         return gameMode;
     }
 
+    /**
+     * Method getOperator.
+     *
+     * @return boolean
+     */
     public boolean getOperator() {
         return operator;
     }
 
+    /**
+     * Method getGroup.
+     *
+     * @return String
+     */
     public String getGroup() {
         return group;
     }
 
+    /**
+     * Method getTimeoutTaskId.
+     *
+     * @return BukkitTask
+     */
+    public BukkitTask getTimeoutTaskId() {
+        return timeoutTaskId;
+    }
+
+    /**
+     * Method setTimeoutTaskId.
+     *
+     * @param i BukkitTask
+     */
     public void setTimeoutTaskId(BukkitTask i) {
         if (this.timeoutTaskId != null)
             this.timeoutTaskId.cancel();
         this.timeoutTaskId = i;
     }
 
-    public BukkitTask getTimeoutTaskId() {
-        return timeoutTaskId;
+    /**
+     * Method getMessageTaskId.
+     *
+     * @return BukkitTask
+     */
+    public BukkitTask getMessageTaskId() {
+        return messageTaskId;
     }
 
+    /**
+     * Method setMessageTaskId.
+     *
+     * @param messageTaskId BukkitTask
+     */
     public void setMessageTaskId(BukkitTask messageTaskId) {
         if (this.messageTaskId != null)
             this.messageTaskId.cancel();
         this.messageTaskId = messageTaskId;
     }
 
-    public BukkitTask getMessageTaskId() {
-        return messageTaskId;
-    }
-
+    /**
+     * Method isFlying.
+     *
+     * @return boolean
+     */
     public boolean isFlying() {
         return flying;
     }

src/main/java/fr/xephi/authme/command/CommandArgumentDescription.java

@@ -1,37 +1,35 @@
 package fr.xephi.authme.command;
 
+/**
+ */
 public class CommandArgumentDescription {
 
     // TODO: Allow argument to consist of infinite parts. <label ...>
 
-    /** Argument label. */
+    /**
+     * Argument label (one-word description of the argument).
+     */
     private String label;
-    /** Argument description. */
+    /**
+     * Argument description.
+     */
     private String description;
-    /** Defines whether the argument is optional. */
-    private boolean optional = false;
+    /**
+     * Defines whether the argument is optional.
+     */
+    private boolean isOptional = false;
 
     /**
      * Constructor.
      *
-     * @param label The argument label.
+     * @param label       The argument label.
      * @param description The argument description.
+     * @param isOptional  True if the argument is optional, false otherwise.
      */
-    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);
+    public CommandArgumentDescription(String label, String description, boolean isOptional) {
+        this.label = label;
+        this.description = description;
+        this.isOptional = isOptional;
     }
 
     /**
@@ -43,15 +41,6 @@ public class CommandArgumentDescription {
         return this.label;
     }
 
-    /**
-     * Set the argument label.
-     *
-     * @param label Argument label.
-     */
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
     /**
      * Get the argument description.
      *
@@ -61,30 +50,13 @@ public class CommandArgumentDescription {
         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;
+        return isOptional;
     }
 
-    /**
-     * Set whether the argument is optional.
-     *
-     * @param optional True if the argument is optional, false otherwise.
-     */
-    public void setOptional(boolean optional) {
-        this.optional = optional;
-    }
 }

src/main/java/fr/xephi/authme/command/CommandDescription.java

@@ -1,56 +1,72 @@
 package fr.xephi.authme.command;
 
+import fr.xephi.authme.permission.PermissionNode;
+import fr.xephi.authme.util.StringUtils;
+import org.bukkit.command.CommandSender;
+
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.bukkit.command.CommandSender;
-
-import fr.xephi.authme.util.StringUtils;
-
+/**
+ * Command description - defines which labels ("names") will lead to a command and points to the
+ * {@link ExecutableCommand} implementation that executes the logic of the command.
+ *
+ * CommandDescription is built hierarchically and have one parent or {@code null} for base commands (main commands
+ * such as /authme) and may have multiple children extending the mapping of the parent: e.g. if /authme has a child
+ * whose label is "register", then "/authme register" is the command that the child defines.
+ */
 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> children = 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.
+     * Defines the labels to execute the command. For example, if labels are "register" and "r" and the parent is
+     * the command for "/authme", then both "/authme register" and "/authme r" will be handled by this command.
      */
-    public CommandDescription(ExecutableCommand executableCommand, String label, String description, String detailedDescription, CommandDescription parent) {
-        this(executableCommand, label, description, parent, detailedDescription, null);
-    }
+    private List<String> labels;
+    /**
+     * Command description.
+     */
+    private String description;
+    /**
+     * Detailed description of the command.
+     */
+    private String detailedDescription;
+    /**
+     * The executable command instance.
+     */
+    private ExecutableCommand executableCommand;
+    /**
+     * The parent command.
+     */
+    private CommandDescription parent;
+    /**
+     * The child commands that extend this command.
+     */
+    private List<CommandDescription> children = new ArrayList<>();
+    /**
+     * The arguments the command takes.
+     */
+    private List<CommandArgumentDescription> arguments;
+    /**
+     * Defines whether there is an argument maximum or not.
+     */
+    private boolean noArgumentMaximum;
+    /**
+     * Defines the command permissions.
+     */
+    private CommandPermissions permissions;
 
     /**
      * Constructor.
      *
-     * @param executableCommand The executable command, or null.
-     * @param labels List of command labels.
-     * @param description Command description.
+     * @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 parent              Parent command.
      */
     public CommandDescription(ExecutableCommand executableCommand, List<String> labels, String description, String detailedDescription, CommandDescription parent) {
         this(executableCommand, labels, description, detailedDescription, parent, null);
@@ -59,55 +75,70 @@ public class CommandDescription {
     /**
      * Constructor.
      *
-     * @param executableCommand The executable command, or null.
-     * @param label Command label.
-     * @param description Command description.
-     * @param parent Parent command.
+     * @param executableCommand   The executable command, or null.
+     * @param labels              List of command labels.
+     * @param description         Command description.
      * @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.
+     * @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);
+        this.labels = labels;
+        this.description = description;
+        this.detailedDescription = detailedDescription;
         setParent(parent);
         setArguments(arguments);
     }
 
     /**
-     * Get the first relative command label.
+     * Private constructor. Use {@link CommandDescription#builder()} to create instances of this class.
      *
-     * @return First relative command label.
+     * @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 String getLabel() {
-        // Ensure there's any item in the command list
-        if(this.labels.size() == 0)
-            return "";
+    private CommandDescription(List<String> labels, String description, String detailedDescription,
+                               ExecutableCommand executableCommand, CommandDescription parent,
+                               List<CommandArgumentDescription> arguments, boolean noArgumentMaximum,
+                               CommandPermissions permissions) {
+        this.labels = labels;
+        this.description = description;
+        this.detailedDescription = detailedDescription;
+        this.executableCommand = executableCommand;
+        this.parent = parent;
+        this.arguments = arguments;
+        this.noArgumentMaximum = noArgumentMaximum;
+        this.permissions = permissions;
 
-        // Return the first command on the list
-        return this.labels.get(0);
+        if (parent != null) {
+            // Passing `this` in constructor is not very nice; consider creating a "static create()" method instead
+            parent.addChild(this);
+        }
     }
 
+    /**
+     * Check whether two labels are 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));
+    }
+
+
+
     /**
      * Get the label most similar to the reference. The first label will be returned if no reference was supplied.
      *
@@ -117,11 +148,11 @@ public class CommandDescription {
      */
     public String getLabel(CommandParts reference) {
         // Ensure there's any item in the command list
-        if(this.labels.size() == 0)
+        if (this.labels.size() == 0)
             return "";
 
         // Return the first label if we can't use the reference
-        if(reference == null)
+        if (reference == null)
             return this.labels.get(0);
 
         // Get the correct label from the reference
@@ -130,9 +161,9 @@ public class CommandDescription {
         // Check whether the preferred label is in the label list
         double currentDifference = -1;
         String currentLabel = this.labels.get(0);
-        for(String entry : this.labels) {
+        for (String entry : this.labels) {
             double entryDifference = StringUtils.getDifference(entry, preferred);
-            if(entryDifference < currentDifference || currentDifference < 0) {
+            if (entryDifference < currentDifference || currentDifference < 0) {
                 currentDifference = entryDifference;
                 currentLabel = entry;
             }
@@ -151,83 +182,6 @@ public class CommandDescription {
         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.
      *
@@ -237,29 +191,14 @@ public class CommandDescription {
      */
     public boolean hasLabel(String commandLabel) {
         // Check whether any command matches with the argument
-        for(String entry : this.labels)
-            if(commandLabelEquals(entry, commandLabel))
+        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.
@@ -270,7 +209,7 @@ public class CommandDescription {
      */
     public boolean isSuitableLabel(CommandParts commandReference) {
         // Make sure the command reference is valid
-        if(commandReference.getCount() <= 0)
+        if (commandReference.getCount() <= 0)
             return false;
 
         // Get the parent count
@@ -281,30 +220,9 @@ public class CommandDescription {
     }
 
     /**
-     * Check whether a label is valid to use.
+     * Get the absolute command label, without a starting slash.
      *
-     * @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.
+     * @return The absolute label
      */
     public String getAbsoluteLabel() {
         return getAbsoluteLabel(false);
@@ -313,6 +231,8 @@ public class CommandDescription {
     /**
      * Get the absolute command label.
      *
+     * @param includeSlash boolean
+     *
      * @return Absolute command label.
      */
     public String getAbsoluteLabel(boolean includeSlash) {
@@ -322,12 +242,15 @@ public class CommandDescription {
     /**
      * Get the absolute command label.
      *
+     * @param includeSlash
+     * @param reference
+     *
      * @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)
+        if (out == null)
             return "";
 
         // Return the result
@@ -346,7 +269,7 @@ public class CommandDescription {
         List<String> referenceList = new ArrayList<>();
 
         // Check whether this command has a parent, if so, add the absolute parent command
-        if(getParent() != null)
+        if (getParent() != null)
             referenceList.addAll(getParent().getCommandReference(reference).getList());
 
         // Get the current label
@@ -370,14 +293,14 @@ public class CommandDescription {
     /**
      * Get the difference between this command and another command reference.
      *
-     * @param other The other 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)
+        if (other == null)
             return -1;
 
         // Get the command reference
@@ -417,7 +340,7 @@ public class CommandDescription {
     /**
      * Execute the command, if possible.
      *
-     * @param sender The command sender that triggered the execution of this command.
+     * @param sender           The command sender that triggered the execution of this command.
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *
@@ -425,7 +348,7 @@ public class CommandDescription {
      */
     public boolean execute(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // Make sure the command is executable
-        if(!isExecutable())
+        if (!isExecutable())
             return false;
 
         // Execute the command, return the result
@@ -448,7 +371,7 @@ public class CommandDescription {
      */
     public int getParentCount() {
         // Check whether the this description has a parent
-        if(!hasParent())
+        if (!hasParent())
             return 0;
 
         // Get the parent count of the parent, return the result
@@ -464,14 +387,14 @@ public class CommandDescription {
      */
     public boolean setParent(CommandDescription parent) {
         // Make sure the parent is different
-        if(this.parent == parent)
+        if (this.parent == parent)
             return true;
 
         // Set the parent
         this.parent = parent;
 
         // Make sure the parent isn't null
-        if(parent == null)
+        if (parent == null)
             return true;
 
         // Add this description as a child to the parent
@@ -505,43 +428,27 @@ public class CommandDescription {
      */
     public boolean addChild(CommandDescription commandDescription) {
         // Make sure the description is valid
-        if(commandDescription == null)
-            return false;
-        if(!commandDescription.isValid())
+        if (commandDescription == null)
             return false;
 
         // Make sure the child doesn't exist already
-        if(isChild(commandDescription))
+        if (isChild(commandDescription))
             return true;
 
         // The command description to add as a child
-        if(!this.children.add(commandDescription))
+        if (!this.children.add(commandDescription))
             return false;
 
         // Set this description as parent on the child
         return commandDescription.setParent(this);
     }
 
-    /**
-     * Set the children of this command.
-     *
-     * @param children New command children. Null to remove all children.
-     */
-    public void setChildren(List<CommandDescription> children) {
-        // Check whether the children list should be cleared
-        if(children == null)
-            this.children.clear();
-
-        else
-            this.children = children;
-    }
-
     /**
      * Check whether this command has any child labels.
      *
      * @return True if this command has any child labels.
      */
-    public boolean hasChilds() {
+    public boolean hasChildren() {
         return (this.children.size() != 0);
     }
 
@@ -554,9 +461,7 @@ public class CommandDescription {
      */
     public boolean isChild(CommandDescription commandDescription) {
         // Make sure the description is valid
-        if(commandDescription == null)
-            return false;
-        if(!commandDescription.isValid())
+        if (commandDescription == null) // TODO: After builder, commandDescription == null -> never
             return false;
 
         // Check whether this child exists, return the result
@@ -572,11 +477,11 @@ public class CommandDescription {
      */
     public boolean addArgument(CommandArgumentDescription argument) {
         // Make sure the argument is valid
-        if(argument == null)
+        if (argument == null)
             return false;
 
         // Make sure the argument isn't added already
-        if(hasArgument(argument))
+        if (hasArgument(argument))
             return true;
 
         // Add the argument, return the result
@@ -599,11 +504,14 @@ public class CommandDescription {
      */
     public void setArguments(List<CommandArgumentDescription> arguments) {
         // Convert null into an empty argument list
-        if(arguments == null)
-            this.arguments.clear();
-
-        else
+        if (arguments == null) {
+            // Note ljacqu 20151128: Temporary workaround to avoid null pointer exception. Soon we won't need setters
+            // on the main class (-> complete instantiation via Builder)
+            // TODO Remove this method once unused
+            this.arguments = new ArrayList<>();
+        } else {
             this.arguments = arguments;
+        }
     }
 
     /**
@@ -614,12 +522,7 @@ public class CommandDescription {
      * @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);
+        return argument != null && arguments.contains(argument);
     }
 
     /**
@@ -628,7 +531,7 @@ public class CommandDescription {
      * @return True if this command has any arguments.
      */
     public boolean hasArguments() {
-        return (this.arguments.size() != 0);
+        return !arguments.isEmpty();
     }
 
     /**
@@ -642,9 +545,9 @@ public class CommandDescription {
         int optionalArgument = 0;
 
         // Loop through each argument
-        for(CommandArgumentDescription argument : this.arguments) {
+        for (CommandArgumentDescription argument : this.arguments) {
             // Check whether the command is optional
-            if(!argument.isOptional()) {
+            if (!argument.isOptional()) {
                 requiredArguments += optionalArgument + 1;
                 optionalArgument = 0;
 
@@ -663,22 +566,14 @@ public class CommandDescription {
      */
     public int getMaximumArguments() {
         // Check whether there is a maximum set
-        if(this.noArgumentMaximum)
+        if (this.noArgumentMaximum)
+            // TODO ljacqu 20151128: Magic number
             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.
      *
@@ -688,26 +583,13 @@ public class CommandDescription {
         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);
+        return !StringUtils.isEmpty(description);
     }
 
     /**
@@ -716,29 +598,7 @@ public class CommandDescription {
      * @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);
+        return !StringUtils.isEmpty(detailedDescription) ? this.detailedDescription : this.description;
     }
 
     /**
@@ -750,31 +610,31 @@ public class CommandDescription {
      */
     public FoundCommandResult findCommand(final CommandParts queryReference) {
         // Make sure the command reference is valid
-        if(queryReference.getCount() <= 0)
+        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)
+        if (queryReference.getCount() <= getParentCount() + 1)
             return new FoundCommandResult(
-                    this,
-                    getCommandReference(queryReference),
-                    new CommandParts(),
-                    queryReference);
+                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(getChildren().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> 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));
+                        o1.getCommandDifference(queryReference),
+                        o2.getCommandDifference(queryReference));
                 }
             });
 
@@ -782,21 +642,21 @@ public class CommandDescription {
             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)
-                if(getSuitableArgumentsDifference(queryReference) == 0)
+            if (firstChildDifference > 0.0)
+                if (getSuitableArgumentsDifference(queryReference) == 0)
                     return new FoundCommandResult(this, newReference, newArguments, queryReference);
 
             // Loop through each child
-            for(CommandDescription child : commandChildren) {
+            for (CommandDescription child : commandChildren) {
                 // Get the best suitable command
                 FoundCommandResult result = child.findCommand(queryReference);
-                if(result != null)
+                if (result != null)
                     return result;
             }
         }
 
         // Check if the remaining command reference elements fit the arguments for this command
-        if(getSuitableArgumentsDifference(queryReference) >= 0)
+        if (getSuitableArgumentsDifference(queryReference) >= 0)
             return new FoundCommandResult(this, newReference, newArguments, queryReference);
 
         // No command found, return null
@@ -835,26 +695,29 @@ public class CommandDescription {
      */
     public int getSuitableArgumentsDifference(CommandParts commandReference) {
         // Make sure the command reference is valid
-        if(commandReference.getCount() <= 0)
+        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)
+        // Check if there are too few arguments
+        if (getMinimumArguments() > remainingElementCount) {
             return Math.abs(getMinimumArguments() - remainingElementCount);
+        }
 
         // Check if there are too many arguments
-        if(getMaximumArguments() < remainingElementCount && getMaximumArguments() >= 0)
+        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.
+     * Get the command permissions. Return null if the command doesn't require any permission.
      *
      * @return The command permissions.
      */
@@ -865,54 +728,117 @@ public class CommandDescription {
     /**
      * 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 permissionNode    The permission node required.
      * @param defaultPermission The default permission.
      */
-    public void setCommandPermissions(String permissionNode, CommandPermissions.DefaultPermission defaultPermission) {
+    public void setCommandPermissions(PermissionNode 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));
+    public static Builder builder() {
+        return new Builder();
     }
 
-    /**
-     * 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;
+    public static final class Builder {
+        private List<String> labels;
+        private String description;
+        private String detailedDescription;
+        private ExecutableCommand executableCommand;
+        private CommandDescription parent;
+        private List<CommandArgumentDescription> arguments = new ArrayList<>();
+        private boolean noArgumentMaximum;
+        private CommandPermissions permissions;
 
-        // Make sure the permissions are set up properly
-        if(this.permissions == null)
-            return false;
+        /**
+         * Build a CommandDescription from the builder.
+         *
+         * @return The generated CommandDescription object
+         */
+        public CommandDescription build() {
+            return new CommandDescription(
+                getOrThrow(labels, "labels"),
+                firstNonNull(description, ""),
+                firstNonNull(detailedDescription, ""),
+                getOrThrow(executableCommand, "executableCommand"),
+                firstNonNull(parent, null),
+                arguments,
+                noArgumentMaximum,
+                firstNonNull(permissions, null)
+            );
+        }
+
+        public Builder labels(List<String> labels) {
+            this.labels = labels;
+            return this;
+        }
+
+        public Builder labels(String... labels) {
+            return labels(asMutableList(labels));
+        }
+
+        public Builder description(String description) {
+            this.description = description;
+            return this;
+        }
+
+        public Builder detailedDescription(String detailedDescription) {
+            this.detailedDescription = detailedDescription;
+            return this;
+        }
+
+        public Builder executableCommand(ExecutableCommand executableCommand) {
+            this.executableCommand = executableCommand;
+            return this;
+        }
+
+        public Builder parent(CommandDescription parent) {
+            this.parent = parent;
+            return this;
+        }
+
+        public Builder withArgument(String label, String description, boolean isOptional) {
+            arguments.add(new CommandArgumentDescription(label, description, isOptional));
+            return this;
+        }
+
+        public Builder noArgumentMaximum(boolean noArgumentMaximum) {
+            this.noArgumentMaximum = noArgumentMaximum;
+            return this;
+        }
+
+        public Builder permissions(CommandPermissions.DefaultPermission defaultPermission,
+                                   PermissionNode... permissionNodes) {
+            this.permissions = new CommandPermissions(asMutableList(permissionNodes), defaultPermission);
+            return this;
+        }
+
+        @SafeVarargs
+        private static <T> List<T> asMutableList(T... items) {
+            return new ArrayList<>(Arrays.asList(items));
+        }
+
+        private static <T> T firstNonNull(T first, T second) {
+            return first != null ? first : second;
+        }
+
+        private static <T> T getOrThrow(T element, String elementName) {
+            if (!isEmpty(element)) {
+                return element;
+            }
+            throw new RuntimeException("The element '" + elementName + "' may not be empty in CommandDescription");
+        }
+
+        private static <T> boolean isEmpty(T element) {
+            if (element == null) {
+                return true;
+            } else if (element instanceof Collection<?>) {
+                return ((Collection<?>) element).isEmpty();
+            } else if (element instanceof String) {
+                return StringUtils.isEmpty((String) element);
+            }
+            return false;
+        }
 
-        // Everything seems to be correct, return the result
-        return true;
     }
+
 }

src/main/java/fr/xephi/authme/command/CommandHandler.java

@@ -1,18 +1,21 @@
 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. */
+    /**
+     * The command manager instance.
+     */
     private CommandManager commandManager;
 
     /**
@@ -22,7 +25,7 @@ public class CommandHandler {
      */
     public CommandHandler(boolean init) {
         // Initialize
-        if(init)
+        if (init)
             init();
     }
 
@@ -34,7 +37,7 @@ public class CommandHandler {
      */
     public boolean init() {
         // Make sure the handler isn't initialized already
-        if(isInit())
+        if (isInit())
             return true;
 
         // Initialize the command manager
@@ -62,7 +65,7 @@ public class CommandHandler {
      */
     public boolean destroy() {
         // Make sure the command handler is initialized
-        if(!isInit())
+        if (!isInit())
             return true;
 
         // Unset the command manager
@@ -82,10 +85,10 @@ public class CommandHandler {
     /**
      * Process a command.
      *
-     * @param sender The command sender (Bukkit).
-     * @param bukkitCommand The command (Bukkit).
+     * @param sender             The command sender (Bukkit).
+     * @param bukkitCommand      The command (Bukkit).
      * @param bukkitCommandLabel The command label (Bukkit).
-     * @param bukkitArgs The command arguments (Bukkit).
+     * @param bukkitArgs         The command arguments (Bukkit).
      *
      * @return True if the command was executed, false otherwise.
      */
@@ -95,13 +98,13 @@ public class CommandHandler {
 
         // Create a command reference, and make sure at least one command part is available
         CommandParts commandReference = new CommandParts(bukkitCommandLabel, args);
-        if(commandReference.getCount() == 0)
+        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 " + AuthMe.PLUGIN_NAME + " command!");
+        if (result == null) {
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to parse " + AuthMe.getPluginName() + " command!");
             return false;
         }
 
@@ -110,13 +113,13 @@ public class CommandHandler {
 
         // 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) {
+        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)
+            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
@@ -125,17 +128,17 @@ public class CommandHandler {
         }
 
         // Show a message when the command handler is assuming a command
-        if(commandDifference > 0) {
+        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 + "!");
+                ChatColor.DARK_RED + "!");
         }
 
         // Make sure the command is executable
-        if(!result.isExecutable()) {
+        if (!result.isExecutable()) {
             // Get the command reference
             CommandParts helpCommandReference = new CommandParts(result.getCommandReference().getRange(1));
 
@@ -148,14 +151,14 @@ public class CommandHandler {
         }
 
         // Make sure the command sender has permission
-        if(!result.hasPermission(sender)) {
+        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()) {
+        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));
@@ -187,12 +190,12 @@ public class CommandHandler {
         List<String> arguments = new ArrayList<>(Arrays.asList(args));
 
         /// Remove all empty arguments
-        for(int i = 0; i < arguments.size(); i++) {
+        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) {
+            if (arg.trim().length() == 0) {
                 // Remove the current argument
                 arguments.remove(i);
 

src/main/java/fr/xephi/authme/command/CommandManager.java

@@ -1,29 +1,7 @@
 package fr.xephi.authme.command;
 
-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.authme.*;
 import fr.xephi.authme.command.executable.captcha.CaptchaCommand;
 import fr.xephi.authme.command.executable.converter.ConverterCommand;
 import fr.xephi.authme.command.executable.email.AddEmailCommand;
@@ -31,17 +9,29 @@ 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;
+import fr.xephi.authme.permission.AdminPermission;
+import fr.xephi.authme.permission.UserPermission;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static fr.xephi.authme.command.CommandPermissions.DefaultPermission.ALLOWED;
+import static fr.xephi.authme.command.CommandPermissions.DefaultPermission.OP_ONLY;
+
+/**
+ */
 public class CommandManager {
 
-    /** The list of commandDescriptions. */
-    private List<CommandDescription> commandDescriptions = new ArrayList<>();
+    /**
+     * The list of commandDescriptions.
+     */
+    private final List<CommandDescription> commandDescriptions = new ArrayList<>();
 
     /**
      * Constructor.
      *
-     * @param registerCommands
-     *            True to register the commands, false otherwise.
+     * @param registerCommands True to register the commands, false otherwise.
      */
     public CommandManager(boolean registerCommands) {
         // Register the commands
@@ -52,103 +42,97 @@ public class CommandManager {
     /**
      * Register all commands.
      */
-    @SuppressWarnings({ "serial" })
     public void registerCommands() {
-        // Register the base AuthMe Reloaded command
-        CommandDescription authMeBaseCommand = new CommandDescription(new AuthMeCommand(), new ArrayList<String>() {
+        // Create a list of help command labels
+        final List<String> helpCommandLabels = Arrays.asList("help", "hlp", "h", "sos", "?");
+        ExecutableCommand helpCommandExecutable = new HelpCommand();
 
-            {
-                add("authme");
-            }
-        }, "Main command", "The main AuthMeReloaded command. The root for all admin commands.", null);
+        // Register the base AuthMe Reloaded command
+        CommandDescription authMeBaseCommand = CommandDescription.builder()
+            .executableCommand(new AuthMeCommand())
+            .labels("authme")
+            .description("Main command")
+            .detailedDescription("The main AuthMeReloaded command. The root for all admin commands.")
+            .parent(null)
+            .build();
 
         // Register the help command
-        CommandDescription authMeHelpCommand = new CommandDescription(new HelpCommand(), new ArrayList<String>() {
-
-            {
-                add("help");
-                add("hlp");
-                add("h");
-                add("sos");
-                add("?");
-            }
-        }, "View help", "View detailed help pages about AuthMeReloaded commands.", authMeBaseCommand);
-        authMeHelpCommand.addArgument(new CommandArgumentDescription("query", "The command or query to view help for.", true));
-        authMeHelpCommand.setMaximumArguments(false);
+        CommandDescription authMeHelpCommand = CommandDescription.builder()
+            .executableCommand(helpCommandExecutable)
+            .labels(helpCommandLabels)
+            .description("View help")
+            .detailedDescription("View detailed help pages about AuthMeReloaded commands.")
+            .parent(authMeBaseCommand)
+            .withArgument("query", "The command or query to view help for.", true)
+            .build();
 
         // Register the register command
-        CommandDescription registerCommand = new CommandDescription(new RegisterCommand(), new ArrayList<String>() {
-
-            {
-                add("register");
-                add("reg");
-                add("r");
-            }
-        }, "Register a player", "Register the specified player with the specified password.", 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));
+        CommandDescription registerCommand = CommandDescription.builder()
+            .executableCommand(new RegisterCommand())
+            .labels("register", "reg", "r")
+            .description("Register a player")
+            .detailedDescription("Register the specified player with the specified password.")
+            .parent(authMeBaseCommand)
+            .permissions(OP_ONLY, UserPermission.REGISTER)
+            .withArgument("player", "Player name", false)
+            .withArgument("password", "Password", false)
+            .build();
 
         // Register the unregister command
-        CommandDescription unregisterCommand = new CommandDescription(new UnregisterCommand(), new ArrayList<String>() {
-
-            {
-                add("unregister");
-                add("unreg");
-                add("unr");
-                add("delete");
-                add("del");
-            }
-        }, "Unregister a player", "Unregister the specified player.", authMeBaseCommand);
-        unregisterCommand.setCommandPermissions("authme.admin.unregister", CommandPermissions.DefaultPermission.OP_ONLY);
-        unregisterCommand.addArgument(new CommandArgumentDescription("player", "Player name", false));
+        CommandDescription unregisterCommand = CommandDescription.builder()
+            .executableCommand(new UnregisterCommand())
+            .labels("unregister", "unreg", "unr")
+            .description("Unregister a player")
+            .detailedDescription("Unregister the specified player.")
+            .parent(authMeBaseCommand)
+            .permissions(OP_ONLY, UserPermission.UNREGISTER)
+            .withArgument("player", "Player name", false)
+            .build();
 
         // Register the forcelogin command
-        CommandDescription forceLoginCommand = new CommandDescription(new ForceLoginCommand(), new ArrayList<String>() {
-
-            {
-                add("forcelogin");
-                add("login");
-            }
-        }, "Enforce login player", "Enforce the specified player to login.", authMeBaseCommand);
-        forceLoginCommand.setCommandPermissions("authme.admin.forcelogin", CommandPermissions.DefaultPermission.OP_ONLY);
-        forceLoginCommand.addArgument(new CommandArgumentDescription("player", "Online player name", true));
+        CommandDescription forceLoginCommand = CommandDescription.builder()
+            .executableCommand(new ForceLoginCommand())
+            .labels("forcelogin", "login")
+            .description("Enforce login player")
+            .detailedDescription("Enforce the specified player to login.")
+            .parent(authMeBaseCommand)
+            .permissions(OP_ONLY, UserPermission.CAN_LOGIN_BE_FORCED)
+            .withArgument("player", "Online player name", true)
+            .build();
 
         // Register the changepassword command
-        CommandDescription changePasswordCommand = new CommandDescription(new ChangePasswordCommand(), new ArrayList<String>() {
+        CommandDescription changePasswordCommand = CommandDescription.builder()
+            .executableCommand(new ChangePasswordCommand())
+            .labels("password", "changepassword", "changepass", "cp")
+            .description("Change a player's password")
+            .detailedDescription("Change the password of a player.")
+            .parent(authMeBaseCommand)
+            .permissions(OP_ONLY, UserPermission.CHANGE_PASSWORD)
+            .withArgument("player", "Player name", false)
+            .withArgument("pwd", "New password", false)
+            .build();
 
-            {
-                add("password");
-                add("changepassword");
-                add("changepass");
-                add("cp");
-            }
-        }, "Change player's password", "Change the password of a player.", 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));
-
-        // 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", authMeBaseCommand);
-        lastLoginCommand.setCommandPermissions("authme.admin.lastlogin", CommandPermissions.DefaultPermission.OP_ONLY);
-        lastLoginCommand.addArgument(new CommandArgumentDescription("player", "Player name", true));
+        // Register the last login command
+        CommandDescription lastLoginCommand = CommandDescription.builder()
+            .executableCommand(new LastLoginCommand())
+            .labels("lastlogin", "ll")
+            .description("Player's last login")
+            .detailedDescription("View the date of the specified players last login.")
+            .parent(authMeBaseCommand)
+            .permissions(OP_ONLY, AdminPermission.LAST_LOGIN)
+            .withArgument("player", "Player name", true)
+            .build();
 
         // 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.", authMeBaseCommand);
-        accountsCommand.setCommandPermissions("authme.admin.accounts", CommandPermissions.DefaultPermission.OP_ONLY);
-        accountsCommand.addArgument(new CommandArgumentDescription("player", "Player name or IP", true));
+        CommandDescription accountsCommand = CommandDescription.builder()
+            .executableCommand(new AccountsCommand())
+            .labels("accounts", "account")
+            .description("Display player accounts")
+            .detailedDescription("Display all accounts of a player by his player name or IP.")
+            .parent(authMeBaseCommand)
+            .permissions(OP_ONLY, AdminPermission.ACCOUNTS)
+            .withArgument("player", "Player name or IP", true)
+            .build();
 
         // Register the getemail command
         CommandDescription getEmailCommand = new CommandDescription(new GetEmailCommand(), new ArrayList<String>() {
@@ -160,7 +144,7 @@ public class CommandManager {
                 add("mail");
             }
         }, "Display player's email", "Display the email address of the specified player if set.", authMeBaseCommand);
-        getEmailCommand.setCommandPermissions("authme.admin.getemail", CommandPermissions.DefaultPermission.OP_ONLY);
+        getEmailCommand.setCommandPermissions(AdminPermission.GET_EMAIL, OP_ONLY);
         getEmailCommand.addArgument(new CommandArgumentDescription("player", "Player name", true));
 
         // Register the setemail command
@@ -173,7 +157,7 @@ public class CommandManager {
                 add("setmail");
             }
         }, "Change player's email", "Change the email address of the specified player.", authMeBaseCommand);
-        setEmailCommand.setCommandPermissions("authme.admin.chgemail", CommandPermissions.DefaultPermission.OP_ONLY);
+        setEmailCommand.setCommandPermissions(AdminPermission.CHANGE_EMAIL, OP_ONLY);
         setEmailCommand.addArgument(new CommandArgumentDescription("player", "Player name", false));
         setEmailCommand.addArgument(new CommandArgumentDescription("email", "Player email", false));
 
@@ -185,7 +169,7 @@ public class CommandManager {
                 add("ip");
             }
         }, "Get player's IP", "Get the IP address of the specified online player.", authMeBaseCommand);
-        getIpCommand.setCommandPermissions("authme.admin.getip", CommandPermissions.DefaultPermission.OP_ONLY);
+        getIpCommand.setCommandPermissions(AdminPermission.GET_IP, OP_ONLY);
         getIpCommand.addArgument(new CommandArgumentDescription("player", "Online player name", true));
 
         // Register the spawn command
@@ -196,7 +180,7 @@ public class CommandManager {
                 add("home");
             }
         }, "Teleport to spawn", "Teleport to the spawn.", authMeBaseCommand);
-        spawnCommand.setCommandPermissions("authme.admin.spawn", CommandPermissions.DefaultPermission.OP_ONLY);
+        spawnCommand.setCommandPermissions(AdminPermission.SPAWN, OP_ONLY);
 
         // Register the setspawn command
         CommandDescription setSpawnCommand = new CommandDescription(new SetSpawnCommand(), new ArrayList<String>() {
@@ -206,7 +190,7 @@ public class CommandManager {
                 add("chgspawn");
             }
         }, "Change the spawn", "Change the player's spawn to your current position.", authMeBaseCommand);
-        setSpawnCommand.setCommandPermissions("authme.admin.setspawn", CommandPermissions.DefaultPermission.OP_ONLY);
+        setSpawnCommand.setCommandPermissions(AdminPermission.SET_SPAWN, OP_ONLY);
 
         // Register the firstspawn command
         CommandDescription firstSpawnCommand = new CommandDescription(new FirstSpawnCommand(), new ArrayList<String>() {
@@ -216,7 +200,7 @@ public class CommandManager {
                 add("firsthome");
             }
         }, "Teleport to first spawn", "Teleport to the first spawn.", authMeBaseCommand);
-        firstSpawnCommand.setCommandPermissions("authme.admin.firstspawn", CommandPermissions.DefaultPermission.OP_ONLY);
+        firstSpawnCommand.setCommandPermissions(AdminPermission.FIRST_SPAWN, OP_ONLY);
 
         // Register the setfirstspawn command
         CommandDescription setFirstSpawnCommand = new CommandDescription(new SetFirstSpawnCommand(), new ArrayList<String>() {
@@ -226,7 +210,7 @@ public class CommandManager {
                 add("chgfirstspawn");
             }
         }, "Change the first spawn", "Change the first player's spawn to your current position.", authMeBaseCommand);
-        setFirstSpawnCommand.setCommandPermissions("authme.admin.setfirstspawn", CommandPermissions.DefaultPermission.OP_ONLY);
+        setFirstSpawnCommand.setCommandPermissions(AdminPermission.SET_FIRST_SPAWN, OP_ONLY);
 
         // Register the purge command
         CommandDescription purgeCommand = new CommandDescription(new PurgeCommand(), new ArrayList<String>() {
@@ -236,7 +220,7 @@ public class CommandManager {
                 add("delete");
             }
         }, "Purge old data", "Purge old AuthMeReloaded data longer than the specified amount of days ago.", authMeBaseCommand);
-        purgeCommand.setCommandPermissions("authme.admin.purge", CommandPermissions.DefaultPermission.OP_ONLY);
+        purgeCommand.setCommandPermissions(AdminPermission.PURGE, OP_ONLY);
         purgeCommand.addArgument(new CommandArgumentDescription("days", "Number of days", false));
 
         // Register the purgelastposition command
@@ -251,7 +235,7 @@ public class CommandManager {
                 add("resetlastpos");
             }
         }, "Purge player's last position", "Purge the last know position of the specified player.", authMeBaseCommand);
-        purgeLastPositionCommand.setCommandPermissions("authme.admin.purgelastpos", CommandPermissions.DefaultPermission.OP_ONLY);
+        purgeLastPositionCommand.setCommandPermissions(AdminPermission.PURGE_LAST_POSITION, OP_ONLY);
         purgeLastPositionCommand.addArgument(new CommandArgumentDescription("player", "Player name", true));
 
         // Register the purgebannedplayers command
@@ -264,7 +248,7 @@ public class CommandManager {
                 add("deletebannedplayer");
             }
         }, "Purge banned palyers data", "Purge all AuthMeReloaded data for banned players.", authMeBaseCommand);
-        purgeBannedPlayersCommand.setCommandPermissions("authme.admin.purgebannedplayers", CommandPermissions.DefaultPermission.OP_ONLY);
+        purgeBannedPlayersCommand.setCommandPermissions(AdminPermission.PURGE_BANNED_PLAYERS, OP_ONLY);
 
         // Register the switchantibot command
         CommandDescription switchAntiBotCommand = new CommandDescription(new SwitchAntiBotCommand(), new ArrayList<String>() {
@@ -275,7 +259,7 @@ public class CommandManager {
                 add("antibot");
             }
         }, "Switch AntiBot mode", "Switch or toggle the AntiBot mode to the specified state.", authMeBaseCommand);
-        switchAntiBotCommand.setCommandPermissions("authme.admin.switchantibot", CommandPermissions.DefaultPermission.OP_ONLY);
+        switchAntiBotCommand.setCommandPermissions(AdminPermission.SWITCH_ANTIBOT, OP_ONLY);
         switchAntiBotCommand.addArgument(new CommandArgumentDescription("mode", "ON / OFF", true));
 
         // // Register the resetname command
@@ -299,45 +283,33 @@ public class CommandManager {
                 add("rld");
             }
         }, "Reload plugin", "Reload the AuthMeReloaded plugin.", authMeBaseCommand);
-        reloadCommand.setCommandPermissions("authme.admin.reload", CommandPermissions.DefaultPermission.OP_ONLY);
+        reloadCommand.setCommandPermissions(AdminPermission.RELOAD, OP_ONLY);
 
         // Register the version command
-        CommandDescription versionCommand = new CommandDescription(new VersionCommand(), new ArrayList<String>() {
+        CommandDescription versionCommand = CommandDescription.builder()
+            .executableCommand(new VersionCommand())
+            .labels("version", "ver", "v", "about", "info")
+            .description("Version info")
+            .detailedDescription("Show detailed information about the installed AuthMeReloaded version, and shows the "
+                + "developers, contributors, license and other information.")
+            .parent(authMeBaseCommand)
+            .build();
 
-            {
-                add("version");
-                add("ver");
-                add("v");
-                add("about");
-                add("info");
-            }
-        }, "Version info", "Show detailed information about the installed AuthMeReloaded version, and shows the developers, contributors, license and other information.", authMeBaseCommand);
-        versionCommand.setMaximumArguments(false);
-
-        // Register the base Dungeon Maze command
-        CommandDescription loginBaseCommand = new CommandDescription(new LoginCommand(), new ArrayList<String>() {
-
-            {
-                add("login");
-                add("l");
-            }
-        }, "Login command", "Command to login using AuthMeReloaded.", null);
-        loginBaseCommand.setCommandPermissions("authme.login", CommandPermissions.DefaultPermission.ALLOWED);
-        loginBaseCommand.addArgument(new CommandArgumentDescription("password", "Login password", false));
+        // Register the base login command
+        CommandDescription loginBaseCommand = CommandDescription.builder()
+            .executableCommand(new LoginCommand())
+            .labels("login", "l")
+            .description("Login command")
+            .detailedDescription("Command to log in using AuthMeReloaded.")
+            .parent(null)
+            .permissions(ALLOWED, UserPermission.LOGIN)
+            .withArgument("password", "Login password", false)
+            .build();
 
         // 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);
+        CommandDescription loginHelpCommand = new CommandDescription(helpCommandExecutable, helpCommandLabels,
+            "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);
 
         // Register the base logout command
         CommandDescription logoutBaseCommand = new CommandDescription(new LogoutCommand(), new ArrayList<String>() {
@@ -346,21 +318,12 @@ public class CommandManager {
                 add("logout");
             }
         }, "Logout command", "Command to logout using AuthMeReloaded.", null);
-        logoutBaseCommand.setCommandPermissions("authme.logout", CommandPermissions.DefaultPermission.ALLOWED);
+        logoutBaseCommand.setCommandPermissions(UserPermission.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 logout commands.", logoutBaseCommand);
+        CommandDescription logoutHelpCommand = new CommandDescription(helpCommandExecutable, helpCommandLabels,
+            "View help", "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);
 
         // Register the base register command
         CommandDescription registerBaseCommand = new CommandDescription(new fr.xephi.authme.command.executable.register.RegisterCommand(), new ArrayList<String>() {
@@ -370,24 +333,14 @@ public class CommandManager {
                 add("reg");
             }
         }, "Registration command", "Command to register using AuthMeReloaded.", null);
-        registerBaseCommand.setCommandPermissions("authme.register", CommandPermissions.DefaultPermission.ALLOWED);
+        registerBaseCommand.setCommandPermissions(UserPermission.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);
+        CommandDescription registerHelpCommand = new CommandDescription(helpCommandExecutable, helpCommandLabels,
+            "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);
 
         // Register the base unregister command
         CommandDescription unregisterBaseCommand = new CommandDescription(new fr.xephi.authme.command.executable.unregister.UnregisterCommand(), new ArrayList<String>() {
@@ -397,22 +350,12 @@ public class CommandManager {
                 add("unreg");
             }
         }, "Unregistration command", "Command to unregister using AuthMeReloaded.", null);
-        unregisterBaseCommand.setCommandPermissions("authme.unregister", CommandPermissions.DefaultPermission.ALLOWED);
+        unregisterBaseCommand.setCommandPermissions(UserPermission.UNREGISTER, CommandPermissions.DefaultPermission.ALLOWED);
         unregisterBaseCommand.addArgument(new CommandArgumentDescription("password", "Password", 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 unregister commands.", unregisterBaseCommand);
+        CommandDescription unregisterHelpCommand = new CommandDescription(helpCommandExecutable, helpCommandLabels, "View help", "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);
 
         // Register the base changepassword command
         CommandDescription changePasswordBaseCommand = new CommandDescription(new fr.xephi.authme.command.executable.changepassword.ChangePasswordCommand(), new ArrayList<String>() {
@@ -422,27 +365,17 @@ public class CommandManager {
                 add("changepass");
             }
         }, "Change password command", "Command to change your password using AuthMeReloaded.", null);
-        changePasswordBaseCommand.setCommandPermissions("authme.changepassword", CommandPermissions.DefaultPermission.ALLOWED);
+        changePasswordBaseCommand.setCommandPermissions(UserPermission.CHANGE_PASSWORD, 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 change password commands.", changePasswordBaseCommand);
+        CommandDescription changePasswordHelpCommand = new CommandDescription(helpCommandExecutable, helpCommandLabels,
+            "View help", "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>() {
+        CommandDescription emailBaseCommand = new CommandDescription(helpCommandExecutable, new ArrayList<String>() {
 
             {
                 add("email");
@@ -451,18 +384,9 @@ 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);
+        CommandDescription emailHelpCommand = new CommandDescription(helpCommandExecutable, helpCommandLabels,
+            "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(), new ArrayList<String>() {
@@ -473,7 +397,7 @@ public class CommandManager {
                 add("addmail");
             }
         }, "Add E-mail", "Add an new E-Mail address to your account.", emailBaseCommand);
-        addEmailCommand.setCommandPermissions("authme.email.add", CommandPermissions.DefaultPermission.ALLOWED);
+        addEmailCommand.setCommandPermissions(UserPermission.ADD_EMAIL, CommandPermissions.DefaultPermission.ALLOWED);
         addEmailCommand.addArgument(new CommandArgumentDescription("email", "Email address", false));
         addEmailCommand.addArgument(new CommandArgumentDescription("verifyEmail", "Email address verification", false));
 
@@ -486,7 +410,7 @@ public class CommandManager {
                 add("changemail");
             }
         }, "Change E-mail", "Change an E-Mail address of your account.", emailBaseCommand);
-        changeEmailCommand.setCommandPermissions("authme.email.change", CommandPermissions.DefaultPermission.ALLOWED);
+        changeEmailCommand.setCommandPermissions(UserPermission.CHANGE_EMAIL, CommandPermissions.DefaultPermission.ALLOWED);
         changeEmailCommand.addArgument(new CommandArgumentDescription("oldEmail", "Old email address", false));
         changeEmailCommand.addArgument(new CommandArgumentDescription("newEmail", "New email address", false));
 
@@ -500,7 +424,7 @@ public class CommandManager {
                 add("recovermail");
             }
         }, "Recover using E-mail", "Recover your account using an E-mail address.", emailBaseCommand);
-        recoverEmailCommand.setCommandPermissions("authme.email.recover", CommandPermissions.DefaultPermission.ALLOWED);
+        recoverEmailCommand.setCommandPermissions(UserPermission.RECOVER_EMAIL, CommandPermissions.DefaultPermission.ALLOWED);
         recoverEmailCommand.addArgument(new CommandArgumentDescription("email", "Email address", false));
 
         // Register the base captcha command
@@ -511,23 +435,13 @@ public class CommandManager {
                 add("capt");
             }
         }, "Captcha command", "Captcha command for AuthMeReloaded.", null);
-        captchaBaseCommand.setCommandPermissions("authme.captcha", CommandPermissions.DefaultPermission.ALLOWED);
+        captchaBaseCommand.setCommandPermissions(UserPermission.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);
+        CommandDescription captchaHelpCommand = new CommandDescription(helpCommandExecutable, helpCommandLabels,
+            "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);
 
         // Register the base converter command
         CommandDescription converterBaseCommand = new CommandDescription(new ConverterCommand(), new ArrayList<String>() {
@@ -538,23 +452,13 @@ public class CommandManager {
                 add("conv");
             }
         }, "Convert command", "Convert command for AuthMeReloaded.", null);
-        converterBaseCommand.setCommandPermissions("authme.converter", CommandPermissions.DefaultPermission.OP_ONLY);
+        converterBaseCommand.setCommandPermissions(UserPermission.CONVERTER, OP_ONLY);
         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);
+        CommandDescription converterHelpCommand = new CommandDescription(helpCommandExecutable, helpCommandLabels,
+            "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);
@@ -589,8 +493,7 @@ public class CommandManager {
     /**
      * Find the best suitable command for the specified reference.
      *
-     * @param queryReference
-     *            The query reference to find a command for.
+     * @param queryReference The query reference to find a command for.
      *
      * @return The command found, or null.
      */

src/main/java/fr/xephi/authme/command/CommandParts.java

@@ -1,20 +1,24 @@
 package fr.xephi.authme.command;
 
+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. */
-    private List<String> parts = new ArrayList<>();
+    /**
+     * The list of parts for this command.
+     */
+    private final List<String> parts = new ArrayList<>();
 
     /**
      * Constructor.
      */
-    public CommandParts() { }
+    public CommandParts() {
+    }
 
     /**
      * Constructor.
@@ -46,7 +50,7 @@ public class CommandParts {
     /**
      * Constructor.
      *
-     * @param base The base part.
+     * @param base  The base part.
      * @param parts The list of additional parts.
      */
     public CommandParts(String base, List<String> parts) {
@@ -93,7 +97,7 @@ public class CommandParts {
      * @return The result.
      */
     public boolean add(String[] parts) {
-        for(String entry : parts)
+        for (String entry : parts)
             add(entry);
         return true;
     }
@@ -116,7 +120,7 @@ public class CommandParts {
      */
     public String get(int i) {
         // Make sure the index is in-bound
-        if(i < 0 || i >= getCount())
+        if (i < 0 || i >= getCount())
             return null;
 
         // Get and return the argument
@@ -147,10 +151,10 @@ public class CommandParts {
         List<String> elements = new ArrayList<>();
 
         // Get the range
-        for(int i = start; i < start + count; i++) {
+        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)
+            if (element != null)
                 elements.add(element);
         }
 
@@ -172,21 +176,21 @@ public class CommandParts {
     /**
      * Get the difference value between two references.
      *
-     * @param other The other reference.
+     * @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)
+        if (other == null)
             return -1;
 
         // Get the range to use
         int range = Math.min(this.getCount(), other.getCount());
 
         // Get and the difference
-        if(fullCompare)
+        if (fullCompare)
             return StringUtils.getDifference(this.toString(), other.toString());
         return StringUtils.getDifference(this.getRange(range - 1, 1).toString(), other.getRange(range - 1, 1).toString());
     }
@@ -198,6 +202,6 @@ public class CommandParts {
      */
     @Override
     public String toString() {
-        return ListUtils.implode(this.parts, " ");
+        return StringUtils.join(" ", this.parts);
     }
 }

src/main/java/fr/xephi/authme/command/CommandPermissions.java

@@ -1,34 +1,35 @@
 package fr.xephi.authme.command;
 
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.permission.PermissionsManager;
+import fr.xephi.authme.permission.PermissionNode;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 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;
-
+/**
+ */
 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.
+     * Defines the permission nodes required to have permission to execute this command.
      */
-    public CommandPermissions() { }
+    private List<PermissionNode> permissionNodes;
+    /**
+     * Defines the default permission if the permission nodes couldn't be used.
+     */
+    private DefaultPermission defaultPermission;
 
     /**
      * Constructor.
      *
-     * @param permissionNode The permission node required to execute a command.
+     * @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) {
+    public CommandPermissions(PermissionNode permissionNode, DefaultPermission defaultPermission) {
+        this.permissionNodes = new ArrayList<>();
         this.permissionNodes.add(permissionNode);
         this.defaultPermission = defaultPermission;
     }
@@ -36,45 +37,12 @@ public class CommandPermissions {
     /**
      * Constructor.
      *
-     * @param permissionNodes The permission nodes required to execute a command.
+     * @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);
+    public CommandPermissions(List<PermissionNode> permissionNodes, DefaultPermission defaultPermission) {
+        this.permissionNodes = permissionNodes;
+        this.defaultPermission = defaultPermission;
     }
 
     /**
@@ -82,10 +50,11 @@ public class CommandPermissions {
      *
      * @return The permission nodes required to execute this command.
      */
-    public List<String> getPermissionNodes() {
+    public List<PermissionNode> getPermissionNodes() {
         return this.permissionNodes;
     }
 
+
     /**
      * Get the number of permission nodes set.
      *
@@ -95,44 +64,39 @@ public class CommandPermissions {
         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.
      *
+     * @param sender CommandSender
+     *
      * @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)
+        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))
+        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;
+        // Get the permissions manager, and make sure it's instance is valid
+        PermissionsManager permissionsManager = AuthMe.getInstance().getPermissionsManager();
+        if (permissionsManager == null)
+            return false;
 
         // Check whether the player has permission, return the result
-        for(String node : this.permissionNodes)
-            if(!AuthMe.getInstance().authmePermissible(player, node))
+        for (PermissionNode node : this.permissionNodes) {
+            if (!permissionsManager.hasPermission(player, node, defaultPermission)) {
                 return false;
+            }
+        }
         return true;
     }
 
@@ -162,19 +126,21 @@ public class CommandPermissions {
      * @return True if the command sender has permission by default, false otherwise.
      */
     public boolean getDefaultPermissionCommandSender(CommandSender sender) {
-        switch(getDefaultPermission()) {
-        case ALLOWED:
-            return true;
+        switch (getDefaultPermission()) {
+            case ALLOWED:
+                return true;
 
-        case OP_ONLY:
-            return sender.isOp();
+            case OP_ONLY:
+                return sender.isOp();
 
-        case NOT_ALLOWED:
-        default:
-            return false;
+            case NOT_ALLOWED:
+            default:
+                return false;
         }
     }
 
+    /**
+     */
     public enum DefaultPermission {
         NOT_ALLOWED,
         OP_ONLY,

src/main/java/fr/xephi/authme/command/ExecutableCommand.java

@@ -2,12 +2,15 @@ package fr.xephi.authme.command;
 
 import org.bukkit.command.CommandSender;
 
+/**
+ * Base class for AuthMe commands that can be executed.
+ */
 public abstract class ExecutableCommand {
 
     /**
      * Execute the command.
      *
-     * @param sender The command sender.
+     * @param sender           The command sender.
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *

src/main/java/fr/xephi/authme/command/FoundCommandResult.java

@@ -2,24 +2,34 @@ package fr.xephi.authme.command;
 
 import org.bukkit.command.CommandSender;
 
+/**
+ */
 public class FoundCommandResult {
 
-    /** The command description instance. */
+    /**
+     * 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;
+    /**
+     * The command reference.
+     */
+    private final CommandParts commandReference;
+    /**
+     * The command arguments.
+     */
+    private final CommandParts commandArguments;
+    /**
+     * The original search query reference.
+     */
+    private final CommandParts queryReference;
 
     /**
      * Constructor.
      *
      * @param commandDescription The command description.
-     * @param commandReference The command reference.
-     * @param commandArguments The command arguments.
-     * @param queryReference The original query reference.
+     * @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;
@@ -35,7 +45,7 @@ public class FoundCommandResult {
      */
     public boolean hasProperArguments() {
         // Make sure the command description is set
-        if(this.commandDescription == null)
+        if (this.commandDescription == null)
             return false;
 
         // Get and return the result
@@ -55,7 +65,6 @@ public class FoundCommandResult {
      * Set the command description.
      *
      * @param commandDescription The command description.
-     *
      */
     public void setCommandDescription(CommandDescription commandDescription) {
         this.commandDescription = commandDescription;
@@ -68,7 +77,7 @@ public class FoundCommandResult {
      */
     public boolean isExecutable() {
         // Make sure the command description is valid
-        if(this.commandDescription == null)
+        if (this.commandDescription == null)
             return false;
 
         // Check whether the command is executable, return the result
@@ -84,7 +93,7 @@ public class FoundCommandResult {
      */
     public boolean executeCommand(CommandSender sender) {
         // Make sure the command description is valid
-        if(this.commandDescription == null)
+        if (this.commandDescription == null)
             return false;
 
         // Execute the command
@@ -99,12 +108,15 @@ public class FoundCommandResult {
      * @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)
+        if (commandDescription == null) {
             return false;
+        } else if (commandDescription.getCommandPermissions() == null) {
+            return true;
+        }
 
-        // Get and return the permission
-        return this.commandDescription.getCommandPermissions().hasPermission(sender);
+        // TODO: Move permissions check to the permission package; command package should not define permission-checking
+        // API
+        return commandDescription.getCommandPermissions().hasPermission(sender);
     }
 
     /**
@@ -141,7 +153,7 @@ public class FoundCommandResult {
      */
     public double getDifference() {
         // Get the difference through the command found
-        if(this.commandDescription != null)
+        if (this.commandDescription != null)
             return this.commandDescription.getCommandDifference(this.queryReference);
 
         // Get the difference from the query reference

src/main/java/fr/xephi/authme/command/executable/HelpCommand.java

@@ -1,38 +1,27 @@
 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 {
 
-    /**
-     * 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)
+        // Set the proper command arguments for the quick help and show it
+        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
+        } else {
             HelpProvider.showHelp(sender, commandReference, commandArguments);
+        }
 
-        // Return the result
         return true;
     }
 }

src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java

@@ -1,39 +1,32 @@
 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.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.MessageKey;
 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();
+        final Messages m = plugin.getMessages();
 
         // Get the player query
         String playerQuery = sender.getName();
-        if(commandArguments.getCount() >= 1)
+        if (commandArguments.getCount() >= 1)
             playerQuery = commandArguments.get(0);
         final String playerQueryFinal = playerQuery;
 
@@ -48,16 +41,16 @@ public class AccountsCommand extends ExecutableCommand {
                     try {
                         auth = plugin.database.getAuth(playerQueryFinal.toLowerCase());
                     } catch (NullPointerException npe) {
-                        m.send(sender, "unknown_user");
+                        m.send(sender, MessageKey.UNKNOWN_USER);
                         return;
                     }
                     if (auth == null) {
-                        m.send(sender, "unknown_user");
+                        m.send(sender, MessageKey.UNKNOWN_USER);
                         return;
                     }
                     List<String> accountList = plugin.database.getAllAuthsByName(auth);
                     if (accountList == null || accountList.isEmpty()) {
-                        m.send(sender, "user_unknown");
+                        m.send(sender, MessageKey.USER_NOT_REGISTERED);
                         return;
                     }
                     if (accountList.size() == 1) {
@@ -71,7 +64,7 @@ public class AccountsCommand extends ExecutableCommand {
                         if (i != accountList.size()) {
                             message.append(", ");
                         } else {
-                            message.append(".");
+                            message.append('.');
                         }
                     }
                     sender.sendMessage("[AuthMe] " + playerQueryFinal + " has " + String.valueOf(accountList.size()) + " accounts");
@@ -89,7 +82,7 @@ public class AccountsCommand extends ExecutableCommand {
                     } catch (Exception e) {
                         ConsoleLogger.showError(e.getMessage());
                         ConsoleLogger.writeStackTrace(e);
-                        m.send(sender, "error");
+                        m.send(sender, MessageKey.ERROR);
                         return;
                     }
 
@@ -109,7 +102,7 @@ public class AccountsCommand extends ExecutableCommand {
                         if (i != accountList.size()) {
                             message.append(", ");
                         } else {
-                            message.append(".");
+                            message.append('.');
                         }
                     }
                     sender.sendMessage("[AuthMe] " + playerQueryFinal + " has " + String.valueOf(accountList.size()) + " accounts");

src/main/java/fr/xephi/authme/command/executable/authme/AuthMeCommand.java

@@ -1,27 +1,19 @@
 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 {
 
-    /**
-     * 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 " + AuthMe.PLUGIN_NAME + " v" + AuthMe.getVersionName() + "! " + ChatColor.RED + "<3");
+        sender.sendMessage(ChatColor.GREEN + "This server is running " + AuthMe.getPluginName() + " v" + AuthMe.getPluginVersion() + " b" + AuthMe.getPluginBuildNumber()+ "! " + 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;

src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordCommand.java

@@ -1,10 +1,5 @@
 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;
@@ -12,27 +7,23 @@ 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.MessageKey;
 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();
+        final Messages m = plugin.getMessages();
 
         // Get the player and password
         String playerName = commandArguments.get(0);
@@ -41,24 +32,23 @@ public class ChangePasswordCommand extends ExecutableCommand {
         // 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");
+            m.send(sender, MessageKey.PASSWORD_IS_USERNAME_ERROR);
             return true;
         }
         if (playerPassLowerCase.equalsIgnoreCase(playerName)) {
-            m.send(sender, "password_error_nick");
+            m.send(sender, MessageKey.PASSWORD_IS_USERNAME_ERROR);
             return true;
         }
         if (playerPassLowerCase.length() < Settings.getPasswordMinLen || playerPassLowerCase.length() > Settings.passwordMaxLength) {
-            m.send(sender, "pass_len");
+            m.send(sender, MessageKey.INVALID_PASSWORD_LENGTH);
             return true;
         }
         if (!Settings.unsafePasswords.isEmpty()) {
             if (Settings.unsafePasswords.contains(playerPassLowerCase)) {
-                m.send(sender, "password_error_unsafe");
+                m.send(sender, MessageKey.PASSWORD_UNSAFE_ERROR);
                 return true;
             }
         }
-
         // Set the password
         final String playerNameLowerCase = playerName.toLowerCase();
         Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
@@ -69,7 +59,7 @@ public class ChangePasswordCommand extends ExecutableCommand {
                 try {
                     hash = PasswordSecurity.getHash(Settings.getPasswordHash, playerPass, playerNameLowerCase);
                 } catch (NoSuchAlgorithmException e) {
-                    m.send(sender, "error");
+                    m.send(sender, MessageKey.ERROR);
                     return;
                 }
                 PlayerAuth auth = null;
@@ -79,7 +69,7 @@ public class ChangePasswordCommand extends ExecutableCommand {
                     auth = plugin.database.getAuth(playerNameLowerCase);
                 }
                 if (auth == null) {
-                    m.send(sender, "unknown_user");
+                    m.send(sender, MessageKey.UNKNOWN_USER);
                     return;
                 }
                 auth.setHash(hash);
@@ -88,7 +78,7 @@ public class ChangePasswordCommand extends ExecutableCommand {
                     plugin.database.updateSalt(auth);
                 }
                 if (!plugin.database.updatePassword(auth)) {
-                    m.send(sender, "error");
+                    m.send(sender, MessageKey.ERROR);
                     return;
                 }
                 sender.sendMessage("pwd_changed");

src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java

@@ -1,24 +1,16 @@
 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 {
 
-    /**
-     * 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
@@ -31,6 +23,7 @@ public class FirstSpawnCommand extends ExecutableCommand {
                 sender.sendMessage("[AuthMe] Please use that command in game");
             }
         } catch (NullPointerException ex) {
+            // TODO ljacqu 20151119: Catching NullPointerException is never a good idea. Find what can cause one instead
             ConsoleLogger.showError(ex.getMessage());
         }
         return true;

src/main/java/fr/xephi/authme/command/executable/authme/ForceLoginCommand.java

@@ -1,24 +1,17 @@
 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 fr.xephi.authme.permission.UserPermission;
+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
@@ -26,7 +19,7 @@ public class ForceLoginCommand extends ExecutableCommand {
 
         // Get the player query
         String playerName = sender.getName();
-        if(commandArguments.getCount() >= 1)
+        if (commandArguments.getCount() >= 1)
             playerName = commandArguments.get(0);
 
         // Command logic
@@ -37,7 +30,7 @@ public class ForceLoginCommand extends ExecutableCommand {
                 sender.sendMessage("Player needs to be online!");
                 return true;
             }
-            if (!plugin.authmePermissible(player, "authme.canbeforced")) {
+            if (!plugin.getPermissionsManager().hasPermission(player, UserPermission.CAN_LOGIN_BE_FORCED)) {
                 sender.sendMessage("You cannot force login for the player " + playerName + "!");
                 return true;
             }

src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java

@@ -1,13 +1,15 @@
 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.MessageKey;
 import fr.xephi.authme.settings.Messages;
+import org.bukkit.command.CommandSender;
 
+/**
+ */
 public class GetEmailCommand extends ExecutableCommand {
 
     /**
@@ -21,21 +23,17 @@ public class GetEmailCommand extends ExecutableCommand {
      */
     @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)
+        if (commandArguments.getCount() >= 1)
             playerName = commandArguments.get(0);
 
         // Get the authenticated user
+        AuthMe plugin = AuthMe.getInstance();
+        Messages m = plugin.getMessages();
         PlayerAuth auth = plugin.database.getAuth(playerName.toLowerCase());
         if (auth == null) {
-            m.send(sender, "unknown_user");
+            m.send(sender, MessageKey.UNKNOWN_USER);
             return true;
         }
 

src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java

@@ -1,24 +1,16 @@
 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 {
 
-    /**
-     * 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
@@ -26,7 +18,7 @@ public class GetIpCommand extends ExecutableCommand {
 
         // Get the player query
         String playerName = sender.getName();
-        if(commandArguments.getCount() >= 1)
+        if (commandArguments.getCount() >= 1)
             playerName = commandArguments.get(0);
 
         @SuppressWarnings("deprecation")

src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java

@@ -1,49 +1,39 @@
 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.MessageKey;
 import fr.xephi.authme.settings.Messages;
+import org.bukkit.command.CommandSender;
 
+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) {
-        // AuthMe plugin instance
-        AuthMe plugin = AuthMe.getInstance();
-
-        // Messages instance
-        Messages m = Messages.getInstance();
-
         // Get the player
         String playerName = sender.getName();
-        if(commandArguments.getCount() >= 1)
+        if (commandArguments.getCount() >= 1)
             playerName = commandArguments.get(0);
 
         // Validate the player
+        AuthMe plugin = AuthMe.getInstance();
+        Messages m = plugin.getMessages();
+
         PlayerAuth auth;
         try {
             auth = plugin.database.getAuth(playerName.toLowerCase());
         } catch (NullPointerException e) {
-            m.send(sender, "unknown_user");
+            m.send(sender, MessageKey.UNKNOWN_USER);
             return true;
         }
         if (auth == null) {
-            m.send(sender, "user_unknown");
+            m.send(sender, MessageKey.USER_NOT_REGISTERED);
             return true;
         }
 

src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java

@@ -1,16 +1,17 @@
 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 {
 
     /**

src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java

@@ -1,16 +1,17 @@
 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 {
 
     /**
@@ -34,13 +35,13 @@ public class PurgeCommand extends ExecutableCommand {
         int days;
         try {
             days = Integer.valueOf(daysStr);
-        } catch(Exception ex) {
+        } catch (Exception ex) {
             sender.sendMessage(ChatColor.RED + "The value you've entered is invalid!");
             return true;
         }
 
         // Validate the value
-        if(days < 30) {
+        if (days < 30) {
             sender.sendMessage(ChatColor.RED + "You can only purge data older than 30 days");
             return true;
         }
@@ -57,13 +58,13 @@ public class PurgeCommand extends ExecutableCommand {
         sender.sendMessage(ChatColor.GOLD + "Deleted " + purged.size() + " user accounts");
 
         // Purge other data
-        if(Settings.purgeEssentialsFile && plugin.ess != null)
+        if (Settings.purgeEssentialsFile && plugin.ess != null)
             plugin.dataManager.purgeEssentials(purged);
-        if(Settings.purgePlayerDat)
+        if (Settings.purgePlayerDat)
             plugin.dataManager.purgeDat(purged);
-        if(Settings.purgeLimitedCreative)
+        if (Settings.purgeLimitedCreative)
             plugin.dataManager.purgeLimitedCreative(purged);
-        if(Settings.purgeAntiXray)
+        if (Settings.purgeAntiXray)
             plugin.dataManager.purgeAntiXray(purged);
 
         // Show a status message

src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java

@@ -1,15 +1,17 @@
 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.MessageKey;
 import fr.xephi.authme.settings.Messages;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
+/**
+ */
 public class PurgeLastPositionCommand extends ExecutableCommand {
 
     /**
@@ -27,11 +29,11 @@ public class PurgeLastPositionCommand extends ExecutableCommand {
         final AuthMe plugin = AuthMe.getInstance();
 
         // Messages instance
-        final Messages m = Messages.getInstance();
+        final Messages m = plugin.getMessages();
 
         // Get the player
         String playerName = sender.getName();
-        if(commandArguments.getCount() >= 1)
+        if (commandArguments.getCount() >= 1)
             playerName = commandArguments.get(0);
         String playerNameLowerCase = playerName.toLowerCase();
 
@@ -40,7 +42,7 @@ public class PurgeLastPositionCommand extends ExecutableCommand {
             // Get the user auth and make sure the user exists
             PlayerAuth auth = plugin.database.getAuth(playerNameLowerCase);
             if (auth == null) {
-                m.send(sender, "unknown_user");
+                m.send(sender, MessageKey.UNKNOWN_USER);
                 return true;
             }
 

src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java

@@ -1,19 +1,21 @@
 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;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.security.PasswordSecurity;
+import fr.xephi.authme.settings.MessageKey;
 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 {
 
     /**
@@ -31,7 +33,7 @@ public class RegisterCommand extends ExecutableCommand {
         final AuthMe plugin = AuthMe.getInstance();
 
         // Messages instance
-        final Messages m = Messages.getInstance();
+        final Messages m = plugin.getMessages();
 
         // Get the player name and password
         final String playerName = commandArguments.get(0);
@@ -41,20 +43,20 @@ public class RegisterCommand extends ExecutableCommand {
 
         // 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");
+            m.send(sender, MessageKey.PASSWORD_IS_USERNAME_ERROR);
             return true;
         }
         if (playerPassLowerCase.equalsIgnoreCase(playerName)) {
-            m.send(sender, "password_error_nick");
+            m.send(sender, MessageKey.PASSWORD_IS_USERNAME_ERROR);
             return true;
         }
         if (playerPassLowerCase.length() < Settings.getPasswordMinLen || playerPassLowerCase.length() > Settings.passwordMaxLength) {
-            m.send(sender, "pass_len");
+            m.send(sender, MessageKey.INVALID_PASSWORD_LENGTH);
             return true;
         }
         if (!Settings.unsafePasswords.isEmpty()) {
             if (Settings.unsafePasswords.contains(playerPassLowerCase)) {
-                m.send(sender, "password_error_unsafe");
+                m.send(sender, MessageKey.PASSWORD_UNSAFE_ERROR);
                 return true;
             }
         }
@@ -64,26 +66,26 @@ public class RegisterCommand extends ExecutableCommand {
             public void run() {
                 try {
                     if (plugin.database.isAuthAvailable(playerNameLowerCase)) {
-                        m.send(sender, "user_regged");
+                        m.send(sender, MessageKey.NAME_ALREADY_REGISTERED);
                         return;
                     }
-                    String hash = PasswordSecurity.getHash(Settings.getPasswordHash, playerPassLowerCase, playerNameLowerCase);
+                    String hash = PasswordSecurity.getHash(Settings.getPasswordHash, playerPass, 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");
+                        m.send(sender, MessageKey.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");
+                    m.send(sender, MessageKey.REGISTER_SUCCESS);
                     ConsoleLogger.info(playerNameLowerCase + " registered");
                 } catch (NoSuchAlgorithmException ex) {
                     ConsoleLogger.showError(ex.getMessage());
-                    m.send(sender, "error");
+                    m.send(sender, MessageKey.ERROR);
                 }
 
             }

src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java

@@ -1,16 +1,19 @@
 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.MessageKey;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.util.Profiler;
+import org.bukkit.command.CommandSender;
 
+/**
+ */
 public class ReloadCommand extends ExecutableCommand {
 
     /**
@@ -31,15 +34,15 @@ public class ReloadCommand extends ExecutableCommand {
         AuthMe plugin = AuthMe.getInstance();
 
         // Messages instance
-        Messages m = Messages.getInstance();
+        Messages m = plugin.getMessages();
 
         // Show a status message
         // sender.sendMessage(ChatColor.YELLOW + "Reloading AuthMeReloaded...");
 
         try {
             Settings.reload();
+            plugin.setMessages(new Messages(Settings.messageFile, Settings.messagesLanguage));
             plugin.getModuleManager().reloadModules();
-            Messages.getInstance().reloadMessages();
             plugin.setupDatabase();
         } catch (Exception e) {
             ConsoleLogger.showError("Fatal error occurred! AuthMe instance ABORTED!");
@@ -50,7 +53,7 @@ public class ReloadCommand extends ExecutableCommand {
 
         // Show a status message
         // TODO: add the profiler result
-        m.send(sender, "reload");
+        m.send(sender, MessageKey.CONFIG_RELOAD_SUCCESS);
 
         // AuthMeReloaded reloaded, show a status message
         // sender.sendMessage(ChatColor.GREEN + "AuthMeReloaded has been reloaded successfully, took " + p.getTimeFormatted() + "!");

src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java

@@ -1,15 +1,16 @@
 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 {
 
     /**
@@ -31,7 +32,7 @@ public class ResetNameCommand extends ExecutableCommand {
             @Override
             public void run() {
                 List<PlayerAuth> authentications = plugin.database.getAllAuths();
-                for(PlayerAuth auth : authentications) {
+                for (PlayerAuth auth : authentications) {
                     auth.setRealName("Player");
                     plugin.database.updateSession(auth);
                 }

src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java

@@ -1,15 +1,17 @@
 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;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.MessageKey;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
+import org.bukkit.command.CommandSender;
 
+/**
+ */
 public class SetEmailCommand extends ExecutableCommand {
 
     /**
@@ -27,7 +29,7 @@ public class SetEmailCommand extends ExecutableCommand {
         AuthMe plugin = AuthMe.getInstance();
 
         // Messages instance
-        Messages m = Messages.getInstance();
+        Messages m = plugin.getMessages();
 
         // Get the player name and email address
         String playerName = commandArguments.get(0);
@@ -35,21 +37,21 @@ public class SetEmailCommand extends ExecutableCommand {
 
         // Validate the email address
         if (!Settings.isEmailCorrect(playerEmail)) {
-            m.send(sender, "email_invalid");
+            m.send(sender, MessageKey.INVALID_EMAIL);
             return true;
         }
 
         // Validate the user
         PlayerAuth auth = plugin.database.getAuth(playerName.toLowerCase());
         if (auth == null) {
-            m.send(sender, "unknown_user");
+            m.send(sender, MessageKey.UNKNOWN_USER);
             return true;
         }
 
         // Set the email address
         auth.setEmail(playerEmail);
         if (!plugin.database.updateEmail(auth)) {
-            m.send(sender, "error");
+            m.send(sender, MessageKey.ERROR);
             return true;
         }
 
@@ -58,7 +60,7 @@ public class SetEmailCommand extends ExecutableCommand {
             PlayerCache.getInstance().updatePlayer(auth);
 
         // Show a status message
-        m.send(sender, "email_changed");
+        m.send(sender, MessageKey.EMAIL_CHANGED_SUCCESS);
         return true;
     }
 }

src/main/java/fr/xephi/authme/command/executable/authme/SetFirstSpawnCommand.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.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 {
 
     /**

src/main/java/fr/xephi/authme/command/executable/authme/SetSpawnCommand.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.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 {
 
     /**

src/main/java/fr/xephi/authme/command/executable/authme/SpawnCommand.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.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 {
 
     /**

src/main/java/fr/xephi/authme/command/executable/authme/SwitchAntiBotCommand.java

@@ -1,13 +1,14 @@
 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.AntiBot;
 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 {
 
     /**
@@ -21,25 +22,26 @@ public class SwitchAntiBotCommand extends ExecutableCommand {
      */
     @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)
+        String newState = null;
+        if (commandArguments.getCount() == 1) {
             newState = commandArguments.get(0);
+        } else if(commandArguments.getCount() == 0) {
+            sender.sendMessage("[AuthMe] AntiBot status: " + AntiBot.getAntiBotStatus().name());
+            return true;
+        }
 
         // Enable the mod
-        if(newState.equalsIgnoreCase("ON")) {
-            plugin.switchAntiBotMod(true);
-            sender.sendMessage("[AuthMe] AntiBotMod enabled");
+        if (newState.equalsIgnoreCase("ON")) {
+            AntiBot.overrideAntiBotStatus(true);
+            sender.sendMessage("[AuthMe] AntiBot Manual Ovverride: enabled!");
             return true;
         }
 
         // Disable the mod
-        if(newState.equalsIgnoreCase("OFF")) {
-            plugin.switchAntiBotMod(false);
-            sender.sendMessage("[AuthMe] AntiBotMod disabled");
+        if (newState.equalsIgnoreCase("OFF")) {
+            AntiBot.overrideAntiBotStatus(false);
+            sender.sendMessage("[AuthMe] AntiBotMod Manual Ovverride: disabled!");
             return true;
         }
 

src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java

@@ -1,5 +1,17 @@
 package fr.xephi.authme.command.executable.authme;
 
+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.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.MessageKey;
+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 org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -8,18 +20,8 @@ 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;
-import fr.xephi.authme.cache.limbo.LimboCache;
-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.MessageTask;
-import fr.xephi.authme.task.TimeoutTask;
-import fr.xephi.authme.util.Utils;
-
+/**
+ */
 public class UnregisterCommand extends ExecutableCommand {
 
     /**
@@ -28,6 +30,7 @@ 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
@@ -36,7 +39,7 @@ public class UnregisterCommand extends ExecutableCommand {
         final AuthMe plugin = AuthMe.getInstance();
 
         // Messages instance
-        final Messages m = Messages.getInstance();
+        final Messages m = plugin.getMessages();
 
         // Get the player name
         String playerName = commandArguments.get(0);
@@ -44,18 +47,17 @@ public class UnregisterCommand extends ExecutableCommand {
 
         // Make sure the user is valid
         if (!plugin.database.isAuthAvailable(playerNameLowerCase)) {
-            m.send(sender, "user_unknown");
+            m.send(sender, MessageKey.UNKNOWN_USER);
             return true;
         }
 
         // Remove the player
         if (!plugin.database.removeAuth(playerNameLowerCase)) {
-            m.send(sender, "error");
+            m.send(sender, MessageKey.ERROR);
             return true;
         }
 
         // Unregister the player
-        @SuppressWarnings("deprecation")
         Player target = Bukkit.getPlayer(playerNameLowerCase);
         PlayerCache.getInstance().removePlayer(playerNameLowerCase);
         Utils.setGroup(target, Utils.GroupType.UNREGISTERED);
@@ -69,19 +71,21 @@ public class UnregisterCommand extends ExecutableCommand {
                 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)));
+            LimboCache.getInstance().getLimboPlayer(playerNameLowerCase).setMessageTaskId(
+                scheduler.runTaskAsynchronously(plugin,
+                    new MessageTask(plugin, playerNameLowerCase, m.retrieve(MessageKey.REGISTER_MESSAGE), 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(target, MessageKey.UNREGISTERED_SUCCESS);
 
         }
 
         // Show a status message
-        m.send(sender, "unregistered");
+        m.send(sender, MessageKey.UNREGISTERED_SUCCESS);
         ConsoleLogger.info(playerName + " unregistered");
         return true;
     }

src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java

@@ -1,14 +1,17 @@
 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.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 {
 
     /**
@@ -23,8 +26,8 @@ public class VersionCommand extends ExecutableCommand {
     @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 + "==========[ " + Settings.helpHeader.toUpperCase() + " ABOUT ]==========");
+        sender.sendMessage(ChatColor.GOLD + "Version: " + ChatColor.WHITE + AuthMe.getPluginName() + " v" + AuthMe.getPluginVersion() + ChatColor.GRAY + " (build: " + AuthMe.getPluginBuildNumber() + ")");
         sender.sendMessage(ChatColor.GOLD + "Developers:");
         printDeveloper(sender, "Xephi", "xephi59", "Lead Developer");
         printDeveloper(sender, "DNx5", "DNx5", "Developer");
@@ -40,10 +43,10 @@ public class VersionCommand extends ExecutableCommand {
     /**
      * Print a developer with proper styling.
      *
-     * @param sender The command sender.
-     * @param name The display name of the developer.
+     * @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.
+     * @param function      The function of the developer.
      */
     @SuppressWarnings("StringConcatenationInsideStringBufferAppend")
     private void printDeveloper(CommandSender sender, String name, String minecraftName, String function) {
@@ -53,13 +56,13 @@ public class VersionCommand extends ExecutableCommand {
         msg.append(name);
 
         // Append the Minecraft name, if available
-        if(minecraftName.length() != 0)
+        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))
+        if (minecraftName.length() != 0)
+            if (isPlayerOnline(minecraftName))
                 msg.append(ChatColor.GREEN + "" + ChatColor.ITALIC + " (In-Game)");
 
         // Print the message
@@ -74,9 +77,13 @@ public class VersionCommand extends ExecutableCommand {
      * @return True if the player is online, false otherwise.
      */
     private boolean isPlayerOnline(String minecraftName) {
-        for(Player player : Bukkit.getOnlinePlayers())
-            if(player.getName().equalsIgnoreCase(minecraftName))
+        // Note ljacqu 20151121: Generally you should use Utils#getOnlinePlayers to retrieve the list of online players.
+        // If it's only used in a for-each loop such as here, it's fine. For other purposes, go through the Utils class.
+        for (Player player : Bukkit.getOnlinePlayers()) {
+            if (player.getName().equalsIgnoreCase(minecraftName)) {
                 return true;
+            }
+        }
         return false;
     }
 }

src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java

@@ -1,43 +1,24 @@
 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;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.security.RandomString;
+import fr.xephi.authme.settings.MessageKey;
 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 {
 
-    /**
-     * 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();
-
-        // Random string instance, for captcha generation (I think) -- timvisee
-        RandomString randStr = new RandomString(Settings.captchaLength);
-
-        // Get the parameter values
-        String captcha = commandArguments.get(0);
-
         // Make sure the current command executor is a player
-        if(!(sender instanceof Player)) {
+        if (!(sender instanceof Player)) {
             return true;
         }
 
@@ -45,39 +26,48 @@ public class CaptchaCommand extends ExecutableCommand {
         final Player player = (Player) sender;
         final String playerNameLowerCase = player.getName().toLowerCase();
 
+        // Get the parameter values
+        String captcha = commandArguments.get(0);
+
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
+        // Messages instance
+        final Messages m = plugin.getMessages();
+
         // Command logic
         if (PlayerCache.getInstance().isAuthenticated(playerNameLowerCase)) {
-            m.send(player, "logged_in");
+            m.send(player, MessageKey.ALREADY_LOGGED_IN_ERROR);
             return true;
         }
 
         if (!Settings.useCaptcha) {
-            m.send(player, "usage_log");
+            m.send(player, MessageKey.USAGE_LOGIN);
             return true;
         }
 
+
         if (!plugin.cap.containsKey(playerNameLowerCase)) {
-            m.send(player, "usage_log");
+            m.send(player, MessageKey.USAGE_LOGIN);
             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")) {
+            String randStr = new RandomString(Settings.captchaLength).nextString();
+            plugin.cap.put(playerNameLowerCase, randStr);
+            for (String s : m.retrieve(MessageKey.CAPTCHA_WRONG_ERROR)) {
                 player.sendMessage(s.replace("THE_CAPTCHA", plugin.cap.get(playerNameLowerCase)));
             }
             return true;
         }
 
-        try {
-            plugin.captcha.remove(playerNameLowerCase);
-            plugin.cap.remove(playerNameLowerCase);
-        } catch (NullPointerException ignored) { }
+        plugin.captcha.remove(playerNameLowerCase);
+        plugin.cap.remove(playerNameLowerCase);
 
         // Show a status message
-        m.send(player, "valid_captcha");
-        m.send(player, "login_msg");
+        m.send(player, MessageKey.CAPTCHA_SUCCESS);
+        m.send(player, MessageKey.LOGIN_MESSAGE);
         return true;
     }
 }

src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java

@@ -1,75 +1,73 @@
 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;
 import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.settings.MessageKey;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.ChangePasswordTask;
+import fr.xephi.authme.util.Wrapper;
+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();
+        // Make sure the current command executor is a player
+        if (!(sender instanceof Player)) {
+            return true;
+        }
 
-        // Messages instance
-        final Messages m = Messages.getInstance();
+        final Wrapper wrapper = Wrapper.getInstance();
+        final Messages m = wrapper.getMessages();
 
         // 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");
+        final PlayerCache playerCache = wrapper.getPlayerCache();
+        if (!playerCache.isAuthenticated(name)) {
+            m.send(player, MessageKey.NOT_LOGGED_IN);
             return true;
         }
 
         // Make sure the password is allowed
+        // TODO ljacqu 20151121: The password confirmation appears to be never verified
         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");
+        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, MessageKey.PASSWORD_MATCH_ERROR);
             return true;
         }
         if (playerPassLowerCase.equalsIgnoreCase(name)) {
-            m.send(player, "password_error_nick");
+            m.send(player, MessageKey.PASSWORD_IS_USERNAME_ERROR);
             return true;
         }
-        if (playerPassLowerCase.length() < Settings.getPasswordMinLen || playerPassLowerCase.length() > Settings.passwordMaxLength) {
-            m.send(player, "pass_len");
+        if (playerPassLowerCase.length() < Settings.getPasswordMinLen
+            || playerPassLowerCase.length() > Settings.passwordMaxLength) {
+            m.send(player, MessageKey.INVALID_PASSWORD_LENGTH);
             return true;
         }
-        if (!Settings.unsafePasswords.isEmpty()) {
-            if (Settings.unsafePasswords.contains(playerPassLowerCase)) {
-                m.send(player, "password_error_unsafe");
-                return true;
-            }
+        if (!Settings.unsafePasswords.isEmpty() && Settings.unsafePasswords.contains(playerPassLowerCase)) {
+            m.send(player, MessageKey.PASSWORD_UNSAFE_ERROR);
+            return true;
         }
 
         // Set the password
-        plugin.getServer().getScheduler().runTaskAsynchronously(plugin, new ChangePasswordTask(plugin, player, playerPass, playerPassVerify));
+        final AuthMe plugin = wrapper.getAuthMe();
+        wrapper.getServer().getScheduler().runTaskAsynchronously(plugin,
+            new ChangePasswordTask(plugin, player, playerPass, playerPassVerify));
         return true;
     }
 }

src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java

@@ -1,28 +1,22 @@
 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.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.converter.*;
+import fr.xephi.authme.settings.MessageKey;
 import fr.xephi.authme.settings.Messages;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
 
+/**
+ */
 public class ConverterCommand 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.
      *
@@ -34,7 +28,7 @@ public class ConverterCommand extends ExecutableCommand {
         final AuthMe plugin = AuthMe.getInstance();
 
         // Messages instance
-        final Messages m = Messages.getInstance();
+        final Messages m = plugin.getMessages();
 
         // Get the conversion job
         String job = commandArguments.get(0);
@@ -42,39 +36,39 @@ public class ConverterCommand extends ExecutableCommand {
         // Determine the job type
         ConvertType jobType = ConvertType.fromName(job);
         if (jobType == null) {
-            m.send(sender, "error");
+            m.send(sender, MessageKey.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;
+            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
@@ -85,6 +79,8 @@ public class ConverterCommand extends ExecutableCommand {
         return true;
     }
 
+    /**
+     */
     public enum ConvertType {
         ftsql("flattosql"),
         ftsqlite("flattosqlite"),
@@ -95,16 +91,24 @@ public class ConverterCommand extends ExecutableCommand {
         vauth("vauth"),
         sqltoflat("sqltoflat");
 
-        String name;
+        final String name;
 
+        /**
+         * Constructor for ConvertType.
+         *
+         * @param name String
+         */
         ConvertType(String name) {
             this.name = name;
         }
 
-        String getName() {
-            return this.name;
-        }
-
+        /**
+         * Method fromName.
+         *
+         * @param name String
+         *
+         * @return ConvertType
+         */
         public static ConvertType fromName(String name) {
             for (ConvertType type : ConvertType.values()) {
                 if (type.getName().equalsIgnoreCase(name))
@@ -112,5 +116,14 @@ public class ConverterCommand extends ExecutableCommand {
             }
             return null;
         }
+
+        /**
+         * Method getName.
+         *
+         * @return String
+         */
+        String getName() {
+            return this.name;
+        }
     }
 }

src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java

@@ -1,46 +1,31 @@
 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.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.util.Wrapper;
+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().toLowerCase();
+        // Get the parameter values
+        String playerMail = commandArguments.get(0);
+        String playerMailVerify = commandArguments.get(1);
 
-        // Command logic
-        plugin.management.performAddEmail(player, playerMail, playerMailVerify);
+        // Get the player and perform email addition
+        final AuthMe plugin = Wrapper.getInstance().getAuthMe();
+        final Player player = (Player) sender;
+        plugin.getManagement().performAddEmail(player, playerMail, playerMailVerify);
         return true;
     }
 }

src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java

@@ -1,46 +1,31 @@
 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.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.util.Wrapper;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
+/**
+ */
 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();
+        // Get the parameter values
+        String playerMailOld = commandArguments.get(0);
+        String playerMailNew = commandArguments.get(1);
 
-        // Command logic
-        plugin.management.performChangeEmail(player, playerMailOld, playerMailNew);
+        // Get the player instance and execute action
+        final AuthMe plugin = Wrapper.getInstance().getAuthMe();
+        final Player player = (Player) sender;
+        plugin.getManagement().performChangeEmail(player, playerMailOld, playerMailNew);
         return true;
     }
 }

src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java

@@ -1,10 +1,5 @@
 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;
@@ -13,48 +8,45 @@ 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.MessageKey;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Wrapper;
+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();
+        // Make sure the current command executor is a player
+        if (!(sender instanceof Player)) {
+            return true;
+        }
 
         // 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
+        final Wrapper wrapper = Wrapper.getInstance();
+        final AuthMe plugin = wrapper.getAuthMe();
+        final Messages m = wrapper.getMessages();
+
         if (plugin.mail == null) {
-            m.send(player, "error");
+            m.send(player, MessageKey.ERROR);
             return true;
         }
         if (plugin.database.isAuthAvailable(playerName)) {
             if (PlayerCache.getInstance().isAuthenticated(playerName)) {
-                m.send(player, "logged_in");
+                m.send(player, MessageKey.ALREADY_LOGGED_IN_ERROR);
                 return true;
             }
             try {
@@ -67,29 +59,29 @@ public class RecoverEmailCommand extends ExecutableCommand {
                 } else if (plugin.database.isAuthAvailable(playerName)) {
                     auth = plugin.database.getAuth(playerName);
                 } else {
-                    m.send(player, "unknown_user");
+                    m.send(player, MessageKey.UNKNOWN_USER);
                     return true;
                 }
                 if (Settings.getmailAccount.equals("") || Settings.getmailAccount.isEmpty()) {
-                    m.send(player, "error");
+                    m.send(player, MessageKey.ERROR);
                     return true;
                 }
 
                 if (!playerMail.equalsIgnoreCase(auth.getEmail()) || playerMail.equalsIgnoreCase("your@email.com") || auth.getEmail().equalsIgnoreCase("your@email.com")) {
-                    m.send(player, "email_invalid");
+                    m.send(player, MessageKey.INVALID_EMAIL);
                     return true;
                 }
                 auth.setHash(hashNew);
                 plugin.database.updatePassword(auth);
                 plugin.mail.main(auth, thePass);
-                m.send(player, "email_send");
+                m.send(player, MessageKey.RECOVERY_EMAIL_SENT_MESSAGE);
             } catch (NoSuchAlgorithmException | NoClassDefFoundError ex) {
                 ex.printStackTrace();
                 ConsoleLogger.showError(ex.getMessage());
-                m.send(sender, "error");
+                m.send(sender, MessageKey.ERROR);
             }
         } else {
-            m.send(player, "reg_email_msg");
+            m.send(player, MessageKey.REGISTER_EMAIL_MESSAGE);
         }
 
         return true;

src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java

@@ -1,41 +1,30 @@
 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 fr.xephi.authme.util.Wrapper;
+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();
-
         // Make sure the current command executor is a player
-        if(!(sender instanceof Player)) {
+        if (!(sender instanceof Player)) {
             return true;
         }
 
-        // Get the player instance
+        // Get the necessary objects
+        final AuthMe plugin = Wrapper.getInstance().getAuthMe();
         final Player player = (Player) sender;
+        final String password = commandArguments.get(0);
 
-        // Get the password
-        String playerPass = commandArguments.get(0);
-
-        // Login the player
-        plugin.management.performLogin(player, playerPass, false);
+        // Log the player in
+        plugin.getManagement().performLogin(player, password, false);
         return true;
     }
 }

src/main/java/fr/xephi/authme/command/executable/logout/LogoutCommand.java

@@ -1,38 +1,29 @@
 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 fr.xephi.authme.util.Wrapper;
+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)) {
+        if (!(sender instanceof Player)) {
             return true;
         }
 
         // Get the player instance
+        final AuthMe plugin = Wrapper.getInstance().getAuthMe();
         final Player player = (Player) sender;
 
         // Logout the player
-        plugin.management.performLogout(player);
+        plugin.getManagement().performLogout(player);
         return true;
     }
 }

src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java

@@ -1,33 +1,23 @@
 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.process.Management;
 import fr.xephi.authme.security.RandomString;
+import fr.xephi.authme.settings.MessageKey;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.util.Wrapper;
+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)) {
@@ -35,36 +25,41 @@ public class RegisterCommand extends ExecutableCommand {
             return true;
         }
 
+        final Wrapper wrapper = Wrapper.getInstance();
+        final AuthMe plugin = wrapper.getAuthMe();
+        final Messages m = wrapper.getMessages();
+
         // 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");
+            m.send(player, MessageKey.USAGE_REGISTER);
             return true;
         }
 
+        final Management management = plugin.getManagement();
         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");
+                    m.send(player, MessageKey.USAGE_REGISTER);
                     return true;
                 }
             }
             final String email = commandArguments.get(0);
             if (!Settings.isEmailCorrect(email)) {
-                m.send(player, "email_invalid");
+                m.send(player, MessageKey.INVALID_EMAIL);
                 return true;
             }
-            RandomString rand = new RandomString(Settings.getRecoveryPassLength);
-            final String thePass = rand.nextString();
-            plugin.management.performRegister(player, thePass, email);
+            final String thePass = new RandomString(Settings.getRecoveryPassLength).nextString();
+            management.performRegister(player, thePass, email);
             return true;
         }
-        if (commandArguments.getCount() > 1 && Settings.getEnablePasswordVerifier)
+        if (commandArguments.getCount() > 1 && Settings.getEnablePasswordVerifier) {
             if (!commandArguments.get(0).equals(commandArguments.get(1))) {
-                m.send(player, "password_error");
+                m.send(player, MessageKey.PASSWORD_IS_USERNAME_ERROR);
                 return true;
             }
-        plugin.management.performRegister(player, commandArguments.get(0), "");
+        }
+        management.performRegister(player, commandArguments.get(0), "");
         return true;
     }
 }

src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java

@@ -1,20 +1,22 @@
 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.MessageKey;
 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 sender           The command sender.
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *
@@ -26,10 +28,10 @@ public class UnregisterCommand extends ExecutableCommand {
         final AuthMe plugin = AuthMe.getInstance();
 
         // Messages instance
-        final Messages m = Messages.getInstance();
+        final Messages m = plugin.getMessages();
 
         // Make sure the current command executor is a player
-        if(!(sender instanceof Player)) {
+        if (!(sender instanceof Player)) {
             return true;
         }
 
@@ -42,7 +44,7 @@ public class UnregisterCommand extends ExecutableCommand {
 
         // Make sure the player is authenticated
         if (!PlayerCache.getInstance().isAuthenticated(playerNameLowerCase)) {
-            m.send(player, "not_logged_in");
+            m.send(player, MessageKey.NOT_LOGGED_IN);
             return true;
         }
 

src/main/java/fr/xephi/authme/command/help/HelpPrinter.java

@@ -1,28 +1,30 @@
 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.permission.PermissionNode;
 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 {
 
     /**
      * Print the command help information.
      *
-     * @param sender The command sender to print the help to.
-     * @param command The command to print.
+     * @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) {
@@ -33,16 +35,16 @@ public class HelpPrinter {
     /**
      * 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 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())
+        if (command.hasDescription())
             sender.sendMessage(ChatColor.GOLD + "Short Description: " + ChatColor.WHITE + command.getDescription());
 
         // Print the detailed description, if available
-        if(command.hasDetailedDescription()) {
+        if (!StringUtils.isEmpty(command.getDetailedDescription())) {
             sender.sendMessage(ChatColor.GOLD + "Detailed Description:");
             sender.sendMessage(ChatColor.WHITE + " " + command.getDetailedDescription());
         }
@@ -51,26 +53,26 @@ public class HelpPrinter {
     /**
      * Print the command help arguments information if available.
      *
-     * @param sender The command sender to print the help to.
+     * @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)
+        if (!command.hasArguments() && command.getMaximumArguments() >= 0)
             return;
 
         // Print the header
         sender.sendMessage(ChatColor.GOLD + "Arguments:");
 
         // Print each argument
-        for(CommandArgumentDescription arg : command.getArguments()) {
+        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())
+            if (arg.isOptional())
                 argString.append(ChatColor.GRAY + "" + ChatColor.ITALIC + " (Optional)");
 
             // Print the syntax
@@ -78,57 +80,57 @@ public class HelpPrinter {
         }
 
         // Show the unlimited arguments argument
-        if(command.getMaximumArguments() < 0)
+        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 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)
+        if (permissions == null)
             return;
 
         // Make sure any permission node is set
-        if(permissions.getPermissionNodeCount() <= 0)
+        if (permissions.getPermissionNodeCount() <= 0)
             return;
 
         // Print the header
         sender.sendMessage(ChatColor.GOLD + "Permissions:");
 
         // Print each node
-        for(String node : permissions.getPermissionNodes()) {
+        for (PermissionNode node : permissions.getPermissionNodes()) {
             boolean nodePermission = true;
-            if(sender instanceof Player)
-                nodePermission = AuthMe.getInstance().authmePermissible((Player) sender, node);
+            if (sender instanceof Player)
+                nodePermission = AuthMe.getInstance().getPermissionsManager().hasPermission((Player) sender, node);
             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;
+        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 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;
+            case NOT_ALLOWED:
+            default:
+                sender.sendMessage(ChatColor.GOLD + " Default: " + ChatColor.GRAY + ChatColor.ITALIC + "No Permission!");
+                break;
         }
 
         // Print the permission result
-        if(permissions.hasPermission(sender))
+        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!");
@@ -137,13 +139,13 @@ public class HelpPrinter {
     /**
      * Print the command help alternatives information if available.
      *
-     * @param sender The command sender to print the help to.
-     * @param command The command used.
+     * @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)
+        if (command.getLabels().size() <= 1)
             return;
 
         // Print the header
@@ -154,9 +156,9 @@ public class HelpPrinter {
 
         // Create a list of alternatives
         List<String> alternatives = new ArrayList<>();
-        for(String entry : command.getLabels()) {
+        for (String entry : command.getLabels()) {
             // Exclude the proper argument
-            if(entry.equalsIgnoreCase(usedLabel))
+            if (entry.equalsIgnoreCase(usedLabel))
                 continue;
             alternatives.add(entry);
         }
@@ -170,27 +172,27 @@ public class HelpPrinter {
         });
 
         // Print each alternative with proper syntax
-        for(String alternative : alternatives)
+        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 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.getChildren().size() <= 0)
+        if (command.getChildren().size() <= 0)
             return;
 
         // Print the header
         sender.sendMessage(ChatColor.GOLD + "Commands:");
 
         // Loop through each child
-        for(CommandDescription child : command.getChildren())
+        for (CommandDescription child : command.getChildren())
             sender.sendMessage(" " + HelpSyntaxHelper.getCommandSyntax(child, commandReference, null, false) + ChatColor.GRAY + ChatColor.ITALIC + " : " + child.getDescription());
     }
 }

src/main/java/fr/xephi/authme/command/help/HelpProvider.java

@@ -1,19 +1,22 @@
 package fr.xephi.authme.command.help;
 
-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;
+import fr.xephi.authme.settings.Settings;
 
+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 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.
      */
@@ -24,31 +27,31 @@ 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.
-     * @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 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.
+     * @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 = AuthMe.getInstance().getCommandHandler().getCommandManager().findCommand(new CommandParts(helpQuery.getList()));
         CommandParts commandReferenceOther = new CommandParts(reference.get(0), helpQuery.getList());
         FoundCommandResult resultOther = AuthMe.getInstance().getCommandHandler().getCommandManager().findCommand(commandReferenceOther);
-        if(resultOther != null) {
-            if(result == null)
+        if (resultOther != null) {
+            if (result == null)
                 result = resultOther;
 
-            else if(result.getDifference() > resultOther.getDifference())
+            else if (result.getDifference() > resultOther.getDifference())
                 result = resultOther;
         }
 
         // Make sure a result was found
-        if(result == null) {
+        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.");
@@ -57,7 +60,7 @@ public class HelpProvider {
 
         // Get the command description, and make sure it's valid
         CommandDescription command = result.getCommandDescription();
-        if(command == null) {
+        if (command == null) {
             // Show a warning message
             sender.sendMessage(ChatColor.DARK_RED + "Failed to retrieve any help information!");
             return;
@@ -71,7 +74,7 @@ public class HelpProvider {
 
         // 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) {
+        if (commandDifference > 0.20) {
             // Show the unknown command warning
             sender.sendMessage(ChatColor.DARK_RED + "No help found for '" + helpQuery + "'!");
 
@@ -79,8 +82,8 @@ public class HelpProvider {
             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)
+            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
@@ -89,7 +92,7 @@ public class HelpProvider {
         }
 
         // Show a message when the command handler is assuming a command
-        if(commandDifference > 0) {
+        if (commandDifference > 0) {
             // Get the suggested command
             CommandParts suggestedCommandParts = new CommandParts(result.getCommandDescription().getCommandReference(commandReference).getRange(1));
 
@@ -98,20 +101,20 @@ public class HelpProvider {
         }
 
         // Print the help header
-        sender.sendMessage(ChatColor.GOLD + "==========[ " + AuthMe.PLUGIN_NAME.toUpperCase() + " HELP ]==========");
+        sender.sendMessage(ChatColor.GOLD + "==========[ " + Settings.helpHeader.toUpperCase() + " HELP ]==========");
 
         // Print the command help information
-        if(showCommand)
+        if (showCommand)
             HelpPrinter.printCommand(sender, command, commandReference);
-        if(showDescription)
+        if (showDescription)
             HelpPrinter.printCommandDescription(sender, command);
-        if(showArguments)
+        if (showArguments)
             HelpPrinter.printArguments(sender, command);
-        if(showPermissions)
+        if (showPermissions)
             HelpPrinter.printPermissions(sender, command);
-        if(showAlternatives)
+        if (showAlternatives)
             HelpPrinter.printAlternatives(sender, command, commandReference);
-        if(showCommands)
+        if (showCommands)
             HelpPrinter.printChildren(sender, command, commandReference);
     }
 }

src/main/java/fr/xephi/authme/command/help/HelpSyntaxHelper.java

@@ -1,61 +1,79 @@
 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 fr.xephi.authme.util.StringUtils;
+import org.bukkit.ChatColor;
 
-public class HelpSyntaxHelper {
+/**
+ * Helper class for formatting a command's structure (name and arguments)
+ * for a Minecraft user.
+ */
+public final class HelpSyntaxHelper {
+
+    private HelpSyntaxHelper() {
+        // Helper class
+    }
 
     /**
-     * Get the proper syntax for a command.
+     * Get the formatted 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.
+     * @param commandDescription The command to build 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 + "/");
+    public static String getCommandSyntax(CommandDescription commandDescription, CommandParts commandReference,
+                                          String alternativeLabel, boolean highlight) {
+        // Create a string builder with white color and prefixed slash
+        StringBuilder sb = new StringBuilder()
+            .append(ChatColor.WHITE)
+            .append("/");
 
         // 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);
+        final String parentCommand = new CommandParts(
+            helpCommandReference.getRange(0, helpCommandReference.getCount() - 1)).toString();
 
         // Check whether the alternative label should be used
-        if(alternativeLabel != null)
-            if(alternativeLabel.trim().length() > 0)
-                commandLabel = alternativeLabel;
+        String commandLabel;
+        if (StringUtils.isEmpty(alternativeLabel)) {
+            commandLabel = helpCommandReference.get(helpCommandReference.getCount() - 1);
+        } else {
+            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);
+        sb.append(parentCommand)
+            .append(" ")
+            .append(highlight ? ChatColor.YELLOW.toString() + ChatColor.BOLD : "")
+            .append(commandLabel);
 
-        // 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() + "]");
+        if (highlight) {
+            sb.append(ChatColor.YELLOW);
+        }
+
+        // Add each command argument
+        for (CommandArgumentDescription arg : commandDescription.getArguments()) {
+            sb.append(ChatColor.ITALIC).append(formatArgument(arg));
         }
 
         // Add some dots if the command allows unlimited arguments
-        if(commandDescription.getMaximumArguments() < 0)
-            sb.append(ChatColor.ITALIC + " ...");
+        if (commandDescription.getMaximumArguments() < 0) {
+            sb.append(ChatColor.ITALIC).append(" ...");
+        }
 
         // Return the build command syntax
         return sb.toString();
     }
+
+    private static String formatArgument(CommandArgumentDescription argument) {
+        if (argument.isOptional()) {
+            return " [" + argument.getLabel() + "]";
+        }
+        return " <" + argument.getLabel() + ">";
+    }
 }

src/main/java/fr/xephi/authme/converter/Converter.java

@@ -1,4 +1,6 @@
 package fr.xephi.authme.converter;
 
+/**
+ */
 public interface Converter extends Runnable {
 }

src/main/java/fr/xephi/authme/converter/CrazyLoginConverter.java

@@ -1,37 +1,53 @@
 package fr.xephi.authme.converter;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-
-import org.bukkit.command.CommandSender;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.settings.Settings;
+import org.bukkit.command.CommandSender;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
 
 /**
  * @author Xephi59
+ * @version $Revision: 1.0 $
  */
 public class CrazyLoginConverter implements Converter {
 
-    public AuthMe instance;
-    public DataSource database;
-    public CommandSender sender;
+    public final AuthMe instance;
+    public final DataSource database;
+    public final CommandSender sender;
 
+    /**
+     * Constructor for CrazyLoginConverter.
+     *
+     * @param instance AuthMe
+     * @param sender   CommandSender
+     */
     public CrazyLoginConverter(AuthMe instance, CommandSender sender) {
         this.instance = instance;
         this.database = instance.database;
         this.sender = sender;
     }
 
+    /**
+     * Method getInstance.
+     *
+     * @return CrazyLoginConverter
+     */
     public CrazyLoginConverter getInstance() {
         return this;
     }
 
+    /**
+     * Method run.
+     *
+     * @see java.lang.Runnable#run()
+     */
     @Override
     public void run() {
         String fileName = Settings.crazyloginFileName;

src/main/java/fr/xephi/authme/converter/FlatToSql.java

@@ -1,18 +1,14 @@
 package fr.xephi.authme.converter;
 
-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 fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.settings.Settings;
 
+import java.io.*;
+
 /**
  * @author Xephi59
+ * @version $Revision: 1.0 $
  */
 public class FlatToSql implements Converter {
 
@@ -44,6 +40,11 @@ public class FlatToSql implements Converter {
         columnID = Settings.getMySQLColumnId;
     }
 
+    /**
+     * Method run.
+     *
+     * @see java.lang.Runnable#run()
+     */
     @Override
     public void run() {
         try {

src/main/java/fr/xephi/authme/converter/FlatToSqlite.java

@@ -1,24 +1,20 @@
 package fr.xephi.authme.converter;
 
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.settings.Settings;
+import org.bukkit.command.CommandSender;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import org.bukkit.command.CommandSender;
-
-import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.settings.Settings;
+import java.sql.*;
 
+/**
+ */
 public class FlatToSqlite implements Converter {
 
-    public CommandSender sender;
+    public final CommandSender sender;
     private String tableName;
     private String columnName;
     private String columnPassword;
@@ -32,10 +28,21 @@ public class FlatToSqlite implements Converter {
     private String database;
     private String columnID;
     private Connection con;
+
+    /**
+     * Constructor for FlatToSqlite.
+     *
+     * @param sender CommandSender
+     */
     public FlatToSqlite(CommandSender sender) {
         this.sender = sender;
     }
 
+    /**
+     * Method close.
+     *
+     * @param o AutoCloseable
+     */
     private static void close(AutoCloseable o) {
         if (o != null) {
             try {
@@ -46,6 +53,11 @@ public class FlatToSqlite implements Converter {
         }
     }
 
+    /**
+     * Method run.
+     *
+     * @see java.lang.Runnable#run()
+     */
     @Override
     public void run() {
         database = Settings.getMySQLDatabase;
@@ -105,11 +117,21 @@ public class FlatToSqlite implements Converter {
         }
     }
 
+    /**
+     * Method connect.
+     *
+     * @throws ClassNotFoundException * @throws SQLException
+     */
     private synchronized void connect() throws ClassNotFoundException, SQLException {
         Class.forName("org.sqlite.JDBC");
         con = DriverManager.getConnection("jdbc:sqlite:plugins/AuthMe/" + database + ".db");
     }
 
+    /**
+     * Method setup.
+     *
+     * @throws SQLException
+     */
     private synchronized void setup() throws SQLException {
         Statement st = null;
         ResultSet rs = null;
@@ -153,6 +175,13 @@ public class FlatToSqlite implements Converter {
         }
     }
 
+    /**
+     * Method saveAuth.
+     *
+     * @param s String
+     *
+     * @return boolean
+     */
     private synchronized boolean saveAuth(String s) {
         PreparedStatement pst = null;
         try {

src/main/java/fr/xephi/authme/converter/ForceFlatToSqlite.java

@@ -7,13 +7,27 @@ import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.datasource.SQLite;
 import fr.xephi.authme.settings.Settings;
 
+/**
+ */
 public class ForceFlatToSqlite implements Converter {
 
-    private DataSource data;
+    private final DataSource data;
+
+    /**
+     * Constructor for ForceFlatToSqlite.
+     *
+     * @param data   DataSource
+     * @param plugin AuthMe
+     */
     public ForceFlatToSqlite(DataSource data, AuthMe plugin) {
         this.data = data;
     }
 
+    /**
+     * Method run.
+     *
+     * @see java.lang.Runnable#run()
+     */
     @Override
     public void run() {
         DataSource sqlite = null;

src/main/java/fr/xephi/authme/converter/RakamakConverter.java

@@ -1,5 +1,14 @@
 package fr.xephi.authme.converter;
 
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.security.HashAlgorithm;
+import fr.xephi.authme.security.PasswordSecurity;
+import fr.xephi.authme.settings.Settings;
+import org.bukkit.command.CommandSender;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -8,35 +17,42 @@ import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.Map.Entry;
 
-import org.bukkit.command.CommandSender;
-
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.cache.auth.PlayerAuth;
-import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.security.HashAlgorithm;
-import fr.xephi.authme.security.PasswordSecurity;
-import fr.xephi.authme.settings.Settings;
-
 /**
  * @author Xephi59
+ * @version $Revision: 1.0 $
  */
 public class RakamakConverter implements Converter {
 
-    public AuthMe instance;
-    public DataSource database;
-    public CommandSender sender;
+    public final AuthMe instance;
+    public final DataSource database;
+    public final CommandSender sender;
 
+    /**
+     * Constructor for RakamakConverter.
+     *
+     * @param instance AuthMe
+     * @param sender   CommandSender
+     */
     public RakamakConverter(AuthMe instance, CommandSender sender) {
         this.instance = instance;
         this.database = instance.database;
         this.sender = sender;
     }
 
+    /**
+     * Method getInstance.
+     *
+     * @return RakamakConverter
+     */
     public RakamakConverter getInstance() {
         return this;
     }
 
+    /**
+     * Method run.
+     *
+     * @see java.lang.Runnable#run()
+     */
     @Override
     public void run() {
         HashAlgorithm hash = Settings.getPasswordHash;

src/main/java/fr/xephi/authme/converter/RoyalAuthConverter.java

@@ -1,24 +1,35 @@
 package fr.xephi.authme.converter;
 
-import java.io.File;
-
-import org.bukkit.OfflinePlayer;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
+import org.bukkit.OfflinePlayer;
 
+import java.io.File;
+
+/**
+ */
 public class RoyalAuthConverter implements Converter {
 
-    public AuthMe plugin;
-    private DataSource data;
+    public final AuthMe plugin;
+    private final DataSource data;
 
+    /**
+     * Constructor for RoyalAuthConverter.
+     *
+     * @param plugin AuthMe
+     */
     public RoyalAuthConverter(AuthMe plugin) {
         this.plugin = plugin;
         this.data = plugin.database;
     }
 
+    /**
+     * Method run.
+     *
+     * @see java.lang.Runnable#run()
+     */
     @Override
     public void run() {
         for (OfflinePlayer o : plugin.getServer().getOfflinePlayers()) {

src/main/java/fr/xephi/authme/converter/RoyalAuthYamlReader.java

@@ -1,21 +1,38 @@
 package fr.xephi.authme.converter;
 
-import java.io.File;
-
 import fr.xephi.authme.settings.CustomConfiguration;
 
+import java.io.File;
+
+/**
+ */
 public class RoyalAuthYamlReader extends CustomConfiguration {
 
+    /**
+     * Constructor for RoyalAuthYamlReader.
+     *
+     * @param file File
+     */
     public RoyalAuthYamlReader(File file) {
         super(file);
         load();
         save();
     }
 
+    /**
+     * Method getLastLogin.
+     *
+     * @return long
+     */
     public long getLastLogin() {
         return getLong("timestamps.quit");
     }
 
+    /**
+     * Method getHash.
+     *
+     * @return String
+     */
     public String getHash() {
         return getString("login.password");
     }

src/main/java/fr/xephi/authme/converter/SqlToFlat.java

@@ -1,28 +1,40 @@
 package fr.xephi.authme.converter;
 
-import java.util.List;
-
-import org.bukkit.command.CommandSender;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.datasource.FlatFile;
-import fr.xephi.authme.settings.Messages;
+import fr.xephi.authme.settings.MessageKey;
+import org.bukkit.command.CommandSender;
 
+import java.util.List;
+
+/**
+ */
 public class SqlToFlat implements Converter {
 
-    public AuthMe plugin;
-    public DataSource database;
-    public CommandSender sender;
+    public final AuthMe plugin;
+    public final DataSource database;
+    public final CommandSender sender;
 
+    /**
+     * Constructor for SqlToFlat.
+     *
+     * @param plugin AuthMe
+     * @param sender CommandSender
+     */
     public SqlToFlat(AuthMe plugin, CommandSender sender) {
         this.plugin = plugin;
         this.database = plugin.database;
         this.sender = sender;
     }
 
+    /**
+     * Method run.
+     *
+     * @see java.lang.Runnable#run()
+     */
     @Override
     public void run() {
         try {
@@ -40,7 +52,7 @@ public class SqlToFlat implements Converter {
             sender.sendMessage("Successfully convert from SQL table to file auths.db");
         } catch (Exception ex) {
             ConsoleLogger.showError(ex.getMessage());
-            Messages.getInstance().send(sender, "error");
+            plugin.getMessages().send(sender, MessageKey.ERROR);
         }
     }
 

src/main/java/fr/xephi/authme/converter/vAuthConverter.java

@@ -1,23 +1,35 @@
 package fr.xephi.authme.converter;
 
-import org.bukkit.command.CommandSender;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
+import org.bukkit.command.CommandSender;
 
+/**
+ */
 public class vAuthConverter implements Converter {
 
-    public AuthMe plugin;
-    public DataSource database;
-    public CommandSender sender;
+    public final AuthMe plugin;
+    public final DataSource database;
+    public final CommandSender sender;
 
+    /**
+     * Constructor for vAuthConverter.
+     *
+     * @param plugin AuthMe
+     * @param sender CommandSender
+     */
     public vAuthConverter(AuthMe plugin, CommandSender sender) {
         this.plugin = plugin;
         this.database = plugin.database;
         this.sender = sender;
     }
 
+    /**
+     * Method run.
+     *
+     * @see java.lang.Runnable#run()
+     */
     @Override
     public void run() {
         try {

src/main/java/fr/xephi/authme/converter/vAuthFileReader.java

@@ -1,32 +1,38 @@
 package fr.xephi.authme.converter;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Scanner;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.CommandSender;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
 
+import java.io.File;
+import java.util.Scanner;
+import java.util.UUID;
+
+/**
+ */
 public class vAuthFileReader {
 
-    public AuthMe plugin;
-    public DataSource database;
-    public CommandSender sender;
+    public final AuthMe plugin;
+    public final DataSource database;
+    public final CommandSender sender;
 
+    /**
+     * Constructor for vAuthFileReader.
+     *
+     * @param plugin AuthMe
+     * @param sender CommandSender
+     */
     public vAuthFileReader(AuthMe plugin, CommandSender sender) {
         this.plugin = plugin;
         this.database = plugin.database;
         this.sender = sender;
     }
 
-    public void convert() throws IOException {
+    public void convert() {
         final File file = new File(plugin.getDataFolder().getParent() + "" + File.separator + "vAuth" + File.separator + "passwords.yml");
         Scanner scanner;
         try {
@@ -37,32 +43,47 @@ public class vAuthFileReader {
                 String password = line.split(": ")[1];
                 PlayerAuth auth;
                 if (isUUIDinstance(password)) {
-                    String pname;
+                    String playerName;
                     try {
-                        pname = Bukkit.getOfflinePlayer(UUID.fromString(name)).getName();
+                        playerName = Bukkit.getOfflinePlayer(UUID.fromString(name)).getName();
                     } catch (Exception | NoSuchMethodError e) {
-                        pname = getName(UUID.fromString(name));
+                        playerName = getName(UUID.fromString(name));
                     }
-                    if (pname == null)
+                    if (playerName == null)
                         continue;
-                    auth = new PlayerAuth(pname.toLowerCase(), password, "127.0.0.1", System.currentTimeMillis(), "your@email.com", pname);
+                    auth = new PlayerAuth(playerName.toLowerCase(), password, "127.0.0.1", System.currentTimeMillis(), "your@email.com", playerName);
                 } else {
                     auth = new PlayerAuth(name.toLowerCase(), password, "127.0.0.1", System.currentTimeMillis(), "your@email.com", name);
                 }
                 database.saveAuth(auth);
             }
+            scanner.close();
         } catch (Exception e) {
             ConsoleLogger.writeStackTrace(e);
         }
 
     }
 
+    /**
+     * Method isUUIDinstance.
+     *
+     * @param s String
+     *
+     * @return boolean
+     */
     private boolean isUUIDinstance(String s) {
         if (String.valueOf(s.charAt(8)).equalsIgnoreCase("-"))
             return true;
         return true;
     }
 
+    /**
+     * Method getName.
+     *
+     * @param uuid UUID
+     *
+     * @return String
+     */
     private String getName(UUID uuid) {
         try {
             for (OfflinePlayer op : Bukkit.getOfflinePlayers()) {

src/main/java/fr/xephi/authme/converter/xAuthConverter.java

@@ -1,19 +1,31 @@
 package fr.xephi.authme.converter;
 
+import fr.xephi.authme.AuthMe;
 import org.bukkit.command.CommandSender;
 
-import fr.xephi.authme.AuthMe;
-
+/**
+ */
 public class xAuthConverter implements Converter {
 
-    public AuthMe plugin;
-    public CommandSender sender;
+    public final AuthMe plugin;
+    public final CommandSender sender;
 
+    /**
+     * Constructor for xAuthConverter.
+     *
+     * @param plugin AuthMe
+     * @param sender CommandSender
+     */
     public xAuthConverter(AuthMe plugin, CommandSender sender) {
         this.plugin = plugin;
         this.sender = sender;
     }
 
+    /**
+     * Method run.
+     *
+     * @see java.lang.Runnable#run()
+     */
     @Override
     public void run() {
         try {

src/main/java/fr/xephi/authme/converter/xAuthToFlat.java

@@ -1,5 +1,13 @@
 package fr.xephi.authme.converter;
 
+import de.luricos.bukkit.xAuth.database.DatabaseTables;
+import de.luricos.bukkit.xAuth.utils.xAuthLog;
+import de.luricos.bukkit.xAuth.xAuth;
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.datasource.DataSource;
+import org.bukkit.command.CommandSender;
+
 import java.io.File;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -8,27 +16,31 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.bukkit.command.CommandSender;
-
-import de.luricos.bukkit.xAuth.xAuth;
-import de.luricos.bukkit.xAuth.database.DatabaseTables;
-import de.luricos.bukkit.xAuth.utils.xAuthLog;
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.cache.auth.PlayerAuth;
-import fr.xephi.authme.datasource.DataSource;
-
+/**
+ */
 public class xAuthToFlat {
 
-    public AuthMe instance;
-    public DataSource database;
-    public CommandSender sender;
+    public final AuthMe instance;
+    public final DataSource database;
+    public final CommandSender sender;
 
+    /**
+     * Constructor for xAuthToFlat.
+     *
+     * @param instance AuthMe
+     * @param sender   CommandSender
+     */
     public xAuthToFlat(AuthMe instance, CommandSender sender) {
         this.instance = instance;
         this.database = instance.database;
         this.sender = sender;
     }
 
+    /**
+     * Method convert.
+     *
+     * @return boolean
+     */
     public boolean convert() {
         if (instance.getServer().getPluginManager().getPlugin("xAuth") == null) {
             sender.sendMessage("[AuthMe] xAuth plugin not found");
@@ -52,13 +64,20 @@ public class xAuthToFlat {
                     database.saveAuth(auth);
                 }
             }
-            sender.sendMessage("[AuthMe] Successfull convert from xAuth database");
+            sender.sendMessage("[AuthMe] Successfully convert from xAuth database");
         } catch (Exception e) {
             sender.sendMessage("[AuthMe] An error has been thrown while import xAuth database, the import hadn't fail but can be not complete ");
         }
         return true;
     }
 
+    /**
+     * Method getIdPlayer.
+     *
+     * @param id int
+     *
+     * @return String
+     */
     public String getIdPlayer(int id) {
         String realPass = "";
         Connection conn = xAuth.getPlugin().getDatabaseController().getConnection();
@@ -81,6 +100,11 @@ public class xAuthToFlat {
         return realPass;
     }
 
+    /**
+     * Method getXAuthPlayers.
+     *
+     * @return List<Integer>
+     */
     public List<Integer> getXAuthPlayers() {
         List<Integer> xP = new ArrayList<>();
         Connection conn = xAuth.getPlugin().getDatabaseController().getConnection();
@@ -102,6 +126,13 @@ public class xAuthToFlat {
         return xP;
     }
 
+    /**
+     * Method getPassword.
+     *
+     * @param accountId int
+     *
+     * @return String
+     */
     public String getPassword(int accountId) {
         String realPass = "";
         Connection conn = xAuth.getPlugin().getDatabaseController().getConnection();

src/main/java/fr/xephi/authme/datasource/CacheDataSource.java

@@ -1,378 +1,561 @@
-package fr.xephi.authme.datasource;
-
-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 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;
-
-public class CacheDataSource implements DataSource {
-
-    private final DataSource source;
-    private final ExecutorService exec;
-    private final ConcurrentHashMap<String, PlayerAuth> cache = new ConcurrentHashMap<>();
-
-    public CacheDataSource(final AuthMe pl, DataSource src) {
-        this.source = src;
-        this.exec = Executors.newCachedThreadPool();
-        pl.setCanConnect(false);
-
-        /*
-         * We need to load all players in cache ... It will took more time to
-         * load the server, but it will be much easier to check for an
-         * isAuthAvailable !
-         */
-        exec.execute(new Runnable() {
-            @Override
-            public void run() {
-                for (PlayerAuth auth : source.getAllAuths()) {
-                    cache.put(auth.getNickname().toLowerCase(), auth);
-                }
-                pl.setCanConnect(true);
-            }
-        });
-    }
-
-    @Override
-    public synchronized boolean isAuthAvailable(String user) {
-        return cache.containsKey(user.toLowerCase());
-    }
-
-    @Override
-    public synchronized PlayerAuth getAuth(String user) {
-        user = user.toLowerCase();
-        if (cache.containsKey(user)) {
-            return cache.get(user);
-        }
-        return null;
-    }
-
-    @Override
-    public synchronized boolean saveAuth(final PlayerAuth auth) {
-        cache.put(auth.getNickname(), auth);
-        exec.execute(new Runnable() {
-            @Override
-            public void run() {
-                if (!source.saveAuth(auth)) {
-                    cache.remove(auth.getNickname());
-                }
-            }
-        });
-        return true;
-    }
-
-    @Override
-    public synchronized boolean updatePassword(final PlayerAuth auth) {
-        if (!cache.containsKey(auth.getNickname())) {
-            return false;
-        }
-        final String oldHash = cache.get(auth.getNickname()).getHash();
-        cache.get(auth.getNickname()).setHash(auth.getHash());
-        exec.execute(new Runnable() {
-            @Override
-            public void run() {
-                if (!source.updatePassword(auth)) {
-                    if (cache.containsKey(auth.getNickname())) {
-                        cache.get(auth.getNickname()).setHash(oldHash);
-                    }
-                }
-            }
-        });
-        return true;
-    }
-
-    @Override
-    public boolean updateSession(final PlayerAuth auth) {
-        if (!cache.containsKey(auth.getNickname())) {
-            return false;
-        }
-        PlayerAuth cachedAuth = cache.get(auth.getNickname());
-        final String oldIp = cachedAuth.getIp();
-        final long oldLastLogin = cachedAuth.getLastLogin();
-        final String oldRealName = cachedAuth.getRealName();
-
-        cachedAuth.setIp(auth.getIp());
-        cachedAuth.setLastLogin(auth.getLastLogin());
-        cachedAuth.setRealName(auth.getRealName());
-        exec.execute(new Runnable() {
-            @Override
-            public void run() {
-                if (!source.updateSession(auth)) {
-                    if (cache.containsKey(auth.getNickname())) {
-                        PlayerAuth cachedAuth = cache.get(auth.getNickname());
-                        cachedAuth.setIp(oldIp);
-                        cachedAuth.setLastLogin(oldLastLogin);
-                        cachedAuth.setRealName(oldRealName);
-                    }
-                }
-            }
-        });
-        return true;
-    }
-
-    @Override
-    public boolean updateQuitLoc(final PlayerAuth auth) {
-        if (!cache.containsKey(auth.getNickname())) {
-            return false;
-        }
-        final PlayerAuth cachedAuth = cache.get(auth.getNickname());
-        final double oldX = cachedAuth.getQuitLocX();
-        final double oldY = cachedAuth.getQuitLocY();
-        final double oldZ = cachedAuth.getQuitLocZ();
-        final String oldWorld = cachedAuth.getWorld();
-
-        cachedAuth.setQuitLocX(auth.getQuitLocX());
-        cachedAuth.setQuitLocY(auth.getQuitLocY());
-        cachedAuth.setQuitLocZ(auth.getQuitLocZ());
-        cachedAuth.setWorld(auth.getWorld());
-        exec.execute(new Runnable() {
-            @Override
-            public void run() {
-                if (!source.updateQuitLoc(auth)) {
-                    if (cache.containsKey(auth.getNickname())) {
-                        PlayerAuth cachedAuth = cache.get(auth.getNickname());
-                        cachedAuth.setQuitLocX(oldX);
-                        cachedAuth.setQuitLocY(oldY);
-                        cachedAuth.setQuitLocZ(oldZ);
-                        cachedAuth.setWorld(oldWorld);
-                    }
-                }
-            }
-        });
-        return true;
-    }
-
-    @Override
-    public int getIps(String ip) {
-        int count = 0;
-        for (Map.Entry<String, PlayerAuth> p : cache.entrySet()) {
-            if (p.getValue().getIp().equals(ip)) {
-                count++;
-            }
-        }
-        return count;
-    }
-
-    @Override
-    public int purgeDatabase(long until) {
-        int cleared = source.purgeDatabase(until);
-        if (cleared > 0) {
-            for (PlayerAuth auth : cache.values()) {
-                if (auth.getLastLogin() < until) {
-                    cache.remove(auth.getNickname());
-                }
-            }
-        }
-        return cleared;
-    }
-
-    @Override
-    public List<String> autoPurgeDatabase(long until) {
-        List<String> cleared = source.autoPurgeDatabase(until);
-        if (cleared.size() > 0) {
-            for (PlayerAuth auth : cache.values()) {
-                if (auth.getLastLogin() < until) {
-                    cache.remove(auth.getNickname());
-                }
-            }
-        }
-        return cleared;
-    }
-
-    @Override
-    public synchronized boolean removeAuth(String username) {
-        final String user = username.toLowerCase();
-        final PlayerAuth auth = cache.get(user);
-        cache.remove(user);
-        exec.execute(new Runnable() {
-            @Override
-            public void run() {
-                if (!source.removeAuth(user)) {
-                    cache.put(user, auth);
-                }
-            }
-        });
-        return true;
-    }
-
-    @Override
-    public synchronized void close() {
-        exec.shutdown();
-        source.close();
-    }
-
-    @Override
-    public void reload() {
-        exec.execute(new Runnable() {
-            @Override
-            public void run() {
-                cache.clear();
-                source.reload();
-                for (Player player : Utils.getOnlinePlayers()) {
-                    String user = player.getName().toLowerCase();
-                    if (PlayerCache.getInstance().isAuthenticated(user)) {
-                        PlayerAuth auth = source.getAuth(user);
-                        cache.put(user, auth);
-                    }
-                }
-            }
-        });
-    }
-
-    @Override
-    public synchronized boolean updateEmail(final PlayerAuth auth) {
-        try {
-            return exec.submit(new Callable<Boolean>() {
-                public Boolean call() {
-                    return source.updateEmail(auth);
-                }
-            }).get();
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    @Override
-    public synchronized boolean updateSalt(final PlayerAuth auth) {
-        if (!cache.containsKey(auth.getNickname())) {
-            return false;
-        }
-        PlayerAuth cachedAuth = cache.get(auth.getNickname());
-        final String oldSalt = cachedAuth.getSalt();
-        cachedAuth.setSalt(auth.getSalt());
-        exec.execute(new Runnable() {
-            @Override
-            public void run() {
-                if (!source.updateSalt(auth)) {
-                    if (cache.containsKey(auth.getNickname())) {
-                        cache.get(auth.getNickname()).setSalt(oldSalt);
-                    }
-                }
-            }
-        });
-        return true;
-    }
-
-    @Override
-    public synchronized List<String> getAllAuthsByName(PlayerAuth auth) {
-        List<String> result = new ArrayList<>();
-        for (Map.Entry<String, PlayerAuth> stringPlayerAuthEntry : cache.entrySet()) {
-            PlayerAuth p = stringPlayerAuthEntry.getValue();
-            if (p.getIp().equals(auth.getIp()))
-                result.add(p.getNickname());
-        }
-        return result;
-    }
-
-    @Override
-    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(final String email) throws Exception {
-        return exec.submit(new Callable<List<String>>() {
-            public List<String> call() throws Exception {
-                return source.getAllAuthsByEmail(email);
-            }
-        }).get();
-    }
-
-    @Override
-    public synchronized void purgeBanned(final List<String> banned) {
-        exec.execute(new Runnable() {
-            @Override
-            public void run() {
-                source.purgeBanned(banned);
-                for (PlayerAuth auth : cache.values()) {
-                    if (banned.contains(auth.getNickname())) {
-                        cache.remove(auth.getNickname());
-                    }
-                }
-            }
-        });
-    }
-
-    @Override
-    public DataSourceType getType() {
-        return source.getType();
-    }
-
-    @Override
-    public boolean isLogged(String user) {
-        user = user.toLowerCase();
-        return PlayerCache.getInstance().getCache().containsKey(user);
-    }
-
-    @Override
-    public void setLogged(final String user) {
-        exec.execute(new Runnable() {
-            @Override
-            public void run() {
-                source.setLogged(user.toLowerCase());
-            }
-        });
-    }
-
-    @Override
-    public void setUnlogged(final String user) {
-        exec.execute(new Runnable() {
-            @Override
-            public void run() {
-                source.setUnlogged(user.toLowerCase());
-            }
-        });
-    }
-
-    @Override
-    public void purgeLogged() {
-        exec.execute(new Runnable() {
-            @Override
-            public void run() {
-                source.purgeLogged();
-            }
-        });
-    }
-
-    @Override
-    public int getAccountsRegistered() {
-        return cache.size();
-    }
-
-    @Override
-    public void updateName(final String oldone, final String newone) {
-        if (cache.containsKey(oldone)) {
-            cache.put(newone, cache.get(oldone));
-            cache.remove(oldone);
-        }
-        exec.execute(new Runnable() {
-            @Override
-            public void run() {
-                source.updateName(oldone, newone);
-            }
-        });
-    }
-
-    @Override
-    public List<PlayerAuth> getAllAuths() {
-        return new ArrayList<>(cache.values());
-    }
-
-    @Override
-    public List<PlayerAuth> getLoggedPlayers() {
-        return new ArrayList<>(PlayerCache.getInstance().getCache().values());
-    }
-}
+package fr.xephi.authme.datasource;
+
+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 {
+
+    private final DataSource source;
+    private final ExecutorService exec;
+    private final ConcurrentHashMap<String, PlayerAuth> cache = new ConcurrentHashMap<>();
+
+    /**
+     * Constructor for CacheDataSource.
+     *
+     * @param pl  AuthMe
+     * @param src DataSource
+     */
+    public CacheDataSource(final AuthMe pl, DataSource src) {
+        this.source = src;
+        this.exec = Executors.newCachedThreadPool();
+        pl.setCanConnect(false);
+
+        /*
+         * We need to load all players in cache ... It will took more time to
+         * load the server, but it will be much easier to check for an
+         * isAuthAvailable !
+         */
+        exec.execute(new Runnable() {
+            @Override
+            public void run() {
+                for (PlayerAuth auth : source.getAllAuths()) {
+                    cache.put(auth.getNickname().toLowerCase(), auth);
+                }
+                pl.setCanConnect(true);
+            }
+        });
+    }
+
+    /**
+     * Method isAuthAvailable.
+     *
+     * @param user String
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isAuthAvailable(String)
+     */
+    @Override
+    public synchronized boolean isAuthAvailable(String user) {
+        return cache.containsKey(user.toLowerCase());
+    }
+
+    /**
+     * Method getAuth.
+     *
+     * @param user String
+     *
+     * @return PlayerAuth * @see fr.xephi.authme.datasource.DataSource#getAuth(String)
+     */
+    @Override
+    public synchronized PlayerAuth getAuth(String user) {
+        user = user.toLowerCase();
+        if (cache.containsKey(user)) {
+            return cache.get(user);
+        }
+        return null;
+    }
+
+    /**
+     * Method saveAuth.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#saveAuth(PlayerAuth)
+     */
+    @Override
+    public synchronized boolean saveAuth(final PlayerAuth auth) {
+        cache.put(auth.getNickname(), auth);
+        exec.execute(new Runnable() {
+            @Override
+            public void run() {
+                if (!source.saveAuth(auth)) {
+                    cache.remove(auth.getNickname());
+                }
+            }
+        });
+        return true;
+    }
+
+    /**
+     * Method updatePassword.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updatePassword(PlayerAuth)
+     */
+    @Override
+    public synchronized boolean updatePassword(final PlayerAuth auth) {
+        if (!cache.containsKey(auth.getNickname())) {
+            return false;
+        }
+        final String oldHash = cache.get(auth.getNickname()).getHash();
+        cache.get(auth.getNickname()).setHash(auth.getHash());
+        exec.execute(new Runnable() {
+            @Override
+            public void run() {
+                if (!source.updatePassword(auth)) {
+                    if (cache.containsKey(auth.getNickname())) {
+                        cache.get(auth.getNickname()).setHash(oldHash);
+                    }
+                }
+            }
+        });
+        return true;
+    }
+
+    /**
+     * Method updateSession.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSession(PlayerAuth)
+     */
+    @Override
+    public boolean updateSession(final PlayerAuth auth) {
+        if (!cache.containsKey(auth.getNickname())) {
+            return false;
+        }
+        PlayerAuth cachedAuth = cache.get(auth.getNickname());
+        final String oldIp = cachedAuth.getIp();
+        final long oldLastLogin = cachedAuth.getLastLogin();
+        final String oldRealName = cachedAuth.getRealName();
+
+        cachedAuth.setIp(auth.getIp());
+        cachedAuth.setLastLogin(auth.getLastLogin());
+        cachedAuth.setRealName(auth.getRealName());
+        exec.execute(new Runnable() {
+            @Override
+            public void run() {
+                if (!source.updateSession(auth)) {
+                    if (cache.containsKey(auth.getNickname())) {
+                        PlayerAuth cachedAuth = cache.get(auth.getNickname());
+                        cachedAuth.setIp(oldIp);
+                        cachedAuth.setLastLogin(oldLastLogin);
+                        cachedAuth.setRealName(oldRealName);
+                    }
+                }
+            }
+        });
+        return true;
+    }
+
+    /**
+     * Method updateQuitLoc.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateQuitLoc(PlayerAuth)
+     */
+    @Override
+    public boolean updateQuitLoc(final PlayerAuth auth) {
+        if (!cache.containsKey(auth.getNickname())) {
+            return false;
+        }
+        final PlayerAuth cachedAuth = cache.get(auth.getNickname());
+        final double oldX = cachedAuth.getQuitLocX();
+        final double oldY = cachedAuth.getQuitLocY();
+        final double oldZ = cachedAuth.getQuitLocZ();
+        final String oldWorld = cachedAuth.getWorld();
+
+        cachedAuth.setQuitLocX(auth.getQuitLocX());
+        cachedAuth.setQuitLocY(auth.getQuitLocY());
+        cachedAuth.setQuitLocZ(auth.getQuitLocZ());
+        cachedAuth.setWorld(auth.getWorld());
+        exec.execute(new Runnable() {
+            @Override
+            public void run() {
+                if (!source.updateQuitLoc(auth)) {
+                    if (cache.containsKey(auth.getNickname())) {
+                        PlayerAuth cachedAuth = cache.get(auth.getNickname());
+                        cachedAuth.setQuitLocX(oldX);
+                        cachedAuth.setQuitLocY(oldY);
+                        cachedAuth.setQuitLocZ(oldZ);
+                        cachedAuth.setWorld(oldWorld);
+                    }
+                }
+            }
+        });
+        return true;
+    }
+
+    /**
+     * Method getIps.
+     *
+     * @param ip String
+     *
+     * @return int * @see fr.xephi.authme.datasource.DataSource#getIps(String)
+     */
+    @Override
+    public int getIps(String ip) {
+        int count = 0;
+        for (Map.Entry<String, PlayerAuth> p : cache.entrySet()) {
+            if (p.getValue().getIp().equals(ip)) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    /**
+     * Method purgeDatabase.
+     *
+     * @param until long
+     *
+     * @return int * @see fr.xephi.authme.datasource.DataSource#purgeDatabase(long)
+     */
+    @Override
+    public int purgeDatabase(long until) {
+        int cleared = source.purgeDatabase(until);
+        if (cleared > 0) {
+            for (PlayerAuth auth : cache.values()) {
+                if (auth.getLastLogin() < until) {
+                    cache.remove(auth.getNickname());
+                }
+            }
+        }
+        return cleared;
+    }
+
+    /**
+     * Method autoPurgeDatabase.
+     *
+     * @param until long
+     *
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#autoPurgeDatabase(long)
+     */
+    @Override
+    public List<String> autoPurgeDatabase(long until) {
+        List<String> cleared = source.autoPurgeDatabase(until);
+        if (cleared.size() > 0) {
+            for (PlayerAuth auth : cache.values()) {
+                if (auth.getLastLogin() < until) {
+                    cache.remove(auth.getNickname());
+                }
+            }
+        }
+        return cleared;
+    }
+
+    /**
+     * Method removeAuth.
+     *
+     * @param username String
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#removeAuth(String)
+     */
+    @Override
+    public synchronized boolean removeAuth(String username) {
+        final String user = username.toLowerCase();
+        final PlayerAuth auth = cache.get(user);
+        cache.remove(user);
+        exec.execute(new Runnable() {
+            @Override
+            public void run() {
+                if (!source.removeAuth(user)) {
+                    cache.put(user, auth);
+                }
+            }
+        });
+        return true;
+    }
+
+    /**
+     * Method close.
+     *
+     * @see fr.xephi.authme.datasource.DataSource#close()
+     */
+    @Override
+    public synchronized void close() {
+        exec.shutdown();
+        source.close();
+    }
+
+    /**
+     * Method reload.
+     *
+     * @see fr.xephi.authme.datasource.DataSource#reload()
+     */
+    @Override
+    public void reload() {
+        exec.execute(new Runnable() {
+            @Override
+            public void run() {
+                cache.clear();
+                source.reload();
+                for (Player player : Utils.getOnlinePlayers()) {
+                    String user = player.getName().toLowerCase();
+                    if (PlayerCache.getInstance().isAuthenticated(user)) {
+                        PlayerAuth auth = source.getAuth(user);
+                        cache.put(user, auth);
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+     * Method updateEmail.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateEmail(PlayerAuth)
+     */
+    @Override
+    public synchronized boolean updateEmail(final PlayerAuth auth) {
+        try {
+            return exec.submit(new Callable<Boolean>() {
+                public Boolean call() {
+                    return source.updateEmail(auth);
+                }
+            }).get();
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * Method updateSalt.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSalt(PlayerAuth)
+     */
+    @Override
+    public synchronized boolean updateSalt(final PlayerAuth auth) {
+        if (!cache.containsKey(auth.getNickname())) {
+            return false;
+        }
+        PlayerAuth cachedAuth = cache.get(auth.getNickname());
+        final String oldSalt = cachedAuth.getSalt();
+        cachedAuth.setSalt(auth.getSalt());
+        exec.execute(new Runnable() {
+            @Override
+            public void run() {
+                if (!source.updateSalt(auth)) {
+                    if (cache.containsKey(auth.getNickname())) {
+                        cache.get(auth.getNickname()).setSalt(oldSalt);
+                    }
+                }
+            }
+        });
+        return true;
+    }
+
+    /**
+     * Method getAllAuthsByName.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByName(PlayerAuth)
+     */
+    @Override
+    public synchronized List<String> getAllAuthsByName(PlayerAuth auth) {
+        List<String> result = new ArrayList<>();
+        for (Map.Entry<String, PlayerAuth> stringPlayerAuthEntry : cache.entrySet()) {
+            PlayerAuth p = stringPlayerAuthEntry.getValue();
+            if (p.getIp().equals(auth.getIp()))
+                result.add(p.getNickname());
+        }
+        return result;
+    }
+
+    /**
+     * Method getAllAuthsByIp.
+     *
+     * @param ip String
+     *
+     * @return List<String> * @throws Exception * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByIp(String)
+     */
+    @Override
+    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();
+    }
+
+    /**
+     * Method getAllAuthsByEmail.
+     *
+     * @param email String
+     *
+     * @return List<String> * @throws Exception * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByEmail(String)
+     */
+    @Override
+    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();
+    }
+
+    /**
+     * Method purgeBanned.
+     *
+     * @param banned List<String>
+     *
+     * @see fr.xephi.authme.datasource.DataSource#purgeBanned(List<String>)
+     */
+    @Override
+    public synchronized void purgeBanned(final List<String> banned) {
+        exec.execute(new Runnable() {
+            @Override
+            public void run() {
+                source.purgeBanned(banned);
+                for (PlayerAuth auth : cache.values()) {
+                    if (banned.contains(auth.getNickname())) {
+                        cache.remove(auth.getNickname());
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+     * Method getType.
+     *
+     * @return DataSourceType * @see fr.xephi.authme.datasource.DataSource#getType()
+     */
+    @Override
+    public DataSourceType getType() {
+        return source.getType();
+    }
+
+    /**
+     * Method isLogged.
+     *
+     * @param user String
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isLogged(String)
+     */
+    @Override
+    public boolean isLogged(String user) {
+        user = user.toLowerCase();
+        return PlayerCache.getInstance().getCache().containsKey(user);
+    }
+
+    /**
+     * Method setLogged.
+     *
+     * @param user String
+     *
+     * @see fr.xephi.authme.datasource.DataSource#setLogged(String)
+     */
+    @Override
+    public void setLogged(final String user) {
+        exec.execute(new Runnable() {
+            @Override
+            public void run() {
+                source.setLogged(user.toLowerCase());
+            }
+        });
+    }
+
+    /**
+     * Method setUnlogged.
+     *
+     * @param user String
+     *
+     * @see fr.xephi.authme.datasource.DataSource#setUnlogged(String)
+     */
+    @Override
+    public void setUnlogged(final String user) {
+        exec.execute(new Runnable() {
+            @Override
+            public void run() {
+                source.setUnlogged(user.toLowerCase());
+            }
+        });
+    }
+
+    /**
+     * Method purgeLogged.
+     *
+     * @see fr.xephi.authme.datasource.DataSource#purgeLogged()
+     */
+    @Override
+    public void purgeLogged() {
+        exec.execute(new Runnable() {
+            @Override
+            public void run() {
+                source.purgeLogged();
+            }
+        });
+    }
+
+    /**
+     * Method getAccountsRegistered.
+     *
+     * @return int * @see fr.xephi.authme.datasource.DataSource#getAccountsRegistered()
+     */
+    @Override
+    public int getAccountsRegistered() {
+        return cache.size();
+    }
+
+    /**
+     * Method updateName.
+     *
+     * @param oldOne String
+     * @param newOne String
+     *
+     * @see fr.xephi.authme.datasource.DataSource#updateName(String, String)
+     */
+    @Override
+    public void updateName(final String oldOne, final String newOne) {
+        if (cache.containsKey(oldOne)) {
+            cache.put(newOne, cache.get(oldOne));
+            cache.remove(oldOne);
+        }
+        exec.execute(new Runnable() {
+            @Override
+            public void run() {
+                source.updateName(oldOne, newOne);
+            }
+        });
+    }
+
+    /**
+     * Method getAllAuths.
+     *
+     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getAllAuths()
+     */
+    @Override
+    public List<PlayerAuth> getAllAuths() {
+        return new ArrayList<>(cache.values());
+    }
+
+    /**
+     * Method getLoggedPlayers.
+     *
+     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getLoggedPlayers()
+     */
+    @Override
+    public List<PlayerAuth> getLoggedPlayers() {
+        return new ArrayList<>(PlayerCache.getInstance().getCache().values());
+    }
+}

src/main/java/fr/xephi/authme/datasource/DataSource.java

@@ -1,69 +1,223 @@
-package fr.xephi.authme.datasource;
-
-import java.util.List;
-
-import fr.xephi.authme.cache.auth.PlayerAuth;
-
-public interface DataSource {
-
-    enum DataSourceType {
-        MYSQL,
-        FILE,
-        SQLITE
-    }
-
-    boolean isAuthAvailable(String user);
-
-    PlayerAuth getAuth(String user);
-
-    boolean saveAuth(PlayerAuth auth);
-
-    boolean updateSession(PlayerAuth auth);
-
-    boolean updatePassword(PlayerAuth auth);
-
-    int purgeDatabase(long until);
-
-    List<String> autoPurgeDatabase(long until);
-
-    boolean removeAuth(String user);
-
-    boolean updateQuitLoc(PlayerAuth auth);
-
-    int getIps(String ip);
-
-    List<String> getAllAuthsByName(PlayerAuth auth);
-
-    List<String> getAllAuthsByIp(String ip) throws Exception;
-
-    List<String> getAllAuthsByEmail(String email) throws Exception;
-
-    boolean updateEmail(PlayerAuth auth);
-
-    boolean updateSalt(PlayerAuth auth);
-
-    void close();
-
-    void reload();
-
-    void purgeBanned(List<String> banned);
-
-    DataSourceType getType();
-
-    boolean isLogged(String user);
-
-    void setLogged(String user);
-
-    void setUnlogged(String user);
-
-    void purgeLogged();
-
-    int getAccountsRegistered();
-
-    void updateName(String oldone, String newone);
-
-    List<PlayerAuth> getAllAuths();
-
-    List<PlayerAuth> getLoggedPlayers();
-
-}
+package fr.xephi.authme.datasource;
+
+import fr.xephi.authme.cache.auth.PlayerAuth;
+
+import java.util.List;
+
+/**
+ */
+public interface DataSource {
+
+    /**
+     * Method isAuthAvailable.
+     *
+     * @param user String
+     *
+     * @return boolean
+     */
+    boolean isAuthAvailable(String user);
+
+    /**
+     * Method getAuth.
+     *
+     * @param user String
+     *
+     * @return PlayerAuth
+     */
+    PlayerAuth getAuth(String user);
+
+    /**
+     * Method saveAuth.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean
+     */
+    boolean saveAuth(PlayerAuth auth);
+
+    /**
+     * Method updateSession.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean
+     */
+    boolean updateSession(PlayerAuth auth);
+
+    /**
+     * Method updatePassword.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean
+     */
+    boolean updatePassword(PlayerAuth auth);
+
+    /**
+     * Method purgeDatabase.
+     *
+     * @param until long
+     *
+     * @return int
+     */
+    int purgeDatabase(long until);
+
+    /**
+     * Method autoPurgeDatabase.
+     *
+     * @param until long
+     *
+     * @return List<String>
+     */
+    List<String> autoPurgeDatabase(long until);
+
+    /**
+     * Method removeAuth.
+     *
+     * @param user String
+     *
+     * @return boolean
+     */
+    boolean removeAuth(String user);
+
+    /**
+     * Method updateQuitLoc.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean
+     */
+    boolean updateQuitLoc(PlayerAuth auth);
+
+    /**
+     * Method getIps.
+     *
+     * @param ip String
+     *
+     * @return int
+     */
+    int getIps(String ip);
+
+    /**
+     * Method getAllAuthsByName.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return List<String>
+     */
+    List<String> getAllAuthsByName(PlayerAuth auth);
+
+    /**
+     * Method getAllAuthsByIp.
+     *
+     * @param ip String
+     *
+     * @return List<String> * @throws Exception
+     */
+    List<String> getAllAuthsByIp(String ip) throws Exception;
+
+    /**
+     * Method getAllAuthsByEmail.
+     *
+     * @param email String
+     *
+     * @return List<String> * @throws Exception
+     */
+    List<String> getAllAuthsByEmail(String email) throws Exception;
+
+    /**
+     * Method updateEmail.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean
+     */
+    boolean updateEmail(PlayerAuth auth);
+
+    /**
+     * Method updateSalt.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean
+     */
+    boolean updateSalt(PlayerAuth auth);
+
+    void close();
+
+    void reload();
+
+    /**
+     * Method purgeBanned.
+     *
+     * @param banned List<String>
+     */
+    void purgeBanned(List<String> banned);
+
+    /**
+     * Method getType.
+     *
+     * @return DataSourceType
+     */
+    DataSourceType getType();
+
+    /**
+     * Method isLogged.
+     *
+     * @param user String
+     *
+     * @return boolean
+     */
+    boolean isLogged(String user);
+
+    /**
+     * Method setLogged.
+     *
+     * @param user String
+     */
+    void setLogged(String user);
+
+    /**
+     * Method setUnlogged.
+     *
+     * @param user String
+     */
+    void setUnlogged(String user);
+
+    void purgeLogged();
+
+    /**
+     * Method getAccountsRegistered.
+     *
+     * @return int
+     */
+    int getAccountsRegistered();
+
+    /**
+     * Method updateName.
+     *
+     * @param oldOne String
+     * @param newOne String
+     */
+    void updateName(String oldOne, String newOne);
+
+    /**
+     * Method getAllAuths.
+     *
+     * @return List<PlayerAuth>
+     */
+    List<PlayerAuth> getAllAuths();
+
+    /**
+     * Method getLoggedPlayers.
+     *
+     * @return List<PlayerAuth>
+     */
+    List<PlayerAuth> getLoggedPlayers();
+
+    enum DataSourceType {
+        MYSQL,
+        FILE,
+        SQLITE
+    }
+}

src/main/java/fr/xephi/authme/datasource/DatabaseCalls.java

@@ -1,330 +1,513 @@
-package fr.xephi.authme.datasource;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import fr.xephi.authme.cache.auth.PlayerAuth;
-
-public class DatabaseCalls implements DataSource {
-
-    private DataSource database;
-    private final ExecutorService exec;
-
-    public DatabaseCalls(DataSource database) {
-        this.database = database;
-        this.exec = Executors.newCachedThreadPool();
-    }
-
-    @Override
-    public synchronized boolean isAuthAvailable(final String user) {
-        try {
-            return exec.submit(new Callable<Boolean>() {
-                public Boolean call() throws Exception {
-                    return database.isAuthAvailable(user);
-                }
-            }).get();
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    @Override
-    public synchronized PlayerAuth getAuth(final String user) {
-        try {
-            return exec.submit(new Callable<PlayerAuth>() {
-                public PlayerAuth call() throws Exception {
-                    return database.getAuth(user);
-                }
-            }).get();
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    @Override
-    public synchronized boolean saveAuth(final PlayerAuth auth) {
-        try {
-            return exec.submit(new Callable<Boolean>() {
-                public Boolean call() throws Exception {
-                    return database.saveAuth(auth);
-                }
-            }).get();
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    @Override
-    public synchronized boolean updateSession(final PlayerAuth auth) {
-        try {
-            return exec.submit(new Callable<Boolean>() {
-                public Boolean call() throws Exception {
-                    return database.updateSession(auth);
-                }
-            }).get();
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    @Override
-    public synchronized boolean updatePassword(final PlayerAuth auth) {
-        try {
-            return exec.submit(new Callable<Boolean>() {
-                public Boolean call() throws Exception {
-                    return database.updatePassword(auth);
-                }
-            }).get();
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    @Override
-    public synchronized int purgeDatabase(final long until) {
-        try {
-            return exec.submit(new Callable<Integer>() {
-                public Integer call() throws Exception {
-                    return database.purgeDatabase(until);
-                }
-            }).get();
-        } catch (Exception e) {
-            return -1;
-        }
-    }
-
-    @Override
-    public synchronized List<String> autoPurgeDatabase(final long until) {
-        try {
-            return exec.submit(new Callable<List<String>>() {
-                public List<String> call() throws Exception {
-                    return database.autoPurgeDatabase(until);
-                }
-            }).get();
-        } catch (Exception e) {
-            return new ArrayList<>();
-        }
-    }
-
-    @Override
-    public synchronized boolean removeAuth(final String user) {
-        try {
-            return exec.submit(new Callable<Boolean>() {
-                public Boolean call() throws Exception {
-                    return database.removeAuth(user);
-                }
-            }).get();
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    @Override
-    public synchronized boolean updateQuitLoc(final PlayerAuth auth) {
-        try {
-            return exec.submit(new Callable<Boolean>() {
-                public Boolean call() throws Exception {
-                    return database.updateQuitLoc(auth);
-                }
-            }).get();
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    @Override
-    public synchronized int getIps(final String ip) {
-        try {
-            return exec.submit(new Callable<Integer>() {
-
-                public Integer call() throws Exception {
-                    return database.getIps(ip);
-                }
-            }).get();
-        } catch (Exception e) {
-            return -1;
-        }
-    }
-
-    @Override
-    public synchronized List<String> getAllAuthsByName(final PlayerAuth auth) {
-        try {
-            return exec.submit(new Callable<List<String>>() {
-                public List<String> call() throws Exception {
-                    return database.getAllAuthsByName(auth);
-                }
-            }).get();
-        } catch (Exception e) {
-            return new ArrayList<>();
-        }
-    }
-
-    @Override
-    public synchronized List<String> getAllAuthsByIp(final String ip) {
-        try {
-            return exec.submit(new Callable<List<String>>() {
-                public List<String> call() throws Exception {
-                    return database.getAllAuthsByIp(ip);
-                }
-            }).get();
-        } catch (Exception e) {
-            return new ArrayList<>();
-        }
-    }
-
-    @Override
-    public synchronized List<String> getAllAuthsByEmail(final String email) {
-        try {
-            return exec.submit(new Callable<List<String>>() {
-                public List<String> call() throws Exception {
-                    return database.getAllAuthsByEmail(email);
-                }
-            }).get();
-        } catch (Exception e) {
-            return new ArrayList<>();
-        }
-    }
-
-    @Override
-    public synchronized boolean updateEmail(final PlayerAuth auth) {
-        try {
-            return exec.submit(new Callable<Boolean>() {
-                public Boolean call() throws Exception {
-                    return database.updateEmail(auth);
-                }
-            }).get();
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    @Override
-    public synchronized boolean updateSalt(final PlayerAuth auth) {
-        try {
-            return exec.submit(new Callable<Boolean>() {
-                public Boolean call() throws Exception {
-                    return database.updateSalt(auth);
-                }
-            }).get();
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    @Override
-    public synchronized void close() {
-        exec.shutdown();
-        database.close();
-    }
-
-    @Override
-    public synchronized void reload() {
-        database.reload();
-    }
-
-    @Override
-    public synchronized void purgeBanned(final List<String> banned) {
-        new Thread(new Runnable() {
-            public synchronized void run() {
-                database.purgeBanned(banned);
-            }
-        }).start();
-    }
-
-    @Override
-    public synchronized DataSourceType getType() {
-        return database.getType();
-    }
-
-    @Override
-    public synchronized boolean isLogged(final String user) {
-        try {
-            return exec.submit(new Callable<Boolean>() {
-                public Boolean call() throws Exception {
-                    return database.isLogged(user);
-                }
-            }).get();
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    @Override
-    public synchronized void setLogged(final String user) {
-        exec.execute(new Runnable() {
-            public synchronized void run() {
-                database.setLogged(user);
-            }
-        });
-    }
-
-    @Override
-    public synchronized void setUnlogged(final String user) {
-        exec.execute(new Runnable() {
-            public synchronized void run() {
-                database.setUnlogged(user);
-            }
-        });
-    }
-
-    @Override
-    public synchronized void purgeLogged() {
-        exec.execute(new Runnable() {
-            public synchronized void run() {
-                database.purgeLogged();
-            }
-        });
-    }
-
-    @Override
-    public synchronized int getAccountsRegistered() {
-        try {
-            return exec.submit(new Callable<Integer>() {
-                public Integer call() throws Exception {
-                    return database.getAccountsRegistered();
-                }
-            }).get();
-        } catch (Exception e) {
-            return -1;
-        }
-    }
-
-    @Override
-    public synchronized void updateName(final String oldone, final String newone) {
-        exec.execute(new Runnable() {
-            public synchronized void run() {
-                database.updateName(oldone, newone);
-            }
-        });
-    }
-
-    @Override
-    public synchronized List<PlayerAuth> getAllAuths() {
-        try {
-            return exec.submit(new Callable<List<PlayerAuth>>() {
-                public List<PlayerAuth> call() throws Exception {
-                    return database.getAllAuths();
-                }
-            }).get();
-        } catch (Exception e) {
-            return new ArrayList<>();
-        }
-    }
-
-    @Override
-    public List<PlayerAuth> getLoggedPlayers() {
-        try {
-            return exec.submit(new Callable<List<PlayerAuth>>() {
-                public List<PlayerAuth> call() throws Exception {
-                    return database.getLoggedPlayers();
-                }
-            }).get();
-        } catch (Exception e) {
-            return new ArrayList<>();
-        }
-    }
-
-}
+package fr.xephi.authme.datasource;
+
+import fr.xephi.authme.cache.auth.PlayerAuth;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ */
+public class DatabaseCalls implements DataSource {
+
+    private final ExecutorService exec;
+    private final DataSource database;
+
+    /**
+     * Constructor for DatabaseCalls.
+     *
+     * @param database DataSource
+     */
+    public DatabaseCalls(DataSource database) {
+        this.database = database;
+        this.exec = Executors.newCachedThreadPool();
+    }
+
+    /**
+     * Method isAuthAvailable.
+     *
+     * @param user String
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isAuthAvailable(String)
+     */
+    @Override
+    public synchronized boolean isAuthAvailable(final String user) {
+        try {
+            return exec.submit(new Callable<Boolean>() {
+                public Boolean call() throws Exception {
+                    return database.isAuthAvailable(user);
+                }
+            }).get();
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * Method getAuth.
+     *
+     * @param user String
+     *
+     * @return PlayerAuth * @see fr.xephi.authme.datasource.DataSource#getAuth(String)
+     */
+    @Override
+    public synchronized PlayerAuth getAuth(final String user) {
+        try {
+            return exec.submit(new Callable<PlayerAuth>() {
+                public PlayerAuth call() throws Exception {
+                    return database.getAuth(user);
+                }
+            }).get();
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * Method saveAuth.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#saveAuth(PlayerAuth)
+     */
+    @Override
+    public synchronized boolean saveAuth(final PlayerAuth auth) {
+        try {
+            return exec.submit(new Callable<Boolean>() {
+                public Boolean call() throws Exception {
+                    return database.saveAuth(auth);
+                }
+            }).get();
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * Method updateSession.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSession(PlayerAuth)
+     */
+    @Override
+    public synchronized boolean updateSession(final PlayerAuth auth) {
+        try {
+            return exec.submit(new Callable<Boolean>() {
+                public Boolean call() throws Exception {
+                    return database.updateSession(auth);
+                }
+            }).get();
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * Method updatePassword.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updatePassword(PlayerAuth)
+     */
+    @Override
+    public synchronized boolean updatePassword(final PlayerAuth auth) {
+        try {
+            return exec.submit(new Callable<Boolean>() {
+                public Boolean call() throws Exception {
+                    return database.updatePassword(auth);
+                }
+            }).get();
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * Method purgeDatabase.
+     *
+     * @param until long
+     *
+     * @return int * @see fr.xephi.authme.datasource.DataSource#purgeDatabase(long)
+     */
+    @Override
+    public synchronized int purgeDatabase(final long until) {
+        try {
+            return exec.submit(new Callable<Integer>() {
+                public Integer call() throws Exception {
+                    return database.purgeDatabase(until);
+                }
+            }).get();
+        } catch (Exception e) {
+            return -1;
+        }
+    }
+
+    /**
+     * Method autoPurgeDatabase.
+     *
+     * @param until long
+     *
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#autoPurgeDatabase(long)
+     */
+    @Override
+    public synchronized List<String> autoPurgeDatabase(final long until) {
+        try {
+            return exec.submit(new Callable<List<String>>() {
+                public List<String> call() throws Exception {
+                    return database.autoPurgeDatabase(until);
+                }
+            }).get();
+        } catch (Exception e) {
+            return new ArrayList<>();
+        }
+    }
+
+    /**
+     * Method removeAuth.
+     *
+     * @param user String
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#removeAuth(String)
+     */
+    @Override
+    public synchronized boolean removeAuth(final String user) {
+        try {
+            return exec.submit(new Callable<Boolean>() {
+                public Boolean call() throws Exception {
+                    return database.removeAuth(user);
+                }
+            }).get();
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * Method updateQuitLoc.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateQuitLoc(PlayerAuth)
+     */
+    @Override
+    public synchronized boolean updateQuitLoc(final PlayerAuth auth) {
+        try {
+            return exec.submit(new Callable<Boolean>() {
+                public Boolean call() throws Exception {
+                    return database.updateQuitLoc(auth);
+                }
+            }).get();
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * Method getIps.
+     *
+     * @param ip String
+     *
+     * @return int * @see fr.xephi.authme.datasource.DataSource#getIps(String)
+     */
+    @Override
+    public synchronized int getIps(final String ip) {
+        try {
+            return exec.submit(new Callable<Integer>() {
+
+                public Integer call() throws Exception {
+                    return database.getIps(ip);
+                }
+            }).get();
+        } catch (Exception e) {
+            return -1;
+        }
+    }
+
+    /**
+     * Method getAllAuthsByName.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByName(PlayerAuth)
+     */
+    @Override
+    public synchronized List<String> getAllAuthsByName(final PlayerAuth auth) {
+        try {
+            return exec.submit(new Callable<List<String>>() {
+                public List<String> call() throws Exception {
+                    return database.getAllAuthsByName(auth);
+                }
+            }).get();
+        } catch (Exception e) {
+            return new ArrayList<>();
+        }
+    }
+
+    /**
+     * Method getAllAuthsByIp.
+     *
+     * @param ip String
+     *
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByIp(String)
+     */
+    @Override
+    public synchronized List<String> getAllAuthsByIp(final String ip) {
+        try {
+            return exec.submit(new Callable<List<String>>() {
+                public List<String> call() throws Exception {
+                    return database.getAllAuthsByIp(ip);
+                }
+            }).get();
+        } catch (Exception e) {
+            return new ArrayList<>();
+        }
+    }
+
+    /**
+     * Method getAllAuthsByEmail.
+     *
+     * @param email String
+     *
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByEmail(String)
+     */
+    @Override
+    public synchronized List<String> getAllAuthsByEmail(final String email) {
+        try {
+            return exec.submit(new Callable<List<String>>() {
+                public List<String> call() throws Exception {
+                    return database.getAllAuthsByEmail(email);
+                }
+            }).get();
+        } catch (Exception e) {
+            return new ArrayList<>();
+        }
+    }
+
+    /**
+     * Method updateEmail.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateEmail(PlayerAuth)
+     */
+    @Override
+    public synchronized boolean updateEmail(final PlayerAuth auth) {
+        try {
+            return exec.submit(new Callable<Boolean>() {
+                public Boolean call() throws Exception {
+                    return database.updateEmail(auth);
+                }
+            }).get();
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * Method updateSalt.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSalt(PlayerAuth)
+     */
+    @Override
+    public synchronized boolean updateSalt(final PlayerAuth auth) {
+        try {
+            return exec.submit(new Callable<Boolean>() {
+                public Boolean call() throws Exception {
+                    return database.updateSalt(auth);
+                }
+            }).get();
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * Method close.
+     *
+     * @see fr.xephi.authme.datasource.DataSource#close()
+     */
+    @Override
+    public synchronized void close() {
+        exec.shutdown();
+        database.close();
+    }
+
+    /**
+     * Method reload.
+     *
+     * @see fr.xephi.authme.datasource.DataSource#reload()
+     */
+    @Override
+    public synchronized void reload() {
+        database.reload();
+    }
+
+    /**
+     * Method purgeBanned.
+     *
+     * @param banned List<String>
+     *
+     * @see fr.xephi.authme.datasource.DataSource#purgeBanned(List<String>)
+     */
+    @Override
+    public synchronized void purgeBanned(final List<String> banned) {
+        new Thread(new Runnable() {
+            public synchronized void run() {
+                database.purgeBanned(banned);
+            }
+        }).start();
+    }
+
+    /**
+     * Method getType.
+     *
+     * @return DataSourceType * @see fr.xephi.authme.datasource.DataSource#getType()
+     */
+    @Override
+    public synchronized DataSourceType getType() {
+        return database.getType();
+    }
+
+    /**
+     * Method isLogged.
+     *
+     * @param user String
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isLogged(String)
+     */
+    @Override
+    public synchronized boolean isLogged(final String user) {
+        try {
+            return exec.submit(new Callable<Boolean>() {
+                public Boolean call() throws Exception {
+                    return database.isLogged(user);
+                }
+            }).get();
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * Method setLogged.
+     *
+     * @param user String
+     *
+     * @see fr.xephi.authme.datasource.DataSource#setLogged(String)
+     */
+    @Override
+    public synchronized void setLogged(final String user) {
+        exec.execute(new Runnable() {
+            public synchronized void run() {
+                database.setLogged(user);
+            }
+        });
+    }
+
+    /**
+     * Method setUnlogged.
+     *
+     * @param user String
+     *
+     * @see fr.xephi.authme.datasource.DataSource#setUnlogged(String)
+     */
+    @Override
+    public synchronized void setUnlogged(final String user) {
+        exec.execute(new Runnable() {
+            public synchronized void run() {
+                database.setUnlogged(user);
+            }
+        });
+    }
+
+    /**
+     * Method purgeLogged.
+     *
+     * @see fr.xephi.authme.datasource.DataSource#purgeLogged()
+     */
+    @Override
+    public synchronized void purgeLogged() {
+        exec.execute(new Runnable() {
+            public synchronized void run() {
+                database.purgeLogged();
+            }
+        });
+    }
+
+    /**
+     * Method getAccountsRegistered.
+     *
+     * @return int * @see fr.xephi.authme.datasource.DataSource#getAccountsRegistered()
+     */
+    @Override
+    public synchronized int getAccountsRegistered() {
+        try {
+            return exec.submit(new Callable<Integer>() {
+                public Integer call() throws Exception {
+                    return database.getAccountsRegistered();
+                }
+            }).get();
+        } catch (Exception e) {
+            return -1;
+        }
+    }
+
+    /**
+     * Method updateName.
+     *
+     * @param oldOne String
+     * @param newOne String
+     *
+     * @see fr.xephi.authme.datasource.DataSource#updateName(String, String)
+     */
+    @Override
+    public synchronized void updateName(final String oldOne, final String newOne) {
+        exec.execute(new Runnable() {
+            public synchronized void run() {
+                database.updateName(oldOne, newOne);
+            }
+        });
+    }
+
+    /**
+     * Method getAllAuths.
+     *
+     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getAllAuths()
+     */
+    @Override
+    public synchronized List<PlayerAuth> getAllAuths() {
+        try {
+            return exec.submit(new Callable<List<PlayerAuth>>() {
+                public List<PlayerAuth> call() throws Exception {
+                    return database.getAllAuths();
+                }
+            }).get();
+        } catch (Exception e) {
+            return new ArrayList<>();
+        }
+    }
+
+    /**
+     * Method getLoggedPlayers.
+     *
+     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getLoggedPlayers()
+     */
+    @Override
+    public List<PlayerAuth> getLoggedPlayers() {
+        try {
+            return exec.submit(new Callable<List<PlayerAuth>>() {
+                public List<PlayerAuth> call() throws Exception {
+                    return database.getLoggedPlayers();
+                }
+            }).get();
+        } catch (Exception e) {
+            return new ArrayList<>();
+        }
+    }
+
+}

src/main/java/fr/xephi/authme/datasource/FlatFile.java

@@ -1,21 +1,17 @@
 package fr.xephi.authme.datasource;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
 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.Settings;
 
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ */
 public class FlatFile implements DataSource {
 
     /*
@@ -29,7 +25,7 @@ public class FlatFile implements DataSource {
      * :LASTPOSZ:LASTPOSWORLD PLAYERNAME:HASHSUM:IP:LOGININMILLIESECONDS
      * PLAYERNAME:HASHSUM:IP PLAYERNAME:HASHSUM
      */
-    private File source;
+    private final File source;
 
     public FlatFile() {
         source = Settings.AUTH_FILE;
@@ -48,6 +44,13 @@ public class FlatFile implements DataSource {
         }
     }
 
+    /**
+     * Method isAuthAvailable.
+     *
+     * @param user String
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isAuthAvailable(String)
+     */
     @Override
     public synchronized boolean isAuthAvailable(String user) {
         BufferedReader br = null;
@@ -70,13 +73,20 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
         return false;
     }
 
+    /**
+     * Method saveAuth.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#saveAuth(PlayerAuth)
+     */
     @Override
     public synchronized boolean saveAuth(PlayerAuth auth) {
         if (isAuthAvailable(auth.getNickname())) {
@@ -93,13 +103,20 @@ public class FlatFile implements DataSource {
             if (bw != null) {
                 try {
                     bw.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
         return true;
     }
 
+    /**
+     * Method updatePassword.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updatePassword(PlayerAuth)
+     */
     @Override
     public synchronized boolean updatePassword(PlayerAuth auth) {
         if (!isAuthAvailable(auth.getNickname())) {
@@ -148,7 +165,7 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -159,6 +176,13 @@ public class FlatFile implements DataSource {
         return true;
     }
 
+    /**
+     * Method updateSession.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSession(PlayerAuth)
+     */
     @Override
     public boolean updateSession(PlayerAuth auth) {
         if (!isAuthAvailable(auth.getNickname())) {
@@ -207,7 +231,7 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -218,6 +242,13 @@ public class FlatFile implements DataSource {
         return true;
     }
 
+    /**
+     * Method updateQuitLoc.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateQuitLoc(PlayerAuth)
+     */
     @Override
     public boolean updateQuitLoc(PlayerAuth auth) {
         if (!isAuthAvailable(auth.getNickname())) {
@@ -245,7 +276,7 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -256,6 +287,13 @@ public class FlatFile implements DataSource {
         return true;
     }
 
+    /**
+     * Method getIps.
+     *
+     * @param ip String
+     *
+     * @return int * @see fr.xephi.authme.datasource.DataSource#getIps(String)
+     */
     @Override
     public int getIps(String ip) {
         BufferedReader br = null;
@@ -280,12 +318,19 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
     }
 
+    /**
+     * Method purgeDatabase.
+     *
+     * @param until long
+     *
+     * @return int * @see fr.xephi.authme.datasource.DataSource#purgeDatabase(long)
+     */
     @Override
     public int purgeDatabase(long until) {
         BufferedReader br = null;
@@ -319,19 +364,26 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
             if (bw != null) {
                 try {
                     bw.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
         return cleared;
     }
 
+    /**
+     * Method autoPurgeDatabase.
+     *
+     * @param until long
+     *
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#autoPurgeDatabase(long)
+     */
     @Override
     public List<String> autoPurgeDatabase(long until) {
         BufferedReader br = null;
@@ -365,19 +417,26 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
             if (bw != null) {
                 try {
                     bw.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
         return cleared;
     }
 
+    /**
+     * Method removeAuth.
+     *
+     * @param user String
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#removeAuth(String)
+     */
     @Override
     public synchronized boolean removeAuth(String user) {
         if (!isAuthAvailable(user)) {
@@ -409,19 +468,26 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
             if (bw != null) {
                 try {
                     bw.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
         return true;
     }
 
+    /**
+     * Method getAuth.
+     *
+     * @param user String
+     *
+     * @return PlayerAuth * @see fr.xephi.authme.datasource.DataSource#getAuth(String)
+     */
     @Override
     public synchronized PlayerAuth getAuth(String user) {
         BufferedReader br = null;
@@ -457,21 +523,38 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
         return null;
     }
 
+    /**
+     * Method close.
+     *
+     * @see fr.xephi.authme.datasource.DataSource#close()
+     */
     @Override
     public synchronized void close() {
     }
 
+    /**
+     * Method reload.
+     *
+     * @see fr.xephi.authme.datasource.DataSource#reload()
+     */
     @Override
     public void reload() {
     }
 
+    /**
+     * Method updateEmail.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateEmail(PlayerAuth)
+     */
     @Override
     public boolean updateEmail(PlayerAuth auth) {
         if (!isAuthAvailable(auth.getNickname())) {
@@ -499,7 +582,7 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -510,11 +593,25 @@ public class FlatFile implements DataSource {
         return true;
     }
 
+    /**
+     * Method updateSalt.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSalt(PlayerAuth)
+     */
     @Override
     public boolean updateSalt(PlayerAuth auth) {
         return false;
     }
 
+    /**
+     * Method getAllAuthsByName.
+     *
+     * @param auth PlayerAuth
+     *
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByName(PlayerAuth)
+     */
     @Override
     public List<String> getAllAuthsByName(PlayerAuth auth) {
         BufferedReader br = null;
@@ -539,12 +636,19 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
     }
 
+    /**
+     * Method getAllAuthsByIp.
+     *
+     * @param ip String
+     *
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByIp(String)
+     */
     @Override
     public List<String> getAllAuthsByIp(String ip) {
         BufferedReader br = null;
@@ -569,12 +673,19 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
     }
 
+    /**
+     * Method getAllAuthsByEmail.
+     *
+     * @param email String
+     *
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByEmail(String)
+     */
     @Override
     public List<String> getAllAuthsByEmail(String email) {
         BufferedReader br = null;
@@ -599,12 +710,19 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
     }
 
+    /**
+     * Method purgeBanned.
+     *
+     * @param banned List<String>
+     *
+     * @see fr.xephi.authme.datasource.DataSource#purgeBanned(List<String>)
+     */
     @Override
     public void purgeBanned(List<String> banned) {
         BufferedReader br = null;
@@ -619,58 +737,91 @@ public class FlatFile implements DataSource {
                     if (banned.contains(args[0])) {
                         lines.add(line);
                     }
-                } catch (NullPointerException | ArrayIndexOutOfBoundsException exc) {
+                } catch (NullPointerException | ArrayIndexOutOfBoundsException ignored) {
                 }
             }
             bw = new BufferedWriter(new FileWriter(source));
             for (String l : lines) {
                 bw.write(l + "\n");
             }
-        } catch (FileNotFoundException ex) {
-            ConsoleLogger.showError(ex.getMessage());
-            return;
+
         } catch (IOException ex) {
             ConsoleLogger.showError(ex.getMessage());
-            return;
+
         } finally {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
             if (bw != null) {
                 try {
                     bw.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
-        return;
     }
 
+    /**
+     * Method getType.
+     *
+     * @return DataSourceType * @see fr.xephi.authme.datasource.DataSource#getType()
+     */
     @Override
     public DataSourceType getType() {
         return DataSourceType.FILE;
     }
 
+    /**
+     * Method isLogged.
+     *
+     * @param user String
+     *
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isLogged(String)
+     */
     @Override
     public boolean isLogged(String user) {
         return PlayerCache.getInstance().isAuthenticated(user);
     }
 
+    /**
+     * Method setLogged.
+     *
+     * @param user String
+     *
+     * @see fr.xephi.authme.datasource.DataSource#setLogged(String)
+     */
     @Override
     public void setLogged(String user) {
     }
 
+    /**
+     * Method setUnlogged.
+     *
+     * @param user String
+     *
+     * @see fr.xephi.authme.datasource.DataSource#setUnlogged(String)
+     */
     @Override
     public void setUnlogged(String user) {
     }
 
+    /**
+     * Method purgeLogged.
+     *
+     * @see fr.xephi.authme.datasource.DataSource#purgeLogged()
+     */
     @Override
     public void purgeLogged() {
     }
 
+    /**
+     * Method getAccountsRegistered.
+     *
+     * @return int * @see fr.xephi.authme.datasource.DataSource#getAccountsRegistered()
+     */
     @Override
     public int getAccountsRegistered() {
         BufferedReader br = null;
@@ -687,21 +838,34 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
         return result;
     }
 
+    /**
+     * Method updateName.
+     *
+     * @param oldOne String
+     * @param newOne String
+     *
+     * @see fr.xephi.authme.datasource.DataSource#updateName(String, String)
+     */
     @Override
-    public void updateName(String oldone, String newone) {
-        PlayerAuth auth = this.getAuth(oldone);
-        auth.setName(newone);
+    public void updateName(String oldOne, String newOne) {
+        PlayerAuth auth = this.getAuth(oldOne);
+        auth.setName(newOne);
         this.saveAuth(auth);
-        this.removeAuth(oldone);
+        this.removeAuth(oldOne);
     }
 
+    /**
+     * Method getAllAuths.
+     *
+     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getAllAuths()
+     */
     @Override
     public List<PlayerAuth> getAllAuths() {
         BufferedReader br = null;
@@ -742,13 +906,18 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
         return auths;
     }
 
+    /**
+     * Method getLoggedPlayers.
+     *
+     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getLoggedPlayers()
+     */
     @Override
     public List<PlayerAuth> getLoggedPlayers() {
         return new ArrayList<>();

src/main/java/fr/xephi/authme/events/AuthMeAsyncPreLoginEvent.java

@@ -5,34 +5,59 @@ import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 /**
- *
  * This event is call when a player try to /login
  *
  * @author Xephi59
+ * @version $Revision: 1.0 $
  */
 public class AuthMeAsyncPreLoginEvent extends Event {
 
-    private Player player;
-    private boolean canLogin = true;
     private static final HandlerList handlers = new HandlerList();
+    private final Player player;
+    private boolean canLogin = true;
 
+    /**
+     * Constructor for AuthMeAsyncPreLoginEvent.
+     *
+     * @param player Player
+     */
     public AuthMeAsyncPreLoginEvent(Player player) {
         super(true);
         this.player = player;
     }
 
+    /**
+     * Method getPlayer.
+     *
+     * @return Player
+     */
     public Player getPlayer() {
         return player;
     }
 
+    /**
+     * Method canLogin.
+     *
+     * @return boolean
+     */
     public boolean canLogin() {
         return canLogin;
     }
 
+    /**
+     * Method setCanLogin.
+     *
+     * @param canLogin boolean
+     */
     public void setCanLogin(boolean canLogin) {
         this.canLogin = canLogin;
     }
 
+    /**
+     * Method getHandlers.
+     *
+     * @return HandlerList
+     */
     @Override
     public HandlerList getHandlers() {
         return handlers;

src/main/java/fr/xephi/authme/events/AuthMeTeleportEvent.java

@@ -4,35 +4,61 @@ import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
 /**
- *
  * This event is call when AuthMe try to teleport a player
  *
  * @author Xephi59
+ * @version $Revision: 1.0 $
  */
 public class AuthMeTeleportEvent extends CustomEvent {
 
-    private Player player;
+    private final Player player;
     private Location to;
-    private Location from;
+    private final Location from;
 
+    /**
+     * Constructor for AuthMeTeleportEvent.
+     *
+     * @param player Player
+     * @param to     Location
+     */
     public AuthMeTeleportEvent(Player player, Location to) {
         this.player = player;
         this.from = player.getLocation();
         this.to = to;
     }
 
+    /**
+     * Method getPlayer.
+     *
+     * @return Player
+     */
     public Player getPlayer() {
         return player;
     }
 
-    public void setTo(Location to) {
-        this.to = to;
-    }
-
+    /**
+     * Method getTo.
+     *
+     * @return Location
+     */
     public Location getTo() {
         return to;
     }
 
+    /**
+     * Method setTo.
+     *
+     * @param to Location
+     */
+    public void setTo(Location to) {
+        this.to = to;
+    }
+
+    /**
+     * Method getFrom.
+     *
+     * @return Location
+     */
     public Location getFrom() {
         return from;
     }

src/main/java/fr/xephi/authme/events/CustomEvent.java

@@ -5,34 +5,61 @@ import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 /**
- *
  * @author Xephi59
+ * @version $Revision: 1.0 $
  */
 public class CustomEvent extends Event implements Cancellable {
 
-    private boolean isCancelled;
     private static final HandlerList handlers = new HandlerList();
+    private boolean isCancelled;
 
     public CustomEvent() {
         super(false);
     }
 
+    /**
+     * Constructor for CustomEvent.
+     *
+     * @param b boolean
+     */
     public CustomEvent(boolean b) {
         super(b);
     }
 
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
+    /**
+     * Method getHandlerList.
+     *
+     * @return HandlerList
+     */
     public static HandlerList getHandlerList() {
         return handlers;
     }
 
+    /**
+     * Method getHandlers.
+     *
+     * @return HandlerList
+     */
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    /**
+     * Method isCancelled.
+     *
+     * @return boolean * @see org.bukkit.event.Cancellable#isCancelled()
+     */
     public boolean isCancelled() {
         return this.isCancelled;
     }
 
+    /**
+     * Method setCancelled.
+     *
+     * @param cancelled boolean
+     *
+     * @see org.bukkit.event.Cancellable#setCancelled(boolean)
+     */
     public void setCancelled(boolean cancelled) {
         this.isCancelled = cancelled;
     }

src/main/java/fr/xephi/authme/events/FirstSpawnTeleportEvent.java

@@ -4,17 +4,24 @@ import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
 /**
- * 
  * Called if a player is teleported to the authme first spawn
  *
  * @author Xephi59
+ * @version $Revision: 1.0 $
  */
 public class FirstSpawnTeleportEvent extends CustomEvent {
 
-    private Player player;
+    private final Player player;
     private Location to;
-    private Location from;
+    private final Location from;
 
+    /**
+     * Constructor for FirstSpawnTeleportEvent.
+     *
+     * @param player Player
+     * @param from   Location
+     * @param to     Location
+     */
     public FirstSpawnTeleportEvent(Player player, Location from, Location to) {
         super(true);
         this.player = player;
@@ -22,18 +29,38 @@ public class FirstSpawnTeleportEvent extends CustomEvent {
         this.to = to;
     }
 
+    /**
+     * Method getPlayer.
+     *
+     * @return Player
+     */
     public Player getPlayer() {
         return player;
     }
 
-    public void setTo(Location to) {
-        this.to = to;
-    }
-
+    /**
+     * Method getTo.
+     *
+     * @return Location
+     */
     public Location getTo() {
         return to;
     }
 
+    /**
+     * Method setTo.
+     *
+     * @param to Location
+     */
+    public void setTo(Location to) {
+        this.to = to;
+    }
+
+    /**
+     * Method getFrom.
+     *
+     * @return Location
+     */
     public Location getFrom() {
         return from;
     }

src/main/java/fr/xephi/authme/events/LoginEvent.java

@@ -5,47 +5,83 @@ import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 /**
- *
  * This event is called when a player login or register through AuthMe. The
  * boolean 'isLogin' will be false if, and only if, login/register failed.
  *
  * @author Xephi59
+ * @version $Revision: 1.0 $
  */
 public class LoginEvent extends Event {
 
+    private static final HandlerList handlers = new HandlerList();
     private Player player;
     private boolean isLogin;
-    private static final HandlerList handlers = new HandlerList();
 
+    /**
+     * Constructor for LoginEvent.
+     *
+     * @param player  Player
+     * @param isLogin boolean
+     */
     public LoginEvent(Player player, boolean isLogin) {
         this.player = player;
         this.isLogin = isLogin;
     }
 
+    /**
+     * Method getHandlerList.
+     *
+     * @return HandlerList
+     */
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    /**
+     * Method getPlayer.
+     *
+     * @return Player
+     */
     public Player getPlayer() {
         return this.player;
     }
 
+    /**
+     * Method setPlayer.
+     *
+     * @param player Player
+     */
     public void setPlayer(Player player) {
         this.player = player;
     }
 
+    /**
+     * Method isLogin.
+     *
+     * @return boolean
+     */
+    public boolean isLogin() {
+        return isLogin;
+    }
+
+    /**
+     * Method setLogin.
+     *
+     * @param isLogin boolean
+     */
     @Deprecated
     public void setLogin(boolean isLogin) {
         this.isLogin = isLogin;
     }
 
-    public boolean isLogin() {
-        return isLogin;
-    }
-
+    /**
+     * Method getHandlers.
+     *
+     * @return HandlerList
+     */
     @Override
     public HandlerList getHandlers() {
         return handlers;
     }
 
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
 }

src/main/java/fr/xephi/authme/events/LogoutEvent.java

@@ -5,35 +5,60 @@ import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 /**
- *
  * This event is called when a player logout through AuthMe.
  *
  * @author Xephi59
+ * @version $Revision: 1.0 $
  */
 public class LogoutEvent extends Event {
 
-    private Player player;
     private static final HandlerList handlers = new HandlerList();
+    private Player player;
 
+    /**
+     * Constructor for LogoutEvent.
+     *
+     * @param player Player
+     */
     public LogoutEvent(Player player) {
         this.player = player;
     }
 
+    /**
+     * Method getHandlerList.
+     *
+     * @return HandlerList
+     */
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    /**
+     * Method getPlayer.
+     *
+     * @return Player
+     */
     public Player getPlayer() {
         return this.player;
     }
 
+    /**
+     * Method setPlayer.
+     *
+     * @param player Player
+     */
     public void setPlayer(Player player) {
         this.player = player;
     }
 
+    /**
+     * Method getHandlers.
+     *
+     * @return HandlerList
+     */
     @Override
     public HandlerList getHandlers() {
         return handlers;
     }
 
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
 }

src/main/java/fr/xephi/authme/events/PasswordEncryptionEvent.java

@@ -1,19 +1,18 @@
 package fr.xephi.authme.events;
 
+import fr.xephi.authme.security.crypts.EncryptionMethod;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import fr.xephi.authme.security.crypts.EncryptionMethod;
-
 /**
  * <p>
  * This event is called when we need to compare or get an hash password, for set
  * a custom EncryptionMethod
  * </p>
  *
- * @see fr.xephi.authme.security.crypts.EncryptionMethod
- *
  * @author Xephi59
+ * @version $Revision: 1.0 $
+ * @see fr.xephi.authme.security.crypts.EncryptionMethod
  */
 public class PasswordEncryptionEvent extends Event {
 
@@ -21,31 +20,62 @@ public class PasswordEncryptionEvent extends Event {
     private EncryptionMethod method = null;
     private String playerName = "";
 
+    /**
+     * Constructor for PasswordEncryptionEvent.
+     *
+     * @param method     EncryptionMethod
+     * @param playerName String
+     */
     public PasswordEncryptionEvent(EncryptionMethod method, String playerName) {
         super(false);
         this.method = method;
         this.playerName = playerName;
     }
 
+    /**
+     * Method getHandlerList.
+     *
+     * @return HandlerList
+     */
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    /**
+     * Method getHandlers.
+     *
+     * @return HandlerList
+     */
     @Override
     public HandlerList getHandlers() {
         return handlers;
     }
 
-    public void setMethod(EncryptionMethod method) {
-        this.method = method;
-    }
-
+    /**
+     * Method getMethod.
+     *
+     * @return EncryptionMethod
+     */
     public EncryptionMethod getMethod() {
         return method;
     }
 
+    /**
+     * Method setMethod.
+     *
+     * @param method EncryptionMethod
+     */
+    public void setMethod(EncryptionMethod method) {
+        this.method = method;
+    }
+
+    /**
+     * Method getPlayerName.
+     *
+     * @return String
+     */
     public String getPlayerName() {
         return playerName;
     }
 
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
 }

src/main/java/fr/xephi/authme/events/ProtectInventoryEvent.java

@@ -4,20 +4,25 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 /**
- *
  * This event is call just after store inventory into cache and will empty the
  * player inventory.
  *
  * @author Xephi59
+ * @version $Revision: 1.0 $
  */
 public class ProtectInventoryEvent extends CustomEvent {
 
-    private ItemStack[] storedinventory;
-    private ItemStack[] storedarmor;
+    private final ItemStack[] storedinventory;
+    private final ItemStack[] storedarmor;
     private ItemStack[] emptyInventory = null;
     private ItemStack[] emptyArmor = null;
-    private Player player;
+    private final Player player;
 
+    /**
+     * Constructor for ProtectInventoryEvent.
+     *
+     * @param player Player
+     */
     public ProtectInventoryEvent(Player player) {
         super(true);
         this.player = player;
@@ -27,30 +32,65 @@ public class ProtectInventoryEvent extends CustomEvent {
         this.emptyArmor = new ItemStack[4];
     }
 
+    /**
+     * Method getStoredInventory.
+     *
+     * @return ItemStack[]
+     */
     public ItemStack[] getStoredInventory() {
         return this.storedinventory;
     }
 
+    /**
+     * Method getStoredArmor.
+     *
+     * @return ItemStack[]
+     */
     public ItemStack[] getStoredArmor() {
         return this.storedarmor;
     }
 
+    /**
+     * Method getPlayer.
+     *
+     * @return Player
+     */
     public Player getPlayer() {
         return this.player;
     }
 
+    /**
+     * Method setNewInventory.
+     *
+     * @param emptyInventory ItemStack[]
+     */
     public void setNewInventory(ItemStack[] emptyInventory) {
         this.emptyInventory = emptyInventory;
     }
 
+    /**
+     * Method getEmptyInventory.
+     *
+     * @return ItemStack[]
+     */
     public ItemStack[] getEmptyInventory() {
         return this.emptyInventory;
     }
 
+    /**
+     * Method setNewArmor.
+     *
+     * @param emptyArmor ItemStack[]
+     */
     public void setNewArmor(ItemStack[] emptyArmor) {
         this.emptyArmor = emptyArmor;
     }
 
+    /**
+     * Method getEmptyArmor.
+     *
+     * @return ItemStack[]
+     */
     public ItemStack[] getEmptyArmor() {
         return this.emptyArmor;
     }

src/main/java/fr/xephi/authme/events/RegisterTeleportEvent.java

@@ -4,36 +4,62 @@ import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
 /**
- * 
  * This event is call if, and only if, a player is teleported just after a
  * register.
  *
  * @author Xephi59
+ * @version $Revision: 1.0 $
  */
 public class RegisterTeleportEvent extends CustomEvent {
 
-    private Player player;
+    private final Player player;
     private Location to;
-    private Location from;
+    private final Location from;
 
+    /**
+     * Constructor for RegisterTeleportEvent.
+     *
+     * @param player Player
+     * @param to     Location
+     */
     public RegisterTeleportEvent(Player player, Location to) {
         this.player = player;
         this.from = player.getLocation();
         this.to = to;
     }
 
+    /**
+     * Method getPlayer.
+     *
+     * @return Player
+     */
     public Player getPlayer() {
         return player;
     }
 
-    public void setTo(Location to) {
-        this.to = to;
-    }
-
+    /**
+     * Method getTo.
+     *
+     * @return Location
+     */
     public Location getTo() {
         return to;
     }
 
+    /**
+     * Method setTo.
+     *
+     * @param to Location
+     */
+    public void setTo(Location to) {
+        this.to = to;
+    }
+
+    /**
+     * Method getFrom.
+     *
+     * @return Location
+     */
     public Location getFrom() {
         return from;
     }