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

Replace m._ by a method call m.send, Java 8 in comming ...

Browse Source
This commit is contained in:
Xephi
2015-05-26 13:03:45 +02:00
parent 5585db221f
commit 9ba90bfb97
20 changed files with 170 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/commands/AdminCommand.java
+20 -20
View File
@@ -77,7 +77,7 @@ public class AdminCommand implements CommandExecutor {
}
if (!plugin.authmePermissible(sender, "authme.admin." + args[0].toLowerCase())) {
m._(sender, "no_perm");
m.send(sender, "no_perm");
return true;
}
@@ -155,7 +155,7 @@ public class AdminCommand implements CommandExecutor {
Settings.reloadConfigOptions(newConfig);
m.reLoad();
s.reLoad();
m._(sender, "reload");
m.send(sender, "reload");
} else if (args[0].equalsIgnoreCase("lastlogin")) {
if (args.length != 2) {
sender.sendMessage("Usage: /authme lastlogin <playername>");
@@ -173,11 +173,11 @@ public class AdminCommand implements CommandExecutor {
sender.sendMessage("[AuthMe] The player : " + player.getNickname() + " is unlogged since " + msg);
sender.sendMessage("[AuthMe] LastPlayer IP : " + lastIP);
} else {
m._(sender, "unknown_user");
m.send(sender, "unknown_user");
return true;
}
} catch (NullPointerException e) {
m._(sender, "unknown_user");
m.send(sender, "unknown_user");
return true;
}
} else if (args[0].equalsIgnoreCase("accounts")) {
@@ -276,7 +276,7 @@ public class AdminCommand implements CommandExecutor {
try {
String name = args[1].toLowerCase();
if (database.isAuthAvailable(name)) {
m._(sender, "user_regged");
m.send(sender, "user_regged");
return true;
}
String hash = PasswordSecurity.getHash(Settings.getPasswordHash, args[2], name);
@@ -285,14 +285,14 @@ public class AdminCommand implements CommandExecutor {
auth.setSalt(PasswordSecurity.userSalt.get(name));
else auth.setSalt("");
if (!database.saveAuth(auth)) {
m._(sender, "error");
m.send(sender, "error");
return true;
}
m._(sender, "registered");
m.send(sender, "registered");
ConsoleLogger.info(args[1] + " registered");
} catch (NoSuchAlgorithmException ex) {
ConsoleLogger.showError(ex.getMessage());
m._(sender, "error");
m.send(sender, "error");
}
return true;
} else if (args[0].equalsIgnoreCase("getemail")) {
@@ -303,7 +303,7 @@ public class AdminCommand implements CommandExecutor {
String playername = args[1].toLowerCase();
PlayerAuth getAuth = database.getAuth(playername);
if (getAuth == null) {
m._(sender, "unknown_user");
m.send(sender, "unknown_user");
return true;
}
sender.sendMessage("[AuthMe] " + args[1] + " email : " + getAuth.getEmail());
@@ -316,12 +316,12 @@ public class AdminCommand implements CommandExecutor {
String playername = args[1].toLowerCase();
PlayerAuth getAuth = database.getAuth(playername);
if (getAuth == null) {
m._(sender, "unknown_user");
m.send(sender, "unknown_user");
return true;
}
getAuth.setEmail(args[2]);
if (!database.updateEmail(getAuth)) {
m._(sender, "error");
m.send(sender, "error");
return true;
}
if (PlayerCache.getInstance().getAuth(playername) != null)
@@ -409,7 +409,7 @@ public class AdminCommand implements CommandExecutor {
auth = database.getAuth(name);
}
if (auth == null) {
m._(sender, "unknown_user");
m.send(sender, "unknown_user");
return true;
}
auth.setHash(hash);
@@ -418,14 +418,14 @@ public class AdminCommand implements CommandExecutor {
database.updateSalt(auth);
}
if (!database.updatePassword(auth)) {
m._(sender, "error");
m.send(sender, "error");
return true;
}
sender.sendMessage("pwd_changed");
ConsoleLogger.info(args[1] + "'s password changed");
} catch (NoSuchAlgorithmException ex) {
ConsoleLogger.showError(ex.getMessage());
m._(sender, "error");
m.send(sender, "error");
}
return true;
} else if (args[0].equalsIgnoreCase("unregister") || args[0].equalsIgnoreCase("unreg") || args[0].equalsIgnoreCase("del")) {
@@ -435,11 +435,11 @@ public class AdminCommand implements CommandExecutor {
}
String name = args[1].toLowerCase();
if (!database.isAuthAvailable(name)) {
m._(sender, "user_unknown");
m.send(sender, "user_unknown");
return true;
}
if (!database.removeAuth(name)) {
m._(sender, "error");
m.send(sender, "error");
return true;
}
Player target = Bukkit.getPlayer(name);
@@ -463,17 +463,17 @@ public class AdminCommand implements CommandExecutor {
BukkitTask id = sched.runTaskLater(plugin, new TimeoutTask(plugin, name), delay);
LimboCache.getInstance().getLimboPlayer(name).setTimeoutTaskId(id);
}
LimboCache.getInstance().getLimboPlayer(name).setMessageTaskId(sched.runTask(plugin, new MessageTask(plugin, name, m._("reg_msg"), interval)));
LimboCache.getInstance().getLimboPlayer(name).setMessageTaskId(sched.runTask(plugin, new MessageTask(plugin, name, m.send("reg_msg"), interval)));
if (Settings.applyBlindEffect)
target.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, Settings.getRegistrationTimeout * 20, 2));
m._(target, "unregistered");
m.send(target, "unregistered");
} else {
// Player isn't online, do nothing else
}
} else {
// Player does not exist, do nothing else
}
m._(sender, "unregistered");
m.send(sender, "unregistered");
ConsoleLogger.info(args[1] + " unregistered");
return true;
} else if (args[0].equalsIgnoreCase("purgelastpos")) {
@@ -540,7 +540,7 @@ public class AdminCommand implements CommandExecutor {
}
PlayerAuth auth = database.getAuth(args[1]);
if (auth == null) {
m._(sender, "unknown_user");
m.send(sender, "unknown_user");
return true;
}
auth.setQuitLocX(0D);
src/main/java/fr/xephi/authme/commands/CaptchaCommand.java
+8 -8
View File
@@ -33,34 +33,34 @@ public class CaptchaCommand implements CommandExecutor {
String name = player.getName().toLowerCase();
if (args.length == 0) {
m._(player, "usage_captcha");
m.send(player, "usage_captcha");
return true;
}
if (PlayerCache.getInstance().isAuthenticated(name)) {
m._(player, "logged_in");
m.send(player, "logged_in");
return true;
}
if (!plugin.authmePermissible(player, "authme." + label.toLowerCase())) {
m._(player, "no_perm");
m.send(player, "no_perm");
return true;
}
if (!Settings.useCaptcha) {
m._(player, "usage_log");
m.send(player, "usage_log");
return true;
}
if (!plugin.cap.containsKey(name)) {
m._(player, "usage_log");
m.send(player, "usage_log");
return true;
}
if (Settings.useCaptcha && !args[0].equals(plugin.cap.get(name))) {
plugin.cap.remove(name);
plugin.cap.put(name, rdm.nextString());
for (String s : m._("wrong_captcha")) {
for (String s : m.send("wrong_captcha")) {
player.sendMessage(s.replace("THE_CAPTCHA", plugin.cap.get(name)));
}
return true;
@@ -70,8 +70,8 @@ public class CaptchaCommand implements CommandExecutor {
plugin.cap.remove(name);
} catch (NullPointerException npe) {
}
m._(player, "valid_captcha");
m._(player, "login_msg");
m.send(player, "valid_captcha");
m.send(player, "login_msg");
return true;
}
src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java
+7 -7
View File
@@ -37,19 +37,19 @@ public class ChangePasswordCommand implements CommandExecutor {
}
if (!plugin.authmePermissible(sender, "authme." + label.toLowerCase())) {
m._(sender, "no_perm");
m.send(sender, "no_perm");
return true;
}
Player player = (Player) sender;
String name = player.getName().toLowerCase();
if (!PlayerCache.getInstance().isAuthenticated(name)) {
m._(player, "not_logged_in");
m.send(player, "not_logged_in");
return true;
}
if (args.length != 2) {
m._(player, "usage_changepassword");
m.send(player, "usage_changepassword");
return true;
}
@@ -63,22 +63,22 @@ public class ChangePasswordCommand implements CommandExecutor {
auth.setSalt(PasswordSecurity.userSalt.get(name));
else auth.setSalt("");
if (!database.updatePassword(auth)) {
m._(player, "error");
m.send(player, "error");
return true;
}
database.updateSalt(auth);
PlayerCache.getInstance().updatePlayer(auth);
m._(player, "pwd_changed");
m.send(player, "pwd_changed");
ConsoleLogger.info(player.getName() + " changed his password");
if (plugin.notifications != null) {
plugin.notifications.showNotification(new Notification("[AuthMe] " + player.getName() + " change his password!"));
}
} else {
m._(player, "wrong_pwd");
m.send(player, "wrong_pwd");
}
} catch (NoSuchAlgorithmException ex) {
ConsoleLogger.showError(ex.getMessage());
m._(sender, "error");
m.send(sender, "error");
}
return true;
}
src/main/java/fr/xephi/authme/commands/ConverterCommand.java
+3 -3
View File
@@ -38,7 +38,7 @@ public class ConverterCommand implements CommandExecutor {
}
if (!plugin.authmePermissible(sender, "authme.admin.converter")) {
m._(sender, "no_perm");
m.send(sender, "no_perm");
return true;
}
@@ -49,7 +49,7 @@ public class ConverterCommand implements CommandExecutor {
ConvertType type = ConvertType.fromName(args[0]);
if (type == null) {
m._(sender, "error");
m.send(sender, "error");
return true;
}
Converter converter = null;
@@ -82,7 +82,7 @@ public class ConverterCommand implements CommandExecutor {
break;
}
if (converter == null) {
m._(sender, "error");
m.send(sender, "error");
return true;
}
Bukkit.getScheduler().runTaskAsynchronously(plugin, converter);
src/main/java/fr/xephi/authme/commands/EmailCommand.java
+34 -34
View File
@@ -41,7 +41,7 @@ public class EmailCommand implements CommandExecutor {
}
if (!plugin.authmePermissible(sender, "authme." + label.toLowerCase())) {
m._(sender, "no_perm");
m.send(sender, "no_perm");
return true;
}
@@ -49,105 +49,105 @@ public class EmailCommand implements CommandExecutor {
String name = player.getName();
if (args.length == 0) {
m._(player, "usage_email_add");
m._(player, "usage_email_change");
m._(player, "usage_email_recovery");
m.send(player, "usage_email_add");
m.send(player, "usage_email_change");
m.send(player, "usage_email_recovery");
return true;
}
if (args[0].equalsIgnoreCase("add")) {
if (args.length != 3) {
m._(player, "usage_email_add");
m.send(player, "usage_email_add");
return true;
}
if (Settings.getmaxRegPerEmail > 0) {
if (!plugin.authmePermissible(sender, "authme.allow2accounts") && data.getAllAuthsByEmail(args[1]).size() >= Settings.getmaxRegPerEmail) {
m._(player, "max_reg");
m.send(player, "max_reg");
return true;
}
}
if (args[1].equals(args[2]) && PlayerCache.getInstance().isAuthenticated(name)) {
PlayerAuth auth = PlayerCache.getInstance().getAuth(name);
if (auth.getEmail() == null || (!auth.getEmail().equals("your@email.com") && !auth.getEmail().isEmpty())) {
m._(player, "usage_email_change");
m.send(player, "usage_email_change");
return true;
}
if (!Settings.isEmailCorrect(args[1])) {
m._(player, "email_invalid");
m.send(player, "email_invalid");
return true;
}
auth.setEmail(args[1]);
if (!data.updateEmail(auth)) {
m._(player, "error");
m.send(player, "error");
return true;
}
PlayerCache.getInstance().updatePlayer(auth);
m._(player, "email_added");
m.send(player, "email_added");
player.sendMessage(auth.getEmail());
} else if (PlayerCache.getInstance().isAuthenticated(name)) {
m._(player, "email_confirm");
m.send(player, "email_confirm");
} else {
if (!data.isAuthAvailable(name)) {
m._(player, "login_msg");
m.send(player, "login_msg");
} else {
m._(player, "reg_email_msg");
m.send(player, "reg_email_msg");
}
}
} else if (args[0].equalsIgnoreCase("change")) {
if (args.length != 3) {
m._(player, "usage_email_change");
m.send(player, "usage_email_change");
return true;
}
if (Settings.getmaxRegPerEmail > 0) {
if (!plugin.authmePermissible(sender, "authme.allow2accounts") && data.getAllAuthsByEmail(args[2]).size() >= Settings.getmaxRegPerEmail) {
m._(player, "max_reg");
m.send(player, "max_reg");
return true;
}
}
if (PlayerCache.getInstance().isAuthenticated(name)) {
PlayerAuth auth = PlayerCache.getInstance().getAuth(name);
if (auth.getEmail() == null || auth.getEmail().equals("your@email.com") || auth.getEmail().isEmpty()) {
m._(player, "usage_email_add");
m.send(player, "usage_email_add");
return true;
}
if (!args[1].equals(auth.getEmail())) {
m._(player, "old_email_invalid");
m.send(player, "old_email_invalid");
return true;
}
if (!Settings.isEmailCorrect(args[2])) {
m._(player, "new_email_invalid");
m.send(player, "new_email_invalid");
return true;
}
auth.setEmail(args[2]);
if (!data.updateEmail(auth)) {
m._(player, "error");
m.send(player, "error");
return true;
}
PlayerCache.getInstance().updatePlayer(auth);
m._(player, "email_changed");
player.sendMessage(m._("email_defined") + auth.getEmail());
m.send(player, "email_changed");
player.sendMessage(m.send("email_defined") + auth.getEmail());
} else if (PlayerCache.getInstance().isAuthenticated(name)) {
m._(player, "email_confirm");
m.send(player, "email_confirm");
} else {
if (!data.isAuthAvailable(name)) {
m._(player, "login_msg");
m.send(player, "login_msg");
} else {
m._(player, "reg_email_msg");
m.send(player, "reg_email_msg");
}
}
}
if (args[0].equalsIgnoreCase("recovery")) {
if (args.length != 2) {
m._(player, "usage_email_recovery");
m.send(player, "usage_email_recovery");
return true;
}
if (plugin.mail == null) {
m._(player, "error");
m.send(player, "error");
return true;
}
if (data.isAuthAvailable(name)) {
if (PlayerCache.getInstance().isAuthenticated(name)) {
m._(player, "logged_in");
m.send(player, "logged_in");
return true;
}
try {
@@ -160,16 +160,16 @@ public class EmailCommand implements CommandExecutor {
} else if (data.isAuthAvailable(name)) {
auth = data.getAuth(name);
} else {
m._(player, "unknown_user");
m.send(player, "unknown_user");
return true;
}
if (Settings.getmailAccount.equals("") || Settings.getmailAccount.isEmpty()) {
m._(player, "error");
m.send(player, "error");
return true;
}
if (!args[1].equalsIgnoreCase(auth.getEmail()) || args[1].equalsIgnoreCase("your@email.com") || auth.getEmail().equalsIgnoreCase("your@email.com")) {
m._(player, "email_invalid");
m.send(player, "email_invalid");
return true;
}
final String finalhashnew = hashnew;
@@ -188,16 +188,16 @@ public class EmailCommand implements CommandExecutor {
});
}
plugin.mail.main(auth, thePass);
m._(player, "email_send");
m.send(player, "email_send");
} catch (NoSuchAlgorithmException ex) {
ConsoleLogger.showError(ex.getMessage());
m._(sender, "error");
m.send(sender, "error");
} catch (NoClassDefFoundError ncdfe) {
ConsoleLogger.showError(ncdfe.getMessage());
m._(sender, "error");
m.send(sender, "error");
}
} else {
m._(player, "reg_email_msg");
m.send(player, "reg_email_msg");
}
}
return true;
src/main/java/fr/xephi/authme/commands/LoginCommand.java
+2 -2
View File
@@ -27,12 +27,12 @@ public class LoginCommand implements CommandExecutor {
final Player player = (Player) sender;
if (args.length == 0) {
m._(player, "usage_log");
m.send(player, "usage_log");
return true;
}
if (!plugin.authmePermissible(player, "authme." + label.toLowerCase())) {
m._(player, "no_perm");
m.send(player, "no_perm");
return true;
}
plugin.management.performLogin(player, args[0], false);
src/main/java/fr/xephi/authme/commands/LogoutCommand.java
+4 -4
View File
@@ -52,7 +52,7 @@ public class LogoutCommand implements CommandExecutor {
}
if (!plugin.authmePermissible(sender, "authme." + label.toLowerCase())) {
m._(sender, "no_perm");
m.send(sender, "no_perm");
return true;
}
@@ -60,7 +60,7 @@ public class LogoutCommand implements CommandExecutor {
String name = player.getName().toLowerCase();
if (!PlayerCache.getInstance().isAuthenticated(name)) {
m._(player, "not_logged_in");
m.send(player, "not_logged_in");
return true;
}
@@ -106,7 +106,7 @@ public class LogoutCommand implements CommandExecutor {
BukkitTask id = sched.runTaskLater(plugin, new TimeoutTask(plugin, name), delay);
LimboCache.getInstance().getLimboPlayer(name).setTimeoutTaskId(id);
}
BukkitTask msgT = sched.runTask(plugin, new MessageTask(plugin, name, m._("login_msg"), interval));
BukkitTask msgT = sched.runTask(plugin, new MessageTask(plugin, name, m.send("login_msg"), interval));
LimboCache.getInstance().getLimboPlayer(name).setMessageTaskId(msgT);
try {
if (player.isInsideVehicle())
@@ -125,7 +125,7 @@ public class LogoutCommand implements CommandExecutor {
Bukkit.getServer().getPluginManager().callEvent(new LogoutEvent(player));
}
});
m._(player, "logout");
m.send(player, "logout");
ConsoleLogger.info(player.getDisplayName() + " logged out");
if (plugin.notifications != null) {
plugin.notifications.showNotification(new Notification("[AuthMe] " + player.getName() + " logged out!"));
src/main/java/fr/xephi/authme/commands/PasspartuCommand.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class PasspartuCommand implements CommandExecutor {
String[] args) {
if (!plugin.authmePermissible(sender, "authme." + label.toLowerCase())) {
m._(sender, "no_perm");
m.send(sender, "no_perm");
return true;
}
src/main/java/fr/xephi/authme/commands/RegisterCommand.java
+7 -7
View File
@@ -29,27 +29,27 @@ public class RegisterCommand implements CommandExecutor {
return true;
}
if (args.length == 0) {
m._(sender, "usage_reg");
m.send(sender, "usage_reg");
}
if (!plugin.authmePermissible(sender, "authme." + label.toLowerCase())) {
m._(sender, "no_perm");
m.send(sender, "no_perm");
return true;
}
final Player player = (Player) sender;
if (Settings.emailRegistration && !Settings.getmailAccount.isEmpty()) {
if (Settings.doubleEmailCheck) {
if (args.length < 2) {
m._(player, "usage_reg");
m.send(player, "usage_reg");
return true;
}
if (!args[0].equals(args[1])) {
m._(player, "usage_reg");
m.send(player, "usage_reg");
return true;
}
}
final String email = args[0];
if (!Settings.isEmailCorrect(email)) {
m._(player, "email_invalid");
m.send(player, "email_invalid");
return true;
}
RandomString rand = new RandomString(Settings.getRecoveryPassLength);
@@ -58,12 +58,12 @@ public class RegisterCommand implements CommandExecutor {
return true;
}
if (args.length == 0 || (Settings.getEnablePasswordVerifier && args.length < 2)) {
m._(player, "usage_reg");
m.send(player, "usage_reg");
return true;
}
if (args.length > 1 && Settings.getEnablePasswordVerifier)
if (!args[0].equals(args[1])) {
m._(player, "password_error");
m.send(player, "password_error");
return true;
}
plugin.management.performRegister(player, args[0], "");
src/main/java/fr/xephi/authme/commands/UnregisterCommand.java
+7 -7
View File
@@ -51,7 +51,7 @@ public class UnregisterCommand implements CommandExecutor {
}
if (!plugin.authmePermissible(sender, "authme." + label.toLowerCase())) {
m._(sender, "no_perm");
m.send(sender, "no_perm");
return true;
}
@@ -59,12 +59,12 @@ public class UnregisterCommand implements CommandExecutor {
String name = player.getName().toLowerCase();
if (!PlayerCache.getInstance().isAuthenticated(name)) {
m._(player, "not_logged_in");
m.send(player, "not_logged_in");
return true;
}
if (args.length != 1) {
m._(player, "usage_unreg");
m.send(player, "usage_unreg");
return true;
}
try {
@@ -96,8 +96,8 @@ public class UnregisterCommand implements CommandExecutor {
BukkitTask id = sched.runTaskLater(plugin, new TimeoutTask(plugin, name), delay);
LimboCache.getInstance().getLimboPlayer(name).setTimeoutTaskId(id);
}
LimboCache.getInstance().getLimboPlayer(name).setMessageTaskId(sched.runTask(plugin, new MessageTask(plugin, name, m._("reg_msg"), interval)));
m._(player, "unregistered");
LimboCache.getInstance().getLimboPlayer(name).setMessageTaskId(sched.runTask(plugin, new MessageTask(plugin, name, m.send("reg_msg"), interval)));
m.send(player, "unregistered");
ConsoleLogger.info(player.getDisplayName() + " unregistered himself");
if (plugin.notifications != null) {
plugin.notifications.showNotification(new Notification("[AuthMe] " + player.getName() + " unregistered himself!"));
@@ -115,7 +115,7 @@ public class UnregisterCommand implements CommandExecutor {
}
if (Settings.applyBlindEffect)
player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, Settings.getRegistrationTimeout * 20, 2));
m._(player, "unregistered");
m.send(player, "unregistered");
ConsoleLogger.info(player.getDisplayName() + " unregistered himself");
if (plugin.notifications != null) {
plugin.notifications.showNotification(new Notification("[AuthMe] " + player.getName() + " unregistered himself!"));
@@ -133,7 +133,7 @@ public class UnregisterCommand implements CommandExecutor {
}
return true;
} else {
m._(player, "wrong_pwd");
m.send(player, "wrong_pwd");
}
} catch (NoSuchAlgorithmException ex) {
ConsoleLogger.showError(ex.getMessage());