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;

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/ConverterSettings.java

@@ -8,6 +8,7 @@ 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");

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

@@ -49,13 +49,13 @@ public final class DatabaseSettings implements SettingsHolder {
             "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"})
     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.",
             "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 =
@@ -151,7 +151,7 @@ public final class DatabaseSettings implements SettingsHolder {
 
     @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 =

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.
  */
@@ -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

@@ -134,7 +134,7 @@ public final class SecuritySettings implements SettingsHolder {
             "- 'help'"})
     public static final Property<Set<String>> UNSAFE_PASSWORDS =
             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 =

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;

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

@@ -1,4 +1,4 @@
-package fr.xephi.authme.output;
+package fr.xephi.authme.logger;
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.Marker;

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

@@ -1,4 +1,4 @@
-package fr.xephi.authme.output;
+package fr.xephi.authme.logger;
 
 import com.google.common.annotations.VisibleForTesting;
 import fr.xephi.authme.util.StringUtils;

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

@@ -1,4 +1,4 @@
-package fr.xephi.authme.output;
+package fr.xephi.authme.logger;
 
 /**
  * Log level.