Merge branch 'experimental/nojava8support' into dev

GravitLauncher · Jan 31, 2024 · f3d5652 · f3d5652
2 parents 0649fd0 + 8ef43c6
commit f3d5652
Show file tree

Hide file tree

Showing 40 changed files with 197 additions and 192 deletions.
diff --git a/build.gradle b/build.gradle
@@ -58,12 +58,11 @@ repositories {
 }
 
 dependencies {
-    implementation "pro.gravit.launcher:launcher-core:5.5.4"
-    implementation "pro.gravit.launcher:launcher-modern-core:5.5.4"
-    implementation "pro.gravit.launcher:launcher-ws-api:5.5.4"
-    implementation "pro.gravit.launcher:launcher-client-api:5.5.4"
-    implementation "pro.gravit.launcher:launcher-client-start-api:5.5.4"
-    implementation "pro.gravit.launcher:launcher-client-starter-api:5.5.4"
+    implementation "pro.gravit.launcher:launcher-core:5.6.0-SNAPSHOT"
+    implementation "pro.gravit.launcher:launcher-ws-api:5.6.0-SNAPSHOT"
+    implementation "pro.gravit.launcher:launcher-client-api:5.6.0-SNAPSHOT"
+    implementation "pro.gravit.launcher:launcher-client-start-api:5.6.0-SNAPSHOT"
+    implementation "pro.gravit.launcher:launcher-client-starter-api:5.6.0-SNAPSHOT"
     implementation "pro.gravit.utils.enfs:enfs:2.0.1-SNAPSHOT"
     implementation 'io.netty:netty-codec-http:4.1.67.Final'
     implementation 'com.github.oshi:oshi-core:5.8.1'

diff --git a/src/main/java/pro/gravit/launcher/client/JavaRuntimeModule.java b/src/main/java/pro/gravit/launcher/client/JavaRuntimeModule.java
@@ -1,19 +1,19 @@
 package pro.gravit.launcher.client;
 
 import javafx.stage.Stage;
-import pro.gravit.launcher.LauncherEngine;
-import pro.gravit.launcher.client.events.ClientEngineInitPhase;
-import pro.gravit.launcher.client.events.ClientExitPhase;
-import pro.gravit.launcher.client.events.ClientPreGuiPhase;
-import pro.gravit.launcher.client.events.ClientUnlockConsoleEvent;
 import pro.gravit.launcher.client.gui.JavaFXApplication;
 import pro.gravit.launcher.client.gui.service.OfflineService;
-import pro.gravit.launcher.gui.RuntimeProvider;
-import pro.gravit.launcher.modules.LauncherInitContext;
-import pro.gravit.launcher.modules.LauncherModule;
-import pro.gravit.launcher.modules.LauncherModuleInfo;
-import pro.gravit.launcher.modules.events.OfflineModeEvent;
-import pro.gravit.launcher.request.websockets.OfflineRequestService;
+import pro.gravit.launcher.runtime.LauncherEngine;
+import pro.gravit.launcher.runtime.client.events.ClientEngineInitPhase;
+import pro.gravit.launcher.client.events.ClientExitPhase;
+import pro.gravit.launcher.runtime.client.events.ClientPreGuiPhase;
+import pro.gravit.launcher.client.events.ClientUnlockConsoleEvent;
+import pro.gravit.launcher.runtime.gui.RuntimeProvider;
+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.OfflineModeEvent;
+import pro.gravit.launcher.base.request.websockets.OfflineRequestService;
 import pro.gravit.utils.Version;
 import pro.gravit.utils.helper.JVMHelper;
 import pro.gravit.utils.helper.LogHelper;

diff --git a/src/main/java/pro/gravit/launcher/client/RuntimeSecurityService.java b/src/main/java/pro/gravit/launcher/client/RuntimeSecurityService.java
@@ -1,10 +1,10 @@
 package pro.gravit.launcher.client;
 
 import pro.gravit.launcher.client.gui.JavaFXApplication;
-import pro.gravit.launcher.request.secure.GetSecureLevelInfoRequest;
-import pro.gravit.launcher.request.secure.HardwareReportRequest;
-import pro.gravit.launcher.request.secure.VerifySecureLevelKeyRequest;
-import pro.gravit.launcher.utils.HWIDProvider;
+import pro.gravit.launcher.runtime.utils.HWIDProvider;
+import pro.gravit.launcher.base.request.secure.GetSecureLevelInfoRequest;
+import pro.gravit.launcher.base.request.secure.HardwareReportRequest;
+import pro.gravit.launcher.base.request.secure.VerifySecureLevelKeyRequest;
 import pro.gravit.utils.helper.*;
 
 import java.io.IOException;

diff --git a/src/main/java/pro/gravit/launcher/client/StdJavaRuntimeProvider.java b/src/main/java/pro/gravit/launcher/client/StdJavaRuntimeProvider.java
@@ -1,10 +1,10 @@
 package pro.gravit.launcher.client;
 
 import javafx.application.Application;
-import pro.gravit.launcher.LauncherEngine;
 import pro.gravit.launcher.client.gui.JavaFXApplication;
-import pro.gravit.launcher.gui.RuntimeProvider;
-import pro.gravit.launcher.utils.LauncherUpdater;
+import pro.gravit.launcher.runtime.LauncherEngine;
+import pro.gravit.launcher.runtime.gui.RuntimeProvider;
+import pro.gravit.launcher.runtime.utils.LauncherUpdater;
 import pro.gravit.utils.helper.IOHelper;
 import pro.gravit.utils.helper.LogHelper;
 

diff --git a/src/main/java/pro/gravit/launcher/client/gui/JavaFXApplication.java b/src/main/java/pro/gravit/launcher/client/gui/JavaFXApplication.java
@@ -6,11 +6,9 @@
 import javafx.event.EventHandler;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-import pro.gravit.launcher.*;
-import pro.gravit.launcher.api.DialogService;
+import pro.gravit.launcher.base.*;
 import pro.gravit.launcher.client.*;
-import pro.gravit.launcher.client.events.ClientExitPhase;
-import pro.gravit.launcher.client.events.ClientGuiPhase;
+import pro.gravit.launcher.client.api.DialogService;
 import pro.gravit.launcher.client.gui.commands.RuntimeCommand;
 import pro.gravit.launcher.client.gui.commands.VersionCommand;
 import pro.gravit.launcher.client.gui.config.GuiModuleConfig;
@@ -23,14 +21,20 @@
 import pro.gravit.launcher.client.gui.stage.PrimaryStage;
 import pro.gravit.launcher.client.gui.utils.FXMLFactory;
 import pro.gravit.launcher.client.gui.utils.TriggerManager;
-import pro.gravit.launcher.debug.DebugMain;
-import pro.gravit.launcher.managers.ConsoleManager;
-import pro.gravit.launcher.managers.SettingsManager;
-import pro.gravit.launcher.profiles.ClientProfile;
-import pro.gravit.launcher.request.Request;
-import pro.gravit.launcher.request.RequestService;
-import pro.gravit.launcher.request.WebSocketEvent;
-import pro.gravit.launcher.request.auth.AuthRequest;
+import pro.gravit.launcher.runtime.LauncherEngine;
+import pro.gravit.launcher.runtime.NewLauncherSettings;
+import pro.gravit.launcher.runtime.client.DirBridge;
+import pro.gravit.launcher.runtime.client.UserSettings;
+import pro.gravit.launcher.client.events.ClientExitPhase;
+import pro.gravit.launcher.runtime.client.events.ClientGuiPhase;
+import pro.gravit.launcher.runtime.debug.DebugMain;
+import pro.gravit.launcher.runtime.managers.ConsoleManager;
+import pro.gravit.launcher.runtime.managers.SettingsManager;
+import pro.gravit.launcher.base.profiles.ClientProfile;
+import pro.gravit.launcher.base.request.Request;
+import pro.gravit.launcher.base.request.RequestService;
+import pro.gravit.launcher.base.request.WebSocketEvent;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
 import pro.gravit.utils.command.BaseCommandCategory;
 import pro.gravit.utils.command.CommandCategory;
 import pro.gravit.utils.command.CommandHandler;
@@ -138,7 +142,7 @@ public final <T extends WebSocketEvent> void processRequest(String message, Requ
     public void start(Stage stage) {
         // If debugging
         try {
-            Class.forName("pro.gravit.launcher.debug.DebugMain", false, JavaFXApplication.class.getClassLoader());
+            Class.forName("pro.gravit.launcher.runtime.debug.DebugMain", false, JavaFXApplication.class.getClassLoader());
             if (DebugMain.IS_DEBUG.get()) {
                 runtimeDirectory = IOHelper.WORKING_DIR.resolve("runtime");
                 debugMode = true;

diff --git a/src/main/java/pro/gravit/launcher/client/gui/config/GuiModuleConfig.java b/src/main/java/pro/gravit/launcher/client/gui/config/GuiModuleConfig.java
@@ -1,6 +1,6 @@
 package pro.gravit.launcher.client.gui.config;
 
-import pro.gravit.launcher.LauncherInject;
+import pro.gravit.launcher.core.LauncherInject;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/src/main/java/pro/gravit/launcher/client/gui/config/RuntimeSettings.java b/src/main/java/pro/gravit/launcher/client/gui/config/RuntimeSettings.java
@@ -1,12 +1,11 @@
 package pro.gravit.launcher.client.gui.config;
-
-import pro.gravit.launcher.LauncherNetworkAPI;
-import pro.gravit.launcher.client.DirBridge;
-import pro.gravit.launcher.client.UserSettings;
 import pro.gravit.launcher.client.gui.service.JavaService;
-import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent;
-import pro.gravit.launcher.profiles.ClientProfile;
-import pro.gravit.launcher.request.auth.AuthRequest;
+import pro.gravit.launcher.runtime.client.DirBridge;
+import pro.gravit.launcher.runtime.client.UserSettings;
+import pro.gravit.launcher.core.LauncherNetworkAPI;
+import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent;
+import pro.gravit.launcher.base.profiles.ClientProfile;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
 import pro.gravit.utils.helper.JavaHelper;
 
 import java.nio.file.Path;

diff --git a/src/main/java/pro/gravit/launcher/client/gui/config/StdSettingsManager.java b/src/main/java/pro/gravit/launcher/client/gui/config/StdSettingsManager.java
@@ -1,8 +1,8 @@
 package pro.gravit.launcher.client.gui.config;
 
-import pro.gravit.launcher.NewLauncherSettings;
 import pro.gravit.launcher.client.JavaRuntimeModule;
-import pro.gravit.launcher.managers.SettingsManager;
+import pro.gravit.launcher.runtime.NewLauncherSettings;
+import pro.gravit.launcher.runtime.managers.SettingsManager;
 
 public class StdSettingsManager extends SettingsManager {
 

diff --git a/src/main/java/pro/gravit/launcher/client/gui/helper/EnFSHelper.java b/src/main/java/pro/gravit/launcher/client/gui/helper/EnFSHelper.java
@@ -1,7 +1,7 @@
 package pro.gravit.launcher.client.gui.helper;
 
-import pro.gravit.launcher.Launcher;
-import pro.gravit.launcher.LauncherConfig;
+import pro.gravit.launcher.base.Launcher;
+import pro.gravit.launcher.base.LauncherConfig;
 import pro.gravit.launcher.client.gui.JavaFXApplication;
 import pro.gravit.launcher.client.gui.utils.RuntimeCryptedFile;
 import pro.gravit.utils.enfs.EnFS;

diff --git a/src/main/java/pro/gravit/launcher/client/gui/impl/AbstractVisualComponent.java b/src/main/java/pro/gravit/launcher/client/gui/impl/AbstractVisualComponent.java
@@ -14,8 +14,8 @@
 import pro.gravit.launcher.client.gui.config.RuntimeSettings;
 import pro.gravit.launcher.client.gui.helper.LookupHelper;
 import pro.gravit.launcher.client.gui.utils.FXMLFactory;
-import pro.gravit.launcher.request.RequestException;
-import pro.gravit.launcher.request.auth.ExitRequest;
+import pro.gravit.launcher.base.request.RequestException;
+import pro.gravit.launcher.base.request.auth.ExitRequest;
 import pro.gravit.utils.helper.LogHelper;
 
 import java.util.concurrent.CompletableFuture;

diff --git a/src/main/java/pro/gravit/launcher/client/gui/impl/GuiEventHandler.java b/src/main/java/pro/gravit/launcher/client/gui/impl/GuiEventHandler.java
@@ -7,12 +7,12 @@
 import pro.gravit.launcher.client.gui.scenes.serverinfo.ServerInfoScene;
 import pro.gravit.launcher.client.gui.scenes.servermenu.ServerMenuScene;
 import pro.gravit.launcher.client.gui.scenes.settings.SettingsScene;
-import pro.gravit.launcher.events.RequestEvent;
-import pro.gravit.launcher.events.request.AuthRequestEvent;
-import pro.gravit.launcher.events.request.ProfilesRequestEvent;
-import pro.gravit.launcher.profiles.ClientProfile;
-import pro.gravit.launcher.request.RequestService;
-import pro.gravit.launcher.request.WebSocketEvent;
+import pro.gravit.launcher.base.events.RequestEvent;
+import pro.gravit.launcher.base.events.request.AuthRequestEvent;
+import pro.gravit.launcher.base.events.request.ProfilesRequestEvent;
+import pro.gravit.launcher.base.profiles.ClientProfile;
+import pro.gravit.launcher.base.request.RequestService;
+import pro.gravit.launcher.base.request.WebSocketEvent;
 import pro.gravit.utils.helper.LogHelper;
 
 import java.util.UUID;

diff --git a/src/main/java/pro/gravit/launcher/client/gui/overlays/ProcessingOverlay.java b/src/main/java/pro/gravit/launcher/client/gui/overlays/ProcessingOverlay.java
@@ -8,8 +8,8 @@
 import pro.gravit.launcher.client.gui.impl.AbstractStage;
 import pro.gravit.launcher.client.gui.scenes.AbstractScene;
 import pro.gravit.launcher.client.gui.impl.ContextHelper;
-import pro.gravit.launcher.request.Request;
-import pro.gravit.launcher.request.WebSocketEvent;
+import pro.gravit.launcher.base.request.Request;
+import pro.gravit.launcher.base.request.WebSocketEvent;
 import pro.gravit.utils.helper.LogHelper;
 
 import java.io.IOException;

diff --git a/src/main/java/pro/gravit/launcher/client/gui/overlays/UploadAssetOverlay.java b/src/main/java/pro/gravit/launcher/client/gui/overlays/UploadAssetOverlay.java
@@ -3,15 +3,15 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.stage.FileChooser;
-import pro.gravit.launcher.Launcher;
-import pro.gravit.launcher.LauncherNetworkAPI;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launcher.client.gui.JavaFXApplication;
 import pro.gravit.launcher.client.gui.helper.LookupHelper;
-import pro.gravit.launcher.events.request.AssetUploadInfoRequestEvent;
-import pro.gravit.launcher.profiles.Texture;
-import pro.gravit.launcher.request.Request;
-import pro.gravit.launcher.request.RequestException;
-import pro.gravit.launcher.request.cabinet.GetAssetUploadUrl;
+import pro.gravit.launcher.core.LauncherNetworkAPI;
+import pro.gravit.launcher.base.events.request.AssetUploadInfoRequestEvent;
+import pro.gravit.launcher.base.profiles.Texture;
+import pro.gravit.launcher.base.request.Request;
+import pro.gravit.launcher.base.request.RequestException;
+import pro.gravit.launcher.base.request.cabinet.GetAssetUploadUrl;
 import pro.gravit.utils.helper.LogHelper;
 import pro.gravit.utils.helper.SecurityHelper;
 

diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/AbstractScene.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/AbstractScene.java
@@ -8,18 +8,18 @@
 import javafx.scene.control.MenuItem;
 import javafx.scene.layout.Pane;
 import javafx.scene.shape.Rectangle;
-import pro.gravit.launcher.Launcher;
-import pro.gravit.launcher.LauncherConfig;
+import pro.gravit.launcher.base.Launcher;
+import pro.gravit.launcher.base.LauncherConfig;
 import pro.gravit.launcher.client.gui.JavaFXApplication;
 import pro.gravit.launcher.client.gui.config.RuntimeSettings;
 import pro.gravit.launcher.client.gui.helper.LookupHelper;
 import pro.gravit.launcher.client.gui.impl.AbstractStage;
 import pro.gravit.launcher.client.gui.impl.AbstractVisualComponent;
 import pro.gravit.launcher.client.gui.impl.ContextHelper;
 import pro.gravit.launcher.client.gui.overlays.AbstractOverlay;
-import pro.gravit.launcher.request.Request;
-import pro.gravit.launcher.request.WebSocketEvent;
-import pro.gravit.launcher.request.auth.ExitRequest;
+import pro.gravit.launcher.base.request.Request;
+import pro.gravit.launcher.base.request.WebSocketEvent;
+import pro.gravit.launcher.base.request.auth.ExitRequest;
 import pro.gravit.utils.helper.LogHelper;
 
 import java.util.function.Consumer;

diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/console/ConsoleScene.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/console/ConsoleScene.java
@@ -7,7 +7,7 @@
 import pro.gravit.launcher.client.gui.JavaFXApplication;
 import pro.gravit.launcher.client.gui.helper.LookupHelper;
 import pro.gravit.launcher.client.gui.scenes.AbstractScene;
-import pro.gravit.launcher.managers.ConsoleManager;
+import pro.gravit.launcher.runtime.managers.ConsoleManager;
 import pro.gravit.utils.helper.LogHelper;
 
 public class ConsoleScene extends AbstractScene {

diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/debug/DebugScene.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/debug/DebugScene.java
@@ -5,8 +5,7 @@
 import javafx.scene.control.TextArea;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
-import pro.gravit.launcher.Launcher;
-import pro.gravit.launcher.LauncherNetworkAPI;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launcher.client.JavaRuntimeModule;
 import pro.gravit.launcher.client.gui.JavaFXApplication;
 import pro.gravit.launcher.client.gui.helper.LookupHelper;

diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/login/LoginScene.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/login/LoginScene.java
@@ -7,34 +7,32 @@
 import javafx.scene.layout.Pane;
 import javafx.scene.text.Text;
 import javafx.util.StringConverter;
-import pro.gravit.launcher.LauncherEngine;
 import pro.gravit.launcher.client.StdJavaRuntimeProvider;
-import pro.gravit.launcher.client.events.ClientExitPhase;
 import pro.gravit.launcher.client.gui.JavaFXApplication;
 import pro.gravit.launcher.client.gui.helper.LookupHelper;
 import pro.gravit.launcher.client.gui.impl.AbstractVisualComponent;
 import pro.gravit.launcher.client.gui.overlays.AbstractOverlay;
 import pro.gravit.launcher.client.gui.scenes.AbstractScene;
 import pro.gravit.launcher.client.gui.scenes.login.methods.*;
-import pro.gravit.launcher.client.gui.service.AuthService;
-import pro.gravit.launcher.events.request.AuthRequestEvent;
-import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent;
-import pro.gravit.launcher.profiles.ClientProfile;
-import pro.gravit.launcher.profiles.Texture;
-import pro.gravit.launcher.request.Request;
-import pro.gravit.launcher.request.RequestException;
-import pro.gravit.launcher.request.WebSocketEvent;
-import pro.gravit.launcher.request.auth.AuthRequest;
-import pro.gravit.launcher.request.auth.GetAvailabilityAuthRequest;
-import pro.gravit.launcher.request.auth.RefreshTokenRequest;
-import pro.gravit.launcher.request.auth.details.AuthLoginOnlyDetails;
-import pro.gravit.launcher.request.auth.details.AuthPasswordDetails;
-import pro.gravit.launcher.request.auth.details.AuthTotpDetails;
-import pro.gravit.launcher.request.auth.details.AuthWebViewDetails;
-import pro.gravit.launcher.request.auth.password.*;
-import pro.gravit.launcher.request.update.LauncherRequest;
-import pro.gravit.launcher.request.update.ProfilesRequest;
-import pro.gravit.launcher.utils.LauncherUpdater;
+import pro.gravit.launcher.runtime.LauncherEngine;
+import pro.gravit.launcher.client.events.ClientExitPhase;
+import pro.gravit.launcher.runtime.utils.LauncherUpdater;
+import pro.gravit.launcher.base.events.request.AuthRequestEvent;
+import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent;
+import pro.gravit.launcher.base.profiles.Texture;
+import pro.gravit.launcher.base.request.Request;
+import pro.gravit.launcher.base.request.RequestException;
+import pro.gravit.launcher.base.request.WebSocketEvent;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
+import pro.gravit.launcher.base.request.auth.GetAvailabilityAuthRequest;
+import pro.gravit.launcher.base.request.auth.RefreshTokenRequest;
+import pro.gravit.launcher.base.request.auth.details.AuthLoginOnlyDetails;
+import pro.gravit.launcher.base.request.auth.details.AuthPasswordDetails;
+import pro.gravit.launcher.base.request.auth.details.AuthTotpDetails;
+import pro.gravit.launcher.base.request.auth.details.AuthWebViewDetails;
+import pro.gravit.launcher.base.request.auth.password.*;
+import pro.gravit.launcher.base.request.update.LauncherRequest;
+import pro.gravit.launcher.base.request.update.ProfilesRequest;
 import pro.gravit.utils.helper.LogHelper;
 
 import java.net.URL;

diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/login/methods/AbstractAuthMethod.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/login/methods/AbstractAuthMethod.java
@@ -1,7 +1,7 @@
 package pro.gravit.launcher.client.gui.scenes.login.methods;
 
 import pro.gravit.launcher.client.gui.scenes.login.LoginScene;
-import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent;
+import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent;
 
 import java.util.concurrent.CompletableFuture;
 

diff --git a/.../java/pro/gravit/launcher/client/gui/scenes/login/methods/LoginAndPasswordAuthMethod.java b/.../java/pro/gravit/launcher/client/gui/scenes/login/methods/LoginAndPasswordAuthMethod.java
@@ -7,8 +7,8 @@
 import pro.gravit.launcher.client.gui.impl.ContextHelper;
 import pro.gravit.launcher.client.gui.scenes.login.LoginAuthButtonComponent;
 import pro.gravit.launcher.client.gui.scenes.login.LoginScene;
-import pro.gravit.launcher.request.auth.AuthRequest;
-import pro.gravit.launcher.request.auth.details.AuthPasswordDetails;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
+import pro.gravit.launcher.base.request.auth.details.AuthPasswordDetails;
 import pro.gravit.utils.helper.LogHelper;
 
 import java.util.concurrent.CompletableFuture;

diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/login/methods/LoginOnlyAuthMethod.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/login/methods/LoginOnlyAuthMethod.java
@@ -8,7 +8,7 @@
 import pro.gravit.launcher.client.gui.impl.ContextHelper;
 import pro.gravit.launcher.client.gui.scenes.login.LoginAuthButtonComponent;
 import pro.gravit.launcher.client.gui.scenes.login.LoginScene;
-import pro.gravit.launcher.request.auth.details.AuthLoginOnlyDetails;
+import pro.gravit.launcher.base.request.auth.details.AuthLoginOnlyDetails;
 import pro.gravit.utils.helper.LogHelper;
 
 import java.util.concurrent.CompletableFuture;

diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/login/methods/TotpAuthMethod.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/login/methods/TotpAuthMethod.java
@@ -6,8 +6,8 @@
 import pro.gravit.launcher.client.gui.impl.AbstractVisualComponent;
 import pro.gravit.launcher.client.gui.impl.ContextHelper;
 import pro.gravit.launcher.client.gui.scenes.login.LoginScene;
-import pro.gravit.launcher.request.auth.details.AuthTotpDetails;
-import pro.gravit.launcher.request.auth.password.AuthTOTPPassword;
+import pro.gravit.launcher.base.request.auth.details.AuthTotpDetails;
+import pro.gravit.launcher.base.request.auth.password.AuthTOTPPassword;
 
 import java.util.concurrent.CompletableFuture;
 

diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/login/methods/WebAuthMethod.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/login/methods/WebAuthMethod.java
@@ -10,8 +10,8 @@
 import pro.gravit.launcher.client.gui.helper.LookupHelper;
 import pro.gravit.launcher.client.gui.overlays.AbstractOverlay;
 import pro.gravit.launcher.client.gui.scenes.login.LoginScene;
-import pro.gravit.launcher.request.auth.details.AuthWebViewDetails;
-import pro.gravit.launcher.request.auth.password.AuthCodePassword;
+import pro.gravit.launcher.base.request.auth.details.AuthWebViewDetails;
+import pro.gravit.launcher.base.request.auth.password.AuthCodePassword;
 import pro.gravit.utils.helper.LogHelper;
 
 import java.util.concurrent.CompletableFuture;