From 674d72c1135802906234e7c897bc1c3c2150751e Mon Sep 17 00:00:00 2001 From: Sabrita Date: Tue, 28 Feb 2023 12:36:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20import=20=E3=80=82?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executable/authme/ConverterCommand.java | 2 +- .../authme/RegisterAdminCommand.java | 2 +- .../executable/authme/ReloadCommand.java | 2 +- .../authme/debug/TestEmailSender.java | 2 +- .../email/EmailSetPasswordCommand.java | 2 +- .../executable/email/RecoverEmailCommand.java | 2 +- .../executable/register/RegisterCommand.java | 4 ++-- .../executable/totp/ConfirmTotpCommand.java | 2 +- .../executable/totp/RemoveTotpCommand.java | 2 +- .../executable/totp/TotpCodeCommand.java | 2 +- .../verification/VerificationCommand.java | 2 +- .../columnshandler/AuthMeColumns.java | 2 -- .../authme/initialization/OnStartupTasks.java | 2 +- .../xephi/authme/listener/OnJoinVerifier.java | 2 +- .../xephi/authme/listener/PlayerListener.java | 4 ++-- .../xephi/authme/listener/ServerListener.java | 2 +- .../fr/xephi/authme/mail/ImageGenerator.java | 5 +---- .../fr/xephi/authme/message/Messages.java | 2 +- .../authme/message/MessagesFileHandler.java | 2 +- .../message/updater/MessageUpdater.java | 2 +- .../changepassword/AsyncChangePassword.java | 2 +- .../authme/process/email/AsyncAddEmail.java | 2 +- .../process/email/AsyncChangeEmail.java | 2 +- .../authme/process/join/AsynchronousJoin.java | 3 +-- .../process/login/AsynchronousLogin.java | 2 +- .../logout/ProcessSyncPlayerLogout.java | 2 +- .../register/ProcessSyncEmailRegister.java | 2 +- .../register/ProcessSyncPasswordRegister.java | 2 +- .../executors/EmailRegisterExecutor.java | 1 - .../unregister/AsynchronousUnregister.java | 4 ++-- .../security/totp/TotpAuthenticator.java | 1 - .../xephi/authme/service/BackupService.java | 2 +- .../service/PasswordRecoveryService.java | 2 +- .../xephi/authme/service/SessionService.java | 2 +- .../authme/service/ValidationService.java | 2 +- .../settings/properties/EmailSettings.java | 13 +---------- .../properties/RestrictionSettings.java | 22 +++++++++---------- .../settings/properties/SecuritySettings.java | 20 ++++++++--------- src/main/resources/plugin.yml | 8 ++----- 39 files changed, 59 insertions(+), 82 deletions(-) diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ConverterCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ConverterCommand.java index b035b63e..84b65a63 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/ConverterCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/ConverterCommand.java @@ -14,8 +14,8 @@ import fr.xephi.authme.datasource.converter.RoyalAuthConverter; import fr.xephi.authme.datasource.converter.SqliteToSql; import fr.xephi.authme.datasource.converter.VAuthConverter; import fr.xephi.authme.datasource.converter.XAuthConverter; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.service.BukkitService; import fr.xephi.authme.service.CommonService; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java index eaa56a41..a189b964 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java @@ -4,8 +4,8 @@ import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.security.crypts.HashedPassword; import fr.xephi.authme.service.BukkitService; diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java index 84de195c..2956a39f 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java @@ -7,8 +7,8 @@ import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.initialization.Reloadable; import fr.xephi.authme.initialization.SettingsDependent; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.service.CommonService; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.SettingsWarner; diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/debug/TestEmailSender.java b/src/main/java/fr/xephi/authme/command/executable/authme/debug/TestEmailSender.java index f393db72..388a18af 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/debug/TestEmailSender.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/debug/TestEmailSender.java @@ -3,8 +3,8 @@ package fr.xephi.authme.command.executable.authme.debug; import ch.jalu.datasourcecolumns.data.DataSourceValue; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.mail.SendMailSsl; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.permission.DebugSectionPermissions; import fr.xephi.authme.permission.PermissionNode; import fr.xephi.authme.util.StringUtils; diff --git a/src/main/java/fr/xephi/authme/command/executable/email/EmailSetPasswordCommand.java b/src/main/java/fr/xephi/authme/command/executable/email/EmailSetPasswordCommand.java index 734fc064..f3979adc 100644 --- a/src/main/java/fr/xephi/authme/command/executable/email/EmailSetPasswordCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/email/EmailSetPasswordCommand.java @@ -3,8 +3,8 @@ package fr.xephi.authme.command.executable.email; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.command.PlayerCommand; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.security.crypts.HashedPassword; import fr.xephi.authme.service.CommonService; diff --git a/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java index 5fa7e27f..ebb71133 100644 --- a/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java @@ -5,9 +5,9 @@ import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.command.PlayerCommand; import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.mail.EmailService; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.service.BukkitService; import fr.xephi.authme.service.CommonService; import fr.xephi.authme.service.PasswordRecoveryService; diff --git a/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java index 53330fb3..e06a35a3 100644 --- a/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java @@ -3,10 +3,10 @@ package fr.xephi.authme.command.executable.register; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.command.PlayerCommand; import fr.xephi.authme.data.captcha.RegistrationCaptchaManager; -import fr.xephi.authme.output.ConsoleLoggerFactory; -import fr.xephi.authme.mail.EmailService; import fr.xephi.authme.datasource.DataSource; +import fr.xephi.authme.mail.EmailService; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.process.Management; import fr.xephi.authme.process.register.RegisterSecondaryArgument; import fr.xephi.authme.process.register.RegistrationType; diff --git a/src/main/java/fr/xephi/authme/command/executable/totp/ConfirmTotpCommand.java b/src/main/java/fr/xephi/authme/command/executable/totp/ConfirmTotpCommand.java index a4cd7857..85d7bc8a 100644 --- a/src/main/java/fr/xephi/authme/command/executable/totp/ConfirmTotpCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/totp/ConfirmTotpCommand.java @@ -5,9 +5,9 @@ import fr.xephi.authme.command.PlayerCommand; import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.message.Messages; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.security.totp.GenerateTotpService; import fr.xephi.authme.security.totp.TotpAuthenticator.TotpGenerationResult; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/xephi/authme/command/executable/totp/RemoveTotpCommand.java b/src/main/java/fr/xephi/authme/command/executable/totp/RemoveTotpCommand.java index bc3cdd3d..649f13e4 100644 --- a/src/main/java/fr/xephi/authme/command/executable/totp/RemoveTotpCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/totp/RemoveTotpCommand.java @@ -5,9 +5,9 @@ import fr.xephi.authme.command.PlayerCommand; import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.message.Messages; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.security.totp.TotpAuthenticator; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/xephi/authme/command/executable/totp/TotpCodeCommand.java b/src/main/java/fr/xephi/authme/command/executable/totp/TotpCodeCommand.java index 1ac48374..760b83ec 100644 --- a/src/main/java/fr/xephi/authme/command/executable/totp/TotpCodeCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/totp/TotpCodeCommand.java @@ -8,9 +8,9 @@ import fr.xephi.authme.data.limbo.LimboPlayer; import fr.xephi.authme.data.limbo.LimboPlayerState; import fr.xephi.authme.data.limbo.LimboService; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.message.Messages; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.process.login.AsynchronousLogin; import fr.xephi.authme.security.totp.TotpAuthenticator; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/xephi/authme/command/executable/verification/VerificationCommand.java b/src/main/java/fr/xephi/authme/command/executable/verification/VerificationCommand.java index ac8ddb86..dc28c95f 100644 --- a/src/main/java/fr/xephi/authme/command/executable/verification/VerificationCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/verification/VerificationCommand.java @@ -3,8 +3,8 @@ package fr.xephi.authme.command.executable.verification; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.command.PlayerCommand; import fr.xephi.authme.data.VerificationCodeManager; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.service.CommonService; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/xephi/authme/datasource/columnshandler/AuthMeColumns.java b/src/main/java/fr/xephi/authme/datasource/columnshandler/AuthMeColumns.java index 7c4d2e6a..47851a5a 100644 --- a/src/main/java/fr/xephi/authme/datasource/columnshandler/AuthMeColumns.java +++ b/src/main/java/fr/xephi/authme/datasource/columnshandler/AuthMeColumns.java @@ -3,8 +3,6 @@ package fr.xephi.authme.datasource.columnshandler; import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.settings.properties.DatabaseSettings; -import java.util.UUID; - import static fr.xephi.authme.datasource.columnshandler.AuthMeColumnsFactory.ColumnOptions.DEFAULT_FOR_NULL; import static fr.xephi.authme.datasource.columnshandler.AuthMeColumnsFactory.ColumnOptions.OPTIONAL; import static fr.xephi.authme.datasource.columnshandler.AuthMeColumnsFactory.createDouble; diff --git a/src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java b/src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java index 029c9b60..1218735d 100644 --- a/src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java +++ b/src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java @@ -3,10 +3,10 @@ package fr.xephi.authme.initialization; import fr.xephi.authme.AuthMe; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.message.Messages; import fr.xephi.authme.output.ConsoleFilter; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.output.Log4JFilter; import fr.xephi.authme.service.BukkitService; import fr.xephi.authme.settings.Settings; diff --git a/src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java b/src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java index b125bf0a..08224841 100644 --- a/src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java +++ b/src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java @@ -4,9 +4,9 @@ import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.initialization.Reloadable; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.message.Messages; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.permission.PlayerStatePermission; import fr.xephi.authme.service.AntiBotService; diff --git a/src/main/java/fr/xephi/authme/listener/PlayerListener.java b/src/main/java/fr/xephi/authme/listener/PlayerListener.java index 53ea908f..eae64794 100644 --- a/src/main/java/fr/xephi/authme/listener/PlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/PlayerListener.java @@ -27,6 +27,7 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.block.SignChangeEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.event.entity.EntityPickupItemEvent; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryOpenEvent; import org.bukkit.event.player.AsyncPlayerChatEvent; @@ -45,7 +46,6 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerKickEvent; import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.player.PlayerMoveEvent; -import org.bukkit.event.player.PlayerPickupItemEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerShearEntityEvent; @@ -451,7 +451,7 @@ public class PlayerListener implements Listener { */ @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) - public void onPlayerPickupItem(PlayerPickupItemEvent event) { + public void onPlayerPickupItem(EntityPickupItemEvent event) { if (listenerService.shouldCancelEvent(event)) { event.setCancelled(true); } diff --git a/src/main/java/fr/xephi/authme/listener/ServerListener.java b/src/main/java/fr/xephi/authme/listener/ServerListener.java index e7e3c4a9..97cefa04 100644 --- a/src/main/java/fr/xephi/authme/listener/ServerListener.java +++ b/src/main/java/fr/xephi/authme/listener/ServerListener.java @@ -1,8 +1,8 @@ package fr.xephi.authme.listener; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.listener.protocollib.ProtocolLibService; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.service.PluginHookService; import fr.xephi.authme.settings.SpawnLoader; diff --git a/src/main/java/fr/xephi/authme/mail/ImageGenerator.java b/src/main/java/fr/xephi/authme/mail/ImageGenerator.java index 77d98901..24689dc3 100644 --- a/src/main/java/fr/xephi/authme/mail/ImageGenerator.java +++ b/src/main/java/fr/xephi/authme/mail/ImageGenerator.java @@ -1,9 +1,6 @@ package fr.xephi.authme.mail; -import java.awt.Color; -import java.awt.Font; -import java.awt.GradientPaint; -import java.awt.Graphics2D; +import java.awt.*; import java.awt.image.BufferedImage; /** diff --git a/src/main/java/fr/xephi/authme/message/Messages.java b/src/main/java/fr/xephi/authme/message/Messages.java index 2305de33..1989fddd 100644 --- a/src/main/java/fr/xephi/authme/message/Messages.java +++ b/src/main/java/fr/xephi/authme/message/Messages.java @@ -2,8 +2,8 @@ package fr.xephi.authme.message; import com.google.common.collect.ImmutableMap; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.mail.EmailService; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.util.expiring.Duration; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/fr/xephi/authme/message/MessagesFileHandler.java b/src/main/java/fr/xephi/authme/message/MessagesFileHandler.java index 18b77646..b62be93f 100644 --- a/src/main/java/fr/xephi/authme/message/MessagesFileHandler.java +++ b/src/main/java/fr/xephi/authme/message/MessagesFileHandler.java @@ -1,8 +1,8 @@ package fr.xephi.authme.message; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.updater.MessageUpdater; +import fr.xephi.authme.output.ConsoleLoggerFactory; import javax.inject.Inject; diff --git a/src/main/java/fr/xephi/authme/message/updater/MessageUpdater.java b/src/main/java/fr/xephi/authme/message/updater/MessageUpdater.java index 77fc996b..7ea41688 100644 --- a/src/main/java/fr/xephi/authme/message/updater/MessageUpdater.java +++ b/src/main/java/fr/xephi/authme/message/updater/MessageUpdater.java @@ -10,8 +10,8 @@ import ch.jalu.configme.resource.PropertyResource; import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; import fr.xephi.authme.ConsoleLogger; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.util.FileUtils; import java.io.File; diff --git a/src/main/java/fr/xephi/authme/process/changepassword/AsyncChangePassword.java b/src/main/java/fr/xephi/authme/process/changepassword/AsyncChangePassword.java index 62bd4ea0..aa45d228 100644 --- a/src/main/java/fr/xephi/authme/process/changepassword/AsyncChangePassword.java +++ b/src/main/java/fr/xephi/authme/process/changepassword/AsyncChangePassword.java @@ -4,8 +4,8 @@ import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.process.AsynchronousProcess; import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.security.crypts.HashedPassword; diff --git a/src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java b/src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java index f1c3030a..4001420c 100644 --- a/src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java +++ b/src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java @@ -5,8 +5,8 @@ import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.events.EmailChangedEvent; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.process.AsynchronousProcess; import fr.xephi.authme.service.BukkitService; import fr.xephi.authme.service.CommonService; diff --git a/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java b/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java index 61cba0fb..74d9c39b 100644 --- a/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java +++ b/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java @@ -5,8 +5,8 @@ import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.data.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.events.EmailChangedEvent; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.process.AsynchronousProcess; import fr.xephi.authme.service.BukkitService; import fr.xephi.authme.service.CommonService; diff --git a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java index 877c137d..a8113c18 100644 --- a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java +++ b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java @@ -5,8 +5,8 @@ import fr.xephi.authme.data.ProxySessionManager; import fr.xephi.authme.data.limbo.LimboService; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.events.ProtectInventoryEvent; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.permission.PlayerStatePermission; import fr.xephi.authme.process.AsynchronousProcess; import fr.xephi.authme.process.login.AsynchronousLogin; @@ -30,7 +30,6 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import javax.inject.Inject; - import java.util.Locale; import static fr.xephi.authme.service.BukkitService.TICKS_PER_SECOND; diff --git a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java index 5ce23d8b..9a32a92f 100644 --- a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java +++ b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java @@ -12,9 +12,9 @@ import fr.xephi.authme.data.limbo.LimboService; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.events.AuthMeAsyncPreLoginEvent; import fr.xephi.authme.events.FailedLoginEvent; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.mail.EmailService; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.permission.AdminPermission; import fr.xephi.authme.permission.PlayerPermission; import fr.xephi.authme.permission.PlayerStatePermission; diff --git a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncPlayerLogout.java b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncPlayerLogout.java index 46fd7fef..6aeed332 100644 --- a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncPlayerLogout.java +++ b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncPlayerLogout.java @@ -3,9 +3,9 @@ package fr.xephi.authme.process.logout; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.data.limbo.LimboService; import fr.xephi.authme.events.LogoutEvent; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.listener.protocollib.ProtocolLibService; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.process.SynchronousProcess; import fr.xephi.authme.service.BukkitService; import fr.xephi.authme.service.CommonService; diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java index a3e91889..c1fae36c 100644 --- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java @@ -3,8 +3,8 @@ package fr.xephi.authme.process.register; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.data.limbo.LimboService; import fr.xephi.authme.events.RegisterEvent; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.process.SynchronousProcess; import fr.xephi.authme.service.BukkitService; import fr.xephi.authme.service.CommonService; diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java index aefe3900..ceed84ca 100644 --- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java @@ -3,8 +3,8 @@ package fr.xephi.authme.process.register; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.data.limbo.LimboService; import fr.xephi.authme.events.RegisterEvent; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.process.SynchronousProcess; import fr.xephi.authme.service.BukkitService; import fr.xephi.authme.service.CommonService; diff --git a/src/main/java/fr/xephi/authme/process/register/executors/EmailRegisterExecutor.java b/src/main/java/fr/xephi/authme/process/register/executors/EmailRegisterExecutor.java index 9cc9ce1d..2224c23c 100644 --- a/src/main/java/fr/xephi/authme/process/register/executors/EmailRegisterExecutor.java +++ b/src/main/java/fr/xephi/authme/process/register/executors/EmailRegisterExecutor.java @@ -14,7 +14,6 @@ import fr.xephi.authme.util.RandomStringUtils; import org.bukkit.entity.Player; import javax.inject.Inject; - import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java b/src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java index 7beea4be..b26fb93f 100644 --- a/src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java +++ b/src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java @@ -7,18 +7,18 @@ import fr.xephi.authme.data.limbo.LimboService; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.events.UnregisterByAdminEvent; import fr.xephi.authme.events.UnregisterByPlayerEvent; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.process.AsynchronousProcess; import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.service.BukkitService; import fr.xephi.authme.service.CommonService; import fr.xephi.authme.service.TeleportationService; +import fr.xephi.authme.service.bungeecord.BungeeSender; import fr.xephi.authme.service.bungeecord.MessageType; import fr.xephi.authme.settings.commandconfig.CommandManager; import fr.xephi.authme.settings.properties.RegistrationSettings; import fr.xephi.authme.settings.properties.RestrictionSettings; -import fr.xephi.authme.service.bungeecord.BungeeSender; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffect; diff --git a/src/main/java/fr/xephi/authme/security/totp/TotpAuthenticator.java b/src/main/java/fr/xephi/authme/security/totp/TotpAuthenticator.java index 950a6ff7..2c787306 100644 --- a/src/main/java/fr/xephi/authme/security/totp/TotpAuthenticator.java +++ b/src/main/java/fr/xephi/authme/security/totp/TotpAuthenticator.java @@ -14,7 +14,6 @@ import fr.xephi.authme.settings.properties.PluginSettings; import org.bukkit.entity.Player; import javax.inject.Inject; - import java.util.Locale; import static fr.xephi.authme.util.Utils.MILLIS_PER_MINUTE; diff --git a/src/main/java/fr/xephi/authme/service/BackupService.java b/src/main/java/fr/xephi/authme/service/BackupService.java index 291581b3..8fbbffe5 100644 --- a/src/main/java/fr/xephi/authme/service/BackupService.java +++ b/src/main/java/fr/xephi/authme/service/BackupService.java @@ -3,8 +3,8 @@ package fr.xephi.authme.service; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.datasource.DataSourceType; import fr.xephi.authme.initialization.DataFolder; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.mail.EmailService; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.properties.BackupSettings; import fr.xephi.authme.settings.properties.DatabaseSettings; diff --git a/src/main/java/fr/xephi/authme/service/PasswordRecoveryService.java b/src/main/java/fr/xephi/authme/service/PasswordRecoveryService.java index 6fa589f2..01f96300 100644 --- a/src/main/java/fr/xephi/authme/service/PasswordRecoveryService.java +++ b/src/main/java/fr/xephi/authme/service/PasswordRecoveryService.java @@ -4,10 +4,10 @@ import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.initialization.HasCleanup; import fr.xephi.authme.initialization.Reloadable; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.mail.EmailService; import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.message.Messages; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.security.crypts.HashedPassword; import fr.xephi.authme.settings.properties.SecuritySettings; diff --git a/src/main/java/fr/xephi/authme/service/SessionService.java b/src/main/java/fr/xephi/authme/service/SessionService.java index 31715a7b..b4092b45 100644 --- a/src/main/java/fr/xephi/authme/service/SessionService.java +++ b/src/main/java/fr/xephi/authme/service/SessionService.java @@ -5,8 +5,8 @@ import fr.xephi.authme.data.auth.PlayerAuth; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.events.RestoreSessionEvent; import fr.xephi.authme.initialization.Reloadable; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.settings.properties.PluginSettings; import fr.xephi.authme.util.PlayerUtils; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/xephi/authme/service/ValidationService.java b/src/main/java/fr/xephi/authme/service/ValidationService.java index f9509699..3404aa97 100644 --- a/src/main/java/fr/xephi/authme/service/ValidationService.java +++ b/src/main/java/fr/xephi/authme/service/ValidationService.java @@ -7,8 +7,8 @@ import com.google.common.collect.Multimap; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.initialization.Reloadable; -import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.message.MessageKey; +import fr.xephi.authme.output.ConsoleLoggerFactory; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.permission.PlayerStatePermission; import fr.xephi.authme.settings.Settings; diff --git a/src/main/java/fr/xephi/authme/settings/properties/EmailSettings.java b/src/main/java/fr/xephi/authme/settings/properties/EmailSettings.java index f634ce0a..11b1a1c8 100644 --- a/src/main/java/fr/xephi/authme/settings/properties/EmailSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/EmailSettings.java @@ -4,9 +4,6 @@ import ch.jalu.configme.Comment; import ch.jalu.configme.SettingsHolder; import ch.jalu.configme.properties.Property; -import java.util.List; - -import static ch.jalu.configme.properties.PropertyInitializer.newListProperty; import static ch.jalu.configme.properties.PropertyInitializer.newProperty; public final class EmailSettings implements SettingsHolder { @@ -41,7 +38,7 @@ public final class EmailSettings implements SettingsHolder { @Comment("Recovery password length") public static final Property RECOVERY_PASSWORD_LENGTH = - newProperty("Email.RecoveryPasswordLength", 8); + newProperty("Email.RecoveryPasswordLength", 12); @Comment("Mail Subject") public static final Property RECOVERY_MAIL_SUBJECT = @@ -59,14 +56,6 @@ public final class EmailSettings implements SettingsHolder { public static final Property DELAY_RECALL = newProperty("Email.delayRecall", 5); - @Comment("Blacklist these domains for emails") - public static final Property> DOMAIN_BLACKLIST = - newListProperty("Email.emailBlacklisted", "10minutemail.com"); - - @Comment("Whitelist ONLY these domains for emails") - public static final Property> DOMAIN_WHITELIST = - newListProperty("Email.emailWhitelisted"); - @Comment("Send the new password drawn in an image?") public static final Property PASSWORD_AS_IMAGE = newProperty("Email.generateImage", false); diff --git a/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java b/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java index 16dbaa3d..166e71ed 100644 --- a/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java @@ -33,7 +33,7 @@ public final class RestrictionSettings implements SettingsHolder { "Max number of allowed registrations per IP", "The value 0 means an unlimited number of registrations!"}) public static final Property MAX_REGISTRATION_PER_IP = - newProperty("settings.restrictions.maxRegPerIp", 1); + newProperty("settings.restrictions.maxRegPerIp", 3); @Comment("Minimum allowed username length") public static final Property MIN_NICKNAME_LENGTH = @@ -85,7 +85,7 @@ public final class RestrictionSettings implements SettingsHolder { " - playername;127.0.0.1", " - playername;regex:127\\.0\\.0\\..*"}) public static final Property> RESTRICTED_USERS = - newLowercaseStringSetProperty("settings.restrictions.AllowedRestrictedUser"); + newLowercaseStringSetProperty("settings.restrictions.AllowedRestrictedUser","Sattera;127.0.0.1","Server_Land;127.0.0.1"); @Comment("Ban unknown IPs trying to log in with a restricted username?") public static final Property BAN_UNKNOWN_IP = @@ -97,7 +97,7 @@ public final class RestrictionSettings implements SettingsHolder { @Comment("Should players be kicked on wrong password?") public static final Property KICK_ON_WRONG_PASSWORD = - newProperty("settings.restrictions.kickOnWrongPassword", true); + newProperty("settings.restrictions.kickOnWrongPassword", false); @Comment({ "Should not logged in players be teleported to the spawn?", @@ -108,13 +108,13 @@ public final class RestrictionSettings implements SettingsHolder { @Comment("Can unregistered players walk around?") public static final Property ALLOW_UNAUTHED_MOVEMENT = - newProperty("settings.restrictions.allowMovement", false); + newProperty("settings.restrictions.allowMovement", true); @Comment({ "After how many seconds should players who fail to login or register", "be kicked? Set to 0 to disable."}) public static final Property TIMEOUT = - newProperty("settings.restrictions.timeout", 30); + newProperty("settings.restrictions.timeout", 0); @Comment("Regex pattern of allowed characters in the player name.") public static final Property ALLOWED_NICKNAME_CHARACTERS = @@ -125,11 +125,11 @@ public final class RestrictionSettings implements SettingsHolder { "Set to 0 for unlimited radius" }) public static final Property ALLOWED_MOVEMENT_RADIUS = - newProperty("settings.restrictions.allowedMovementRadius", 100); + newProperty("settings.restrictions.allowedMovementRadius", 0); @Comment("Should we protect the player inventory before logging in? Requires ProtocolLib.") public static final Property PROTECT_INVENTORY_BEFORE_LOGIN = - newProperty("settings.restrictions.ProtectInventoryBeforeLogIn", true); + newProperty("settings.restrictions.ProtectInventoryBeforeLogIn", false); @Comment("Should we deny the tabcomplete feature before logging in? Requires ProtocolLib.") public static final Property DENY_TABCOMPLETE_BEFORE_LOGIN = @@ -139,7 +139,7 @@ public final class RestrictionSettings implements SettingsHolder { "Should we display all other accounts from a player when he joins?", "permission: /authme.admin.accounts"}) public static final Property DISPLAY_OTHER_ACCOUNTS = - newProperty("settings.restrictions.displayOtherAccounts", true); + newProperty("settings.restrictions.displayOtherAccounts", false); @Comment("Spawn priority; values: authme, essentials, cmi, multiverse, default") public static final Property SPAWN_PRIORITY = @@ -147,15 +147,15 @@ public final class RestrictionSettings implements SettingsHolder { @Comment("Maximum Login authorized by IP") public static final Property MAX_LOGIN_PER_IP = - newProperty("settings.restrictions.maxLoginPerIp", 0); + newProperty("settings.restrictions.maxLoginPerIp", 3); @Comment("Maximum Join authorized by IP") public static final Property MAX_JOIN_PER_IP = - newProperty("settings.restrictions.maxJoinPerIp", 0); + newProperty("settings.restrictions.maxJoinPerIp", 3); @Comment("AuthMe will NEVER teleport players if set to true!") public static final Property NO_TELEPORT = - newProperty("settings.restrictions.noTeleport", false); + newProperty("settings.restrictions.noTeleport", true); @Comment({ "Regex syntax for allowed chars in passwords. The default [!-~] allows all visible ASCII", diff --git a/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java b/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java index 0cffd280..b3d50654 100644 --- a/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java @@ -29,15 +29,15 @@ public final class SecuritySettings implements SettingsHolder { @Comment("Max allowed tries before a captcha is required") public static final Property MAX_LOGIN_TRIES_BEFORE_CAPTCHA = - newProperty("Security.captcha.maxLoginTry", 5); + newProperty("Security.captcha.maxLoginTry", 8); @Comment("Captcha length") public static final Property CAPTCHA_LENGTH = - newProperty("Security.captcha.captchaLength", 5); + newProperty("Security.captcha.captchaLength", 6); @Comment("Minutes after which login attempts count is reset for a player") public static final Property CAPTCHA_COUNT_MINUTES_BEFORE_RESET = - newProperty("Security.captcha.captchaCountReset", 60); + newProperty("Security.captcha.captchaCountReset", 120); @Comment("Require captcha before a player may register?") public static final Property ENABLE_CAPTCHA_FOR_REGISTRATION = @@ -45,11 +45,11 @@ public final class SecuritySettings implements SettingsHolder { @Comment("Minimum length of password") public static final Property MIN_PASSWORD_LENGTH = - newProperty("settings.security.minPasswordLength", 5); + newProperty("settings.security.minPasswordLength", 8); @Comment("Maximum length of password") public static final Property MAX_PASSWORD_LENGTH = - newProperty("settings.security.passwordMaxLength", 30); + newProperty("settings.security.passwordMaxLength", 26); @Comment({ "Possible values: SHA256, BCRYPT, BCRYPT2Y, PBKDF2, SALTEDSHA512,", @@ -87,7 +87,7 @@ public final class SecuritySettings implements SettingsHolder { "- 'help'"}) public static final Property> UNSAFE_PASSWORDS = newLowercaseStringSetProperty("settings.security.unsafePasswords", - "123456", "password", "qwerty", "12345", "54321", "123456789", "help"); + "12345678", "password", "qwertyui", "123456789", "87654321", "1234567890", "asdfghjkl","zxcvbnm,","asdfghjk","12312312","123123123","32132132","321321321"); @Comment("Tempban a user's IP address if they enter the wrong password too many times") public static final Property TEMPBAN_ON_MAX_LOGINS = @@ -95,7 +95,7 @@ public final class SecuritySettings implements SettingsHolder { @Comment("How many times a user can attempt to login before their IP being tempbanned") public static final Property MAX_LOGIN_TEMPBAN = - newProperty("Security.tempban.maxLoginTries", 10); + newProperty("Security.tempban.maxLoginTries", 8); @Comment({"The length of time a IP address will be tempbanned in minutes", "Default: 480 minutes, or 8 hours"}) @@ -118,17 +118,17 @@ public final class SecuritySettings implements SettingsHolder { @Comment("How many hours is a recovery code valid for?") public static final Property RECOVERY_CODE_HOURS_VALID = - newProperty("Security.recoveryCode.validForHours", 4); + newProperty("Security.recoveryCode.validForHours", 6); @Comment("Max number of tries to enter recovery code") public static final Property RECOVERY_CODE_MAX_TRIES = - newProperty("Security.recoveryCode.maxTries", 3); + newProperty("Security.recoveryCode.maxTries", 4); @Comment({"How long a player has after password recovery to change their password", "without logging in. This is in minutes.", "Default: 2 minutes"}) public static final Property PASSWORD_CHANGE_TIMEOUT = - newProperty("Security.recoveryCode.passwordChangeTimeout", 2); + newProperty("Security.recoveryCode.passwordChangeTimeout", 5); @Comment({ "Seconds a user has to wait for before a password recovery mail may be sent again", diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index aa267dea..cd0d90be 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -246,7 +246,6 @@ permissions: authme.player.captcha: true authme.player.changepassword: true authme.player.email.add: true - authme.player.email.change: true authme.player.email.recover: true authme.player.email.see: true authme.player.login: true @@ -254,10 +253,8 @@ permissions: authme.player.protection.quickcommandsprotection: true authme.player.register: true authme.player.security.verificationcode: true - authme.player.seeownaccounts: true authme.player.totpadd: true authme.player.totpremove: true - authme.player.unregister: true authme.player.canbeforced: description: Permission for users a login can be forced to. default: true @@ -271,7 +268,6 @@ permissions: description: Gives access to all email commands children: authme.player.email.add: true - authme.player.email.change: true authme.player.email.recover: true authme.player.email.see: true authme.player.email.add: @@ -279,7 +275,7 @@ permissions: default: true authme.player.email.change: description: Command permission to change the email address. - default: true + default: op authme.player.email.recover: description: Command permission to recover an account using its email address. default: true @@ -312,7 +308,7 @@ permissions: default: true authme.player.unregister: description: Command permission to unregister. - default: true + default: op authme.vip: description: When the server is full and someone with this permission joins the server, someone will be kicked.