From ea4b75a212ce074df601f8992a3abc5b56a48256 Mon Sep 17 00:00:00 2001 From: 502647092 Date: Fri, 8 Jan 2016 13:55:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B3=A8=E5=86=8C=E5=90=8E?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=9B=B4=E6=8E=A5=E7=99=BB=E5=BD=95=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 502647092 --- pom.xml | 346 +++--- .../AuthMe/cache/limbo/LimboCache.java | 143 ++- .../process/register/AsyncronousRegister.java | 252 ++-- .../citycraft/AuthMe/settings/Settings.java | 1043 ++++++++--------- src/main/resources/config.yml | 6 +- 5 files changed, 890 insertions(+), 900 deletions(-) diff --git a/pom.xml b/pom.xml index 9441e15..800840b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,176 +1,176 @@ - 4.0.0 - cn.citycraft - AuthMe - 6.0 - jar - AuthMe - 登录插件重制版本 - 2013 - http://dev.bukkit.org/bukkit-plugins/authme-reloaded/ - - - AuthMe-Team - https://github.com/AuthMe-Team - - - scm:git:https://github.com/Xephi/AuthMeReloaded.git - scm:git:git@github.com:Xephi/AuthMeReloaded.git - http://github.com/Xephi/AuthMeReloaded - - - - GitHub - https://github.com/Xephi/AuthMeReloaded/issues - - - hudson - http://ci.citycraft.cn:8080/job/AuthMe/ - - - - The GNU General Public Licence version 3 (GPLv3) - http://www.gnu.org/licenses/gpl-3.0.html - - - - UTF-8 - 1.7 - http://ci.citycraft.cn:8080 - 测试版本发布... - 1.8.8-R0.1-SNAPSHOT - - - ${project.name} - - - . - true - src/main/resources/ - - *.yml - - - - ./messages/ - false - src/main/resources/messages/ - - *.yml - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.7 - ${javaVersion} - - - - org.apache.maven.plugins - maven-shade-plugin - 2.3 - - false - true - - - com.zaxxer:HikariCP - org.slf4j:slf4j-jdk14 - org.slf4j:slf4j-api - com.maxmind.geoip:geoip-api - com.google.code.gson:gson - cn.citycraft:PluginHelper - - - - - cn.citycraft.PluginHelper - ${project.groupId}.${project.artifactId} - - - - - - package - - shade - - - - - - - - - spigot-repo - http://hub.spigotmc.org/nexus/content/groups/public - - - citycraft-repo - ${jenkins.url}/plugin/repository/everything/ - - - - - org.spigotmc - spigot-api - jar - 1.8.8-R0.1-SNAPSHOT - - - cn.citycraft - PluginHelper - jar - 1.0 - - - net.milkbowl.vault - VaultAPI - 1.5 - system - ${project.basedir}/lib/Vault.jar - - - com.earth2me - essentials - 2.9.6 - system - ${project.basedir}/lib/Essentials.jar - - - com.zaxxer - HikariCP - 2.4.1 - compile - true - - - com.maxmind.geoip - geoip-api - 1.2.15 - compile - true - - - org.apache.logging.log4j - log4j-core - 2.0-beta9 - provided - true - - - com.comphenix.protocol - ProtocolLib - 3.6.5-SNAPSHOT - system - ${project.basedir}/lib/ProtocolLib-3.6.5-SNAPSHOT.jar - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cn.citycraft + AuthMe + 6.0.1 + jar + AuthMe + 登录插件重制版本 + 2013 + http://dev.bukkit.org/bukkit-plugins/authme-reloaded/ + + + AuthMe-Team + https://github.com/AuthMe-Team + + + scm:git:https://github.com/Xephi/AuthMeReloaded.git + scm:git:git@github.com:Xephi/AuthMeReloaded.git + http://github.com/Xephi/AuthMeReloaded + + + + GitHub + https://github.com/Xephi/AuthMeReloaded/issues + + + hudson + http://ci.citycraft.cn:8080/job/AuthMe/ + + + + The GNU General Public Licence version 3 (GPLv3) + http://www.gnu.org/licenses/gpl-3.0.html + + + + UTF-8 + 1.7 + http://ci.citycraft.cn:8080 + &c修复注册后无法直接登录的问题... + 1.8.8-R0.1-SNAPSHOT + + + ${project.name} + + + . + true + src/main/resources/ + + *.yml + + + + ./messages/ + false + src/main/resources/messages/ + + *.yml + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.7 + ${javaVersion} + + + + org.apache.maven.plugins + maven-shade-plugin + 2.3 + + false + true + + + com.zaxxer:HikariCP + org.slf4j:slf4j-jdk14 + org.slf4j:slf4j-api + com.maxmind.geoip:geoip-api + com.google.code.gson:gson + cn.citycraft:PluginHelper + + + + + cn.citycraft.PluginHelper + ${project.groupId}.${project.artifactId} + + + + + + package + + shade + + + + + + + + + spigot-repo + http://hub.spigotmc.org/nexus/content/groups/public + + + citycraft-repo + ${jenkins.url}/plugin/repository/everything/ + + + + + org.spigotmc + spigot-api + jar + 1.8.8-R0.1-SNAPSHOT + + + cn.citycraft + PluginHelper + jar + 1.0 + + + net.milkbowl.vault + VaultAPI + 1.5 + system + ${project.basedir}/lib/Vault.jar + + + com.earth2me + essentials + 2.9.6 + system + ${project.basedir}/lib/Essentials.jar + + + com.zaxxer + HikariCP + 2.4.1 + compile + true + + + com.maxmind.geoip + geoip-api + 1.2.15 + compile + true + + + org.apache.logging.log4j + log4j-core + 2.0-beta9 + provided + true + + + com.comphenix.protocol + ProtocolLib + 3.6.5-SNAPSHOT + system + ${project.basedir}/lib/ProtocolLib-3.6.5-SNAPSHOT.jar + + diff --git a/src/main/java/cn/citycraft/AuthMe/cache/limbo/LimboCache.java b/src/main/java/cn/citycraft/AuthMe/cache/limbo/LimboCache.java index 15c7fb2..518e1e3 100644 --- a/src/main/java/cn/citycraft/AuthMe/cache/limbo/LimboCache.java +++ b/src/main/java/cn/citycraft/AuthMe/cache/limbo/LimboCache.java @@ -13,88 +13,85 @@ import cn.citycraft.AuthMe.cache.backup.JsonCache; import cn.citycraft.AuthMe.settings.Settings; public class LimboCache { + private volatile static LimboCache singleton; + public ConcurrentHashMap cache; + public AuthMe plugin; + private final JsonCache playerData; - private volatile static LimboCache singleton; + private LimboCache(final AuthMe plugin) { + this.plugin = plugin; + this.cache = new ConcurrentHashMap<>(); + this.playerData = new JsonCache(); + } - public static LimboCache getInstance() { - if (singleton == null) { - singleton = new LimboCache(AuthMe.getInstance()); - } - return singleton; - } + public static LimboCache getInstance() { + if (singleton == null) { + singleton = new LimboCache(AuthMe.getInstance()); + } + return singleton; + } - public ConcurrentHashMap cache; - public AuthMe plugin; + public void addLimboPlayer(final Player player) { + final String name = player.getName().toLowerCase(); + Location loc = player.getLocation(); + GameMode gameMode = player.getGameMode(); + boolean operator = false; + String playerGroup = ""; + boolean flying = false; - private final JsonCache playerData; + if (playerData.doesCacheExist(player)) { + final DataFileCache cache = playerData.readCache(player); + if (cache != null) { + playerGroup = cache.getGroup(); + operator = cache.getOperator(); + flying = cache.isFlying(); + } + } else { + operator = player.isOp(); + flying = player.isFlying(); + if (plugin.permission != null) { + try { + playerGroup = plugin.permission.getPrimaryGroup(player); + } catch (final UnsupportedOperationException e) { + ConsoleLogger.showError("你的权限系统 (" + plugin.permission.getName() + ") 不支持权限组功能 移除配置... UnHook!"); + plugin.permission = null; + } + } + } - private LimboCache(final AuthMe plugin) { - this.plugin = plugin; - this.cache = new ConcurrentHashMap<>(); - this.playerData = new JsonCache(); - } + if (Settings.isForceSurvivalModeEnabled) { + if (gameMode == GameMode.CREATIVE) { + flying = false; + } + gameMode = GameMode.SURVIVAL; + } + if (player.isDead()) { + loc = plugin.getSpawnLocation(player); + } + cache.put(name, new LimboPlayer(name, loc, gameMode, operator, playerGroup, flying)); + } - public void addLimboPlayer(final Player player) { - final String name = player.getName().toLowerCase(); - Location loc = player.getLocation(); - GameMode gameMode = player.getGameMode(); - boolean operator = false; - String playerGroup = ""; - boolean flying = false; + public void addLimboPlayer(final Player player, final String group) { + cache.put(player.getName().toLowerCase(), new LimboPlayer(player.getName().toLowerCase(), group)); + } - if (playerData.doesCacheExist(player)) { - final DataFileCache cache = playerData.readCache(player); - if (cache != null) { - playerGroup = cache.getGroup(); - operator = cache.getOperator(); - flying = cache.isFlying(); - } - } else { - operator = player.isOp(); - flying = player.isFlying(); - if (plugin.permission != null) { - try { - playerGroup = plugin.permission.getPrimaryGroup(player); - } catch (final UnsupportedOperationException e) { - ConsoleLogger.showError("Your permission system (" + plugin.permission.getName() + ") do not support Group system with that config... unhook!"); - plugin.permission = null; - } - } - } + public void deleteLimboPlayer(final String name) { + cache.remove(name); + } - if (Settings.isForceSurvivalModeEnabled) { - if (gameMode == GameMode.CREATIVE) { - flying = false; - } - gameMode = GameMode.SURVIVAL; - } - if (player.isDead()) { - loc = plugin.getSpawnLocation(player); - } - cache.put(name, new LimboPlayer(name, loc, gameMode, operator, playerGroup, flying)); - } + public LimboPlayer getLimboPlayer(final String name) { + return cache.get(name); + } - public void addLimboPlayer(final Player player, final String group) { - cache.put(player.getName().toLowerCase(), new LimboPlayer(player.getName().toLowerCase(), group)); - } + public boolean hasLimboPlayer(final String name) { + return cache.containsKey(name); + } - public void deleteLimboPlayer(final String name) { - cache.remove(name); - } - - public LimboPlayer getLimboPlayer(final String name) { - return cache.get(name); - } - - public boolean hasLimboPlayer(final String name) { - return cache.containsKey(name); - } - - public void updateLimboPlayer(final Player player) { - if (this.hasLimboPlayer(player.getName().toLowerCase())) { - this.deleteLimboPlayer(player.getName().toLowerCase()); - } - addLimboPlayer(player); - } + public void updateLimboPlayer(final Player player) { + if (this.hasLimboPlayer(player.getName().toLowerCase())) { + this.deleteLimboPlayer(player.getName().toLowerCase()); + } + addLimboPlayer(player); + } } diff --git a/src/main/java/cn/citycraft/AuthMe/process/register/AsyncronousRegister.java b/src/main/java/cn/citycraft/AuthMe/process/register/AsyncronousRegister.java index 1e53b0d..64a274d 100644 --- a/src/main/java/cn/citycraft/AuthMe/process/register/AsyncronousRegister.java +++ b/src/main/java/cn/citycraft/AuthMe/process/register/AsyncronousRegister.java @@ -16,135 +16,135 @@ import cn.citycraft.AuthMe.settings.Settings; public class AsyncronousRegister { - private final DataSource database; - private final Messages m = Messages.getInstance(); - private final AuthMe plugin; - protected boolean allowRegister; - protected String email = ""; - protected String name; - protected String password; - protected Player player; + private final DataSource database; + private final Messages m = Messages.getInstance(); + private final AuthMe plugin; + protected boolean allowRegister; + protected String email = ""; + protected String name; + protected String password; + protected Player player; - public AsyncronousRegister(final Player player, final String password, final String email, final AuthMe plugin, final DataSource data) { - this.player = player; - this.password = password; - this.name = player.getName().toLowerCase(); - this.email = email; - this.plugin = plugin; - this.database = data; - this.allowRegister = true; - } + public AsyncronousRegister(final Player player, final String password, final String email, final AuthMe plugin, final DataSource data) { + this.player = player; + this.password = password; + this.name = player.getName().toLowerCase(); + this.email = email; + this.plugin = plugin; + this.database = data; + this.allowRegister = true; + } - public void process() { - preRegister(); - if (!allowRegister) { - return; - } - // TODO 计划删除邮箱 - // if (!email.isEmpty() && !email.equals("")) { - // if (Settings.getmaxRegPerEmail > 0) { - // if (!plugin.authmePermissible(player, "authme.allow2accounts") && database.getAllAuthsByEmail(email).size() >= Settings.getmaxRegPerEmail) { - // m.send(player, "max_reg"); - // return; - // } - // } - // emailRegister(); - // return; - // } - passwordRegister(); - } - // TODO 计划删除邮箱 - // protected void emailRegister() { - // if (Settings.getmaxRegPerEmail > 0) { - // if (!plugin.authmePermissible(player, "authme.allow2accounts") && database.getAllAuthsByEmail(email).size() >= Settings.getmaxRegPerEmail) { - // m.send(player, "max_reg"); - // return; - // } - // } - // PlayerAuth auth; - // try { - // final String hashnew = PasswordSecurity.getHash(Settings.getPasswordHash, password, name); - // auth = new PlayerAuth(name, hashnew, getIp(), 0, (int) player.getLocation().getX(), (int) player.getLocation().getY(), (int) player.getLocation().getZ(), player - // .getLocation() - // .getWorld() - // .getName(), email, player.getName()); - // } catch (final NoSuchAlgorithmException e) { - // ConsoleLogger.showError(e.getMessage()); - // m.send(player, "error"); - // return; - // } - // if (PasswordSecurity.userSalt.containsKey(name)) { - // auth.setSalt(PasswordSecurity.userSalt.get(name)); - // } - // database.saveAuth(auth); - // database.updateEmail(auth); - // database.updateSession(auth); - // final ProcessSyncronousEmailRegister syncronous = new ProcessSyncronousEmailRegister(player, plugin); - // plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, syncronous); - // } + public void process() { + preRegister(); + if (!allowRegister) { + return; + } + // TODO 计划删除邮箱 + // if (!email.isEmpty() && !email.equals("")) { + // if (Settings.getmaxRegPerEmail > 0) { + // if (!plugin.authmePermissible(player, "authme.allow2accounts") && database.getAllAuthsByEmail(email).size() >= Settings.getmaxRegPerEmail) { + // m.send(player, "max_reg"); + // return; + // } + // } + // emailRegister(); + // return; + // } + passwordRegister(); + } + // TODO 计划删除邮箱 + // protected void emailRegister() { + // if (Settings.getmaxRegPerEmail > 0) { + // if (!plugin.authmePermissible(player, "authme.allow2accounts") && database.getAllAuthsByEmail(email).size() >= Settings.getmaxRegPerEmail) { + // m.send(player, "max_reg"); + // return; + // } + // } + // PlayerAuth auth; + // try { + // final String hashnew = PasswordSecurity.getHash(Settings.getPasswordHash, password, name); + // auth = new PlayerAuth(name, hashnew, getIp(), 0, (int) player.getLocation().getX(), (int) player.getLocation().getY(), (int) player.getLocation().getZ(), player + // .getLocation() + // .getWorld() + // .getName(), email, player.getName()); + // } catch (final NoSuchAlgorithmException e) { + // ConsoleLogger.showError(e.getMessage()); + // m.send(player, "error"); + // return; + // } + // if (PasswordSecurity.userSalt.containsKey(name)) { + // auth.setSalt(PasswordSecurity.userSalt.get(name)); + // } + // database.saveAuth(auth); + // database.updateEmail(auth); + // database.updateSession(auth); + // final ProcessSyncronousEmailRegister syncronous = new ProcessSyncronousEmailRegister(player, plugin); + // plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, syncronous); + // } - protected String getIp() { - return plugin.getIP(player); - } + protected String getIp() { + return plugin.getIP(player); + } - protected void passwordRegister() { - PlayerAuth auth; - String hash; - try { - hash = PasswordSecurity.getHash(Settings.getPasswordHash, password, name); - } catch (final NoSuchAlgorithmException e) { - ConsoleLogger.showError(e.getMessage()); - m.send(player, "error"); - return; - } - if (Settings.getMySQLColumnSalt.isEmpty() && !PasswordSecurity.userSalt.containsKey(name)) { - auth = new PlayerAuth(name, hash, getIp(), new Date().getTime(), "your@email.com", player.getName()); - } else { - auth = new PlayerAuth(name, hash, PasswordSecurity.userSalt.get(name), getIp(), new Date().getTime(), player.getName()); - } - if (!database.saveAuth(auth)) { - m.send(player, "error"); - return; - } - if (!Settings.forceRegLogin) { - PlayerCache.getInstance().addPlayer(auth); - database.setLogged(name); - } - plugin.otherAccounts.addPlayer(player.getName()); - final ProcessSyncronousPasswordRegister syncronous = new ProcessSyncronousPasswordRegister(player, plugin); - plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, syncronous); - } + protected void passwordRegister() { + PlayerAuth auth; + String hash; + try { + hash = PasswordSecurity.getHash(Settings.getPasswordHash, password, name); + } catch (final NoSuchAlgorithmException e) { + ConsoleLogger.showError(e.getMessage()); + m.send(player, "error"); + return; + } + if (Settings.getMySQLColumnSalt.isEmpty() && !PasswordSecurity.userSalt.containsKey(name)) { + auth = new PlayerAuth(name, hash, getIp(), new Date().getTime(), "your@email.com", player.getName()); + } else { + auth = new PlayerAuth(name, hash, PasswordSecurity.userSalt.get(name), getIp(), new Date().getTime(), player.getName()); + } + if (!database.saveAuth(auth)) { + m.send(player, "error"); + return; + } + if (Settings.forceRegLogin) { + PlayerCache.getInstance().addPlayer(auth); + database.setLogged(name); + } + plugin.otherAccounts.addPlayer(player.getName()); + final ProcessSyncronousPasswordRegister syncronous = new ProcessSyncronousPasswordRegister(player, plugin); + plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, syncronous); + } - protected void preRegister() { - final String lowpass = password.toLowerCase(); - if (PlayerCache.getInstance().isAuthenticated(name)) { - m.send(player, "logged_in"); - allowRegister = false; - } else if (!Settings.isRegistrationEnabled) { - m.send(player, "reg_disabled"); - allowRegister = false; - } else 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.send(player, "password_error"); - allowRegister = false; - } else if (lowpass.equalsIgnoreCase(player.getName())) { - m.send(player, "password_error_nick"); - allowRegister = false; - } else if (password.length() < Settings.getPasswordMinLen || password.length() > Settings.passwordMaxLength) { - m.send(player, "pass_len"); - allowRegister = false; - } else if (!Settings.unsafePasswords.isEmpty() && Settings.unsafePasswords.contains(password.toLowerCase())) { - m.send(player, "password_error_unsafe"); - allowRegister = false; - } else if (database.isAuthAvailable(name)) { - m.send(player, "user_regged"); - allowRegister = false; - } else 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.send(player, "max_reg"); - allowRegister = false; - } - } - } + protected void preRegister() { + final String lowpass = password.toLowerCase(); + if (PlayerCache.getInstance().isAuthenticated(name)) { + m.send(player, "logged_in"); + allowRegister = false; + } else if (!Settings.isRegistrationEnabled) { + m.send(player, "reg_disabled"); + allowRegister = false; + } else 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.send(player, "password_error"); + allowRegister = false; + } else if (lowpass.equalsIgnoreCase(player.getName())) { + m.send(player, "password_error_nick"); + allowRegister = false; + } else if (password.length() < Settings.getPasswordMinLen || password.length() > Settings.passwordMaxLength) { + m.send(player, "pass_len"); + allowRegister = false; + } else if (!Settings.unsafePasswords.isEmpty() && Settings.unsafePasswords.contains(password.toLowerCase())) { + m.send(player, "password_error_unsafe"); + allowRegister = false; + } else if (database.isAuthAvailable(name)) { + m.send(player, "user_regged"); + allowRegister = false; + } else 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.send(player, "max_reg"); + allowRegister = false; + } + } + } } diff --git a/src/main/java/cn/citycraft/AuthMe/settings/Settings.java b/src/main/java/cn/citycraft/AuthMe/settings/Settings.java index 0eec742..a58f0c7 100644 --- a/src/main/java/cn/citycraft/AuthMe/settings/Settings.java +++ b/src/main/java/cn/citycraft/AuthMe/settings/Settings.java @@ -19,547 +19,542 @@ import cn.citycraft.PluginHelper.config.FileConfig; public final class Settings { - public static List allowCommands; - // This is not an option! - public static boolean antiBotInAction = false; - public static final File APLUGIN_FOLDER = AuthMe.getInstance().getDataFolder(); - public static final File AUTH_FILE = new File(APLUGIN_FOLDER, "auths.db"); + public static List allowCommands; + // This is not an option! + public static boolean antiBotInAction = false; + public static final File APLUGIN_FOLDER = AuthMe.getInstance().getDataFolder(); + public static final File AUTH_FILE = new File(APLUGIN_FOLDER, "auths.db"); - public static final File CACHE_FOLDER = new File(APLUGIN_FOLDER, "cache"); + public static final File CACHE_FOLDER = new File(APLUGIN_FOLDER, "cache"); - public static List countries; - public static List countriesBlacklist; - public static List emailBlacklist; - public static List emailWhitelist; - public static List forceCommands; - public static List forceCommandsAsConsole; + public static List countries; + public static List countriesBlacklist; + public static List emailBlacklist; + public static List emailWhitelist; + public static List forceCommands; + public static List forceCommandsAsConsole; - public static List forceRegisterCommands; - public static List forceRegisterCommandsAsConsole; - public static DataSourceType getDataSource; - public static List getForcedWorlds; - public static List getJoinPermissions; - public static List getMySQLOtherUsernameColumn; - public static String getNickRegex, getUnloggedinGroup, getMySQLHost, getMySQLPort, getMySQLUsername, getMySQLPassword, getMySQLDatabase, getMySQLTablename, getMySQLColumnName, - getMySQLColumnPassword, getMySQLColumnIp, getMySQLColumnLastLogin, getMySQLColumnSalt, getMySQLColumnGroup, getMySQLColumnEmail, unRegisteredGroup, backupWindowsPath, getRegisteredGroup, - getMySQLlastlocX, getMySQLlastlocY, getMySQLlastlocZ, rakamakUsers, rakamakUsersIp, getmailAccount, getmailPassword, getmailSMTP, getMySQLColumnId, getmailSenderName, getMailSubject, - getMailText, getMySQLlastlocWorld, defaultWorld, getPhpbbPrefix, getWordPressPrefix, getMySQLColumnLogged, spawnPriority, crazyloginFileName, getPassRegex, getMySQLColumnRealName, - messageSplit; - public static HashAlgorithm getPasswordHash; - public static List getRestrictedIp; - public static List getUnrestrictedName; - public static int getWarnMessageInterval, getSessionTimeout, getRegistrationTimeout, getMaxNickLength, getMinNickLength, getPasswordMinLen, getMovementRadius, getmaxRegPerIp, getNonActivatedGroup, - passwordMaxLength, getRecoveryPassLength, getMailPort, maxLoginTry, captchaLength, saltLength, getmaxRegPerEmail, bCryptLog2Rounds, getPhpbbGroup, antiBotSensibility, antiBotDuration, - delayRecall, getMaxLoginPerIp, getMaxJoinPerIp, getMySQLMaxConnections; - public static boolean isPermissionCheckEnabled, isRegistrationEnabled, isForcedRegistrationEnabled, isTeleportToSpawnEnabled, isSessionsEnabled, isChatAllowed, isAllowRestrictedIp, - isMovementAllowed, isKickNonRegisteredEnabled, isForceSingleSessionEnabled, isForceSpawnLocOnJoinEnabled, isSaveQuitLocationEnabled, isForceSurvivalModeEnabled, isResetInventoryIfCreative, - isCachingEnabled, isKickOnWrongPasswordEnabled, getEnablePasswordVerifier, isBackupActivated, isBackupOnStart, isBackupOnStop, isStopEnabled, reloadSupport, rakamakUseIp, noConsoleSpam, - removePassword, displayOtherAccounts, useCaptcha, emailRegistration, multiverse, bungee, banUnsafeIp, doubleEmailCheck, sessionExpireOnIpChange, disableSocialSpy, forceOnlyAfterLogin, - useEssentialsMotd, usePurge, purgePlayerDat, purgeEssentialsFile, supportOldPassword, purgeLimitedCreative, purgeAntiXray, purgePermissions, enableProtection, enableAntiBot, recallEmail, - useWelcomeMessage, broadcastWelcomeMessage, forceRegKick, forceRegLogin, checkVeryGames, delayJoinMessage, noTeleport, applyBlindEffect, customAttributes, generateImage, - isRemoveSpeedEnabled; - public static final File LOG_FILE = new File(APLUGIN_FOLDER, "authme.log"); - public static int purgeDelay = 60; - public static final File SETTINGS_FILE = new File(APLUGIN_FOLDER, "config.yml"); - public static List unsafePasswords; - public static boolean useLogging = false; + public static List forceRegisterCommands; + public static List forceRegisterCommandsAsConsole; + public static DataSourceType getDataSource; + public static List getForcedWorlds; + public static List getJoinPermissions; + public static List getMySQLOtherUsernameColumn; + public static String getNickRegex, getUnloggedinGroup, getMySQLHost, getMySQLPort, getMySQLUsername, getMySQLPassword, getMySQLDatabase, getMySQLTablename, getMySQLColumnName, + getMySQLColumnPassword, getMySQLColumnIp, getMySQLColumnLastLogin, getMySQLColumnSalt, getMySQLColumnGroup, getMySQLColumnEmail, unRegisteredGroup, backupWindowsPath, getRegisteredGroup, + getMySQLlastlocX, getMySQLlastlocY, getMySQLlastlocZ, rakamakUsers, rakamakUsersIp, getmailAccount, getmailPassword, getmailSMTP, getMySQLColumnId, getmailSenderName, getMailSubject, + getMailText, getMySQLlastlocWorld, defaultWorld, getPhpbbPrefix, getWordPressPrefix, getMySQLColumnLogged, spawnPriority, crazyloginFileName, getPassRegex, getMySQLColumnRealName, + messageSplit; + public static HashAlgorithm getPasswordHash; + public static List getRestrictedIp; + public static List getUnrestrictedName; + public static int getWarnMessageInterval, getSessionTimeout, getRegistrationTimeout, getMaxNickLength, getMinNickLength, getPasswordMinLen, getMovementRadius, getmaxRegPerIp, getNonActivatedGroup, + passwordMaxLength, getRecoveryPassLength, getMailPort, maxLoginTry, captchaLength, saltLength, getmaxRegPerEmail, bCryptLog2Rounds, getPhpbbGroup, antiBotSensibility, antiBotDuration, + delayRecall, getMaxLoginPerIp, getMaxJoinPerIp, getMySQLMaxConnections; + public static boolean isPermissionCheckEnabled, isRegistrationEnabled, isForcedRegistrationEnabled, isTeleportToSpawnEnabled, isSessionsEnabled, isChatAllowed, isAllowRestrictedIp, + isMovementAllowed, isKickNonRegisteredEnabled, isForceSingleSessionEnabled, isForceSpawnLocOnJoinEnabled, isSaveQuitLocationEnabled, isForceSurvivalModeEnabled, isResetInventoryIfCreative, + isCachingEnabled, isKickOnWrongPasswordEnabled, getEnablePasswordVerifier, isBackupActivated, isBackupOnStart, isBackupOnStop, isStopEnabled, reloadSupport, rakamakUseIp, noConsoleSpam, + removePassword, displayOtherAccounts, useCaptcha, emailRegistration, multiverse, bungee, banUnsafeIp, doubleEmailCheck, sessionExpireOnIpChange, disableSocialSpy, forceOnlyAfterLogin, + useEssentialsMotd, usePurge, purgePlayerDat, purgeEssentialsFile, supportOldPassword, purgeLimitedCreative, purgeAntiXray, purgePermissions, enableProtection, enableAntiBot, recallEmail, + useWelcomeMessage, broadcastWelcomeMessage, forceRegKick, forceRegLogin, checkVeryGames, delayJoinMessage, noTeleport, applyBlindEffect, customAttributes, generateImage, + isRemoveSpeedEnabled; + public static final File LOG_FILE = new File(APLUGIN_FOLDER, "authme.log"); + public static int purgeDelay = 60; + public static final File SETTINGS_FILE = new File(APLUGIN_FOLDER, "config.yml"); + public static List unsafePasswords; + public static boolean useLogging = false; - public static List welcomeMsg; + public static List welcomeMsg; - private static AuthMe plugin; + private static AuthMe plugin; - protected static FileConfig configFile; + protected static FileConfig configFile; - public Settings(final AuthMe pl) { - plugin = pl; - configFile = (FileConfig) plugin.getConfig(); - } + public Settings(final AuthMe pl) { + plugin = pl; + configFile = (FileConfig) plugin.getConfig(); + } - /** - * Config option for setting and check restricted user by username;ip , - * return false if ip and name doesnt amtch with player that join the - * server, so player has a restricted access - */ - public static boolean getRestrictedIp(final String name, final String ip) { + /** + * Config option for setting and check restricted user by username;ip , + * return false if ip and name doesnt amtch with player that join the + * server, so player has a restricted access + */ + public static boolean getRestrictedIp(final String name, final String ip) { - final Iterator iter = getRestrictedIp.iterator(); - boolean trueonce = false; - boolean namefound = false; - while (iter.hasNext()) { - final String[] args = iter.next().split(";"); - final String testname = args[0]; - final String testip = args[1]; - if (testname.equalsIgnoreCase(name)) { - namefound = true; - if (testip.equalsIgnoreCase(ip)) { - trueonce = true; - } - } - } - return !namefound || trueonce; - } + final Iterator iter = getRestrictedIp.iterator(); + boolean trueonce = false; + boolean namefound = false; + while (iter.hasNext()) { + final String[] args = iter.next().split(";"); + final String testname = args[0]; + final String testip = args[1]; + if (testname.equalsIgnoreCase(name)) { + namefound = true; + if (testip.equalsIgnoreCase(ip)) { + trueonce = true; + } + } + } + return !namefound || trueonce; + } - public static boolean isEmailCorrect(final String email) { - if (!email.contains("@")) { - return false; - } - if (email.equalsIgnoreCase("your@email.com")) { - return false; - } - final String emailDomain = email.split("@")[1]; - boolean correct = true; - if (emailWhitelist != null && !emailWhitelist.isEmpty()) { - for (final String domain : emailWhitelist) { - if (!domain.equalsIgnoreCase(emailDomain)) { - correct = false; - } else { - correct = true; - break; - } - } - return correct; - } - if (emailBlacklist != null && !emailBlacklist.isEmpty()) { - for (final String domain : emailBlacklist) { - if (domain.equalsIgnoreCase(emailDomain)) { - correct = false; - break; - } - } - } - return correct; - } + public static boolean isEmailCorrect(final String email) { + if (!email.contains("@")) { + return false; + } + if (email.equalsIgnoreCase("your@email.com")) { + return false; + } + final String emailDomain = email.split("@")[1]; + boolean correct = true; + if (emailWhitelist != null && !emailWhitelist.isEmpty()) { + for (final String domain : emailWhitelist) { + if (!domain.equalsIgnoreCase(emailDomain)) { + correct = false; + } else { + correct = true; + break; + } + } + return correct; + } + if (emailBlacklist != null && !emailBlacklist.isEmpty()) { + for (final String domain : emailBlacklist) { + if (domain.equalsIgnoreCase(emailDomain)) { + correct = false; + break; + } + } + } + return correct; + } - public static void loadVariables() { - isPermissionCheckEnabled = configFile.getBoolean("permission.EnablePermissionCheck", false); - isForcedRegistrationEnabled = configFile.getBoolean("settings.registration.force", true); - isRegistrationEnabled = configFile.getBoolean("settings.registration.enabled", true); - isTeleportToSpawnEnabled = configFile.getBoolean("settings.restrictions.teleportUnAuthedToSpawn", false); - getWarnMessageInterval = configFile.getInt("settings.registration.messageInterval", 5); - isSessionsEnabled = configFile.getBoolean("settings.sessions.enabled", false); - getSessionTimeout = configFile.getInt("settings.sessions.timeout", 10); - getRegistrationTimeout = configFile.getInt("settings.restrictions.timeout", 30); - isChatAllowed = configFile.getBoolean("settings.restrictions.allowChat", false); - getMaxNickLength = configFile.getInt("settings.restrictions.maxNicknameLength", 20); - getMinNickLength = configFile.getInt("settings.restrictions.minNicknameLength", 3); - getPasswordMinLen = configFile.getInt("settings.security.minPasswordLength", 4); - getNickRegex = configFile.getString("settings.restrictions.allowedNicknameCharacters", "[a-zA-Z0-9_?]*"); - isAllowRestrictedIp = configFile.getBoolean("settings.restrictions.AllowRestrictedUser", false); - getRestrictedIp = configFile.getStringList("settings.restrictions.AllowedRestrictedUser"); - isMovementAllowed = configFile.getBoolean("settings.restrictions.allowMovement", false); - isRemoveSpeedEnabled = configFile.getBoolean("settings.restrictions.removeSpeed", true); - getMovementRadius = configFile.getInt("settings.restrictions.allowedMovementRadius", 100); - getJoinPermissions = configFile.getStringList("GroupOptions.Permissions.PermissionsOnJoin"); - isKickOnWrongPasswordEnabled = configFile.getBoolean("settings.restrictions.kickOnWrongPassword", false); - isKickNonRegisteredEnabled = configFile.getBoolean("settings.restrictions.kickNonRegistered", false); - isForceSingleSessionEnabled = configFile.getBoolean("settings.restrictions.ForceSingleSession", true); - isForceSpawnLocOnJoinEnabled = configFile.getBoolean("settings.restrictions.ForceSpawnLocOnJoinEnabled", false); - isSaveQuitLocationEnabled = configFile.getBoolean("settings.restrictions.SaveQuitLocation", false); - isForceSurvivalModeEnabled = configFile.getBoolean("settings.GameMode.ForceSurvivalMode", false); - getmaxRegPerIp = configFile.getInt("settings.restrictions.maxRegPerIp", 1); - getPasswordHash = getPasswordHash(); - getUnloggedinGroup = configFile.getString("settings.security.unLoggedinGroup", "unLoggedInGroup"); - getDataSource = getDataSource(); - isCachingEnabled = configFile.getBoolean("DataSource.caching", true); - getMySQLHost = configFile.getString("DataSource.mySQLHost", "127.0.0.1"); - getMySQLPort = configFile.getString("DataSource.mySQLPort", "3306"); - getMySQLMaxConnections = configFile.getInt("DataSource.mySQLMaxConections", 25); - getMySQLUsername = configFile.getString("DataSource.mySQLUsername", "authme"); - getMySQLPassword = configFile.getString("DataSource.mySQLPassword", "12345"); - getMySQLDatabase = configFile.getString("DataSource.mySQLDatabase", "authme"); - getMySQLTablename = configFile.getString("DataSource.mySQLTablename", "authme"); - getMySQLColumnEmail = configFile.getString("DataSource.mySQLColumnEmail", "email"); - getMySQLColumnName = configFile.getString("DataSource.mySQLColumnName", "username"); - getMySQLColumnPassword = configFile.getString("DataSource.mySQLColumnPassword", "password"); - getMySQLColumnIp = configFile.getString("DataSource.mySQLColumnIp", "ip"); - getMySQLColumnLastLogin = configFile.getString("DataSource.mySQLColumnLastLogin", "lastlogin"); - getMySQLColumnSalt = configFile.getString("ExternalBoardOptions.mySQLColumnSalt"); - getMySQLColumnGroup = configFile.getString("ExternalBoardOptions.mySQLColumnGroup", ""); - getMySQLlastlocX = configFile.getString("DataSource.mySQLlastlocX", "x"); - getMySQLlastlocY = configFile.getString("DataSource.mySQLlastlocY", "y"); - getMySQLlastlocZ = configFile.getString("DataSource.mySQLlastlocZ", "z"); - getMySQLlastlocWorld = configFile.getString("DataSource.mySQLlastlocWorld", "world"); - getMySQLColumnRealName = configFile.getString("DataSource.mySQLRealName", "realname"); - getNonActivatedGroup = configFile.getInt("ExternalBoardOptions.nonActivedUserGroup", -1); - unRegisteredGroup = configFile.getString("GroupOptions.UnregisteredPlayerGroup", ""); - getUnrestrictedName = configFile.getStringList("settings.unrestrictions.UnrestrictedName"); - getRegisteredGroup = configFile.getString("GroupOptions.RegisteredPlayerGroup", ""); - getEnablePasswordVerifier = configFile.getBoolean("settings.restrictions.enablePasswordVerifier", true); - passwordMaxLength = configFile.getInt("settings.security.passwordMaxLength", 20); - isBackupActivated = configFile.getBoolean("BackupSystem.ActivateBackup", false); - isBackupOnStart = configFile.getBoolean("BackupSystem.OnServerStart", false); - isBackupOnStop = configFile.getBoolean("BackupSystem.OnServeStop", false); - backupWindowsPath = configFile.getString("BackupSystem.MysqlWindowsPath", "C:\\Program Files\\MySQL\\MySQL Server 5.1\\"); - isStopEnabled = configFile.getBoolean("Security.SQLProblem.stopServer", true); - reloadSupport = configFile.getBoolean("Security.ReloadCommand.useReloadCommandSupport", true); - allowCommands = configFile.getStringList("settings.restrictions.allowCommands"); - if (configFile.contains("allowCommands")) { - if (!allowCommands.contains("/login")) { - allowCommands.add("/login"); - } - if (!allowCommands.contains("/register")) { - allowCommands.add("/register"); - } - if (!allowCommands.contains("/l")) { - allowCommands.add("/l"); - } - if (!allowCommands.contains("/reg")) { - allowCommands.add("/reg"); - } - if (!allowCommands.contains("/email")) { - allowCommands.add("/email"); - } - if (!allowCommands.contains("/captcha")) { - allowCommands.add("/captcha"); - } - } - rakamakUsers = configFile.getString("Converter.Rakamak.fileName", "users.rak"); - rakamakUsersIp = configFile.getString("Converter.Rakamak.ipFileName", "UsersIp.rak"); - rakamakUseIp = configFile.getBoolean("Converter.Rakamak.useIp", false); - noConsoleSpam = configFile.getBoolean("Security.console.noConsoleSpam", false); - removePassword = configFile.getBoolean("Security.console.removePassword", true); - getmailAccount = configFile.getString("Email.mailAccount", ""); - getmailPassword = configFile.getString("Email.mailPassword", ""); - getmailSMTP = configFile.getString("Email.mailSMTP", "smtp.gmail.com"); - getMailPort = configFile.getInt("Email.mailPort", 465); - getRecoveryPassLength = configFile.getInt("Email.RecoveryPasswordLength", 8); - getMySQLOtherUsernameColumn = configFile.getStringList("ExternalBoardOptions.mySQLOtherUsernameColumns"); - displayOtherAccounts = configFile.getBoolean("settings.restrictions.displayOtherAccounts", true); - getMySQLColumnId = configFile.getString("DataSource.mySQLColumnId", "id"); - getmailSenderName = configFile.getString("Email.mailSenderName", ""); - useCaptcha = configFile.getBoolean("Security.captcha.useCaptcha", false); - maxLoginTry = configFile.getInt("Security.captcha.maxLoginTry", 5); - captchaLength = configFile.getInt("Security.captcha.captchaLength", 5); - getMailSubject = configFile.getString("Email.mailSubject", "Your new AuthMe Password"); - getMailText = configFile.getString("Email.mailText", - "Dear ,

This is your new AuthMe password for the server

:



Do not forget to change password after login!
/changepassword newPassword"); - emailRegistration = configFile.getBoolean("settings.registration.enableEmailRegistrationSystem", false); - saltLength = configFile.getInt("settings.security.doubleMD5SaltLength", 8); - getmaxRegPerEmail = configFile.getInt("Email.maxRegPerEmail", 1); - multiverse = configFile.getBoolean("Hooks.multiverse", true); - bungee = configFile.getBoolean("Hooks.bungeecord", false); - getForcedWorlds = configFile.getStringList("settings.restrictions.ForceSpawnOnTheseWorlds"); - banUnsafeIp = configFile.getBoolean("settings.restrictions.banUnsafedIP", false); - doubleEmailCheck = configFile.getBoolean("settings.registration.doubleEmailCheck", false); - sessionExpireOnIpChange = configFile.getBoolean("settings.sessions.sessionExpireOnIpChange", true); - useLogging = configFile.getBoolean("Security.console.logConsole", false); - disableSocialSpy = configFile.getBoolean("Hooks.disableSocialSpy", true); - bCryptLog2Rounds = configFile.getInt("ExternalBoardOptions.bCryptLog2Round", 10); - forceOnlyAfterLogin = configFile.getBoolean("settings.GameMode.ForceOnlyAfterLogin", false); - useEssentialsMotd = configFile.getBoolean("Hooks.useEssentialsMotd", false); - usePurge = configFile.getBoolean("Purge.useAutoPurge", false); - purgeDelay = configFile.getInt("Purge.daysBeforeRemovePlayer", 60); - purgePlayerDat = configFile.getBoolean("Purge.removePlayerDat", false); - purgeEssentialsFile = configFile.getBoolean("Purge.removeEssentialsFile", false); - defaultWorld = configFile.getString("Purge.defaultWorld", "world"); - getPhpbbPrefix = configFile.getString("ExternalBoardOptions.phpbbTablePrefix", "phpbb_"); - getPhpbbGroup = configFile.getInt("ExternalBoardOptions.phpbbActivatedGroupId", 2); - supportOldPassword = configFile.getBoolean("settings.security.supportOldPasswordHash", false); - getWordPressPrefix = configFile.getString("ExternalBoardOptions.wordpressTablePrefix", "wp_"); - purgeLimitedCreative = configFile.getBoolean("Purge.removeLimitedCreativesInventories", false); - purgeAntiXray = configFile.getBoolean("Purge.removeAntiXRayFile", false); - purgePermissions = configFile.getBoolean("Purge.removePermissions", false); - enableProtection = configFile.getBoolean("Protection.enableProtection", false); - countries = configFile.getStringList("Protection.countries"); - enableAntiBot = configFile.getBoolean("Protection.enableAntiBot", false); - antiBotSensibility = configFile.getInt("Protection.antiBotSensibility", 5); - antiBotDuration = configFile.getInt("Protection.antiBotDuration", 10); - forceCommands = configFile.getStringList("settings.forceCommands"); - forceCommandsAsConsole = configFile.getStringList("settings.forceCommandsAsConsole"); - recallEmail = configFile.getBoolean("Email.recallPlayers", false); - delayRecall = configFile.getInt("Email.delayRecall", 5); - useWelcomeMessage = configFile.getBoolean("settings.useWelcomeMessage", true); - unsafePasswords = configFile.getStringList("settings.security.unsafePasswords"); - countriesBlacklist = configFile.getStringList("Protection.countriesBlacklist"); - broadcastWelcomeMessage = configFile.getBoolean("settings.broadcastWelcomeMessage", false); - forceRegKick = configFile.getBoolean("settings.registration.forceKickAfterRegister", false); - forceRegLogin = configFile.getBoolean("settings.registration.forceLoginAfterRegister", false); - getMySQLColumnLogged = configFile.getString("DataSource.mySQLColumnLogged", "isLogged"); - spawnPriority = configFile.getString("settings.restrictions.spawnPriority", "authme,essentials,multiverse,default"); - getMaxLoginPerIp = configFile.getInt("settings.restrictions.maxLoginPerIp", 0); - getMaxJoinPerIp = configFile.getInt("settings.restrictions.maxJoinPerIp", 0); - checkVeryGames = configFile.getBoolean("VeryGames.enableIpCheck", false); - delayJoinMessage = configFile.getBoolean("settings.delayJoinMessage", false); - noTeleport = configFile.getBoolean("settings.restrictions.noTeleport", false); - crazyloginFileName = configFile.getString("Converter.CrazyLogin.fileName", "accounts.db"); - getPassRegex = configFile.getString("settings.restrictions.allowedPasswordCharacters", "[\\x21-\\x7E]*"); - applyBlindEffect = configFile.getBoolean("settings.applyBlindEffect", false); - emailBlacklist = configFile.getStringList("Email.emailBlacklisted"); - emailWhitelist = configFile.getStringList("Email.emailWhitelisted"); - forceRegisterCommands = configFile.getStringList("settings.forceRegisterCommands"); - forceRegisterCommandsAsConsole = configFile.getStringList("settings.forceRegisterCommandsAsConsole"); - customAttributes = configFile.getBoolean("Hooks.customAttributes"); - generateImage = configFile.getBoolean("Email.generateImage", true); - // Load the welcome message - getWelcomeMessage(); + public static void loadVariables() { + isPermissionCheckEnabled = configFile.getBoolean("permission.EnablePermissionCheck", false); + isForcedRegistrationEnabled = configFile.getBoolean("settings.registration.force", true); + isRegistrationEnabled = configFile.getBoolean("settings.registration.enabled", true); + isTeleportToSpawnEnabled = configFile.getBoolean("settings.restrictions.teleportUnAuthedToSpawn", false); + getWarnMessageInterval = configFile.getInt("settings.registration.messageInterval", 5); + isSessionsEnabled = configFile.getBoolean("settings.sessions.enabled", false); + getSessionTimeout = configFile.getInt("settings.sessions.timeout", 10); + getRegistrationTimeout = configFile.getInt("settings.restrictions.timeout", 30); + isChatAllowed = configFile.getBoolean("settings.restrictions.allowChat", false); + getMaxNickLength = configFile.getInt("settings.restrictions.maxNicknameLength", 20); + getMinNickLength = configFile.getInt("settings.restrictions.minNicknameLength", 3); + getPasswordMinLen = configFile.getInt("settings.security.minPasswordLength", 4); + getNickRegex = configFile.getString("settings.restrictions.allowedNicknameCharacters", "[a-zA-Z0-9_?]*"); + isAllowRestrictedIp = configFile.getBoolean("settings.restrictions.AllowRestrictedUser", false); + getRestrictedIp = configFile.getStringList("settings.restrictions.AllowedRestrictedUser"); + isMovementAllowed = configFile.getBoolean("settings.restrictions.allowMovement", false); + isRemoveSpeedEnabled = configFile.getBoolean("settings.restrictions.removeSpeed", true); + getMovementRadius = configFile.getInt("settings.restrictions.allowedMovementRadius", 100); + getJoinPermissions = configFile.getStringList("GroupOptions.Permissions.PermissionsOnJoin"); + isKickOnWrongPasswordEnabled = configFile.getBoolean("settings.restrictions.kickOnWrongPassword", false); + isKickNonRegisteredEnabled = configFile.getBoolean("settings.restrictions.kickNonRegistered", false); + isForceSingleSessionEnabled = configFile.getBoolean("settings.restrictions.ForceSingleSession", true); + isForceSpawnLocOnJoinEnabled = configFile.getBoolean("settings.restrictions.ForceSpawnLocOnJoinEnabled", false); + isSaveQuitLocationEnabled = configFile.getBoolean("settings.restrictions.SaveQuitLocation", false); + isForceSurvivalModeEnabled = configFile.getBoolean("settings.GameMode.ForceSurvivalMode", false); + getmaxRegPerIp = configFile.getInt("settings.restrictions.maxRegPerIp", 1); + getPasswordHash = getPasswordHash(); + getUnloggedinGroup = configFile.getString("settings.security.unLoggedinGroup", "unLoggedInGroup"); + getDataSource = getDataSource(); + isCachingEnabled = configFile.getBoolean("DataSource.caching", true); + getMySQLHost = configFile.getString("DataSource.mySQLHost", "127.0.0.1"); + getMySQLPort = configFile.getString("DataSource.mySQLPort", "3306"); + getMySQLMaxConnections = configFile.getInt("DataSource.mySQLMaxConections", 25); + getMySQLUsername = configFile.getString("DataSource.mySQLUsername", "authme"); + getMySQLPassword = configFile.getString("DataSource.mySQLPassword", "12345"); + getMySQLDatabase = configFile.getString("DataSource.mySQLDatabase", "authme"); + getMySQLTablename = configFile.getString("DataSource.mySQLTablename", "authme"); + getMySQLColumnEmail = configFile.getString("DataSource.mySQLColumnEmail", "email"); + getMySQLColumnName = configFile.getString("DataSource.mySQLColumnName", "username"); + getMySQLColumnPassword = configFile.getString("DataSource.mySQLColumnPassword", "password"); + getMySQLColumnIp = configFile.getString("DataSource.mySQLColumnIp", "ip"); + getMySQLColumnLastLogin = configFile.getString("DataSource.mySQLColumnLastLogin", "lastlogin"); + getMySQLColumnSalt = configFile.getString("ExternalBoardOptions.mySQLColumnSalt"); + getMySQLColumnGroup = configFile.getString("ExternalBoardOptions.mySQLColumnGroup", ""); + getMySQLlastlocX = configFile.getString("DataSource.mySQLlastlocX", "x"); + getMySQLlastlocY = configFile.getString("DataSource.mySQLlastlocY", "y"); + getMySQLlastlocZ = configFile.getString("DataSource.mySQLlastlocZ", "z"); + getMySQLlastlocWorld = configFile.getString("DataSource.mySQLlastlocWorld", "world"); + getMySQLColumnRealName = configFile.getString("DataSource.mySQLRealName", "realname"); + getNonActivatedGroup = configFile.getInt("ExternalBoardOptions.nonActivedUserGroup", -1); + unRegisteredGroup = configFile.getString("GroupOptions.UnregisteredPlayerGroup", ""); + getUnrestrictedName = configFile.getStringList("settings.unrestrictions.UnrestrictedName"); + getRegisteredGroup = configFile.getString("GroupOptions.RegisteredPlayerGroup", ""); + getEnablePasswordVerifier = configFile.getBoolean("settings.restrictions.enablePasswordVerifier", true); + passwordMaxLength = configFile.getInt("settings.security.passwordMaxLength", 20); + isBackupActivated = configFile.getBoolean("BackupSystem.ActivateBackup", false); + isBackupOnStart = configFile.getBoolean("BackupSystem.OnServerStart", false); + isBackupOnStop = configFile.getBoolean("BackupSystem.OnServeStop", false); + backupWindowsPath = configFile.getString("BackupSystem.MysqlWindowsPath", "C:\\Program Files\\MySQL\\MySQL Server 5.1\\"); + isStopEnabled = configFile.getBoolean("Security.SQLProblem.stopServer", true); + reloadSupport = configFile.getBoolean("Security.ReloadCommand.useReloadCommandSupport", true); + allowCommands = configFile.getStringList("settings.restrictions.allowCommands"); + if (configFile.contains("allowCommands")) { + if (!allowCommands.contains("/login")) { + allowCommands.add("/login"); + } + if (!allowCommands.contains("/register")) { + allowCommands.add("/register"); + } + if (!allowCommands.contains("/l")) { + allowCommands.add("/l"); + } + if (!allowCommands.contains("/reg")) { + allowCommands.add("/reg"); + } + if (!allowCommands.contains("/email")) { + allowCommands.add("/email"); + } + if (!allowCommands.contains("/captcha")) { + allowCommands.add("/captcha"); + } + } + rakamakUsers = configFile.getString("Converter.Rakamak.fileName", "users.rak"); + rakamakUsersIp = configFile.getString("Converter.Rakamak.ipFileName", "UsersIp.rak"); + rakamakUseIp = configFile.getBoolean("Converter.Rakamak.useIp", false); + noConsoleSpam = configFile.getBoolean("Security.console.noConsoleSpam", false); + removePassword = configFile.getBoolean("Security.console.removePassword", true); + getmailAccount = configFile.getString("Email.mailAccount", ""); + getmailPassword = configFile.getString("Email.mailPassword", ""); + getmailSMTP = configFile.getString("Email.mailSMTP", "smtp.gmail.com"); + getMailPort = configFile.getInt("Email.mailPort", 465); + getRecoveryPassLength = configFile.getInt("Email.RecoveryPasswordLength", 8); + getMySQLOtherUsernameColumn = configFile.getStringList("ExternalBoardOptions.mySQLOtherUsernameColumns"); + displayOtherAccounts = configFile.getBoolean("settings.restrictions.displayOtherAccounts", true); + getMySQLColumnId = configFile.getString("DataSource.mySQLColumnId", "id"); + getmailSenderName = configFile.getString("Email.mailSenderName", ""); + useCaptcha = configFile.getBoolean("Security.captcha.useCaptcha", false); + maxLoginTry = configFile.getInt("Security.captcha.maxLoginTry", 5); + captchaLength = configFile.getInt("Security.captcha.captchaLength", 5); + saltLength = configFile.getInt("settings.security.doubleMD5SaltLength", 8); + getmaxRegPerEmail = configFile.getInt("Email.maxRegPerEmail", 1); + multiverse = configFile.getBoolean("Hooks.multiverse", true); + bungee = configFile.getBoolean("Hooks.bungeecord", false); + getForcedWorlds = configFile.getStringList("settings.restrictions.ForceSpawnOnTheseWorlds"); + banUnsafeIp = configFile.getBoolean("settings.restrictions.banUnsafedIP", false); + doubleEmailCheck = configFile.getBoolean("settings.registration.doubleEmailCheck", false); + sessionExpireOnIpChange = configFile.getBoolean("settings.sessions.sessionExpireOnIpChange", true); + useLogging = configFile.getBoolean("Security.console.logConsole", false); + disableSocialSpy = configFile.getBoolean("Hooks.disableSocialSpy", true); + bCryptLog2Rounds = configFile.getInt("ExternalBoardOptions.bCryptLog2Round", 10); + forceOnlyAfterLogin = configFile.getBoolean("settings.GameMode.ForceOnlyAfterLogin", false); + useEssentialsMotd = configFile.getBoolean("Hooks.useEssentialsMotd", false); + usePurge = configFile.getBoolean("Purge.useAutoPurge", false); + purgeDelay = configFile.getInt("Purge.daysBeforeRemovePlayer", 60); + purgePlayerDat = configFile.getBoolean("Purge.removePlayerDat", false); + purgeEssentialsFile = configFile.getBoolean("Purge.removeEssentialsFile", false); + defaultWorld = configFile.getString("Purge.defaultWorld", "world"); + getPhpbbPrefix = configFile.getString("ExternalBoardOptions.phpbbTablePrefix", "phpbb_"); + getPhpbbGroup = configFile.getInt("ExternalBoardOptions.phpbbActivatedGroupId", 2); + supportOldPassword = configFile.getBoolean("settings.security.supportOldPasswordHash", false); + getWordPressPrefix = configFile.getString("ExternalBoardOptions.wordpressTablePrefix", "wp_"); + purgeLimitedCreative = configFile.getBoolean("Purge.removeLimitedCreativesInventories", false); + purgeAntiXray = configFile.getBoolean("Purge.removeAntiXRayFile", false); + purgePermissions = configFile.getBoolean("Purge.removePermissions", false); + enableProtection = configFile.getBoolean("Protection.enableProtection", false); + countries = configFile.getStringList("Protection.countries"); + enableAntiBot = configFile.getBoolean("Protection.enableAntiBot", false); + antiBotSensibility = configFile.getInt("Protection.antiBotSensibility", 5); + antiBotDuration = configFile.getInt("Protection.antiBotDuration", 10); + forceCommands = configFile.getStringList("settings.forceCommands"); + forceCommandsAsConsole = configFile.getStringList("settings.forceCommandsAsConsole"); + recallEmail = configFile.getBoolean("Email.recallPlayers", false); + delayRecall = configFile.getInt("Email.delayRecall", 5); + useWelcomeMessage = configFile.getBoolean("settings.useWelcomeMessage", true); + unsafePasswords = configFile.getStringList("settings.security.unsafePasswords"); + countriesBlacklist = configFile.getStringList("Protection.countriesBlacklist"); + broadcastWelcomeMessage = configFile.getBoolean("settings.broadcastWelcomeMessage", false); + forceRegKick = configFile.getBoolean("settings.registration.forceKickAfterRegister", false); + forceRegLogin = configFile.getBoolean("settings.registration.forceLoginAfterRegister", true); + getMySQLColumnLogged = configFile.getString("DataSource.mySQLColumnLogged", "isLogged"); + spawnPriority = configFile.getString("settings.restrictions.spawnPriority", "authme,essentials,multiverse,default"); + getMaxLoginPerIp = configFile.getInt("settings.restrictions.maxLoginPerIp", 0); + getMaxJoinPerIp = configFile.getInt("settings.restrictions.maxJoinPerIp", 0); + checkVeryGames = configFile.getBoolean("VeryGames.enableIpCheck", false); + delayJoinMessage = configFile.getBoolean("settings.delayJoinMessage", false); + noTeleport = configFile.getBoolean("settings.restrictions.noTeleport", false); + crazyloginFileName = configFile.getString("Converter.CrazyLogin.fileName", "accounts.db"); + getPassRegex = configFile.getString("settings.restrictions.allowedPasswordCharacters", "[\\x21-\\x7E]*"); + applyBlindEffect = configFile.getBoolean("settings.applyBlindEffect", false); + emailBlacklist = configFile.getStringList("Email.emailBlacklisted"); + emailWhitelist = configFile.getStringList("Email.emailWhitelisted"); + forceRegisterCommands = configFile.getStringList("settings.forceRegisterCommands"); + forceRegisterCommandsAsConsole = configFile.getStringList("settings.forceRegisterCommandsAsConsole"); + customAttributes = configFile.getBoolean("Hooks.customAttributes"); + generateImage = configFile.getBoolean("Email.generateImage", true); + // Load the welcome message + getWelcomeMessage(); + } - } + public static boolean reloadcfg() { + return configFile.reload(); + } - public static boolean reloadcfg() { - return configFile.reload(); - } + public static void setValue(final String key, final Object value) { + configFile.set(key, value); + configFile.save(); + } - public static void setValue(final String key, final Object value) { - configFile.set(key, value); - configFile.save(); - } + public static void switchAntiBotMod(final boolean mode) { + if (mode) { + isKickNonRegisteredEnabled = true; + antiBotInAction = true; + } else { + isKickNonRegisteredEnabled = configFile.getBoolean("settings.restrictions.kickNonRegistered", false); + antiBotInAction = false; + } + } - public static void switchAntiBotMod(final boolean mode) { - if (mode) { - isKickNonRegisteredEnabled = true; - antiBotInAction = true; - } else { - isKickNonRegisteredEnabled = configFile.getBoolean("settings.restrictions.kickNonRegistered", false); - antiBotInAction = false; - } - } + private static DataSourceType getDataSource() { + final String key = "DataSource.backend"; + try { + return DataSource.DataSourceType.valueOf(configFile.getString(key, "sqlite").toUpperCase()); + } catch (final IllegalArgumentException ex) { + ConsoleLogger.showError("未知的数据库类型; 默认使用SQLite..."); + return DataSource.DataSourceType.SQLITE; + } + } - private static DataSourceType getDataSource() { - final String key = "DataSource.backend"; - try { - return DataSource.DataSourceType.valueOf(configFile.getString(key, "sqlite").toUpperCase()); - } catch (final IllegalArgumentException ex) { - ConsoleLogger.showError("未知的数据库类型; 默认使用SQLite..."); - return DataSource.DataSourceType.SQLITE; - } - } + private static HashAlgorithm getPasswordHash() { + final String key = "settings.security.passwordHash"; + try { + return HashAlgorithm.valueOf(configFile.getString(key, "SHA256").toUpperCase()); + } catch (final IllegalArgumentException ex) { + ConsoleLogger.showError("未知的密码加密; 默认使用 SHA256 ..."); + return HashAlgorithm.SHA256; + } + } - private static HashAlgorithm getPasswordHash() { - final String key = "settings.security.passwordHash"; - try { - return HashAlgorithm.valueOf(configFile.getString(key, "SHA256").toUpperCase()); - } catch (final IllegalArgumentException ex) { - ConsoleLogger.showError("未知的密码加密; 默认使用 SHA256 ..."); - return HashAlgorithm.SHA256; - } - } + private static void getWelcomeMessage() { + final AuthMe plugin = AuthMe.getInstance(); + welcomeMsg = new ArrayList<>(); + if (!useWelcomeMessage) { + return; + } + if (!(new File(plugin.getDataFolder() + File.separator + "welcome.txt").exists())) { + try { + final FileWriter fw = new FileWriter(plugin.getDataFolder() + File.separator + "welcome.txt", true); + final BufferedWriter w = new BufferedWriter(fw); + w.write("§6欢迎 §a{PLAYER} §6来到 §b{SERVER} §6服务器"); + w.newLine(); + w.write("§a当前服务器使用 §dAuthMe §a登陆系统 §6- §c重制 By:喵♂呜!"); + w.close(); + } catch (final IOException e) { + e.printStackTrace(); + } + } + try { + final FileReader fr = new FileReader(plugin.getDataFolder() + File.separator + "welcome.txt"); + final BufferedReader br = new BufferedReader(fr); + String line; + while ((line = br.readLine()) != null) { + welcomeMsg.add(line); + } + br.close(); + } catch (final IOException e) { + e.printStackTrace(); + } + } - private static void getWelcomeMessage() { - final AuthMe plugin = AuthMe.getInstance(); - welcomeMsg = new ArrayList<>(); - if (!useWelcomeMessage) { - return; - } - if (!(new File(plugin.getDataFolder() + File.separator + "welcome.txt").exists())) { - try { - final FileWriter fw = new FileWriter(plugin.getDataFolder() + File.separator + "welcome.txt", true); - final BufferedWriter w = new BufferedWriter(fw); - w.write("§6欢迎 §a{PLAYER} §6来到 §b{SERVER} §6服务器"); - w.newLine(); - w.write("§a当前服务器使用 §dAuthMe §a登陆系统 §6- §c重制 By:喵♂呜!"); - w.close(); - } catch (final IOException e) { - e.printStackTrace(); - } - } - try { - final FileReader fr = new FileReader(plugin.getDataFolder() + File.separator + "welcome.txt"); - final BufferedReader br = new BufferedReader(fr); - String line; - while ((line = br.readLine()) != null) { - welcomeMsg.add(line); - } - br.close(); - } catch (final IOException e) { - e.printStackTrace(); - } - } + public void mergeConfig() { + boolean changes = false; + if (configFile.contains("Xenoforo.predefinedSalt")) { + configFile.set("Xenoforo.predefinedSalt", null); + changes = true; + } + if (configFile.getString("settings.security.passwordHash", "SHA256").toUpperCase().equals("XFSHA1") + || configFile.getString("settings.security.passwordHash", "SHA256").toUpperCase().equals("XFSHA256")) { + configFile.set("settings.security.passwordHash", "XENFORO"); + changes = true; + } + if (!configFile.contains("Protection.enableProtection")) { + configFile.set("Protection.enableProtection", false); + changes = true; + } + if (!configFile.contains("settings.restrictions.removeSpeed")) { + configFile.set("settings.restrictions.removeSpeed", true); + changes = true; + } + if (!configFile.contains("DataSource.mySQLMaxConections")) { + configFile.set("DataSource.mySQLMaxConections", 25); + changes = true; + } + if (!configFile.contains("Protection.countries")) { + countries = new ArrayList<>(); + countries.add("US"); + countries.add("GB"); + configFile.set("Protection.countries", countries); + changes = true; + } + if (!configFile.contains("Protection.enableAntiBot")) { + configFile.set("Protection.enableAntiBot", false); + changes = true; + } + if (!configFile.contains("Protection.antiBotSensibility")) { + configFile.set("Protection.antiBotSensibility", 5); + changes = true; + } + if (!configFile.contains("Protection.antiBotDuration")) { + configFile.set("Protection.antiBotDuration", 10); + changes = true; + } + if (!configFile.contains("settings.forceCommands")) { + configFile.set("settings.forceCommands", new ArrayList()); + changes = true; + } + if (!configFile.contains("settings.forceCommandsAsConsole")) { + configFile.set("settings.forceCommandsAsConsole", new ArrayList()); + changes = true; + } + if (!configFile.contains("Email.recallPlayers")) { + configFile.set("Email.recallPlayers", false); + changes = true; + } + if (!configFile.contains("Email.delayRecall")) { + configFile.set("Email.delayRecall", 5); + changes = true; + } + if (!configFile.contains("settings.useWelcomeMessage")) { + configFile.set("settings.useWelcomeMessage", true); + changes = true; + } + if (!configFile.contains("settings.security.unsafePasswords")) { + final List str = new ArrayList<>(); + str.add("123456"); + str.add("password"); + configFile.set("settings.security.unsafePasswords", str); + changes = true; + } + if (!configFile.contains("Protection.countriesBlacklist")) { + countriesBlacklist = new ArrayList<>(); + countriesBlacklist.add("A1"); + configFile.set("Protection.countriesBlacklist", countriesBlacklist); + changes = true; + } + if (!configFile.contains("settings.broadcastWelcomeMessage")) { + configFile.set("settings.broadcastWelcomeMessage", false); + changes = true; + } + if (!configFile.contains("settings.registration.forceKickAfterRegister")) { + configFile.set("settings.registration.forceKickAfterRegister", false); + changes = true; + } + if (!configFile.contains("settings.registration.forceLoginAfterRegister")) { + configFile.set("settings.registration.forceLoginAfterRegister", false); + changes = true; + } + if (!configFile.contains("DataSource.mySQLColumnLogged")) { + configFile.set("DataSource.mySQLColumnLogged", "isLogged"); + changes = true; + } + if (!configFile.contains("settings.restrictions.spawnPriority")) { + configFile.set("settings.restrictions.spawnPriority", "authme,essentials,multiverse,default"); + changes = true; + } + if (!configFile.contains("settings.restrictions.maxLoginPerIp")) { + configFile.set("settings.restrictions.maxLoginPerIp", 0); + changes = true; + } + if (!configFile.contains("settings.restrictions.maxJoinPerIp")) { + configFile.set("settings.restrictions.maxJoinPerIp", 0); + changes = true; + } + if (configFile.getString("settings.restrictions.allowedNicknameCharacters").equals("[a-zA-Z0-9_?]*")) { + configFile.set("settings.restrictions.allowedNicknameCharacters", "[a-zA-Z0-9_]*"); + changes = true; + } + if (!configFile.contains("settings.delayJoinMessage")) { + configFile.set("settings.delayJoinMessage", false); + changes = true; + } + if (!configFile.contains("settings.restrictions.noTeleport")) { + configFile.set("settings.restrictions.noTeleport", false); + changes = true; + } + if (configFile.contains("Converter.Rakamak.newPasswordHash")) { + configFile.set("Converter.Rakamak.newPasswordHash", null); + changes = true; + } + if (!configFile.contains("Converter.CrazyLogin.fileName")) { + configFile.set("Converter.CrazyLogin.fileName", "accounts.db"); + changes = true; + } + if (!configFile.contains("settings.restrictions.allowedPasswordCharacters")) { + configFile.set("settings.restrictions.allowedPasswordCharacters", "[\\x21-\\x7E]*"); + changes = true; + } + if (!configFile.contains("settings.applyBlindEffect")) { + configFile.set("settings.applyBlindEffect", false); + changes = true; + } + if (!configFile.contains("Email.emailBlacklisted")) { + configFile.set("Email.emailBlacklisted", new ArrayList()); + changes = true; + } + if (configFile.contains("Performances.useMultiThreading")) { + configFile.set("Performances.useMultiThreading", null); + changes = true; + } + if (configFile.contains("Performances")) { + configFile.set("Performances", null); + changes = true; + } + if (configFile.contains("Passpartu.enablePasspartu")) { + configFile.set("Passpartu.enablePasspartu", null); + changes = true; + } + if (configFile.contains("Passpartu")) { + configFile.set("Passpartu", null); + changes = true; + } + if (!configFile.contains("Email.emailWhitelisted")) { + configFile.set("Email.emailWhitelisted", new ArrayList()); + changes = true; + } + if (!configFile.contains("settings.forceRegisterCommands")) { + configFile.set("settings.forceRegisterCommands", new ArrayList()); + changes = true; + } + if (!configFile.contains("settings.forceRegisterCommandsAsConsole")) { + configFile.set("settings.forceRegisterCommandsAsConsole", new ArrayList()); + changes = true; + } + if (!configFile.contains("Hooks.customAttributes")) { + configFile.set("Hooks.customAttributes", false); + changes = true; + } + if (!configFile.contains("Purge.removePermissions")) { + configFile.set("Purge.removePermissions", false); + changes = true; + } + if (configFile.contains("Hooks.notifications")) { + configFile.set("Hooks.notifications", null); + changes = true; + } + if (configFile.contains("Hooks.chestshop")) { + configFile.set("Hooks.chestshop", null); + changes = true; + } + if (configFile.contains("Hooks.legacyChestshop")) { + configFile.set("Hooks.legacyChestshop", null); + changes = true; + } + if (!configFile.contains("Email.generateImage")) { + configFile.set("Email.generateImage", true); + changes = true; + } + if (!configFile.contains("DataSource.mySQLRealName")) { + configFile.set("DataSource.mySQLRealName", "realname"); + changes = true; + } - public void mergeConfig() { - boolean changes = false; - if (configFile.contains("Xenoforo.predefinedSalt")) { - configFile.set("Xenoforo.predefinedSalt", null); - changes = true; - } - if (configFile.getString("settings.security.passwordHash", "SHA256").toUpperCase().equals("XFSHA1") - || configFile.getString("settings.security.passwordHash", "SHA256").toUpperCase().equals("XFSHA256")) { - configFile.set("settings.security.passwordHash", "XENFORO"); - changes = true; - } - if (!configFile.contains("Protection.enableProtection")) { - configFile.set("Protection.enableProtection", false); - changes = true; - } - if (!configFile.contains("settings.restrictions.removeSpeed")) { - configFile.set("settings.restrictions.removeSpeed", true); - changes = true; - } - if (!configFile.contains("DataSource.mySQLMaxConections")) { - configFile.set("DataSource.mySQLMaxConections", 25); - changes = true; - } - if (!configFile.contains("Protection.countries")) { - countries = new ArrayList<>(); - countries.add("US"); - countries.add("GB"); - configFile.set("Protection.countries", countries); - changes = true; - } - if (!configFile.contains("Protection.enableAntiBot")) { - configFile.set("Protection.enableAntiBot", false); - changes = true; - } - if (!configFile.contains("Protection.antiBotSensibility")) { - configFile.set("Protection.antiBotSensibility", 5); - changes = true; - } - if (!configFile.contains("Protection.antiBotDuration")) { - configFile.set("Protection.antiBotDuration", 10); - changes = true; - } - if (!configFile.contains("settings.forceCommands")) { - configFile.set("settings.forceCommands", new ArrayList()); - changes = true; - } - if (!configFile.contains("settings.forceCommandsAsConsole")) { - configFile.set("settings.forceCommandsAsConsole", new ArrayList()); - changes = true; - } - if (!configFile.contains("Email.recallPlayers")) { - configFile.set("Email.recallPlayers", false); - changes = true; - } - if (!configFile.contains("Email.delayRecall")) { - configFile.set("Email.delayRecall", 5); - changes = true; - } - if (!configFile.contains("settings.useWelcomeMessage")) { - configFile.set("settings.useWelcomeMessage", true); - changes = true; - } - if (!configFile.contains("settings.security.unsafePasswords")) { - final List str = new ArrayList<>(); - str.add("123456"); - str.add("password"); - configFile.set("settings.security.unsafePasswords", str); - changes = true; - } - if (!configFile.contains("Protection.countriesBlacklist")) { - countriesBlacklist = new ArrayList<>(); - countriesBlacklist.add("A1"); - configFile.set("Protection.countriesBlacklist", countriesBlacklist); - changes = true; - } - if (!configFile.contains("settings.broadcastWelcomeMessage")) { - configFile.set("settings.broadcastWelcomeMessage", false); - changes = true; - } - if (!configFile.contains("settings.registration.forceKickAfterRegister")) { - configFile.set("settings.registration.forceKickAfterRegister", false); - changes = true; - } - if (!configFile.contains("settings.registration.forceLoginAfterRegister")) { - configFile.set("settings.registration.forceLoginAfterRegister", false); - changes = true; - } - if (!configFile.contains("DataSource.mySQLColumnLogged")) { - configFile.set("DataSource.mySQLColumnLogged", "isLogged"); - changes = true; - } - if (!configFile.contains("settings.restrictions.spawnPriority")) { - configFile.set("settings.restrictions.spawnPriority", "authme,essentials,multiverse,default"); - changes = true; - } - if (!configFile.contains("settings.restrictions.maxLoginPerIp")) { - configFile.set("settings.restrictions.maxLoginPerIp", 0); - changes = true; - } - if (!configFile.contains("settings.restrictions.maxJoinPerIp")) { - configFile.set("settings.restrictions.maxJoinPerIp", 0); - changes = true; - } - if (configFile.getString("settings.restrictions.allowedNicknameCharacters").equals("[a-zA-Z0-9_?]*")) { - configFile.set("settings.restrictions.allowedNicknameCharacters", "[a-zA-Z0-9_]*"); - changes = true; - } - if (!configFile.contains("settings.delayJoinMessage")) { - configFile.set("settings.delayJoinMessage", false); - changes = true; - } - if (!configFile.contains("settings.restrictions.noTeleport")) { - configFile.set("settings.restrictions.noTeleport", false); - changes = true; - } - if (configFile.contains("Converter.Rakamak.newPasswordHash")) { - configFile.set("Converter.Rakamak.newPasswordHash", null); - changes = true; - } - if (!configFile.contains("Converter.CrazyLogin.fileName")) { - configFile.set("Converter.CrazyLogin.fileName", "accounts.db"); - changes = true; - } - if (!configFile.contains("settings.restrictions.allowedPasswordCharacters")) { - configFile.set("settings.restrictions.allowedPasswordCharacters", "[\\x21-\\x7E]*"); - changes = true; - } - if (!configFile.contains("settings.applyBlindEffect")) { - configFile.set("settings.applyBlindEffect", false); - changes = true; - } - if (!configFile.contains("Email.emailBlacklisted")) { - configFile.set("Email.emailBlacklisted", new ArrayList()); - changes = true; - } - if (configFile.contains("Performances.useMultiThreading")) { - configFile.set("Performances.useMultiThreading", null); - changes = true; - } - if (configFile.contains("Performances")) { - configFile.set("Performances", null); - changes = true; - } - if (configFile.contains("Passpartu.enablePasspartu")) { - configFile.set("Passpartu.enablePasspartu", null); - changes = true; - } - if (configFile.contains("Passpartu")) { - configFile.set("Passpartu", null); - changes = true; - } - if (!configFile.contains("Email.emailWhitelisted")) { - configFile.set("Email.emailWhitelisted", new ArrayList()); - changes = true; - } - if (!configFile.contains("settings.forceRegisterCommands")) { - configFile.set("settings.forceRegisterCommands", new ArrayList()); - changes = true; - } - if (!configFile.contains("settings.forceRegisterCommandsAsConsole")) { - configFile.set("settings.forceRegisterCommandsAsConsole", new ArrayList()); - changes = true; - } - if (!configFile.contains("Hooks.customAttributes")) { - configFile.set("Hooks.customAttributes", false); - changes = true; - } - if (!configFile.contains("Purge.removePermissions")) { - configFile.set("Purge.removePermissions", false); - changes = true; - } - if (configFile.contains("Hooks.notifications")) { - configFile.set("Hooks.notifications", null); - changes = true; - } - if (configFile.contains("Hooks.chestshop")) { - configFile.set("Hooks.chestshop", null); - changes = true; - } - if (configFile.contains("Hooks.legacyChestshop")) { - configFile.set("Hooks.legacyChestshop", null); - changes = true; - } - if (!configFile.contains("Email.generateImage")) { - configFile.set("Email.generateImage", true); - changes = true; - } - if (!configFile.contains("DataSource.mySQLRealName")) { - configFile.set("DataSource.mySQLRealName", "realname"); - changes = true; - } - - if (changes) { - plugin.getLogger().warning("已合并新的配置选项 - 这不是一个错误, 请不要反馈给我"); - plugin.getLogger().warning("请检查新的 config.yml 文件 并修改相关配置!"); - } - } + if (changes) { + plugin.getLogger().warning("已合并新的配置选项 - 这不是一个错误, 请不要反馈给我"); + plugin.getLogger().warning("请检查新的 config.yml 文件 并修改相关配置!"); + } + } } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 653644c..2a246b0 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -196,8 +196,8 @@ settings: # 是否在玩家成功注册后t出玩家 # 不使用下面的注册功能 forceKickAfterRegister: false - # 是否需要Autheme强制在正常注册后才能使用/login - forceLoginAfterRegister: false + # 是否需要Autheme注册以后直接使玩家登录 + forceLoginAfterRegister: true unrestrictions: # 在下面列出的所有id，Authme都将忽略注册和登陆。启用该选项要注意风险！ # 如果你要添加[]的括号，你必须使用' ' @@ -226,8 +226,6 @@ settings: delayJoinMessage: false # 是否需要再 login或register 后使用药水效果? applyBlindEffect: false - - ExternalBoardOptions: # MySQL column for the salt , needed for some forum/cms support mySQLColumnSalt: ''