#450 Make reload & messages functionality use NewSetting

- Change ReloadCommand to use the new setting functionality
- Check and construct the messages file in NewSetting
- Unrelated: change MessagesManager not to extend CustomConfiguration anymore

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

@@ -12,6 +12,7 @@ import fr.xephi.authme.settings.NewSetting;
 import fr.xephi.authme.settings.domain.Property;
 import org.bukkit.command.CommandSender;
 
+import java.io.File;
 import java.util.List;
 
 /**
@@ -101,6 +102,16 @@ public class CommandService {
         return authMe.getDataSource();
     }
 
+    /**
+     * Return the AuthMe instance for further manipulation. Use only if other methods from
+     * the command service cannot be used.
+     *
+     * @return The AuthMe instance
+     */
+    public AuthMe getAuthMe() {
+        return authMe;
+    }
+
     /**
      * Return the PasswordSecurity instance.
      *
@@ -152,6 +163,15 @@ public class CommandService {
         return messages.retrieve(key);
     }
 
+    /**
+     * Change the messages instance to retrieve messages from the given file.
+     *
+     * @param file The new file to read messages from
+     */
+    public void reloadMessages(File file) {
+        messages.reload(file);
+    }
+
     /**
      * Retrieve the given property's value.
      *
@@ -163,4 +183,13 @@ public class CommandService {
         return settings.getProperty(property);
     }
 
+    /**
+     * Return the settings manager.
+     *
+     * @return The settings manager
+     */
+    public NewSetting getSettings() {
+        return settings;
+    }
+
 }

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

@@ -1,36 +1,32 @@
 package fr.xephi.authme.command.executable.authme;
 
-import java.util.List;
-
-import org.bukkit.command.CommandSender;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.output.MessageKey;
-import fr.xephi.authme.output.Messages;
-import fr.xephi.authme.settings.Settings;
+import org.bukkit.command.CommandSender;
 
+import java.util.List;
+
+/**
+ * The reload command.
+ */
 public class ReloadCommand implements ExecutableCommand {
 
     @Override
     public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
-        // AuthMe plugin instance
-        AuthMe plugin = AuthMe.getInstance();
-
+        AuthMe plugin = commandService.getAuthMe();
         try {
-            Settings.reload();
-            Messages.getInstance().reloadManager();
-            plugin.getModuleManager().reloadModules();
+            commandService.getSettings().reload();
+            commandService.reloadMessages(commandService.getSettings().getMessagesFile());
             plugin.setupDatabase();
+            commandService.send(sender, MessageKey.CONFIG_RELOAD_SUCCESS);
         } catch (Exception e) {
             sender.sendMessage("Error occurred during reload of AuthMe: aborting");
             ConsoleLogger.showError("Fatal error occurred! AuthMe instance ABORTED!");
             ConsoleLogger.writeStackTrace(e);
             plugin.stopOrUnload();
         }
-
-        commandService.send(sender, MessageKey.CONFIG_RELOAD_SUCCESS);
     }
 }