Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set classes to use Messages getter in plugin instance.

Browse Source
This commit is contained in:
DNx5
2015-11-26 08:17:19 +07:00
parent 0601ab0e40
commit 2de0e0e819
31 changed files with 76 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
+1 -1
View File
@@ -21,7 +21,7 @@ public class AccountsCommand extends ExecutableCommand {
final AuthMe plugin = AuthMe.getInstance();
// Messages instance
final Messages m = Messages.getInstance();
final Messages m = plugin.getMessages();
// Get the player query
String playerQuery = sender.getName();
src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordCommand.java
+2 -3
View File
@@ -20,8 +20,9 @@ public class ChangePasswordCommand extends ExecutableCommand {
@Override
public boolean executeCommand(final CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
final AuthMe plugin = AuthMe.getInstance();
// Messages instance
final Messages m = Messages.getInstance();
final Messages m = plugin.getMessages();
// Get the player and password
String playerName = commandArguments.get(0);
@@ -47,9 +48,7 @@ public class ChangePasswordCommand extends ExecutableCommand {
return true;
}
}
// Set the password
final AuthMe plugin = AuthMe.getInstance();
final String playerNameLowerCase = playerName.toLowerCase();
Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class GetEmailCommand extends ExecutableCommand {
// Get the authenticated user
AuthMe plugin = AuthMe.getInstance();
Messages m = Messages.getInstance();
Messages m = plugin.getMessages();
PlayerAuth auth = plugin.database.getAuth(playerName.toLowerCase());
if (auth == null) {
m.send(sender, "unknown_user");
src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java
+1 -1
View File
@@ -22,7 +22,7 @@ public class LastLoginCommand extends ExecutableCommand {
// Validate the player
AuthMe plugin = AuthMe.getInstance();
Messages m = Messages.getInstance();
Messages m = plugin.getMessages();
PlayerAuth auth;
try {
src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class PurgeLastPositionCommand extends ExecutableCommand {
final AuthMe plugin = AuthMe.getInstance();
// Messages instance
final Messages m = Messages.getInstance();
final Messages m = plugin.getMessages();
// Get the player
String playerName = sender.getName();
src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class RegisterCommand extends ExecutableCommand {
final AuthMe plugin = AuthMe.getInstance();
// Messages instance
final Messages m = Messages.getInstance();
final Messages m = plugin.getMessages();
// Get the player name and password
final String playerName = commandArguments.get(0);
src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java
+2 -2
View File
@@ -33,15 +33,15 @@ public class ReloadCommand extends ExecutableCommand {
AuthMe plugin = AuthMe.getInstance();
// Messages instance
Messages m = Messages.getInstance();
Messages m = plugin.getMessages();
// Show a status message
// sender.sendMessage(ChatColor.YELLOW + "Reloading AuthMeReloaded...");
try {
Settings.reload();
plugin.setMessages(new Messages(Settings.messageFile, Settings.messagesLanguage));
plugin.getModuleManager().reloadModules();
Messages.getInstance().reloadMessages();
plugin.setupDatabase();
} catch (Exception e) {
ConsoleLogger.showError("Fatal error occurred! AuthMe instance ABORTED!");
src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class SetEmailCommand extends ExecutableCommand {
AuthMe plugin = AuthMe.getInstance();
// Messages instance
Messages m = Messages.getInstance();
Messages m = plugin.getMessages();
// Get the player name and email address
String playerName = commandArguments.get(0);
src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class UnregisterCommand extends ExecutableCommand {
final AuthMe plugin = AuthMe.getInstance();
// Messages instance
final Messages m = Messages.getInstance();
final Messages m = plugin.getMessages();
// Get the player name
String playerName = commandArguments.get(0);
src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java
+4 -3
View File
@@ -29,8 +29,11 @@ public class CaptchaCommand extends ExecutableCommand {
// Get the parameter values
String captcha = commandArguments.get(0);
// AuthMe plugin instance
final AuthMe plugin = AuthMe.getInstance();
// Messages instance
final Messages m = Messages.getInstance();
final Messages m = plugin.getMessages();
// Command logic
if (PlayerCache.getInstance().isAuthenticated(playerNameLowerCase)) {
@@ -43,8 +46,6 @@ public class CaptchaCommand extends ExecutableCommand {
return true;
}
// AuthMe plugin instance
final AuthMe plugin = AuthMe.getInstance();
if (!plugin.cap.containsKey(playerNameLowerCase)) {
m.send(player, MessageKey.USAGE_LOGIN);
src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java
+11 -5
View File
@@ -16,7 +16,8 @@ public class ChangePasswordCommand extends ExecutableCommand {
@Override
public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
final Messages m = Messages.getInstance();
final AuthMe plugin = AuthMe.getInstance();
final Messages m = plugin.getMessages();
// Get the passwords
String playerPass = commandArguments.get(0);
@@ -37,7 +38,11 @@ public class ChangePasswordCommand extends ExecutableCommand {
// Make sure the password is allowed
String playerPassLowerCase = playerPass.toLowerCase();
if (playerPassLowerCase.contains("delete") || playerPassLowerCase.contains("where") || playerPassLowerCase.contains("insert") || playerPassLowerCase.contains("modify") || playerPassLowerCase.contains("from") || playerPassLowerCase.contains("select") || playerPassLowerCase.contains(";") || playerPassLowerCase.contains("null") || !playerPassLowerCase.matches(Settings.getPassRegex)) {
if (playerPassLowerCase.contains("delete") || playerPassLowerCase.contains("where")
|| playerPassLowerCase.contains("insert") || playerPassLowerCase.contains("modify")
|| playerPassLowerCase.contains("from") || playerPassLowerCase.contains("select")
|| playerPassLowerCase.contains(";") || playerPassLowerCase.contains("null")
|| !playerPassLowerCase.matches(Settings.getPassRegex)) {
m.send(player, "password_error");
return true;
}
@@ -45,7 +50,8 @@ public class ChangePasswordCommand extends ExecutableCommand {
m.send(player, "password_error_nick");
return true;
}
if (playerPassLowerCase.length() < Settings.getPasswordMinLen || playerPassLowerCase.length() > Settings.passwordMaxLength) {
if (playerPassLowerCase.length() < Settings.getPasswordMinLen
|| playerPassLowerCase.length() > Settings.passwordMaxLength) {
m.send(player, "pass_len");
return true;
}
@@ -57,8 +63,8 @@ public class ChangePasswordCommand extends ExecutableCommand {
}
// Set the password
final AuthMe plugin = AuthMe.getInstance();
plugin.getServer().getScheduler().runTaskAsynchronously(plugin, new ChangePasswordTask(plugin, player, playerPass, playerPassVerify));
plugin.getServer().getScheduler().runTaskAsynchronously(plugin,
new ChangePasswordTask(plugin, player, playerPass, playerPassVerify));
return true;
}
}
src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class ConverterCommand extends ExecutableCommand {
final AuthMe plugin = AuthMe.getInstance();
// Messages instance
final Messages m = Messages.getInstance();
final Messages m = plugin.getMessages();
// Get the conversion job
String job = commandArguments.get(0);
src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class RecoverEmailCommand extends ExecutableCommand {
// Command logic
final AuthMe plugin = AuthMe.getInstance();
final Messages m = Messages.getInstance();
final Messages m = plugin.getMessages();
if (plugin.mail == null) {
m.send(player, "error");
src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java
+7 -5
View File
@@ -16,7 +16,6 @@ public class RegisterCommand extends ExecutableCommand {
@Override
public boolean executeCommand(CommandSender sender, CommandParts commandReference, CommandParts commandArguments) {
final Messages m = Messages.getInstance();
// Make sure the sender is a player
if (!(sender instanceof Player)) {
@@ -24,6 +23,9 @@ public class RegisterCommand extends ExecutableCommand {
return true;
}
final AuthMe plugin = AuthMe.getInstance();
final Messages m = plugin.getMessages();
// Make sure the command arguments are valid
final Player player = (Player) sender;
if (commandArguments.getCount() == 0 || (Settings.getEnablePasswordVerifier && commandArguments.getCount() < 2)) {
@@ -31,7 +33,7 @@ public class RegisterCommand extends ExecutableCommand {
return true;
}
final Management management = AuthMe.getInstance().getManagement();
final Management management = plugin.getManagement();
if (Settings.emailRegistration && !Settings.getmailAccount.isEmpty()) {
if (Settings.doubleEmailCheck) {
if (commandArguments.getCount() < 2 || !commandArguments.get(0).equals(commandArguments.get(1))) {
@@ -44,16 +46,16 @@ public class RegisterCommand extends ExecutableCommand {
m.send(player, "email_invalid");
return true;
}
RandomString rand = new RandomString(Settings.getRecoveryPassLength);
final String thePass = rand.nextString();
final String thePass = new RandomString(Settings.getRecoveryPassLength).nextString();
management.performRegister(player, thePass, email);
return true;
}
if (commandArguments.getCount() > 1 && Settings.getEnablePasswordVerifier)
if (commandArguments.getCount() > 1 && Settings.getEnablePasswordVerifier) {
if (!commandArguments.get(0).equals(commandArguments.get(1))) {
m.send(player, "password_error");
return true;
}
}
management.performRegister(player, commandArguments.get(0), "");
return true;
}
src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class UnregisterCommand extends ExecutableCommand {
final AuthMe plugin = AuthMe.getInstance();
// Messages instance
final Messages m = Messages.getInstance();
final Messages m = plugin.getMessages();
// Make sure the current command executor is a player
if (!(sender instanceof Player)) {