Change calls to Messages to use the MessageKey enum

This commit is contained in:
ljacqu
2015-11-24 23:27:28 +01:00
parent cb11ae9610
commit d2b3d416a9
5 changed files with 47 additions and 80 deletions
@@ -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;
}
}