Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-23 18:55:11 +01:00
Code Issues Projects Releases Wiki Activity

start fixing language

Browse Source
This commit is contained in:
Gabriele C 2015-11-25 15:11:01 +01:00
parent 32e088c73f
commit f8ec474534
11 changed files with 130 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
.idea/dictionaries/Gabriele.xml Normal file
View File

@ -0,0 +1,77 @@
<component name="ProjectDictionaryState">
<dictionary name="Gabriele">
<words>
<w>abcdef</w>
<w>againt</w>
<w>allowd</w>
<w>antibot</w>
<w>auths</w>
<w>bcrypt</w>
<w>bcrypt's</w>
<w>bukkit</w>
<w>checkpw</w>
<w>ciphertext</w>
<w>classe</w>
<w>clen</w>
<w>crazycrypt</w>
<w>cycically</w>
<w>damager</w>
<w>datasource</w>
<w>doffp</w>
<w>dontneed</w>
<w>doublemd</w>
<w>ekskey</w>
<w>feistel</w>
<w>gensalt</w>
<w>geoip</w>
<w>getclasse</w>
<w>hashpw</w>
<w>hashsum</w>
<w>hotbar</w>
<w>joomla</w>
<w>koffp</w>
<w>koolaid</w>
<w>lastposworld</w>
<w>lastposx</w>
<w>lastposy</w>
<w>lastposz</w>
<w>lgpl</w>
<w>logininmillieseconds</w>
<w>maxmind</w>
<w>maxolen</w>
<w>mazieres</w>
<w>minecraft</w>
<w>motd</w>
<w>multiverse</w>
<w>mybb</w>
<w>offp</w>
<w>orphean</w>
<w>parameterised</w>
<w>passwordb</w>
<w>pbkdf</w>
<w>phpbb</w>
<w>phpfusion</w>
<w>playername</w>
<w>plen</w>
<w>preprocess</w>
<w>provos</w>
<w>royalauth</w>
<w>rtner</w>
<w>saltb</w>
<w>saltedsha</w>
<w>schneier's</w>
<w>scry</w>
<w>slen</w>
<w>sqlite</w>
<w>streamtoword</w>
<w>teleport</w>
<w>tortious</w>
<w>unavailableworld</w>
<w>unlogged</w>
<w>wordpress</w>
<w>xauth</w>
<w>xenforo</w>
<w>xephi</w>
</words>
</dictionary>
</component>

10
src/main/java/fr/xephi/authme/AntiBot.java
View File

@ -15,7 +15,7 @@ public class AntiBot {
private static final AuthMe plugin = AuthMe.getInstance();
private static final Messages messages = plugin.getMessages();
private static final List<String> antibotPlayers = new ArrayList<>();
private static final List<String> antiBotPlayers = new ArrayList<>();
private static AntiBotStatus antiBotStatus = AntiBotStatus.DISABLED;
public static void setupAntiBotService() {
@ -56,7 +56,7 @@ public class AntiBot {
public void run() {
if (antiBotStatus == AntiBotStatus.ACTIVE) {
antiBotStatus = AntiBotStatus.LISTENING;
antibotPlayers.clear();
antiBotPlayers.clear();
for (String s : messages.send("antibot_auto_disabled"))
Bukkit.broadcastMessage(s.replace("%m", "" + Settings.antiBotDuration));
}
@ -77,15 +77,15 @@ public class AntiBot {
return;
}
antibotPlayers.add(player.getName().toLowerCase());
if (antibotPlayers.size() > Settings.antiBotSensibility) {
antiBotPlayers.add(player.getName().toLowerCase());
if (antiBotPlayers.size() > Settings.antiBotSensibility) {
activateAntiBot();
return;
}
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
@Override
public void run() {
antibotPlayers.remove(player.getName().toLowerCase());
antiBotPlayers.remove(player.getName().toLowerCase());
}
}, 300);
}

3
src/main/java/fr/xephi/authme/AuthMe.java
View File

@ -297,7 +297,6 @@ public class AuthMe extends JavaPlugin {
// Sponsor messages
ConsoleLogger.info("AuthMe hooks perfectly with the VeryGames server hosting!");
ConsoleLogger.info("Development builds are available on our jenkins, thanks to f14stelt.");
ConsoleLogger.info("Do you want a good game server? Look at our sponsor GameHosting.it leader in Italy as Game Server Provider!");
// Successful message
@ -548,7 +547,7 @@ public class AuthMe extends JavaPlugin {
public void setupDatabase() throws Exception {
if (database != null)
database.close();
// Backend MYSQL - FILE - SQLITE - SQLITEHIKARI
// Backend MYSQL - FILE - SQLITE
boolean isSQLite = false;
switch (Settings.getDataSource) {
case FILE:

4
src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
View File

@ -234,7 +234,7 @@ public class AuthMePlayerListener implements Listener {
event.setJoinMessage(null);
}
// Shedule login task so works after the prelogin
// Schedule login task so works after the preLogin
// (Fix found by Koolaid5000)
Bukkit.getScheduler().runTask(plugin, new Runnable() {
@Override
@ -300,7 +300,7 @@ public class AuthMePlayerListener implements Listener {
pl.kickPlayer(m.send("kick_forvip")[0]);
event.allow();
} else {
ConsoleLogger.info("The player " + event.getPlayer().getName() + " tryed to join, but the server was full");
ConsoleLogger.info("The player " + event.getPlayer().getName() + " tried to join, but the server was full");
event.setKickMessage(m.send("kick_fullserver")[0]);
event.setResult(PlayerLoginEvent.Result.KICK_FULL);
}

26
src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java
View File

@ -36,7 +36,7 @@ public class AsynchronousJoin {
private final DataSource database;
private final String name;
private final Messages m;
private final BukkitScheduler sched;
private final BukkitScheduler scheduler;
/**
* Constructor for AsynchronousJoin.
@ -48,7 +48,7 @@ public class AsynchronousJoin {
public AsynchronousJoin(Player player, AuthMe plugin, DataSource database) {
this.player = player;
this.plugin = plugin;
this.sched = plugin.getServer().getScheduler();
this.scheduler = plugin.getServer().getScheduler();
this.database = database;
this.name = player.getName().toLowerCase();
this.m = Messages.getInstance();
@ -69,7 +69,7 @@ public class AsynchronousJoin {
if (!plugin.canConnect()) {
final GameMode gM = AuthMePlayerListener.gameMode.get(name);
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
@Override
public void run() {
@ -85,7 +85,7 @@ public class AsynchronousJoin {
final String ip = plugin.getIP(player);
if (Settings.isAllowRestrictedIp && !Settings.getRestrictedIp(name, ip)) {
final GameMode gM = AuthMePlayerListener.gameMode.get(name);
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
@Override
public void run() {
@ -101,7 +101,7 @@ public class AsynchronousJoin {
}
if (Settings.getMaxJoinPerIp > 0 && !plugin.getPermissionsManager().hasPermission(player, "authme.allow2accounts") && !ip.equalsIgnoreCase("127.0.0.1") && !ip.equalsIgnoreCase("localhost")) {
if (plugin.hasJoinedIp(player.getName(), ip)) {
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
@Override
public void run() {
@ -116,7 +116,7 @@ public class AsynchronousJoin {
final boolean isAuthAvailable = database.isAuthAvailable(name);
if (isAuthAvailable) {
if (Settings.isForceSurvivalModeEnabled && !Settings.forceOnlyAfterLogin) {
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
@Override
public void run() {
@ -128,7 +128,7 @@ public class AsynchronousJoin {
}
if (!Settings.noTeleport)
if (Settings.isTeleportToSpawnEnabled || (Settings.isForceSpawnLocOnJoinEnabled && Settings.getForcedWorlds.contains(player.getWorld().getName()))) {
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
@Override
public void run() {
@ -158,7 +158,7 @@ public class AsynchronousJoin {
}
} else {
if (Settings.isForceSurvivalModeEnabled && !Settings.forceOnlyAfterLogin) {
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
@Override
public void run() {
@ -176,7 +176,7 @@ public class AsynchronousJoin {
}
if (!Settings.noTeleport)
if (!needFirstSpawn() && Settings.isTeleportToSpawnEnabled || (Settings.isForceSpawnLocOnJoinEnabled && Settings.getForcedWorlds.contains(player.getWorld().getName()))) {
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
@Override
public void run() {
@ -202,12 +202,12 @@ public class AsynchronousJoin {
final int timeOut = Settings.getRegistrationTimeout * 20;
int msgInterval = Settings.getWarnMessageInterval;
if (timeOut > 0) {
BukkitTask id = sched.runTaskLaterAsynchronously(plugin, new TimeoutTask(plugin, name, player), timeOut);
BukkitTask id = scheduler.runTaskLaterAsynchronously(plugin, new TimeoutTask(plugin, name, player), timeOut);
LimboCache.getInstance().getLimboPlayer(name).setTimeoutTaskId(id);
}
Utils.setGroup(player, isAuthAvailable ? GroupType.NOTLOGGEDIN : GroupType.UNREGISTERED);
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
@Override
public void run() {
player.setOp(false);
@ -249,7 +249,7 @@ public class AsynchronousJoin {
String[] msg = isAuthAvailable ? m.send("login_msg") :
m.send("reg_" + (Settings.emailRegistration ? "email_" : "") + "msg");
BukkitTask msgTask = sched.runTaskAsynchronously(plugin, new MessageTask(plugin, name, msg, msgInterval));
BukkitTask msgTask = scheduler.runTaskAsynchronously(plugin, new MessageTask(plugin, name, msg, msgInterval));
LimboCache.getInstance().getLimboPlayer(name).setMessageTaskId(msgTask);
}
@ -297,7 +297,7 @@ public class AsynchronousJoin {
return;
if (!player.hasPlayedBefore())
return;
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
scheduler.scheduleSyncDelayedTask(plugin, new Runnable() {
@Override
public void run() {
if (spawnLoc.getWorld() == null) {

32
src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java
View File

@ -183,7 +183,7 @@ public class AsynchronousLogin {
if (!Settings.noConsoleSpam)
ConsoleLogger.info(realName + " logged in!");
// makes player isLoggedin via API
// Set player status to LoggedIn
PlayerCache.getInstance().addPlayer(auth);
database.setLogged(name);
plugin.otherAccounts.addPlayer(player.getUniqueId());
@ -192,14 +192,14 @@ public class AsynchronousLogin {
// task, we schedule it in the end
// so that we can be sure, and have not to care if it might be
// processed in other order.
ProcessSyncronousPlayerLogin syncronousPlayerLogin = new ProcessSyncronousPlayerLogin(player, plugin, database);
if (syncronousPlayerLogin.getLimbo() != null) {
if (syncronousPlayerLogin.getLimbo().getTimeoutTaskId() != null)
syncronousPlayerLogin.getLimbo().getTimeoutTaskId().cancel();
if (syncronousPlayerLogin.getLimbo().getMessageTaskId() != null)
syncronousPlayerLogin.getLimbo().getMessageTaskId().cancel();
ProcessSynchronousPlayerLogin synchronousPlayerLogin = new ProcessSynchronousPlayerLogin(player, plugin, database);
if (synchronousPlayerLogin.getLimbo() != null) {
if (synchronousPlayerLogin.getLimbo().getTimeoutTaskId() != null)
synchronousPlayerLogin.getLimbo().getTimeoutTaskId().cancel();
if (synchronousPlayerLogin.getLimbo().getMessageTaskId() != null)
synchronousPlayerLogin.getLimbo().getMessageTaskId().cancel();
}
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, syncronousPlayerLogin);
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, synchronousPlayerLogin);
} else if (player.isOnline()) {
if (!Settings.noConsoleSpam)
ConsoleLogger.info(realName + " used the wrong password");
@ -236,7 +236,7 @@ public class AsynchronousLogin {
return;
}
List<String> auths = this.database.getAllAuthsByName(auth);
// List<String> uuidlist =
// List<String> uuidList =
// plugin.otherAccounts.getAllPlayersByUUID(player.getUniqueId());
if (auths.isEmpty()) {
return;
@ -245,7 +245,7 @@ public class AsynchronousLogin {
return;
}
StringBuilder message = new StringBuilder("[AuthMe] ");
// String uuidaccounts =
// String uuidAccounts =
// "[AuthMe] PlayerNames has %size% links to this UUID : ";
int i = 0;
for (String account : auths) {
@ -258,17 +258,17 @@ public class AsynchronousLogin {
}
}
/*
* TODO: Active uuid system i = 0; for (String account : uuidlist) {
* i++; uuidaccounts = uuidaccounts + account; if (i != auths.size()) {
* uuidaccounts = uuidaccounts + ", "; } else { uuidaccounts =
* uuidaccounts + "."; } }
* TODO: Active uuid system i = 0; for (String account : uuidList) {
* i++; uuidAccounts = uuidAccounts + account; if (i != auths.size()) {
* uuidAccounts = uuidAccounts + ", "; } else { uuidAccounts =
* uuidAccounts + "."; } }
*/
for (Player player : Utils.getOnlinePlayers()) {
if (plugin.getPermissionsManager().hasPermission(player, "authme.seeOtherAccounts")) {
player.sendMessage("[AuthMe] The player " + auth.getNickname() + " has " + auths.size() + " accounts");
player.sendMessage(message.toString());
// player.sendMessage(uuidaccounts.replace("%size%",
// ""+uuidlist.size()));
// player.sendMessage(uuidAccounts.replace("%size%",
// ""+uuidList.size()));
}
}
}

8
src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java → src/main/java/fr/xephi/authme/process/login/ProcessSynchronousPlayerLogin.java
View File

@ -22,7 +22,7 @@ import org.bukkit.potion.PotionEffectType;
/**
*/
public class ProcessSyncronousPlayerLogin implements Runnable {
public class ProcessSynchronousPlayerLogin implements Runnable {
private final LimboPlayer limbo;
private final Player player;
@ -34,14 +34,14 @@ public class ProcessSyncronousPlayerLogin implements Runnable {
private final JsonCache playerCache;
/**
* Constructor for ProcessSyncronousPlayerLogin.
* Constructor for ProcessSynchronousPlayerLogin.
*
* @param player Player
* @param plugin AuthMe
* @param data DataSource
*/
public ProcessSyncronousPlayerLogin(Player player, AuthMe plugin,
DataSource data) {
public ProcessSynchronousPlayerLogin(Player player, AuthMe plugin,
DataSource data) {
this.plugin = plugin;
this.database = data;
this.pm = plugin.getServer().getPluginManager();

12
src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java
View File

@ -35,8 +35,7 @@ public class AsynchronousQuit {
* @param database DataSource
* @param isKick boolean
*/
public AsynchronousQuit(Player p, AuthMe plugin, DataSource database,
boolean isKick) {
public AsynchronousQuit(Player p, AuthMe plugin, DataSource database, boolean isKick) {
this.player = p;
this.plugin = plugin;
this.database = database;
@ -45,9 +44,7 @@ public class AsynchronousQuit {
}
public void process() {
if (player == null)
return;
if (/*Utils.isNPC(player) || */Utils.isUnrestricted(player)) {
if (player == null || Utils.isUnrestricted(player)) {
return;
}
@ -56,7 +53,8 @@ public class AsynchronousQuit {
if (PlayerCache.getInstance().isAuthenticated(name)) {
if (Settings.isSaveQuitLocationEnabled) {
Location loc = player.getLocation();
PlayerAuth auth = new PlayerAuth(name, loc.getX(), loc.getY(), loc.getZ(), loc.getWorld().getName(), player.getName());
PlayerAuth auth = new PlayerAuth(name, loc.getX(), loc.getY(), loc.getZ(), loc.getWorld().getName(),
player.getName());
database.updateQuitLoc(auth);
}
PlayerAuth auth = new PlayerAuth(name, ip, System.currentTimeMillis(), player.getName());
@ -97,6 +95,6 @@ public class AsynchronousQuit {
}
AuthMePlayerListener.gameMode.remove(name);
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new ProcessSyncronousPlayerQuit(plugin, player, isOp, isFlying, needToChange));
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new ProcessSynchronousPlayerQuit(plugin, player, isOp, isFlying, needToChange));
}
}

6
src/main/java/fr/xephi/authme/process/quit/ProcessSyncronousPlayerQuit.java → src/main/java/fr/xephi/authme/process/quit/ProcessSynchronousPlayerQuit.java
View File

@ -7,7 +7,7 @@ import org.bukkit.entity.Player;
/**
*/
public class ProcessSyncronousPlayerQuit implements Runnable {
public class ProcessSynchronousPlayerQuit implements Runnable {
protected final AuthMe plugin;
protected final Player player;
@ -16,7 +16,7 @@ public class ProcessSyncronousPlayerQuit implements Runnable {
protected final boolean needToChange;
/**
* Constructor for ProcessSyncronousPlayerQuit.
* Constructor for ProcessSynchronousPlayerQuit.
*
* @param plugin AuthMe
* @param player Player
@ -24,7 +24,7 @@ public class ProcessSyncronousPlayerQuit implements Runnable {
* @param isFlying boolean
* @param needToChange boolean
*/
public ProcessSyncronousPlayerQuit(AuthMe plugin, Player player
public ProcessSynchronousPlayerQuit(AuthMe plugin, Player player
, boolean isOp, boolean isFlying
, boolean needToChange) {
this.plugin = plugin;

2
src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
View File

@ -163,7 +163,7 @@ public class AsyncRegister {
database.setLogged(name);
}
plugin.otherAccounts.addPlayer(player.getUniqueId());
ProcessSyncronousPasswordRegister sync = new ProcessSyncronousPasswordRegister(player, plugin);
ProcessSynchronousPasswordRegister sync = new ProcessSynchronousPasswordRegister(player, plugin);
plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, sync);
}
}

6
src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java → src/main/java/fr/xephi/authme/process/register/ProcessSynchronousPasswordRegister.java
View File

@ -20,7 +20,7 @@ import org.bukkit.scheduler.BukkitTask;
/**
*/
public class ProcessSyncronousPasswordRegister implements Runnable {
public class ProcessSynchronousPasswordRegister implements Runnable {
protected final Player player;
protected final String name;
@ -28,12 +28,12 @@ public class ProcessSyncronousPasswordRegister implements Runnable {
private final Messages m = Messages.getInstance();
/**
* Constructor for ProcessSyncronousPasswordRegister.
* Constructor for ProcessSynchronousPasswordRegister.
*
* @param player Player
* @param plugin AuthMe
*/
public ProcessSyncronousPasswordRegister(Player player, AuthMe plugin) {
public ProcessSynchronousPasswordRegister(Player player, AuthMe plugin) {
this.player = player;
this.name = player.getName().toLowerCase();
this.plugin = plugin;