Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 437-add-email

Conflicts:
	src/main/java/fr/xephi/authme/datasource/MySQL.java
	src/main/java/fr/xephi/authme/datasource/SQLite.java
	src/main/java/fr/xephi/authme/process/Management.java
	src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java

src/main/java/fr/xephi/authme/output/Messages.java

@@ -1,9 +1,10 @@
 package fr.xephi.authme.output;
 
-import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.util.StringUtils;
 import org.bukkit.command.CommandSender;
 
+import java.io.File;
+
 /**
  * Class for retrieving and sending translatable messages to players.
  * This class detects when the language settings have changed and will
@@ -11,27 +12,15 @@ import org.bukkit.command.CommandSender;
  */
 public class Messages {
 
-    private static Messages singleton;
-    private final String language;
     private MessagesManager manager;
 
-
-    private Messages(String language, MessagesManager manager) {
-        this.language = language;
-        this.manager = manager;
-    }
-
     /**
-     * Get the instance of Messages.
+     * Constructor.
      *
-     * @return The Messages instance
+     * @param messageFile The messages file to use
      */
-    public static Messages getInstance() {
-        if (singleton == null) {
-            MessagesManager manager = new MessagesManager(Settings.messageFile);
-            singleton = new Messages(Settings.messagesLanguage, manager);
-        }
-        return singleton;
+    public Messages(File messageFile) {
+        manager = new MessagesManager(messageFile);
     }
 
     /**
@@ -60,7 +49,8 @@ public class Messages {
         String message = retrieveSingle(key);
         String[] tags = key.getTags();
         if (replacements.length != tags.length) {
-            throw new RuntimeException("Given replacement size does not match the tags in message key '" + key + "'");
+            throw new IllegalStateException(
+                "Given replacement size does not match the tags in message key '" + key + "'");
         }
 
         for (int i = 0; i < tags.length; ++i) {
@@ -80,9 +70,6 @@ public class Messages {
      * @return The message split by new lines
      */
     public String[] retrieve(MessageKey key) {
-        if (!Settings.messagesLanguage.equalsIgnoreCase(language)) {
-            reloadManager();
-        }
         return manager.retrieve(key.getKey());
     }
 
@@ -100,8 +87,8 @@ public class Messages {
     /**
      * Reload the messages manager.
      */
-    public void reloadManager() {
-        manager = new MessagesManager(Settings.messageFile);
+    public void reload(File messagesFile) {
+        manager = new MessagesManager(messagesFile);
     }
 
 }

src/main/java/fr/xephi/authme/output/MessagesManager.java

@@ -1,8 +1,8 @@
 package fr.xephi.authme.output;
 
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.settings.CustomConfiguration;
 import org.bukkit.ChatColor;
+import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.io.File;
 
@@ -12,7 +12,10 @@ import java.io.File;
  * This class is used within {@link Messages}, which offers a high-level interface for accessing
  * or sending messages from a properties file.
  */
-class MessagesManager extends CustomConfiguration {
+class MessagesManager {
+
+    private final YamlConfiguration configuration;
+    private final String fileName;
 
     /**
      * Constructor for Messages.
@@ -20,8 +23,8 @@ class MessagesManager extends CustomConfiguration {
      * @param file the configuration file
      */
     MessagesManager(File file) {
-        super(file);
-        load();
+        this.fileName = file.getName();
+        this.configuration = YamlConfiguration.loadConfiguration(file);
     }
 
     /**
@@ -31,24 +34,22 @@ class MessagesManager extends CustomConfiguration {
      *
      * @return The message
      */
-    String[] retrieve(String key) {
-        String message = (String) get(key);
+    public String[] retrieve(String key) {
+        String message = configuration.getString(key);
         if (message != null) {
             return formatMessage(message);
         }
 
         // Message is null: log key not being found and send error back as message
         String retrievalError = "Error getting message with key '" + key + "'. ";
-        ConsoleLogger.showError(retrievalError + "Please verify your config file at '"
-            + getConfigFile().getName() + "'");
+        ConsoleLogger.showError(retrievalError + "Please verify your config file at '" + fileName + "'");
         return new String[]{
             retrievalError + "Please contact the admin to verify or update the AuthMe messages file."};
     }
 
-    static String[] formatMessage(String message) {
+    private static String[] formatMessage(String message) {
         String[] lines = message.split("&n");
         for (int i = 0; i < lines.length; ++i) {
-            // We don't initialize a StringBuilder here because mostly we will only have one entry
             lines[i] = ChatColor.translateAlternateColorCodes('&', lines[i]);
         }
         return lines;