Add module-security & Move some to module-common & Fix

gradle/libs.versions.toml

@@ -1,12 +1,14 @@
 [versions]
 guava = "33.2.1-jre"
 configme = "1.3.1"
+jalu-injector = "1.0"
 adventure-api = "4.17.0"
 adventure-platform = "4.3.2"
 
 [libraries]
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 configme = { module = "ch.jalu:configme", version.ref = "configme" }
+jalu-injector = { module = "ch.jalu:injector", version.ref = "jalu-injector" }
 adventure-text-minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "adventure-api" }
 adventure-text-serializer-gson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "adventure-api" }
 adventure-platform-bukkit = { module = "net.kyori:adventure-platform-bukkit", version.ref = "adventure-platform" }

plugin/build.gradle.kts

@@ -24,6 +24,7 @@ subprojects {
         implementation(project(":project:module-configuration", "shadow"))
         implementation(project(":project:module-logger", "shadow"))
         implementation(project(":project:module-util", "shadow"))
+        implementation(project(":project:module-security", "shadow"))
         implementation(project(":project:module-common", "shadow"))
         implementation(project(":project:module-message", "shadow"))
         implementation(project(":project:module-database", "shadow"))

plugin/platform-bukkit/src/main/java/fr/xephi/authme/AuthMe.java

@@ -28,8 +28,9 @@ import fr.xephi.authme.listener.PlayerListener19Spigot;
 import fr.xephi.authme.listener.PlayerListenerHigherThan18;
 import fr.xephi.authme.listener.PurgeListener;
 import fr.xephi.authme.listener.ServerListener;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.mail.EmailService;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.security.crypts.Sha256;
 import fr.xephi.authme.service.BackupService;
 import fr.xephi.authme.service.BukkitService;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/command/executable/authme/ConverterCommand.java

@@ -3,7 +3,7 @@ package fr.xephi.authme.command.executable.authme;
 import ch.jalu.injector.factory.Factory;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSortedMap;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.datasource.converter.Converter;
 import fr.xephi.authme.datasource.converter.CrazyLoginConverter;
@@ -15,7 +15,7 @@ import fr.xephi.authme.datasource.converter.SqliteToH2;
 import fr.xephi.authme.datasource.converter.SqliteToSql;
 import fr.xephi.authme.datasource.converter.XAuthConverter;
 import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;
 import org.bukkit.command.CommandSender;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java

@@ -1,11 +1,11 @@
 package fr.xephi.authme.command.executable.authme;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.crypts.HashedPassword;
 import fr.xephi.authme.service.BukkitService;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java

@@ -2,13 +2,13 @@ package fr.xephi.authme.command.executable.authme;
 
 import ch.jalu.injector.factory.SingletonStore;
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 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.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.SettingsWarner;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/command/executable/authme/TotpDisableAdminCommand.java

@@ -1,12 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.message.Messages;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.service.BukkitService;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/command/executable/authme/UpdateHelpMessagesCommand.java

@@ -1,9 +1,9 @@
 package fr.xephi.authme.command.executable.authme;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.command.help.HelpMessagesService;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.service.HelpTranslationGenerator;
 import org.bukkit.command.CommandSender;
 

plugin/platform-bukkit/src/main/java/fr/xephi/authme/command/executable/authme/debug/DataStatistics.java

@@ -8,7 +8,7 @@ import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.HasCleanup;
 import fr.xephi.authme.initialization.Reloadable;
 import fr.xephi.authme.initialization.SettingsDependent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.DebugSectionPermissions;
 import fr.xephi.authme.permission.PermissionNode;
 import org.bukkit.ChatColor;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/command/executable/authme/debug/DebugSectionUtils.java

@@ -1,10 +1,10 @@
 package fr.xephi.authme.command.executable.authme.debug;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.datasource.CacheDataSource;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import org.bukkit.Location;
 
 import java.lang.reflect.Field;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/command/executable/authme/debug/MySqlDefaultChanger.java

@@ -2,10 +2,10 @@ package fr.xephi.authme.command.executable.authme.debug;
 
 import ch.jalu.configme.properties.Property;
 import com.google.common.annotations.VisibleForTesting;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.datasource.MySQL;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.DebugSectionPermissions;
 import fr.xephi.authme.permission.PermissionNode;
 import fr.xephi.authme.settings.Settings;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/command/executable/authme/debug/TestEmailSender.java

@@ -1,10 +1,10 @@
 package fr.xephi.authme.command.executable.authme.debug;
 
 import ch.jalu.datasourcecolumns.data.DataSourceValue;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.mail.SendMailSsl;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.DebugSectionPermissions;
 import fr.xephi.authme.permission.PermissionNode;
 import fr.xephi.authme.util.StringUtils;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/command/executable/email/EmailSetPasswordCommand.java

@@ -1,10 +1,10 @@
 package fr.xephi.authme.command.executable.email;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.crypts.HashedPassword;
 import fr.xephi.authme.service.CommonService;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java

@@ -1,13 +1,13 @@
 package fr.xephi.authme.command.executable.email;
 
 import ch.jalu.datasourcecolumns.data.DataSourceValue;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.data.auth.PlayerCache;
 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.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.service.PasswordRecoveryService;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java

@@ -1,12 +1,12 @@
 package fr.xephi.authme.command.executable.register;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.data.captcha.RegistrationCaptchaManager;
 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.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.process.Management;
 import fr.xephi.authme.process.register.RegisterSecondaryArgument;
 import fr.xephi.authme.process.register.RegistrationType;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/command/executable/totp/ConfirmTotpCommand.java

@@ -1,13 +1,13 @@
 package fr.xephi.authme.command.executable.totp;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 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.message.MessageKey;
 import fr.xephi.authme.message.Messages;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.security.totp.GenerateTotpService;
 import fr.xephi.authme.security.totp.TotpAuthenticator.TotpGenerationResult;
 import org.bukkit.entity.Player;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/command/executable/totp/RemoveTotpCommand.java

@@ -1,13 +1,13 @@
 package fr.xephi.authme.command.executable.totp;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 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.message.MessageKey;
 import fr.xephi.authme.message.Messages;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.security.totp.TotpAuthenticator;
 import org.bukkit.entity.Player;
 

plugin/platform-bukkit/src/main/java/fr/xephi/authme/command/executable/totp/TotpCodeCommand.java

@@ -1,6 +1,6 @@
 package fr.xephi.authme.command.executable.totp;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.data.auth.PlayerCache;
@@ -10,7 +10,7 @@ import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.message.Messages;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.process.login.AsynchronousLogin;
 import fr.xephi.authme.security.totp.TotpAuthenticator;
 import org.bukkit.entity.Player;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/command/executable/verification/VerificationCommand.java

@@ -1,10 +1,10 @@
 package fr.xephi.authme.command.executable.verification;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.command.PlayerCommand;
 import fr.xephi.authme.data.VerificationCodeManager;
 import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.service.CommonService;
 import org.bukkit.entity.Player;
 

plugin/platform-bukkit/src/main/java/fr/xephi/authme/data/limbo/AuthGroupHandler.java

@@ -1,8 +1,8 @@
 package fr.xephi.authme.data.limbo;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.initialization.Reloadable;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.PluginSettings;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/data/limbo/LimboService.java

@@ -1,8 +1,8 @@
 package fr.xephi.authme.data.limbo;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.limbo.persistence.LimboPersistence;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.SpawnLoader;
 import org.bukkit.Location;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/data/limbo/LimboServiceHelper.java

@@ -1,7 +1,7 @@
 package fr.xephi.authme.data.limbo;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.LimboSettings;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/data/limbo/WalkFlySpeedRestoreType.java

@@ -1,7 +1,7 @@
 package fr.xephi.authme.data.limbo;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import org.bukkit.entity.Player;
 
 /**

plugin/platform-bukkit/src/main/java/fr/xephi/authme/data/limbo/persistence/DistributedFilesPersistenceHandler.java

@@ -4,10 +4,10 @@ import com.google.common.io.Files;
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.limbo.LimboPlayer;
 import fr.xephi.authme.initialization.DataFolder;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.LimboSettings;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/data/limbo/persistence/IndividualFilesPersistenceHandler.java

@@ -3,10 +3,10 @@ package fr.xephi.authme.data.limbo.persistence;
 import com.google.common.io.Files;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.limbo.LimboPlayer;
 import fr.xephi.authme.initialization.DataFolder;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.util.FileUtils;
 import org.bukkit.entity.Player;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/data/limbo/persistence/LimboPersistence.java

@@ -1,10 +1,10 @@
 package fr.xephi.authme.data.limbo.persistence;
 
 import ch.jalu.injector.factory.Factory;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.limbo.LimboPlayer;
 import fr.xephi.authme.initialization.SettingsDependent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.LimboSettings;
 import org.bukkit.entity.Player;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java

@@ -10,10 +10,10 @@ import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.data.auth.PlayerCache;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.security.crypts.HashedPassword;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
 import fr.xephi.authme.util.Utils;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/datasource/H2.java

@@ -1,10 +1,10 @@
 package fr.xephi.authme.datasource;
 
 import com.google.common.annotations.VisibleForTesting;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.columnshandler.AuthMeColumnsHandler;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
 

plugin/platform-bukkit/src/main/java/fr/xephi/authme/datasource/MySQL.java

@@ -3,12 +3,12 @@ package fr.xephi.authme.datasource;
 import com.google.common.annotations.VisibleForTesting;
 import com.zaxxer.hikari.HikariDataSource;
 import com.zaxxer.hikari.pool.HikariPool.PoolInitializationException;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.columnshandler.AuthMeColumnsHandler;
 import fr.xephi.authme.datasource.mysqlextensions.MySqlExtension;
 import fr.xephi.authme.datasource.mysqlextensions.MySqlExtensionsFactory;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
 import fr.xephi.authme.settings.properties.HooksSettings;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/datasource/MySqlMigrater.java

@@ -1,7 +1,7 @@
 package fr.xephi.authme.datasource;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/datasource/PostgreSqlDataSource.java

@@ -3,12 +3,12 @@ package fr.xephi.authme.datasource;
 import com.google.common.annotations.VisibleForTesting;
 import com.zaxxer.hikari.HikariDataSource;
 import com.zaxxer.hikari.pool.HikariPool.PoolInitializationException;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.columnshandler.AuthMeColumnsHandler;
 import fr.xephi.authme.datasource.mysqlextensions.MySqlExtension;
 import fr.xephi.authme.datasource.mysqlextensions.MySqlExtensionsFactory;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
 import fr.xephi.authme.settings.properties.HooksSettings;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/datasource/SQLite.java

@@ -1,10 +1,10 @@
 package fr.xephi.authme.datasource;
 
 import com.google.common.annotations.VisibleForTesting;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.columnshandler.AuthMeColumnsHandler;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
 

plugin/platform-bukkit/src/main/java/fr/xephi/authme/datasource/SqLiteMigrater.java

@@ -1,8 +1,8 @@
 package fr.xephi.authme.datasource;
 
 import com.google.common.io.Files;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
 import fr.xephi.authme.util.FileUtils;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/datasource/SqlDataSourceUtils.java

@@ -1,7 +1,7 @@
 package fr.xephi.authme.datasource;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/datasource/converter/AbstractDataSourceConverter.java

@@ -1,10 +1,10 @@
 package fr.xephi.authme.datasource.converter;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.datasource.DataSourceType;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import org.bukkit.command.CommandSender;
 
 import java.util.ArrayList;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/datasource/converter/CrazyLoginConverter.java

@@ -1,10 +1,10 @@
 package fr.xephi.authme.datasource.converter;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.DataFolder;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.ConverterSettings;
 import org.bukkit.command.CommandSender;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/datasource/converter/LoginSecurityConverter.java

@@ -1,11 +1,11 @@
 package fr.xephi.authme.datasource.converter;
 
 import com.google.common.annotations.VisibleForTesting;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.DataFolder;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.ConverterSettings;
 import fr.xephi.authme.util.UuidUtils;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/datasource/converter/RoyalAuthConverter.java

@@ -1,10 +1,10 @@
 package fr.xephi.authme.datasource.converter;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.FileConfiguration;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/initialization/DataSourceProvider.java

@@ -1,7 +1,6 @@
 package fr.xephi.authme.initialization;
 
 import com.alessiodp.libby.Library;
-import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.datasource.CacheDataSource;
 import fr.xephi.authme.datasource.DataSource;
@@ -12,7 +11,8 @@ import fr.xephi.authme.datasource.MySQL;
 import fr.xephi.authme.datasource.PostgreSqlDataSource;
 import fr.xephi.authme.datasource.SQLite;
 import fr.xephi.authme.datasource.mysqlextensions.MySqlExtensionsFactory;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
@@ -82,10 +82,10 @@ public class DataSourceProvider implements Provider<DataSource> {
                 break;
             case H2:
                 Library h2 = Library.builder()
-                    .groupId("com.h2database")
+                        .groupId("com.h2database")
-                    .artifactId("h2")
+                        .artifactId("h2")
-                    .version("2.2.224")
+                        .version("2.2.224")
-                    .build();
+                        .build();
                 libraryManager.addMavenCentral();
                 libraryManager.loadLibrary(h2);
                 dataSource = new H2(settings, dataFolder);
@@ -108,7 +108,7 @@ public class DataSourceProvider implements Provider<DataSource> {
             int accounts = dataSource.getAccountsRegistered();
             if (accounts >= SQLITE_MAX_SIZE) {
                 logger.warning("YOU'RE USING THE SQLITE DATABASE WITH "
-                    + accounts + "+ ACCOUNTS; FOR BETTER PERFORMANCE, PLEASE UPGRADE TO MYSQL!!");
+                        + accounts + "+ ACCOUNTS; FOR BETTER PERFORMANCE, PLEASE UPGRADE TO MYSQL!!");
             }
         });
     }

plugin/platform-bukkit/src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java

@@ -2,13 +2,13 @@ package fr.xephi.authme.initialization;
 
 import com.github.Anon8281.universalScheduler.UniversalRunnable;
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.message.Messages;
-import fr.xephi.authme.output.ConsoleFilter;
+import fr.xephi.authme.logger.ConsoleFilter;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
-import fr.xephi.authme.output.Log4JFilter;
+import fr.xephi.authme.logger.Log4JFilter;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.DatabaseSettings;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java

@@ -1,12 +1,12 @@
 package fr.xephi.authme.listener;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.Reloadable;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.message.Messages;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.permission.PlayerStatePermission;
 import fr.xephi.authme.service.AntiBotService;

plugin/platform-bukkit/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.logger.ConsoleLogger;
 import fr.xephi.authme.listener.protocollib.ProtocolLibService;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.service.PluginHookService;
 import fr.xephi.authme.settings.SpawnLoader;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/listener/protocollib/InventoryPacketAdapter.java

@@ -25,10 +25,10 @@ import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.reflect.StructureModifier;
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.service.BukkitService;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/listener/protocollib/ProtocolLibService.java

@@ -2,11 +2,11 @@ package fr.xephi.authme.listener.protocollib;
 
 import ch.jalu.injector.annotations.NoFieldScan;
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.SettingsDependent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.PluginSettings;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/listener/protocollib/TabCompletePacketAdapter.java

@@ -7,9 +7,9 @@ import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.reflect.FieldAccessException;
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerCache;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 
 class TabCompletePacketAdapter extends PacketAdapter {
 

plugin/platform-bukkit/src/main/java/fr/xephi/authme/message/AbstractMessageFileHandler.java

@@ -1,11 +1,11 @@
 package fr.xephi.authme.message;
 
 import com.google.common.annotations.VisibleForTesting;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.configruation.Configuration;
 import fr.xephi.authme.initialization.DataFolder;
 import fr.xephi.authme.initialization.Reloadable;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.util.FileUtils;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/message/HelpMessagesFileHandler.java

@@ -1,8 +1,8 @@
 package fr.xephi.authme.message;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.configruation.Configuration;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.util.FileUtils;
 
 import javax.inject.Inject;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/message/Messages.java

@@ -1,9 +1,9 @@
 package fr.xephi.authme.message;
 
 import com.google.common.collect.ImmutableMap;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.mail.EmailService;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.util.expiring.Duration;
 import fr.xephi.authme.util.message.I18NUtils;
 import fr.xephi.authme.util.message.MiniMessageUtils;

plugin/platform-bukkit/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.logger.ConsoleLogger;
 import fr.xephi.authme.message.updater.MessageUpdater;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 
 import javax.inject.Inject;
 

plugin/platform-bukkit/src/main/java/fr/xephi/authme/message/updater/JarMessageSource.java

@@ -2,8 +2,8 @@ package fr.xephi.authme.message.updater;
 
 import ch.jalu.configme.properties.Property;
 import ch.jalu.configme.resource.PropertyReader;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.util.FileUtils;
 
 import java.io.IOException;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/message/updater/MessageUpdater.java

@@ -9,9 +9,9 @@ import ch.jalu.configme.resource.PropertyReader;
 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.logger.ConsoleLogger;
 import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.util.FileUtils;
 
 import java.io.File;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/permission/PermissionsManager.java

@@ -1,10 +1,10 @@
 package fr.xephi.authme.permission;
 
 import com.google.common.annotations.VisibleForTesting;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.limbo.UserGroup;
 import fr.xephi.authme.initialization.Reloadable;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.handlers.LuckPermsHandler;
 import fr.xephi.authme.permission.handlers.PermissionHandler;
 import fr.xephi.authme.permission.handlers.PermissionHandlerException;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/permission/handlers/LuckPermsHandler.java

@@ -1,8 +1,8 @@
 package fr.xephi.authme.permission.handlers;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.limbo.UserGroup;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.PermissionNode;
 import fr.xephi.authme.permission.PermissionsSystemType;
 import net.luckperms.api.LuckPerms;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/process/changepassword/AsyncChangePassword.java

@@ -1,11 +1,11 @@
 package fr.xephi.authme.process.changepassword;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.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.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.crypts.HashedPassword;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java

@@ -1,12 +1,12 @@
 package fr.xephi.authme.process.email;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.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.events.EmailChangedEvent;
 import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java

@@ -1,12 +1,12 @@
 package fr.xephi.authme.process.email;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.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.events.EmailChangedEvent;
 import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java

@@ -1,12 +1,12 @@
 package fr.xephi.authme.process.join;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 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.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.PlayerStatePermission;
 import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.process.login.AsynchronousLogin;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java

@@ -1,7 +1,7 @@
 package fr.xephi.authme.process.login;
 
 import com.google.common.annotations.VisibleForTesting;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.TempbanManager;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.data.auth.PlayerCache;
@@ -14,7 +14,7 @@ import fr.xephi.authme.events.AuthMeAsyncPreLoginEvent;
 import fr.xephi.authme.events.FailedLoginEvent;
 import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.AdminPermission;
 import fr.xephi.authme.permission.PlayerPermission;
 import fr.xephi.authme.permission.PlayerStatePermission;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/process/logout/ProcessSyncPlayerLogout.java

@@ -1,11 +1,11 @@
 package fr.xephi.authme.process.logout;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.events.LogoutEvent;
 import fr.xephi.authme.listener.protocollib.ProtocolLibService;
 import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.process.SynchronousProcess;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java

@@ -1,10 +1,10 @@
 package fr.xephi.authme.process.register;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.events.RegisterEvent;
 import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.process.SynchronousProcess;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java

@@ -1,10 +1,10 @@
 package fr.xephi.authme.process.register;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.events.RegisterEvent;
 import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.process.SynchronousProcess;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.CommonService;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java

@@ -1,6 +1,6 @@
 package fr.xephi.authme.process.unregister;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.data.limbo.LimboService;
@@ -8,7 +8,7 @@ import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.events.UnregisterByAdminEvent;
 import fr.xephi.authme.events.UnregisterByPlayerEvent;
 import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.service.BukkitService;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/service/BackupService.java

@@ -1,10 +1,10 @@
 package fr.xephi.authme.service;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSourceType;
 import fr.xephi.authme.initialization.DataFolder;
 import fr.xephi.authme.mail.EmailService;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.BackupSettings;
 import fr.xephi.authme.settings.properties.DatabaseSettings;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/service/GeoIpService.java

@@ -7,9 +7,9 @@ import com.maxmind.db.Reader.FileMode;
 import com.maxmind.db.cache.CHMCache;
 import com.maxmind.db.model.Country;
 import com.maxmind.db.model.CountryResponse;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.initialization.DataFolder;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.util.InternetProtocolUtils;
 
 import javax.inject.Inject;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/service/MigrationService.java

@@ -1,9 +1,9 @@
 package fr.xephi.authme.service;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.security.HashAlgorithm;
 import fr.xephi.authme.security.crypts.HashedPassword;
 import fr.xephi.authme.security.crypts.Sha256;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/service/PasswordRecoveryService.java

@@ -1,13 +1,13 @@
 package fr.xephi.authme.service;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.HasCleanup;
 import fr.xephi.authme.initialization.Reloadable;
 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.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.crypts.HashedPassword;
 import fr.xephi.authme.settings.properties.SecuritySettings;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/service/PluginHookService.java

@@ -4,8 +4,8 @@ import ch.jalu.injector.annotations.NoFieldScan;
 import com.earth2me.essentials.Essentials;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/service/SessionService.java

@@ -1,12 +1,12 @@
 package fr.xephi.authme.service;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 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.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.util.PlayerUtils;
 import org.bukkit.entity.Player;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/service/TeleportationService.java

@@ -1,6 +1,6 @@
 package fr.xephi.authme.service;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.data.limbo.LimboPlayer;
@@ -10,7 +10,7 @@ import fr.xephi.authme.events.AuthMeTeleportEvent;
 import fr.xephi.authme.events.FirstSpawnTeleportEvent;
 import fr.xephi.authme.events.SpawnTeleportEvent;
 import fr.xephi.authme.initialization.Reloadable;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.SpawnLoader;
 import fr.xephi.authme.settings.properties.RestrictionSettings;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/service/ValidationService.java

@@ -4,11 +4,11 @@ import ch.jalu.configme.properties.Property;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.Reloadable;
 import fr.xephi.authme.message.MessageKey;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.permission.PlayerStatePermission;
 import fr.xephi.authme.security.HashUtils;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/service/bungeecord/BungeeReceiver.java

@@ -3,10 +3,10 @@ package fr.xephi.authme.service.bungeecord;
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.ProxySessionManager;
 import fr.xephi.authme.initialization.SettingsDependent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.process.Management;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.settings.Settings;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/service/bungeecord/BungeeSender.java

@@ -3,9 +3,9 @@ package fr.xephi.authme.service.bungeecord;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.initialization.SettingsDependent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.HooksSettings;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/service/velocity/VelocityReceiver.java

@@ -3,10 +3,10 @@ package fr.xephi.authme.service.velocity;
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.data.ProxySessionManager;
 import fr.xephi.authme.initialization.SettingsDependent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.process.Management;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.settings.Settings;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/service/velocity/VelocitySender.java

@@ -3,9 +3,9 @@ package fr.xephi.authme.service.velocity;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.initialization.SettingsDependent;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.bungeecord.MessageType;
 import fr.xephi.authme.settings.Settings;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java

@@ -5,11 +5,11 @@ import ch.jalu.configme.migration.PlainMigrationService;
 import ch.jalu.configme.properties.Property;
 import ch.jalu.configme.properties.convertresult.PropertyValue;
 import ch.jalu.configme.resource.PropertyReader;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSourceType;
 import fr.xephi.authme.initialization.DataFolder;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
-import fr.xephi.authme.output.LogLevel;
+import fr.xephi.authme.logger.LogLevel;
 import fr.xephi.authme.process.register.RegisterSecondaryArgument;
 import fr.xephi.authme.process.register.RegistrationType;
 import fr.xephi.authme.security.HashAlgorithm;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/settings/SettingsWarner.java

@@ -1,8 +1,8 @@
 package fr.xephi.authme.settings;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.security.HashAlgorithm;
 import fr.xephi.authme.security.crypts.Argon2;
 import fr.xephi.authme.service.BukkitService;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/settings/SpawnLoader.java

@@ -1,9 +1,9 @@
 package fr.xephi.authme.settings;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.initialization.DataFolder;
 import fr.xephi.authme.initialization.Reloadable;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.service.PluginHookService;
 import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/settings/properties/AuthMeSettingsRetriever.java

@@ -20,9 +20,9 @@ public final class AuthMeSettingsRetriever {
      */
     public static ConfigurationData buildConfigurationData() {
         return ConfigurationDataBuilder.createConfiguration(
-            DatabaseSettings.class,  PluginSettings.class,    RestrictionSettings.class,
+                DatabaseSettings.class, PluginSettings.class, RestrictionSettings.class,
-            EmailSettings.class,     HooksSettings.class,     ProtectionSettings.class,
+                EmailSettings.class, HooksSettings.class, ProtectionSettings.class,
-            PurgeSettings.class,     SecuritySettings.class,  RegistrationSettings.class,
+                PurgeSettings.class, SecuritySettings.class, RegistrationSettings.class,
-            LimboSettings.class,     BackupSettings.class,    ConverterSettings.class);
+                LimboSettings.class, BackupSettings.class, ConverterSettings.class);
     }
 }

plugin/platform-bukkit/src/main/java/fr/xephi/authme/settings/properties/ConverterSettings.java

@@ -8,29 +8,30 @@ import ch.jalu.configme.properties.Property;
 import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
 
 public final class ConverterSettings implements SettingsHolder {
+
     @Comment("CrazyLogin database file name")
     public static final Property<String> CRAZYLOGIN_FILE_NAME =
-        newProperty("Converter.CrazyLogin.fileName", "accounts.db");
+            newProperty("Converter.CrazyLogin.fileName", "accounts.db");
 
     @Comment("LoginSecurity: convert from SQLite; if false we use MySQL")
     public static final Property<Boolean> LOGINSECURITY_USE_SQLITE =
-        newProperty("Converter.loginSecurity.useSqlite", true);
+            newProperty("Converter.loginSecurity.useSqlite", true);
 
     @Comment("LoginSecurity MySQL: database host")
     public static final Property<String> LOGINSECURITY_MYSQL_HOST =
-        newProperty("Converter.loginSecurity.mySql.host", "");
+            newProperty("Converter.loginSecurity.mySql.host", "");
 
     @Comment("LoginSecurity MySQL: database name")
     public static final Property<String> LOGINSECURITY_MYSQL_DATABASE =
-        newProperty("Converter.loginSecurity.mySql.database", "");
+            newProperty("Converter.loginSecurity.mySql.database", "");
 
     @Comment("LoginSecurity MySQL: database user")
     public static final Property<String> LOGINSECURITY_MYSQL_USER =
-        newProperty("Converter.loginSecurity.mySql.user", "");
+            newProperty("Converter.loginSecurity.mySql.user", "");
 
     @Comment("LoginSecurity MySQL: password for database user")
     public static final Property<String> LOGINSECURITY_MYSQL_PASSWORD =
-        newProperty("Converter.loginSecurity.mySql.password", "");
+            newProperty("Converter.loginSecurity.mySql.password", "");
 
     private ConverterSettings() {
     }
@@ -38,6 +39,6 @@ public final class ConverterSettings implements SettingsHolder {
     @Override
     public void registerComments(CommentsConfiguration conf) {
         conf.setComment("Converter",
-            "Converter settings: see https://github.com/AuthMe/AuthMeReloaded/wiki/Converters");
+                "Converter settings: see https://github.com/AuthMe/AuthMeReloaded/wiki/Converters");
     }
 }

plugin/platform-bukkit/src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java

@@ -10,161 +10,161 @@ import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
 public final class DatabaseSettings implements SettingsHolder {
 
     @Comment({"What type of database do you want to use?",
-        "Valid values: H2, SQLITE, MARIADB, MYSQL, POSTGRESQL"})
+            "Valid values: H2, SQLITE, MARIADB, MYSQL, POSTGRESQL"})
     public static final Property<DataSourceType> BACKEND =
-        newProperty(DataSourceType.class, "DataSource.backend", DataSourceType.SQLITE);
+            newProperty(DataSourceType.class, "DataSource.backend", DataSourceType.SQLITE);
 
     @Comment({"Enable the database caching system, should be disabled on bungeecord environments",
-        "or when a website integration is being used."})
+            "or when a website integration is being used."})
     public static final Property<Boolean> USE_CACHING =
-        newProperty("DataSource.caching", true);
+            newProperty("DataSource.caching", true);
 
     @Comment("Should we try to use VirtualThreads(Java 21+) for database cache loader?")
     public static final Property<Boolean> USE_VIRTUAL_THREADS =
-        newProperty("DataSource.useVirtualThreadsCache", false);
+            newProperty("DataSource.useVirtualThreadsCache", false);
 
     @Comment("Database host address")
     public static final Property<String> MYSQL_HOST =
-        newProperty("DataSource.mySQLHost", "127.0.0.1");
+            newProperty("DataSource.mySQLHost", "127.0.0.1");
 
     @Comment("Database port")
     public static final Property<String> MYSQL_PORT =
-        newProperty("DataSource.mySQLPort", "3306");
+            newProperty("DataSource.mySQLPort", "3306");
 
     @Comment({"Replacement of Mysql's useSsl (for MariaDB only).",
-        "- disable: No SSL",
+            "- disable: No SSL",
-        "- trust: Trust blindly (no validation)",
+            "- trust: Trust blindly (no validation)",
-        "- verify_ca:  Encryption, certificates validation, BUT no hostname verification",
+            "- verify_ca:  Encryption, certificates validation, BUT no hostname verification",
-        "- verify_full: Encryption, certificate validation and hostname validation",
+            "- verify_full: Encryption, certificate validation and hostname validation",
-        "Read more: https://bit.ly/mariadb-sslmode"})
+            "Read more: https://bit.ly/mariadb-sslmode"})
     public static final Property<String> MARIADB_SSL_MODE =
-        newProperty("DataSource.MariaDbSslMode", "disabled");
+            newProperty("DataSource.MariaDbSslMode", "disabled");
 
     @Comment({"Connect to MySQL database over SSL",
-        "If you're using MariaDB, use sslMode instead"})
+            "If you're using MariaDB, use sslMode instead"})
     public static final Property<Boolean> MYSQL_USE_SSL =
-        newProperty("DataSource.mySQLUseSSL", true);
+            newProperty("DataSource.mySQLUseSSL", true);
 
     @Comment({"Verification of server's certificate.",
-        "We would not recommend to set this option to false.",
+            "We would not recommend to set this option to false.",
-        "Set this option to false at your own risk if and only if you know what you're doing"})
+            "Set this option to false at your own risk if and only if you know what you're doing"})
     public static final Property<Boolean> MYSQL_CHECK_SERVER_CERTIFICATE =
-        newProperty( "DataSource.mySQLCheckServerCertificate", true);
+            newProperty("DataSource.mySQLCheckServerCertificate", true);
 
     @Comment({"Authorize client to retrieve RSA server public key.",
-        "Advanced option, ignore if you don't know what it means.",
+            "Advanced option, ignore if you don't know what it means.",
-        "If you are using MariaDB, use MariaDbSslMode instead."})
+            "If you are using MariaDB, use MariaDbSslMode instead."})
     public static final Property<Boolean> MYSQL_ALLOW_PUBLIC_KEY_RETRIEVAL =
-        newProperty( "DataSource.mySQLAllowPublicKeyRetrieval", true);
+            newProperty("DataSource.mySQLAllowPublicKeyRetrieval", true);
 
     @Comment("Username to connect to the MySQL database")
     public static final Property<String> MYSQL_USERNAME =
-        newProperty("DataSource.mySQLUsername", "authme");
+            newProperty("DataSource.mySQLUsername", "authme");
 
     @Comment("Password to connect to the MySQL database")
     public static final Property<String> MYSQL_PASSWORD =
-        newProperty("DataSource.mySQLPassword", "12345");
+            newProperty("DataSource.mySQLPassword", "12345");
 
     @Comment("Database Name, use with converters or as SQLITE database name")
     public static final Property<String> MYSQL_DATABASE =
-        newProperty("DataSource.mySQLDatabase", "authme");
+            newProperty("DataSource.mySQLDatabase", "authme");
 
     @Comment("Table of the database")
     public static final Property<String> MYSQL_TABLE =
-        newProperty("DataSource.mySQLTablename", "authme");
+            newProperty("DataSource.mySQLTablename", "authme");
 
     @Comment("Column of IDs to sort data")
     public static final Property<String> MYSQL_COL_ID =
-        newProperty("DataSource.mySQLColumnId", "id");
+            newProperty("DataSource.mySQLColumnId", "id");
 
     @Comment("Column for storing or checking players nickname")
     public static final Property<String> MYSQL_COL_NAME =
-        newProperty("DataSource.mySQLColumnName", "username");
+            newProperty("DataSource.mySQLColumnName", "username");
 
     @Comment("Column for storing or checking players RealName")
     public static final Property<String> MYSQL_COL_REALNAME =
-        newProperty("DataSource.mySQLRealName", "realname");
+            newProperty("DataSource.mySQLRealName", "realname");
 
     @Comment("Column for storing players passwords")
     public static final Property<String> MYSQL_COL_PASSWORD =
-        newProperty("DataSource.mySQLColumnPassword", "password");
+            newProperty("DataSource.mySQLColumnPassword", "password");
 
     @Comment("Column for storing players passwords salts")
     public static final Property<String> MYSQL_COL_SALT =
-        newProperty("DataSource.mySQLColumnSalt", "");
+            newProperty("DataSource.mySQLColumnSalt", "");
 
     @Comment("Column for storing players emails")
     public static final Property<String> MYSQL_COL_EMAIL =
-        newProperty("DataSource.mySQLColumnEmail", "email");
+            newProperty("DataSource.mySQLColumnEmail", "email");
 
     @Comment("Column for storing if a player is logged in or not")
     public static final Property<String> MYSQL_COL_ISLOGGED =
-        newProperty("DataSource.mySQLColumnLogged", "isLogged");
+            newProperty("DataSource.mySQLColumnLogged", "isLogged");
 
     @Comment("Column for storing if a player has a valid session or not")
     public static final Property<String> MYSQL_COL_HASSESSION =
-        newProperty("DataSource.mySQLColumnHasSession", "hasSession");
+            newProperty("DataSource.mySQLColumnHasSession", "hasSession");
 
     @Comment("Column for storing a player's TOTP key (for two-factor authentication)")
     public static final Property<String> MYSQL_COL_TOTP_KEY =
-        newProperty("DataSource.mySQLtotpKey", "totp");
+            newProperty("DataSource.mySQLtotpKey", "totp");
 
     @Comment("Column for storing the player's last IP")
     public static final Property<String> MYSQL_COL_LAST_IP =
-        newProperty("DataSource.mySQLColumnIp", "ip");
+            newProperty("DataSource.mySQLColumnIp", "ip");
 
     @Comment("Column for storing players lastlogins")
     public static final Property<String> MYSQL_COL_LASTLOGIN =
-        newProperty("DataSource.mySQLColumnLastLogin", "lastlogin");
+            newProperty("DataSource.mySQLColumnLastLogin", "lastlogin");
 
     @Comment("Column storing the registration date")
     public static final Property<String> MYSQL_COL_REGISTER_DATE =
-        newProperty("DataSource.mySQLColumnRegisterDate", "regdate");
+            newProperty("DataSource.mySQLColumnRegisterDate", "regdate");
 
     @Comment("Column for storing the IP address at the time of registration")
     public static final Property<String> MYSQL_COL_REGISTER_IP =
-        newProperty("DataSource.mySQLColumnRegisterIp", "regip");
+            newProperty("DataSource.mySQLColumnRegisterIp", "regip");
 
     @Comment("Column for storing player LastLocation - X")
     public static final Property<String> MYSQL_COL_LASTLOC_X =
-        newProperty("DataSource.mySQLlastlocX", "x");
+            newProperty("DataSource.mySQLlastlocX", "x");
 
     @Comment("Column for storing player LastLocation - Y")
     public static final Property<String> MYSQL_COL_LASTLOC_Y =
-        newProperty("DataSource.mySQLlastlocY", "y");
+            newProperty("DataSource.mySQLlastlocY", "y");
 
     @Comment("Column for storing player LastLocation - Z")
     public static final Property<String> MYSQL_COL_LASTLOC_Z =
-        newProperty("DataSource.mySQLlastlocZ", "z");
+            newProperty("DataSource.mySQLlastlocZ", "z");
 
     @Comment("Column for storing player LastLocation - World Name")
     public static final Property<String> MYSQL_COL_LASTLOC_WORLD =
-        newProperty("DataSource.mySQLlastlocWorld", "world");
+            newProperty("DataSource.mySQLlastlocWorld", "world");
 
     @Comment("Column for storing player LastLocation - Yaw")
     public static final Property<String> MYSQL_COL_LASTLOC_YAW =
-        newProperty("DataSource.mySQLlastlocYaw", "yaw");
+            newProperty("DataSource.mySQLlastlocYaw", "yaw");
 
     @Comment("Column for storing player LastLocation - Pitch")
     public static final Property<String> MYSQL_COL_LASTLOC_PITCH =
-        newProperty("DataSource.mySQLlastlocPitch", "pitch");
+            newProperty("DataSource.mySQLlastlocPitch", "pitch");
 
     @Comment("Column for storing players uuids (optional)")
     public static final Property<String> MYSQL_COL_PLAYER_UUID =
-        newProperty( "DataSource.mySQLPlayerUUID", "" );
+            newProperty("DataSource.mySQLPlayerUUID", "");
 
     @Comment("Column for storing players groups")
     public static final Property<String> MYSQL_COL_GROUP =
-        newProperty("ExternalBoardOptions.mySQLColumnGroup", "");
+            newProperty("ExternalBoardOptions.mySQLColumnGroup", "");
 
     @Comment("Overrides the size of the DB Connection Pool, default = 10")
     public static final Property<Integer> MYSQL_POOL_SIZE =
-        newProperty("DataSource.poolSize", 10);
+            newProperty("DataSource.poolSize", 10);
 
     @Comment({"The maximum lifetime of a connection in the pool, default = 1800 seconds",
-        "You should set this at least 30 seconds less than mysql server wait_timeout"})
+            "You should set this at least 30 seconds less than mysql server wait_timeout"})
     public static final Property<Integer> MYSQL_CONNECTION_MAX_LIFETIME =
-        newProperty("DataSource.maxLifetime", 1800);
+            newProperty("DataSource.maxLifetime", 1800);
 
     private DatabaseSettings() {
     }

plugin/platform-bukkit/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java

@@ -13,86 +13,86 @@ public final class HooksSettings implements SettingsHolder {
 
     @Comment("Do we need to hook with multiverse for spawn checking?")
     public static final Property<Boolean> MULTIVERSE =
-        newProperty("Hooks.multiverse", true);
+            newProperty("Hooks.multiverse", true);
 
     @Comment("Do we need to hook with BungeeCord?")
     public static final Property<Boolean> BUNGEECORD =
-        newProperty("Hooks.bungeecord", false);
+            newProperty("Hooks.bungeecord", false);
     @Comment("Do we need to hook with Velocity?")
     public static final Property<Boolean> VELOCITY =
-        newProperty("Hooks.velocity", false);
+            newProperty("Hooks.velocity", false);
 
     @Comment({"How many ticks should we wait before sending login info to proxy?",
-        "Change this to higher if your player has high ping.",
+            "Change this to higher if your player has high ping.",
-        "See: https://www.spigotmc.org/wiki/bukkit-bungee-plugin-messaging-channel/"})
+            "See: https://www.spigotmc.org/wiki/bukkit-bungee-plugin-messaging-channel/"})
     public static final Property<Long> PROXY_SEND_DELAY =
-        newProperty("Hooks.proxySendDelay", 10L);
+            newProperty("Hooks.proxySendDelay", 10L);
 
     @Comment({"Hook into floodgate.",
-        "This must be true if you want to use other bedrock features."
+            "This must be true if you want to use other bedrock features."
     })
     public static final Property<Boolean> HOOK_FLOODGATE_PLAYER =
-        newProperty("Hooks.floodgate", false);
+            newProperty("Hooks.floodgate", false);
 
     @Comment("Allow bedrock players join without check isValidName?")
     public static final Property<Boolean> IGNORE_BEDROCK_NAME_CHECK =
-        newProperty("Hooks.ignoreBedrockNameCheck", true);
+            newProperty("Hooks.ignoreBedrockNameCheck", true);
 
 
     @Comment("Send player to this BungeeCord server after register/login")
     public static final Property<String> BUNGEECORD_SERVER =
-        newProperty("Hooks.sendPlayerTo", "");
+            newProperty("Hooks.sendPlayerTo", "");
 
     @Comment("Do we need to disable Essentials SocialSpy on join?")
     public static final Property<Boolean> DISABLE_SOCIAL_SPY =
-        newProperty("Hooks.disableSocialSpy", false);
+            newProperty("Hooks.disableSocialSpy", false);
 
     @Comment("Do we need to force /motd Essentials command on join?")
     public static final Property<Boolean> USE_ESSENTIALS_MOTD =
-        newProperty("Hooks.useEssentialsMotd", false);
+            newProperty("Hooks.useEssentialsMotd", false);
 
     @Comment({
-        "-1 means disabled. If you want that only activated players",
+            "-1 means disabled. If you want that only activated players",
-        "can log into your server, you can set here the group number",
+            "can log into your server, you can set here the group number",
-        "of unactivated users, needed for some forum/CMS support"})
+            "of unactivated users, needed for some forum/CMS support"})
     public static final Property<Integer> NON_ACTIVATED_USERS_GROUP =
-        newProperty("ExternalBoardOptions.nonActivedUserGroup", -1);
+            newProperty("ExternalBoardOptions.nonActivedUserGroup", -1);
 
     @Comment("Other MySQL columns where we need to put the username (case-sensitive)")
     public static final Property<List<String>> MYSQL_OTHER_USERNAME_COLS =
-        newListProperty("ExternalBoardOptions.mySQLOtherUsernameColumns");
+            newListProperty("ExternalBoardOptions.mySQLOtherUsernameColumns");
 
     @Comment("How much log2 rounds needed in BCrypt (do not change if you do not know what it does)")
     public static final Property<Integer> BCRYPT_LOG2_ROUND =
-        newProperty("ExternalBoardOptions.bCryptLog2Round", 12);
+            newProperty("ExternalBoardOptions.bCryptLog2Round", 12);
 
     @Comment("phpBB table prefix defined during the phpBB installation process")
     public static final Property<String> PHPBB_TABLE_PREFIX =
-        newProperty("ExternalBoardOptions.phpbbTablePrefix", "phpbb_");
+            newProperty("ExternalBoardOptions.phpbbTablePrefix", "phpbb_");
 
     @Comment("phpBB activated group ID; 2 is the default registered group defined by phpBB")
     public static final Property<Integer> PHPBB_ACTIVATED_GROUP_ID =
-        newProperty("ExternalBoardOptions.phpbbActivatedGroupId", 2);
+            newProperty("ExternalBoardOptions.phpbbActivatedGroupId", 2);
 
     @Comment("IP Board table prefix defined during the IP Board installation process")
     public static final Property<String> IPB_TABLE_PREFIX =
-        newProperty("ExternalBoardOptions.IPBTablePrefix", "ipb_");
+            newProperty("ExternalBoardOptions.IPBTablePrefix", "ipb_");
 
     @Comment("IP Board default group ID; 3 is the default registered group defined by IP Board")
     public static final Property<Integer> IPB_ACTIVATED_GROUP_ID =
-        newProperty("ExternalBoardOptions.IPBActivatedGroupId", 3);
+            newProperty("ExternalBoardOptions.IPBActivatedGroupId", 3);
 
     @Comment("Xenforo table prefix defined during the Xenforo installation process")
     public static final Property<String> XF_TABLE_PREFIX =
-        newProperty("ExternalBoardOptions.XFTablePrefix", "xf_");
+            newProperty("ExternalBoardOptions.XFTablePrefix", "xf_");
 
     @Comment("XenForo default group ID; 2 is the default registered group defined by Xenforo")
     public static final Property<Integer> XF_ACTIVATED_GROUP_ID =
-        newProperty("ExternalBoardOptions.XFActivatedGroupId", 2);
+            newProperty("ExternalBoardOptions.XFActivatedGroupId", 2);
 
     @Comment("Wordpress prefix defined during WordPress installation")
     public static final Property<String> WORDPRESS_TABLE_PREFIX =
-        newProperty("ExternalBoardOptions.wordpressTablePrefix", "wp_");
+            newProperty("ExternalBoardOptions.wordpressTablePrefix", "wp_");
 
 
     private HooksSettings() {

plugin/platform-bukkit/src/main/java/fr/xephi/authme/settings/properties/LimboSettings.java

@@ -17,54 +17,54 @@ import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
 public final class LimboSettings implements SettingsHolder {
 
     @Comment({
-        "Besides storing the data in memory, you can define if/how the data should be persisted",
+            "Besides storing the data in memory, you can define if/how the data should be persisted",
-        "on disk. This is useful in case of a server crash, so next time the server starts we can",
+            "on disk. This is useful in case of a server crash, so next time the server starts we can",
-        "properly restore things like OP status, ability to fly, and walk/fly speed.",
+            "properly restore things like OP status, ability to fly, and walk/fly speed.",
-        "DISABLED: no disk storage,",
+            "DISABLED: no disk storage,",
-        "INDIVIDUAL_FILES: each player data in its own file,",
+            "INDIVIDUAL_FILES: each player data in its own file,",
-        "DISTRIBUTED_FILES: distributes players into different files based on their UUID, see below"
+            "DISTRIBUTED_FILES: distributes players into different files based on their UUID, see below"
     })
     public static final Property<LimboPersistenceType> LIMBO_PERSISTENCE_TYPE =
-        newProperty(LimboPersistenceType.class, "limbo.persistence.type", LimboPersistenceType.INDIVIDUAL_FILES);
+            newProperty(LimboPersistenceType.class, "limbo.persistence.type", LimboPersistenceType.INDIVIDUAL_FILES);
 
     @Comment({
-        "This setting only affects DISTRIBUTED_FILES persistence. The distributed file",
+            "This setting only affects DISTRIBUTED_FILES persistence. The distributed file",
-        "persistence attempts to reduce the number of files by distributing players into various",
+            "persistence attempts to reduce the number of files by distributing players into various",
-        "buckets based on their UUID. This setting defines into how many files the players should",
+            "buckets based on their UUID. This setting defines into how many files the players should",
-        "be distributed. Possible values: ONE, FOUR, EIGHT, SIXTEEN, THIRTY_TWO, SIXTY_FOUR,",
+            "be distributed. Possible values: ONE, FOUR, EIGHT, SIXTEEN, THIRTY_TWO, SIXTY_FOUR,",
-        "ONE_TWENTY for 128, TWO_FIFTY for 256.",
+            "ONE_TWENTY for 128, TWO_FIFTY for 256.",
-        "For example, if you expect 100 non-logged in players, setting to SIXTEEN will average",
+            "For example, if you expect 100 non-logged in players, setting to SIXTEEN will average",
-        "6.25 players per file (100 / 16).",
+            "6.25 players per file (100 / 16).",
-        "Note: if you change this setting all data will be migrated. If you have a lot of data,",
+            "Note: if you change this setting all data will be migrated. If you have a lot of data,",
-        "change this setting only on server restart, not with /authme reload."
+            "change this setting only on server restart, not with /authme reload."
     })
     public static final Property<SegmentSize> DISTRIBUTION_SIZE =
-        newProperty(SegmentSize.class, "limbo.persistence.distributionSize", SegmentSize.SIXTEEN);
+            newProperty(SegmentSize.class, "limbo.persistence.distributionSize", SegmentSize.SIXTEEN);
 
     @Comment({
-        "Whether the player is allowed to fly: RESTORE, ENABLE, DISABLE, NOTHING.",
+            "Whether the player is allowed to fly: RESTORE, ENABLE, DISABLE, NOTHING.",
-        "RESTORE sets back the old property from the player. NOTHING will prevent AuthMe",
+            "RESTORE sets back the old property from the player. NOTHING will prevent AuthMe",
-        "from modifying the 'allow flight' property on the player."
+            "from modifying the 'allow flight' property on the player."
     })
     public static final Property<AllowFlightRestoreType> RESTORE_ALLOW_FLIGHT =
-        newProperty(AllowFlightRestoreType.class, "limbo.restoreAllowFlight", AllowFlightRestoreType.RESTORE);
+            newProperty(AllowFlightRestoreType.class, "limbo.restoreAllowFlight", AllowFlightRestoreType.RESTORE);
 
     @Comment({
-        "Restore fly speed: RESTORE, DEFAULT, MAX_RESTORE, RESTORE_NO_ZERO.",
+            "Restore fly speed: RESTORE, DEFAULT, MAX_RESTORE, RESTORE_NO_ZERO.",
-        "RESTORE: restore the speed the player had;",
+            "RESTORE: restore the speed the player had;",
-        "DEFAULT: always set to default speed;",
+            "DEFAULT: always set to default speed;",
-        "MAX_RESTORE: take the maximum of the player's current speed and the previous one",
+            "MAX_RESTORE: take the maximum of the player's current speed and the previous one",
-        "RESTORE_NO_ZERO: Like 'restore' but sets speed to default if the player's speed was 0"
+            "RESTORE_NO_ZERO: Like 'restore' but sets speed to default if the player's speed was 0"
     })
     public static final Property<WalkFlySpeedRestoreType> RESTORE_FLY_SPEED =
-        newProperty(WalkFlySpeedRestoreType.class, "limbo.restoreFlySpeed", WalkFlySpeedRestoreType.RESTORE_NO_ZERO);
+            newProperty(WalkFlySpeedRestoreType.class, "limbo.restoreFlySpeed", WalkFlySpeedRestoreType.RESTORE_NO_ZERO);
 
     @Comment({
-        "Restore walk speed: RESTORE, DEFAULT, MAX_RESTORE, RESTORE_NO_ZERO.",
+            "Restore walk speed: RESTORE, DEFAULT, MAX_RESTORE, RESTORE_NO_ZERO.",
-        "See above for a description of the values."
+            "See above for a description of the values."
     })
     public static final Property<WalkFlySpeedRestoreType> RESTORE_WALK_SPEED =
-        newProperty(WalkFlySpeedRestoreType.class, "limbo.restoreWalkSpeed", WalkFlySpeedRestoreType.RESTORE_NO_ZERO);
+            newProperty(WalkFlySpeedRestoreType.class, "limbo.restoreWalkSpeed", WalkFlySpeedRestoreType.RESTORE_NO_ZERO);
 
     private LimboSettings() {
     }
@@ -72,11 +72,11 @@ public final class LimboSettings implements SettingsHolder {
     @Override
     public void registerComments(CommentsConfiguration conf) {
         String[] limboExplanation = {
-            "Before a user logs in, various properties are temporarily removed from the player,",
+                "Before a user logs in, various properties are temporarily removed from the player,",
-            "such as OP status, ability to fly, and walk/fly speed.",
+                "such as OP status, ability to fly, and walk/fly speed.",
-            "Once the user is logged in, we add back the properties we previously saved.",
+                "Once the user is logged in, we add back the properties we previously saved.",
-            "In this section, you may define how these properties should be handled.",
+                "In this section, you may define how these properties should be handled.",
-            "Read more at https://github.com/AuthMe/AuthMeReloaded/wiki/Limbo-players"
+                "Read more at https://github.com/AuthMe/AuthMeReloaded/wiki/Limbo-players"
         };
         conf.setComment("limbo", limboExplanation);
     }

plugin/platform-bukkit/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java

@@ -1,122 +0,0 @@
-package fr.xephi.authme.settings.properties;
-
-import ch.jalu.configme.Comment;
-import ch.jalu.configme.SettingsHolder;
-import ch.jalu.configme.properties.Property;
-import fr.xephi.authme.output.LogLevel;
-
-import java.util.Set;
-
-import static ch.jalu.configme.properties.PropertyInitializer.newLowercaseStringSetProperty;
-import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
-
-public final class PluginSettings implements SettingsHolder {
-    @Comment({
-        "Should we execute /help command when unregistered players press Shift+F?",
-        "This keeps compatibility with some menu plugins",
-        "If you are using TrMenu, don't enable this because TrMenu already implemented this."
-    })
-    public static final Property<Boolean> MENU_UNREGISTER_COMPATIBILITY =
-        newProperty("3rdPartyFeature.compatibility.menuPlugins", false);
-
-    @Comment({
-        "Send i18n messages to player based on their client settings, this option will override `settings.messagesLanguage`",
-        "(Requires Protocollib or Packetevents)",
-        "This will not affect language of AuthMe help command."
-    })
-    public static final Property<Boolean> I18N_MESSAGES =
-        newProperty("3rdPartyFeature.features.i18nMessages.enabled", false);
-
-    @Comment({"Redirect locale code to certain AuthMe language code as you want",
-        "Minecraft locale list: https://minecraft.wiki/w/Language",
-        "AuthMe language code: https://github.com/HaHaWTH/AuthMeReReloaded/blob/master/docs/translations.md",
-        "For example, if you want to show Russian messages to player using language Tatar(tt_ru),",
-        "and show Chinese Simplified messages to player using language Classical Chinese(lzh), then:",
-        "locale-code-redirect:",
-        "- 'tt_ru:ru'",
-        "- 'lzh:zhcn'"})
-    public static final Property<Set<String>> I18N_CODE_REDIRECT =
-        newLowercaseStringSetProperty("3rdPartyFeature.features.i18nMessages.locale-code-redirect",
-            "tt_ru:ru", "lzh:zhcn");
-
-    @Comment({
-        "Do you want to enable the session feature?",
-        "If enabled, when a player authenticates successfully,",
-        "his IP and his nickname is saved.",
-        "The next time the player joins the server, if his IP",
-        "is the same as last time and the timeout hasn't",
-        "expired, he will not need to authenticate."
-    })
-    public static final Property<Boolean> SESSIONS_ENABLED =
-        newProperty("settings.sessions.enabled", true);
-
-    @Comment({
-        "After how many minutes should a session expire?",
-        "A player's session ends after the timeout or if his IP has changed"
-    })
-    public static final Property<Integer> SESSIONS_TIMEOUT =
-        newProperty("settings.sessions.timeout", 43200);
-
-    @Comment({
-        "Message language, available languages:",
-        "https://github.com/AuthMe/AuthMeReloaded/blob/master/docs/translations.md",
-        "Example: zhcn, en"
-    })
-    public static final Property<String> MESSAGES_LANGUAGE =
-        newProperty("settings.messagesLanguage", "en");
-
-    @Comment({
-        "Enables switching a player to defined permission groups before they log in.",
-        "See below for a detailed explanation."
-    })
-    public static final Property<Boolean> ENABLE_PERMISSION_CHECK =
-        newProperty("GroupOptions.enablePermissionCheck", false);
-
-    @Comment({
-        "This is a very important option: if a registered player joins the server",
-        "AuthMe will switch him to unLoggedInGroup. This should prevent all major exploits.",
-        "You can set up your permission plugin with this special group to have no permissions,",
-        "or only permission to chat (or permission to send private messages etc.).",
-        "The better way is to set up this group with few permissions, so if a player",
-        "tries to exploit an account they can do only what you've defined for the group.",
-        "After login, the player will be moved to his correct permissions group!",
-        "Please note that the group name is case-sensitive, so 'admin' is different from 'Admin'",
-        "Otherwise your group will be wiped and the player will join in the default group []!",
-        "Example: registeredPlayerGroup: 'NotLogged'"
-    })
-    public static final Property<String> REGISTERED_GROUP =
-        newProperty("GroupOptions.registeredPlayerGroup", "");
-
-    @Comment({
-        "Similar to above, unregistered players can be set to the following",
-        "permissions group"
-    })
-    public static final Property<String> UNREGISTERED_GROUP =
-        newProperty("GroupOptions.unregisteredPlayerGroup", "");
-
-    @Comment("Forces authme to hook into Vault instead of a specific permission handler system.")
-    public static final Property<Boolean> FORCE_VAULT_HOOK =
-        newProperty("settings.forceVaultHook", false);
-
-    @Comment({
-        "Log level: INFO, FINE, DEBUG. Use INFO for general messages,",
-        "FINE for some additional detailed ones (like password failed),",
-        "and DEBUG for debugging"
-    })
-    public static final Property<LogLevel> LOG_LEVEL =
-        newProperty(LogLevel.class, "settings.logLevel", LogLevel.FINE);
-
-    @Comment({
-        "By default we schedule async tasks when talking to the database. If you want",
-        "typical communication with the database to happen synchronously, set this to false"
-    })
-    public static final Property<Boolean> USE_ASYNC_TASKS =
-        newProperty("settings.useAsyncTasks", true);
-
-    @Comment("The name of the server, used in some placeholders.")
-    public static final Property<String> SERVER_NAME = newProperty("settings.serverName", "Your Minecraft Server");
-
-    private PluginSettings() {
-    }
-
-}

plugin/platform-bukkit/src/main/java/fr/xephi/authme/task/purge/PurgeExecutor.java

@@ -1,8 +1,8 @@
 package fr.xephi.authme.task.purge;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.PluginHookService;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/task/purge/PurgeService.java

@@ -1,8 +1,8 @@
 package fr.xephi.authme.task.purge;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.settings.Settings;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/task/purge/PurgeTask.java

@@ -1,8 +1,8 @@
 package fr.xephi.authme.task.purge;
 
 import com.github.Anon8281.universalScheduler.UniversalRunnable;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.permission.PlayerStatePermission;
 import org.bukkit.Bukkit;

plugin/platform-bukkit/src/main/java/fr/xephi/authme/util/Utils.java

@@ -1,7 +1,7 @@
 package fr.xephi.authme.util;
 
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;

project/module-common/build.gradle.kts

@@ -1,6 +1,8 @@
 dependencies {
     compileOnly(project(":project:module-configuration"))
+    compileOnly(project(":project:module-util"))
     compileOnly(project(":project:module-logger"))
-    // ConfigMe
+    compileOnly(project(":project:module-security"))
     compileOnly(libs.configme)
+    compileOnly(libs.guava)
 }

project/module-common/src/main/java/fr/xephi/authme/initialization/HasCleanup.java

@@ -4,7 +4,6 @@ package fr.xephi.authme.initialization;
  * Common interface for types which have data that becomes outdated
  * and that can be cleaned up periodically.
  *
- * @see fr.xephi.authme.task.CleanupTask
  */
 public interface HasCleanup {
 

project/module-common/src/main/java/fr/xephi/authme/initialization/Reloadable.java

@@ -3,7 +3,6 @@ package fr.xephi.authme.initialization;
 /**
  * Interface for reloadable entities.
  *
- * @see fr.xephi.authme.command.executable.authme.ReloadCommand
  */
 public interface Reloadable {
 

project/module-common/src/main/java/fr/xephi/authme/logger/ConsoleLogger.java

@@ -1,7 +1,6 @@
-package fr.xephi.authme;
+package fr.xephi.authme.logger;
 
 import com.google.common.base.Throwables;
-import fr.xephi.authme.output.LogLevel;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;

project/module-common/src/main/java/fr/xephi/authme/logger/ConsoleLoggerFactory.java

@@ -1,6 +1,5 @@
-package fr.xephi.authme.output;
+package fr.xephi.authme.logger;
 
-import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.settings.Settings;
 
 import java.util.Map;

project/module-common/src/main/java/fr/xephi/authme/settings/Settings.java

@@ -5,15 +5,14 @@ import ch.jalu.configme.configurationdata.ConfigurationData;
 import ch.jalu.configme.migration.MigrationService;
 import ch.jalu.configme.resource.PropertyResource;
 import com.google.common.io.Files;
-import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.logger.ConsoleLogger;
-import fr.xephi.authme.output.ConsoleLoggerFactory;
+import fr.xephi.authme.logger.ConsoleLoggerFactory;
+import fr.xephi.authme.util.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
-import static fr.xephi.authme.util.FileUtils.copyFileFromResource;
-
 /**
  * The AuthMe settings manager.
  */
@@ -31,9 +30,9 @@ public class Settings extends SettingsManagerImpl {
     /**
      * Constructor.
      *
-     * @param pluginFolder the AuthMe plugin folder
+     * @param pluginFolder      the AuthMe plugin folder
-     * @param resource the property resource to read and write properties to
+     * @param resource          the property resource to read and write properties to
-     * @param migrationService migration service to check the settings file with
+     * @param migrationService  migration service to check the settings file with
      * @param configurationData configuration data (properties and comments)
      */
     public Settings(File pluginFolder, PropertyResource resource, MigrationService migrationService,
@@ -70,7 +69,9 @@ public class Settings extends SettingsManagerImpl {
         return recoveryCodeEmailMessage;
     }
 
-    public String getShutdownEmailMessage() {return shutdownEmailMessage;}
+    public String getShutdownEmailMessage() {
+        return shutdownEmailMessage;
+    }
 
     public String getNewPasswordEmailMessage() {
         return newPasswordEmailMessage;
@@ -99,7 +100,7 @@ public class Settings extends SettingsManagerImpl {
      */
     private String readFile(String filename) {
         final File file = new File(pluginFolder, filename);
-        if (copyFileFromResource(file, filename)) {
+        if (FileUtils.copyFileFromResource(file, filename)) {
             try {
                 return Files.asCharSource(file, StandardCharsets.UTF_8).read();
             } catch (IOException e) {
@@ -110,4 +111,5 @@ public class Settings extends SettingsManagerImpl {
         }
         return "";
     }
+
 }

project/module-common/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java

@@ -0,0 +1,122 @@
+package fr.xephi.authme.settings.properties;
+
+import ch.jalu.configme.Comment;
+import ch.jalu.configme.SettingsHolder;
+import ch.jalu.configme.properties.Property;
+import fr.xephi.authme.logger.LogLevel;
+
+import java.util.Set;
+
+import static ch.jalu.configme.properties.PropertyInitializer.newLowercaseStringSetProperty;
+import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
+
+public final class PluginSettings implements SettingsHolder {
+    @Comment({
+            "Should we execute /help command when unregistered players press Shift+F?",
+            "This keeps compatibility with some menu plugins",
+            "If you are using TrMenu, don't enable this because TrMenu already implemented this."
+    })
+    public static final Property<Boolean> MENU_UNREGISTER_COMPATIBILITY =
+            newProperty("3rdPartyFeature.compatibility.menuPlugins", false);
+
+    @Comment({
+            "Send i18n messages to player based on their client settings, this option will override `settings.messagesLanguage`",
+            "(Requires Protocollib or Packetevents)",
+            "This will not affect language of AuthMe help command."
+    })
+    public static final Property<Boolean> I18N_MESSAGES =
+            newProperty("3rdPartyFeature.features.i18nMessages.enabled", false);
+
+    @Comment({"Redirect locale code to certain AuthMe language code as you want",
+            "Minecraft locale list: https://minecraft.wiki/w/Language",
+            "AuthMe language code: https://github.com/HaHaWTH/AuthMeReReloaded/blob/master/docs/translations.md",
+            "For example, if you want to show Russian messages to player using language Tatar(tt_ru),",
+            "and show Chinese Simplified messages to player using language Classical Chinese(lzh), then:",
+            "locale-code-redirect:",
+            "- 'tt_ru:ru'",
+            "- 'lzh:zhcn'"})
+    public static final Property<Set<String>> I18N_CODE_REDIRECT =
+            newLowercaseStringSetProperty("3rdPartyFeature.features.i18nMessages.locale-code-redirect",
+                    "tt_ru:ru", "lzh:zhcn");
+
+    @Comment({
+            "Do you want to enable the session feature?",
+            "If enabled, when a player authenticates successfully,",
+            "his IP and his nickname is saved.",
+            "The next time the player joins the server, if his IP",
+            "is the same as last time and the timeout hasn't",
+            "expired, he will not need to authenticate."
+    })
+    public static final Property<Boolean> SESSIONS_ENABLED =
+            newProperty("settings.sessions.enabled", true);
+
+    @Comment({
+            "After how many minutes should a session expire?",
+            "A player's session ends after the timeout or if his IP has changed"
+    })
+    public static final Property<Integer> SESSIONS_TIMEOUT =
+            newProperty("settings.sessions.timeout", 43200);
+
+    @Comment({
+            "Message language, available languages:",
+            "https://github.com/AuthMe/AuthMeReloaded/blob/master/docs/translations.md",
+            "Example: zhcn, en"
+    })
+    public static final Property<String> MESSAGES_LANGUAGE =
+            newProperty("settings.messagesLanguage", "en");
+
+    @Comment({
+            "Enables switching a player to defined permission groups before they log in.",
+            "See below for a detailed explanation."
+    })
+    public static final Property<Boolean> ENABLE_PERMISSION_CHECK =
+            newProperty("GroupOptions.enablePermissionCheck", false);
+
+    @Comment({
+            "This is a very important option: if a registered player joins the server",
+            "AuthMe will switch him to unLoggedInGroup. This should prevent all major exploits.",
+            "You can set up your permission plugin with this special group to have no permissions,",
+            "or only permission to chat (or permission to send private messages etc.).",
+            "The better way is to set up this group with few permissions, so if a player",
+            "tries to exploit an account they can do only what you've defined for the group.",
+            "After login, the player will be moved to his correct permissions group!",
+            "Please note that the group name is case-sensitive, so 'admin' is different from 'Admin'",
+            "Otherwise your group will be wiped and the player will join in the default group []!",
+            "Example: registeredPlayerGroup: 'NotLogged'"
+    })
+    public static final Property<String> REGISTERED_GROUP =
+            newProperty("GroupOptions.registeredPlayerGroup", "");
+
+    @Comment({
+            "Similar to above, unregistered players can be set to the following",
+            "permissions group"
+    })
+    public static final Property<String> UNREGISTERED_GROUP =
+            newProperty("GroupOptions.unregisteredPlayerGroup", "");
+
+    @Comment("Forces authme to hook into Vault instead of a specific permission handler system.")
+    public static final Property<Boolean> FORCE_VAULT_HOOK =
+            newProperty("settings.forceVaultHook", false);
+
+    @Comment({
+            "Log level: INFO, FINE, DEBUG. Use INFO for general messages,",
+            "FINE for some additional detailed ones (like password failed),",
+            "and DEBUG for debugging"
+    })
+    public static final Property<LogLevel> LOG_LEVEL =
+            newProperty(LogLevel.class, "settings.logLevel", LogLevel.FINE);
+
+    @Comment({
+            "By default we schedule async tasks when talking to the database. If you want",
+            "typical communication with the database to happen synchronously, set this to false"
+    })
+    public static final Property<Boolean> USE_ASYNC_TASKS =
+            newProperty("settings.useAsyncTasks", true);
+
+    @Comment("The name of the server, used in some placeholders.")
+    public static final Property<String> SERVER_NAME = newProperty("settings.serverName", "Your Minecraft Server");
+
+    private PluginSettings() {
+    }
+
+}

project/module-common/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java

@@ -14,188 +14,188 @@ import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
 public final class SecuritySettings implements SettingsHolder {
 
     @Comment({"Stop the server if we can't contact the sql database",
-        "Take care with this, if you set this to false,",
+            "Take care with this, if you set this to false,",
-        "AuthMe will automatically disable and the server won't be protected!"})
+            "AuthMe will automatically disable and the server won't be protected!"})
     public static final Property<Boolean> STOP_SERVER_ON_PROBLEM =
-        newProperty("Security.SQLProblem.stopServer", false);
+            newProperty("Security.SQLProblem.stopServer", false);
 
     @Comment({"Should we let Bedrock players login automatically?",
-        "(Requires hookFloodgate to be true & floodgate loaded)",
+            "(Requires hookFloodgate to be true & floodgate loaded)",
-        "(**THIS IS SAFE DO NOT WORRY**)"})
+            "(**THIS IS SAFE DO NOT WORRY**)"})
     public static final Property<Boolean> FORCE_LOGIN_BEDROCK =
-        newProperty("3rdPartyFeature.features.bedrockAutoLogin", false);
+            newProperty("3rdPartyFeature.features.bedrockAutoLogin", false);
 
     @Comment("Should we purge data on non-registered players quit?")
     public static final Property<Boolean> PURGE_DATA_ON_QUIT =
-        newProperty("3rdPartyFeature.features.purgeData.purgeOnQuit", false);
+            newProperty("3rdPartyFeature.features.purgeData.purgeOnQuit", false);
 
     @Comment("Which world's player data should be deleted?(Enter the world *FOLDER* name where your players first logged in)")
     public static final Property<String> DELETE_PLAYER_DATA_WORLD =
-        newProperty("3rdPartyFeature.features.purgeData.purgeWorldFolderName", "world");
+            newProperty("3rdPartyFeature.features.purgeData.purgeWorldFolderName", "world");
     @Comment("Enable the new feature to prevent ghost players?")
     public static final Property<Boolean> ANTI_GHOST_PLAYERS =
-        newProperty("3rdPartyFeature.fixes.antiGhostPlayer", false);
+            newProperty("3rdPartyFeature.fixes.antiGhostPlayer", false);
 
     @Comment({"(MC1.13- only)",
-        "Should we fix the shulker crash bug with advanced method?"})
+            "Should we fix the shulker crash bug with advanced method?"})
     public static final Property<Boolean> ADVANCED_SHULKER_FIX =
-        newProperty("3rdPartyFeature.fixes.advancedShulkerFix", false);
+            newProperty("3rdPartyFeature.fixes.advancedShulkerFix", false);
 
     @Comment("Should we fix the location when players logged in the portal?")
     public static final Property<Boolean> LOGIN_LOC_FIX_SUB_PORTAL =
-        newProperty("3rdPartyFeature.fixes.loginLocationFix.fixPortalStuck", false);
+            newProperty("3rdPartyFeature.fixes.loginLocationFix.fixPortalStuck", false);
 
     @Comment("Should we fix the location when players logged underground?")
     public static final Property<Boolean> LOGIN_LOC_FIX_SUB_UNDERGROUND =
-        newProperty("3rdPartyFeature.fixes.loginLocationFix.fixGroundStuck", false);
+            newProperty("3rdPartyFeature.fixes.loginLocationFix.fixGroundStuck", false);
 
     @Comment("Copy AuthMe log output in a separate file as well?")
     public static final Property<Boolean> USE_LOGGING =
-        newProperty("Security.console.logConsole", true);
+            newProperty("Security.console.logConsole", true);
 
     @Comment({"Query haveibeenpwned.com with a hashed version of the password.",
-        "This is used to check whether it is safe."})
+            "This is used to check whether it is safe."})
     public static final Property<Boolean> HAVE_I_BEEN_PWNED_CHECK =
-        newProperty("Security.account.haveIBeenPwned.check", false);
+            newProperty("Security.account.haveIBeenPwned.check", false);
 
     @Comment({"If the password is used more than this number of times, it is considered unsafe."})
     public static final Property<Integer> HAVE_I_BEEN_PWNED_LIMIT =
-        newProperty("Security.account.haveIBeenPwned.limit", 0);
+            newProperty("Security.account.haveIBeenPwned.limit", 0);
 
     @Comment("Enable captcha when a player uses wrong password too many times")
     public static final Property<Boolean> ENABLE_LOGIN_FAILURE_CAPTCHA =
-        newProperty("Security.captcha.useCaptcha", false);
+            newProperty("Security.captcha.useCaptcha", false);
 
     @Comment("Check for updates on enabled from GitHub?")
     public static final Property<Boolean> CHECK_FOR_UPDATES =
-        newProperty("Plugin.updates.checkForUpdates", true);
+            newProperty("Plugin.updates.checkForUpdates", true);
 
     @Comment("Should we show the AuthMe banner on startup?")
     public static final Property<Boolean> SHOW_STARTUP_BANNER =
-        newProperty("Plugin.banners.showBanners", true);
+            newProperty("Plugin.banners.showBanners", true);
 
     @Comment("Max allowed tries before a captcha is required")
     public static final Property<Integer> MAX_LOGIN_TRIES_BEFORE_CAPTCHA =
-        newProperty("Security.captcha.maxLoginTry", 8);
+            newProperty("Security.captcha.maxLoginTry", 8);
 
     @Comment("Captcha length")
     public static final Property<Integer> CAPTCHA_LENGTH =
-        newProperty("Security.captcha.captchaLength", 6);
+            newProperty("Security.captcha.captchaLength", 6);
 
     @Comment("Minutes after which login attempts count is reset for a player")
     public static final Property<Integer> CAPTCHA_COUNT_MINUTES_BEFORE_RESET =
-        newProperty("Security.captcha.captchaCountReset", 120);
+            newProperty("Security.captcha.captchaCountReset", 120);
 
     @Comment("Require captcha before a player may register?")
     public static final Property<Boolean> ENABLE_CAPTCHA_FOR_REGISTRATION =
-        newProperty("Security.captcha.requireForRegistration", false);
+            newProperty("Security.captcha.requireForRegistration", false);
 
     @Comment("Minimum length of password")
     public static final Property<Integer> MIN_PASSWORD_LENGTH =
-        newProperty("settings.security.minPasswordLength", 8);
+            newProperty("settings.security.minPasswordLength", 8);
 
     @Comment("Maximum length of password")
     public static final Property<Integer> MAX_PASSWORD_LENGTH =
-        newProperty("settings.security.passwordMaxLength", 26);
+            newProperty("settings.security.passwordMaxLength", 26);
 
     @Comment({
-        "Possible values: SHA256, BCRYPT, BCRYPT2Y, PBKDF2, SALTEDSHA512,",
+            "Possible values: SHA256, BCRYPT, BCRYPT2Y, PBKDF2, SALTEDSHA512,",
-        "MYBB, IPB3, PHPBB, PHPFUSION, SMF, XENFORO, XAUTH, JOOMLA, WBB3, WBB4, MD5VB,",
+            "MYBB, IPB3, PHPBB, PHPFUSION, SMF, XENFORO, XAUTH, JOOMLA, WBB3, WBB4, MD5VB,",
-        "PBKDF2DJANGO, WORDPRESS, ROYALAUTH, ARGON2, NOCRYPT, CUSTOM (for developers only). See full list at",
+            "PBKDF2DJANGO, WORDPRESS, ROYALAUTH, ARGON2, NOCRYPT, CUSTOM (for developers only). See full list at",
-        "https://github.com/AuthMe/AuthMeReloaded/blob/master/docs/hash_algorithms.md",
+            "https://github.com/AuthMe/AuthMeReloaded/blob/master/docs/hash_algorithms.md",
-        "If you use ARGON2, check that you have the argon2 c library on your system"
+            "If you use ARGON2, check that you have the argon2 c library on your system"
     })
     public static final Property<HashAlgorithm> PASSWORD_HASH =
-        newProperty(HashAlgorithm.class, "settings.security.passwordHash", HashAlgorithm.SHA256);
+            newProperty(HashAlgorithm.class, "settings.security.passwordHash", HashAlgorithm.SHA256);
 
     @Comment({
-        "If a password check fails, AuthMe will also try to check with the following hash methods.",
+            "If a password check fails, AuthMe will also try to check with the following hash methods.",
-        "Use this setting when you change from one hash method to another.",
+            "Use this setting when you change from one hash method to another.",
-        "AuthMe will update the password to the new hash. Example:",
+            "AuthMe will update the password to the new hash. Example:",
-        "legacyHashes:",
+            "legacyHashes:",
-        "- 'SHA1'"
+            "- 'SHA1'"
     })
     public static final Property<Set<HashAlgorithm>> LEGACY_HASHES =
-        new EnumSetProperty<>(HashAlgorithm.class, "settings.security.legacyHashes");
+            new EnumSetProperty<>(HashAlgorithm.class, "settings.security.legacyHashes");
 
     @Comment("Salt length for the SALTED2MD5 MD5(MD5(password)+salt)")
     public static final Property<Integer> DOUBLE_MD5_SALT_LENGTH =
-        newProperty("settings.security.doubleMD5SaltLength", 8);
+            newProperty("settings.security.doubleMD5SaltLength", 8);
 
     @Comment("Number of rounds to use if passwordHash is set to PBKDF2. Default is 10000")
     public static final Property<Integer> PBKDF2_NUMBER_OF_ROUNDS =
-        newProperty("settings.security.pbkdf2Rounds", 10000);
+            newProperty("settings.security.pbkdf2Rounds", 10000);
 
     @Comment({"Prevent unsafe passwords from being used; put them in lowercase!",
-        "You should always set 'help' as unsafePassword due to possible conflicts.",
+            "You should always set 'help' as unsafePassword due to possible conflicts.",
-        "unsafePasswords:",
+            "unsafePasswords:",
-        "- '123456'",
+            "- '123456'",
-        "- 'password'",
+            "- 'password'",
-        "- 'help'"})
+            "- 'help'"})
     public static final Property<Set<String>> UNSAFE_PASSWORDS =
-        newLowercaseStringSetProperty("settings.security.unsafePasswords",
+            newLowercaseStringSetProperty("settings.security.unsafePasswords",
-            "12345678", "password", "qwertyui", "123456789", "87654321", "1234567890", "asdfghjkl","zxcvbnm,","asdfghjk","12312312","123123123","32132132","321321321");
+                    "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<Boolean> TEMPBAN_ON_MAX_LOGINS =
-        newProperty("Security.tempban.enableTempban", false);
+            newProperty("Security.tempban.enableTempban", false);
 
     @Comment("How many times a user can attempt to login before their IP being tempbanned")
     public static final Property<Integer> MAX_LOGIN_TEMPBAN =
-        newProperty("Security.tempban.maxLoginTries", 8);
+            newProperty("Security.tempban.maxLoginTries", 8);
 
     @Comment({"The length of time a IP address will be tempbanned in minutes",
-        "Default: 480 minutes, or 8 hours"})
+            "Default: 480 minutes, or 8 hours"})
     public static final Property<Integer> TEMPBAN_LENGTH =
-        newProperty("Security.tempban.tempbanLength", 480);
+            newProperty("Security.tempban.tempbanLength", 480);
 
     @Comment({"How many minutes before resetting the count for failed logins by IP and username",
-        "Default: 480 minutes (8 hours)"})
+            "Default: 480 minutes (8 hours)"})
     public static final Property<Integer> TEMPBAN_MINUTES_BEFORE_RESET =
-        newProperty("Security.tempban.minutesBeforeCounterReset", 480);
+            newProperty("Security.tempban.minutesBeforeCounterReset", 480);
 
     @Comment({"The command to execute instead of using the internal ban system, empty if disabled.",
-        "Available placeholders: %player%, %ip%"})
+            "Available placeholders: %player%, %ip%"})
     public static final Property<String> TEMPBAN_CUSTOM_COMMAND =
-        newProperty("Security.tempban.customCommand", "");
+            newProperty("Security.tempban.customCommand", "");
 
     @Comment("Number of characters a recovery code should have (0 to disable)")
     public static final Property<Integer> RECOVERY_CODE_LENGTH =
-        newProperty("Security.recoveryCode.length", 8);
+            newProperty("Security.recoveryCode.length", 8);
 
     @Comment("How many hours is a recovery code valid for?")
     public static final Property<Integer> RECOVERY_CODE_HOURS_VALID =
-        newProperty("Security.recoveryCode.validForHours", 6);
+            newProperty("Security.recoveryCode.validForHours", 6);
 
     @Comment("Max number of tries to enter recovery code")
     public static final Property<Integer> RECOVERY_CODE_MAX_TRIES =
-        newProperty("Security.recoveryCode.maxTries", 4);
+            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.",
+            "without logging in. This is in minutes.",
-        "Default: 2 minutes"})
+            "Default: 2 minutes"})
     public static final Property<Integer> PASSWORD_CHANGE_TIMEOUT =
-        newProperty("Security.recoveryCode.passwordChangeTimeout", 5);
+            newProperty("Security.recoveryCode.passwordChangeTimeout", 5);
 
     @Comment({
-        "Seconds a user has to wait for before a password recovery mail may be sent again",
+            "Seconds a user has to wait for before a password recovery mail may be sent again",
-        "This prevents an attacker from abusing AuthMe's email feature."
+            "This prevents an attacker from abusing AuthMe's email feature."
     })
     public static final Property<Integer> EMAIL_RECOVERY_COOLDOWN_SECONDS =
-        newProperty("Security.emailRecovery.cooldown", 60);
+            newProperty("Security.emailRecovery.cooldown", 60);
 
     @Comment({
-        "The mail shown using /email show will be partially hidden",
+            "The mail shown using /email show will be partially hidden",
-        "E.g. (if enabled)",
+            "E.g. (if enabled)",
-        " original email: my.email@example.com",
+            " original email: my.email@example.com",
-        " hidden email: my.***@***mple.com"
+            " hidden email: my.***@***mple.com"
     })
     public static final Property<Boolean> USE_EMAIL_MASKING =
-        newProperty("Security.privacy.enableEmailMasking", false);
+            newProperty("Security.privacy.enableEmailMasking", false);
 
     @Comment("Minutes after which a verification code will expire")
     public static final Property<Integer> VERIFICATION_CODE_EXPIRATION_MINUTES =
-        newProperty("Security.privacy.verificationCodeExpiration", 10);
+            newProperty("Security.privacy.verificationCodeExpiration", 10);
 
     private SecuritySettings() {
     }

project/module-database/build.gradle.kts

@@ -0,0 +1,7 @@
+dependencies {
+ compileOnly(project(":project:module-common"))
+        compileOnly(project(":project:module-util"))
+        compileOnly(project(":project:module-logger"))
+        compileOnly(project(":project:module-configuration"))
+        compileOnly(project(":project:module-message"))
+}

project/module-logger/build.gradle.kts

@@ -1,6 +1,5 @@
 dependencies {
     compileOnly(project(":project:module-util"))
-    compileOnly(project(":project:module-common"))
     compileOnly(libs.guava)
     // Log4J Logger (required by the console filter)
     compileOnly("org.apache.logging.log4j:log4j-core:2.20.0") // Log4J version bundled in 1.12.2

project/module-logger/src/main/java/fr/xephi/authme/logger/ConsoleFilter.java

@@ -1,4 +1,4 @@
-package fr.xephi.authme.output;
+package fr.xephi.authme.logger;
 
 import java.util.logging.Filter;
 import java.util.logging.LogRecord;