#1055 Remove multiple "please register" messages

Part 1:
- Use only one message entry for "Please register", that may have to be adapted to reflect the proper /register arguments
- Remove other message entries from code and from the messages files

Breaking change: reg_email_msg is also removed

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

@@ -59,7 +59,7 @@ public void runCommand(Player player, List<String> arguments) {
 
         PlayerAuth auth = dataSource.getAuth(playerName); // TODO: Create method to get email only
         if (auth == null) {
-            commonService.send(player, MessageKey.REGISTER_EMAIL_MESSAGE);
+            commonService.send(player, MessageKey.USAGE_REGISTER);
             return;
         }
 

src/main/java/fr/xephi/authme/message/MessageKey.java

@@ -64,18 +64,6 @@ public enum MessageKey {
 
     /** Please, register to the server with the command "/register <password> <ConfirmPassword>" */
     REGISTER_MESSAGE("reg_msg"),
-
-    /** Please, register to the server with the command "/register <password>" */
-    REGISTER_NO_REPEAT_MESSAGE("reg_no_repeat_msg"),
-
-    /** Please, register to the server with the command "/register <email> <confirmEmail>" */
-    REGISTER_EMAIL_MESSAGE("reg_email_msg"),
-
-    /** Please, register to the server with the command "/register <email>" */
-    REGISTER_EMAIL_NO_REPEAT_MESSAGE("reg_email_no_repeat_msg"),
-
-    /** Please, register to the server with the command "/register <password> <email>" */
-    REGISTER_PASSWORD_EMAIL_MESSAGE("reg_psw_email_msg"),
 
     /** You have exceeded the maximum number of registrations (%reg_count/%max_acc %reg_names) for your connection! */
     MAX_REGISTER_EXCEEDED("max_reg", "%max_acc", "%reg_count", "%reg_names"),

src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java

@@ -8,8 +8,6 @@
 import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.service.ValidationService;
-import fr.xephi.authme.settings.properties.RegistrationSettings;
-import fr.xephi.authme.util.Utils;
 import org.bukkit.entity.Player;
 
 import javax.inject.Inject;
@@ -65,10 +63,7 @@ private void sendUnloggedMessage(Player player) {
         if (dataSource.isAuthAvailable(player.getName())) {
             service.send(player, MessageKey.LOGIN_MESSAGE);
         } else {
-            MessageKey registerMessage = Utils.getRegisterMessage(
-                service.getProperty(RegistrationSettings.REGISTRATION_TYPE),
-                service.getProperty(RegistrationSettings.REGISTER_SECOND_ARGUMENT));
-            service.send(player, registerMessage);
+            service.send(player, MessageKey.REGISTER_MESSAGE);
         }
     }
 

src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java

@@ -7,8 +7,6 @@
 import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.service.ValidationService;
-import fr.xephi.authme.settings.properties.RegistrationSettings;
-import fr.xephi.authme.util.Utils;
 import org.bukkit.entity.Player;
 
 import javax.inject.Inject;
@@ -68,10 +66,7 @@ private void outputUnloggedMessage(Player player) {
         if (dataSource.isAuthAvailable(player.getName())) {
             service.send(player, MessageKey.LOGIN_MESSAGE);
         } else {
-            MessageKey registerMessage = Utils.getRegisterMessage(
-                service.getProperty(RegistrationSettings.REGISTRATION_TYPE),
-                service.getProperty(RegistrationSettings.REGISTER_SECOND_ARGUMENT));
-            service.send(player, registerMessage);
+            service.send(player, MessageKey.REGISTER_MESSAGE);
         }
     }
 }

src/main/java/fr/xephi/authme/task/LimboPlayerTaskManager.java

@@ -10,7 +10,6 @@
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
-import fr.xephi.authme.util.Utils;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
@@ -96,9 +95,7 @@ private MessageKey getMessageKey(boolean isRegistered) {
         if (isRegistered) {
             return MessageKey.LOGIN_MESSAGE;
         } else {
-            return Utils.getRegisterMessage(
-                settings.getProperty(RegistrationSettings.REGISTRATION_TYPE),
-                settings.getProperty(RegistrationSettings.REGISTER_SECOND_ARGUMENT));
+            return MessageKey.REGISTER_MESSAGE;
         }
     }
 

src/main/java/fr/xephi/authme/util/Utils.java

@@ -1,9 +1,6 @@
 package fr.xephi.authme.util;
 
 import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.process.register.RegisterSecondaryArgument;
-import fr.xephi.authme.process.register.RegistrationType;
 
 import java.util.regex.Pattern;
 
@@ -62,30 +59,4 @@ public static int getCoreCount() {
         return Runtime.getRuntime().availableProcessors();
     }
 
-    /**
-     * Returns the proper message key for the given registration types.
-     *
-     * @param registrationType the registration type
-     * @param secondaryArgType secondary argument type for the register command
-     * @return the message key
-     */
-    // TODO #1037: Remove this method
-    public static MessageKey getRegisterMessage(RegistrationType registrationType,
-                                                RegisterSecondaryArgument secondaryArgType) {
-        if (registrationType == RegistrationType.PASSWORD) {
-            if (secondaryArgType == RegisterSecondaryArgument.CONFIRMATION) {
-                return MessageKey.REGISTER_MESSAGE;
-            } else if (secondaryArgType == RegisterSecondaryArgument.NONE) {
-                return MessageKey.REGISTER_NO_REPEAT_MESSAGE;
-            } else { /* EMAIL_MANDATORY || EMAIL_OPTIONAL */
-                return MessageKey.REGISTER_PASSWORD_EMAIL_MESSAGE;
-            }
-        } else { /* registrationType == EMAIL */
-            if (secondaryArgType == RegisterSecondaryArgument.NONE) {
-                return MessageKey.REGISTER_EMAIL_NO_REPEAT_MESSAGE;
-            } else { /* CONFIRMATION || EMAIL_MANDATORY || EMAIL_OPTIONAL */
-                return MessageKey.REGISTER_EMAIL_MESSAGE;
-            }
-        }
-    }
 }

src/main/resources/messages/messages_bg.yml

@@ -17,10 +17,6 @@ no_perm: '&cНямаш Достъп!'
 error: '&fПолучи се грешка; Моля свържете се с админ'
 login_msg: '&cМоля влез с "/login парола"'
 reg_msg: '&cМоля регистрирай се с "/register <парола> <парола>"'
-reg_no_repeat_msg: '&cМоля регистрирай се с "/register <парола>"'
-reg_email_msg: '&cМоля регистрирай се с "/register <имейл> <имейл>"'
-reg_email_no_repeat_msg: '&cМоля регистрирай се с "/register <имейл>"'
-reg_psw_email_msg: '&cМоля регистрирай се с "/register <парола> <имейл>"'
 usage_unreg: '&cКоманда: /unregister парола'
 pwd_changed: '&cПаролата е променена!'
 user_unknown: '&cПотребителя не е регистриран'

src/main/resources/messages/messages_br.yml

@@ -23,7 +23,6 @@ no_perm: '&4Você não tem permissão para executar esta ação!'
 error: '&4Ocorreu um erro inesperado, por favor contacte um administrador!'
 login_msg: '&cPor favor, faça o login com o comando "/login <senha>"'
 reg_msg: '&3Por favor, registre-se com o comando "/register <senha> <senha>"'
-reg_email_msg: '&3Por favor, registre-se com o comando "/register <email> <email>"'
 usage_unreg: '&cUse: /unregister <senha>'
 pwd_changed: '&2Senha alterada com sucesso!'
 user_unknown: '&cEste usuário não está registrado!'
@@ -77,7 +76,4 @@ kicked_admin_registered: 'Um administrador registrou você, por favor faça logi
 incomplete_email_settings: 'Erro: Nem todas as configurações necessárias estão definidas para o envio de e-mails. Entre em contato com um administrador.'
 recovery_code_sent: 'Um código de recuperação para redefinir sua senha foi enviada para o seu e-mail.'
 recovery_code_incorrect: 'O código de recuperação esta incorreto! Use /email recovery [email] para gerar um novo!'
-reg_no_repeat_msg: '&3Por favor, registre-se usando "/register <senha>"'
-reg_email_no_repeat_msg: '&3Por favor, registre-se usando "/register <email>"'
-reg_psw_email_msg: '&3Por favor, registre-se usando "/register <senha> <email>"'
 email_send_failure: '&cO e-mail não pôde ser enviado, reporte isso a um administrador!'

src/main/resources/messages/messages_cz.yml

@@ -20,10 +20,6 @@ no_perm: '&cNa tento příkaz nemáš dostatečné pravomoce.'
 error: '&cVyskytla se chyba - kontaktujte prosím administrátora ...'
 login_msg: '&cProsím přihlaš se pomocí "/login TvojeHeslo".'
 reg_msg: '&cProsím zaregistruj se pomocí "/register <heslo> <ZnovuHeslo>"'
-reg_no_repeat_msg: '&cProsím zaregistruj se pomocí "/register <heslo>"'
-reg_email_msg: '&cProsím zaregistruj se pomocí "/register <email> <potvrzení_emailu>"'
-reg_email_no_repeat_msg: '&cProsím zaregistruj se pomocí "/register <email>"'
-reg_psw_email_msg: '&cProsím zaregistruj se pomocí "/register <heslo> <email>"'
 usage_unreg: '&cPoužij: "/unregister TvojeHeslo".'
 pwd_changed: '&cHeslo změněno!'
 user_unknown: '&cUživatelské jméno není zaregistrováno.'
@@ -77,4 +73,4 @@ kicked_admin_registered: 'Admin vás právě zaregistroval; Přihlašte se pros
 incomplete_email_settings: 'Chyba: chybí některé důležité informace pro odeslání emailu. Kontaktujte prosím admina.'
 email_send_failure: 'Email nemohl být odeslán. Kontaktujte prosím admina.'
 recovery_code_sent: 'Kód pro obnovení hesla byl odeslán na váš email.'
-recovery_code_incorrect: 'Kód pro není správný! Použijte příkaz /email recovery [email] pro vygenerování nového.'
+recovery_code_incorrect: 'Kód pro není správný! Použijte příkaz /email recovery [email] pro vygenerování nového.'

src/main/resources/messages/messages_de.yml

@@ -16,10 +16,6 @@ no_perm: '&4Du hast keine Rechte, um diese Aktion auszuführen!'
 error: '&4Ein Fehler ist aufgetreten. Bitte kontaktiere einen Administrator.'
 login_msg: '&cBitte logge dich ein mit "/login <passwort>"'
 reg_msg: '&3Bitte registriere dich mit "/register <passwort> <passwortBestätigen>"'
-reg_email_msg: '&3Bitte registriere dich mit "/register <email> <emailBestätigen>"'
-reg_no_repeat_msg: '&3Bitte registriere dich mit "/register <passwort>"'
-reg_email_no_repeat_msg: '&3Bitte registriere dich mit "/register <email>"'
-reg_psw_email_msg: '&3Bitte registriere dich mit "/register <passwort> <email>"'
 usage_unreg: '&cBenutze: /unregister <passwort>'
 pwd_changed: '&2Passwort geändert!'
 user_unknown: '&cBenutzername nicht registriert!'

src/main/resources/messages/messages_en.yml

@@ -20,10 +20,6 @@ no_perm: '&4You don''t have the permission to perform this action!'
 error: '&4An unexpected error occurred, please contact an administrator!'
 login_msg: '&cPlease, login with the command "/login <password>"'
 reg_msg: '&3Please, register to the server with the command "/register <password> <ConfirmPassword>"'
-reg_no_repeat_msg: '&3Please, register to the server with the command "/register <password>"'
-reg_email_msg: '&3Please, register to the server with the command "/register <email> <confirmEmail>"'
-reg_email_no_repeat_msg: '&3Please, register to the server with the command "/register <email>"'
-reg_psw_email_msg: '&3Please, register to the server with the command "/register <password> <email>"'
 usage_unreg: '&cUsage: /unregister <password>'
 pwd_changed: '&2Password changed successfully!'
 user_unknown: '&cThis user isn''t registered!'

src/main/resources/messages/messages_es.yml

@@ -18,10 +18,6 @@ no_perm: '&cNo tienes permiso'
 error: '&fHa ocurrido un error. Por favor contacta al administrador.'
 login_msg: '&cInicia sesión con "/login contraseña"'
 reg_msg: '&cPor favor, regístrate con "/register <contraseña> <confirmarContraseña">'
-reg_no_repeat_msg: '&cPor favor, regístrate con "/register <contraseña>"'
-reg_email_msg: '&cPor favor, regístrate con "/register <email> <confirmarEmail>"'
-reg_email_no_repeat_msg: '&cPor favor, regístrate con "/register <email>"'
-reg_psw_email_msg: '&cPor favor, regístrate con "/register <contraseña> <email>"'
 usage_unreg: '&cUso: /unregister contraseña'
 pwd_changed: '&c¡Contraseña cambiada!'
 user_unknown: '&cUsuario no registrado'

src/main/resources/messages/messages_eu.yml

@@ -17,7 +17,6 @@ no_perm: '&cBaimenik ez'
 error: '&fErrorea; Mesedez jarri kontaktuan administratzaile batekin'
 login_msg: '&cMesedez erabili "/login pasahitza" saioa hasteko'
 reg_msg: '&cMesedez erabili "/register pasahitza pasahitza" erregistratzeko'
-reg_email_msg: '&cMesdez erabili "/register <email> <confirmEmail>" erregistratzeko'
 usage_unreg: '&cErabili: /unregister password'
 pwd_changed: '&cPasahitza aldatu duzu!'
 user_unknown: '&cErabiltzailea ez dago erregistratuta'
@@ -52,9 +51,6 @@ country_banned: '[AuthMe] Zure herrialdea blokeatuta dago zerbitzari honetan'
 # TODO same_ip_online: 'A player with the same IP is already in game!'
 # TODO denied_chat: '&cIn order to chat you must be authenticated!'
 # TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
-# TODO reg_no_repeat_msg: '&3Please, register to the server with the command "/register <password>"'
-# TODO reg_email_no_repeat_msg: '&3Please, register to the server with the command "/register <email>"'
-# TODO reg_psw_email_msg: '&3Please, register to the server with the command "/register <password> <email>"'
 # TODO password_error_nick: '&cYou can''t use your name as password, please choose another one...'
 # TODO password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...'
 # TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'

src/main/resources/messages/messages_fi.yml

@@ -17,10 +17,6 @@ no_perm: '&cEi oikeuksia'
 error: '&fVirhe: Ota yhteys palveluntarjoojaan!'
 login_msg: '&cKirjaudu palvelimmelle komennolla "/login salasana"'
 reg_msg: '&cRekisteröidy palvelimellemme komennolla "/register <salasana> <salasana>"'
-reg_no_repeat_msg: '&cRekisteröidy palvelimellemme komennolla "/register <salasana>"'
-reg_email_msg: '&cRekisteröi sähköpostisi komennolla "/register <sposti> <spostiUudelleen>"'
-reg_email_no_repeat_msg: '&cRekisteröi sähköpostisi komennolla "/register <sposti>"'
-reg_psw_email_msg: '&cRekisteröi sähköpostisi komennolla "/register <salasana> <sposti>"'
 usage_unreg: '&cKäyttötapa: /unregister password'
 pwd_changed: '&cSalasana vaihdettu!!'
 user_unknown: '&cSalasanat eivät täsmää'

src/main/resources/messages/messages_fr.yml

@@ -21,10 +21,6 @@ password_error_chars: '&4Ton mot de passe contient des caractères non autorisé
 error: '&fUne erreur est apparue, veuillez contacter un administrateur.'
 login_msg: '&cPour vous connecter, utilisez: /login motdepasse'
 reg_msg: '&cPour vous inscrire, utilisez "/register <motdepasse> <confirmermotdepasse>"'
-reg_no_repeat_msg: '&cPour vous inscrire, utilisez "/register <motdepasse>"'
-reg_email_no_repeat_msg: '&cPour vous inscrire, utilisez "/register <email>"'
-reg_psw_email_msg: '&cPour vous inscrire, utilisez "/register <motdepasse> <email>"'
-reg_email_msg: '&cPour vous inscrire, utilisez "/register <email> <confirmEmail>"'
 usage_unreg: '&cPour supprimer ce compte, utilisez: /unregister <motdepasse>'
 pwd_changed: '&aMot de passe changé avec succès !'
 user_unknown: '&cCe compte n''est pas enregistré.'

src/main/resources/messages/messages_gl.yml

@@ -18,10 +18,6 @@ no_perm: '&cNon tes o permiso'
 error: '&fOcurriu un erro; contacta cun administrador'
 login_msg: '&cPor favor, identifícate con "/login <password>"'
 reg_msg: '&cPor favor, rexístrate con "/register <contrasinal> <confirmarContrasinal>"'
-reg_no_repeat_msg: '&cPor favor, rexístrate con "/register <contrasinal>"'
-reg_email_msg: '&cPor favor, rexístrate con "/register <email> <confirmarEmail>"'
-reg_email_no_repeat_msg: '&cPor favor, rexístrate con "/register <email>"'
-reg_psw_email_msg: '&cPor favor, rexístrate con "/register <contrasinal> <email>"'
 usage_unreg: '&cUso: /unregister <contrasinal>'
 pwd_changed: '&cCambiouse o contrasinal!'
 user_unknown: '&cEse nome de usuario non está rexistrado'

src/main/resources/messages/messages_hu.yml

@@ -25,7 +25,6 @@ login: '&aSikeresen beléptél!'
 wrong_pwd: '&4Hibás jelszó!'
 user_unknown: '&cEz a felhasználó nincs regisztrálva!'
 reg_msg: '&cKérlek Regisztrálj: "/register <jelszó> <jelszó ismét>"'
-reg_email_msg: '&cKérlek regisztrálj: "/register <email> <email ismét>"'
 unsafe_spawn: 'A kilépési helyzeted nem biztonságos, ezért elteleportálunk a kezdő pozícióra.'
 max_reg: '&cElérted a maximálisan beregisztrálható karakterek számát. (%reg_count/%max_acc %reg_names)!'
 password_error: 'A két jelszó nem egyezik!'
@@ -74,7 +73,4 @@ recovery_code_incorrect: 'A visszaállító kód helytelen volt! Használd a kö
 recovery_code_sent: 'A jelszavad visszaállításához szükséges kódot sikeresen kiküldtük az email címedre!'
 email_show: '&2A jelenlegi email-ed a következő: &f%email'
 show_no_email: '&2Ehhez a felhasználóhoz jelenleg még nincs email hozzárendelve.'
-# TODO reg_no_repeat_msg: '&3Please, register to the server with the command "/register <password>"'
-# TODO reg_email_no_repeat_msg: '&3Please, register to the server with the command "/register <email>"'
-# TODO reg_psw_email_msg: '&3Please, register to the server with the command "/register <password> <email>"'
 # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.'

src/main/resources/messages/messages_id.yml

@@ -16,7 +16,6 @@ no_perm: '&4Kamu tidak mempunyai izin melakukan ini!'
 error: '&4Terjadi kesalahan tak dikenal, silahkan hubungi Administrator!'
 login_msg: '&cSilahkan login menggunakan command "/login <password>"'
 reg_msg: '&3Silahkan mendaftar ke server menggunakan command "/register <password> <ulangiPassword>"'
-reg_email_msg: '&3Silahkan mendaftar ke server menggunakan command "/register <email> <ulangiEmail>"'
 pwd_changed: '&2Berhasil mengubah password!'
 user_unknown: '&cUser ini belum terdaftar!'
 password_error: '&cPassword tidak cocok, silahkan periksa dan ulangi kembali!'
@@ -58,9 +57,6 @@ antibot_auto_disabled: '&2[AntiBotService] AntiBot dimatikan setelah %m menit!'
 # TODO same_ip_online: 'A player with the same IP is already in game!'
 # TODO denied_chat: '&cIn order to chat you must be authenticated!'
 # TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
-# TODO reg_no_repeat_msg: '&3Please, register to the server with the command "/register <password>"'
-# TODO reg_email_no_repeat_msg: '&3Please, register to the server with the command "/register <email>"'
-# TODO reg_psw_email_msg: '&3Please, register to the server with the command "/register <password> <email>"'
 # TODO usage_reg: '&cUsage: /register <password> <ConfirmPassword>'
 # TODO usage_unreg: '&cUsage: /unregister <password>'
 # TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'