From 769da9dbbe2f808174f9c38627d8b54962ab40e5 Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Fri, 17 Jul 2015 19:02:23 +0200 Subject: [PATCH 01/18] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 87962af3..5b44e905 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,9 @@ McStats: http://mcstats.org/plugin/AuthMe - +[​IMG] - +[​IMG]
From 0596eaed6ce8a9ab815ce1ab21c6d52c06b9398c Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Fri, 17 Jul 2015 21:13:23 +0200 Subject: [PATCH 02/18] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5b44e905..d7f76c51 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
-

+

The most used authentication plugin for CraftBukkit/Spigot!

#####Development tools: From 77c2fbd7a7c91f09aa77c92dc6a0f2b639c051cf Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Fri, 17 Jul 2015 21:18:07 +0200 Subject: [PATCH 03/18] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d7f76c51..54d6d182 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,9 @@ McStats: http://mcstats.org/plugin/AuthMe -[​IMG] + -[​IMG] +
From ebacf5e1648d181b92d52c946388fb5893aea05d Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Sat, 18 Jul 2015 00:02:48 +0200 Subject: [PATCH 04/18] No colors! --- src/main/resources/messages_en.yml | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/resources/messages_en.yml b/src/main/resources/messages_en.yml index 25099ef8..72358a68 100644 --- a/src/main/resources/messages_en.yml +++ b/src/main/resources/messages_en.yml @@ -1,38 +1,38 @@ -unknown_user: '&fThe requested user is not in the database' -unsafe_spawn: '&fYour quit location was unsafe, teleporting you to world spawn' +unknown_user: 'The requested user is not in the database' +unsafe_spawn: 'Your quit location was unsafe, teleporting you to world spawn' not_logged_in: '&cYou''re not logged in!' -reg_voluntarily: '&fYou can register your nickname with the command "/register "' +reg_voluntarily: 'You can register your nickname with the command "/register "' usage_log: '&cUsage: /login ' wrong_pwd: '&cWrong password' unregistered: '&cSuccessfully unregistered!' reg_disabled: '&cRegistration is disabled' valid_session: '&cSession login' login: '&cSuccessful login!' -vb_nonActiv: '&fYour account isn''t activated yet, check your emails!' +vb_nonActiv: 'Your account isn''t activated yet, check your emails!' user_regged: '&cYou have already registered this username' usage_reg: '&cUsage: /register ' -max_reg: '&fYou have exceeded the max number of registrations for your account' +max_reg: 'You have exceeded the max number of registrations for your account' no_perm: '&cYou don''t have the permission to execute this command' -error: '&fAn error occurred; Please contact the admin' +error: 'An error occurred; Please contact the admin' login_msg: '&cPlease login with "/login "' reg_msg: '&cPlease register with "/register "' reg_email_msg: '&cPlease register with "/register "' usage_unreg: '&cUsage: /unregister ' pwd_changed: '&cPassword changed!' user_unknown: '&cUsername not registered' -password_error: '&fPassword doesn''t match' -password_error_nick: '&fYou can''t use your name as password, please choose another one' -password_error_unsafe: '&fThe chosen password is not safe, please choose another one' -invalid_session: '&fSession datas doesn''t match. Please wait until the end of the current session' -reg_only: '&fRegistered players only! Please visit http://example.com to register' +password_error: 'Password doesn''t match' +password_error_nick: 'You can''t use your name as password, please choose another one' +password_error_unsafe: 'The chosen password is not safe, please choose another one' +invalid_session: 'Session datas doesn''t match. Please wait until the end of the current session' +reg_only: 'Registered players only! Please visit http://example.com to register' logged_in: '&cYou''re already logged in!' logout: '&cSuccessfully logged out' -same_nick: '&fThe same nick is already playing on the server' +same_nick: 'The same nick is already playing on the server' registered: '&cSuccessfully registered!' -pass_len: '&fYour password didn''t reach the minimum length or exceeded the max length' -reload: '&fConfiguration and database has been reloaded' -timeout: '&fLogin timeout, please try again' -usage_changepassword: '&fUsage: /changepassword ' +pass_len: 'Your password didn''t reach the minimum length or exceeded the max length' +reload: 'Configuration and database has been reloaded' +timeout: 'Login timeout, please try again' +usage_changepassword: 'Usage: /changepassword ' name_len: '&cYour nickname is either too short or too long' regex: '&cYour nickname contains illegal characters. Allowed chars: REG_EX' add_email: '&cPlease add your email with: /email add ' @@ -43,9 +43,9 @@ wrong_captcha: '&cWrong Captcha, please type: /captcha THE_CAPTCHA' valid_captcha: '&cYour captcha is valid!' kick_forvip: '&cA VIP Player has joined the server when full!' kick_fullserver: '&cThe server is full, try again later' -usage_email_add: '&fUsage: /email add ' -usage_email_change: '&fUsage: /email change ' -usage_email_recovery: '&fUsage: /email recovery ' +usage_email_add: 'Usage: /email add ' +usage_email_change: 'Usage: /email change ' +usage_email_recovery: 'Usage: /email recovery ' new_email_invalid: '[AuthMe] New email invalid!' old_email_invalid: '[AuthMe] Old email invalid!' email_invalid: '[AuthMe] Invalid email' From 3d1cc3a321e805d0a3237fc6723347e7cd2dba44 Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Sat, 18 Jul 2015 01:07:06 +0200 Subject: [PATCH 05/18] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 54d6d182..60615646 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,8 @@ McStats: http://mcstats.org/plugin/AuthMe + +
#####Compiling Requirements: From d980ffa34f4c753730957d756d966090ca1227a5 Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Sat, 18 Jul 2015 01:07:34 +0200 Subject: [PATCH 06/18] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 60615646..f2519481 100644 --- a/README.md +++ b/README.md @@ -22,10 +22,10 @@ McStats: http://mcstats.org/plugin/AuthMe - - + +
#####Compiling Requirements: From 6966fa4faac5f972e7e4a0b4478f8de261ceb63a Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Sat, 18 Jul 2015 14:33:44 +0200 Subject: [PATCH 07/18] Update messages_en.yml --- src/main/resources/messages_en.yml | 40 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/main/resources/messages_en.yml b/src/main/resources/messages_en.yml index 72358a68..af17668f 100644 --- a/src/main/resources/messages_en.yml +++ b/src/main/resources/messages_en.yml @@ -1,28 +1,28 @@ -unknown_user: 'The requested user is not in the database' -unsafe_spawn: 'Your quit location was unsafe, teleporting you to world spawn' +unknown_user: '&cCan''t find the requested user in the database! Probably he isn''t registered.' +unsafe_spawn: '&cYour quit location was unsafe, you have been teleported to the world''s spawnpoint.' not_logged_in: '&cYou''re not logged in!' -reg_voluntarily: 'You can register your nickname with the command "/register "' +reg_voluntarily: 'You can register yourself to the server with the command "/register "' usage_log: '&cUsage: /login ' -wrong_pwd: '&cWrong password' +wrong_pwd: '&cWrong password!' unregistered: '&cSuccessfully unregistered!' -reg_disabled: '&cRegistration is disabled' -valid_session: '&cSession login' -login: '&cSuccessful login!' -vb_nonActiv: 'Your account isn''t activated yet, check your emails!' -user_regged: '&cYou have already registered this username' +reg_disabled: '&cIngame registration is disabled!' +valid_session: '&2Logged-in due to Session Reconnection.' +login: '&2Successful login!' +vb_nonActiv: '&cYour account isn''t activated yet, plase check your emails!' +user_regged: '&cThis username has already been registered!' usage_reg: '&cUsage: /register ' -max_reg: 'You have exceeded the max number of registrations for your account' -no_perm: '&cYou don''t have the permission to execute this command' -error: 'An error occurred; Please contact the admin' -login_msg: '&cPlease login with "/login "' -reg_msg: '&cPlease register with "/register "' -reg_email_msg: '&cPlease register with "/register "' +max_reg: '&cYou have exceeded the maximum number of registrations for your connection!' +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 "' +reg_msg: '&3Please, register to the server with the command "/register "' +reg_email_msg: '&3Please, register to the server with the command "/register "' usage_unreg: '&cUsage: /unregister ' -pwd_changed: '&cPassword changed!' -user_unknown: '&cUsername not registered' -password_error: 'Password doesn''t match' -password_error_nick: 'You can''t use your name as password, please choose another one' -password_error_unsafe: 'The chosen password is not safe, please choose another one' +pwd_changed: '&2Password changed successfully!' +user_unknown: '&cThis user isn''t registered!' +password_error: '&cPassword confirmation doesn''t match Password!' +password_error_nick: '&cYou can''t use your name as password, please choose another one...' +password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...' invalid_session: 'Session datas doesn''t match. Please wait until the end of the current session' reg_only: 'Registered players only! Please visit http://example.com to register' logged_in: '&cYou''re already logged in!' From 8906738ca920c0686c56b8fc2c63d228a65d9658 Mon Sep 17 00:00:00 2001 From: Maxetto Date: Sat, 18 Jul 2015 14:51:13 +0200 Subject: [PATCH 08/18] Update messages_en.yml - unknown_user casts when no record is found in the database, therefore hasn't even connected to the server. - pl(e)ase - user_reddeg casts when trying to register after having already registered the name. We must then use it at 2nd person. - I personally didn't like the new "password_error" --- src/main/resources/messages_en.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/messages_en.yml b/src/main/resources/messages_en.yml index af17668f..1b5b1ca9 100644 --- a/src/main/resources/messages_en.yml +++ b/src/main/resources/messages_en.yml @@ -1,15 +1,15 @@ -unknown_user: '&cCan''t find the requested user in the database! Probably he isn''t registered.' +unknown_user: '&cCan''t find the requested user in the database!' unsafe_spawn: '&cYour quit location was unsafe, you have been teleported to the world''s spawnpoint.' not_logged_in: '&cYou''re not logged in!' reg_voluntarily: 'You can register yourself to the server with the command "/register "' usage_log: '&cUsage: /login ' wrong_pwd: '&cWrong password!' unregistered: '&cSuccessfully unregistered!' -reg_disabled: '&cIngame registration is disabled!' +reg_disabled: '&cIn-game registration is disabled!' valid_session: '&2Logged-in due to Session Reconnection.' login: '&2Successful login!' -vb_nonActiv: '&cYour account isn''t activated yet, plase check your emails!' -user_regged: '&cThis username has already been registered!' +vb_nonActiv: '&cYour account isn''t activated yet, please check your emails!' +user_regged: '&cYou already have registered this username!' usage_reg: '&cUsage: /register ' max_reg: '&cYou have exceeded the maximum number of registrations for your connection!' no_perm: '&4You don''t have the permission to perform this action!' @@ -20,7 +20,7 @@ reg_email_msg: '&3Please, register to the server with the command "/register ' pwd_changed: '&2Password changed successfully!' user_unknown: '&cThis user isn''t registered!' -password_error: '&cPassword confirmation doesn''t match Password!' +password_error: '&cPasswords didn''t match, check them again!' password_error_nick: '&cYou can''t use your name as password, please choose another one...' password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...' invalid_session: 'Session datas doesn''t match. Please wait until the end of the current session' From 32063bc76075cec99172315278697b15db93f9a2 Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Sat, 18 Jul 2015 15:02:23 +0200 Subject: [PATCH 09/18] Update messages_en.yml --- src/main/resources/messages_en.yml | 66 +++++++++++++++--------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/src/main/resources/messages_en.yml b/src/main/resources/messages_en.yml index 1b5b1ca9..8f07d88b 100644 --- a/src/main/resources/messages_en.yml +++ b/src/main/resources/messages_en.yml @@ -23,37 +23,37 @@ user_unknown: '&cThis user isn''t registered!' password_error: '&cPasswords didn''t match, check them again!' password_error_nick: '&cYou can''t use your name as password, please choose another one...' password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...' -invalid_session: 'Session datas doesn''t match. Please wait until the end of the current session' -reg_only: 'Registered players only! Please visit http://example.com to register' +invalid_session: '&cYour IP has been changed and your session data has expired!' +reg_only: '&4Only registered users can join the server! Please visit http://example.com to register yourself!' logged_in: '&cYou''re already logged in!' -logout: '&cSuccessfully logged out' -same_nick: 'The same nick is already playing on the server' -registered: '&cSuccessfully registered!' -pass_len: 'Your password didn''t reach the minimum length or exceeded the max length' -reload: 'Configuration and database has been reloaded' -timeout: 'Login timeout, please try again' -usage_changepassword: 'Usage: /changepassword ' -name_len: '&cYour nickname is either too short or too long' -regex: '&cYour nickname contains illegal characters. Allowed chars: REG_EX' -add_email: '&cPlease add your email with: /email add ' -bad_database_email: '[AuthMe] This /email command is only available with MySQL and SQLite, contact an admin' -recovery_email: '&cForgot your password? Please use /email recovery ' -usage_captcha: '&cWe need you to type a captcha, please type: /captcha ' -wrong_captcha: '&cWrong Captcha, please type: /captcha THE_CAPTCHA' -valid_captcha: '&cYour captcha is valid!' -kick_forvip: '&cA VIP Player has joined the server when full!' -kick_fullserver: '&cThe server is full, try again later' -usage_email_add: 'Usage: /email add ' -usage_email_change: 'Usage: /email change ' -usage_email_recovery: 'Usage: /email recovery ' -new_email_invalid: '[AuthMe] New email invalid!' -old_email_invalid: '[AuthMe] Old email invalid!' -email_invalid: '[AuthMe] Invalid email' -email_added: '[AuthMe] Email Added!' -email_confirm: '[AuthMe] Confirm your email!' -email_changed: '[AuthMe] Email changed!' -email_send: '[AuthMe] Recovery email sent!' -email_exists: '[AuthMe] An email already exists on your account. You can change it using the command below' -country_banned: 'Your country is banned from this server' -antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to the number of connections!' -antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m minutes' +logout: '&2Logged-out successfully!' +same_nick: '&4The same username is already playing on the server!' +registered: '&2Successfully registered!' +pass_len: '&cYour password is too short or too long! Please try with another one!' +reload: '&2Configuration and database have been reloaded correctly!' +timeout: '&4Login timeout exceeded, you have been kicked from the server, please try again!' +usage_changepassword: '&cUsage: /changepassword ' +name_len: '&4Your username is either too short or too long!' +regex: '&4Your username contains illegal characters. Allowed chars: REG_EX' +add_email: '&3Please add your email to your account with the command "/email add "' +bad_database_email: '&4The /email command is available only with MySQL and SQLite databases, please contact an Admin!' #This should be removed! +recovery_email: '&3Forgot your password? Please use the command "/email recovery "' +usage_captcha: '&3To login you have to solve a captcha code, please use the command "/captcha "' +wrong_captcha: '&cWrong Captcha, please type "/captcha THE_CAPTCHA" into the chat!' +valid_captcha: '&2Captcha code solved correctly!' +kick_forvip: '&3A VIP Player has joined the server when it was full!' +kick_fullserver: '&4The server is full, try again later!' +usage_email_add: '&cUsage: /email add ' +usage_email_change: '&cUsage: /email change ' +usage_email_recovery: '&cUsage: /email recovery ' +new_email_invalid: '&cInvalid New Email, try again!' +old_email_invalid: '&cInvalid Old Email, try again!' +email_invalid: '&cInvalid Email address, try again!' +email_added: '&2Email address successfully added to your account!' +email_confirm: '&cPlease confirm your email address!' +email_changed: '&2Email address changed correctly!' +email_send: '&2Recovery email sent correctly! Check your email inbox!' +email_exists: '&cA recovery email was already sent! You can discart it and send a new one using the command below:' +country_banned: '&4Your country is banned from this server!' +antibot_auto_enabled: '&4[AntiBotService] AntiBot enabled due to the huge number of connections!' +antibot_auto_disabled: '&2[AntiBotService] AntiBot disabled disabled after %m minutes!' From 61abee86b0cbe5f6dfb425b86076f8450ec89c26 Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Sat, 18 Jul 2015 15:07:36 +0200 Subject: [PATCH 10/18] This was useless... --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f2519481..fc70c520 100644 --- a/README.md +++ b/README.md @@ -20,11 +20,11 @@ McStats: http://mcstats.org/plugin/AuthMe - + - + - +
From 7142ed845b42ce37137158d94057a3e42263afdb Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Sat, 18 Jul 2015 15:23:33 +0200 Subject: [PATCH 11/18] Moved Email settings --- NewAuthMeConf/emailSystem.yml | 40 +++++++++++++++++++++++++++++++++ NewAuthMeConf/general.yml | 42 ----------------------------------- 2 files changed, 40 insertions(+), 42 deletions(-) create mode 100644 NewAuthMeConf/emailSystem.yml diff --git a/NewAuthMeConf/emailSystem.yml b/NewAuthMeConf/emailSystem.yml new file mode 100644 index 00000000..48c9b59a --- /dev/null +++ b/NewAuthMeConf/emailSystem.yml @@ -0,0 +1,40 @@ +emailSystem: + # Do you want to replace the Password registration with an Email registration method? + enableEmailRegistration: false + # Do you want to enable the double check of the email address during a player registration? + # When it's true, registration require that kind of command: + # /register + doubleEmailCheck: true + # Like maxRegPerIp but with emails + maxRegPerEmail: 1 + # Do you want to recall players to add an email to their accounts? + recallPlayers: true + # Delay in minute for the recall scheduler + delayRecall: 5 + + passwordRecovery: + # Recovery password length + RecoveryPasswordLength: 8 + # Recovery Email subject + mailSubject: 'Your new AuthMe Password' + # Recovery Email text + mailText: 'Dear ,

This is your new AuthMe password for the server

:



Do not forget to change password after login!
/changepassword newPassword' + + smtpOptions: + # SMTP server host + mailSMTP: smtp.gmail.com + # SMTP server port + mailPort: 465 + # Email account that sends the mails + mailAccount: '' + # Email account's password + mailPassword: '' + # Custom SenderName, that replace the mailAccount name in the emails + mailSenderName: '' + + emailSecurity: + # Blacklisted domains for emails + emailBlacklist: + - 10minutemail.com + # Do you like a Whitelist instead of a Blacklist? + blacklistAsWhitelist: false diff --git a/NewAuthMeConf/general.yml b/NewAuthMeConf/general.yml index 1db49e34..c1d290c2 100644 --- a/NewAuthMeConf/general.yml +++ b/NewAuthMeConf/general.yml @@ -23,53 +23,11 @@ registration: minUsernameLength: 4 # Regex syntax allowed in player's username allowedNicknameCharacters: '[a-zA-Z0-9_]*' - # Do you want to kick players after a successful registration? # Do not use this option with the loginAfterRegister feature below! kickAfterRegistration: false # Do you want to force the player to login after a successful registration? loginAfterRegister: false - - emailSystem: - # Do you want to replace the Password registration with an Email registration method? - enableEmailRegistration: false - # Do you want to enable the double check of the email address during a player registration? - # When it's true, registration require that kind of command: - # /register - doubleEmailCheck: true - # Like maxRegPerIp but with emails - maxRegPerEmail: 1 - # Do you want to recall players to add an email to their accounts? - recallPlayers: true - # Delay in minute for the recall scheduler - delayRecall: 5 - - passwordRecovery: - # Recovery password length - RecoveryPasswordLength: 8 - # Recovery Email subject - mailSubject: 'Your new AuthMe Password' - # Recovery Email text - mailText: 'Dear ,

This is your new AuthMe password for the server

:



Do not forget to change password after login!
/changepassword newPassword' - - smtpOptions: - # SMTP server host - mailSMTP: smtp.gmail.com - # SMTP server port - mailPort: 465 - # Email account that sends the mails - mailAccount: '' - # Email account's password - mailPassword: '' - # Custom SenderName, that replace the mailAccount name in the emails - mailSenderName: '' - - emailSecurity: - # Blacklisted domains for emails - emailBlacklist: - - 10minutemail.com - # Do you like a Whitelist instead of a Blacklist? - blacklistAsWhitelist: false login: # How many players per IP can join the server concurrently? From d433b7d0f8d15470b13d5ee08a99e18baee79b39 Mon Sep 17 00:00:00 2001 From: Trojaner Date: Sat, 18 Jul 2015 16:54:14 +0300 Subject: [PATCH 12/18] Update german translation (add missing translations) --- src/main/resources/messages_de.yml | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/resources/messages_de.yml b/src/main/resources/messages_de.yml index 4e104df7..8b4ad8b1 100644 --- a/src/main/resources/messages_de.yml +++ b/src/main/resources/messages_de.yml @@ -13,12 +13,12 @@ user_regged: '&cBenutzername ist schon vergeben' usage_reg: '&cBenutze: /register ' max_reg: '&fDu hast die maximale Anzahl an Accounts erreicht' no_perm: '&cKeine Rechte' -password_error_nick: '&fYou can''t use your name as password' -password_error_unsafe: '&fYou can''t use unsafe passwords' +password_error_nick: '&fDu kannst nicht deinen Namen als Passwort nutzen!' +password_error_unsafe: '&fDu kannst nicht unsichere Passwörter nutzen!' error: '&fEin Fehler ist aufgetreten. Bitte kontaktiere einen Admin' login_msg: '&cBitte logge dich ein mit "/login "' reg_msg: '&cBitte registriere dich mit "/register "' -reg_email_msg: '&cPlease register with "/register "' +reg_email_msg: '&cBitte registriere dich mit "/register "' usage_unreg: '&cBenutze: /unregister ' pwd_changed: '&cPasswort geändert!' user_unknown: '&cBenutzername nicht registriert' @@ -29,30 +29,30 @@ logged_in: '&cBereits eingeloggt!' logout: '&cErfolgreich ausgeloggt' same_nick: '&fSelber Name spielt bereits' registered: '&cErfolgreich registriert!' -pass_len: '&fDein Passwort ist zu kurz oder zu langg' +pass_len: '&fDein Passwort ist zu kurz oder zu lang' reload: '&fKonfiguration und Datenbank neu geladen' timeout: '&fZeitüberschreitung beim Login' usage_changepassword: '&fBenutze: /changepassword ' name_len: '&cDein Nickname ist zu kurz oder zu lang' regex: '&cDein Nichname enthält nicht erlaubte Zeichen. Zulässige Zeichen: REG_EX' add_email: '&cBitte hinterlege Deine E-Mail Adresse: /email add ' -bad_database_email: '[AuthMe] Der /email Befehl ist nur mit MySQL und SQLite kompatibel. Bitte kontaktieren einen Admin' -recovery_email: '&cPasswort vergessen? Nutze "/email recovery " für ein neues Passwort' +bad_database_email: '[AuthMe] Der /email Befehl ist nur mit MySQL und SQLite kompatibel. Bitte kontaktieren einen Administrator' +recovery_email: '&cPasswort vergessen? Nutze "/email recovery " für ein neues Passwort' usage_captcha: '&cBenutze: /captcha ' wrong_captcha: '&cFalsches Captcha, bitte nutze: /captcha ' valid_captcha: '&cDas Captcha ist korrekt!' kick_forvip: '&cEin VIP Spieler hat den vollen Server betreten!' kick_fullserver: '&cDer Server ist momentan voll, Sorry!' -usage_email_add: '&fUsage: /email add ' -usage_email_change: '&fUsage: /email change ' -usage_email_recovery: '&fUsage: /email recovery ' -new_email_invalid: '[AuthMe] New email invalid!' -old_email_invalid: '[AuthMe] Old email invalid!' -email_invalid: '[AuthMe] Invalid Email' -email_added: '[AuthMe] Email Added !' -email_confirm: '[AuthMe] Confirm your Email !' -email_changed: '[AuthMe] Email Change !' -email_send: '[AuthMe] Recovery Email Send !' -country_banned: 'Your country is banned from this server' -antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' -antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' +usage_email_add: '&fBenutzung: /email add ' +usage_email_change: '&fBenutzung: /email change ' +usage_email_recovery: '&fBenutzung: /email recovery ' +new_email_invalid: '[AuthMe] Die neue Email ist ungültig!' +old_email_invalid: '[AuthMe] Die alte Email ist ungültig!' +email_invalid: '[AuthMe] Ungültige Email' +email_added: '[AuthMe] Email hinzugefügt!' +email_confirm: '[AuthMe] Bitte bestätige deine Email!' +email_changed: '[AuthMe] Email aktualisiert!' +email_send: '[AuthMe] Wiederherstelltungs-Email wurde gesendet !' +country_banned: 'Dein Land ist gesperrt' +antibot_auto_enabled: '[AuthMe] AntiBotMod wurde aufgrund hoher Netzauslastung automatisch aktiviert!' +antibot_auto_disabled: '[AuthMe] AntiBotMod wurde nach %m Minuten deaktiviert, hoffentlich ist die Invasion vorbei' From b95795f2c6cfc3d3f9ebee3a6f1c3f13f976b18b Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Sat, 18 Jul 2015 15:58:09 +0200 Subject: [PATCH 13/18] added a converters little documentation (prototype) --- NewAuthMeConf/converters.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 NewAuthMeConf/converters.txt diff --git a/NewAuthMeConf/converters.txt b/NewAuthMeConf/converters.txt new file mode 100644 index 00000000..0290f672 --- /dev/null +++ b/NewAuthMeConf/converters.txt @@ -0,0 +1,21 @@ +_________________________________________________________________________________ +> < +> WARNING: Conversions can't be undone! DO ALWAYS A BACKUP BEFORE!!! < +> < +_________________________________________________________________________________ +> AuthMe Reloaded converters description file < +_________________________________________________________________________________ + +Built-in converters (Into the Plugin's core module): + Old File Backend ("file") >>> SQLite ("/authme converter flatfiletosqlite") THIS CONVERTER WILL BE REMOVED FROM THE CORE IN FUTURE VERSIONS!!! + +Converters in the Converters module (Into the Converters module avariable at: NEED LINK): + SQlite >>> MySql ("/authme converter sqlitetomysql") + MySql >>> Redis ("/authme converter mysqltoredis") + Rakamak >>> SQlite ("/authme converter rakamaktosqlite [databasefile.rak] [(ip-mode) (ipdatabasefle.rak)]") + CrazyLogin >>> SQlite ("/authme converter crazylogintosqlite [databasefile.db]") + xAuth (Min version 2.6) >>> SQlite ("/authme converter xauthtosqlite") NOTE: xAUTH MUST BE INSTALLED AND CONFIGURED IN THE SERVER, it works with all the xAuth backends! + +Discontinued Converters (use an old AuthMe version like 3.4): + RoyalAuth >>> SQlite + vAuth >>> SQlite From edd77fe0a67b3b2521cd1df3a6976c28537be91d Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Sat, 18 Jul 2015 20:27:35 +0200 Subject: [PATCH 14/18] Update messages_de.yml --- src/main/resources/messages_de.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/messages_de.yml b/src/main/resources/messages_de.yml index 8b4ad8b1..ed3d965f 100644 --- a/src/main/resources/messages_de.yml +++ b/src/main/resources/messages_de.yml @@ -36,14 +36,14 @@ usage_changepassword: '&fBenutze: /changepassword ' -bad_database_email: '[AuthMe] Der /email Befehl ist nur mit MySQL und SQLite kompatibel. Bitte kontaktieren einen Administrator' +bad_database_email: '[AuthMe] Der /email Befehl ist nur mit MySQL und SQLite kompatibel. Bitte kontaktiere einen Administrator!' recovery_email: '&cPasswort vergessen? Nutze "/email recovery " für ein neues Passwort' -usage_captcha: '&cBenutze: /captcha ' +usage_captcha: '&cBenutze: /captcha ' wrong_captcha: '&cFalsches Captcha, bitte nutze: /captcha ' valid_captcha: '&cDas Captcha ist korrekt!' kick_forvip: '&cEin VIP Spieler hat den vollen Server betreten!' kick_fullserver: '&cDer Server ist momentan voll, Sorry!' -usage_email_add: '&fBenutzung: /email add ' +usage_email_add: '&fBenutzung: /email add ' usage_email_change: '&fBenutzung: /email change ' usage_email_recovery: '&fBenutzung: /email recovery ' new_email_invalid: '[AuthMe] Die neue Email ist ungültig!' @@ -52,7 +52,7 @@ email_invalid: '[AuthMe] Ungültige Email' email_added: '[AuthMe] Email hinzugefügt!' email_confirm: '[AuthMe] Bitte bestätige deine Email!' email_changed: '[AuthMe] Email aktualisiert!' -email_send: '[AuthMe] Wiederherstelltungs-Email wurde gesendet !' +email_send: '[AuthMe] Wiederherstellungs-Email wurde gesendet !' country_banned: 'Dein Land ist gesperrt' antibot_auto_enabled: '[AuthMe] AntiBotMod wurde aufgrund hoher Netzauslastung automatisch aktiviert!' antibot_auto_disabled: '[AuthMe] AntiBotMod wurde nach %m Minuten deaktiviert, hoffentlich ist die Invasion vorbei' From 1bde8729ee92fd5213d9fd3c0db5324040062db7 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Sat, 18 Jul 2015 21:57:26 +0200 Subject: [PATCH 15/18] I hope I didn't made only shit (pls check this) --- .../xephi/authme/process/quit/AsyncronousQuit.java | 3 --- .../java/fr/xephi/authme/settings/Messages.java | 9 ++------- .../java/fr/xephi/authme/settings/Settings.java | 13 +++++-------- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java b/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java index 953a3c71..0bd00118 100644 --- a/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java +++ b/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java @@ -10,7 +10,6 @@ import fr.xephi.authme.AuthMe; import fr.xephi.authme.Utils; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.cache.backup.FileCache; import fr.xephi.authme.cache.limbo.LimboCache; import fr.xephi.authme.cache.limbo.LimboPlayer; import fr.xephi.authme.datasource.DataSource; @@ -25,7 +24,6 @@ public class AsyncronousQuit { protected Player p; protected Utils utils = Utils.getInstance(); private String name; - private FileCache playerBackup; private ItemStack[] armor = null; private ItemStack[] inv = null; private boolean isOp = false; @@ -39,7 +37,6 @@ public class AsyncronousQuit { this.plugin = plugin; this.database = database; this.name = p.getName().toLowerCase(); - this.playerBackup = new FileCache(plugin); this.isKick = isKick; } diff --git a/src/main/java/fr/xephi/authme/settings/Messages.java b/src/main/java/fr/xephi/authme/settings/Messages.java index b98bd7fc..b7f73b11 100644 --- a/src/main/java/fr/xephi/authme/settings/Messages.java +++ b/src/main/java/fr/xephi/authme/settings/Messages.java @@ -1,12 +1,9 @@ package fr.xephi.authme.settings; import java.io.File; -import java.io.InputStream; - import org.bukkit.command.CommandSender; import org.bukkit.configuration.file.YamlConfiguration; -import fr.xephi.authme.AuthMe; import fr.xephi.authme.ConsoleLogger; public class Messages extends CustomConfiguration { @@ -27,13 +24,11 @@ public class Messages extends CustomConfiguration { * @param filename * The filename to open */ - @SuppressWarnings("deprecation") public final void loadDefaults(File file) { - InputStream stream = AuthMe.getInstance().getResource(file.getName()); - if (stream == null) + if (file.exists()) return; - setDefaults(YamlConfiguration.loadConfiguration(stream)); + setDefaults(YamlConfiguration.loadConfiguration(file)); } /** diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java index ae53fdac..16bd3330 100644 --- a/src/main/java/fr/xephi/authme/settings/Settings.java +++ b/src/main/java/fr/xephi/authme/settings/Settings.java @@ -7,7 +7,6 @@ import java.io.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -102,7 +101,7 @@ public final class Settings extends YamlConfiguration { if (exists()) { load(); } else { - loadDefaults(file.getName()); + loadDefaults(file); load(); } configFile = (YamlConfiguration) plugin.getConfig(); @@ -672,7 +671,7 @@ public final class Settings extends YamlConfiguration { public final void reload() { load(); - loadDefaults(file.getName()); + loadDefaults(file); } /** @@ -704,13 +703,11 @@ public final class Settings extends YamlConfiguration { * @param filename * The filename to open */ - @SuppressWarnings("deprecation") - public final void loadDefaults(String filename) { - InputStream stream = plugin.getResource(filename); - if (stream == null) + public final void loadDefaults(File file) { + if (file.exists()) return; - setDefaults(YamlConfiguration.loadConfiguration(stream)); + setDefaults(YamlConfiguration.loadConfiguration(file)); } /** From 00da050f4c0a1d14a2a2ccb2d073b6bad5fac6f0 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Sat, 18 Jul 2015 23:08:47 +0200 Subject: [PATCH 16/18] moved prototype files --- .../NewConfiguration}/advanced.yml | 0 .../NewConfiguration}/database.yml | 0 .../NewConfiguration}/emailSystem.yml | 0 .../NewConfiguration}/forcedActions.yml | 0 .../NewConfiguration}/general.yml | 0 .../converters.txt | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename {NewAuthMeConf => PROTOTYPE AREA (future stuff and etc...)/NewConfiguration}/advanced.yml (100%) rename {NewAuthMeConf => PROTOTYPE AREA (future stuff and etc...)/NewConfiguration}/database.yml (100%) rename {NewAuthMeConf => PROTOTYPE AREA (future stuff and etc...)/NewConfiguration}/emailSystem.yml (100%) rename {NewAuthMeConf => PROTOTYPE AREA (future stuff and etc...)/NewConfiguration}/forcedActions.yml (100%) rename {NewAuthMeConf => PROTOTYPE AREA (future stuff and etc...)/NewConfiguration}/general.yml (100%) rename {NewAuthMeConf => PROTOTYPE AREA (future stuff and etc...)}/converters.txt (100%) diff --git a/NewAuthMeConf/advanced.yml b/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/advanced.yml similarity index 100% rename from NewAuthMeConf/advanced.yml rename to PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/advanced.yml diff --git a/NewAuthMeConf/database.yml b/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/database.yml similarity index 100% rename from NewAuthMeConf/database.yml rename to PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/database.yml diff --git a/NewAuthMeConf/emailSystem.yml b/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/emailSystem.yml similarity index 100% rename from NewAuthMeConf/emailSystem.yml rename to PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/emailSystem.yml diff --git a/NewAuthMeConf/forcedActions.yml b/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/forcedActions.yml similarity index 100% rename from NewAuthMeConf/forcedActions.yml rename to PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/forcedActions.yml diff --git a/NewAuthMeConf/general.yml b/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/general.yml similarity index 100% rename from NewAuthMeConf/general.yml rename to PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/general.yml diff --git a/NewAuthMeConf/converters.txt b/PROTOTYPE AREA (future stuff and etc...)/converters.txt similarity index 100% rename from NewAuthMeConf/converters.txt rename to PROTOTYPE AREA (future stuff and etc...)/converters.txt From ea7b470c311571b24755f41f02425d3802b63f1a Mon Sep 17 00:00:00 2001 From: Maxetto Date: Sun, 19 Jul 2015 01:36:36 +0200 Subject: [PATCH 17/18] Update Messages.java Returning the method if file is NOT found. --- src/main/java/fr/xephi/authme/settings/Messages.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/settings/Messages.java b/src/main/java/fr/xephi/authme/settings/Messages.java index b7f73b11..bf88b15d 100644 --- a/src/main/java/fr/xephi/authme/settings/Messages.java +++ b/src/main/java/fr/xephi/authme/settings/Messages.java @@ -25,7 +25,7 @@ public class Messages extends CustomConfiguration { * The filename to open */ public final void loadDefaults(File file) { - if (file.exists()) + if (!file.exists()) return; setDefaults(YamlConfiguration.loadConfiguration(file)); From 1760461518127fb4ae6af4137659b239bcecdfee Mon Sep 17 00:00:00 2001 From: Maxetto Date: Sun, 19 Jul 2015 01:37:22 +0200 Subject: [PATCH 18/18] Update Settings.java Returning the method if file is NOT found. --- src/main/java/fr/xephi/authme/settings/Settings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java index 16bd3330..abd5e45f 100644 --- a/src/main/java/fr/xephi/authme/settings/Settings.java +++ b/src/main/java/fr/xephi/authme/settings/Settings.java @@ -704,7 +704,7 @@ public final class Settings extends YamlConfiguration { * The filename to open */ public final void loadDefaults(File file) { - if (file.exists()) + if (!file.exists()) return; setDefaults(YamlConfiguration.loadConfiguration(file));