Merge origin/enum into local branch

.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 files ###
-
-### Java ###
 *.class
 
-# Mobile Tools for Java (J2ME)
+# Package Files
-.mtj.tmp/
-
-# 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:
+# Ignore IDEA directory
-.idea/
+.idea/*
-# if you remove the above rule, at least ignore the following:
 
-# User-specific stuff:
+# Include the project's code style settings file
-# .idea/workspace.xml
+!.idea/codeStyleSettings.xml
-# .idea/tasks.xml
-# .idea/dictionaries
 
-# Sensitive or high-churn files:
+# Include the project's dictionary
-# .idea/dataSources.ids
+!.idea/dictionaries/
-# .idea/dataSources.xml
+!.idea/dictionaries/*
-# .idea/sqlDataSources.xml
-# .idea/dynamic.xml
-# .idea/uiDesigner.xml
 
-# Gradle:
+# File-based project format:
-# .idea/gradle.xml
-# .idea/libraries
-
-# Mongo Explorer plugin:
-# .idea/mongoSettings.xml
-
-## 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,17 @@
+<?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" />
+  </component>
+</project>

.idea/dictionaries/Tim.xml

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

pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -42,11 +42,17 @@
         </license>
     </licenses>
 
+    <prerequisites>
+        <maven>3.3.3</maven>
+    </prerequisites>
+
     <properties>
-        <!-- Project Properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <!-- Project Properties -->
+        <pluginName>AuthMe</pluginName>
         <mainClass>fr.xephi.authme.AuthMe</mainClass>
-		<buildNumber>CustomBuild</buildNumber>
+        <buildNumber>100</buildNumber>
         <pluginAuthors>[Xephi, sgdc3, DNx5, timvisee, games647, ljacqu]</pluginAuthors>
 
         <!-- Change Compiler Version (JDK) HERE! -->
@@ -90,6 +96,11 @@
 				</includes>
 			</resource>
 		</resources>
+		<testResources>
+			<testResource>
+				<directory>src/test/resources</directory>
+			</testResource>
+		</testResources>
 
 		<plugins>
 			<plugin>
@@ -238,21 +249,7 @@
             <optional>true</optional>
         </dependency>
 
-		<!-- Java Email Implementation -->
+        <!-- Java Email Library -->
-		<dependency>
-			<groupId>com.sun.mail</groupId>
-			<artifactId>mailapi</artifactId>
-			<version>1.5.4</version>
-			<scope>compile</scope>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.mail</groupId>
-			<artifactId>smtp</artifactId>
-			<version>1.5.4</version>
-			<scope>compile</scope>
-			<optional>true</optional>
-		</dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-email</artifactId>
@@ -442,7 +439,7 @@
                     <groupId>com.fernferret.allpay</groupId>
                 </exclusion>
                 <exclusion>
-					<artifactId>Vault</artifactId>
+                    <artifactId>VaultAPI</artifactId>
                     <groupId>net.milkbowl.vault</groupId>
                 </exclusion>
                 <exclusion>

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

@@ -0,0 +1,98 @@
+package fr.xephi.authme;
+
+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 AuthMe plugin = AuthMe.getInstance();
+    private static final Messages messages = plugin.getMessages();
+    private static Wrapper wrapper = new Wrapper(plugin);
+    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, "authme.bypassantibot")) {
+            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,6 +4,7 @@ import java.util.logging.Filter;
 import java.util.logging.LogRecord;
 
 /**
+ * Console filter Class
  *
  * @author Xephi59
  * @version $Revision: 1.0 $
@@ -15,10 +16,11 @@ public class ConsoleFilter implements Filter {
 
     /**
      * Method isLoggable.
+     *
      * @param record LogRecord
-    
+     *
-    
+     * @return boolean * @see java.util.logging.Filter#isLoggable(LogRecord)
-     * @return boolean * @see java.util.logging.Filter#isLoggable(LogRecord) */
+     */
     @Override
     public boolean isLoggable(LogRecord record) {
         try {
@@ -29,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];
+            String playerName = record.getMessage().split(" ")[0];
-            record.setMessage(playername + " issued an AuthMe command!");
+            record.setMessage(playerName + " issued an AuthMe command!");
             return true;
         } catch (NullPointerException npe) {
             return true;

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

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

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

@@ -1,5 +1,12 @@
 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;
@@ -7,36 +14,28 @@ 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 final AuthMe plugin;
 
     /**
      * Constructor for DataManager.
+     *
      * @param plugin AuthMe
      */
     public DataManager(AuthMe plugin) {
         this.plugin = plugin;
     }
 
-    public void run() {
-    }
-
     /**
      * Method getOfflinePlayer.
+     *
      * @param name String
-    
+     *
-     * @return OfflinePlayer */
+     * @return OfflinePlayer
+     */
     public synchronized OfflinePlayer getOfflinePlayer(final String name) {
         ExecutorService executor = Executors.newSingleThreadExecutor();
         Future<OfflinePlayer> result = executor.submit(new Callable<OfflinePlayer>() {
@@ -49,7 +48,7 @@ public class DataManager {
                             result = op;
                             break;
                         }
-                } catch (Exception e) {
+                } catch (Exception ignored) {
                 }
                 return result;
             }
@@ -65,6 +64,7 @@ public class DataManager {
 
     /**
      * Method purgeAntiXray.
+     *
      * @param cleared List<String>
      */
     public synchronized void purgeAntiXray(List<String> cleared) {
@@ -77,10 +77,11 @@ public class DataManager {
                 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 e) {
+            } catch (Exception ignored) {
             }
         }
         ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " AntiXRayData Files");
@@ -88,6 +89,7 @@ public class DataManager {
 
     /**
      * Method purgeLimitedCreative.
+     *
      * @param cleared List<String>
      */
     public synchronized void purgeLimitedCreative(List<String> cleared) {
@@ -100,20 +102,23 @@ public class DataManager {
                 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 e) {
+            } catch (Exception ignored) {
             }
         }
         ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " LimitedCreative Survival, Creative and Adventure files");
@@ -121,6 +126,7 @@ public class DataManager {
 
     /**
      * Method purgeDat.
+     *
      * @param cleared List<String>
      */
     public synchronized void purgeDat(List<String> cleared) {
@@ -134,11 +140,13 @@ public class DataManager {
 
                 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) {
+                } 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++;
                     }
@@ -151,6 +159,7 @@ public class DataManager {
 
     /**
      * Method purgeEssentials.
+     *
      * @param cleared List<String>
      */
     @SuppressWarnings("deprecation")
@@ -159,11 +168,13 @@ public class DataManager {
         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++;
                 }
@@ -172,13 +183,29 @@ public class DataManager {
         ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " EssentialsFiles");
     }
 
+    // TODO: What is this method for? Is it correct?
+
     /**
-     * Method purgePermissions.
+     * @param cleared Cleared players.
-     * @param cleared List<String>
-     * @param permission Permission
      */
-    public synchronized void purgePermissions(List<String> cleared, Permission permission) {
+    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);
@@ -189,15 +216,17 @@ public class DataManager {
             } catch (Exception e) {
             }
         }
-        ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " Permissions");
+        ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " Permissions");*/
     }
 
     /**
      * Method isOnline.
+     *
      * @param player Player
      * @param name   String
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     public boolean isOnline(Player player, final String name) {
         if (player.isOnline())
             return true;
@@ -224,9 +253,11 @@ public class DataManager {
 
     /**
      * Method getOnlinePlayerLower.
+     *
      * @param name String
-    
+     *
-     * @return Player */
+     * @return Player
+     */
     public Player getOnlinePlayerLower(String name) {
         name = name.toLowerCase();
         for (Player player : Utils.getOnlinePlayers()) {

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

@@ -1,18 +1,17 @@
 package fr.xephi.authme;
 
-import java.awt.Color;
+import java.awt.*;
-import java.awt.Font;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 
 /**
  */
 public class ImageGenerator {
 
-    private String pass;
+    private final String pass;
+
     /**
      * Constructor for ImageGenerator.
+     *
      * @param pass String
      */
     public ImageGenerator(String pass) {
@@ -21,8 +20,9 @@ public class ImageGenerator {
 
     /**
      * Method generateImage.
-    
+     *
-     * @return BufferedImage */
+     * @return BufferedImage
+     */
     public BufferedImage generateImage() {
         BufferedImage image = new BufferedImage(200, 60, BufferedImage.TYPE_BYTE_INDEXED);
         Graphics2D graphics = image.createGraphics();

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

@@ -1,29 +1,70 @@
 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;
 import org.apache.logging.log4j.core.Logger;
 import org.apache.logging.log4j.message.Message;
 
-import fr.xephi.authme.util.StringUtils;
-
 /**
  * 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 ",
+     * 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 " };
+        "/register "};
 
-    /** Constructor. */
+    /**
+     * 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) {
         if (record == null) {
@@ -63,41 +104,4 @@ public class Log4JFilter implements org.apache.logging.log4j.core.Filter {
         return Result.NEUTRAL;
     }
 
-	/**
-	 * 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;
-    }
-
 }

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

@@ -1,34 +1,31 @@
 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;
+    final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd_HH-mm");
-    private String dbUserName = Settings.getMySQLUsername;
+    final String dateString = format.format(new Date());
-    private String dbPassword = Settings.getMySQLPassword;
+    private final String dbName = Settings.getMySQLDatabase;
-    private String tblname = Settings.getMySQLTablename;
+    private final String dbUserName = Settings.getMySQLUsername;
-    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd_HH-mm");
+    private final String dbPassword = Settings.getMySQLPassword;
-    String dateString = format.format(new Date());
+    private final String tblname = Settings.getMySQLTablename;
-    private String path = AuthMe.getInstance().getDataFolder() + File.separator + "backups" + File.separator + "backup" + dateString;
+    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) {
@@ -36,9 +33,39 @@ public class PerformBackup {
     }
 
     /**
-     * Method doBackup.
+     * 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:
+        }
 
-     * @return boolean */
+        // 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) {
@@ -55,8 +82,9 @@ public class PerformBackup {
 
     /**
      * Method MySqlBackup.
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     private boolean MySqlBackup() {
         File dirBackup = new File(AuthMe.getInstance().getDataFolder() + "/backups");
 
@@ -98,9 +126,11 @@ public class PerformBackup {
 
     /**
      * Method FileBackup.
+     *
      * @param backend String
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     private boolean FileBackup(String backend) {
         File dirBackup = new File(AuthMe.getInstance().getDataFolder() + "/backups");
 
@@ -117,18 +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 */
+     * @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 {
@@ -139,14 +167,18 @@ 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 */
+     * @throws IOException
+     */
     void copy(File src, File dst) throws IOException {
         InputStream in = new FileInputStream(src);
         OutputStream out = new FileOutputStream(dst);
@@ -161,8 +193,22 @@ public class PerformBackup {
         out.close();
     }
 
+    /*
+     * 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) {
@@ -170,11 +216,13 @@ public class PerformBackup {
     }
 
     /**
-     * Method getInstance.
+     * Possible backup causes.
-    
+     */
-     * @return AuthMe */
+    public enum BackupCause {
-    public AuthMe getInstance() {
+        START,
-        return instance;
+        STOP,
+        COMMAND,
+        OTHER,
     }
 
 }

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

@@ -1,28 +1,26 @@
 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 java.io.File;
-import org.apache.commons.mail.HtmlEmail;
-import org.bukkit.Bukkit;
-
-import fr.xephi.authme.cache.auth.PlayerAuth;
-import fr.xephi.authme.settings.Settings;
 
 /**
- *
  * @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) {
@@ -31,19 +29,20 @@ public class SendMailSSL {
 
     /**
      * 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;
@@ -91,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,19 +1,18 @@
 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;
 
 /**
  */
@@ -24,6 +23,7 @@ public class API {
 
     /**
      * Constructor for API.
+     *
      * @param instance AuthMe
      */
     @Deprecated
@@ -34,8 +34,8 @@ public class API {
     /**
      * Hook into AuthMe
      *
-    
+     * @return AuthMe instance
-     * @return AuthMe instance */
+     */
     @Deprecated
     public static AuthMe hookAuthMe() {
         if (instance != null)
@@ -49,49 +49,20 @@ public class API {
     }
 
     /**
-     * Method getPlugin.
-    
-     * @return AuthMe */
-    @Deprecated
-    public AuthMe getPlugin() {
-        return instance;
-    }
-
-    /**
-     *
      * @param player
-    
+     *
-     * @return true if player is authenticate */
+     * @return true if player is authenticate
+     */
     @Deprecated
     public static boolean isAuthenticated(Player player) {
         return PlayerCache.getInstance().isAuthenticated(player.getName());
     }
 
     /**
-     *
      * @param player
-    
-     * @return true if player is a npc */
-    @Deprecated
-    public boolean isaNPC(Player player) {
-        return Utils.isNPC(player);
-    }
-
-    /**
      *
-     * @param player
+     * @return true if the player is unrestricted
-    
+     */
-     * @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
     public static boolean isUnrestricted(Player player) {
         return Utils.isUnrestricted(player);
@@ -99,9 +70,11 @@ public class API {
 
     /**
      * Method getLastLocation.
+     *
      * @param player Player
-    
+     *
-     * @return Location */
+     * @return Location
+     */
     @Deprecated
     public static Location getLastLocation(Player player) {
         try {
@@ -121,6 +94,7 @@ public class API {
 
     /**
      * Method setPlayerInventory.
+     *
      * @param player  Player
      * @param content ItemStack[]
      * @param armor   ItemStack[]
@@ -131,15 +105,15 @@ public class API {
         try {
             player.getInventory().setContents(content);
             player.getInventory().setArmorContents(armor);
-        } catch (NullPointerException npe) {
+        } catch (NullPointerException ignored) {
         }
     }
 
     /**
-     *
      * @param playerName
-    
+     *
-     * @return true if player is registered */
+     * @return true if player is registered
+     */
     @Deprecated
     public static boolean isRegistered(String playerName) {
         String player = playerName.toLowerCase();
@@ -147,11 +121,11 @@ public class API {
     }
 
     /**
-    
-    
      * @param playerName      String
      * @param passwordToCheck String
-     * @return true if the password is correct , false else */
+     *
+     * @return true if the password is correct , false else
+     */
     @Deprecated
     public static boolean checkPassword(String playerName,
                                         String passwordToCheck) {
@@ -169,11 +143,11 @@ public class API {
     /**
      * Register a player
      *
-    
-    
      * @param playerName String
      * @param password   String
-     * @return true if the player is register correctly */
+     *
+     * @return true if the player is register correctly
+     */
     @Deprecated
     public static boolean registerPlayer(String playerName, String password) {
         try {
@@ -183,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 instance.database.saveAuth(auth);
-                return false;
-            }
-            return true;
         } catch (NoSuchAlgorithmException ex) {
             return false;
         }
@@ -195,7 +166,6 @@ public class API {
     /**
      * Force a player to login
      *
-    
      * @param player *            player
      */
     @Deprecated
@@ -203,4 +173,34 @@ public class API {
         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,30 +1,29 @@
 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) {
@@ -33,17 +32,18 @@ public class NewAPI {
 
     /**
      * Constructor for NewAPI.
-     * @param serv Server
+     *
+     * @param server Server
      */
-    public NewAPI(Server serv) {
+    public NewAPI(Server server) {
-        this.plugin = (AuthMe) serv.getPluginManager().getPlugin("AuthMe");
+        this.plugin = (AuthMe) server.getPluginManager().getPlugin("AuthMe");
     }
 
     /**
      * Hook into AuthMe
      *
-    
+     * @return AuthMe plugin
-     * @return AuthMe plugin */
+     */
     public static NewAPI getInstance() {
         if (singleton != null)
             return singleton;
@@ -58,44 +58,47 @@ public class NewAPI {
 
     /**
      * Method getPlugin.
-    
+     *
-     * @return AuthMe */
+     * @return AuthMe
+     */
     public AuthMe getPlugin() {
         return plugin;
     }
 
     /**
-     *
      * @param player
-    
+     *
-     * @return true if player is authenticate */
+     * @return true if player is authenticate
+     */
     public boolean isAuthenticated(Player player) {
         return PlayerCache.getInstance().isAuthenticated(player.getName());
     }
 
     /**
-     *
      * @param player
-    
+     *
-     * @return true if player is a npc */
+     * @return true if player is a npc
+     */
     public boolean isNPC(Player player) {
         return Utils.isNPC(player);
     }
 
     /**
-     *
      * @param player
-    
+     *
-     * @return true if the player is unrestricted */
+     * @return true if the player is unrestricted
+     */
     public boolean isUnrestricted(Player player) {
         return Utils.isUnrestricted(player);
     }
 
     /**
      * Method getLastLocation.
+     *
      * @param player Player
-    
+     *
-     * @return Location */
+     * @return Location
+     */
     public Location getLastLocation(Player player) {
         try {
             PlayerAuth auth = PlayerCache.getInstance().getAuth(player.getName().toLowerCase());
@@ -112,21 +115,21 @@ public class NewAPI {
     }
 
     /**
-     *
      * @param playerName
-    
+     *
-     * @return true if player is registered */
+     * @return true if player is registered
+     */
     public boolean isRegistered(String playerName) {
         String player = playerName.toLowerCase();
         return plugin.database.isAuthAvailable(player);
     }
 
     /**
-    
-    
      * @param playerName      String
      * @param passwordToCheck String
-     * @return true if the password is correct , false else */
+     *
+     * @return true if the password is correct , false else
+     */
     public boolean checkPassword(String playerName, String passwordToCheck) {
         if (!isRegistered(playerName))
             return false;
@@ -142,11 +145,11 @@ public class NewAPI {
     /**
      * Register a player
      *
-    
-    
      * @param playerName String
      * @param password   String
-     * @return true if the player is register correctly */
+     *
+     * @return true if the player is register correctly
+     */
     public boolean registerPlayer(String playerName, String password) {
         try {
             String name = playerName.toLowerCase();
@@ -164,7 +167,6 @@ public class NewAPI {
     /**
      * Force a player to login
      *
-    
      * @param player *            player
      */
     public void forceLogin(Player player) {
@@ -174,35 +176,28 @@ public class NewAPI {
     /**
      * Force a player to logout
      *
-    
      * @param player * 			player
      */
-    public void forceLogout(Player player)
+    public void forceLogout(Player player) {
-    {
         plugin.management.performLogout(player);
     }
 
     /**
      * Force a player to register
      *
-    
-    
      * @param player   * 			player
      * @param password String
      */
-    public void forceRegister(Player player, String password)
+    public void forceRegister(Player player, String password) {
-    {
         plugin.management.performRegister(player, password, null);
     }
 
     /**
      * Force a player to unregister
      *
-    
      * @param player * 			player
      */
-    public void forceUnregister(Player player)
+    public void forceUnregister(Player player) {
-    {
         plugin.management.performUnregister(player, "", true);
     }
 }

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

@@ -16,12 +16,13 @@ public class PlayerAuth {
     private double z;
     private String world;
     private String salt;
-    private int groupId;
+    private final int groupId;
     private String email;
     private String realName;
 
     /**
      * Constructor for PlayerAuth.
+     *
      * @param nickname  String
      * @param ip        String
      * @param lastLogin long
@@ -33,6 +34,7 @@ public class PlayerAuth {
 
     /**
      * Constructor for PlayerAuth.
+     *
      * @param nickname String
      * @param x        double
      * @param y        double
@@ -46,6 +48,7 @@ public class PlayerAuth {
 
     /**
      * Constructor for PlayerAuth.
+     *
      * @param nickname  String
      * @param hash      String
      * @param ip        String
@@ -58,6 +61,7 @@ public class PlayerAuth {
 
     /**
      * Constructor for PlayerAuth.
+     *
      * @param nickname  String
      * @param hash      String
      * @param ip        String
@@ -71,6 +75,7 @@ public class PlayerAuth {
 
     /**
      * Constructor for PlayerAuth.
+     *
      * @param nickname  String
      * @param hash      String
      * @param salt      String
@@ -84,6 +89,7 @@ public class PlayerAuth {
 
     /**
      * Constructor for PlayerAuth.
+     *
      * @param nickname  String
      * @param hash      String
      * @param ip        String
@@ -101,6 +107,7 @@ public class PlayerAuth {
 
     /**
      * Constructor for PlayerAuth.
+     *
      * @param nickname  String
      * @param hash      String
      * @param salt      String
@@ -119,6 +126,7 @@ public class PlayerAuth {
 
     /**
      * Constructor for PlayerAuth.
+     *
      * @param nickname  String
      * @param hash      String
      * @param salt      String
@@ -133,6 +141,7 @@ public class PlayerAuth {
 
     /**
      * Constructor for PlayerAuth.
+     *
      * @param nickname  String
      * @param hash      String
      * @param salt      String
@@ -163,6 +172,7 @@ public class PlayerAuth {
 
     /**
      * Method set.
+     *
      * @param auth PlayerAuth
      */
     public void set(PlayerAuth auth) {
@@ -181,6 +191,7 @@ public class PlayerAuth {
 
     /**
      * Method setName.
+     *
      * @param nickname String
      */
     public void setName(String nickname) {
@@ -189,22 +200,25 @@ public class PlayerAuth {
 
     /**
      * Method getNickname.
-    
+     *
-     * @return String */
+     * @return String
+     */
     public String getNickname() {
         return nickname;
     }
 
     /**
      * Method getRealName.
-    
+     *
-     * @return String */
+     * @return String
+     */
     public String getRealName() {
         return realName;
     }
 
     /**
      * Method setRealName.
+     *
      * @param realName String
      */
     public void setRealName(String realName) {
@@ -213,14 +227,25 @@ public class PlayerAuth {
 
     /**
      * Method getGroupId.
-    
+     *
-     * @return int */
+     * @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) {
@@ -228,15 +253,17 @@ public class PlayerAuth {
     }
 
     /**
-     * Method getQuitLocX.
+     * Method getQuitLocY.
-    
+     *
-     * @return double */
+     * @return double
-    public double getQuitLocX() {
+     */
-        return x;
+    public double getQuitLocY() {
+        return y;
     }
 
     /**
      * Method setQuitLocY.
+     *
      * @param d double
      */
     public void setQuitLocY(double d) {
@@ -244,15 +271,17 @@ public class PlayerAuth {
     }
 
     /**
-     * Method getQuitLocY.
+     * Method getQuitLocZ.
-    
+     *
-     * @return double */
+     * @return double
-    public double getQuitLocY() {
+     */
-        return y;
+    public double getQuitLocZ() {
+        return z;
     }
 
     /**
      * Method setQuitLocZ.
+     *
      * @param d double
      */
     public void setQuitLocZ(double d) {
@@ -260,15 +289,17 @@ public class PlayerAuth {
     }
 
     /**
-     * Method getQuitLocZ.
+     * Method getWorld.
-    
+     *
-     * @return double */
+     * @return String
-    public double getQuitLocZ() {
+     */
-        return z;
+    public String getWorld() {
+        return world;
     }
 
     /**
      * Method setWorld.
+     *
      * @param world String
      */
     public void setWorld(String world) {
@@ -276,15 +307,17 @@ public class PlayerAuth {
     }
 
     /**
-     * Method getWorld.
+     * Method getIp.
-    
+     *
-     * @return String */
+     * @return String
-    public String getWorld() {
+     */
-        return world;
+    public String getIp() {
+        return ip;
     }
 
     /**
      * Method setIp.
+     *
      * @param ip String
      */
     public void setIp(String ip) {
@@ -292,15 +325,17 @@ public class PlayerAuth {
     }
 
     /**
-     * Method getIp.
+     * Method getLastLogin.
-    
+     *
-     * @return String */
+     * @return long
-    public String getIp() {
+     */
-        return ip;
+    public long getLastLogin() {
+        return lastLogin;
     }
 
     /**
      * Method setLastLogin.
+     *
      * @param lastLogin long
      */
     public void setLastLogin(long lastLogin) {
@@ -308,15 +343,17 @@ public class PlayerAuth {
     }
 
     /**
-     * Method getLastLogin.
+     * Method getEmail.
-    
+     *
-     * @return long */
+     * @return String
-    public long getLastLogin() {
+     */
-        return lastLogin;
+    public String getEmail() {
+        return email;
     }
 
     /**
      * Method setEmail.
+     *
      * @param email String
      */
     public void setEmail(String email) {
@@ -324,41 +361,28 @@ public class PlayerAuth {
     }
 
     /**
-     * Method getEmail.
+     * Method getSalt.
-    
+     *
-     * @return String */
+     * @return String
-    public String getEmail() {
+     */
-        return email;
+    public String getSalt() {
+        return this.salt;
     }
 
     /**
      * Method setSalt.
+     *
      * @param salt String
      */
     public void setSalt(String salt) {
         this.salt = salt;
     }
 
-    /**
-     * Method getSalt.
-    
-     * @return String */
-    public String getSalt() {
-        return this.salt;
-    }
-
-    /**
-     * Method setHash.
-     * @param hash String
-     */
-    public void setHash(String hash) {
-        this.hash = hash;
-    }
-
     /**
      * Method getHash.
-    
+     *
-     * @return String */
+     * @return String
+     */
     public String getHash() {
         if (Settings.getPasswordHash == HashAlgorithm.MD5VB) {
             if (salt != null && !salt.isEmpty() && Settings.getPasswordHash == HashAlgorithm.MD5VB) {
@@ -369,10 +393,21 @@ public class PlayerAuth {
     }
 
     /**
-     * Method equals.
+     * Method setHash.
-     * @param obj Object
+     *
+     * @param hash String
+     */
+    public void setHash(String hash) {
+        this.hash = hash;
+    }
 
-     * @return boolean */
+    /**
+     * Method equals.
+     *
+     * @param obj Object
+     *
+     * @return boolean
+     */
     @Override
     public boolean equals(Object obj) {
         if (!(obj instanceof PlayerAuth)) {
@@ -384,8 +419,9 @@ public class PlayerAuth {
 
     /**
      * Method hashCode.
-    
+     *
-     * @return int */
+     * @return int
+     */
     @Override
     public int hashCode() {
         int hashCode = 7;
@@ -396,8 +432,9 @@ public class PlayerAuth {
 
     /**
      * Method toString.
-    
+     *
-     * @return String */
+     * @return String
+     */
     @Override
     public String toString() {
         return ("Player : " + nickname + " | " + realName

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

@@ -7,14 +7,27 @@ import java.util.concurrent.ConcurrentHashMap;
 public class PlayerCache {
 
     private volatile static PlayerCache singleton;
-    private ConcurrentHashMap<String, PlayerAuth> cache;
+    private final ConcurrentHashMap<String, PlayerAuth> cache;
 
     private PlayerCache() {
         cache = new ConcurrentHashMap<>();
     }
 
+    /**
+     * Method getInstance.
+     *
+     * @return PlayerCache
+     */
+    public static PlayerCache getInstance() {
+        if (singleton == null) {
+            singleton = new PlayerCache();
+        }
+        return singleton;
+    }
+
     /**
      * Method addPlayer.
+     *
      * @param auth PlayerAuth
      */
     public void addPlayer(PlayerAuth auth) {
@@ -23,6 +36,7 @@ public class PlayerCache {
 
     /**
      * Method updatePlayer.
+     *
      * @param auth PlayerAuth
      */
     public void updatePlayer(PlayerAuth auth) {
@@ -32,6 +46,7 @@ public class PlayerCache {
 
     /**
      * Method removePlayer.
+     *
      * @param user String
      */
     public void removePlayer(String user) {
@@ -40,45 +55,40 @@ public class PlayerCache {
 
     /**
      * Method isAuthenticated.
+     *
      * @param user String
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     public boolean isAuthenticated(String user) {
         return cache.containsKey(user.toLowerCase());
     }
 
     /**
      * Method getAuth.
+     *
      * @param user String
-    
+     *
-     * @return PlayerAuth */
+     * @return PlayerAuth
+     */
     public PlayerAuth getAuth(String user) {
         return cache.get(user.toLowerCase());
     }
 
-    /**
-     * Method getInstance.
-    
-     * @return PlayerCache */
-    public static PlayerCache getInstance() {
-        if (singleton == null) {
-            singleton = new PlayerCache();
-        }
-        return singleton;
-    }
-
     /**
      * Method getLogged.
-    
+     *
-     * @return int */
+     * @return int
+     */
     public int getLogged() {
         return cache.size();
     }
 
     /**
      * Method getCache.
-    
+     *
-     * @return ConcurrentHashMap<String,PlayerAuth> */
+     * @return ConcurrentHashMap<String,PlayerAuth>
+     */
     public ConcurrentHashMap<String, PlayerAuth> getCache() {
         return this.cache;
     }

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

@@ -4,12 +4,13 @@ package fr.xephi.authme.cache.backup;
  */
 public class DataFileCache {
 
-    private String group;
+    private final String group;
-    private boolean operator;
+    private final boolean operator;
-    private boolean flying;
+    private final boolean flying;
 
     /**
      * Constructor for DataFileCache.
+     *
      * @param group    String
      * @param operator boolean
      * @param flying   boolean
@@ -22,24 +23,27 @@ public class DataFileCache {
 
     /**
      * Method getGroup.
-    
+     *
-     * @return String */
+     * @return String
+     */
     public String getGroup() {
         return group;
     }
 
     /**
      * Method getOperator.
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     public boolean getOperator() {
         return operator;
     }
 
     /**
      * Method isFlying.
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     public boolean isFlying() {
         return flying;
     }

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

@@ -1,27 +1,17 @@
 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 {
@@ -43,6 +33,7 @@ public class JsonCache {
 
     /**
      * Method createCache.
+     *
      * @param player     Player
      * @param playerData DataFileCache
      */
@@ -77,9 +68,11 @@ public class JsonCache {
 
     /**
      * Method readCache.
+     *
      * @param player Player
-    
+     *
-     * @return DataFileCache */
+     * @return DataFileCache
+     */
     public DataFileCache readCache(Player player) {
         String path;
         try {
@@ -103,24 +96,42 @@ public class JsonCache {
     }
 
     /**
+     * Method removeCache.
+     *
+     * @param player Player
      */
-    private class PlayerDataSerializer implements JsonSerializer<DataFileCache> {
+    public void removeCache(Player player) {
-        /**
+        String path;
-         * Method serialize.
+        try {
-         * @param dataFileCache DataFileCache
+            path = player.getUniqueId().toString();
-         * @param type Type
+        } catch (Exception | Error e) {
-         * @param jsonSerializationContext JsonSerializationContext
+            path = player.getName().toLowerCase();
-        
-         * @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());
-
-            return jsonObject;
         }
+        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();
     }
 
     /**
@@ -128,13 +139,13 @@ public class JsonCache {
     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)
-        
+         */
-         * @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();
@@ -161,39 +172,26 @@ public class JsonCache {
     }
 
     /**
-     * Method removeCache.
-     * @param player Player
      */
-    public void removeCache(Player player) {
+    private class PlayerDataSerializer implements JsonSerializer<DataFileCache> {
-        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.
+         * Method serialize.
-     * @param player Player
+         *
+         * @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());
 
-     * @return boolean */
+            return jsonObject;
-    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();
     }
 
 }

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

@@ -1,30 +1,31 @@
 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.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;
+    public final ConcurrentHashMap<String, LimboPlayer> cache;
-    private JsonCache playerData;
+    public final AuthMe plugin;
-    public AuthMe plugin;
+    private final JsonCache playerData;
 
     /**
      * Constructor for LimboCache.
+     *
      * @param plugin AuthMe
      */
     private LimboCache(AuthMe plugin) {
@@ -34,8 +35,21 @@ public class LimboCache {
     }
 
     /**
-     * Method addLimboPlayer.
+     * Method getInstance.
-     * @param player Player
+     *
+     * @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();
@@ -45,6 +59,12 @@ public class LimboCache {
         String playerGroup = "";
         boolean flying = false;
 
+        // 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) {
@@ -55,14 +75,10 @@ public class LimboCache {
         } else {
             operator = player.isOp();
             flying = player.isFlying();
-            if (plugin.vaultGroupManagement != null) {
+
-                try {
+            // Check whether groups are supported
-                    playerGroup = plugin.vaultGroupManagement.getPrimaryGroup(player);
+            if (permsMan.hasGroupSupport())
-                } catch (UnsupportedOperationException e) {
+                playerGroup = permsMan.getPrimaryGroup(player);
-                    ConsoleLogger.showError("Your permission system (" + plugin.vaultGroupManagement.getName() + ") do not support Group system with that config... unhook!");
-                    plugin.vaultGroupManagement = null;
-                }
-            }
         }
 
         if (Settings.isForceSurvivalModeEnabled) {
@@ -87,6 +103,7 @@ public class LimboCache {
 
     /**
      * Method addLimboPlayer.
+     *
      * @param player Player
      * @param group  String
      */
@@ -96,6 +113,7 @@ public class LimboCache {
 
     /**
      * Method deleteLimboPlayer.
+     *
      * @param name String
      */
     public void deleteLimboPlayer(String name) {
@@ -104,35 +122,29 @@ public class LimboCache {
 
     /**
      * Method getLimboPlayer.
+     *
      * @param name String
-    
+     *
-     * @return LimboPlayer */
+     * @return LimboPlayer
+     */
     public LimboPlayer getLimboPlayer(String name) {
         return cache.get(name);
     }
 
     /**
      * Method hasLimboPlayer.
+     *
      * @param name String
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     public boolean hasLimboPlayer(String name) {
         return cache.containsKey(name);
     }
 
-    /**
-     * Method getInstance.
-    
-     * @return LimboCache */
-    public static LimboCache getInstance() {
-        if (singleton == null) {
-            singleton = new LimboCache(AuthMe.getInstance());
-        }
-        return singleton;
-    }
-
     /**
      * Method updateLimboPlayer.
+     *
      * @param player Player
      */
     public void updateLimboPlayer(Player player) {

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

@@ -8,7 +8,7 @@ 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;
@@ -19,6 +19,7 @@ public class LimboPlayer {
 
     /**
      * Constructor for LimboPlayer.
+     *
      * @param name     String
      * @param loc      Location
      * @param gameMode GameMode
@@ -38,6 +39,7 @@ public class LimboPlayer {
 
     /**
      * Constructor for LimboPlayer.
+     *
      * @param name  String
      * @param group String
      */
@@ -48,46 +50,61 @@ public class LimboPlayer {
 
     /**
      * Method getName.
-    
+     *
-     * @return String */
+     * @return String
+     */
     public String getName() {
         return name;
     }
 
     /**
      * Method getLoc.
-    
+     *
-     * @return Location */
+     * @return Location
+     */
     public Location getLoc() {
         return loc;
     }
 
     /**
      * Method getGameMode.
-    
+     *
-     * @return GameMode */
+     * @return GameMode
+     */
     public GameMode getGameMode() {
         return gameMode;
     }
 
     /**
      * Method getOperator.
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     public boolean getOperator() {
         return operator;
     }
 
     /**
      * Method getGroup.
-    
+     *
-     * @return String */
+     * @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) {
@@ -97,15 +114,17 @@ public class LimboPlayer {
     }
 
     /**
-     * Method getTimeoutTaskId.
+     * Method getMessageTaskId.
-    
+     *
-     * @return BukkitTask */
+     * @return BukkitTask
-    public BukkitTask getTimeoutTaskId() {
+     */
-        return timeoutTaskId;
+    public BukkitTask getMessageTaskId() {
+        return messageTaskId;
     }
 
     /**
      * Method setMessageTaskId.
+     *
      * @param messageTaskId BukkitTask
      */
     public void setMessageTaskId(BukkitTask messageTaskId) {
@@ -114,18 +133,11 @@ public class LimboPlayer {
         this.messageTaskId = messageTaskId;
     }
 
-    /**
-     * Method getMessageTaskId.
-    
-     * @return BukkitTask */
-    public BukkitTask getMessageTaskId() {
-        return messageTaskId;
-    }
-
     /**
      * Method isFlying.
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     public boolean isFlying() {
         return flying;
     }

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

@@ -6,11 +6,17 @@ public class CommandArgumentDescription {
 
     // TODO: Allow argument to consist of infinite parts. <label ...>
 
-    /** Argument label. */
+    /**
+     * Argument label.
+     */
     private String label;
-    /** Argument description. */
+    /**
+     * Argument description.
+     */
     private String description;
-    /** Defines whether the argument is optional. */
+    /**
+     * Defines whether the argument is optional.
+     */
     private boolean optional = false;
 
     /**

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

@@ -1,35 +1,52 @@
 package fr.xephi.authme.command;
 
+import fr.xephi.authme.util.StringUtils;
+import org.bukkit.command.CommandSender;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.bukkit.command.CommandSender;
-
-import fr.xephi.authme.util.StringUtils;
-
 /**
  */
 public class CommandDescription {
 
-    /** Defines the acceptable labels. */
+    /**
+     * Defines the acceptable labels.
+     */
     private List<String> labels = new ArrayList<>();
-    /** Command description. */
+    /**
+     * Command description.
+     */
     private String description = "";
-    /** Detailed description. */
+    /**
+     * Detailed description.
+     */
     private String detailedDescription = "";
-    /** The executable command instance. */
+    /**
+     * The executable command instance.
+     */
     private ExecutableCommand executableCommand;
-    /** The parent command. */
+    /**
+     * The parent command.
+     */
     private CommandDescription parent = null;
-    /** The child labels. */
+    /**
+     * The child labels.
+     */
     private List<CommandDescription> children = new ArrayList<>();
-    /** The command arguments. */
+    /**
+     * The command arguments.
+     */
     private List<CommandArgumentDescription> arguments = new ArrayList<>();
-    /** Defines whether there is an argument maximum or not. */
+    /**
+     * Defines whether there is an argument maximum or not.
+     */
     private boolean noArgumentMaximum = false;
-    /** Defines the command permissions. */
+    /**
+     * Defines the command permissions.
+     */
     private CommandPermissions permissions = new CommandPermissions();
 
     /**
@@ -96,6 +113,69 @@ public class CommandDescription {
         setArguments(arguments);
     }
 
+    /**
+     * Check whether a label is valid to use.
+     *
+     * @param label The label to test.
+     *
+     * @return True if the label is valid to use, false otherwise.
+     */
+    public static boolean isValidLabel(String label) {
+        // Make sure the label isn't null
+        if (label == null)
+            return false;
+
+        // Trim the label
+        label = label.trim();
+
+        // Make sure the label is at least one character long
+        if (label.length() <= 0)
+            return false;
+
+        // Make sure the label doesn't contain any spaces, return the result
+        return !label.contains(" ");
+    }
+
+    /**
+     * 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));
+    }
+
+    /**
+     * Get the first relative command label.
+     *
+     * @return First relative command label.
+     */
+    public String getLabel() {
+        // Ensure there's any item in the command list
+        if (this.labels.size() == 0)
+            return "";
+
+        // Return the first command on the list
+        return this.labels.get(0);
+    }
+
+    /**
+     * 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);
+    }
+
     /**
      * Get the label most similar to the reference. The first label will be returned if no reference was supplied.
      *
@@ -105,11 +185,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
@@ -118,9 +198,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;
             }
@@ -153,15 +233,6 @@ public class CommandDescription {
         }
     }
 
-    /**
-     * 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.
      *
@@ -169,11 +240,11 @@ public class CommandDescription {
      * @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.
-     * @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)
+        if (!overwrite)
             return addLabel(commandLabel);
 
         // Replace all labels with this new one
@@ -186,15 +257,15 @@ public class CommandDescription {
      *
      * @param commandLabel Command label to add.
      *
-    
+     * @return True if the label was added, or if it was added already. False on error.
-     * @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))
+        if (!isValidLabel(commandLabel))
             return false;
 
         // Ensure this command isn't a duplicate
-        if(hasLabel(commandLabel))
+        if (hasLabel(commandLabel))
             return true;
 
         // Add the command to the list
@@ -206,12 +277,12 @@ public class CommandDescription {
      *
      * @param commandLabels List of command labels to add.
      *
-    
+     * @return True if succeed, false on failure.
-     * @return True if succeed, false on failure. */
+     */
     public boolean addLabels(List<String> commandLabels) {
         // Add each command label separately
-        for(String cmd : commandLabels)
+        for (String cmd : commandLabels)
-            if(!addLabel(cmd))
+            if (!addLabel(cmd))
                 return false;
         return true;
     }
@@ -221,12 +292,12 @@ public class CommandDescription {
      *
      * @param commandLabel Command to check for.
      *
-    
+     * @return True if this command label equals to the param command.
-     * @return True if this command label equals to the param command. */
+     */
     public boolean hasLabel(String commandLabel) {
         // Check whether any command matches with the argument
-        for(String entry : this.labels)
+        for (String entry : this.labels)
-            if(commandLabelEquals(entry, commandLabel))
+            if (commandLabelEquals(entry, commandLabel))
                 return true;
 
         // No match found, return false
@@ -235,13 +306,15 @@ public class CommandDescription {
 
     /**
      * Check whether this command description has a list of labels
+     *
      * @param commandLabels List of labels
-    
+     *
-     * @return True if all labels match, false otherwise */
+     * @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)
+        for (String cmd : commandLabels)
-            if(!hasLabel(cmd))
+            if (!hasLabel(cmd))
                 return false;
 
         // There seems to be a match for every command, return true
@@ -254,11 +327,11 @@ public class CommandDescription {
      *
      * @param commandReference The command reference.
      *
-    
+     * @return True if the command reference is suitable to this command label, false otherwise.
-     * @return True if the command reference is suitable to this command label, false otherwise. */
+     */
     public boolean isSuitableLabel(CommandParts commandReference) {
         // Make sure the command reference is valid
-        if(commandReference.getCount() <= 0)
+        if (commandReference.getCount() <= 0)
             return false;
 
         // Get the parent count
@@ -268,29 +341,6 @@ public class CommandDescription {
         return hasLabel(element);
     }
 
-    /**
-     * Check whether a label is valid to use.
-     *
-     * @param label The label to test.
-     *
-    
-     * @return True if the label is valid to use, false otherwise. */
-    public static boolean isValidLabel(String label) {
-        // Make sure the label isn't null
-        if(label == null)
-            return false;
-
-        // Trim the label
-        label = label.trim();
-
-        // Make sure the label is at least one character long
-        if(label.length() <= 0)
-            return false;
-
-        // Make sure the label doesn't contain any spaces, return the result
-        return !label.contains(" ");
-    }
-
     /**
      * Get the absolute command label, without a slash.
      *
@@ -304,6 +354,7 @@ public class CommandDescription {
      * Get the absolute command label.
      *
      * @param includeSlash boolean
+     *
      * @return Absolute command label.
      */
     public String getAbsoluteLabel(boolean includeSlash) {
@@ -313,14 +364,15 @@ public class CommandDescription {
     /**
      * Get the absolute command label.
      *
-     * @param includeSlash boolean
+     * @param includeSlash
-     * @param reference CommandParts
+     * @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
@@ -339,7 +391,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,7 +422,7 @@ public class CommandDescription {
      */
     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
@@ -418,7 +470,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
@@ -428,8 +480,8 @@ public class CommandDescription {
     /**
      * Get the parent command if this command description has a parent.
      *
-    
+     * @return Parent command, or null
-     * @return Parent command, or null */
+     */
     public CommandDescription getParent() {
         return this.parent;
     }
@@ -437,11 +489,11 @@ public class CommandDescription {
     /**
      * Get the number of parent this description has.
      *
-    
+     * @return The number of parents.
-     * @return The number of parents. */
+     */
     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
@@ -453,18 +505,18 @@ public class CommandDescription {
      *
      * @param parent Parent command.
      *
-    
+     * @return True on success, false on failure.
-     * @return True on success, false on failure. */
+     */
     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
@@ -474,8 +526,8 @@ public class CommandDescription {
     /**
      * Check whether the plugin description has a parent command.
      *
-    
+     * @return True if the description has a parent command, false otherwise.
-     * @return True if the description has a parent command, false otherwise. */
+     */
     public boolean hasParent() {
         return this.parent != null;
     }
@@ -483,38 +535,12 @@ public class CommandDescription {
     /**
      * Get all command children.
      *
-    
+     * @return Command children.
-     * @return Command children. */
+     */
     public List<CommandDescription> getChildren() {
         return this.children;
     }
 
-    /**
-     * Add a child to the command description.
-     *
-     * @param commandDescription The child to add.
-     *
-    
-     * @return True on success, false on failure. */
-    public boolean addChild(CommandDescription commandDescription) {
-        // Make sure the description is valid
-        if(commandDescription == null)
-            return false;
-        if(!commandDescription.isValid())
-            return false;
-
-        // Make sure the child doesn't exist already
-        if(isChild(commandDescription))
-            return true;
-
-        // The command description to add as a child
-        if(!this.children.add(commandDescription))
-            return false;
-
-        // Set this description as parent on the child
-        return commandDescription.setParent(this);
-    }
-
     /**
      * Set the children of this command.
      *
@@ -522,19 +548,45 @@ public class CommandDescription {
      */
     public void setChildren(List<CommandDescription> children) {
         // Check whether the children list should be cleared
-        if(children == null)
+        if (children == null)
             this.children.clear();
 
         else
             this.children = children;
     }
 
+    /**
+     * Add a child to the command description.
+     *
+     * @param commandDescription The child to add.
+     *
+     * @return True on success, false on failure.
+     */
+    public boolean addChild(CommandDescription commandDescription) {
+        // Make sure the description is valid
+        if (commandDescription == null)
+            return false;
+        if (!commandDescription.isValid())
+            return false;
+
+        // Make sure the child doesn't exist already
+        if (isChild(commandDescription))
+            return true;
+
+        // The command description to add as a child
+        if (!this.children.add(commandDescription))
+            return false;
+
+        // Set this description as parent on the child
+        return commandDescription.setParent(this);
+    }
+
     /**
      * Check whether this command has any child labels.
      *
-    
+     * @return True if 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);
     }
 
@@ -543,13 +595,13 @@ public class CommandDescription {
      *
      * @param commandDescription The command description to check for.
      *
-    
+     * @return True if this command description has the specific child, false otherwise.
-     * @return True if this command description has the specific child, false otherwise. */
+     */
     public boolean isChild(CommandDescription commandDescription) {
         // Make sure the description is valid
-        if(commandDescription == null)
+        if (commandDescription == null)
             return false;
-        if(!commandDescription.isValid())
+        if (!commandDescription.isValid())
             return false;
 
         // Check whether this child exists, return the result
@@ -561,15 +613,15 @@ public class CommandDescription {
      *
      * @param argument The argument to add.
      *
-    
+     * @return True if succeed, false if failed.
-     * @return True if succeed, false if failed. */
+     */
     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
@@ -630,9 +682,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;
 
@@ -647,11 +699,11 @@ public class CommandDescription {
     /**
      * Get the maximum number of arguments.
      *
-    
+     * @return The maximum number of arguments. A negative number will be returned if there's no maximum.
-     * @return The maximum number of arguments. A negative number will be returned if there's no maximum. */
+     */
     public int getMaximumArguments() {
         // Check whether there is a maximum set
-        if(this.noArgumentMaximum)
+        if (this.noArgumentMaximum)
             return -1;
 
         // Return the maximum based on the registered arguments
@@ -671,8 +723,8 @@ public class CommandDescription {
     /**
      * Get the command description.
      *
-    
+     * @return Command description.
-     * @return Command description. */
+     */
     public String getDescription() {
         return hasDescription() ? this.description : this.detailedDescription;
     }
@@ -683,7 +735,7 @@ public class CommandDescription {
      * @param description New command description. Null to reset the description.
      */
     public void setDescription(String description) {
-        if(description == null)
+        if (description == null)
             this.description = "";
 
         else
@@ -693,8 +745,8 @@ public class CommandDescription {
     /**
      * Check whether this command has any description.
      *
-    
+     * @return True if this command has any description.
-     * @return True if this command has any description. */
+     */
     public boolean hasDescription() {
         return (this.description.trim().length() != 0);
     }
@@ -702,8 +754,8 @@ public class CommandDescription {
     /**
      * Get the command detailed description.
      *
-    
+     * @return Command detailed description.
-     * @return Command detailed description. */
+     */
     public String getDetailedDescription() {
         return hasDetailedDescription() ? this.detailedDescription : this.description;
     }
@@ -714,7 +766,7 @@ public class CommandDescription {
      * @param detailedDescription New command description. Null to reset the description.
      */
     public void setDetailedDescription(String detailedDescription) {
-        if(detailedDescription == null)
+        if (detailedDescription == null)
             this.detailedDescription = "";
 
         else
@@ -724,8 +776,8 @@ public class CommandDescription {
     /**
      * Check whether this command has any detailed description.
      *
-    
+     * @return True if this command has any detailed description.
-     * @return True if this command has any detailed description. */
+     */
     public boolean hasDetailedDescription() {
         return (this.detailedDescription.trim().length() != 0);
     }
@@ -735,15 +787,15 @@ public class CommandDescription {
      *
      * @param queryReference The query reference to find a command for.
      *
-    
+     * @return The command found, or null.
-     * @return The command found, or null. */
+     */
     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),
@@ -755,7 +807,7 @@ public class CommandDescription {
         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>() {
@@ -771,21 +823,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 (firstChildDifference > 0.0)
-                if(getSuitableArgumentsDifference(queryReference) == 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
@@ -797,8 +849,8 @@ public class CommandDescription {
      *
      * @param commandReference The command reference.
      *
-    
+     * @return True if so, false otherwise.
-     * @return True if so, false otherwise. */
+     */
     public boolean hasSuitableCommand(CommandParts commandReference) {
         return findCommand(commandReference) != null;
     }
@@ -808,8 +860,8 @@ public class CommandDescription {
      *
      * @param commandReference The command reference.
      *
-    
+     * @return True if the arguments are suitable, false otherwise.
-     * @return True if the arguments are suitable, false otherwise. */
+     */
     public boolean hasSuitableArguments(CommandParts commandReference) {
         return getSuitableArgumentsDifference(commandReference) == 0;
     }
@@ -873,20 +925,6 @@ public class CommandDescription {
         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) {
-        commandLabel = commandLabel.trim();
-        otherCommandLabel = otherCommandLabel.trim();
-        return commandLabel.equalsIgnoreCase(otherCommandLabel);
-    }
-
     /**
      * Check whether the command description has been set up properly.
      *

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

@@ -1,20 +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;
 
     /**
@@ -24,19 +25,19 @@ public class CommandHandler {
      */
     public CommandHandler(boolean init) {
         // Initialize
-        if(init)
+        if (init)
             init();
     }
 
     /**
      * Initialize the command handler.
      *
-    
      * @return True if succeed, false on failure. True will also be returned if the command handler was already
-     * initialized. */
+     * initialized.
+     */
     public boolean init() {
         // Make sure the handler isn't initialized already
-        if(isInit())
+        if (isInit())
             return true;
 
         // Initialize the command manager
@@ -50,8 +51,8 @@ public class CommandHandler {
     /**
      * Check whether the command handler is initialized.
      *
-    
+     * @return True if the command handler is initialized.
-     * @return True if the command handler is initialized. */
+     */
     public boolean isInit() {
         return this.commandManager != null;
     }
@@ -59,12 +60,12 @@ public class CommandHandler {
     /**
      * Destroy the command handler.
      *
-    
      * @return True if the command handler was destroyed successfully, false otherwise. True will also be returned if
-     * the command handler wasn't initialized. */
+     * the command handler wasn't initialized.
+     */
     public boolean destroy() {
         // Make sure the command handler is initialized
-        if(!isInit())
+        if (!isInit())
             return true;
 
         // Unset the command manager
@@ -75,8 +76,8 @@ public class CommandHandler {
     /**
      * Get the command manager.
      *
-    
+     * @return Command manager instance.
-     * @return Command manager instance. */
+     */
     public CommandManager getCommandManager() {
         return this.commandManager;
     }
@@ -89,21 +90,21 @@ public class CommandHandler {
      * @param bukkitCommandLabel The command label (Bukkit).
      * @param bukkitArgs         The command arguments (Bukkit).
      *
-    
+     * @return True if the command was executed, false otherwise.
-     * @return True if the command was executed, false otherwise. */
+     */
     public boolean onCommand(CommandSender sender, org.bukkit.command.Command bukkitCommand, String bukkitCommandLabel, String[] bukkitArgs) {
         // Process the arguments
         List<String> args = processArguments(bukkitArgs);
 
         // Create a command reference, and make sure at least one command part is available
         CommandParts commandReference = new CommandParts(bukkitCommandLabel, args);
-        if(commandReference.getCount() == 0)
+        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) {
+        if (result == null) {
-            sender.sendMessage(ChatColor.DARK_RED + "Failed to parse " + AuthMe.PLUGIN_NAME + " command!");
+            sender.sendMessage(ChatColor.DARK_RED + "Failed to parse " + AuthMe.getPluginName() + " command!");
             return false;
         }
 
@@ -112,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 (commandDifference < 0.75)
-                if(result.getCommandDescription() != null)
+                if (result.getCommandDescription() != null)
                     sender.sendMessage(ChatColor.YELLOW + "Did you mean " + ChatColor.GOLD + "/" + result.getCommandDescription().getCommandReference(commandReference) + ChatColor.YELLOW + "?");
 
             // Show the help command
@@ -127,7 +128,7 @@ 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));
 
@@ -137,7 +138,7 @@ public class CommandHandler {
         }
 
         // Make sure the command is executable
-        if(!result.isExecutable()) {
+        if (!result.isExecutable()) {
             // Get the command reference
             CommandParts helpCommandReference = new CommandParts(result.getCommandReference().getRange(1));
 
@@ -150,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));
@@ -182,19 +183,19 @@ public class CommandHandler {
      *
      * @param args The command arguments to process.
      *
-    
+     * @return The processed command arguments.
-     * @return The processed command arguments. */
+     */
     private List<String> processArguments(String[] args) {
         // Convert the array into a list of arguments
         List<String> arguments = new ArrayList<>(Arrays.asList(args));
 
         /// Remove all empty arguments
-        for(int i = 0; i < arguments.size(); i++) {
+        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.*;
-import fr.xephi.authme.command.executable.authme.AuthMeCommand;
-import fr.xephi.authme.command.executable.authme.ChangePasswordCommand;
-import fr.xephi.authme.command.executable.authme.FirstSpawnCommand;
-import fr.xephi.authme.command.executable.authme.ForceLoginCommand;
-import fr.xephi.authme.command.executable.authme.GetEmailCommand;
-import fr.xephi.authme.command.executable.authme.GetIpCommand;
-import fr.xephi.authme.command.executable.authme.LastLoginCommand;
-import fr.xephi.authme.command.executable.authme.PurgeBannedPlayersCommand;
-import fr.xephi.authme.command.executable.authme.PurgeCommand;
-import fr.xephi.authme.command.executable.authme.PurgeLastPositionCommand;
-import fr.xephi.authme.command.executable.authme.RegisterCommand;
-import fr.xephi.authme.command.executable.authme.ReloadCommand;
-import fr.xephi.authme.command.executable.authme.SetEmailCommand;
-import fr.xephi.authme.command.executable.authme.SetFirstSpawnCommand;
-import fr.xephi.authme.command.executable.authme.SetSpawnCommand;
-import fr.xephi.authme.command.executable.authme.SpawnCommand;
-import fr.xephi.authme.command.executable.authme.SwitchAntiBotCommand;
-import fr.xephi.authme.command.executable.authme.UnregisterCommand;
-import fr.xephi.authme.command.executable.authme.VersionCommand;
 import fr.xephi.authme.command.executable.captcha.CaptchaCommand;
 import fr.xephi.authme.command.executable.converter.ConverterCommand;
 import fr.xephi.authme.command.executable.email.AddEmailCommand;
@@ -32,18 +10,22 @@ import fr.xephi.authme.command.executable.email.RecoverEmailCommand;
 import fr.xephi.authme.command.executable.login.LoginCommand;
 import fr.xephi.authme.command.executable.logout.LogoutCommand;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  */
 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
+     * @param registerCommands True to register the commands, false otherwise.
-     *            True to register the commands, false otherwise.
      */
     public CommandManager(boolean registerCommands) {
         // Register the commands
@@ -55,7 +37,7 @@ public class CommandManager {
      * Register all commands.
      */
     // TODO ljacqu 20151121: Create a builder class for CommandDescription
-    @SuppressWarnings({ "serial" })
+    @SuppressWarnings({"serial"})
     public void registerCommands() {
         // Register the base AuthMe Reloaded command
         CommandDescription authMeBaseCommand = new CommandDescription(new AuthMeCommand(), new ArrayList<String>() {
@@ -574,8 +556,8 @@ public class CommandManager {
     /**
      * Get the list of command descriptions
      *
-    
+     * @return List of command descriptions.
-     * @return List of command descriptions. */
+     */
     public List<CommandDescription> getCommandDescriptions() {
         return this.commandDescriptions;
     }
@@ -583,8 +565,8 @@ public class CommandManager {
     /**
      * Get the number of command description count.
      *
-    
+     * @return Command description count.
-     * @return Command description count. */
+     */
     public int getCommandDescriptionCount() {
         return this.getCommandDescriptions().size();
     }
@@ -592,11 +574,10 @@ public class CommandManager {
     /**
      * Find the best suitable command for the specified reference.
      *
-     * @param queryReference
+     * @param queryReference The query reference to find a command for.
-     *            The query reference to find a command for.
      *
-    
+     * @return The command found, or null.
-     * @return The command found, or null. */
+     */
     public FoundCommandResult findCommand(CommandParts queryReference) {
         // Make sure the command reference is valid
         if (queryReference.getCount() <= 0)

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

@@ -1,21 +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.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.
@@ -58,8 +61,8 @@ public class CommandParts {
     /**
      * Get the command parts.
      *
-    
+     * @return Command parts.
-     * @return Command parts. */
+     */
     public List<String> getList() {
         return this.parts;
     }
@@ -69,8 +72,8 @@ public class CommandParts {
      *
      * @param part The part to add.
      *
-    
+     * @return The result.
-     * @return The result. */
+     */
     public boolean add(String part) {
         return this.parts.add(part);
     }
@@ -80,8 +83,8 @@ public class CommandParts {
      *
      * @param parts The parts to add.
      *
-    
+     * @return The result.
-     * @return The result. */
+     */
     public boolean add(List<String> parts) {
         return this.parts.addAll(parts);
     }
@@ -91,10 +94,10 @@ public class CommandParts {
      *
      * @param parts The parts to add.
      *
-    
+     * @return The result.
-     * @return The result. */
+     */
     public boolean add(String[] parts) {
-        for(String entry : parts)
+        for (String entry : parts)
             add(entry);
         return true;
     }
@@ -102,8 +105,8 @@ public class CommandParts {
     /**
      * Get the number of parts.
      *
-    
+     * @return Part count.
-     * @return Part count. */
+     */
     public int getCount() {
         return this.parts.size();
     }
@@ -113,11 +116,11 @@ public class CommandParts {
      *
      * @param i Part index.
      *
-    
+     * @return The part.
-     * @return The part. */
+     */
     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
@@ -129,8 +132,8 @@ public class CommandParts {
      *
      * @param start The starting index.
      *
-    
+     * @return The parts range. Arguments that were out of bound are not included.
-     * @return The parts range. Arguments that were out of bound are not included. */
+     */
     public List<String> getRange(int start) {
         return getRange(start, getCount() - start);
     }
@@ -141,17 +144,17 @@ public class CommandParts {
      * @param start The starting index.
      * @param count The number of parts to get.
      *
-    
+     * @return The parts range. Parts that were out of bound are not included.
-     * @return The parts range. Parts that were out of bound are not included. */
+     */
     public List<String> getRange(int start, int count) {
         // Create a new list to put the range into
         List<String> elements = new ArrayList<>();
 
         // Get the range
-        for(int i = start; i < start + count; i++) {
+        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);
         }
 
@@ -180,14 +183,14 @@ public class CommandParts {
      */
     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());
     }

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

@@ -1,29 +1,34 @@
 package fr.xephi.authme.command;
 
-import java.util.ArrayList;
+import fr.xephi.authme.AuthMe;
-import java.util.List;
-
 import fr.xephi.authme.permission.PermissionsManager;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import java.util.ArrayList;
+import java.util.List;
+
 //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. */
+    /**
+     * 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. */
+    /**
+     * Defines the default permission if the permission nodes couldn't be used.
+     */
     private DefaultPermission defaultPermission = DefaultPermission.NOT_ALLOWED;
 
     /**
      * Constructor.
      */
-    public CommandPermissions() { }
+    public CommandPermissions() {
+    }
 
     /**
      * Constructor.
@@ -51,18 +56,18 @@ public class CommandPermissions {
      *
      * @param permissionNode The permission node to add.
      *
-    
+     * @return True on success, false on failure.
-     * @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)
+        if (permissionNode.length() == 0)
             return false;
 
         // Make sure this permission node hasn't been added already
-        if(hasPermissionNode(permissionNode))
+        if (hasPermissionNode(permissionNode))
             return true;
 
         // Add the permission node, return the result
@@ -74,8 +79,8 @@ public class CommandPermissions {
      *
      * @param permissionNode The permission node to check for.
      *
-    
+     * @return True if this permission node is required, false if not.
-     * @return True if this permission node is required, false if not. */
+     */
     public boolean hasPermissionNode(String permissionNode) {
         return this.permissionNodes.contains(permissionNode);
     }
@@ -83,21 +88,12 @@ public class CommandPermissions {
     /**
      * Get the permission nodes required to execute this command.
      *
-    
+     * @return The permission nodes required to execute this command.
-     * @return The permission nodes required to execute this command. */
+     */
     public List<String> getPermissionNodes() {
         return this.permissionNodes;
     }
 
-    /**
-     * Get the number of permission nodes set.
-     *
-    
-     * @return Permission node count. */
-    public int getPermissionNodeCount() {
-        return this.permissionNodes.size();
-    }
-
     /**
      * Set the permission nodes required to execute this command.
      *
@@ -107,22 +103,32 @@ public class CommandPermissions {
         this.permissionNodes = permissionNodes;
     }
 
+    /**
+     * Get the number of permission nodes set.
+     *
+     * @return Permission node count.
+     */
+    public int getPermissionNodeCount() {
+        return this.permissionNodes.size();
+    }
+
     /**
      * 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. */
+     *
+     * @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
@@ -130,12 +136,12 @@ public class CommandPermissions {
 
         // Get the permissions manager, and make sure it's instance is valid
         PermissionsManager permissionsManager = AuthMe.getInstance().getPermissionsManager();
-        if(permissionsManager == null)
+        if (permissionsManager == null)
             return false;
 
         // Check whether the player has permission, return the result
-        for(String node : this.permissionNodes)
+        for (String node : this.permissionNodes)
-            if(!permissionsManager.hasPermission(player, node, defaultPermission))
+            if (!permissionsManager.hasPermission(player, node, defaultPermission))
                 return false;
         return true;
     }
@@ -143,8 +149,8 @@ public class CommandPermissions {
     /**
      * Get the default permission if the permission nodes couldn't be used.
      *
-    
+     * @return The default permission.
-     * @return The default permission. */
+     */
     public DefaultPermission getDefaultPermission() {
         return this.defaultPermission;
     }
@@ -163,10 +169,10 @@ public class CommandPermissions {
      *
      * @param sender The command sender to get the default permission for.
      *
-    
+     * @return True if the command sender has permission by default, false otherwise.
-     * @return True if the command sender has permission by default, false otherwise. */
+     */
     public boolean getDefaultPermissionCommandSender(CommandSender sender) {
-        switch(getDefaultPermission()) {
+        switch (getDefaultPermission()) {
             case ALLOWED:
                 return true;
 

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

@@ -6,14 +6,22 @@ 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 reference.
-    /** The command arguments. */
+     */
-    private CommandParts commandArguments;
+    private final CommandParts commandReference;
-    /** The original search query reference. */
+    /**
-    private CommandParts queryReference;
+     * The command arguments.
+     */
+    private final CommandParts commandArguments;
+    /**
+     * The original search query reference.
+     */
+    private final CommandParts queryReference;
 
     /**
      * Constructor.
@@ -33,11 +41,11 @@ public class FoundCommandResult {
     /**
      * Check whether the command was suitable.
      *
-    
+     * @return True if the command was suitable, false otherwise.
-     * @return True if the command was suitable, false otherwise. */
+     */
     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
@@ -47,8 +55,8 @@ public class FoundCommandResult {
     /**
      * Get the command description.
      *
-    
+     * @return Command description.
-     * @return Command description. */
+     */
     public CommandDescription getCommandDescription() {
         return this.commandDescription;
     }
@@ -57,7 +65,6 @@ public class FoundCommandResult {
      * Set the command description.
      *
      * @param commandDescription The command description.
-     *
      */
     public void setCommandDescription(CommandDescription commandDescription) {
         this.commandDescription = commandDescription;
@@ -66,11 +73,11 @@ public class FoundCommandResult {
     /**
      * Check whether the command is executable.
      *
-    
+     * @return True if the command is executable, false otherwise.
-     * @return True if the command is executable, false otherwise. */
+     */
     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
@@ -82,11 +89,11 @@ public class FoundCommandResult {
      *
      * @param sender The command sender that executed the command.
      *
-    
+     * @return True on success, false on failure.
-     * @return True on success, false on failure. */
+     */
     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
@@ -98,11 +105,11 @@ public class FoundCommandResult {
      *
      * @param sender The command sender.
      *
-    
+     * @return True if the command sender has permission, false otherwise.
-     * @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 (this.commandDescription == null)
             return false;
 
         // Get and return the permission
@@ -112,8 +119,8 @@ public class FoundCommandResult {
     /**
      * Get the command reference.
      *
-    
+     * @return The command reference.
-     * @return The command reference. */
+     */
     public CommandParts getCommandReference() {
         return this.commandReference;
     }
@@ -121,8 +128,8 @@ public class FoundCommandResult {
     /**
      * Get the command arguments.
      *
-    
+     * @return The command arguments.
-     * @return The command arguments. */
+     */
     public CommandParts getCommandArguments() {
         return this.commandArguments;
     }
@@ -130,8 +137,8 @@ public class FoundCommandResult {
     /**
      * Get the original query reference.
      *
-    
+     * @return Original query reference.
-     * @return Original query reference. */
+     */
     public CommandParts getQueryReference() {
         return this.queryReference;
     }
@@ -139,11 +146,11 @@ public class FoundCommandResult {
     /**
      * Get the difference value between the original query and the result reference.
      *
-    
+     * @return The difference value.
-     * @return The difference value. */
+     */
     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,10 +1,9 @@
 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;
 
 /**
  */

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

@@ -1,16 +1,15 @@
 package fr.xephi.authme.command.executable.authme;
 
-import java.util.List;
-
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
+import java.util.List;
 
 /**
  */
@@ -26,7 +25,7 @@ public class AccountsCommand extends ExecutableCommand {
 
         // Get the player query
         String playerQuery = sender.getName();
-        if(commandArguments.getCount() >= 1)
+        if (commandArguments.getCount() >= 1)
             playerQuery = commandArguments.get(0);
         final String playerQueryFinal = playerQuery;
 

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

@@ -1,11 +1,10 @@
 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;
 
 /**
  */
@@ -14,7 +13,7 @@ public class AuthMeCommand extends ExecutableCommand {
     @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.getVersionName() + "! " + ChatColor.RED + "<3");
         sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/" + commandReference.get(0) + " help" + ChatColor.YELLOW + " to view help.");
         sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/" + commandReference.get(0) + " about" + ChatColor.YELLOW + " to view about.");
         return true;

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;
@@ -14,6 +9,10 @@ import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
+import java.security.NoSuchAlgorithmException;
 
 /**
  */

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

@@ -1,12 +1,11 @@
 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;
 
 /**
  */

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

@@ -1,12 +1,11 @@
 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;
 
 /**
  */
@@ -19,11 +18,12 @@ 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
         try {
+            @SuppressWarnings("deprecation")
             Player player = Bukkit.getPlayer(playerName);
             if (player == null || !player.isOnline()) {
                 sender.sendMessage("Player needs to be online!");

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

@@ -1,12 +1,11 @@
 package fr.xephi.authme.command.executable.authme;
 
-import org.bukkit.command.CommandSender;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
+import org.bukkit.command.CommandSender;
 
 /**
  */
@@ -19,13 +18,13 @@ public class GetEmailCommand extends ExecutableCommand {
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *
-    
+     * @return True if the command was executed successfully, false otherwise.
-     * @return True if the command was executed successfully, false otherwise. */
+     */
     @Override
     public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // Get the player name
         String playerName = sender.getName();
-        if(commandArguments.getCount() >= 1)
+        if (commandArguments.getCount() >= 1)
             playerName = commandArguments.get(0);
 
         // Get the authenticated user

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

@@ -1,12 +1,11 @@
 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;
 
 /**
  */
@@ -19,9 +18,10 @@ 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")
         Player player = Bukkit.getPlayer(playerName);
         if (player == null) {
             sender.sendMessage("This player is not actually online");

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

@@ -1,14 +1,13 @@
 package fr.xephi.authme.command.executable.authme;
 
-import java.util.Date;
-
-import org.bukkit.command.CommandSender;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
+import org.bukkit.command.CommandSender;
+
+import java.util.Date;
 
 /**
  */
@@ -18,7 +17,7 @@ public class LastLoginCommand extends ExecutableCommand {
     public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // Get the player
         String playerName = sender.getName();
-        if(commandArguments.getCount() >= 1)
+        if (commandArguments.getCount() >= 1)
             playerName = commandArguments.get(0);
 
         // Validate the player

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

@@ -1,15 +1,14 @@
 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;
 
 /**
  */
@@ -22,8 +21,8 @@ public class PurgeBannedPlayersCommand extends ExecutableCommand {
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *
-    
+     * @return True if the command was executed successfully, false otherwise.
-     * @return True if the command was executed successfully, false otherwise. */
+     */
     @Override
     public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // AuthMe plugin instance

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

@@ -1,15 +1,14 @@
 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;
 
 /**
  */
@@ -22,8 +21,8 @@ public class PurgeCommand extends ExecutableCommand {
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *
-    
+     * @return True if the command was executed successfully, false otherwise.
-     * @return True if the command was executed successfully, false otherwise. */
+     */
     @Override
     public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // AuthMe plugin instance
@@ -36,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;
         }
@@ -59,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,14 +1,13 @@
 package fr.xephi.authme.command.executable.authme;
 
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 /**
  */
@@ -21,8 +20,8 @@ public class PurgeLastPositionCommand extends ExecutableCommand {
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *
-    
+     * @return True if the command was executed successfully, false otherwise.
-     * @return True if the command was executed successfully, false otherwise. */
+     */
     @Override
     public boolean executeCommand(final CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // AuthMe plugin instance
@@ -33,7 +32,7 @@ public class PurgeLastPositionCommand extends ExecutableCommand {
 
         // Get the player
         String playerName = sender.getName();
-        if(commandArguments.getCount() >= 1)
+        if (commandArguments.getCount() >= 1)
             playerName = commandArguments.get(0);
         String playerNameLowerCase = playerName.toLowerCase();
 

src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.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;
@@ -13,6 +8,10 @@ import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
+import java.security.NoSuchAlgorithmException;
 
 /**
  */
@@ -25,8 +24,8 @@ public class RegisterCommand extends ExecutableCommand {
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *
-    
+     * @return True if the command was executed successfully, false otherwise.
-     * @return True if the command was executed successfully, false otherwise. */
+     */
     @Override
     public boolean executeCommand(final CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // AuthMe plugin instance

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

@@ -1,7 +1,6 @@
 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;
@@ -10,6 +9,7 @@ import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.util.Profiler;
+import org.bukkit.command.CommandSender;
 
 /**
  */
@@ -22,8 +22,8 @@ public class ReloadCommand extends ExecutableCommand {
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *
-    
+     * @return True if the command was executed successfully, false otherwise.
-     * @return True if the command was executed successfully, false otherwise. */
+     */
     @Override
     public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // Profile the reload process

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

@@ -1,14 +1,13 @@
 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;
 
 /**
  */
@@ -21,8 +20,8 @@ public class ResetNameCommand extends ExecutableCommand {
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *
-    
+     * @return True if the command was executed successfully, false otherwise.
-     * @return True if the command was executed successfully, false otherwise. */
+     */
     @Override
     public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // AuthMe plugin instance
@@ -33,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,7 +1,5 @@
 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;
@@ -9,6 +7,7 @@ import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
+import org.bukkit.command.CommandSender;
 
 /**
  */
@@ -21,8 +20,8 @@ public class SetEmailCommand extends ExecutableCommand {
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *
-    
+     * @return True if the command was executed successfully, false otherwise.
-     * @return True if the command was executed successfully, false otherwise. */
+     */
     @Override
     public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // AuthMe plugin instance

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

@@ -1,12 +1,11 @@
 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;
 
 /**
  */
@@ -19,8 +18,8 @@ public class SetFirstSpawnCommand extends ExecutableCommand {
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *
-    
+     * @return True if the command was executed successfully, false otherwise.
-     * @return True if the command was executed successfully, false otherwise. */
+     */
     @Override
     public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         try {

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

@@ -1,12 +1,11 @@
 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;
 
 /**
  */
@@ -19,8 +18,8 @@ public class SetSpawnCommand extends ExecutableCommand {
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *
-    
+     * @return True if the command was executed successfully, false otherwise.
-     * @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

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

@@ -1,12 +1,11 @@
 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;
 
 /**
  */
@@ -19,8 +18,8 @@ public class SpawnCommand extends ExecutableCommand {
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *
-    
+     * @return True if the command was executed successfully, false otherwise.
-     * @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

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

@@ -1,12 +1,11 @@
 package fr.xephi.authme.command.executable.authme;
 
-import org.bukkit.ChatColor;
+import fr.xephi.authme.AntiBot;
-import org.bukkit.command.CommandSender;
-
-import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.command.help.HelpProvider;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
 
 /**
  */
@@ -19,29 +18,30 @@ public class SwitchAntiBotCommand extends ExecutableCommand {
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *
-    
+     * @return True if the command was executed successfully, false otherwise.
-     * @return True if the command was executed successfully, false otherwise. */
+     */
     @Override
     public boolean executeCommand(final CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
-        // AuthMe plugin instance
-        final AuthMe plugin = AuthMe.getInstance();
-
         // Get the new state
-        String newState = plugin.getAntiBotModMode() ? "OFF" : "ON";
+        String newState = null;
-        if(commandArguments.getCount() >= 1)
+        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")) {
+        if (newState.equalsIgnoreCase("ON")) {
-            plugin.switchAntiBotMod(true);
+            AntiBot.overrideAntiBotStatus(true);
-            sender.sendMessage("[AuthMe] AntiBotMod enabled");
+            sender.sendMessage("[AuthMe] AntiBot Manual Ovverride: enabled!");
             return true;
         }
 
         // Disable the mod
-        if(newState.equalsIgnoreCase("OFF")) {
+        if (newState.equalsIgnoreCase("OFF")) {
-            plugin.switchAntiBotMod(false);
+            AntiBot.overrideAntiBotStatus(false);
-            sender.sendMessage("[AuthMe] AntiBotMod disabled");
+            sender.sendMessage("[AuthMe] AntiBotMod Manual Ovverride: disabled!");
             return true;
         }
 

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

@@ -1,24 +1,24 @@
 package fr.xephi.authme.command.executable.authme;
 
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scheduler.BukkitTask;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerCache;
 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;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.scheduler.BukkitTask;
 
 /**
  */
@@ -30,8 +30,9 @@ 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. */
+     * @return True if the command was executed successfully, false otherwise.
+     */
     @Override
     public boolean executeCommand(final CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // AuthMe plugin instance
@@ -46,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);
@@ -71,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,13 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
-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;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 /**
  */
@@ -20,13 +19,13 @@ public class VersionCommand extends ExecutableCommand {
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *
-    
+     * @return True if the command was executed successfully, false otherwise.
-     * @return True if the command was executed successfully, false otherwise. */
+     */
     @Override
     public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // Show some version info
-        sender.sendMessage(ChatColor.GOLD + "==========[ " + AuthMe.PLUGIN_NAME.toUpperCase() + " ABOUT ]==========");
+        sender.sendMessage(ChatColor.GOLD + "==========[ " + AuthMe.getPluginName().toUpperCase() + " ABOUT ]==========");
-        sender.sendMessage(ChatColor.GOLD + "Version: " + ChatColor.WHITE + AuthMe.PLUGIN_NAME + " v" + AuthMe.getVersionName() + ChatColor.GRAY + " (code: " + AuthMe.getVersionCode() + ")");
+        sender.sendMessage(ChatColor.GOLD + "Version: " + ChatColor.WHITE + AuthMe.getPluginName() + " v" + AuthMe.getVersionName() + ChatColor.GRAY + " (code: " + AuthMe.getVersionCode() + ")");
         sender.sendMessage(ChatColor.GOLD + "Developers:");
         printDeveloper(sender, "Xephi", "xephi59", "Lead Developer");
         printDeveloper(sender, "DNx5", "DNx5", "Developer");
@@ -55,13 +54,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 (minecraftName.length() != 0)
-            if(isPlayerOnline(minecraftName))
+            if (isPlayerOnline(minecraftName))
                 msg.append(ChatColor.GREEN + "" + ChatColor.ITALIC + " (In-Game)");
 
         // Print the message
@@ -73,12 +72,16 @@ public class VersionCommand extends ExecutableCommand {
      *
      * @param minecraftName The Minecraft player name.
      *
-    
+     * @return True if the player is online, false otherwise.
-     * @return True if the player is online, false otherwise. */
+     */
     private boolean isPlayerOnline(String minecraftName) {
-        for(Player player : Bukkit.getOnlinePlayers())
+        // Note ljacqu 20151121: Generally you should use Utils#getOnlinePlayers to retrieve the list of online players.
-            if(player.getName().equalsIgnoreCase(minecraftName))
+        // 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,45 +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;
         }
 
@@ -47,39 +26,47 @@ 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);
+
+        // Messages instance
+        final Messages m = Messages.getInstance();
+
         // 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;
         }
 
+        // AuthMe plugin instance
+        final AuthMe plugin = AuthMe.getInstance();
+
         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());
+            String randStr = new RandomString(Settings.captchaLength).nextString();
-            for (String s : m.send("wrong_captcha")) {
+            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) { }
 
         // Show a status message
-        m.send(player, "valid_captcha");
+        m.send(player, MessageKey.CAPTCHA_SUCCESS);
-        m.send(player, "login_msg");
+        m.send(player, MessageKey.LOGIN_MESSAGE);
         return true;
     }
 }

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

@@ -1,8 +1,5 @@
 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;
@@ -10,6 +7,8 @@ import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.ChangePasswordTask;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 /**
  */

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

@@ -1,21 +1,12 @@
 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.*;
-import fr.xephi.authme.converter.CrazyLoginConverter;
-import fr.xephi.authme.converter.FlatToSql;
-import fr.xephi.authme.converter.FlatToSqlite;
-import fr.xephi.authme.converter.RakamakConverter;
-import fr.xephi.authme.converter.RoyalAuthConverter;
-import fr.xephi.authme.converter.SqlToFlat;
-import fr.xephi.authme.converter.vAuthConverter;
-import fr.xephi.authme.converter.xAuthConverter;
 import fr.xephi.authme.settings.Messages;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
 
 /**
  */
@@ -28,8 +19,8 @@ public class ConverterCommand extends ExecutableCommand {
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *
-    
+     * @return True if the command was executed successfully, false otherwise.
-     * @return True if the command was executed successfully, false otherwise. */
+     */
     @Override
     public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // AuthMe plugin instance
@@ -99,29 +90,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;
         }
 
-        /**
-         * Method getName.
-        
-         * @return String */
-        String getName() {
-            return this.name;
-        }
-
         /**
          * Method fromName.
+         *
          * @param name String
-        
+         *
-         * @return ConvertType */
+         * @return ConvertType
+         */
         public static ConvertType fromName(String name) {
             for (ConvertType type : ConvertType.values()) {
                 if (type.getName().equalsIgnoreCase(name))
@@ -129,5 +115,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,12 +1,10 @@
 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 org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 /**
  */

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

@@ -1,11 +1,10 @@
 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 org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 /**
  */

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;
@@ -15,6 +10,10 @@ import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.security.NoSuchAlgorithmException;
 
 /**
  */

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

@@ -1,11 +1,10 @@
 package fr.xephi.authme.command.executable.login;
 
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 /**
  */
@@ -21,10 +20,10 @@ public class LoginCommand extends ExecutableCommand {
         // Get the necessary objects
         final AuthMe plugin = AuthMe.getInstance();
         final Player player = (Player) sender;
-        final String playerPass = commandArguments.get(0);
+        final String password = commandArguments.get(0);
 
         // Log the player in
-        plugin.getManagement().performLogin(player, playerPass, false);
+        plugin.getManagement().performLogin(player, password, false);
         return true;
     }
 }

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

@@ -1,11 +1,10 @@
 package fr.xephi.authme.command.executable.logout;
 
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 /**
  */

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

@@ -1,15 +1,14 @@
 package fr.xephi.authme.command.executable.register;
 
-import fr.xephi.authme.process.Management;
-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.Messages;
 import fr.xephi.authme.settings.Settings;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 /**
  */

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

@@ -1,13 +1,12 @@
 package fr.xephi.authme.command.executable.unregister;
 
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 /**
  */
@@ -20,8 +19,8 @@ public class UnregisterCommand extends ExecutableCommand {
      * @param commandReference The command reference.
      * @param commandArguments The command arguments.
      *
-    
+     * @return True if the command was executed successfully, false otherwise.
-     * @return True if the command was executed successfully, false otherwise. */
+     */
     @Override
     public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
         // AuthMe plugin instance
@@ -31,7 +30,7 @@ public class UnregisterCommand extends ExecutableCommand {
         final Messages m = Messages.getInstance();
 
         // Make sure the current command executor is a player
-        if(!(sender instanceof Player)) {
+        if (!(sender instanceof Player)) {
             return true;
         }
 

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

@@ -1,20 +1,19 @@
 package fr.xephi.authme.command.help;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandArgumentDescription;
 import fr.xephi.authme.command.CommandDescription;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.CommandPermissions;
 import fr.xephi.authme.util.StringUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 
 /**
  */
@@ -40,11 +39,11 @@ public class HelpPrinter {
      */
     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 (command.hasDetailedDescription()) {
             sender.sendMessage(ChatColor.GOLD + "Detailed Description:");
             sender.sendMessage(ChatColor.WHITE + " " + command.getDetailedDescription());
         }
@@ -59,20 +58,20 @@ public class HelpPrinter {
     @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
@@ -80,7 +79,7 @@ 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)");
     }
 
@@ -93,27 +92,27 @@ public class HelpPrinter {
     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 (String node : permissions.getPermissionNodes()) {
             boolean nodePermission = true;
-            if(sender instanceof Player)
+            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()) {
+        switch (permissions.getDefaultPermission()) {
             case ALLOWED:
                 sender.sendMessage(ChatColor.GOLD + " Default: " + ChatColor.GRAY + ChatColor.ITALIC + "Permission!");
                 break;
@@ -130,7 +129,7 @@ public class HelpPrinter {
         }
 
         // 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!");
@@ -145,7 +144,7 @@ public class HelpPrinter {
      */
     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
@@ -156,9 +155,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);
         }
@@ -172,7 +171,7 @@ 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));
     }
 
@@ -185,14 +184,14 @@ public class HelpPrinter {
      */
     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,12 +1,11 @@
 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 org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
 
 /**
  */
@@ -41,16 +40,16 @@ public class HelpProvider {
         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 (resultOther != null) {
-            if(result == 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.");
@@ -59,7 +58,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;
@@ -73,7 +72,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 + "'!");
 
@@ -81,8 +80,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 (commandDifference < 0.75)
-                if(result.getCommandDescription() != null)
+                if (result.getCommandDescription() != null)
                     sender.sendMessage(ChatColor.YELLOW + "Did you mean " + ChatColor.GOLD + "/" + baseCommand + " help " + suggestedCommandParts + ChatColor.YELLOW + "?");
 
             // Show the help command
@@ -91,7 +90,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));
 
@@ -100,20 +99,20 @@ public class HelpProvider {
         }
 
         // Print the help header
-        sender.sendMessage(ChatColor.GOLD + "==========[ " + AuthMe.PLUGIN_NAME.toUpperCase() + " HELP ]==========");
+        sender.sendMessage(ChatColor.GOLD + "==========[ " + AuthMe.getPluginName().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,11 +1,10 @@
 package fr.xephi.authme.command.help;
 
-import fr.xephi.authme.util.StringUtils;
-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.StringUtils;
+import org.bukkit.ChatColor;
 
 /**
  * Helper class for formatting a command's structure (name and arguments)

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

@@ -1,17 +1,16 @@
 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
@@ -19,12 +18,13 @@ import fr.xephi.authme.settings.Settings;
  */
 public class CrazyLoginConverter implements Converter {
 
-    public AuthMe instance;
+    public final AuthMe instance;
-    public DataSource database;
+    public final DataSource database;
-    public CommandSender sender;
+    public final CommandSender sender;
 
     /**
      * Constructor for CrazyLoginConverter.
+     *
      * @param instance AuthMe
      * @param sender   CommandSender
      */
@@ -36,14 +36,16 @@ public class CrazyLoginConverter implements Converter {
 
     /**
      * Method getInstance.
-    
+     *
-     * @return CrazyLoginConverter */
+     * @return CrazyLoginConverter
+     */
     public CrazyLoginConverter getInstance() {
         return this;
     }
 
     /**
      * Method run.
+     *
      * @see java.lang.Runnable#run()
      */
     @Override

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

@@ -1,16 +1,11 @@
 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 $
@@ -47,6 +42,7 @@ public class FlatToSql implements Converter {
 
     /**
      * Method run.
+     *
      * @see java.lang.Runnable#run()
      */
     @Override

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

@@ -1,26 +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.*;
-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;
 
 /**
  */
 public class FlatToSqlite implements Converter {
 
-    public CommandSender sender;
+    public final CommandSender sender;
     private String tableName;
     private String columnName;
     private String columnPassword;
@@ -34,8 +28,10 @@ public class FlatToSqlite implements Converter {
     private String database;
     private String columnID;
     private Connection con;
+
     /**
      * Constructor for FlatToSqlite.
+     *
      * @param sender CommandSender
      */
     public FlatToSqlite(CommandSender sender) {
@@ -44,6 +40,7 @@ public class FlatToSqlite implements Converter {
 
     /**
      * Method close.
+     *
      * @param o AutoCloseable
      */
     private static void close(AutoCloseable o) {
@@ -58,6 +55,7 @@ public class FlatToSqlite implements Converter {
 
     /**
      * Method run.
+     *
      * @see java.lang.Runnable#run()
      */
     @Override
@@ -121,9 +119,9 @@ public class FlatToSqlite implements Converter {
 
     /**
      * Method connect.
-    
+     *
-    
+     * @throws ClassNotFoundException * @throws SQLException
-     * @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");
@@ -131,8 +129,9 @@ public class FlatToSqlite implements Converter {
 
     /**
      * Method setup.
-    
+     *
-     * @throws SQLException */
+     * @throws SQLException
+     */
     private synchronized void setup() throws SQLException {
         Statement st = null;
         ResultSet rs = null;
@@ -178,9 +177,11 @@ public class FlatToSqlite implements Converter {
 
     /**
      * Method saveAuth.
+     *
      * @param s String
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     private synchronized boolean saveAuth(String s) {
         PreparedStatement pst = null;
         try {

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

@@ -11,9 +11,11 @@ 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
      */
@@ -23,6 +25,7 @@ public class ForceFlatToSqlite implements Converter {
 
     /**
      * Method run.
+     *
      * @see java.lang.Runnable#run()
      */
     @Override

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,28 +17,19 @@ 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 final AuthMe instance;
-    public DataSource database;
+    public final DataSource database;
-    public CommandSender sender;
+    public final CommandSender sender;
 
     /**
      * Constructor for RakamakConverter.
+     *
      * @param instance AuthMe
      * @param sender   CommandSender
      */
@@ -41,14 +41,16 @@ public class RakamakConverter implements Converter {
 
     /**
      * Method getInstance.
-    
+     *
-     * @return RakamakConverter */
+     * @return RakamakConverter
+     */
     public RakamakConverter getInstance() {
         return this;
     }
 
     /**
      * Method run.
+     *
      * @see java.lang.Runnable#run()
      */
     @Override

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

@@ -1,23 +1,23 @@
 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;
+    public final AuthMe plugin;
-    private DataSource data;
+    private final DataSource data;
 
     /**
      * Constructor for RoyalAuthConverter.
+     *
      * @param plugin AuthMe
      */
     public RoyalAuthConverter(AuthMe plugin) {
@@ -27,6 +27,7 @@ public class RoyalAuthConverter implements Converter {
 
     /**
      * Method run.
+     *
      * @see java.lang.Runnable#run()
      */
     @Override

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

@@ -1,15 +1,16 @@
 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) {
@@ -20,16 +21,18 @@ public class RoyalAuthYamlReader extends CustomConfiguration {
 
     /**
      * Method getLastLogin.
-    
+     *
-     * @return long */
+     * @return long
+     */
     public long getLastLogin() {
         return getLong("timestamps.quit");
     }
 
     /**
      * Method getHash.
-    
+     *
-     * @return String */
+     * @return String
+     */
     public String getHash() {
         return getString("login.password");
     }

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

@@ -1,26 +1,26 @@
 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 org.bukkit.command.CommandSender;
+
+import java.util.List;
 
 /**
  */
 public class SqlToFlat implements Converter {
 
-    public AuthMe plugin;
+    public final AuthMe plugin;
-    public DataSource database;
+    public final DataSource database;
-    public CommandSender sender;
+    public final CommandSender sender;
 
     /**
      * Constructor for SqlToFlat.
+     *
      * @param plugin AuthMe
      * @param sender CommandSender
      */
@@ -32,6 +32,7 @@ public class SqlToFlat implements Converter {
 
     /**
      * Method run.
+     *
      * @see java.lang.Runnable#run()
      */
     @Override

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

@@ -1,21 +1,21 @@
 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 final AuthMe plugin;
-    public DataSource database;
+    public final DataSource database;
-    public CommandSender sender;
+    public final CommandSender sender;
 
     /**
      * Constructor for vAuthConverter.
+     *
      * @param plugin AuthMe
      * @param sender CommandSender
      */
@@ -27,6 +27,7 @@ public class vAuthConverter implements Converter {
 
     /**
      * Method run.
+     *
      * @see java.lang.Runnable#run()
      */
     @Override

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

@@ -1,29 +1,29 @@
 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 org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+
 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;
-
 /**
  */
 public class vAuthFileReader {
 
-    public AuthMe plugin;
+    public final AuthMe plugin;
-    public DataSource database;
+    public final DataSource database;
-    public CommandSender sender;
+    public final CommandSender sender;
 
     /**
      * Constructor for vAuthFileReader.
+     *
      * @param plugin AuthMe
      * @param sender CommandSender
      */
@@ -35,9 +35,10 @@ public class vAuthFileReader {
 
     /**
      * Method convert.
-    
+     *
-     * @throws IOException */
+     * @throws IOException
-    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 {
@@ -48,15 +49,15 @@ 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);
                 }
@@ -70,9 +71,11 @@ public class vAuthFileReader {
 
     /**
      * Method isUUIDinstance.
+     *
      * @param s String
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     private boolean isUUIDinstance(String s) {
         if (String.valueOf(s.charAt(8)).equalsIgnoreCase("-"))
             return true;
@@ -81,9 +84,11 @@ public class vAuthFileReader {
 
     /**
      * Method getName.
+     *
      * @param uuid UUID
-    
+     *
-     * @return String */
+     * @return String
+     */
     private String getName(UUID uuid) {
         try {
             for (OfflinePlayer op : Bukkit.getOfflinePlayers()) {

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

@@ -1,18 +1,18 @@
 package fr.xephi.authme.converter;
 
-import org.bukkit.command.CommandSender;
-
 import fr.xephi.authme.AuthMe;
+import org.bukkit.command.CommandSender;
 
 /**
  */
 public class xAuthConverter implements Converter {
 
-    public AuthMe plugin;
+    public final AuthMe plugin;
-    public CommandSender sender;
+    public final CommandSender sender;
 
     /**
      * Constructor for xAuthConverter.
+     *
      * @param plugin AuthMe
      * @param sender CommandSender
      */
@@ -23,6 +23,7 @@ public class xAuthConverter implements Converter {
 
     /**
      * Method run.
+     *
      * @see java.lang.Runnable#run()
      */
     @Override

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,25 +16,17 @@ 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 final AuthMe instance;
-    public DataSource database;
+    public final DataSource database;
-    public CommandSender sender;
+    public final CommandSender sender;
 
     /**
      * Constructor for xAuthToFlat.
+     *
      * @param instance AuthMe
      * @param sender   CommandSender
      */
@@ -38,8 +38,9 @@ public class xAuthToFlat {
 
     /**
      * Method convert.
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     public boolean convert() {
         if (instance.getServer().getPluginManager().getPlugin("xAuth") == null) {
             sender.sendMessage("[AuthMe] xAuth plugin not found");
@@ -63,7 +64,7 @@ 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 ");
         }
@@ -72,9 +73,11 @@ public class xAuthToFlat {
 
     /**
      * Method getIdPlayer.
+     *
      * @param id int
-    
+     *
-     * @return String */
+     * @return String
+     */
     public String getIdPlayer(int id) {
         String realPass = "";
         Connection conn = xAuth.getPlugin().getDatabaseController().getConnection();
@@ -99,8 +102,9 @@ public class xAuthToFlat {
 
     /**
      * Method getXAuthPlayers.
-    
+     *
-     * @return List<Integer> */
+     * @return List<Integer>
+     */
     public List<Integer> getXAuthPlayers() {
         List<Integer> xP = new ArrayList<>();
         Connection conn = xAuth.getPlugin().getDatabaseController().getConnection();
@@ -124,9 +128,11 @@ public class xAuthToFlat {
 
     /**
      * Method getPassword.
+     *
      * @param accountId int
-    
+     *
-     * @return String */
+     * @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,5 +1,11 @@
 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;
@@ -8,13 +14,6 @@ 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 {
@@ -25,6 +24,7 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Constructor for CacheDataSource.
+     *
      * @param pl  AuthMe
      * @param src DataSource
      */
@@ -51,10 +51,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method isAuthAvailable.
+     *
      * @param user String
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isAuthAvailable(String)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isAuthAvailable(String) */
+     */
     @Override
     public synchronized boolean isAuthAvailable(String user) {
         return cache.containsKey(user.toLowerCase());
@@ -62,10 +63,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method getAuth.
+     *
      * @param user String
-    
+     *
-    
+     * @return PlayerAuth * @see fr.xephi.authme.datasource.DataSource#getAuth(String)
-     * @return PlayerAuth * @see fr.xephi.authme.datasource.DataSource#getAuth(String) */
+     */
     @Override
     public synchronized PlayerAuth getAuth(String user) {
         user = user.toLowerCase();
@@ -77,10 +79,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method saveAuth.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#saveAuth(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#saveAuth(PlayerAuth) */
+     */
     @Override
     public synchronized boolean saveAuth(final PlayerAuth auth) {
         cache.put(auth.getNickname(), auth);
@@ -97,10 +100,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method updatePassword.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updatePassword(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updatePassword(PlayerAuth) */
+     */
     @Override
     public synchronized boolean updatePassword(final PlayerAuth auth) {
         if (!cache.containsKey(auth.getNickname())) {
@@ -123,10 +127,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method updateSession.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSession(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSession(PlayerAuth) */
+     */
     @Override
     public boolean updateSession(final PlayerAuth auth) {
         if (!cache.containsKey(auth.getNickname())) {
@@ -158,10 +163,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method updateQuitLoc.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateQuitLoc(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateQuitLoc(PlayerAuth) */
+     */
     @Override
     public boolean updateQuitLoc(final PlayerAuth auth) {
         if (!cache.containsKey(auth.getNickname())) {
@@ -196,10 +202,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method getIps.
+     *
      * @param ip String
-    
+     *
-    
+     * @return int * @see fr.xephi.authme.datasource.DataSource#getIps(String)
-     * @return int * @see fr.xephi.authme.datasource.DataSource#getIps(String) */
+     */
     @Override
     public int getIps(String ip) {
         int count = 0;
@@ -213,10 +220,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method purgeDatabase.
+     *
      * @param until long
-    
+     *
-    
+     * @return int * @see fr.xephi.authme.datasource.DataSource#purgeDatabase(long)
-     * @return int * @see fr.xephi.authme.datasource.DataSource#purgeDatabase(long) */
+     */
     @Override
     public int purgeDatabase(long until) {
         int cleared = source.purgeDatabase(until);
@@ -232,10 +240,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method autoPurgeDatabase.
+     *
      * @param until long
-    
+     *
-    
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#autoPurgeDatabase(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);
@@ -251,10 +260,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method removeAuth.
+     *
      * @param username String
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#removeAuth(String)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#removeAuth(String) */
+     */
     @Override
     public synchronized boolean removeAuth(String username) {
         final String user = username.toLowerCase();
@@ -273,6 +283,7 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method close.
+     *
      * @see fr.xephi.authme.datasource.DataSource#close()
      */
     @Override
@@ -283,6 +294,7 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method reload.
+     *
      * @see fr.xephi.authme.datasource.DataSource#reload()
      */
     @Override
@@ -305,10 +317,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method updateEmail.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateEmail(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateEmail(PlayerAuth) */
+     */
     @Override
     public synchronized boolean updateEmail(final PlayerAuth auth) {
         try {
@@ -324,10 +337,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method updateSalt.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSalt(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSalt(PlayerAuth) */
+     */
     @Override
     public synchronized boolean updateSalt(final PlayerAuth auth) {
         if (!cache.containsKey(auth.getNickname())) {
@@ -351,10 +365,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method getAllAuthsByName.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByName(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<>();
@@ -368,11 +383,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method getAllAuthsByIp.
+     *
      * @param ip String
-    
+     *
-    
+     * @return List<String> * @throws Exception * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByIp(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>>() {
@@ -384,11 +399,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method getAllAuthsByEmail.
+     *
      * @param email String
-    
+     *
-    
+     * @return List<String> * @throws Exception * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByEmail(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>>() {
@@ -400,9 +415,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method purgeBanned.
+     *
      * @param banned List<String>
-    
+     *
-     * @see fr.xephi.authme.datasource.DataSource#purgeBanned(List<String>) */
+     * @see fr.xephi.authme.datasource.DataSource#purgeBanned(List<String>)
+     */
     @Override
     public synchronized void purgeBanned(final List<String> banned) {
         exec.execute(new Runnable() {
@@ -420,9 +437,9 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method getType.
-    
+     *
-    
+     * @return DataSourceType * @see fr.xephi.authme.datasource.DataSource#getType()
-     * @return DataSourceType * @see fr.xephi.authme.datasource.DataSource#getType() */
+     */
     @Override
     public DataSourceType getType() {
         return source.getType();
@@ -430,10 +447,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method isLogged.
+     *
      * @param user String
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isLogged(String)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isLogged(String) */
+     */
     @Override
     public boolean isLogged(String user) {
         user = user.toLowerCase();
@@ -442,9 +460,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method setLogged.
+     *
      * @param user String
-    
+     *
-     * @see fr.xephi.authme.datasource.DataSource#setLogged(String) */
+     * @see fr.xephi.authme.datasource.DataSource#setLogged(String)
+     */
     @Override
     public void setLogged(final String user) {
         exec.execute(new Runnable() {
@@ -457,9 +477,11 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method setUnlogged.
+     *
      * @param user String
-    
+     *
-     * @see fr.xephi.authme.datasource.DataSource#setUnlogged(String) */
+     * @see fr.xephi.authme.datasource.DataSource#setUnlogged(String)
+     */
     @Override
     public void setUnlogged(final String user) {
         exec.execute(new Runnable() {
@@ -472,6 +494,7 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method purgeLogged.
+     *
      * @see fr.xephi.authme.datasource.DataSource#purgeLogged()
      */
     @Override
@@ -486,9 +509,9 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method getAccountsRegistered.
-    
+     *
-    
+     * @return int * @see fr.xephi.authme.datasource.DataSource#getAccountsRegistered()
-     * @return int * @see fr.xephi.authme.datasource.DataSource#getAccountsRegistered() */
+     */
     @Override
     public int getAccountsRegistered() {
         return cache.size();
@@ -496,29 +519,31 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method updateName.
-     * @param oldone String
+     *
-     * @param newone String
+     * @param oldOne String
-    
+     * @param newOne String
-     * @see fr.xephi.authme.datasource.DataSource#updateName(String, String) */
+     *
+     * @see fr.xephi.authme.datasource.DataSource#updateName(String, String)
+     */
     @Override
-    public void updateName(final String oldone, final String newone) {
+    public void updateName(final String oldOne, final String newOne) {
-        if (cache.containsKey(oldone)) {
+        if (cache.containsKey(oldOne)) {
-            cache.put(newone, cache.get(oldone));
+            cache.put(newOne, cache.get(oldOne));
-            cache.remove(oldone);
+            cache.remove(oldOne);
         }
         exec.execute(new Runnable() {
             @Override
             public void run() {
-                source.updateName(oldone, newone);
+                source.updateName(oldOne, newOne);
             }
         });
     }
 
     /**
      * Method getAllAuths.
-    
+     *
-    
+     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getAllAuths()
-     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getAllAuths() */
+     */
     @Override
     public List<PlayerAuth> getAllAuths() {
         return new ArrayList<>(cache.values());
@@ -526,9 +551,9 @@ public class CacheDataSource implements DataSource {
 
     /**
      * Method getLoggedPlayers.
-    
+     *
-    
+     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#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,126 +1,146 @@
 package fr.xephi.authme.datasource;
 
-import java.util.List;
-
 import fr.xephi.authme.cache.auth.PlayerAuth;
 
+import java.util.List;
+
 /**
  */
 public interface DataSource {
 
-    /**
-     */
-    enum DataSourceType {
-        MYSQL,
-        FILE,
-        SQLITE
-    }
-
     /**
      * Method isAuthAvailable.
+     *
      * @param user String
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     boolean isAuthAvailable(String user);
 
     /**
      * Method getAuth.
+     *
      * @param user String
-    
+     *
-     * @return PlayerAuth */
+     * @return PlayerAuth
+     */
     PlayerAuth getAuth(String user);
 
     /**
      * Method saveAuth.
+     *
      * @param auth PlayerAuth
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     boolean saveAuth(PlayerAuth auth);
 
     /**
      * Method updateSession.
+     *
      * @param auth PlayerAuth
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     boolean updateSession(PlayerAuth auth);
 
     /**
      * Method updatePassword.
+     *
      * @param auth PlayerAuth
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     boolean updatePassword(PlayerAuth auth);
 
     /**
      * Method purgeDatabase.
+     *
      * @param until long
-    
+     *
-     * @return int */
+     * @return int
+     */
     int purgeDatabase(long until);
 
     /**
      * Method autoPurgeDatabase.
+     *
      * @param until long
-    
+     *
-     * @return List<String> */
+     * @return List<String>
+     */
     List<String> autoPurgeDatabase(long until);
 
     /**
      * Method removeAuth.
+     *
      * @param user String
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     boolean removeAuth(String user);
 
     /**
      * Method updateQuitLoc.
+     *
      * @param auth PlayerAuth
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     boolean updateQuitLoc(PlayerAuth auth);
 
     /**
      * Method getIps.
+     *
      * @param ip String
-    
+     *
-     * @return int */
+     * @return int
+     */
     int getIps(String ip);
 
     /**
      * Method getAllAuthsByName.
+     *
      * @param auth PlayerAuth
-    
+     *
-     * @return List<String> */
+     * @return List<String>
+     */
     List<String> getAllAuthsByName(PlayerAuth auth);
 
     /**
      * Method getAllAuthsByIp.
+     *
      * @param ip String
-    
+     *
-    
+     * @return List<String> * @throws Exception
-     * @return List<String> * @throws Exception */
+     */
     List<String> getAllAuthsByIp(String ip) throws Exception;
 
     /**
      * Method getAllAuthsByEmail.
+     *
      * @param email String
-    
+     *
-    
+     * @return List<String> * @throws Exception
-     * @return List<String> * @throws Exception */
+     */
     List<String> getAllAuthsByEmail(String email) throws Exception;
 
     /**
      * Method updateEmail.
+     *
      * @param auth PlayerAuth
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     boolean updateEmail(PlayerAuth auth);
 
     /**
      * Method updateSalt.
+     *
      * @param auth PlayerAuth
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     boolean updateSalt(PlayerAuth auth);
 
     void close();
@@ -129,31 +149,37 @@ public interface DataSource {
 
     /**
      * Method purgeBanned.
+     *
      * @param banned List<String>
      */
     void purgeBanned(List<String> banned);
 
     /**
      * Method getType.
-    
+     *
-     * @return DataSourceType */
+     * @return DataSourceType
+     */
     DataSourceType getType();
 
     /**
      * Method isLogged.
+     *
      * @param user String
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     boolean isLogged(String user);
 
     /**
      * Method setLogged.
+     *
      * @param user String
      */
     void setLogged(String user);
 
     /**
      * Method setUnlogged.
+     *
      * @param user String
      */
     void setUnlogged(String user);
@@ -162,27 +188,36 @@ public interface DataSource {
 
     /**
      * Method getAccountsRegistered.
-    
+     *
-     * @return int */
+     * @return int
+     */
     int getAccountsRegistered();
 
     /**
      * Method updateName.
-     * @param oldone String
+     *
-     * @param newone String
+     * @param oldOne String
+     * @param newOne String
      */
-    void updateName(String oldone, String newone);
+    void updateName(String oldOne, String newOne);
 
     /**
      * Method getAllAuths.
-    
+     *
-     * @return List<PlayerAuth> */
+     * @return List<PlayerAuth>
+     */
     List<PlayerAuth> getAllAuths();
 
     /**
      * Method getLoggedPlayers.
-    
+     *
-     * @return List<PlayerAuth> */
+     * @return List<PlayerAuth>
+     */
     List<PlayerAuth> getLoggedPlayers();
 
+    enum DataSourceType {
+        MYSQL,
+        FILE,
+        SQLITE
+    }
 }

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

@@ -1,22 +1,23 @@
 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;
 
-import fr.xephi.authme.cache.auth.PlayerAuth;
-
 /**
  */
 public class DatabaseCalls implements DataSource {
 
-    private DataSource database;
     private final ExecutorService exec;
+    private final DataSource database;
 
     /**
      * Constructor for DatabaseCalls.
+     *
      * @param database DataSource
      */
     public DatabaseCalls(DataSource database) {
@@ -26,10 +27,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method isAuthAvailable.
+     *
      * @param user String
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isAuthAvailable(String)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isAuthAvailable(String) */
+     */
     @Override
     public synchronized boolean isAuthAvailable(final String user) {
         try {
@@ -45,10 +47,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method getAuth.
+     *
      * @param user String
-    
+     *
-    
+     * @return PlayerAuth * @see fr.xephi.authme.datasource.DataSource#getAuth(String)
-     * @return PlayerAuth * @see fr.xephi.authme.datasource.DataSource#getAuth(String) */
+     */
     @Override
     public synchronized PlayerAuth getAuth(final String user) {
         try {
@@ -64,10 +67,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method saveAuth.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#saveAuth(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#saveAuth(PlayerAuth) */
+     */
     @Override
     public synchronized boolean saveAuth(final PlayerAuth auth) {
         try {
@@ -83,10 +87,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method updateSession.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSession(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSession(PlayerAuth) */
+     */
     @Override
     public synchronized boolean updateSession(final PlayerAuth auth) {
         try {
@@ -102,10 +107,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method updatePassword.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updatePassword(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updatePassword(PlayerAuth) */
+     */
     @Override
     public synchronized boolean updatePassword(final PlayerAuth auth) {
         try {
@@ -121,10 +127,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method purgeDatabase.
+     *
      * @param until long
-    
+     *
-    
+     * @return int * @see fr.xephi.authme.datasource.DataSource#purgeDatabase(long)
-     * @return int * @see fr.xephi.authme.datasource.DataSource#purgeDatabase(long) */
+     */
     @Override
     public synchronized int purgeDatabase(final long until) {
         try {
@@ -140,10 +147,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method autoPurgeDatabase.
+     *
      * @param until long
-    
+     *
-    
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#autoPurgeDatabase(long)
-     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#autoPurgeDatabase(long) */
+     */
     @Override
     public synchronized List<String> autoPurgeDatabase(final long until) {
         try {
@@ -159,10 +167,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method removeAuth.
+     *
      * @param user String
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#removeAuth(String)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#removeAuth(String) */
+     */
     @Override
     public synchronized boolean removeAuth(final String user) {
         try {
@@ -178,10 +187,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method updateQuitLoc.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateQuitLoc(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateQuitLoc(PlayerAuth) */
+     */
     @Override
     public synchronized boolean updateQuitLoc(final PlayerAuth auth) {
         try {
@@ -197,10 +207,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method getIps.
+     *
      * @param ip String
-    
+     *
-    
+     * @return int * @see fr.xephi.authme.datasource.DataSource#getIps(String)
-     * @return int * @see fr.xephi.authme.datasource.DataSource#getIps(String) */
+     */
     @Override
     public synchronized int getIps(final String ip) {
         try {
@@ -217,10 +228,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method getAllAuthsByName.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByName(PlayerAuth)
-     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByName(PlayerAuth) */
+     */
     @Override
     public synchronized List<String> getAllAuthsByName(final PlayerAuth auth) {
         try {
@@ -236,10 +248,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method getAllAuthsByIp.
+     *
      * @param ip String
-    
+     *
-    
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByIp(String)
-     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByIp(String) */
+     */
     @Override
     public synchronized List<String> getAllAuthsByIp(final String ip) {
         try {
@@ -255,10 +268,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method getAllAuthsByEmail.
+     *
      * @param email String
-    
+     *
-    
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByEmail(String)
-     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByEmail(String) */
+     */
     @Override
     public synchronized List<String> getAllAuthsByEmail(final String email) {
         try {
@@ -274,10 +288,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method updateEmail.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateEmail(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateEmail(PlayerAuth) */
+     */
     @Override
     public synchronized boolean updateEmail(final PlayerAuth auth) {
         try {
@@ -293,10 +308,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method updateSalt.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSalt(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSalt(PlayerAuth) */
+     */
     @Override
     public synchronized boolean updateSalt(final PlayerAuth auth) {
         try {
@@ -312,6 +328,7 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method close.
+     *
      * @see fr.xephi.authme.datasource.DataSource#close()
      */
     @Override
@@ -322,6 +339,7 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method reload.
+     *
      * @see fr.xephi.authme.datasource.DataSource#reload()
      */
     @Override
@@ -331,9 +349,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method purgeBanned.
+     *
      * @param banned List<String>
-    
+     *
-     * @see fr.xephi.authme.datasource.DataSource#purgeBanned(List<String>) */
+     * @see fr.xephi.authme.datasource.DataSource#purgeBanned(List<String>)
+     */
     @Override
     public synchronized void purgeBanned(final List<String> banned) {
         new Thread(new Runnable() {
@@ -345,9 +365,9 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method getType.
-    
+     *
-    
+     * @return DataSourceType * @see fr.xephi.authme.datasource.DataSource#getType()
-     * @return DataSourceType * @see fr.xephi.authme.datasource.DataSource#getType() */
+     */
     @Override
     public synchronized DataSourceType getType() {
         return database.getType();
@@ -355,10 +375,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method isLogged.
+     *
      * @param user String
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isLogged(String)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isLogged(String) */
+     */
     @Override
     public synchronized boolean isLogged(final String user) {
         try {
@@ -374,9 +395,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method setLogged.
+     *
      * @param user String
-    
+     *
-     * @see fr.xephi.authme.datasource.DataSource#setLogged(String) */
+     * @see fr.xephi.authme.datasource.DataSource#setLogged(String)
+     */
     @Override
     public synchronized void setLogged(final String user) {
         exec.execute(new Runnable() {
@@ -388,9 +411,11 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method setUnlogged.
+     *
      * @param user String
-    
+     *
-     * @see fr.xephi.authme.datasource.DataSource#setUnlogged(String) */
+     * @see fr.xephi.authme.datasource.DataSource#setUnlogged(String)
+     */
     @Override
     public synchronized void setUnlogged(final String user) {
         exec.execute(new Runnable() {
@@ -402,6 +427,7 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method purgeLogged.
+     *
      * @see fr.xephi.authme.datasource.DataSource#purgeLogged()
      */
     @Override
@@ -415,9 +441,9 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method getAccountsRegistered.
-    
+     *
-    
+     * @return int * @see fr.xephi.authme.datasource.DataSource#getAccountsRegistered()
-     * @return int * @see fr.xephi.authme.datasource.DataSource#getAccountsRegistered() */
+     */
     @Override
     public synchronized int getAccountsRegistered() {
         try {
@@ -433,24 +459,26 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method updateName.
-     * @param oldone String
+     *
-     * @param newone String
+     * @param oldOne String
-    
+     * @param newOne String
-     * @see fr.xephi.authme.datasource.DataSource#updateName(String, String) */
+     *
+     * @see fr.xephi.authme.datasource.DataSource#updateName(String, String)
+     */
     @Override
-    public synchronized void updateName(final String oldone, final String newone) {
+    public synchronized void updateName(final String oldOne, final String newOne) {
         exec.execute(new Runnable() {
             public synchronized void run() {
-                database.updateName(oldone, newone);
+                database.updateName(oldOne, newOne);
             }
         });
     }
 
     /**
      * Method getAllAuths.
-    
+     *
-    
+     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getAllAuths()
-     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getAllAuths() */
+     */
     @Override
     public synchronized List<PlayerAuth> getAllAuths() {
         try {
@@ -466,9 +494,9 @@ public class DatabaseCalls implements DataSource {
 
     /**
      * Method getLoggedPlayers.
-    
+     *
-    
+     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getLoggedPlayers()
-     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getLoggedPlayers() */
+     */
     @Override
     public List<PlayerAuth> getLoggedPlayers() {
         try {

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

@@ -1,21 +1,15 @@
 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 {
@@ -31,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;
@@ -52,10 +46,11 @@ public class FlatFile implements DataSource {
 
     /**
      * Method isAuthAvailable.
+     *
      * @param user String
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isAuthAvailable(String)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isAuthAvailable(String) */
+     */
     @Override
     public synchronized boolean isAuthAvailable(String user) {
         BufferedReader br = null;
@@ -78,7 +73,7 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -87,10 +82,11 @@ public class FlatFile implements DataSource {
 
     /**
      * Method saveAuth.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#saveAuth(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#saveAuth(PlayerAuth) */
+     */
     @Override
     public synchronized boolean saveAuth(PlayerAuth auth) {
         if (isAuthAvailable(auth.getNickname())) {
@@ -107,7 +103,7 @@ public class FlatFile implements DataSource {
             if (bw != null) {
                 try {
                     bw.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -116,10 +112,11 @@ public class FlatFile implements DataSource {
 
     /**
      * Method updatePassword.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updatePassword(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updatePassword(PlayerAuth) */
+     */
     @Override
     public synchronized boolean updatePassword(PlayerAuth auth) {
         if (!isAuthAvailable(auth.getNickname())) {
@@ -168,7 +165,7 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -181,10 +178,11 @@ public class FlatFile implements DataSource {
 
     /**
      * Method updateSession.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSession(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSession(PlayerAuth) */
+     */
     @Override
     public boolean updateSession(PlayerAuth auth) {
         if (!isAuthAvailable(auth.getNickname())) {
@@ -233,7 +231,7 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -246,10 +244,11 @@ public class FlatFile implements DataSource {
 
     /**
      * Method updateQuitLoc.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateQuitLoc(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateQuitLoc(PlayerAuth) */
+     */
     @Override
     public boolean updateQuitLoc(PlayerAuth auth) {
         if (!isAuthAvailable(auth.getNickname())) {
@@ -277,7 +276,7 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -290,10 +289,11 @@ public class FlatFile implements DataSource {
 
     /**
      * Method getIps.
+     *
      * @param ip String
-    
+     *
-    
+     * @return int * @see fr.xephi.authme.datasource.DataSource#getIps(String)
-     * @return int * @see fr.xephi.authme.datasource.DataSource#getIps(String) */
+     */
     @Override
     public int getIps(String ip) {
         BufferedReader br = null;
@@ -318,7 +318,7 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -326,10 +326,11 @@ public class FlatFile implements DataSource {
 
     /**
      * Method purgeDatabase.
+     *
      * @param until long
-    
+     *
-    
+     * @return int * @see fr.xephi.authme.datasource.DataSource#purgeDatabase(long)
-     * @return int * @see fr.xephi.authme.datasource.DataSource#purgeDatabase(long) */
+     */
     @Override
     public int purgeDatabase(long until) {
         BufferedReader br = null;
@@ -363,13 +364,13 @@ 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) {
                 }
             }
         }
@@ -378,10 +379,11 @@ public class FlatFile implements DataSource {
 
     /**
      * Method autoPurgeDatabase.
+     *
      * @param until long
-    
+     *
-    
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#autoPurgeDatabase(long)
-     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#autoPurgeDatabase(long) */
+     */
     @Override
     public List<String> autoPurgeDatabase(long until) {
         BufferedReader br = null;
@@ -415,13 +417,13 @@ 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) {
                 }
             }
         }
@@ -430,10 +432,11 @@ public class FlatFile implements DataSource {
 
     /**
      * Method removeAuth.
+     *
      * @param user String
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#removeAuth(String)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#removeAuth(String) */
+     */
     @Override
     public synchronized boolean removeAuth(String user) {
         if (!isAuthAvailable(user)) {
@@ -465,13 +468,13 @@ 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) {
                 }
             }
         }
@@ -480,10 +483,11 @@ public class FlatFile implements DataSource {
 
     /**
      * Method getAuth.
+     *
      * @param user String
-    
+     *
-    
+     * @return PlayerAuth * @see fr.xephi.authme.datasource.DataSource#getAuth(String)
-     * @return PlayerAuth * @see fr.xephi.authme.datasource.DataSource#getAuth(String) */
+     */
     @Override
     public synchronized PlayerAuth getAuth(String user) {
         BufferedReader br = null;
@@ -519,7 +523,7 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -528,6 +532,7 @@ public class FlatFile implements DataSource {
 
     /**
      * Method close.
+     *
      * @see fr.xephi.authme.datasource.DataSource#close()
      */
     @Override
@@ -536,6 +541,7 @@ public class FlatFile implements DataSource {
 
     /**
      * Method reload.
+     *
      * @see fr.xephi.authme.datasource.DataSource#reload()
      */
     @Override
@@ -544,10 +550,11 @@ public class FlatFile implements DataSource {
 
     /**
      * Method updateEmail.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateEmail(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateEmail(PlayerAuth) */
+     */
     @Override
     public boolean updateEmail(PlayerAuth auth) {
         if (!isAuthAvailable(auth.getNickname())) {
@@ -575,7 +582,7 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -588,10 +595,11 @@ public class FlatFile implements DataSource {
 
     /**
      * Method updateSalt.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSalt(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSalt(PlayerAuth) */
+     */
     @Override
     public boolean updateSalt(PlayerAuth auth) {
         return false;
@@ -599,10 +607,11 @@ public class FlatFile implements DataSource {
 
     /**
      * Method getAllAuthsByName.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByName(PlayerAuth)
-     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByName(PlayerAuth) */
+     */
     @Override
     public List<String> getAllAuthsByName(PlayerAuth auth) {
         BufferedReader br = null;
@@ -627,7 +636,7 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -635,10 +644,11 @@ public class FlatFile implements DataSource {
 
     /**
      * Method getAllAuthsByIp.
+     *
      * @param ip String
-    
+     *
-    
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByIp(String)
-     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByIp(String) */
+     */
     @Override
     public List<String> getAllAuthsByIp(String ip) {
         BufferedReader br = null;
@@ -663,7 +673,7 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -671,10 +681,11 @@ public class FlatFile implements DataSource {
 
     /**
      * Method getAllAuthsByEmail.
+     *
      * @param email String
-    
+     *
-    
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByEmail(String)
-     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByEmail(String) */
+     */
     @Override
     public List<String> getAllAuthsByEmail(String email) {
         BufferedReader br = null;
@@ -699,7 +710,7 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -707,9 +718,11 @@ public class FlatFile implements DataSource {
 
     /**
      * Method purgeBanned.
+     *
      * @param banned List<String>
-    
+     *
-     * @see fr.xephi.authme.datasource.DataSource#purgeBanned(List<String>) */
+     * @see fr.xephi.authme.datasource.DataSource#purgeBanned(List<String>)
+     */
     @Override
     public void purgeBanned(List<String> banned) {
         BufferedReader br = null;
@@ -724,41 +737,38 @@ 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()
-     * @return DataSourceType * @see fr.xephi.authme.datasource.DataSource#getType() */
+     */
     @Override
     public DataSourceType getType() {
         return DataSourceType.FILE;
@@ -766,10 +776,11 @@ public class FlatFile implements DataSource {
 
     /**
      * Method isLogged.
+     *
      * @param user String
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isLogged(String)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isLogged(String) */
+     */
     @Override
     public boolean isLogged(String user) {
         return PlayerCache.getInstance().isAuthenticated(user);
@@ -777,24 +788,29 @@ public class FlatFile implements DataSource {
 
     /**
      * Method setLogged.
+     *
      * @param user String
-    
+     *
-     * @see fr.xephi.authme.datasource.DataSource#setLogged(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) */
+     * @see fr.xephi.authme.datasource.DataSource#setUnlogged(String)
+     */
     @Override
     public void setUnlogged(String user) {
     }
 
     /**
      * Method purgeLogged.
+     *
      * @see fr.xephi.authme.datasource.DataSource#purgeLogged()
      */
     @Override
@@ -803,9 +819,9 @@ public class FlatFile implements DataSource {
 
     /**
      * Method getAccountsRegistered.
-    
+     *
-    
+     * @return int * @see fr.xephi.authme.datasource.DataSource#getAccountsRegistered()
-     * @return int * @see fr.xephi.authme.datasource.DataSource#getAccountsRegistered() */
+     */
     @Override
     public int getAccountsRegistered() {
         BufferedReader br = null;
@@ -822,7 +838,7 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -831,23 +847,25 @@ public class FlatFile implements DataSource {
 
     /**
      * Method updateName.
-     * @param oldone String
+     *
-     * @param newone String
+     * @param oldOne String
-    
+     * @param newOne String
-     * @see fr.xephi.authme.datasource.DataSource#updateName(String, String) */
+     *
+     * @see fr.xephi.authme.datasource.DataSource#updateName(String, String)
+     */
     @Override
-    public void updateName(String oldone, String newone) {
+    public void updateName(String oldOne, String newOne) {
-        PlayerAuth auth = this.getAuth(oldone);
+        PlayerAuth auth = this.getAuth(oldOne);
-        auth.setName(newone);
+        auth.setName(newOne);
         this.saveAuth(auth);
-        this.removeAuth(oldone);
+        this.removeAuth(oldOne);
     }
 
     /**
      * Method getAllAuths.
-    
+     *
-    
+     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getAllAuths()
-     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getAllAuths() */
+     */
     @Override
     public List<PlayerAuth> getAllAuths() {
         BufferedReader br = null;
@@ -888,7 +906,7 @@ public class FlatFile implements DataSource {
             if (br != null) {
                 try {
                     br.close();
-                } catch (IOException ex) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -897,9 +915,9 @@ public class FlatFile implements DataSource {
 
     /**
      * Method getLoggedPlayers.
-    
+     *
-    
+     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#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/datasource/MySQL.java

@@ -1,58 +1,51 @@
 package fr.xephi.authme.datasource;
 
-import java.sql.Blob;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import com.zaxxer.hikari.pool.PoolInitializationException;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.security.HashAlgorithm;
 import fr.xephi.authme.settings.Settings;
 
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  */
 public class MySQL implements DataSource {
 
-    private String host;
+    private final String host;
-    private String port;
+    private final String port;
-    private String username;
+    private final String username;
-    private String password;
+    private final String password;
-    private String database;
+    private final String database;
-    private String tableName;
+    private final String tableName;
-    private String columnName;
+    private final String columnName;
-    private String columnPassword;
+    private final String columnPassword;
-    private String columnIp;
+    private final String columnIp;
-    private String columnLastLogin;
+    private final String columnLastLogin;
-    private String columnSalt;
+    private final String columnSalt;
-    private String columnGroup;
+    private final String columnGroup;
-    private String lastlocX;
+    private final String lastlocX;
-    private String lastlocY;
+    private final String lastlocY;
-    private String lastlocZ;
+    private final String lastlocZ;
-    private String lastlocWorld;
+    private final String lastlocWorld;
-    private String columnEmail;
+    private final String columnEmail;
-    private String columnID;
+    private final String columnID;
-    private String columnLogged;
+    private final String columnLogged;
-    private List<String> columnOthers;
+    private final List<String> columnOthers;
     private HikariDataSource ds;
-    private String columnRealName;
+    private final String columnRealName;
-    private int maxConnections;
+    private final int maxConnections;
 
     /**
      * Constructor for MySQL.
-    
+     *
-    
+     * @throws ClassNotFoundException * @throws SQLException * @throws PoolInitializationException
-    
+     */
-     * @throws ClassNotFoundException * @throws SQLException * @throws PoolInitializationException */
     public MySQL() throws ClassNotFoundException, SQLException, PoolInitializationException {
         this.host = Settings.getMySQLHost;
         this.port = Settings.getMySQLPort;
@@ -108,11 +101,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method setConnectionArguments.
-    
+     *
-    
+     * @throws ClassNotFoundException * @throws IllegalArgumentException
-     * @throws ClassNotFoundException * @throws IllegalArgumentException */
+     */
     private synchronized void setConnectionArguments()
-            throws ClassNotFoundException, IllegalArgumentException {
+        throws IllegalArgumentException {
         HikariConfig config = new HikariConfig();
         config.setPoolName("AuthMeMYSQLPool");
         config.setDriverClassName("com.mysql.jdbc.Driver");
@@ -132,9 +125,9 @@ public class MySQL implements DataSource {
 
     /**
      * Method reloadArguments.
-    
+     *
-    
+     * @throws ClassNotFoundException * @throws IllegalArgumentException
-     * @throws ClassNotFoundException * @throws IllegalArgumentException */
+     */
     private synchronized void reloadArguments()
         throws ClassNotFoundException, IllegalArgumentException {
         if (ds != null) {
@@ -146,17 +139,18 @@ public class MySQL implements DataSource {
 
     /**
      * Method getConnection.
-    
+     *
-    
+     * @return Connection * @throws SQLException
-     * @return Connection * @throws SQLException */
+     */
     private synchronized Connection getConnection() throws SQLException {
         return ds.getConnection();
     }
 
     /**
      * Method setupConnection.
-    
+     *
-     * @throws SQLException */
+     * @throws SQLException
+     */
     private synchronized void setupConnection() throws SQLException {
         Connection con = null;
         Statement st = null;
@@ -222,10 +216,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method isAuthAvailable.
+     *
      * @param user String
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isAuthAvailable(String)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isAuthAvailable(String) */
+     */
     @Override
     public synchronized boolean isAuthAvailable(String user) {
         Connection con = null;
@@ -250,10 +245,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method getAuth.
+     *
      * @param user String
-    
+     *
-    
+     * @return PlayerAuth * @see fr.xephi.authme.datasource.DataSource#getAuth(String)
-     * @return PlayerAuth * @see fr.xephi.authme.datasource.DataSource#getAuth(String) */
+     */
     @Override
     public synchronized PlayerAuth getAuth(String user) {
         Connection con = null;
@@ -309,10 +305,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method saveAuth.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#saveAuth(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#saveAuth(PlayerAuth) */
+     */
     @Override
     public synchronized boolean saveAuth(PlayerAuth auth) {
         Connection con = null;
@@ -522,10 +519,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method updatePassword.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updatePassword(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updatePassword(PlayerAuth) */
+     */
     @Override
     public synchronized boolean updatePassword(PlayerAuth auth) {
         Connection con = null;
@@ -573,10 +571,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method updateSession.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSession(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSession(PlayerAuth) */
+     */
     @Override
     public synchronized boolean updateSession(PlayerAuth auth) {
         Connection con = null;
@@ -602,10 +601,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method purgeDatabase.
+     *
      * @param until long
-    
+     *
-    
+     * @return int * @see fr.xephi.authme.datasource.DataSource#purgeDatabase(long)
-     * @return int * @see fr.xephi.authme.datasource.DataSource#purgeDatabase(long) */
+     */
     @Override
     public synchronized int purgeDatabase(long until) {
         Connection con = null;
@@ -627,10 +627,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method autoPurgeDatabase.
+     *
      * @param until long
-    
+     *
-    
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#autoPurgeDatabase(long)
-     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#autoPurgeDatabase(long) */
+     */
     @Override
     public synchronized List<String> autoPurgeDatabase(long until) {
         Connection con = null;
@@ -663,10 +664,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method removeAuth.
+     *
      * @param user String
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#removeAuth(String)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#removeAuth(String) */
+     */
     @Override
     public synchronized boolean removeAuth(String user) {
         Connection con = null;
@@ -706,10 +708,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method updateQuitLoc.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateQuitLoc(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateQuitLoc(PlayerAuth) */
+     */
     @Override
     public synchronized boolean updateQuitLoc(PlayerAuth auth) {
         Connection con = null;
@@ -736,10 +739,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method getIps.
+     *
      * @param ip String
-    
+     *
-    
+     * @return int * @see fr.xephi.authme.datasource.DataSource#getIps(String)
-     * @return int * @see fr.xephi.authme.datasource.DataSource#getIps(String) */
+     */
     @Override
     public synchronized int getIps(String ip) {
         Connection con = null;
@@ -768,10 +772,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method updateEmail.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateEmail(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateEmail(PlayerAuth) */
+     */
     @Override
     public synchronized boolean updateEmail(PlayerAuth auth) {
         Connection con = null;
@@ -796,10 +801,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method updateSalt.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSalt(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSalt(PlayerAuth) */
+     */
     @Override
     public synchronized boolean updateSalt(PlayerAuth auth) {
         if (columnSalt.isEmpty()) {
@@ -826,6 +832,7 @@ public class MySQL implements DataSource {
 
     /**
      * Method reload.
+     *
      * @see fr.xephi.authme.datasource.DataSource#reload()
      */
     @Override
@@ -845,6 +852,7 @@ public class MySQL implements DataSource {
 
     /**
      * Method close.
+     *
      * @see fr.xephi.authme.datasource.DataSource#close()
      */
     @Override
@@ -855,6 +863,7 @@ public class MySQL implements DataSource {
 
     /**
      * Method close.
+     *
      * @param o AutoCloseable
      */
     private void close(AutoCloseable o) {
@@ -870,10 +879,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method getAllAuthsByName.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByName(PlayerAuth)
-     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByName(PlayerAuth) */
+     */
     @Override
     public synchronized List<String> getAllAuthsByName(PlayerAuth auth) {
         Connection con = null;
@@ -902,10 +912,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method getAllAuthsByIp.
+     *
      * @param ip String
-    
+     *
-    
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByIp(String)
-     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByIp(String) */
+     */
     @Override
     public synchronized List<String> getAllAuthsByIp(String ip) {
         Connection con = null;
@@ -934,11 +945,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method getAllAuthsByEmail.
+     *
      * @param email String
-    
+     *
-    
+     * @return List<String> * @throws SQLException * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByEmail(String)
-    
+     */
-     * @return List<String> * @throws SQLException * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByEmail(String) */
     @Override
     public synchronized List<String> getAllAuthsByEmail(String email) throws SQLException {
         final Connection con = getConnection();
@@ -963,9 +974,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method purgeBanned.
+     *
      * @param banned List<String>
-    
+     *
-     * @see fr.xephi.authme.datasource.DataSource#purgeBanned(List<String>) */
+     * @see fr.xephi.authme.datasource.DataSource#purgeBanned(List<String>)
+     */
     @Override
     public synchronized void purgeBanned(List<String> banned) {
         Connection con = null;
@@ -988,9 +1001,9 @@ public class MySQL implements DataSource {
 
     /**
      * Method getType.
-    
+     *
-    
+     * @return DataSourceType * @see fr.xephi.authme.datasource.DataSource#getType()
-     * @return DataSourceType * @see fr.xephi.authme.datasource.DataSource#getType() */
+     */
     @Override
     public DataSourceType getType() {
         return DataSourceType.MYSQL;
@@ -998,10 +1011,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method isLogged.
+     *
      * @param user String
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isLogged(String)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isLogged(String) */
+     */
     @Override
     public boolean isLogged(String user) {
         Connection con = null;
@@ -1028,9 +1042,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method setLogged.
+     *
      * @param user String
-    
+     *
-     * @see fr.xephi.authme.datasource.DataSource#setLogged(String) */
+     * @see fr.xephi.authme.datasource.DataSource#setLogged(String)
+     */
     @Override
     public void setLogged(String user) {
         Connection con = null;
@@ -1052,9 +1068,11 @@ public class MySQL implements DataSource {
 
     /**
      * Method setUnlogged.
+     *
      * @param user String
-    
+     *
-     * @see fr.xephi.authme.datasource.DataSource#setUnlogged(String) */
+     * @see fr.xephi.authme.datasource.DataSource#setUnlogged(String)
+     */
     @Override
     public void setUnlogged(String user) {
         Connection con = null;
@@ -1077,6 +1095,7 @@ public class MySQL implements DataSource {
 
     /**
      * Method purgeLogged.
+     *
      * @see fr.xephi.authme.datasource.DataSource#purgeLogged()
      */
     @Override
@@ -1100,9 +1119,9 @@ public class MySQL implements DataSource {
 
     /**
      * Method getAccountsRegistered.
-    
+     *
-    
+     * @return int * @see fr.xephi.authme.datasource.DataSource#getAccountsRegistered()
-     * @return int * @see fr.xephi.authme.datasource.DataSource#getAccountsRegistered() */
+     */
     @Override
     public int getAccountsRegistered() {
         int result = 0;
@@ -1129,20 +1148,22 @@ public class MySQL implements DataSource {
 
     /**
      * Method updateName.
-     * @param oldone String
+     *
-     * @param newone String
+     * @param oldOne String
-    
+     * @param newOne String
-     * @see fr.xephi.authme.datasource.DataSource#updateName(String, String) */
+     *
+     * @see fr.xephi.authme.datasource.DataSource#updateName(String, String)
+     */
     @Override
-    public void updateName(String oldone, String newone) {
+    public void updateName(String oldOne, String newOne) {
         Connection con = null;
         PreparedStatement pst = null;
         try {
             if ((con = getConnection()) == null)
                 return;
             pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnName + "=? WHERE LOWER(" + columnName + ")=?;");
-            pst.setString(1, newone);
+            pst.setString(1, newOne);
-            pst.setString(2, oldone);
+            pst.setString(2, oldOne);
             pst.executeUpdate();
         } catch (Exception ex) {
             ConsoleLogger.showError(ex.getMessage());
@@ -1154,9 +1175,9 @@ public class MySQL implements DataSource {
 
     /**
      * Method getAllAuths.
-    
+     *
-    
+     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getAllAuths()
-     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getAllAuths() */
+     */
     @Override
     public List<PlayerAuth> getAllAuths() {
         List<PlayerAuth> auths = new ArrayList<>();
@@ -1210,9 +1231,9 @@ public class MySQL implements DataSource {
 
     /**
      * Method getLoggedPlayers.
-    
+     *
-    
+     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getLoggedPlayers()
-     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getLoggedPlayers() */
+     */
     @Override
     public List<PlayerAuth> getLoggedPlayers() {
         List<PlayerAuth> auths = new ArrayList<>();

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

@@ -1,45 +1,40 @@
 package fr.xephi.authme.datasource;
 
-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 java.util.ArrayList;
-import java.util.List;
-
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.settings.Settings;
 
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  */
 public class SQLite implements DataSource {
 
-    private String database;
+    private final String database;
-    private String tableName;
+    private final String tableName;
-    private String columnName;
+    private final String columnName;
-    private String columnPassword;
+    private final String columnPassword;
-    private String columnIp;
+    private final String columnIp;
-    private String columnLastLogin;
+    private final String columnLastLogin;
-    private String columnSalt;
+    private final String columnSalt;
-    private String columnGroup;
+    private final String columnGroup;
-    private String lastlocX;
+    private final String lastlocX;
-    private String lastlocY;
+    private final String lastlocY;
-    private String lastlocZ;
+    private final String lastlocZ;
-    private String lastlocWorld;
+    private final String lastlocWorld;
-    private String columnEmail;
+    private final String columnEmail;
-    private String columnID;
+    private final String columnID;
     private Connection con;
-    private String columnLogged;
+    private final String columnLogged;
-    private String columnRealName;
+    private final String columnRealName;
 
     /**
      * Constructor for SQLite.
-    
+     *
-    
+     * @throws ClassNotFoundException * @throws SQLException
-     * @throws ClassNotFoundException * @throws SQLException */
+     */
     public SQLite() throws ClassNotFoundException, SQLException {
         this.database = Settings.getMySQLDatabase;
         this.tableName = Settings.getMySQLTablename;
@@ -69,9 +64,9 @@ public class SQLite implements DataSource {
 
     /**
      * Method connect.
-    
+     *
-    
+     * @throws ClassNotFoundException * @throws SQLException
-     * @throws ClassNotFoundException * @throws SQLException */
+     */
     private synchronized void connect() throws ClassNotFoundException, SQLException {
         Class.forName("org.sqlite.JDBC");
         ConsoleLogger.info("SQLite driver loaded");
@@ -81,8 +76,9 @@ public class SQLite implements DataSource {
 
     /**
      * Method setup.
-    
+     *
-     * @throws SQLException */
+     * @throws SQLException
+     */
     private synchronized void setup() throws SQLException {
         Statement st = null;
         ResultSet rs = null;
@@ -139,10 +135,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method isAuthAvailable.
+     *
      * @param user String
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isAuthAvailable(String)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isAuthAvailable(String) */
+     */
     @Override
     public synchronized boolean isAuthAvailable(String user) {
         PreparedStatement pst = null;
@@ -163,10 +160,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method getAuth.
+     *
      * @param user String
-    
+     *
-    
+     * @return PlayerAuth * @see fr.xephi.authme.datasource.DataSource#getAuth(String)
-     * @return PlayerAuth * @see fr.xephi.authme.datasource.DataSource#getAuth(String) */
+     */
     @Override
     public synchronized PlayerAuth getAuth(String user) {
         PreparedStatement pst = null;
@@ -199,10 +197,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method saveAuth.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#saveAuth(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#saveAuth(PlayerAuth) */
+     */
     @Override
     public synchronized boolean saveAuth(PlayerAuth auth) {
         PreparedStatement pst = null;
@@ -236,10 +235,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method updatePassword.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updatePassword(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updatePassword(PlayerAuth) */
+     */
     @Override
     public synchronized boolean updatePassword(PlayerAuth auth) {
         PreparedStatement pst = null;
@@ -259,10 +259,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method updateSession.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSession(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSession(PlayerAuth) */
+     */
     @Override
     public boolean updateSession(PlayerAuth auth) {
         PreparedStatement pst = null;
@@ -284,10 +285,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method purgeDatabase.
+     *
      * @param until long
-    
+     *
-    
+     * @return int * @see fr.xephi.authme.datasource.DataSource#purgeDatabase(long)
-     * @return int * @see fr.xephi.authme.datasource.DataSource#purgeDatabase(long) */
+     */
     @Override
     public int purgeDatabase(long until) {
         PreparedStatement pst = null;
@@ -306,10 +308,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method autoPurgeDatabase.
+     *
      * @param until long
-    
+     *
-    
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#autoPurgeDatabase(long)
-     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#autoPurgeDatabase(long) */
+     */
     @Override
     public List<String> autoPurgeDatabase(long until) {
         PreparedStatement pst = null;
@@ -334,10 +337,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method removeAuth.
+     *
      * @param user String
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#removeAuth(String)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#removeAuth(String) */
+     */
     @Override
     public synchronized boolean removeAuth(String user) {
         PreparedStatement pst = null;
@@ -356,10 +360,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method updateQuitLoc.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateQuitLoc(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateQuitLoc(PlayerAuth) */
+     */
     @Override
     public boolean updateQuitLoc(PlayerAuth auth) {
         PreparedStatement pst = null;
@@ -382,10 +387,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method getIps.
+     *
      * @param ip String
-    
+     *
-    
+     * @return int * @see fr.xephi.authme.datasource.DataSource#getIps(String)
-     * @return int * @see fr.xephi.authme.datasource.DataSource#getIps(String) */
+     */
     @Override
     public int getIps(String ip) {
         PreparedStatement pst = null;
@@ -410,10 +416,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method updateEmail.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateEmail(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateEmail(PlayerAuth) */
+     */
     @Override
     public boolean updateEmail(PlayerAuth auth) {
         PreparedStatement pst = null;
@@ -433,10 +440,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method updateSalt.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSalt(PlayerAuth)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSalt(PlayerAuth) */
+     */
     @Override
     public boolean updateSalt(PlayerAuth auth) {
         if (columnSalt.isEmpty()) {
@@ -459,6 +467,7 @@ public class SQLite implements DataSource {
 
     /**
      * Method close.
+     *
      * @see fr.xephi.authme.datasource.DataSource#close()
      */
     @Override
@@ -472,6 +481,7 @@ public class SQLite implements DataSource {
 
     /**
      * Method reload.
+     *
      * @see fr.xephi.authme.datasource.DataSource#reload()
      */
     @Override
@@ -480,6 +490,7 @@ public class SQLite implements DataSource {
 
     /**
      * Method close.
+     *
      * @param st Statement
      */
     private void close(Statement st) {
@@ -494,6 +505,7 @@ public class SQLite implements DataSource {
 
     /**
      * Method close.
+     *
      * @param rs ResultSet
      */
     private void close(ResultSet rs) {
@@ -508,10 +520,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method getAllAuthsByName.
+     *
      * @param auth PlayerAuth
-    
+     *
-    
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByName(PlayerAuth)
-     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByName(PlayerAuth) */
+     */
     @Override
     public List<String> getAllAuthsByName(PlayerAuth auth) {
         PreparedStatement pst = null;
@@ -538,10 +551,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method getAllAuthsByIp.
+     *
      * @param ip String
-    
+     *
-    
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByIp(String)
-     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByIp(String) */
+     */
     @Override
     public List<String> getAllAuthsByIp(String ip) {
         PreparedStatement pst = null;
@@ -568,10 +582,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method getAllAuthsByEmail.
+     *
      * @param email String
-    
+     *
-    
+     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByEmail(String)
-     * @return List<String> * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByEmail(String) */
+     */
     @Override
     public List<String> getAllAuthsByEmail(String email) {
         PreparedStatement pst = null;
@@ -598,9 +613,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method purgeBanned.
+     *
      * @param banned List<String>
-    
+     *
-     * @see fr.xephi.authme.datasource.DataSource#purgeBanned(List<String>) */
+     * @see fr.xephi.authme.datasource.DataSource#purgeBanned(List<String>)
+     */
     @Override
     public void purgeBanned(List<String> banned) {
         PreparedStatement pst = null;
@@ -619,9 +636,9 @@ public class SQLite implements DataSource {
 
     /**
      * Method getType.
-    
+     *
-    
+     * @return DataSourceType * @see fr.xephi.authme.datasource.DataSource#getType()
-     * @return DataSourceType * @see fr.xephi.authme.datasource.DataSource#getType() */
+     */
     @Override
     public DataSourceType getType() {
         return DataSourceType.SQLITE;
@@ -629,10 +646,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method isLogged.
+     *
      * @param user String
-    
+     *
-    
+     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isLogged(String)
-     * @return boolean * @see fr.xephi.authme.datasource.DataSource#isLogged(String) */
+     */
     @Override
     public boolean isLogged(String user) {
         PreparedStatement pst = null;
@@ -655,9 +673,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method setLogged.
+     *
      * @param user String
-    
+     *
-     * @see fr.xephi.authme.datasource.DataSource#setLogged(String) */
+     * @see fr.xephi.authme.datasource.DataSource#setLogged(String)
+     */
     @Override
     public void setLogged(String user) {
         PreparedStatement pst = null;
@@ -675,9 +695,11 @@ public class SQLite implements DataSource {
 
     /**
      * Method setUnlogged.
+     *
      * @param user String
-    
+     *
-     * @see fr.xephi.authme.datasource.DataSource#setUnlogged(String) */
+     * @see fr.xephi.authme.datasource.DataSource#setUnlogged(String)
+     */
     @Override
     public void setUnlogged(String user) {
         PreparedStatement pst = null;
@@ -696,6 +718,7 @@ public class SQLite implements DataSource {
 
     /**
      * Method purgeLogged.
+     *
      * @see fr.xephi.authme.datasource.DataSource#purgeLogged()
      */
     @Override
@@ -715,9 +738,9 @@ public class SQLite implements DataSource {
 
     /**
      * Method getAccountsRegistered.
-    
+     *
-    
+     * @return int * @see fr.xephi.authme.datasource.DataSource#getAccountsRegistered()
-     * @return int * @see fr.xephi.authme.datasource.DataSource#getAccountsRegistered() */
+     */
     @Override
     public int getAccountsRegistered() {
         int result = 0;
@@ -740,17 +763,19 @@ public class SQLite implements DataSource {
 
     /**
      * Method updateName.
-     * @param oldone String
+     *
-     * @param newone String
+     * @param oldOne String
-    
+     * @param newOne String
-     * @see fr.xephi.authme.datasource.DataSource#updateName(String, String) */
+     *
+     * @see fr.xephi.authme.datasource.DataSource#updateName(String, String)
+     */
     @Override
-    public void updateName(String oldone, String newone) {
+    public void updateName(String oldOne, String newOne) {
         PreparedStatement pst = null;
         try {
             pst = con.prepareStatement("UPDATE " + tableName + " SET " + columnName + "=? WHERE " + columnName + "=?;");
-            pst.setString(1, newone);
+            pst.setString(1, newOne);
-            pst.setString(2, oldone);
+            pst.setString(2, oldOne);
             pst.executeUpdate();
         } catch (SQLException ex) {
             ConsoleLogger.showError(ex.getMessage());
@@ -761,9 +786,9 @@ public class SQLite implements DataSource {
 
     /**
      * Method getAllAuths.
-    
+     *
-    
+     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getAllAuths()
-     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getAllAuths() */
+     */
     @Override
     public List<PlayerAuth> getAllAuths() {
         List<PlayerAuth> auths = new ArrayList<>();
@@ -796,9 +821,9 @@ public class SQLite implements DataSource {
 
     /**
      * Method getLoggedPlayers.
-    
+     *
-    
+     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getLoggedPlayers()
-     * @return List<PlayerAuth> * @see fr.xephi.authme.datasource.DataSource#getLoggedPlayers() */
+     */
     @Override
     public List<PlayerAuth> getLoggedPlayers() {
         List<PlayerAuth> auths = new ArrayList<>();

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

@@ -5,7 +5,6 @@ import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 /**
- *
  * This event is call when a player try to /login
  *
  * @author Xephi59
@@ -13,12 +12,13 @@ import org.bukkit.event.HandlerList;
  */
 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) {
@@ -28,22 +28,25 @@ public class AuthMeAsyncPreLoginEvent extends Event {
 
     /**
      * Method getPlayer.
-    
+     *
-     * @return Player */
+     * @return Player
+     */
     public Player getPlayer() {
         return player;
     }
 
     /**
      * Method canLogin.
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     public boolean canLogin() {
         return canLogin;
     }
 
     /**
      * Method setCanLogin.
+     *
      * @param canLogin boolean
      */
     public void setCanLogin(boolean canLogin) {
@@ -52,8 +55,9 @@ public class AuthMeAsyncPreLoginEvent extends Event {
 
     /**
      * Method getHandlers.
-    
+     *
-     * @return HandlerList */
+     * @return HandlerList
+     */
     @Override
     public HandlerList getHandlers() {
         return handlers;

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

@@ -4,7 +4,6 @@ import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
 /**
- *
  * This event is call when AuthMe try to teleport a player
  *
  * @author Xephi59
@@ -12,12 +11,13 @@ import org.bukkit.entity.Player;
  */
 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
      */
@@ -29,32 +29,36 @@ public class AuthMeTeleportEvent extends CustomEvent {
 
     /**
      * Method getPlayer.
-    
+     *
-     * @return Player */
+     * @return Player
+     */
     public Player getPlayer() {
         return player;
     }
 
+    /**
+     * Method getTo.
+     *
+     * @return Location
+     */
+    public Location getTo() {
+        return to;
+    }
+
     /**
      * Method setTo.
+     *
      * @param to Location
      */
     public void setTo(Location to) {
         this.to = to;
     }
 
-    /**
-     * Method getTo.
-    
-     * @return Location */
-    public Location getTo() {
-        return to;
-    }
-
     /**
      * Method getFrom.
-    
+     *
-     * @return Location */
+     * @return Location
+     */
     public Location getFrom() {
         return from;
     }

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

@@ -5,14 +5,13 @@ 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);
@@ -20,42 +19,47 @@ public class CustomEvent extends Event implements Cancellable {
 
     /**
      * Constructor for CustomEvent.
+     *
      * @param b boolean
      */
     public CustomEvent(boolean b) {
         super(b);
     }
 
-    /**
-     * Method getHandlers.
-    
-     * @return HandlerList */
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
     /**
      * Method getHandlerList.
-    
+     *
-     * @return HandlerList */
+     * @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()
-     * @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) */
+     * @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,7 +4,6 @@ import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
 /**
- * 
  * Called if a player is teleported to the authme first spawn
  *
  * @author Xephi59
@@ -12,12 +11,13 @@ import org.bukkit.entity.Player;
  */
 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
@@ -31,32 +31,36 @@ public class FirstSpawnTeleportEvent extends CustomEvent {
 
     /**
      * Method getPlayer.
-    
+     *
-     * @return Player */
+     * @return Player
+     */
     public Player getPlayer() {
         return player;
     }
 
+    /**
+     * Method getTo.
+     *
+     * @return Location
+     */
+    public Location getTo() {
+        return to;
+    }
+
     /**
      * Method setTo.
+     *
      * @param to Location
      */
     public void setTo(Location to) {
         this.to = to;
     }
 
-    /**
-     * Method getTo.
-    
-     * @return Location */
-    public Location getTo() {
-        return to;
-    }
-
     /**
      * Method getFrom.
-    
+     *
-     * @return Location */
+     * @return Location
+     */
     public Location getFrom() {
         return from;
     }

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

@@ -5,7 +5,6 @@ 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.
  *
@@ -14,12 +13,13 @@ import org.bukkit.event.HandlerList;
  */
 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
      */
@@ -29,23 +29,44 @@ public class LoginEvent extends Event {
     }
 
     /**
-     * Method getPlayer.
+     * Method getHandlerList.
+     *
+     * @return HandlerList
+     */
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
 
-     * @return Player */
+    /**
+     * 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
@@ -53,29 +74,14 @@ public class LoginEvent extends Event {
         this.isLogin = isLogin;
     }
 
-    /**
-     * Method isLogin.
-    
-     * @return boolean */
-    public boolean isLogin() {
-        return isLogin;
-    }
-
     /**
      * Method getHandlers.
-    
+     *
-     * @return HandlerList */
+     * @return HandlerList
+     */
     @Override
     public HandlerList getHandlers() {
         return handlers;
     }
 
-    /**
-     * Method getHandlerList.
-    
-     * @return HandlerList */
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
 }

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

@@ -5,7 +5,6 @@ import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 /**
- *
  * This event is called when a player logout through AuthMe.
  *
  * @author Xephi59
@@ -13,11 +12,12 @@ import org.bukkit.event.HandlerList;
  */
 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) {
@@ -25,15 +25,26 @@ public class LogoutEvent extends Event {
     }
 
     /**
-     * Method getPlayer.
+     * Method getHandlerList.
+     *
+     * @return HandlerList
+     */
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
 
-     * @return Player */
+    /**
+     * Method getPlayer.
+     *
+     * @return Player
+     */
     public Player getPlayer() {
         return this.player;
     }
 
     /**
      * Method setPlayer.
+     *
      * @param player Player
      */
     public void setPlayer(Player player) {
@@ -42,19 +53,12 @@ public class LogoutEvent extends Event {
 
     /**
      * Method getHandlers.
-    
+     *
-     * @return HandlerList */
+     * @return HandlerList
+     */
     @Override
     public HandlerList getHandlers() {
         return handlers;
     }
 
-    /**
-     * Method getHandlerList.
-    
-     * @return HandlerList */
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
 }

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

@@ -1,20 +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 {
 
@@ -24,6 +22,7 @@ public class PasswordEncryptionEvent extends Event {
 
     /**
      * Constructor for PasswordEncryptionEvent.
+     *
      * @param method     EncryptionMethod
      * @param playerName String
      */
@@ -34,44 +33,49 @@ public class PasswordEncryptionEvent extends Event {
     }
 
     /**
-     * Method getHandlers.
+     * Method getHandlerList.
+     *
+     * @return HandlerList
+     */
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
 
-     * @return HandlerList */
+    /**
+     * Method getHandlers.
+     *
+     * @return HandlerList
+     */
     @Override
     public HandlerList getHandlers() {
         return handlers;
     }
 
+    /**
+     * Method getMethod.
+     *
+     * @return EncryptionMethod
+     */
+    public EncryptionMethod getMethod() {
+        return method;
+    }
+
     /**
      * Method setMethod.
+     *
      * @param method EncryptionMethod
      */
     public void setMethod(EncryptionMethod method) {
         this.method = method;
     }
 
-    /**
-     * Method getMethod.
-    
-     * @return EncryptionMethod */
-    public EncryptionMethod getMethod() {
-        return method;
-    }
-
     /**
      * Method getPlayerName.
-    
+     *
-     * @return String */
+     * @return String
+     */
     public String getPlayerName() {
         return playerName;
     }
 
-    /**
-     * Method getHandlerList.
-    
-     * @return HandlerList */
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
 }

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

@@ -4,7 +4,6 @@ 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.
  *
@@ -13,14 +12,15 @@ import org.bukkit.inventory.ItemStack;
  */
 public class ProtectInventoryEvent extends CustomEvent {
 
-    private ItemStack[] storedinventory;
+    private final ItemStack[] storedinventory;
-    private ItemStack[] storedarmor;
+    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) {
@@ -34,30 +34,34 @@ public class ProtectInventoryEvent extends CustomEvent {
 
     /**
      * Method getStoredInventory.
-    
+     *
-     * @return ItemStack[] */
+     * @return ItemStack[]
+     */
     public ItemStack[] getStoredInventory() {
         return this.storedinventory;
     }
 
     /**
      * Method getStoredArmor.
-    
+     *
-     * @return ItemStack[] */
+     * @return ItemStack[]
+     */
     public ItemStack[] getStoredArmor() {
         return this.storedarmor;
     }
 
     /**
      * Method getPlayer.
-    
+     *
-     * @return Player */
+     * @return Player
+     */
     public Player getPlayer() {
         return this.player;
     }
 
     /**
      * Method setNewInventory.
+     *
      * @param emptyInventory ItemStack[]
      */
     public void setNewInventory(ItemStack[] emptyInventory) {
@@ -66,14 +70,16 @@ public class ProtectInventoryEvent extends CustomEvent {
 
     /**
      * Method getEmptyInventory.
-    
+     *
-     * @return ItemStack[] */
+     * @return ItemStack[]
+     */
     public ItemStack[] getEmptyInventory() {
         return this.emptyInventory;
     }
 
     /**
      * Method setNewArmor.
+     *
      * @param emptyArmor ItemStack[]
      */
     public void setNewArmor(ItemStack[] emptyArmor) {
@@ -82,8 +88,9 @@ public class ProtectInventoryEvent extends CustomEvent {
 
     /**
      * Method getEmptyArmor.
-    
+     *
-     * @return ItemStack[] */
+     * @return ItemStack[]
+     */
     public ItemStack[] getEmptyArmor() {
         return this.emptyArmor;
     }

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

@@ -4,7 +4,6 @@ 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.
  *
@@ -13,12 +12,13 @@ import org.bukkit.entity.Player;
  */
 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
      */
@@ -30,32 +30,36 @@ public class RegisterTeleportEvent extends CustomEvent {
 
     /**
      * Method getPlayer.
-    
+     *
-     * @return Player */
+     * @return Player
+     */
     public Player getPlayer() {
         return player;
     }
 
+    /**
+     * Method getTo.
+     *
+     * @return Location
+     */
+    public Location getTo() {
+        return to;
+    }
+
     /**
      * Method setTo.
+     *
      * @param to Location
      */
     public void setTo(Location to) {
         this.to = to;
     }
 
-    /**
-     * Method getTo.
-    
-     * @return Location */
-    public Location getTo() {
-        return to;
-    }
-
     /**
      * Method getFrom.
-    
+     *
-     * @return Location */
+     * @return Location
+     */
     public Location getFrom() {
         return from;
     }

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

@@ -3,7 +3,6 @@ package fr.xephi.authme.events;
 import org.bukkit.entity.Player;
 
 /**
- * 
  * This event is call when a creative inventory is reseted.
  *
  * @author Xephi59
@@ -15,6 +14,7 @@ public class ResetInventoryEvent extends CustomEvent {
 
     /**
      * Constructor for ResetInventoryEvent.
+     *
      * @param player Player
      */
     public ResetInventoryEvent(Player player) {
@@ -24,14 +24,16 @@ public class ResetInventoryEvent extends CustomEvent {
 
     /**
      * Method getPlayer.
-    
+     *
-     * @return Player */
+     * @return Player
+     */
     public Player getPlayer() {
         return this.player;
     }
 
     /**
      * Method setPlayer.
+     *
      * @param player Player
      */
     public void setPlayer(Player player) {

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

@@ -14,6 +14,7 @@ public class RestoreInventoryEvent extends CustomEvent {
 
     /**
      * Constructor for RestoreInventoryEvent.
+     *
      * @param player Player
      */
     public RestoreInventoryEvent(Player player) {
@@ -22,6 +23,7 @@ public class RestoreInventoryEvent extends CustomEvent {
 
     /**
      * Constructor for RestoreInventoryEvent.
+     *
      * @param player Player
      * @param async  boolean
      */
@@ -32,14 +34,16 @@ public class RestoreInventoryEvent extends CustomEvent {
 
     /**
      * Method getPlayer.
-    
+     *
-     * @return Player */
+     * @return Player
+     */
     public Player getPlayer() {
         return this.player;
     }
 
     /**
      * Method setPlayer.
+     *
      * @param player Player
      */
     public void setPlayer(Player player) {

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

@@ -4,7 +4,6 @@ import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
 /**
- * 
  * Called if a player is teleported to a specific spawn
  *
  * @author Xephi59
@@ -12,13 +11,14 @@ import org.bukkit.entity.Player;
  */
 public class SpawnTeleportEvent extends CustomEvent {
 
-    private Player player;
+    private final Player player;
     private Location to;
-    private Location from;
+    private final Location from;
-    private boolean isAuthenticated;
+    private final boolean isAuthenticated;
 
     /**
      * Constructor for SpawnTeleportEvent.
+     *
      * @param player          Player
      * @param from            Location
      * @param to              Location
@@ -34,40 +34,45 @@ public class SpawnTeleportEvent extends CustomEvent {
 
     /**
      * Method getPlayer.
-    
+     *
-     * @return Player */
+     * @return Player
+     */
     public Player getPlayer() {
         return player;
     }
 
+    /**
+     * Method getTo.
+     *
+     * @return Location
+     */
+    public Location getTo() {
+        return to;
+    }
+
     /**
      * Method setTo.
+     *
      * @param to Location
      */
     public void setTo(Location to) {
         this.to = to;
     }
 
-    /**
-     * Method getTo.
-    
-     * @return Location */
-    public Location getTo() {
-        return to;
-    }
-
     /**
      * Method getFrom.
-    
+     *
-     * @return Location */
+     * @return Location
+     */
     public Location getFrom() {
         return from;
     }
 
     /**
      * Method isAuthenticated.
-    
+     *
-     * @return boolean */
+     * @return boolean
+     */
     public boolean isAuthenticated() {
         return isAuthenticated;
     }

src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java

@@ -1,21 +1,20 @@
 package fr.xephi.authme.hooks;
 
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.messaging.PluginMessageListener;
-
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;
-
 import fr.xephi.authme.AuthMe;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.messaging.PluginMessageListener;
 
 /**
  */
 public class BungeeCordMessage implements PluginMessageListener {
 
-    public AuthMe plugin;
+    public final AuthMe plugin;
 
     /**
      * Constructor for BungeeCordMessage.
+     *
      * @param plugin AuthMe
      */
     public BungeeCordMessage(AuthMe plugin) {
@@ -24,11 +23,13 @@ public class BungeeCordMessage implements PluginMessageListener {
 
     /**
      * Method onPluginMessageReceived.
+     *
      * @param channel String
      * @param player  Player
      * @param message byte[]
-    
+     *
-     * @see org.bukkit.plugin.messaging.PluginMessageListener#onPluginMessageReceived(String, Player, byte[]) */
+     * @see org.bukkit.plugin.messaging.PluginMessageListener#onPluginMessageReceived(String, Player, byte[])
+     */
     @Override
     public void onPluginMessageReceived(String channel, Player player,
                                         byte[] message) {

src/main/java/fr/xephi/authme/hooks/EssSpawn.java

@@ -1,11 +1,10 @@
 package fr.xephi.authme.hooks;
 
-import java.io.File;
+import fr.xephi.authme.settings.CustomConfiguration;
-
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 
-import fr.xephi.authme.settings.CustomConfiguration;
+import java.io.File;
 
 /**
  */
@@ -21,8 +20,9 @@ public class EssSpawn extends CustomConfiguration {
 
     /**
      * Method getInstance.
-    
+     *
-     * @return EssSpawn */
+     * @return EssSpawn
+     */
     public static EssSpawn getInstance() {
         if (spawn == null) {
             spawn = new EssSpawn();
@@ -32,8 +32,9 @@ public class EssSpawn extends CustomConfiguration {
 
     /**
      * Method getLocation.
-    
+     *
-     * @return Location */
+     * @return Location
+     */
     public Location getLocation() {
         try {
             if (!this.contains("spawns.default.world"))

src/main/java/fr/xephi/authme/listener/AuthMeBlockListener.java

@@ -1,22 +1,22 @@
 package fr.xephi.authme.listener;
 
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.util.Utils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.util.Utils;
-
 /**
  */
 public class AuthMeBlockListener implements Listener {
 
-    public AuthMe instance;
+    public final AuthMe instance;
 
     /**
      * Constructor for AuthMeBlockListener.
+     *
      * @param instance AuthMe
      */
     public AuthMeBlockListener(AuthMe instance) {
@@ -26,6 +26,7 @@ public class AuthMeBlockListener implements Listener {
 
     /**
      * Method onBlockPlace.
+     *
      * @param event BlockPlaceEvent
      */
     @EventHandler(ignoreCancelled = true)
@@ -37,6 +38,7 @@ public class AuthMeBlockListener implements Listener {
 
     /**
      * Method onBlockBreak.
+     *
      * @param event BlockBreakEvent
      */
     @EventHandler(ignoreCancelled = true)

src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java

@@ -1,7 +1,7 @@
 package fr.xephi.authme.listener;
 
-import java.lang.reflect.Method;
+import fr.xephi.authme.AuthMe;
-
+import fr.xephi.authme.util.Utils;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -9,29 +9,22 @@ import org.bukkit.entity.Projectile;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.*;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityInteractEvent;
-import org.bukkit.event.entity.EntityRegainHealthEvent;
-import org.bukkit.event.entity.EntityShootBowEvent;
-import org.bukkit.event.entity.EntityTargetEvent;
-import org.bukkit.event.entity.FoodLevelChangeEvent;
-import org.bukkit.event.entity.ProjectileLaunchEvent;
 import org.bukkit.projectiles.ProjectileSource;
 
-import fr.xephi.authme.AuthMe;
+import java.lang.reflect.Method;
-import fr.xephi.authme.util.Utils;
 
 /**
  */
 public class AuthMeEntityListener implements Listener {
 
-    public AuthMe instance;
     private static Method getShooter;
     private static boolean shooterIsProjectileSource;
+    public final AuthMe instance;
 
     /**
      * Constructor for AuthMeEntityListener.
+     *
      * @param instance AuthMe
      */
     public AuthMeEntityListener(AuthMe instance) {
@@ -45,6 +38,7 @@ public class AuthMeEntityListener implements Listener {
 
     /**
      * Method onEntityDamage.
+     *
      * @param event EntityDamageEvent
      */
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
@@ -65,6 +59,7 @@ public class AuthMeEntityListener implements Listener {
 
     /**
      * Method onEntityTarget.
+     *
      * @param event EntityTargetEvent
      */
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
@@ -84,6 +79,7 @@ public class AuthMeEntityListener implements Listener {
 
     /**
      * Method onDmg.
+     *
      * @param event EntityDamageByEntityEvent
      */
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
@@ -103,6 +99,7 @@ public class AuthMeEntityListener implements Listener {
 
     /**
      * Method onFoodLevelChange.
+     *
      * @param event FoodLevelChangeEvent
      */
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
@@ -121,6 +118,7 @@ public class AuthMeEntityListener implements Listener {
 
     /**
      * Method entityRegainHealthEvent.
+     *
      * @param event EntityRegainHealthEvent
      */
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
@@ -140,6 +138,7 @@ public class AuthMeEntityListener implements Listener {
 
     /**
      * Method onEntityInteract.
+     *
      * @param event EntityInteractEvent
      */
     @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
@@ -158,6 +157,7 @@ public class AuthMeEntityListener implements Listener {
 
     /**
      * Method onLowestEntityInteract.
+     *
      * @param event EntityInteractEvent
      */
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
@@ -175,8 +175,10 @@ public class AuthMeEntityListener implements Listener {
     }
 
     // TODO: Need to check this, player can't throw snowball but the item is taken.
+
     /**
      * Method onProjectileLaunch.
+     *
      * @param event ProjectileLaunchEvent
      */
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
@@ -213,6 +215,7 @@ public class AuthMeEntityListener implements Listener {
 
     /**
      * Method onShoot.
+     *
      * @param event EntityShootBowEvent
      */
     @EventHandler(ignoreCancelled = true, priority = EventPriority.NORMAL)