Change calls to Messages to use the MessageKey enum

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

@@ -6,6 +6,7 @@ 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;
@@ -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/captcha/CaptchaCommand.java

@@ -5,6 +5,7 @@ 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;
@@ -14,15 +15,6 @@ 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) {
         // Make sure the current command executor is a player
@@ -42,12 +34,12 @@ public class CaptchaCommand extends ExecutableCommand {
 
         // 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;
         }
 
@@ -55,7 +47,7 @@ public class CaptchaCommand extends ExecutableCommand {
         final AuthMe plugin = AuthMe.getInstance();
 
         if (!plugin.cap.containsKey(playerNameLowerCase)) {
-            m.send(player, "usage_log");
+            m.send(player, MessageKey.USAGE_LOGIN);
             return true;
         }
 
@@ -63,7 +55,7 @@ public class CaptchaCommand extends ExecutableCommand {
             plugin.cap.remove(playerNameLowerCase);
             String randStr = new RandomString(Settings.captchaLength).nextString();
             plugin.cap.put(playerNameLowerCase, randStr);
-            for (String s : m.send("wrong_captcha")) {
+            for (String s : m.retrieve(MessageKey.CAPTCHA_WRONG_ERROR)) {
                 player.sendMessage(s.replace("THE_CAPTCHA", plugin.cap.get(playerNameLowerCase)));
             }
             return true;
@@ -73,8 +65,8 @@ public class CaptchaCommand extends ExecutableCommand {
         plugin.cap.remove(playerNameLowerCase);
 
         // Show a status message
-        m.send(player, "valid_captcha");
-        m.send(player, "login_msg");
+        m.send(player, MessageKey.CAPTCHA_SUCCESS);
+        m.send(player, MessageKey.LOGIN_MESSAGE);
         return true;
     }
 }