[REFACTOR] Renaming

GravitLauncher · Dec 23, 2023 · ee11966 · ee11966
1 parent 9b1740c
commit ee11966
Show file tree

Hide file tree

Showing 41 changed files with 145 additions and 145 deletions.
diff --git a/AdditionalHash_module/src/main/java/pro/gravit/launchermodules/addhash/AddHashModule.java b/AdditionalHash_module/src/main/java/pro/gravit/launchermodules/addhash/AddHashModule.java
@@ -1,9 +1,9 @@
 package pro.gravit.launchermodules.addhash;
 
-import pro.gravit.launcher.modules.LauncherInitContext;
-import pro.gravit.launcher.modules.LauncherModule;
-import pro.gravit.launcher.modules.LauncherModuleInfo;
-import pro.gravit.launcher.modules.events.PreConfigPhase;
+import pro.gravit.launcher.base.modules.LauncherInitContext;
+import pro.gravit.launcher.base.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModuleInfo;
+import pro.gravit.launcher.base.modules.events.PreConfigPhase;
 import pro.gravit.launchermodules.addhash.verifier.BCryptPasswordVerifier;
 import pro.gravit.launchermodules.addhash.verifier.PhpHashPasswordVerifier;
 import pro.gravit.launchserver.auth.password.PasswordVerifier;

diff --git a/...tConsole_module/src/main/java/pro/gravit/launchermodules/discordbot/DiscordBotModule.java b/...tConsole_module/src/main/java/pro/gravit/launchermodules/discordbot/DiscordBotModule.java
@@ -4,10 +4,10 @@
 import net.dv8tion.jda.api.MessageBuilder;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.config.JsonConfigurable;
-import pro.gravit.launcher.modules.LauncherInitContext;
-import pro.gravit.launcher.modules.LauncherModule;
-import pro.gravit.launcher.modules.LauncherModuleInfo;
+import pro.gravit.launcher.base.config.JsonConfigurable;
+import pro.gravit.launcher.base.modules.LauncherInitContext;
+import pro.gravit.launcher.base.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModuleInfo;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.modules.events.LaunchServerFullInitEvent;
 import pro.gravit.launchserver.modules.impl.LaunchServerInitContext;

diff --git a/DiscordGame_lmodule/src/main/java/pro/gravit/launcher/client/api/DiscordActivityService.java b/DiscordGame_lmodule/src/main/java/pro/gravit/launcher/client/api/DiscordActivityService.java
@@ -4,8 +4,8 @@
 import de.jcm.discordgamesdk.activity.Activity;
 import de.jcm.discordgamesdk.activity.ActivityButton;
 import de.jcm.discordgamesdk.activity.ActivityButtonsMode;
-import pro.gravit.launcher.client.runtime.client.ClientParams;
-import pro.gravit.launcher.profiles.PlayerProfile;
+import pro.gravit.launcher.client.ClientParams;
+import pro.gravit.launcher.base.profiles.PlayerProfile;
 import pro.gravit.launchermodules.discordgame.ClientModule;
 import pro.gravit.launchermodules.discordgame.DiscordBridge;
 import pro.gravit.launchermodules.discordgame.ScopeConfig;

diff --git a/DiscordGame_lmodule/src/main/java/pro/gravit/launchermodules/discordgame/ClientModule.java b/DiscordGame_lmodule/src/main/java/pro/gravit/launchermodules/discordgame/ClientModule.java
@@ -1,14 +1,14 @@
 package pro.gravit.launchermodules.discordgame;
 
-import pro.gravit.launcher.client.runtime.client.events.ClientEngineInitPhase;
-import pro.gravit.launcher.client.runtime.client.events.ClientExitPhase;
-import pro.gravit.launcher.client.runtime.client.events.ClientUnlockConsoleEvent;
-import pro.gravit.launcher.client.runtime.client.events.client.ClientProcessBuilderParamsWrittedEvent;
-import pro.gravit.launcher.client.runtime.client.events.client.ClientProcessLaunchEvent;
-import pro.gravit.launcher.modules.LauncherInitContext;
-import pro.gravit.launcher.modules.LauncherModule;
-import pro.gravit.launcher.modules.LauncherModuleInfo;
-import pro.gravit.launcher.request.Request;
+import pro.gravit.launcher.runtime.client.events.ClientEngineInitPhase;
+import pro.gravit.launcher.client.events.ClientExitPhase;
+import pro.gravit.launcher.client.events.ClientUnlockConsoleEvent;
+import pro.gravit.launcher.runtime.client.events.ClientProcessBuilderParamsWrittedEvent;
+import pro.gravit.launcher.client.events.ClientProcessLaunchEvent;
+import pro.gravit.launcher.base.modules.LauncherInitContext;
+import pro.gravit.launcher.base.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModuleInfo;
+import pro.gravit.launcher.base.request.Request;
 import pro.gravit.launchermodules.discordgame.commands.DiscordCommand;
 import pro.gravit.utils.Version;
 import pro.gravit.utils.helper.LogHelper;

diff --git a/DiscordGame_lmodule/src/main/java/pro/gravit/launchermodules/discordgame/DiscordBridge.java b/DiscordGame_lmodule/src/main/java/pro/gravit/launchermodules/discordgame/DiscordBridge.java
@@ -6,8 +6,8 @@
 import de.jcm.discordgamesdk.LogLevel;
 import de.jcm.discordgamesdk.activity.Activity;
 import pro.gravit.launcher.client.api.DiscordActivityService;
-import pro.gravit.launcher.client.runtime.LauncherEngine;
-import pro.gravit.launcher.client.runtime.client.ClientLauncherEntryPoint;
+import pro.gravit.launcher.runtime.LauncherEngine;
+import pro.gravit.launcher.client.ClientLauncherEntryPoint;
 import pro.gravit.launchermodules.discordgame.event.DiscordInitEvent;
 import pro.gravit.utils.helper.*;
 

diff --git a/...ame_lmodule/src/main/java/pro/gravit/launchermodules/discordgame/RequestEventWatcher.java b/...ame_lmodule/src/main/java/pro/gravit/launchermodules/discordgame/RequestEventWatcher.java
@@ -1,9 +1,9 @@
 package pro.gravit.launchermodules.discordgame;
 
-import pro.gravit.launcher.events.request.AuthRequestEvent;
-import pro.gravit.launcher.events.request.ExitRequestEvent;
-import pro.gravit.launcher.request.RequestService;
-import pro.gravit.launcher.request.WebSocketEvent;
+import pro.gravit.launcher.base.events.request.AuthRequestEvent;
+import pro.gravit.launcher.base.events.request.ExitRequestEvent;
+import pro.gravit.launcher.base.request.RequestService;
+import pro.gravit.launcher.base.request.WebSocketEvent;
 
 public class RequestEventWatcher implements RequestService.EventHandler {
     public static RequestEventWatcher INSTANCE;

diff --git a/..._lmodule/src/main/java/pro/gravit/launchermodules/discordgame/event/DiscordInitEvent.java b/..._lmodule/src/main/java/pro/gravit/launchermodules/discordgame/event/DiscordInitEvent.java
@@ -1,7 +1,7 @@
 package pro.gravit.launchermodules.discordgame.event;
 
 import de.jcm.discordgamesdk.Core;
-import pro.gravit.launcher.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModule;
 
 public class DiscordInitEvent extends LauncherModule.Event {
     public final Core core;

diff --git a/..._module/src/main/java/pro/gravit/launchermodules/fileauthsystem/FileAuthSystemModule.java b/..._module/src/main/java/pro/gravit/launchermodules/fileauthsystem/FileAuthSystemModule.java
@@ -1,10 +1,10 @@
 package pro.gravit.launchermodules.fileauthsystem;
 
-import pro.gravit.launcher.config.JsonConfigurable;
-import pro.gravit.launcher.modules.LauncherInitContext;
-import pro.gravit.launcher.modules.LauncherModule;
-import pro.gravit.launcher.modules.LauncherModuleInfo;
-import pro.gravit.launcher.modules.events.PreConfigPhase;
+import pro.gravit.launcher.base.config.JsonConfigurable;
+import pro.gravit.launcher.base.modules.LauncherInitContext;
+import pro.gravit.launcher.base.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModuleInfo;
+import pro.gravit.launcher.base.modules.events.PreConfigPhase;
 import pro.gravit.launchermodules.fileauthsystem.providers.FileSystemAuthCoreProvider;
 import pro.gravit.launchserver.auth.core.AuthCoreProvider;
 import pro.gravit.launchserver.modules.events.LaunchServerFullInitEvent;

diff --git a/.../java/pro/gravit/launchermodules/fileauthsystem/providers/FileSystemAuthCoreProvider.java b/.../java/pro/gravit/launchermodules/fileauthsystem/providers/FileSystemAuthCoreProvider.java
@@ -3,12 +3,12 @@
 import com.google.gson.reflect.TypeToken;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.ClientPermissions;
-import pro.gravit.launcher.Launcher;
-import pro.gravit.launcher.profiles.Texture;
-import pro.gravit.launcher.request.RequestException;
-import pro.gravit.launcher.request.auth.AuthRequest;
-import pro.gravit.launcher.request.auth.password.AuthPlainPassword;
+import pro.gravit.launcher.base.ClientPermissions;
+import pro.gravit.launcher.base.Launcher;
+import pro.gravit.launcher.base.profiles.Texture;
+import pro.gravit.launcher.base.request.RequestException;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
+import pro.gravit.launcher.base.request.auth.password.AuthPlainPassword;
 import pro.gravit.launchermodules.fileauthsystem.FileAuthSystemConfig;
 import pro.gravit.launchermodules.fileauthsystem.FileAuthSystemModule;
 import pro.gravit.launchserver.LaunchServer;

diff --git a/.../main/java/pro/gravit/launchermodules/generatecertificate/GenerateCertificateCommand.java b/.../main/java/pro/gravit/launchermodules/generatecertificate/GenerateCertificateCommand.java
@@ -19,7 +19,7 @@
 import org.bouncycastle.pkcs.bc.BcPKCS12MacCalculatorBuilder;
 import org.bouncycastle.pkcs.bc.BcPKCS12PBEOutputEncryptorBuilder;
 import org.bouncycastle.pkcs.jcajce.JcaPKCS12SafeBagBuilder;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
 import pro.gravit.launchserver.config.LaunchServerConfig;

diff --git a/...c/main/java/pro/gravit/launchermodules/generatecertificate/GenerateCertificateModule.java b/...c/main/java/pro/gravit/launchermodules/generatecertificate/GenerateCertificateModule.java
@@ -1,8 +1,8 @@
 package pro.gravit.launchermodules.generatecertificate;
 
-import pro.gravit.launcher.modules.LauncherInitContext;
-import pro.gravit.launcher.modules.LauncherModule;
-import pro.gravit.launcher.modules.LauncherModuleInfo;
+import pro.gravit.launcher.base.modules.LauncherInitContext;
+import pro.gravit.launcher.base.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModuleInfo;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.modules.events.LaunchServerFullInitEvent;
 import pro.gravit.launchserver.modules.impl.LaunchServerInitContext;

diff --git a/LauncherGuard_lmodule/src/main/java/pro/gravit/launchermodules/guard/Config.java b/LauncherGuard_lmodule/src/main/java/pro/gravit/launchermodules/guard/Config.java
@@ -1,6 +1,6 @@
 package pro.gravit.launchermodules.guard;
 
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launcher.core.LauncherInject;
 import pro.gravit.utils.helper.JVMHelper;
 

diff --git a/LauncherGuard_lmodule/src/main/java/pro/gravit/launchermodules/guard/ModuleImpl.java b/LauncherGuard_lmodule/src/main/java/pro/gravit/launchermodules/guard/ModuleImpl.java
@@ -1,17 +1,17 @@
 package pro.gravit.launchermodules.guard;
 
-import pro.gravit.launcher.client.runtime.client.DirBridge;
-import pro.gravit.launcher.client.runtime.client.events.ClientExitPhase;
-import pro.gravit.launcher.client.runtime.client.events.ClientGuiPhase;
-import pro.gravit.launcher.client.runtime.client.events.ClientPreGuiPhase;
-import pro.gravit.launcher.client.runtime.client.events.client.ClientProcessBuilderCreateEvent;
-import pro.gravit.launcher.client.runtime.client.events.client.ClientProcessPreInvokeMainClassEvent;
+import pro.gravit.launcher.runtime.client.DirBridge;
+import pro.gravit.launcher.client.events.ClientExitPhase;
+import pro.gravit.launcher.runtime.client.events.ClientGuiPhase;
+import pro.gravit.launcher.runtime.client.events.ClientPreGuiPhase;
+import pro.gravit.launcher.runtime.client.events.ClientProcessBuilderCreateEvent;
+import pro.gravit.launcher.client.events.ClientProcessPreInvokeMainClassEvent;
 import pro.gravit.launcher.start.ClientLauncherWrapper;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launcher.start.ClientWrapperModule;
-import pro.gravit.launcher.modules.LauncherInitContext;
-import pro.gravit.launcher.modules.LauncherModule;
-import pro.gravit.launcher.modules.LauncherModuleInfo;
+import pro.gravit.launcher.base.modules.LauncherInitContext;
+import pro.gravit.launcher.base.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModuleInfo;
 import pro.gravit.utils.Version;
 import pro.gravit.utils.helper.*;
 

diff --git a/...rStartScreen_lmodule/src/main/java/pro/gravit/launchermodules/startscreen/ModuleImpl.java b/...rStartScreen_lmodule/src/main/java/pro/gravit/launchermodules/startscreen/ModuleImpl.java
@@ -1,12 +1,12 @@
 package pro.gravit.launchermodules.startscreen;
 
-import pro.gravit.launcher.client.runtime.client.events.ClientExitPhase;
-import pro.gravit.launcher.client.runtime.client.events.ClientGuiPhase;
-import pro.gravit.launcher.client.runtime.client.events.ClientPreGuiPhase;
-import pro.gravit.launcher.client.runtime.client.events.client.ClientProcessPreInvokeMainClassEvent;
-import pro.gravit.launcher.modules.LauncherInitContext;
-import pro.gravit.launcher.modules.LauncherModule;
-import pro.gravit.launcher.modules.LauncherModuleInfo;
+import pro.gravit.launcher.client.events.ClientExitPhase;
+import pro.gravit.launcher.runtime.client.events.ClientGuiPhase;
+import pro.gravit.launcher.runtime.client.events.ClientPreGuiPhase;
+import pro.gravit.launcher.client.events.ClientProcessPreInvokeMainClassEvent;
+import pro.gravit.launcher.base.modules.LauncherInitContext;
+import pro.gravit.launcher.base.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModuleInfo;
 import pro.gravit.utils.Version;
 import pro.gravit.utils.helper.IOHelper;
 import pro.gravit.utils.helper.LogHelper;

diff --git a/MirrorHelper_module/src/main/java/pro/gravit/launchermodules/mirrorhelper/InstallClient.java b/MirrorHelper_module/src/main/java/pro/gravit/launchermodules/mirrorhelper/InstallClient.java
@@ -4,10 +4,10 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
-import pro.gravit.launcher.Launcher;
-import pro.gravit.launcher.modern.Downloader;
-import pro.gravit.launcher.profiles.ClientProfile;
-import pro.gravit.launcher.profiles.ClientProfileVersions;
+import pro.gravit.launcher.base.Launcher;
+import pro.gravit.launcher.base.Downloader;
+import pro.gravit.launcher.base.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfileVersions;
 import pro.gravit.launchermodules.mirrorhelper.commands.DeDupLibrariesCommand;
 import pro.gravit.launchermodules.mirrorhelper.installers.FabricInstallerCommand;
 import pro.gravit.launchermodules.mirrorhelper.installers.QuiltInstallerCommand;

diff --git a/...lper_module/src/main/java/pro/gravit/launchermodules/mirrorhelper/MirrorHelperModule.java b/...lper_module/src/main/java/pro/gravit/launchermodules/mirrorhelper/MirrorHelperModule.java
@@ -2,11 +2,11 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
-import pro.gravit.launcher.config.JsonConfigurable;
-import pro.gravit.launcher.modules.LauncherInitContext;
-import pro.gravit.launcher.modules.LauncherModule;
-import pro.gravit.launcher.modules.LauncherModuleInfo;
+import pro.gravit.launcher.base.Launcher;
+import pro.gravit.launcher.base.config.JsonConfigurable;
+import pro.gravit.launcher.base.modules.LauncherInitContext;
+import pro.gravit.launcher.base.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModuleInfo;
 import pro.gravit.launchermodules.mirrorhelper.commands.*;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.modules.events.LaunchServerFullInitEvent;

diff --git a/...src/main/java/pro/gravit/launchermodules/mirrorhelper/commands/ApplyWorkspaceCommand.java b/...src/main/java/pro/gravit/launchermodules/mirrorhelper/commands/ApplyWorkspaceCommand.java
@@ -2,8 +2,8 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
-import pro.gravit.launcher.modern.Downloader;
+import pro.gravit.launcher.base.Launcher;
+import pro.gravit.launcher.base.Downloader;
 import pro.gravit.launchermodules.mirrorhelper.MirrorHelperModule;
 import pro.gravit.launchermodules.mirrorhelper.MirrorWorkspace;
 import pro.gravit.launchserver.LaunchServer;

diff --git a/...ule/src/main/java/pro/gravit/launchermodules/mirrorhelper/commands/CurseforgeCommand.java b/...ule/src/main/java/pro/gravit/launchermodules/mirrorhelper/commands/CurseforgeCommand.java
@@ -2,7 +2,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launchermodules.mirrorhelper.Config;
 import pro.gravit.launchermodules.mirrorhelper.modapi.CurseforgeAPI;
 import pro.gravit.launchserver.LaunchServer;

diff --git a/.../src/main/java/pro/gravit/launchermodules/mirrorhelper/commands/InstallClientCommand.java b/.../src/main/java/pro/gravit/launchermodules/mirrorhelper/commands/InstallClientCommand.java
@@ -1,6 +1,6 @@
 package pro.gravit.launchermodules.mirrorhelper.commands;
 
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfile;
 import pro.gravit.launchermodules.mirrorhelper.InstallClient;
 import pro.gravit.launchermodules.mirrorhelper.MirrorHelperModule;
 import pro.gravit.launchermodules.mirrorhelper.MirrorWorkspace;

diff --git a/...ule/src/main/java/pro/gravit/launchermodules/mirrorhelper/commands/InstallModCommand.java b/...ule/src/main/java/pro/gravit/launchermodules/mirrorhelper/commands/InstallModCommand.java
@@ -2,7 +2,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfile;
 import pro.gravit.launchermodules.mirrorhelper.modapi.CurseforgeAPI;
 import pro.gravit.launchermodules.mirrorhelper.InstallClient;
 import pro.gravit.launchermodules.mirrorhelper.MirrorHelperModule;

diff --git a/.../main/java/pro/gravit/launchermodules/mirrorhelper/installers/FabricInstallerCommand.java b/.../main/java/pro/gravit/launchermodules/mirrorhelper/installers/FabricInstallerCommand.java
@@ -2,7 +2,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
 import pro.gravit.utils.helper.IOHelper;

diff --git a/...c/main/java/pro/gravit/launchermodules/mirrorhelper/installers/ForgeInstallerCommand.java b/...c/main/java/pro/gravit/launchermodules/mirrorhelper/installers/ForgeInstallerCommand.java
@@ -2,7 +2,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
 import pro.gravit.utils.helper.IOHelper;

diff --git a/...c/main/java/pro/gravit/launchermodules/mirrorhelper/installers/QuiltInstallerCommand.java b/...c/main/java/pro/gravit/launchermodules/mirrorhelper/installers/QuiltInstallerCommand.java
@@ -2,7 +2,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
 import pro.gravit.utils.helper.IOHelper;

diff --git a/...er_module/src/main/java/pro/gravit/launchermodules/mirrorhelper/modapi/CurseforgeAPI.java b/...er_module/src/main/java/pro/gravit/launchermodules/mirrorhelper/modapi/CurseforgeAPI.java
@@ -1,7 +1,7 @@
 package pro.gravit.launchermodules.mirrorhelper.modapi;
 
 import com.google.gson.JsonElement;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launchserver.helper.HttpHelper;
 
 import java.io.IOException;

diff --git a/...lper_module/src/main/java/pro/gravit/launchermodules/mirrorhelper/modapi/ModrinthAPI.java b/...lper_module/src/main/java/pro/gravit/launchermodules/mirrorhelper/modapi/ModrinthAPI.java
@@ -2,7 +2,7 @@
 
 import com.google.gson.JsonElement;
 import com.google.gson.reflect.TypeToken;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launchermodules.mirrorhelper.MirrorHelperModule;
 import pro.gravit.launchserver.helper.HttpHelper;
 import pro.gravit.utils.Version;

diff --git a/...ule/src/main/java/pro/gravit/launchermodules/mojangsupport/MicrosoftAuthCoreProvider.java b/...ule/src/main/java/pro/gravit/launchermodules/mojangsupport/MicrosoftAuthCoreProvider.java
@@ -3,12 +3,12 @@
 import com.google.gson.JsonElement;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
-import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent;
-import pro.gravit.launcher.request.RequestException;
-import pro.gravit.launcher.request.auth.AuthRequest;
-import pro.gravit.launcher.request.auth.details.AuthWebViewDetails;
-import pro.gravit.launcher.request.auth.password.AuthCodePassword;
+import pro.gravit.launcher.base.Launcher;
+import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent;
+import pro.gravit.launcher.base.request.RequestException;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
+import pro.gravit.launcher.base.request.auth.details.AuthWebViewDetails;
+import pro.gravit.launcher.base.request.auth.password.AuthCodePassword;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.AuthException;
 import pro.gravit.launchserver.auth.core.UserSession;

diff --git a/MojangSupport_module/src/main/java/pro/gravit/launchermodules/mojangsupport/ModuleImpl.java b/MojangSupport_module/src/main/java/pro/gravit/launchermodules/mojangsupport/ModuleImpl.java
@@ -1,9 +1,9 @@
 package pro.gravit.launchermodules.mojangsupport;
 
-import pro.gravit.launcher.modules.LauncherInitContext;
-import pro.gravit.launcher.modules.LauncherModule;
-import pro.gravit.launcher.modules.LauncherModuleInfo;
-import pro.gravit.launcher.modules.events.PreConfigPhase;
+import pro.gravit.launcher.base.modules.LauncherInitContext;
+import pro.gravit.launcher.base.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModuleInfo;
+import pro.gravit.launcher.base.modules.events.PreConfigPhase;
 import pro.gravit.launchserver.auth.core.AuthCoreProvider;
 import pro.gravit.launchserver.modules.impl.LaunchServerInitContext;
 import pro.gravit.utils.Version;

diff --git a/...module/src/main/java/pro/gravit/launchermodules/mojangsupport/MojangAuthCoreProvider.java b/...module/src/main/java/pro/gravit/launchermodules/mojangsupport/MojangAuthCoreProvider.java
@@ -2,11 +2,11 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.ClientPermissions;
-import pro.gravit.launcher.Launcher;
-import pro.gravit.launcher.profiles.Texture;
-import pro.gravit.launcher.request.auth.AuthRequest;
-import pro.gravit.launcher.request.auth.password.AuthPlainPassword;
+import pro.gravit.launcher.base.ClientPermissions;
+import pro.gravit.launcher.base.Launcher;
+import pro.gravit.launcher.base.profiles.Texture;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
+import pro.gravit.launcher.base.request.auth.password.AuthPlainPassword;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.AuthException;
 import pro.gravit.launchserver.auth.core.AuthCoreProvider;

diff --git a/...Code_module/src/main/java/pro/gravit/launchermodules/osslsigncode/OSSLSignCodeModule.java b/...Code_module/src/main/java/pro/gravit/launchermodules/osslsigncode/OSSLSignCodeModule.java
@@ -1,9 +1,9 @@
 package pro.gravit.launchermodules.osslsigncode;
 
-import pro.gravit.launcher.config.JsonConfigurable;
-import pro.gravit.launcher.modules.LauncherInitContext;
-import pro.gravit.launcher.modules.LauncherModule;
-import pro.gravit.launcher.modules.LauncherModuleInfo;
+import pro.gravit.launcher.base.config.JsonConfigurable;
+import pro.gravit.launcher.base.modules.LauncherInitContext;
+import pro.gravit.launcher.base.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModuleInfo;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.binary.tasks.exe.BuildExeMainTask;
 import pro.gravit.launchserver.modules.events.LaunchServerFullInitEvent;