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/process/login/AsyncronousLogin.java
+12 -12
View File
@@ -60,7 +60,7 @@ public class AsyncronousLogin {
}
if (plugin.captcha.containsKey(name) && plugin.captcha.get(name) >= Settings.maxLoginTry) {
plugin.cap.put(name, rdm.nextString());
for (String s : m._("usage_captcha")) {
for (String s : m.send("usage_captcha")) {
player.sendMessage(s.replace("THE_CAPTCHA", plugin.cap.get(name)).replace("<theCaptcha>", plugin.cap.get(name)));
}
return true;
@@ -81,18 +81,18 @@ public class AsyncronousLogin {
*/
protected PlayerAuth preAuth() {
if (PlayerCache.getInstance().isAuthenticated(name)) {
m._(player, "logged_in");
m.send(player, "logged_in");
return null;
}
if (!database.isAuthAvailable(name)) {
m._(player, "user_unknown");
m.send(player, "user_unknown");
if (LimboCache.getInstance().hasLimboPlayer(name)) {
LimboCache.getInstance().getLimboPlayer(name).getMessageTaskId().cancel();
String[] msg;
if (Settings.emailRegistration) {
msg = m._("reg_email_msg");
msg = m.send("reg_email_msg");
} else {
msg = m._("reg_msg");
msg = m.send("reg_msg");
}
BukkitTask msgT = Bukkit.getScheduler().runTask(plugin, new MessageTask(plugin, name, msg, Settings.getWarnMessageInterval));
LimboCache.getInstance().getLimboPlayer(name).setMessageTaskId(msgT);
@@ -101,17 +101,17 @@ public class AsyncronousLogin {
}
if (Settings.getMaxLoginPerIp > 0 && !plugin.authmePermissible(player, "authme.allow2accounts") && !getIP().equalsIgnoreCase("127.0.0.1") && !getIP().equalsIgnoreCase("localhost")) {
if (plugin.isLoggedIp(name, getIP())) {
m._(player, "logged_in");
m.send(player, "logged_in");
return null;
}
}
PlayerAuth pAuth = database.getAuth(name);
if (pAuth == null) {
m._(player, "user_unknown");
m.send(player, "user_unknown");
return null;
}
if (!Settings.getMySQLColumnGroup.isEmpty() && pAuth.getGroupId() == Settings.getNonActivatedGroup) {
m._(player, "vb_nonActiv");
m.send(player, "vb_nonActiv");
return null;
}
return pAuth;
@@ -130,7 +130,7 @@ public class AsyncronousLogin {
passwordVerified = PasswordSecurity.comparePasswordWithHash(password, hash, realName);
} catch (Exception ex) {
ConsoleLogger.showError(ex.getMessage());
m._(player, "error");
m.send(player, "error");
return;
}
if (passwordVerified && player.isOnline()) {
@@ -147,7 +147,7 @@ public class AsyncronousLogin {
}
player.setNoDamageTicks(0);
m._(player, "login");
m.send(player, "login");
displayOtherAccounts(auth, player);
@@ -184,11 +184,11 @@ public class AsyncronousLogin {
if (AuthMePlayerListener.gameMode != null && AuthMePlayerListener.gameMode.containsKey(name)) {
player.setGameMode(AuthMePlayerListener.gameMode.get(name));
}
player.kickPlayer(m._("wrong_pwd")[0]);
player.kickPlayer(m.send("wrong_pwd")[0]);
}
});
} else {
m._(player, "wrong_pwd");
m.send(player, "wrong_pwd");
return;
}
} else {
src/main/java/fr/xephi/authme/process/register/AsyncronousRegister.java
+12 -12
View File
@@ -42,23 +42,23 @@ public class AsyncronousRegister {
protected void preRegister() {
if (PlayerCache.getInstance().isAuthenticated(name)) {
m._(player, "logged_in");
m.send(player, "logged_in");
allowRegister = false;
}
if (!Settings.isRegistrationEnabled) {
m._(player, "reg_disabled");
m.send(player, "reg_disabled");
allowRegister = false;
}
String lowpass = password.toLowerCase();
if ((lowpass.contains("delete") || lowpass.contains("where") || lowpass.contains("insert") || lowpass.contains("modify") || lowpass.contains("from") || lowpass.contains("select") || lowpass.contains(";") || lowpass.contains("null")) || !lowpass.matches(Settings.getPassRegex)) {
m._(player, "password_error");
m.send(player, "password_error");
allowRegister = false;
}
if (database.isAuthAvailable(name)) {
m._(player, "user_regged");
m.send(player, "user_regged");
if (plugin.pllog.getStringList("players").contains(name)) {
plugin.pllog.getStringList("players").remove(name);
}
@@ -67,7 +67,7 @@ public class AsyncronousRegister {
if (Settings.getmaxRegPerIp > 0) {
if (!plugin.authmePermissible(player, "authme.allow2accounts") && database.getAllAuthsByIp(getIp()).size() >= Settings.getmaxRegPerIp && !getIp().equalsIgnoreCase("127.0.0.1") && !getIp().equalsIgnoreCase("localhost")) {
m._(player, "max_reg");
m.send(player, "max_reg");
allowRegister = false;
}
}
@@ -81,7 +81,7 @@ public class AsyncronousRegister {
if (!email.isEmpty() && email != "") {
if (Settings.getmaxRegPerEmail > 0) {
if (!plugin.authmePermissible(player, "authme.allow2accounts") && database.getAllAuthsByEmail(email).size() >= Settings.getmaxRegPerEmail) {
m._(player, "max_reg");
m.send(player, "max_reg");
return;
}
}
@@ -94,7 +94,7 @@ public class AsyncronousRegister {
protected void emailRegister() {
if (Settings.getmaxRegPerEmail > 0) {
if (!plugin.authmePermissible(player, "authme.allow2accounts") && database.getAllAuthsByEmail(email).size() >= Settings.getmaxRegPerEmail) {
m._(player, "max_reg");
m.send(player, "max_reg");
return;
}
}
@@ -104,7 +104,7 @@ public class AsyncronousRegister {
auth = new PlayerAuth(name, hashnew, getIp(), 0, (int) player.getLocation().getX(), (int) player.getLocation().getY(), (int) player.getLocation().getZ(), player.getLocation().getWorld().getName(), email);
} catch (NoSuchAlgorithmException e) {
ConsoleLogger.showError(e.getMessage());
m._(player, "error");
m.send(player, "error");
return;
}
if (PasswordSecurity.userSalt.containsKey(name)) {
@@ -121,12 +121,12 @@ public class AsyncronousRegister {
protected void passwordRegister() {
if (password.length() < Settings.getPasswordMinLen || password.length() > Settings.passwordMaxLength) {
m._(player, "pass_len");
m.send(player, "pass_len");
return;
}
if (!Settings.unsafePasswords.isEmpty()) {
if (Settings.unsafePasswords.contains(password.toLowerCase())) {
m._(player, "password_error");
m.send(player, "password_error");
return;
}
}
@@ -136,7 +136,7 @@ public class AsyncronousRegister {
hash = PasswordSecurity.getHash(Settings.getPasswordHash, password, name);
} catch (NoSuchAlgorithmException e) {
ConsoleLogger.showError(e.getMessage());
m._(player, "error");
m.send(player, "error");
return;
}
if (Settings.getMySQLColumnSalt.isEmpty() && !PasswordSecurity.userSalt.containsKey(name)) {
@@ -145,7 +145,7 @@ public class AsyncronousRegister {
auth = new PlayerAuth(name, hash, PasswordSecurity.userSalt.get(name), getIp(), new Date().getTime());
}
if (!database.saveAuth(auth)) {
m._(player, "error");
m.send(player, "error");
return;
}
if (!Settings.forceRegLogin) {
src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java
+2 -2
View File
@@ -33,7 +33,7 @@ public class ProcessSyncronousEmailRegister implements Runnable {
if (!Settings.getRegisteredGroup.isEmpty()) {
Utils.getInstance().setGroup(player, Utils.groupType.REGISTERED);
}
m._(player, "vb_nonActiv");
m.send(player, "vb_nonActiv");
int time = Settings.getRegistrationTimeout * 20;
int msgInterval = Settings.getWarnMessageInterval;
if (time != 0) {
@@ -43,7 +43,7 @@ public class ProcessSyncronousEmailRegister implements Runnable {
}
LimboCache.getInstance().getLimboPlayer(name).getMessageTaskId().cancel();
BukkitTask nwMsg = Bukkit.getScheduler().runTask(plugin, new MessageTask(plugin, name, m._("login_msg"), msgInterval));
BukkitTask nwMsg = Bukkit.getScheduler().runTask(plugin, new MessageTask(plugin, name, m.send("login_msg"), msgInterval));
LimboCache.getInstance().getLimboPlayer(name).setMessageTaskId(nwMsg);
player.saveData();
if (!Settings.noConsoleSpam)
src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java
+4 -4
View File
@@ -70,7 +70,7 @@ public class ProcessSyncronousPasswordRegister implements Runnable {
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 {
plugin.pllog.removePlayer(name);
@@ -104,9 +104,9 @@ public class ProcessSyncronousPasswordRegister implements Runnable {
if (!Settings.getRegisteredGroup.isEmpty()) {
Utils.getInstance().setGroup(player, Utils.groupType.REGISTERED);
}
m._(player, "registered");
m.send(player, "registered");
if (!Settings.getmailAccount.isEmpty())
m._(player, "add_email");
m.send(player, "add_email");
if (player.getGameMode() != GameMode.CREATIVE && !Settings.isMovementAllowed) {
player.setAllowFlight(false);
player.setFlying(false);
@@ -125,7 +125,7 @@ public class ProcessSyncronousPasswordRegister implements Runnable {
// Kick Player after Registration is enabled, kick the player
if (Settings.forceRegKick) {
player.kickPlayer(m._("registered")[0]);
player.kickPlayer(m.send("registered")[0]);
return;
}