diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java index 6963cb9c..381341da 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java @@ -80,9 +80,9 @@ import ru.gravit.utils.helper.CommonHelper; import ru.gravit.utils.helper.IOHelper; import ru.gravit.utils.helper.JVMHelper; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; import ru.gravit.utils.helper.VerifyHelper; +import ru.gravit.utils.logging.LogHelper; public final class LaunchServer implements Runnable { public static final class Config { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/MySQLSourceConfig.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/MySQLSourceConfig.java index 2742bb06..6a8c15b6 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/MySQLSourceConfig.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/MySQLSourceConfig.java @@ -9,8 +9,8 @@ import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.VerifyHelper; +import ru.gravit.utils.logging.LogHelper; public final class MySQLSourceConfig implements AutoCloseable { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/FileAuthHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/FileAuthHandler.java index dd114a48..d788c943 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/FileAuthHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/FileAuthHandler.java @@ -17,9 +17,9 @@ import ru.gravit.launchserver.auth.provider.AuthProviderResult; import ru.gravit.utils.helper.CommonHelper; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; import ru.gravit.utils.helper.VerifyHelper; +import ru.gravit.utils.logging.LogHelper; public abstract class FileAuthHandler extends AuthHandler { public static final class Entry extends StreamObject { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/JsonHWIDHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/JsonHWIDHandler.java index b218d1f2..260c9709 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/JsonHWIDHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/JsonHWIDHandler.java @@ -12,7 +12,7 @@ import ru.gravit.launcher.HWID; import ru.gravit.launcher.OshiHWID; import ru.gravit.utils.HTTPRequest; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class JsonHWIDHandler extends HWIDHandler { private static final Gson gson = new Gson(); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/MysqlHWIDHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/MysqlHWIDHandler.java index 63e3423b..407aba44 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/MysqlHWIDHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/MysqlHWIDHandler.java @@ -11,7 +11,7 @@ import ru.gravit.launcher.OshiHWID; import ru.gravit.launchserver.auth.MySQLSourceConfig; import ru.gravit.utils.helper.CommonHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public class MysqlHWIDHandler extends HWIDHandler { private MySQLSourceConfig mySQLHolder; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/JsonFilePermissionsHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/JsonFilePermissionsHandler.java index 72aa37ca..7622823f 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/JsonFilePermissionsHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/JsonFilePermissionsHandler.java @@ -15,7 +15,7 @@ import ru.gravit.launcher.Launcher; import ru.gravit.launchserver.Reloadable; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public class JsonFilePermissionsHandler extends PermissionsHandler implements Reloadable { public String filename = "permissions.json"; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/RejectAuthProvider.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/RejectAuthProvider.java index efe8af0a..436e4686 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/RejectAuthProvider.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/RejectAuthProvider.java @@ -4,8 +4,8 @@ import ru.gravit.launchserver.Reconfigurable; import ru.gravit.launchserver.auth.AuthException; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; +import ru.gravit.utils.logging.LogHelper; public final class RejectAuthProvider extends AuthProvider implements Reconfigurable { public RejectAuthProvider() { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java index a70fa951..8b6c47b5 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java @@ -13,7 +13,7 @@ import ru.gravit.launcher.Launcher; import ru.gravit.launchserver.LaunchServer; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class EXEL4JLauncherBinary extends LauncherBinary { private final static class Launch4JLog extends Log { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXELauncherBinary.java b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXELauncherBinary.java index 64520247..891a4bd1 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXELauncherBinary.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXELauncherBinary.java @@ -5,7 +5,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public class EXELauncherBinary extends LauncherBinary { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/JARLauncherBinary.java b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/JARLauncherBinary.java index a0caa387..ff716387 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/JARLauncherBinary.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/JARLauncherBinary.java @@ -13,7 +13,7 @@ import ru.gravit.launchserver.binary.tasks.StripLineNumbersTask; import ru.gravit.launchserver.binary.tasks.UnpackBuildTask; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class JARLauncherBinary extends LauncherBinary { public ArrayList tasks; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/ProguardConf.java b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/ProguardConf.java index df293074..0e3901b4 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/ProguardConf.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/ProguardConf.java @@ -12,8 +12,8 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; +import ru.gravit.utils.logging.LogHelper; public class ProguardConf { private static final String charsFirst = "aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ"; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/MainBuildTask.java b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/MainBuildTask.java index 27d7f654..b6c57dfe 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/MainBuildTask.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/MainBuildTask.java @@ -27,8 +27,8 @@ import ru.gravit.launchserver.binary.BuildContext; import ru.gravit.launchserver.binary.JAConfigurator; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; +import ru.gravit.utils.logging.LogHelper; public class MainBuildTask implements LauncherBuildTask { public final Path binaryFile; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/UnpackBuildTask.java b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/UnpackBuildTask.java index b4919b1a..1ef43bbd 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/UnpackBuildTask.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/UnpackBuildTask.java @@ -2,8 +2,8 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.UnpackHelper; +import ru.gravit.utils.logging.LogHelper; import java.io.IOException; import java.nio.file.Path; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/AuthCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/AuthCommand.java index c5048a5b..2ba394e1 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/AuthCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/AuthCommand.java @@ -6,7 +6,7 @@ import ru.gravit.launchserver.auth.provider.AuthProvider; import ru.gravit.launchserver.auth.provider.AuthProviderResult; import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class AuthCommand extends Command { public AuthCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UUIDToUsernameCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UUIDToUsernameCommand.java index 63738552..d2077b3e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UUIDToUsernameCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UUIDToUsernameCommand.java @@ -6,7 +6,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.command.Command; import ru.gravit.launchserver.command.CommandException; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class UUIDToUsernameCommand extends Command { public UUIDToUsernameCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UsernameToUUIDCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UsernameToUUIDCommand.java index 571368a5..639eda3b 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UsernameToUUIDCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UsernameToUUIDCommand.java @@ -6,7 +6,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.command.Command; import ru.gravit.launchserver.command.CommandException; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class UsernameToUUIDCommand extends Command { public UsernameToUUIDCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/ClearCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/ClearCommand.java index f6e62e8c..1905529e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/ClearCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/ClearCommand.java @@ -2,7 +2,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class ClearCommand extends Command { public ClearCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/DebugCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/DebugCommand.java index 89c6a12a..c4af1094 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/DebugCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/DebugCommand.java @@ -2,7 +2,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class DebugCommand extends Command { public DebugCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/GCCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/GCCommand.java index f81b36e5..b3cd6428 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/GCCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/GCCommand.java @@ -4,7 +4,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.command.Command; import ru.gravit.utils.helper.JVMHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class GCCommand extends Command { public GCCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/HelpCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/HelpCommand.java index 364de723..a9db1f6d 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/HelpCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/HelpCommand.java @@ -5,7 +5,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.command.Command; import ru.gravit.launchserver.command.CommandException; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class HelpCommand extends Command { private static void printCommand(String name, Command command) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/LogConnectionsCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/LogConnectionsCommand.java index f3214401..9a581129 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/LogConnectionsCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/LogConnectionsCommand.java @@ -2,7 +2,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class LogConnectionsCommand extends Command { public LogConnectionsCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/VersionCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/VersionCommand.java index 3a2c94d7..df4fbe88 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/VersionCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/VersionCommand.java @@ -3,7 +3,7 @@ import ru.gravit.launcher.Launcher; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class VersionCommand extends Command { public VersionCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/dump/DumpEntryCacheCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/dump/DumpEntryCacheCommand.java index df3d81ca..171208ff 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/dump/DumpEntryCacheCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/dump/DumpEntryCacheCommand.java @@ -10,7 +10,7 @@ import ru.gravit.launchserver.auth.handler.CachedAuthHandler; import ru.gravit.launchserver.command.Command; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public class DumpEntryCacheCommand extends Command { public DumpEntryCacheCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/dump/DumpSessionsCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/dump/DumpSessionsCommand.java index 63e6c158..91a67aa1 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/dump/DumpSessionsCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/dump/DumpSessionsCommand.java @@ -13,7 +13,7 @@ import ru.gravit.launchserver.command.Command; import ru.gravit.launchserver.socket.Client; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public class DumpSessionsCommand extends Command { public DumpSessionsCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/handler/CommandHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/handler/CommandHandler.java index 3858c826..e3656752 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/handler/CommandHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/handler/CommandHandler.java @@ -51,8 +51,8 @@ import ru.gravit.launchserver.command.service.ReloadCommand; import ru.gravit.launchserver.command.service.ReloadListCommand; import ru.gravit.launchserver.command.service.SwapAuthProviderCommand; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.VerifyHelper; +import ru.gravit.utils.logging.LogHelper; public abstract class CommandHandler implements Runnable { private static String[] parse(CharSequence line) throws CommandException { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/handler/JLineCommandHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/handler/JLineCommandHandler.java index 8fdfef7e..4cb3a53c 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/handler/JLineCommandHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/handler/JLineCommandHandler.java @@ -4,8 +4,8 @@ import jline.console.ConsoleReader; import ru.gravit.launchserver.LaunchServer; -import ru.gravit.utils.helper.LogHelper; -import ru.gravit.utils.helper.LogHelper.Output; +import ru.gravit.utils.logging.LogHelper; +import ru.gravit.utils.logging.LogHelper.Output; public final class JLineCommandHandler extends CommandHandler { private final class JLineOutput implements Output { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/DownloadAssetCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/DownloadAssetCommand.java index 49a3770a..a7f72ce9 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/DownloadAssetCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/DownloadAssetCommand.java @@ -9,7 +9,7 @@ import ru.gravit.launchserver.command.Command; import ru.gravit.utils.HttpDownloader; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class DownloadAssetCommand extends Command { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/DownloadClientCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/DownloadClientCommand.java index 4652f1a6..2ff4db88 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/DownloadClientCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/DownloadClientCommand.java @@ -14,7 +14,7 @@ import ru.gravit.launchserver.command.CommandException; import ru.gravit.utils.HttpDownloader; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class DownloadClientCommand extends Command { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/IndexAssetCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/IndexAssetCommand.java index 5878a49a..a6cfbb8c 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/IndexAssetCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/IndexAssetCommand.java @@ -16,9 +16,9 @@ import ru.gravit.launchserver.command.Command; import ru.gravit.launchserver.command.CommandException; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; import ru.gravit.utils.helper.SecurityHelper.DigestAlgorithm; +import ru.gravit.utils.logging.LogHelper; public final class IndexAssetCommand extends Command { private static Gson gson = new Gson(); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncBinariesCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncBinariesCommand.java index 082c37ec..7be9d019 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncBinariesCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncBinariesCommand.java @@ -4,7 +4,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class SyncBinariesCommand extends Command { public SyncBinariesCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncProfilesCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncProfilesCommand.java index 423b3152..3b4d7a5e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncProfilesCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncProfilesCommand.java @@ -4,7 +4,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class SyncProfilesCommand extends Command { public SyncProfilesCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncUpdatesCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncUpdatesCommand.java index e4dc8996..1b3ee1b5 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncUpdatesCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncUpdatesCommand.java @@ -7,7 +7,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class SyncUpdatesCommand extends Command { public SyncUpdatesCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/UnindexAssetCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/UnindexAssetCommand.java index a1f8523b..1e2a6dce 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/UnindexAssetCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/UnindexAssetCommand.java @@ -14,7 +14,7 @@ import ru.gravit.launchserver.command.Command; import ru.gravit.launchserver.command.CommandException; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class UnindexAssetCommand extends Command { private static JsonParser parser = new JsonParser(); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ConfigCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ConfigCommand.java index 137e9895..28d19e7d 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ConfigCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ConfigCommand.java @@ -2,7 +2,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public class ConfigCommand extends Command { public ConfigCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ConfigHelpCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ConfigHelpCommand.java index 1e2f3d8c..6b9fb01c 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ConfigHelpCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ConfigHelpCommand.java @@ -2,7 +2,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public class ConfigHelpCommand extends Command { public ConfigHelpCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ReloadAllCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ReloadAllCommand.java index 6cce4298..0e7386cb 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ReloadAllCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ReloadAllCommand.java @@ -2,7 +2,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public class ReloadAllCommand extends Command { public ReloadAllCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ReloadCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ReloadCommand.java index 86673668..f835f491 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ReloadCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ReloadCommand.java @@ -2,7 +2,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public class ReloadCommand extends Command { public ReloadCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/SwapAuthProviderCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/SwapAuthProviderCommand.java index 6a69c785..4e433035 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/SwapAuthProviderCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/SwapAuthProviderCommand.java @@ -5,7 +5,7 @@ import ru.gravit.launchserver.auth.provider.AuthProvider; import ru.gravit.launchserver.auth.provider.RejectAuthProvider; import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public class SwapAuthProviderCommand extends Command { public AuthProvider[] providersCache; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ReconfigurableManager.java b/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ReconfigurableManager.java index 36a7cddd..e715ad08 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ReconfigurableManager.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ReconfigurableManager.java @@ -4,8 +4,8 @@ import java.util.Objects; import ru.gravit.launchserver.Reconfigurable; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.VerifyHelper; +import ru.gravit.utils.logging.LogHelper; public class ReconfigurableManager { private final HashMap RECONFIGURABLE = new HashMap<>(); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ReloadManager.java b/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ReloadManager.java index 3ef953ee..8ac360f5 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ReloadManager.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ReloadManager.java @@ -4,8 +4,8 @@ import java.util.Objects; import ru.gravit.launchserver.Reloadable; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.VerifyHelper; +import ru.gravit.utils.logging.LogHelper; public class ReloadManager { private final HashMap RELOADABLES = new HashMap<>(); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/Response.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/Response.java index cc1784d6..5701112b 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/Response.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/Response.java @@ -23,7 +23,7 @@ import ru.gravit.launchserver.response.update.ProfilesResponse; import ru.gravit.launchserver.response.update.UpdateListResponse; import ru.gravit.launchserver.response.update.UpdateResponse; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public abstract class Response { @FunctionalInterface diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthResponse.java index 5a0dfa35..8d365ee2 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthResponse.java @@ -21,9 +21,9 @@ import ru.gravit.launchserver.response.profile.ProfileByUUIDResponse; import ru.gravit.launchserver.socket.Client; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; import ru.gravit.utils.helper.VerifyHelper; +import ru.gravit.utils.logging.LogHelper; public final class AuthResponse extends Response { private static String echo(int length) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthServerResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthServerResponse.java index 1423faba..6850c896 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthServerResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthServerResponse.java @@ -18,9 +18,9 @@ import ru.gravit.launchserver.response.Response; import ru.gravit.launchserver.socket.Client; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; import ru.gravit.utils.helper.VerifyHelper; +import ru.gravit.utils.logging.LogHelper; public final class AuthServerResponse extends Response { private static String echo(int length) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/CheckServerResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/CheckServerResponse.java index b853872b..8a0fc1ba 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/CheckServerResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/CheckServerResponse.java @@ -11,8 +11,8 @@ import ru.gravit.launchserver.response.Response; import ru.gravit.launchserver.response.profile.ProfileByUUIDResponse; import ru.gravit.launchserver.socket.Client; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.VerifyHelper; +import ru.gravit.utils.logging.LogHelper; public final class CheckServerResponse extends Response { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/JoinServerResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/JoinServerResponse.java index 2bee7a78..79d13c11 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/JoinServerResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/JoinServerResponse.java @@ -9,9 +9,9 @@ import ru.gravit.launchserver.auth.AuthException; import ru.gravit.launchserver.response.Response; import ru.gravit.launchserver.socket.Client; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; import ru.gravit.utils.helper.VerifyHelper; +import ru.gravit.utils.logging.LogHelper; public final class JoinServerResponse extends Response { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/ProfileByUUIDResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/ProfileByUUIDResponse.java index 34f0506f..d84d4fb2 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/ProfileByUUIDResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/ProfileByUUIDResponse.java @@ -10,7 +10,7 @@ import ru.gravit.launcher.serialize.SerializeLimits; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.response.Response; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class ProfileByUUIDResponse extends Response { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/ProfilesResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/ProfilesResponse.java index eb672145..3dd26c5c 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/ProfilesResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/ProfilesResponse.java @@ -10,7 +10,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.response.Response; import ru.gravit.launchserver.socket.Client; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class ProfilesResponse extends Response { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/NettyServerSocketHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/NettyServerSocketHandler.java index 0a23981d..09389192 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/NettyServerSocketHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/NettyServerSocketHandler.java @@ -50,8 +50,8 @@ import ru.gravit.launchserver.response.Response; import ru.gravit.launchserver.socket.websocket.WebSocketFrameHandler; import ru.gravit.utils.helper.CommonHelper; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.VerifyHelper; +import ru.gravit.utils.logging.LogHelper; @SuppressWarnings({"unused", "rawtypes"}) public final class NettyServerSocketHandler implements Runnable, AutoCloseable { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java index b1f4d20d..9cc2a191 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java @@ -14,8 +14,8 @@ import ru.gravit.launchserver.manangers.hook.SocketHookManager; import ru.gravit.launchserver.response.Response; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; +import ru.gravit.utils.logging.LogHelper; public final class ResponseThread implements Runnable { class Handshake { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ServerSocketHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ServerSocketHandler.java index 93fb1ce3..d2eef2f1 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ServerSocketHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ServerSocketHandler.java @@ -16,7 +16,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.manangers.SessionManager; import ru.gravit.utils.helper.CommonHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class ServerSocketHandler implements Runnable, AutoCloseable { public interface Listener { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketFrameHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketFrameHandler.java index 7f548c8d..1308f29b 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketFrameHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketFrameHandler.java @@ -11,7 +11,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.socket.Client; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public class WebSocketFrameHandler extends SimpleChannelInboundHandler { public static LaunchServer server; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketService.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketService.java index a18ff095..f8a481d4 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketService.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketService.java @@ -22,7 +22,7 @@ import ru.gravit.launchserver.socket.websocket.json.auth.JoinServerResponse; import ru.gravit.launchserver.socket.websocket.json.update.LauncherResponse; import ru.gravit.launchserver.socket.websocket.json.update.UpdateListResponse; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; @SuppressWarnings({"unused", "rawtypes"}) public class WebSocketService { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/EchoResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/EchoResponse.java index 8fba54b4..0b664ff5 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/EchoResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/EchoResponse.java @@ -3,7 +3,7 @@ import io.netty.channel.ChannelHandlerContext; import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.websocket.WebSocketService; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public class EchoResponse implements JsonResponseInterface { public final String echo; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/CheckServerResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/CheckServerResponse.java index c88c8486..f39c5dbf 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/CheckServerResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/CheckServerResponse.java @@ -6,7 +6,7 @@ import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public class CheckServerResponse implements JsonResponseInterface { public String serverID; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/JoinServerResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/JoinServerResponse.java index 0ece3b78..214f0468 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/JoinServerResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/JoinServerResponse.java @@ -6,7 +6,7 @@ import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public class JoinServerResponse implements JsonResponseInterface { public String serverID; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/texture/RequestTextureProvider.java b/LaunchServer/src/main/java/ru/gravit/launchserver/texture/RequestTextureProvider.java index 0f05a421..0518392e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/texture/RequestTextureProvider.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/texture/RequestTextureProvider.java @@ -8,7 +8,7 @@ import ru.gravit.launcher.profiles.Texture; import ru.gravit.utils.helper.CommonHelper; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public final class RequestTextureProvider extends TextureProvider { public RequestTextureProvider() { diff --git a/Launcher/src/main/java/ru/gravit/launcher/ClientLauncherWrapper.java b/Launcher/src/main/java/ru/gravit/launcher/ClientLauncherWrapper.java index c8b4c21f..ae708b2c 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/ClientLauncherWrapper.java +++ b/Launcher/src/main/java/ru/gravit/launcher/ClientLauncherWrapper.java @@ -4,7 +4,7 @@ import ru.gravit.utils.helper.EnvHelper; import ru.gravit.utils.helper.IOHelper; import ru.gravit.utils.helper.JVMHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; import java.io.IOException; import java.nio.file.Path; diff --git a/Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java b/Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java index efa612fd..e8ccfd78 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java +++ b/Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java @@ -5,6 +5,7 @@ import ru.gravit.launcher.gui.JSRuntimeProvider; import ru.gravit.launcher.gui.RuntimeProvider; import ru.gravit.utils.helper.*; +import ru.gravit.utils.logging.LogHelper; import java.time.Duration; import java.time.Instant; diff --git a/Launcher/src/main/java/ru/gravit/launcher/RequestWorker.java b/Launcher/src/main/java/ru/gravit/launcher/RequestWorker.java index bbb44ead..8c868911 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/RequestWorker.java +++ b/Launcher/src/main/java/ru/gravit/launcher/RequestWorker.java @@ -1,10 +1,10 @@ package ru.gravit.launcher; -import ru.gravit.utils.helper.LogHelper; - import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; +import ru.gravit.utils.logging.LogHelper; + public class RequestWorker implements Runnable { public RequestWorker() { queue = new LinkedBlockingQueue<>(64); diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java b/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java index 7ee61ac1..071f31e8 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java +++ b/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java @@ -18,6 +18,7 @@ import ru.gravit.utils.PublicURLClassLoader; import ru.gravit.utils.helper.*; import ru.gravit.utils.helper.JVMHelper.OS; +import ru.gravit.utils.logging.LogHelper; import javax.swing.*; import java.io.IOException; diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/FunctionalBridge.java b/Launcher/src/main/java/ru/gravit/launcher/client/FunctionalBridge.java index 6d9cf772..a5aeae45 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/FunctionalBridge.java +++ b/Launcher/src/main/java/ru/gravit/launcher/client/FunctionalBridge.java @@ -13,7 +13,7 @@ import ru.gravit.launcher.request.update.LegacyLauncherRequest; import ru.gravit.launcher.request.websockets.RequestInterface; import ru.gravit.launcher.serialize.signed.SignedObjectHolder; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; import java.io.IOException; import java.nio.file.Path; diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/LauncherSettings.java b/Launcher/src/main/java/ru/gravit/launcher/client/LauncherSettings.java index 49a079fd..accf51de 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/LauncherSettings.java +++ b/Launcher/src/main/java/ru/gravit/launcher/client/LauncherSettings.java @@ -8,6 +8,7 @@ import ru.gravit.launcher.serialize.HOutput; import ru.gravit.launcher.serialize.signed.SignedObjectHolder; import ru.gravit.utils.helper.*; +import ru.gravit.utils.logging.LogHelper; import javax.crypto.BadPaddingException; import javax.crypto.IllegalBlockSizeException; diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/ServerPinger.java b/Launcher/src/main/java/ru/gravit/launcher/client/ServerPinger.java index 6052e4eb..fb37912f 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/ServerPinger.java +++ b/Launcher/src/main/java/ru/gravit/launcher/client/ServerPinger.java @@ -7,8 +7,8 @@ import ru.gravit.launcher.serialize.HInput; import ru.gravit.launcher.serialize.HOutput; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.VerifyHelper; +import ru.gravit.utils.logging.LogHelper; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/Launcher/src/main/java/ru/gravit/launcher/gui/JSRuntimeProvider.java b/Launcher/src/main/java/ru/gravit/launcher/gui/JSRuntimeProvider.java index ec550573..bdd08af0 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/gui/JSRuntimeProvider.java +++ b/Launcher/src/main/java/ru/gravit/launcher/gui/JSRuntimeProvider.java @@ -37,6 +37,7 @@ import ru.gravit.launcher.serialize.stream.StreamObject; import ru.gravit.utils.HTTPRequest; import ru.gravit.utils.helper.*; +import ru.gravit.utils.logging.LogHelper; import javax.script.*; import java.io.BufferedReader; diff --git a/Launcher/src/main/java/ru/gravit/launcher/gui/indicator/RingProgressIndicator.java b/Launcher/src/main/java/ru/gravit/launcher/gui/indicator/RingProgressIndicator.java index 11c04589..718b350f 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/gui/indicator/RingProgressIndicator.java +++ b/Launcher/src/main/java/ru/gravit/launcher/gui/indicator/RingProgressIndicator.java @@ -9,7 +9,7 @@ import javafx.scene.control.Control; import javafx.scene.control.Skin; import ru.gravit.launcher.LauncherAPI; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; import java.util.ArrayList; import java.util.Collections; diff --git a/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java b/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java index 872bb4a7..e433b654 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java +++ b/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java @@ -5,7 +5,7 @@ import ru.gravit.launcher.HWID; import ru.gravit.launcher.LauncherHWIDInterface; import ru.gravit.launcher.OshiHWID; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public class OshiHWIDProvider implements LauncherHWIDInterface { public SystemInfo systemInfo; diff --git a/Launcher/src/main/java/ru/gravit/launcher/managers/HasherStore.java b/Launcher/src/main/java/ru/gravit/launcher/managers/HasherStore.java index 2270d2c6..f4caee0e 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/managers/HasherStore.java +++ b/Launcher/src/main/java/ru/gravit/launcher/managers/HasherStore.java @@ -6,7 +6,7 @@ import ru.gravit.launcher.hasher.HashedEntry; import ru.gravit.launcher.profiles.ClientProfile; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; import java.io.IOException; import java.nio.file.Files; diff --git a/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/CompatBridge.java b/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/CompatBridge.java index b722c10b..65d01086 100644 --- a/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/CompatBridge.java +++ b/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/CompatBridge.java @@ -8,7 +8,7 @@ import ru.gravit.launcher.request.uuid.ProfileByUUIDRequest; import ru.gravit.launcher.request.uuid.ProfileByUsernameRequest; import ru.gravit.launcher.serialize.SerializeLimits; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/LegacyBridge.java b/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/LegacyBridge.java index 378145e6..39f5eca1 100644 --- a/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/LegacyBridge.java +++ b/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/LegacyBridge.java @@ -5,7 +5,7 @@ import ru.gravit.launcher.request.auth.JoinServerRequest; import ru.gravit.utils.helper.CommonHelper; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; // Used by 1.6.4 and below versions @LauncherAPI diff --git a/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilAuthenticationService.java b/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilAuthenticationService.java index 6579f2e4..b6c8c7eb 100644 --- a/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilAuthenticationService.java +++ b/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilAuthenticationService.java @@ -5,7 +5,8 @@ import com.mojang.authlib.GameProfileRepository; import com.mojang.authlib.UserAuthentication; import com.mojang.authlib.minecraft.MinecraftSessionService; -import ru.gravit.utils.helper.LogHelper; + +import ru.gravit.utils.logging.LogHelper; import java.net.Proxy; diff --git a/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java index d869426e..503d0efb 100644 --- a/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java +++ b/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java @@ -7,8 +7,8 @@ import ru.gravit.launcher.profiles.PlayerProfile; import ru.gravit.launcher.request.uuid.BatchProfileByUsernameRequest; import ru.gravit.launcher.serialize.SerializeLimits; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.VerifyHelper; +import ru.gravit.utils.logging.LogHelper; import java.util.Arrays; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java b/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java index 3328195f..e6681e3d 100644 --- a/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java +++ b/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java @@ -18,8 +18,8 @@ import ru.gravit.launcher.request.auth.JoinServerRequest; import ru.gravit.launcher.request.uuid.ProfileByUUIDRequest; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; +import ru.gravit.utils.logging.LogHelper; import java.net.InetAddress; import java.util.Base64; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/CheckServerRequest.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/CheckServerRequest.java index fff01495..02f40e7a 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/CheckServerRequest.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/CheckServerRequest.java @@ -9,8 +9,8 @@ import ru.gravit.launcher.serialize.HInput; import ru.gravit.launcher.serialize.HOutput; import ru.gravit.launcher.serialize.SerializeLimits; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.VerifyHelper; +import ru.gravit.utils.logging.LogHelper; import java.io.IOException; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/LauncherRequest.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/LauncherRequest.java index adf44662..514652e5 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/LauncherRequest.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/LauncherRequest.java @@ -9,8 +9,8 @@ import ru.gravit.launcher.serialize.HOutput; import ru.gravit.utils.helper.IOHelper; import ru.gravit.utils.helper.JVMHelper; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; +import ru.gravit.utils.logging.LogHelper; import java.io.IOException; import java.nio.file.Path; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/LegacyLauncherRequest.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/LegacyLauncherRequest.java index c387c5b6..2d51f3e6 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/LegacyLauncherRequest.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/LegacyLauncherRequest.java @@ -11,8 +11,8 @@ import ru.gravit.launcher.serialize.HOutput; import ru.gravit.utils.helper.IOHelper; import ru.gravit.utils.helper.JVMHelper; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; +import ru.gravit.utils.logging.LogHelper; import java.io.IOException; import java.nio.file.Path; diff --git a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerAgent.java b/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerAgent.java index 2b248e36..866225a2 100644 --- a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerAgent.java +++ b/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerAgent.java @@ -1,7 +1,7 @@ package ru.gravit.launcher.server; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; import java.io.IOException; import java.lang.instrument.Instrumentation; diff --git a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java b/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java index 8fa85a88..500b6a7f 100644 --- a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java +++ b/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java @@ -12,8 +12,8 @@ import ru.gravit.utils.PublicURLClassLoader; import ru.gravit.utils.helper.CommonHelper; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; +import ru.gravit.utils.logging.LogHelper; import java.io.*; import java.lang.invoke.MethodHandle; diff --git a/libLauncher/src/main/java/ru/gravit/launcher/LauncherAgent.java b/libLauncher/src/main/java/ru/gravit/launcher/LauncherAgent.java index 19b6794e..2cc17d30 100644 --- a/libLauncher/src/main/java/ru/gravit/launcher/LauncherAgent.java +++ b/libLauncher/src/main/java/ru/gravit/launcher/LauncherAgent.java @@ -1,11 +1,11 @@ package ru.gravit.launcher; -import ru.gravit.utils.helper.LogHelper; - import java.io.IOException; import java.lang.instrument.Instrumentation; import java.util.jar.JarFile; +import ru.gravit.utils.logging.LogHelper; + @LauncherAPI public final class LauncherAgent { private static boolean isAgentStarted = false; diff --git a/libLauncher/src/main/java/ru/gravit/launcher/LauncherConfig.java b/libLauncher/src/main/java/ru/gravit/launcher/LauncherConfig.java index 067df7a0..852ed51d 100644 --- a/libLauncher/src/main/java/ru/gravit/launcher/LauncherConfig.java +++ b/libLauncher/src/main/java/ru/gravit/launcher/LauncherConfig.java @@ -3,9 +3,9 @@ import ru.gravit.launcher.serialize.HInput; import ru.gravit.launcher.serialize.HOutput; import ru.gravit.launcher.serialize.stream.StreamObject; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; import ru.gravit.utils.helper.VerifyHelper; +import ru.gravit.utils.logging.LogHelper; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/libLauncher/src/main/java/ru/gravit/launcher/hasher/DirWatcher.java b/libLauncher/src/main/java/ru/gravit/launcher/hasher/DirWatcher.java index 582e7955..3a12a868 100644 --- a/libLauncher/src/main/java/ru/gravit/launcher/hasher/DirWatcher.java +++ b/libLauncher/src/main/java/ru/gravit/launcher/hasher/DirWatcher.java @@ -8,7 +8,7 @@ import ru.gravit.utils.helper.IOHelper; import ru.gravit.utils.helper.JVMHelper; import ru.gravit.utils.helper.JVMHelper.OS; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; import java.io.IOException; import java.nio.file.*; diff --git a/libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedDir.java b/libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedDir.java index beec1595..1a676267 100644 --- a/libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedDir.java +++ b/libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedDir.java @@ -5,8 +5,8 @@ import ru.gravit.launcher.serialize.HOutput; import ru.gravit.launcher.serialize.stream.EnumSerializer; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.VerifyHelper; +import ru.gravit.utils.logging.LogHelper; import java.io.IOException; import java.nio.file.FileVisitResult; diff --git a/libLauncher/src/main/java/ru/gravit/launcher/modules/SimpleModuleManager.java b/libLauncher/src/main/java/ru/gravit/launcher/modules/SimpleModuleManager.java index 91771546..6c74a397 100644 --- a/libLauncher/src/main/java/ru/gravit/launcher/modules/SimpleModuleManager.java +++ b/libLauncher/src/main/java/ru/gravit/launcher/modules/SimpleModuleManager.java @@ -2,7 +2,7 @@ import ru.gravit.utils.PublicURLClassLoader; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; import java.io.IOException; import java.net.URISyntaxException; diff --git a/libLauncher/src/main/java/ru/gravit/utils/HttpDownloader.java b/libLauncher/src/main/java/ru/gravit/utils/HttpDownloader.java index a73bca13..71b7eb3d 100644 --- a/libLauncher/src/main/java/ru/gravit/utils/HttpDownloader.java +++ b/libLauncher/src/main/java/ru/gravit/utils/HttpDownloader.java @@ -1,7 +1,7 @@ package ru.gravit.utils; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; import java.io.BufferedInputStream; import java.io.FileOutputStream; diff --git a/libLauncher/src/main/java/ru/gravit/utils/NativeJVMHalt.java b/libLauncher/src/main/java/ru/gravit/utils/NativeJVMHalt.java index 9d067daf..91afb48d 100644 --- a/libLauncher/src/main/java/ru/gravit/utils/NativeJVMHalt.java +++ b/libLauncher/src/main/java/ru/gravit/utils/NativeJVMHalt.java @@ -1,6 +1,6 @@ package ru.gravit.utils; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; public class NativeJVMHalt { public NativeJVMHalt(int haltCode) { diff --git a/libLauncher/src/main/java/ru/gravit/utils/downloader/Downloader.java b/libLauncher/src/main/java/ru/gravit/utils/downloader/Downloader.java index 12dfa4c1..a3c4dada 100644 --- a/libLauncher/src/main/java/ru/gravit/utils/downloader/Downloader.java +++ b/libLauncher/src/main/java/ru/gravit/utils/downloader/Downloader.java @@ -1,7 +1,7 @@ package ru.gravit.utils.downloader; import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; import javax.net.ssl.HttpsURLConnection; import java.io.BufferedInputStream; diff --git a/libLauncher/src/main/java/ru/gravit/utils/event/EventManager.java b/libLauncher/src/main/java/ru/gravit/utils/event/EventManager.java index d592fd65..2e46abc4 100644 --- a/libLauncher/src/main/java/ru/gravit/utils/event/EventManager.java +++ b/libLauncher/src/main/java/ru/gravit/utils/event/EventManager.java @@ -1,7 +1,7 @@ package ru.gravit.utils.event; import ru.gravit.utils.helper.CommonHelper; -import ru.gravit.utils.helper.LogHelper; +import ru.gravit.utils.logging.LogHelper; import java.util.ArrayList; import java.util.Arrays; diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/IOHelper.java b/libLauncher/src/main/java/ru/gravit/utils/helper/IOHelper.java index 05514c30..aa86d3ed 100644 --- a/libLauncher/src/main/java/ru/gravit/utils/helper/IOHelper.java +++ b/libLauncher/src/main/java/ru/gravit/utils/helper/IOHelper.java @@ -2,6 +2,7 @@ import ru.gravit.launcher.Launcher; import ru.gravit.launcher.LauncherAPI; +import ru.gravit.utils.logging.LogHelper; import javax.imageio.ImageIO; import javax.imageio.ImageReader; diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/JVMHelper.java b/libLauncher/src/main/java/ru/gravit/utils/helper/JVMHelper.java index 32b66599..46dc1eee 100644 --- a/libLauncher/src/main/java/ru/gravit/utils/helper/JVMHelper.java +++ b/libLauncher/src/main/java/ru/gravit/utils/helper/JVMHelper.java @@ -1,6 +1,7 @@ package ru.gravit.utils.helper; import ru.gravit.launcher.LauncherAPI; +import ru.gravit.utils.logging.LogHelper; import java.io.File; import java.lang.invoke.MethodHandles; diff --git a/libLauncher/src/main/java/ru/gravit/utils/logging/ILogHandler.java b/libLauncher/src/main/java/ru/gravit/utils/logging/ILogHandler.java new file mode 100644 index 00000000..7d42c985 --- /dev/null +++ b/libLauncher/src/main/java/ru/gravit/utils/logging/ILogHandler.java @@ -0,0 +1,7 @@ +package ru.gravit.utils.logging; + +public interface ILogHandler { + boolean canExc(Throwable t); + String exc(Throwable t); + String process(String str); +} diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/LogHelper.java b/libLauncher/src/main/java/ru/gravit/utils/logging/LogHelper.java similarity index 96% rename from libLauncher/src/main/java/ru/gravit/utils/helper/LogHelper.java rename to libLauncher/src/main/java/ru/gravit/utils/logging/LogHelper.java index 47acb689..34e47331 100644 --- a/libLauncher/src/main/java/ru/gravit/utils/helper/LogHelper.java +++ b/libLauncher/src/main/java/ru/gravit/utils/logging/LogHelper.java @@ -1,4 +1,4 @@ -package ru.gravit.utils.helper; +package ru.gravit.utils.logging; import org.fusesource.jansi.Ansi; import org.fusesource.jansi.Ansi.Color; @@ -6,6 +6,7 @@ import org.fusesource.jansi.AnsiOutputStream; import ru.gravit.launcher.Launcher; import ru.gravit.launcher.LauncherAPI; +import ru.gravit.utils.helper.IOHelper; import java.io.*; import java.nio.file.Path; @@ -34,7 +35,8 @@ public final class LogHelper { private static final AtomicBoolean STACKTRACE_ENABLED = new AtomicBoolean(Boolean.getBoolean(STACKTRACE_PROPERTY)); private static final Set OUTPUTS = Collections.newSetFromMap(new ConcurrentHashMap<>(2)); private static final Output STD_OUTPUT; - + public static ILogHandler handler = null; + private LogHelper() { } @@ -71,7 +73,7 @@ public static void debug(String format, Object... args) { @LauncherAPI public static void error(Throwable exc) { - error(isStacktraceEnabled() ? toString(exc) : exc.toString()); + error(handler.canExc(exc) ? handler.exc(exc) : isStacktraceEnabled() ? toString(exc) : exc.toString()); } @LauncherAPI @@ -117,8 +119,8 @@ public static void setStacktraceEnabled(boolean stacktraceEnabled) { @LauncherAPI public static void log(Level level, String message, boolean sub) { String dateTime = DATE_TIME_FORMATTER.format(LocalDateTime.now()); - println(JANSI ? ansiFormatLog(level, dateTime, message, sub) : - formatLog(level, message, dateTime, sub)); + println(JANSI ? ansiFormatLog(level, dateTime, handler.process(message), sub) : + formatLog(level, handler.process(message), dateTime, sub)); } @LauncherAPI @@ -279,7 +281,7 @@ private static String formatLicense(String product) { return String.format("License for %s GPLv3. SourceCode: https://github.com/GravitLauncher/Launcher", product); } - static { + static { // Use JAnsi if available boolean jansi; try {