diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle index 57742ddd..1439c426 100644 --- a/LaunchServer/build.gradle +++ b/LaunchServer/build.gradle @@ -73,7 +73,6 @@ tasks.register('cleanjar', Jar) { dependencies { pack project(':LauncherAPI') - pack project(':LauncherModernCore') bundle group: 'me.tongfei', name: 'progressbar', version: '0.9.2' bundle group: 'com.github.Marcono1234', name: 'gson-record-type-adapter-factory', version: 'v0.2.0' bundle group: 'org.fusesource.jansi', name: 'jansi', version: rootProject['verJansi'] diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/HttpRequester.java b/LaunchServer/src/main/java/pro/gravit/launchserver/HttpRequester.java index 9bac27ff..fac90dfb 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/HttpRequester.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/HttpRequester.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver; 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/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java index 3482f317..17264082 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java @@ -2,12 +2,11 @@ package pro.gravit.launchserver; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.events.RequestEvent; -import pro.gravit.launcher.events.request.ProfilesRequestEvent; -import pro.gravit.launcher.client.runtime.managers.ConfigManager; -import pro.gravit.launcher.modules.events.ClosePhase; -import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.events.RequestEvent; +import pro.gravit.launcher.base.events.request.ProfilesRequestEvent; +import pro.gravit.launcher.base.modules.events.ClosePhase; +import pro.gravit.launcher.base.profiles.ClientProfile; import pro.gravit.launchserver.auth.AuthProviderPair; import pro.gravit.launchserver.auth.core.RejectAuthCoreProvider; import pro.gravit.launchserver.binary.EXEL4JLauncherBinary; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java b/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java index e7b93168..865cd674 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java @@ -3,13 +3,13 @@ package pro.gravit.launchserver; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bouncycastle.jce.provider.BouncyCastleProvider; -import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.base.Launcher; import pro.gravit.launcher.core.LauncherTrustManager; -import pro.gravit.launcher.modules.events.PreConfigPhase; -import pro.gravit.launcher.profiles.optional.actions.OptionalAction; -import pro.gravit.launcher.profiles.optional.triggers.OptionalTrigger; -import pro.gravit.launcher.request.auth.AuthRequest; -import pro.gravit.launcher.request.auth.GetAvailabilityAuthRequest; +import pro.gravit.launcher.base.modules.events.PreConfigPhase; +import pro.gravit.launcher.base.profiles.optional.actions.OptionalAction; +import pro.gravit.launcher.base.profiles.optional.triggers.OptionalTrigger; +import pro.gravit.launcher.base.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.auth.GetAvailabilityAuthRequest; import pro.gravit.launchserver.auth.core.AuthCoreProvider; import pro.gravit.launchserver.auth.mix.MixProvider; import pro.gravit.launchserver.auth.password.PasswordVerifier; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/Main.java b/LaunchServer/src/main/java/pro/gravit/launchserver/Main.java index 58f90497..8026ddb2 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/Main.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/Main.java @@ -5,6 +5,10 @@ import pro.gravit.utils.launch.ClassLoaderControl; import pro.gravit.utils.launch.LaunchOptions; import pro.gravit.utils.launch.ModuleLaunch; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.nio.file.FileVisitOption; import java.nio.file.Files; import java.nio.file.Path; @@ -15,6 +19,7 @@ import java.util.stream.Stream; public class Main { private static final List classpathOnly = List.of("proguard", "jline", "kotlin", "epoll"); + private static final String LOG4J_PROPERTY = "log4j2.configurationFile"; private static boolean isClasspathOnly(Path path) { var fileName = path.getFileName().toString(); for(var e : classpathOnly) { @@ -25,7 +30,28 @@ public class Main { return false; } + private static void unpackLog4j() { + String log4jConfigurationFile = System.getProperty(LOG4J_PROPERTY); + if(log4jConfigurationFile == null) { + Path log4jConfigPath = Path.of("log4j2.xml"); + if(!Files.exists(log4jConfigPath)) { + try(FileOutputStream output = new FileOutputStream(log4jConfigPath.toFile())) { + try(InputStream input = Main.class.getResourceAsStream("log4j2.xml")) { + if(input == null) { + return; + } + input.transferTo(output); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + System.setProperty(LOG4J_PROPERTY, log4jConfigPath.toAbsolutePath().toString()); + } + } + public static void main(String[] args) throws Throwable { + unpackLog4j(); ModuleLaunch launch = new ModuleLaunch(); LaunchOptions options = new LaunchOptions(); options.disablePackageDelegateSupport = true; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/AuthException.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/AuthException.java index 0fb5c766..e30f9842 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/AuthException.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/AuthException.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.auth; -import pro.gravit.launcher.events.request.AuthRequestEvent; +import pro.gravit.launcher.base.events.request.AuthRequestEvent; import java.io.IOException; import java.io.Serial; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AbstractSQLCoreProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AbstractSQLCoreProvider.java index 274c6b85..c469990a 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AbstractSQLCoreProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AbstractSQLCoreProvider.java @@ -4,9 +4,9 @@ import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.JwtException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pro.gravit.launcher.ClientPermissions; -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.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.MySQLSourceConfig; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AuthCoreProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AuthCoreProvider.java index f1d8cf7d..50042661 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AuthCoreProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AuthCoreProvider.java @@ -3,12 +3,12 @@ package pro.gravit.launchserver.auth.core; import com.google.gson.reflect.TypeToken; 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.auth.AuthRequest; -import pro.gravit.launcher.request.auth.details.AuthPasswordDetails; -import pro.gravit.launcher.request.auth.password.AuthPlainPassword; -import pro.gravit.launcher.request.secure.HardwareReportRequest; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent; +import pro.gravit.launcher.base.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.auth.details.AuthPasswordDetails; +import pro.gravit.launcher.base.request.auth.password.AuthPlainPassword; +import pro.gravit.launcher.base.request.secure.HardwareReportRequest; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.Reconfigurable; import pro.gravit.launchserver.auth.AuthException; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MemoryAuthCoreProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MemoryAuthCoreProvider.java index 01dc17ad..f8d8cc93 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MemoryAuthCoreProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MemoryAuthCoreProvider.java @@ -1,9 +1,9 @@ package pro.gravit.launchserver.auth.core; -import pro.gravit.launcher.ClientPermissions; -import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent; -import pro.gravit.launcher.request.auth.AuthRequest; -import pro.gravit.launcher.request.auth.details.AuthLoginOnlyDetails; +import pro.gravit.launcher.base.ClientPermissions; +import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent; +import pro.gravit.launcher.base.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.auth.details.AuthLoginOnlyDetails; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.auth.AuthException; import pro.gravit.launchserver.manangers.AuthManager; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MergeAuthCoreProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MergeAuthCoreProvider.java index fe0a26cc..a0d83fd7 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MergeAuthCoreProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MergeAuthCoreProvider.java @@ -2,7 +2,7 @@ package pro.gravit.launchserver.auth.core; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pro.gravit.launcher.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.auth.AuthRequest; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.auth.AuthException; import pro.gravit.launchserver.manangers.AuthManager; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MySQLCoreProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MySQLCoreProvider.java index c5ed101a..13781df9 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MySQLCoreProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MySQLCoreProvider.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.auth.core; -import pro.gravit.launcher.ClientPermissions; -import pro.gravit.launcher.request.secure.HardwareReportRequest; +import pro.gravit.launcher.base.ClientPermissions; +import pro.gravit.launcher.base.request.secure.HardwareReportRequest; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.auth.MySQLSourceConfig; import pro.gravit.launchserver.auth.SQLSourceConfig; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/RejectAuthCoreProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/RejectAuthCoreProvider.java index 0a95d12f..38f3864a 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/RejectAuthCoreProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/RejectAuthCoreProvider.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.auth.core; -import pro.gravit.launcher.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.auth.AuthRequest; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.auth.AuthException; import pro.gravit.launchserver.manangers.AuthManager; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/User.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/User.java index acf69db6..10e265f5 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/User.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/User.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.auth.core; -import pro.gravit.launcher.ClientPermissions; +import pro.gravit.launcher.base.ClientPermissions; import java.util.UUID; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/UserHardware.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/UserHardware.java index 82934d0c..642836ab 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/UserHardware.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/UserHardware.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.auth.core.interfaces; -import pro.gravit.launcher.request.secure.HardwareReportRequest; +import pro.gravit.launcher.base.request.secure.HardwareReportRequest; public interface UserHardware { HardwareReportRequest.HardwareInfo getHardwareInfo(); diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/provider/AuthSupportAssetUpload.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/provider/AuthSupportAssetUpload.java index f1978698..fe5a0cea 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/provider/AuthSupportAssetUpload.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/provider/AuthSupportAssetUpload.java @@ -1,8 +1,8 @@ package pro.gravit.launchserver.auth.core.interfaces.provider; -import pro.gravit.launcher.events.request.AssetUploadInfoRequestEvent; -import pro.gravit.launcher.events.request.AuthRequestEvent; -import pro.gravit.launcher.events.request.GetAssetUploadUrlRequestEvent; +import pro.gravit.launcher.base.events.request.AssetUploadInfoRequestEvent; +import pro.gravit.launcher.base.events.request.AuthRequestEvent; +import pro.gravit.launcher.base.events.request.GetAssetUploadUrlRequestEvent; import pro.gravit.launchserver.auth.Feature; import pro.gravit.launchserver.auth.core.User; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/provider/AuthSupportHardware.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/provider/AuthSupportHardware.java index 943e4993..237a7aac 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/provider/AuthSupportHardware.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/provider/AuthSupportHardware.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.auth.core.interfaces.provider; -import pro.gravit.launcher.request.secure.HardwareReportRequest; +import pro.gravit.launcher.base.request.secure.HardwareReportRequest; import pro.gravit.launchserver.auth.core.User; import pro.gravit.launchserver.auth.core.UserSession; import pro.gravit.launchserver.auth.core.interfaces.UserHardware; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/provider/AuthSupportRegistration.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/provider/AuthSupportRegistration.java index 6277ae2b..fbe098ad 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/provider/AuthSupportRegistration.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/provider/AuthSupportRegistration.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.auth.core.interfaces.provider; -import pro.gravit.launcher.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.auth.AuthRequest; import pro.gravit.launchserver.auth.Feature; import pro.gravit.launchserver.auth.core.User; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/user/UserSupportTextures.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/user/UserSupportTextures.java index 214d759c..679c65e3 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/user/UserSupportTextures.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/user/UserSupportTextures.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.auth.core.interfaces.user; -import pro.gravit.launcher.profiles.ClientProfile; -import pro.gravit.launcher.profiles.Texture; +import pro.gravit.launcher.base.profiles.ClientProfile; +import pro.gravit.launcher.base.profiles.Texture; import java.util.HashMap; import java.util.Map; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/mix/UploadAssetMixProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/mix/UploadAssetMixProvider.java index ef67994f..2e511a77 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/mix/UploadAssetMixProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/mix/UploadAssetMixProvider.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.auth.mix; -import pro.gravit.launcher.events.request.AssetUploadInfoRequestEvent; +import pro.gravit.launcher.base.events.request.AssetUploadInfoRequestEvent; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.auth.core.AuthCoreProvider; import pro.gravit.launchserver.auth.core.User; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/password/JsonPasswordVerifier.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/password/JsonPasswordVerifier.java index e43ae2a8..6b217028 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/password/JsonPasswordVerifier.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/password/JsonPasswordVerifier.java @@ -2,7 +2,7 @@ package pro.gravit.launchserver.auth.password; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.base.Launcher; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/AdvancedProtectHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/AdvancedProtectHandler.java index 83ce07e2..25caa43f 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/AdvancedProtectHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/AdvancedProtectHandler.java @@ -4,9 +4,9 @@ import io.jsonwebtoken.JwtParser; import io.jsonwebtoken.Jwts; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pro.gravit.launcher.events.request.GetSecureLevelInfoRequestEvent; -import pro.gravit.launcher.events.request.HardwareReportRequestEvent; -import pro.gravit.launcher.events.request.VerifySecureLevelKeyRequestEvent; +import pro.gravit.launcher.base.events.request.GetSecureLevelInfoRequestEvent; +import pro.gravit.launcher.base.events.request.HardwareReportRequestEvent; +import pro.gravit.launcher.base.events.request.VerifySecureLevelKeyRequestEvent; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.auth.AuthProviderPair; import pro.gravit.launchserver.auth.core.interfaces.UserHardware; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/StdProtectHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/StdProtectHandler.java index 1188dcab..239857a7 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/StdProtectHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/StdProtectHandler.java @@ -2,7 +2,7 @@ package pro.gravit.launchserver.auth.protect; 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.launchserver.LaunchServer; import pro.gravit.launchserver.auth.protect.interfaces.ProfilesProtectHandler; import pro.gravit.launchserver.socket.Client; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/interfaces/ProfilesProtectHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/interfaces/ProfilesProtectHandler.java index 52f151b1..f2b2d325 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/interfaces/ProfilesProtectHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/interfaces/ProfilesProtectHandler.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.auth.protect.interfaces; -import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.base.profiles.ClientProfile; import pro.gravit.launchserver.socket.Client; public interface ProfilesProtectHandler { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/interfaces/SecureProtectHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/interfaces/SecureProtectHandler.java index 55444083..c5de4fd1 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/interfaces/SecureProtectHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/interfaces/SecureProtectHandler.java @@ -1,8 +1,8 @@ package pro.gravit.launchserver.auth.protect.interfaces; -import pro.gravit.launcher.events.request.GetSecureLevelInfoRequestEvent; -import pro.gravit.launcher.events.request.SecurityReportRequestEvent; -import pro.gravit.launcher.events.request.VerifySecureLevelKeyRequestEvent; +import pro.gravit.launcher.base.events.request.GetSecureLevelInfoRequestEvent; +import pro.gravit.launcher.base.events.request.SecurityReportRequestEvent; +import pro.gravit.launcher.base.events.request.VerifySecureLevelKeyRequestEvent; import pro.gravit.launchserver.socket.Client; import pro.gravit.launchserver.socket.response.secure.SecurityReportResponse; import pro.gravit.utils.helper.SecurityHelper; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/JsonTextureProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/JsonTextureProvider.java index 4f31c526..9a93022b 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/JsonTextureProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/JsonTextureProvider.java @@ -3,7 +3,7 @@ package pro.gravit.launchserver.auth.texture; import com.google.gson.reflect.TypeToken; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pro.gravit.launcher.profiles.Texture; +import pro.gravit.launcher.base.profiles.Texture; import pro.gravit.launchserver.HttpRequester; import pro.gravit.utils.helper.SecurityHelper; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/NullTextureProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/NullTextureProvider.java index b5f785f1..2587a078 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/NullTextureProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/NullTextureProvider.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.auth.texture; -import pro.gravit.launcher.profiles.Texture; +import pro.gravit.launcher.base.profiles.Texture; import pro.gravit.utils.helper.VerifyHelper; import java.io.IOException; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/RequestTextureProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/RequestTextureProvider.java index 4d8885b2..c40ff1ec 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/RequestTextureProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/RequestTextureProvider.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.auth.texture; -import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.profiles.Texture; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.profiles.Texture; import pro.gravit.utils.helper.CommonHelper; import pro.gravit.utils.helper.IOHelper; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/TextureProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/TextureProvider.java index 4519512a..d3cd82fd 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/TextureProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/TextureProvider.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.auth.texture; -import pro.gravit.launcher.profiles.Texture; +import pro.gravit.launcher.base.profiles.Texture; import pro.gravit.utils.ProviderMap; import java.io.IOException; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/VoidTextureProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/VoidTextureProvider.java index ad3f3387..612ac9cf 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/VoidTextureProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/VoidTextureProvider.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.auth.texture; -import pro.gravit.launcher.profiles.Texture; +import pro.gravit.launcher.base.profiles.Texture; import java.util.UUID; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/BuildContext.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/BuildContext.java index 069a5e3c..3bf50c71 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/BuildContext.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/BuildContext.java @@ -2,7 +2,7 @@ package pro.gravit.launchserver.binary; 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.launcher.core.serialize.HOutput; import pro.gravit.launcher.core.serialize.stream.StreamObject; import pro.gravit.launchserver.binary.tasks.MainBuildTask; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/JARLauncherBinary.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/JARLauncherBinary.java index b7bf3e0f..4a1d28b5 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/JARLauncherBinary.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/JARLauncherBinary.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.binary; -import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.base.Launcher; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.binary.tasks.*; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/MainBuildTask.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/MainBuildTask.java index 0d1f6e85..0be26b3a 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/MainBuildTask.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/MainBuildTask.java @@ -8,8 +8,8 @@ import org.objectweb.asm.Type; import org.objectweb.asm.tree.AnnotationNode; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.FieldNode; -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.launchserver.LaunchServer; import pro.gravit.launchserver.asm.ClassMetadataReader; import pro.gravit.launchserver.asm.InjectClassAcceptor; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/command/Command.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/Command.java index b4f7f5a3..fcf67b0f 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/command/Command.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/Command.java @@ -3,9 +3,9 @@ package pro.gravit.launchserver.command; import me.tongfei.progressbar.ProgressBar; import me.tongfei.progressbar.ProgressBarBuilder; import me.tongfei.progressbar.ProgressBarStyle; -import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.modern.Downloader; -import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.Downloader; +import pro.gravit.launcher.base.profiles.ClientProfile; import pro.gravit.launchserver.LaunchServer; import pro.gravit.utils.command.CommandException; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadAssetCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadAssetCommand.java index 249ea173..ba005879 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadAssetCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadAssetCommand.java @@ -3,8 +3,8 @@ package pro.gravit.launchserver.command.hash; import com.google.gson.JsonObject; 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.launchserver.HttpRequester; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.command.Command; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadClientCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadClientCommand.java index 5ac22a87..b2e28cd2 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadClientCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadClientCommand.java @@ -3,9 +3,9 @@ package pro.gravit.launchserver.command.hash; 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.profiles.ClientProfile; -import pro.gravit.launcher.profiles.ClientProfileVersions; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.profiles.ClientProfile; +import pro.gravit.launcher.base.profiles.ClientProfileVersions; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.command.Command; import pro.gravit.launchserver.helper.MakeProfileHelper; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/IndexAssetCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/IndexAssetCommand.java index aec64e36..8c7fe611 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/IndexAssetCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/IndexAssetCommand.java @@ -3,7 +3,7 @@ package pro.gravit.launchserver.command.hash; import com.google.gson.JsonObject; 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.command.CommandException; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/MakeProfileCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/MakeProfileCommand.java index 78f6973d..a424593c 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/MakeProfileCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/MakeProfileCommand.java @@ -2,8 +2,8 @@ package pro.gravit.launchserver.command.hash; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.profiles.ClientProfile; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.command.Command; import pro.gravit.launchserver.helper.MakeProfileHelper; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/SaveProfilesCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/SaveProfilesCommand.java index c4609883..32e65634 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/SaveProfilesCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/SaveProfilesCommand.java @@ -2,8 +2,8 @@ package pro.gravit.launchserver.command.hash; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.profiles.ClientProfile; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.command.Command; import pro.gravit.utils.helper.IOHelper; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/command/modules/ModulesCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/modules/ModulesCommand.java index e535b365..7519711b 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/command/modules/ModulesCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/modules/ModulesCommand.java @@ -3,8 +3,8 @@ package pro.gravit.launchserver.command.modules; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import pro.gravit.launcher.core.LauncherTrustManager; -import pro.gravit.launcher.modules.LauncherModule; -import pro.gravit.launcher.modules.LauncherModuleInfo; +import pro.gravit.launcher.base.modules.LauncherModule; +import pro.gravit.launcher.base.modules.LauncherModuleInfo; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.command.Command; import pro.gravit.launchserver.launchermodules.LauncherModuleLoader; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ComponentCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ComponentCommand.java index 39fd07aa..4ff72e01 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ComponentCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ComponentCommand.java @@ -2,7 +2,7 @@ package pro.gravit.launchserver.command.service; 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.launchserver.components.Component; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/NotifyCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/NotifyCommand.java index abf0e80b..74bc8fa8 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/NotifyCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/NotifyCommand.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.command.service; -import pro.gravit.launcher.events.NotificationEvent; -import pro.gravit.launcher.request.WebSocketEvent; +import pro.gravit.launcher.base.events.NotificationEvent; +import pro.gravit.launcher.base.request.WebSocketEvent; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.command.Command; import pro.gravit.launchserver.socket.WebSocketService; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/SecurityCheckCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/SecurityCheckCommand.java index 95d6cf99..a18c19e7 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/SecurityCheckCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/SecurityCheckCommand.java @@ -2,7 +2,7 @@ package pro.gravit.launchserver.command.service; 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.launchserver.LaunchServer; import pro.gravit.launchserver.auth.protect.AdvancedProtectHandler; import pro.gravit.launchserver.auth.protect.NoProtectHandler; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/TokenCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/TokenCommand.java index f6090469..35fdb687 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/TokenCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/TokenCommand.java @@ -3,7 +3,7 @@ package pro.gravit.launchserver.command.service; import io.jsonwebtoken.Jwts; 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.launchserver.LaunchServer; import pro.gravit.launchserver.auth.AuthProviderPair; import pro.gravit.launchserver.command.Command; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/config/LaunchServerConfig.java b/LaunchServer/src/main/java/pro/gravit/launchserver/config/LaunchServerConfig.java index 8f01b866..66b0aeee 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/config/LaunchServerConfig.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/config/LaunchServerConfig.java @@ -4,8 +4,8 @@ import io.netty.channel.epoll.Epoll; import io.netty.handler.logging.LogLevel; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -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.launchserver.LaunchServer; import pro.gravit.launchserver.auth.AuthProviderPair; import pro.gravit.launchserver.auth.core.RejectAuthCoreProvider; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/helper/HttpHelper.java b/LaunchServer/src/main/java/pro/gravit/launchserver/helper/HttpHelper.java index 2e6a756a..3872fec2 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/helper/HttpHelper.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/helper/HttpHelper.java @@ -3,8 +3,8 @@ package pro.gravit.launchserver.helper; 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.request.RequestException; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.request.RequestException; import java.io.IOException; import java.io.InputStream; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/helper/MakeProfileHelper.java b/LaunchServer/src/main/java/pro/gravit/launchserver/helper/MakeProfileHelper.java index 8bcac9bb..7f81329a 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/helper/MakeProfileHelper.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/helper/MakeProfileHelper.java @@ -1,12 +1,12 @@ package pro.gravit.launchserver.helper; -import pro.gravit.launcher.profiles.ClientProfile; -import pro.gravit.launcher.profiles.ClientProfileBuilder; -import pro.gravit.launcher.profiles.ClientProfileVersions; -import pro.gravit.launcher.profiles.optional.OptionalFile; -import pro.gravit.launcher.profiles.optional.actions.OptionalActionFile; -import pro.gravit.launcher.profiles.optional.actions.OptionalActionJvmArgs; -import pro.gravit.launcher.profiles.optional.triggers.OSTrigger; +import pro.gravit.launcher.base.profiles.ClientProfile; +import pro.gravit.launcher.base.profiles.ClientProfileBuilder; +import pro.gravit.launcher.base.profiles.ClientProfileVersions; +import pro.gravit.launcher.base.profiles.optional.OptionalFile; +import pro.gravit.launcher.base.profiles.optional.actions.OptionalActionFile; +import pro.gravit.launcher.base.profiles.optional.actions.OptionalActionJvmArgs; +import pro.gravit.launcher.base.profiles.optional.triggers.OSTrigger; import pro.gravit.utils.helper.JVMHelper; import java.io.IOException; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java b/LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java index df68ff85..eb6ddcaf 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java @@ -2,7 +2,7 @@ package pro.gravit.launchserver.launchermodules; 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.launcher.core.LauncherTrustManager; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.asm.InjectClassAcceptor; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/AuthManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/AuthManager.java index 5b7c3c21..8d00596d 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/AuthManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/AuthManager.java @@ -4,12 +4,12 @@ import io.jsonwebtoken.JwtParser; import io.jsonwebtoken.Jwts; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pro.gravit.launcher.ClientPermissions; -import pro.gravit.launcher.events.request.AuthRequestEvent; -import pro.gravit.launcher.profiles.ClientProfile; -import pro.gravit.launcher.profiles.PlayerProfile; -import pro.gravit.launcher.request.auth.AuthRequest; -import pro.gravit.launcher.request.auth.password.*; +import pro.gravit.launcher.base.ClientPermissions; +import pro.gravit.launcher.base.events.request.AuthRequestEvent; +import pro.gravit.launcher.base.profiles.ClientProfile; +import pro.gravit.launcher.base.profiles.PlayerProfile; +import pro.gravit.launcher.base.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.auth.password.*; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.auth.AuthException; import pro.gravit.launchserver.auth.AuthProviderPair; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/client/runtime/managers/ConfigManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/ConfigManager.java similarity index 93% rename from LauncherAPI/src/main/java/pro/gravit/launcher/client/runtime/managers/ConfigManager.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/manangers/ConfigManager.java index a1843aaf..fc5df469 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/client/runtime/managers/ConfigManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/ConfigManager.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.runtime.managers; +package pro.gravit.launchserver.manangers; -import pro.gravit.launcher.config.JsonConfigurable; +import pro.gravit.launcher.base.config.JsonConfigurable; import pro.gravit.utils.helper.LogHelper; import pro.gravit.utils.helper.VerifyHelper; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/LaunchServerGsonManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/LaunchServerGsonManager.java index c3f4e575..07deb093 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/LaunchServerGsonManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/LaunchServerGsonManager.java @@ -2,16 +2,16 @@ package pro.gravit.launchserver.manangers; import com.google.gson.GsonBuilder; import marcono1234.gson.recordadapter.RecordTypeAdapterFactory; -import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent; +import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent; import pro.gravit.launcher.core.managers.GsonManager; -import pro.gravit.launcher.modules.events.PreGsonPhase; -import pro.gravit.launcher.profiles.ClientProfile; -import pro.gravit.launcher.profiles.optional.actions.OptionalAction; -import pro.gravit.launcher.profiles.optional.triggers.OptionalTrigger; -import pro.gravit.launcher.request.JsonResultSerializeAdapter; -import pro.gravit.launcher.request.WebSocketEvent; -import pro.gravit.launcher.request.auth.AuthRequest; -import pro.gravit.launcher.request.auth.GetAvailabilityAuthRequest; +import pro.gravit.launcher.base.modules.events.PreGsonPhase; +import pro.gravit.launcher.base.profiles.ClientProfile; +import pro.gravit.launcher.base.profiles.optional.actions.OptionalAction; +import pro.gravit.launcher.base.profiles.optional.triggers.OptionalTrigger; +import pro.gravit.launcher.base.request.JsonResultSerializeAdapter; +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.launchserver.auth.core.AuthCoreProvider; import pro.gravit.launchserver.auth.mix.MixProvider; import pro.gravit.launchserver.auth.password.PasswordVerifier; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/MirrorManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/MirrorManager.java index 07932e2d..ddbd1eb9 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/MirrorManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/MirrorManager.java @@ -3,7 +3,7 @@ package pro.gravit.launchserver.manangers; 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.base.Launcher; import pro.gravit.utils.helper.IOHelper; import java.io.IOException; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerFullInitEvent.java b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerFullInitEvent.java index b619935b..cc5b7361 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerFullInitEvent.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerFullInitEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.modules.events; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.base.modules.LauncherModule; import pro.gravit.launchserver.LaunchServer; public class LaunchServerFullInitEvent extends LauncherModule.Event { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerInitPhase.java b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerInitPhase.java index da8903f1..773f8897 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerInitPhase.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerInitPhase.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.modules.events; -import pro.gravit.launcher.modules.events.InitPhase; +import pro.gravit.launcher.base.modules.events.InitPhase; import pro.gravit.launchserver.LaunchServer; public class LaunchServerInitPhase extends InitPhase { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerLauncherExeInit.java b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerLauncherExeInit.java index 48969876..5429f843 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerLauncherExeInit.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerLauncherExeInit.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.modules.events; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.base.modules.LauncherModule; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.binary.LauncherBinary; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerNettyFullInitEvent.java b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerNettyFullInitEvent.java index dae7d45b..58f9695f 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerNettyFullInitEvent.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerNettyFullInitEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.modules.events; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.base.modules.LauncherModule; import pro.gravit.launchserver.LaunchServer; public class LaunchServerNettyFullInitEvent extends LauncherModule.Event { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerPostInitPhase.java b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerPostInitPhase.java index e582bdf0..cb4ad282 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerPostInitPhase.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerPostInitPhase.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.modules.events; -import pro.gravit.launcher.modules.events.PostInitPhase; +import pro.gravit.launcher.base.modules.events.PostInitPhase; import pro.gravit.launchserver.LaunchServer; public class LaunchServerPostInitPhase extends PostInitPhase { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerProfilesSyncEvent.java b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerProfilesSyncEvent.java index c49ff4a5..a8c1e89d 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerProfilesSyncEvent.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerProfilesSyncEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.modules.events; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.base.modules.LauncherModule; import pro.gravit.launchserver.LaunchServer; public class LaunchServerProfilesSyncEvent extends LauncherModule.Event { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerUpdatesSyncEvent.java b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerUpdatesSyncEvent.java index c8afddf8..811aae2f 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerUpdatesSyncEvent.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerUpdatesSyncEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.modules.events; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.base.modules.LauncherModule; import pro.gravit.launchserver.LaunchServer; public class LaunchServerUpdatesSyncEvent extends LauncherModule.Event { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/NewLaunchServerInstanceEvent.java b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/NewLaunchServerInstanceEvent.java index 1dc3a550..9ed2aaaf 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/NewLaunchServerInstanceEvent.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/NewLaunchServerInstanceEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.modules.events; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.base.modules.LauncherModule; import pro.gravit.launchserver.LaunchServer; public class NewLaunchServerInstanceEvent extends LauncherModule.Event { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/security/SecurityReportModuleEvent.java b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/security/SecurityReportModuleEvent.java index 8fb01c62..39c85369 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/security/SecurityReportModuleEvent.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/security/SecurityReportModuleEvent.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.modules.events.security; -import pro.gravit.launcher.events.request.SecurityReportRequestEvent; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.base.events.request.SecurityReportRequestEvent; +import pro.gravit.launcher.base.modules.LauncherModule; import pro.gravit.launchserver.socket.Client; import pro.gravit.launchserver.socket.response.secure.SecurityReportResponse; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/impl/LaunchServerCoreModule.java b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/impl/LaunchServerCoreModule.java index 6e54d9bb..798572c9 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/impl/LaunchServerCoreModule.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/impl/LaunchServerCoreModule.java @@ -1,9 +1,9 @@ package pro.gravit.launchserver.modules.impl; -import pro.gravit.launcher.modules.LauncherInitContext; -import pro.gravit.launcher.modules.LauncherModule; -import pro.gravit.launcher.modules.LauncherModuleInfo; -import pro.gravit.launcher.modules.events.InitPhase; +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.InitPhase; import pro.gravit.utils.Version; public class LaunchServerCoreModule extends LauncherModule { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/impl/LaunchServerInitContext.java b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/impl/LaunchServerInitContext.java index f33f8b5e..c3e35225 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/impl/LaunchServerInitContext.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/impl/LaunchServerInitContext.java @@ -1,6 +1,6 @@ package pro.gravit.launchserver.modules.impl; -import pro.gravit.launcher.modules.LauncherInitContext; +import pro.gravit.launcher.base.modules.LauncherInitContext; import pro.gravit.launchserver.LaunchServer; public class LaunchServerInitContext implements LauncherInitContext { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/impl/LaunchServerModulesManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/impl/LaunchServerModulesManager.java index 1149eaa6..47dc112e 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/modules/impl/LaunchServerModulesManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/impl/LaunchServerModulesManager.java @@ -1,8 +1,8 @@ package pro.gravit.launchserver.modules.impl; import pro.gravit.launcher.core.LauncherTrustManager; -import pro.gravit.launcher.modules.LauncherModule; -import pro.gravit.launcher.modules.impl.SimpleModuleManager; +import pro.gravit.launcher.base.modules.LauncherModule; +import pro.gravit.launcher.base.modules.impl.SimpleModuleManager; import pro.gravit.launchserver.LaunchServer; import java.nio.file.Path; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/Client.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/Client.java index 32b4fdf4..b91c50f4 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/Client.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/Client.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.socket; -import pro.gravit.launcher.ClientPermissions; -import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.base.ClientPermissions; +import pro.gravit.launcher.base.profiles.ClientProfile; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.auth.AuthProviderPair; import pro.gravit.launchserver.auth.core.interfaces.UserHardware; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/WebSocketService.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/WebSocketService.java index 03de2060..948b01be 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/WebSocketService.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/WebSocketService.java @@ -8,11 +8,11 @@ import io.netty.channel.group.ChannelGroup; import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.events.RequestEvent; -import pro.gravit.launcher.events.request.ErrorRequestEvent; -import pro.gravit.launcher.events.request.ExitRequestEvent; -import pro.gravit.launcher.request.WebSocketEvent; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.events.RequestEvent; +import pro.gravit.launcher.base.events.request.ErrorRequestEvent; +import pro.gravit.launcher.base.events.request.ExitRequestEvent; +import pro.gravit.launcher.base.request.WebSocketEvent; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.socket.handlers.WebSocketFrameHandler; import pro.gravit.launchserver.socket.response.SimpleResponse; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyWebAPIHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyWebAPIHandler.java index 46fa2fd4..ac4c0057 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyWebAPIHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyWebAPIHandler.java @@ -7,7 +7,7 @@ import io.netty.channel.SimpleChannelInboundHandler; import io.netty.handler.codec.http.*; 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.socket.NettyConnectContext; import pro.gravit.utils.helper.IOHelper; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/SimpleResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/SimpleResponse.java index 87e15aed..28738232 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/SimpleResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/SimpleResponse.java @@ -1,8 +1,8 @@ package pro.gravit.launchserver.socket.response; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.RequestEvent; -import pro.gravit.launcher.events.request.ErrorRequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; +import pro.gravit.launcher.base.events.request.ErrorRequestEvent; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.socket.WebSocketService; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/WebSocketServerResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/WebSocketServerResponse.java index d4a769d8..7d3814d8 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/WebSocketServerResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/WebSocketServerResponse.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.socket.response; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.request.websockets.WebSocketRequest; +import pro.gravit.launcher.base.request.websockets.WebSocketRequest; import pro.gravit.launchserver.socket.Client; public interface WebSocketServerResponse extends WebSocketRequest { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AdditionalDataResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AdditionalDataResponse.java index b3a38e6b..a4a368b6 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AdditionalDataResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AdditionalDataResponse.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.socket.response.auth; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.AdditionalDataRequestEvent; +import pro.gravit.launcher.base.events.request.AdditionalDataRequestEvent; import pro.gravit.launchserver.auth.AuthProviderPair; import pro.gravit.launchserver.auth.core.User; import pro.gravit.launchserver.auth.core.interfaces.user.UserSupportAdditionalData; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AuthResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AuthResponse.java index 58f1ea35..fc463437 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AuthResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AuthResponse.java @@ -3,8 +3,8 @@ package pro.gravit.launchserver.socket.response.auth; import io.netty.channel.ChannelHandlerContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pro.gravit.launcher.events.request.AuthRequestEvent; -import pro.gravit.launcher.request.auth.AuthRequest; +import pro.gravit.launcher.base.events.request.AuthRequestEvent; +import pro.gravit.launcher.base.request.auth.AuthRequest; import pro.gravit.launchserver.auth.AuthException; import pro.gravit.launchserver.auth.AuthProviderPair; import pro.gravit.launchserver.manangers.AuthManager; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CheckServerResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CheckServerResponse.java index 947e5dcb..29aed1be 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CheckServerResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CheckServerResponse.java @@ -3,7 +3,7 @@ package pro.gravit.launchserver.socket.response.auth; import io.netty.channel.ChannelHandlerContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pro.gravit.launcher.events.request.CheckServerRequestEvent; +import pro.gravit.launcher.base.events.request.CheckServerRequestEvent; import pro.gravit.launchserver.auth.AuthException; import pro.gravit.launchserver.auth.core.interfaces.session.UserSessionSupportHardware; import pro.gravit.launchserver.auth.core.interfaces.session.UserSessionSupportProperties; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CurrentUserResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CurrentUserResponse.java index d1aaa064..560cf1cd 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CurrentUserResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CurrentUserResponse.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.socket.response.auth; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.CurrentUserRequestEvent; +import pro.gravit.launcher.base.events.request.CurrentUserRequestEvent; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.socket.Client; import pro.gravit.launchserver.socket.response.SimpleResponse; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/ExitResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/ExitResponse.java index af5d4d42..6cd1647c 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/ExitResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/ExitResponse.java @@ -2,8 +2,8 @@ package pro.gravit.launchserver.socket.response.auth; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.RequestEvent; -import pro.gravit.launcher.events.request.ExitRequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; +import pro.gravit.launcher.base.events.request.ExitRequestEvent; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.auth.core.UserSession; import pro.gravit.launchserver.auth.core.interfaces.provider.AuthSupportExit; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/FetchClientProfileKeyResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/FetchClientProfileKeyResponse.java index 92f191f5..6a0d04a3 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/FetchClientProfileKeyResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/FetchClientProfileKeyResponse.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.socket.response.auth; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.FetchClientProfileKeyRequestEvent; +import pro.gravit.launcher.base.events.request.FetchClientProfileKeyRequestEvent; import pro.gravit.launchserver.auth.core.UserSession; import pro.gravit.launchserver.auth.core.interfaces.session.UserSessionSupportKeys; import pro.gravit.launchserver.socket.Client; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/GetAvailabilityAuthResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/GetAvailabilityAuthResponse.java index 913218c1..b5d24f81 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/GetAvailabilityAuthResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/GetAvailabilityAuthResponse.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.socket.response.auth; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent; +import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent; import pro.gravit.launchserver.auth.AuthProviderPair; import pro.gravit.launchserver.socket.Client; import pro.gravit.launchserver.socket.response.SimpleResponse; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/JoinServerResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/JoinServerResponse.java index 72a480a2..d1238639 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/JoinServerResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/JoinServerResponse.java @@ -3,7 +3,7 @@ package pro.gravit.launchserver.socket.response.auth; import io.netty.channel.ChannelHandlerContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pro.gravit.launcher.events.request.JoinServerRequestEvent; +import pro.gravit.launcher.base.events.request.JoinServerRequestEvent; import pro.gravit.launchserver.auth.AuthException; import pro.gravit.launchserver.auth.protect.interfaces.JoinServerProtectHandler; import pro.gravit.launchserver.socket.Client; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/ProfilesResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/ProfilesResponse.java index 45067b2e..39058b76 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/ProfilesResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/ProfilesResponse.java @@ -1,8 +1,8 @@ package pro.gravit.launchserver.socket.response.auth; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.ProfilesRequestEvent; -import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.base.events.request.ProfilesRequestEvent; +import pro.gravit.launcher.base.profiles.ClientProfile; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.auth.protect.interfaces.ProfilesProtectHandler; import pro.gravit.launchserver.socket.Client; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/RefreshTokenResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/RefreshTokenResponse.java index 892a4e3c..df02e059 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/RefreshTokenResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/RefreshTokenResponse.java @@ -1,8 +1,8 @@ package pro.gravit.launchserver.socket.response.auth; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.AuthRequestEvent; -import pro.gravit.launcher.events.request.RefreshTokenRequestEvent; +import pro.gravit.launcher.base.events.request.AuthRequestEvent; +import pro.gravit.launcher.base.events.request.RefreshTokenRequestEvent; import pro.gravit.launchserver.auth.AuthProviderPair; import pro.gravit.launchserver.manangers.AuthManager; import pro.gravit.launchserver.socket.Client; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/RestoreResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/RestoreResponse.java index fa720e5c..4e326b7a 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/RestoreResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/RestoreResponse.java @@ -1,9 +1,9 @@ package pro.gravit.launchserver.socket.response.auth; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.AuthRequestEvent; -import pro.gravit.launcher.events.request.LauncherRequestEvent; -import pro.gravit.launcher.events.request.RestoreRequestEvent; +import pro.gravit.launcher.base.events.request.AuthRequestEvent; +import pro.gravit.launcher.base.events.request.LauncherRequestEvent; +import pro.gravit.launcher.base.events.request.RestoreRequestEvent; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.auth.AuthProviderPair; import pro.gravit.launchserver.auth.core.AuthCoreProvider; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/SetProfileResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/SetProfileResponse.java index 423e4a68..ad1e37d5 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/SetProfileResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/SetProfileResponse.java @@ -1,8 +1,8 @@ package pro.gravit.launchserver.socket.response.auth; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.SetProfileRequestEvent; -import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.base.events.request.SetProfileRequestEvent; +import pro.gravit.launcher.base.profiles.ClientProfile; import pro.gravit.launchserver.auth.protect.interfaces.ProfilesProtectHandler; import pro.gravit.launchserver.socket.Client; import pro.gravit.launchserver.socket.response.SimpleResponse; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/cabinet/GetAssetUploadInfoResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/cabinet/GetAssetUploadInfoResponse.java index 60260f11..5136a389 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/cabinet/GetAssetUploadInfoResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/cabinet/GetAssetUploadInfoResponse.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.socket.response.cabinet; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.GetAssetUploadUrlRequestEvent; +import pro.gravit.launcher.base.events.request.GetAssetUploadUrlRequestEvent; import pro.gravit.launchserver.auth.core.interfaces.provider.AuthSupportAssetUpload; import pro.gravit.launchserver.socket.Client; import pro.gravit.launchserver.socket.response.SimpleResponse; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/management/FeaturesResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/management/FeaturesResponse.java index 74ccf493..02323dd1 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/management/FeaturesResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/management/FeaturesResponse.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.socket.response.management; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.FeaturesRequestEvent; +import pro.gravit.launcher.base.events.request.FeaturesRequestEvent; import pro.gravit.launchserver.socket.Client; import pro.gravit.launchserver.socket.response.SimpleResponse; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/management/GetPublicKeyResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/management/GetPublicKeyResponse.java index 398dc3e4..3e18caff 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/management/GetPublicKeyResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/management/GetPublicKeyResponse.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.socket.response.management; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.GetPublicKeyRequestEvent; +import pro.gravit.launcher.base.events.request.GetPublicKeyRequestEvent; import pro.gravit.launchserver.socket.Client; import pro.gravit.launchserver.socket.response.SimpleResponse; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/BatchProfileByUsername.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/BatchProfileByUsername.java index 3193d940..bfdb81ac 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/BatchProfileByUsername.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/BatchProfileByUsername.java @@ -1,8 +1,8 @@ package pro.gravit.launchserver.socket.response.profile; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.BatchProfileByUsernameRequestEvent; -import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launcher.base.events.request.BatchProfileByUsernameRequestEvent; +import pro.gravit.launcher.base.profiles.PlayerProfile; import pro.gravit.launchserver.auth.AuthProviderPair; import pro.gravit.launchserver.socket.Client; import pro.gravit.launchserver.socket.response.SimpleResponse; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUUIDResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUUIDResponse.java index 90f59088..9bf4ec16 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUUIDResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUUIDResponse.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.socket.response.profile; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.ProfileByUUIDRequestEvent; +import pro.gravit.launcher.base.events.request.ProfileByUUIDRequestEvent; import pro.gravit.launchserver.auth.AuthProviderPair; import pro.gravit.launchserver.auth.core.User; import pro.gravit.launchserver.socket.Client; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUsername.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUsername.java index d19c301a..50b9efe6 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUsername.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUsername.java @@ -1,8 +1,8 @@ package pro.gravit.launchserver.socket.response.profile; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.ProfileByUsernameRequestEvent; -import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launcher.base.events.request.ProfileByUsernameRequestEvent; +import pro.gravit.launcher.base.profiles.PlayerProfile; import pro.gravit.launchserver.auth.AuthProviderPair; import pro.gravit.launchserver.socket.Client; import pro.gravit.launchserver.socket.response.SimpleResponse; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/GetSecureLevelInfoResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/GetSecureLevelInfoResponse.java index defe4630..b3e3c99f 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/GetSecureLevelInfoResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/GetSecureLevelInfoResponse.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.socket.response.secure; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.GetSecureLevelInfoRequestEvent; +import pro.gravit.launcher.base.events.request.GetSecureLevelInfoRequestEvent; import pro.gravit.launchserver.auth.protect.interfaces.SecureProtectHandler; import pro.gravit.launchserver.socket.Client; import pro.gravit.launchserver.socket.response.SimpleResponse; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/HardwareReportResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/HardwareReportResponse.java index b23e5ecb..785a42c3 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/HardwareReportResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/HardwareReportResponse.java @@ -1,8 +1,8 @@ package pro.gravit.launchserver.socket.response.secure; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.HardwareReportRequestEvent; -import pro.gravit.launcher.request.secure.HardwareReportRequest; +import pro.gravit.launcher.base.events.request.HardwareReportRequestEvent; +import pro.gravit.launcher.base.request.secure.HardwareReportRequest; import pro.gravit.launchserver.auth.protect.interfaces.HardwareProtectHandler; import pro.gravit.launchserver.socket.Client; import pro.gravit.launchserver.socket.response.SimpleResponse; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/SecurityReportResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/SecurityReportResponse.java index de64309a..a7ff6784 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/SecurityReportResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/SecurityReportResponse.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.socket.response.secure; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.SecurityReportRequestEvent; +import pro.gravit.launcher.base.events.request.SecurityReportRequestEvent; import pro.gravit.launchserver.auth.protect.interfaces.SecureProtectHandler; import pro.gravit.launchserver.modules.events.security.SecurityReportModuleEvent; import pro.gravit.launchserver.socket.Client; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/LauncherResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/LauncherResponse.java index 8849c61a..de468ed6 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/LauncherResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/LauncherResponse.java @@ -6,7 +6,7 @@ import io.jsonwebtoken.SignatureAlgorithm; import io.netty.channel.ChannelHandlerContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pro.gravit.launcher.events.request.LauncherRequestEvent; +import pro.gravit.launcher.base.events.request.LauncherRequestEvent; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.auth.AuthProviderPair; import pro.gravit.launchserver.socket.Client; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/UpdateListResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/UpdateListResponse.java index bda0328b..5d3d7d67 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/UpdateListResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/UpdateListResponse.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.socket.response.update; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.UpdateListRequestEvent; +import pro.gravit.launcher.base.events.request.UpdateListRequestEvent; import pro.gravit.launchserver.socket.Client; import pro.gravit.launchserver.socket.response.SimpleResponse; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/UpdateResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/UpdateResponse.java index f1a3cd1e..9f92517d 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/UpdateResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/UpdateResponse.java @@ -1,7 +1,7 @@ package pro.gravit.launchserver.socket.response.update; import io.netty.channel.ChannelHandlerContext; -import pro.gravit.launcher.events.request.UpdateRequestEvent; +import pro.gravit.launcher.base.events.request.UpdateRequestEvent; import pro.gravit.launcher.core.hasher.HashedDir; import pro.gravit.launchserver.auth.protect.interfaces.ProfilesProtectHandler; import pro.gravit.launchserver.config.LaunchServerConfig; diff --git a/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/proguard.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/proguard.cfg index ca10f5fa..2f89b1a5 100644 --- a/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/proguard.cfg +++ b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/proguard.cfg @@ -14,9 +14,9 @@ -keepattributes Signature -adaptresourcefilecontents META-INF/MANIFEST.MF --keeppackagenames com.mojang.**,net.minecraftforge.fml.**,cpw.mods.fml.**,com.google.gson.**,pro.gravit.repackage.**,org.fusesource.**, pro.gravit.launcher.api.**, pro.gravit.utils.**, pro.gravit.launcher.request.**, pro.gravit.launcher.events.**, pro.gravit.launcher.profiles.** +-keeppackagenames com.google.gson.**,pro.gravit.repackage.**,org.fusesource.**, pro.gravit.launcher.runtime.api.**, pro.gravit.launcher.base.api.**, pro.gravit.launcher.client.api.**, pro.gravit.utils.**, pro.gravit.launcher.base.request.**, pro.gravit.launcher.base.events.**, pro.gravit.launcher.base.profiles.** --keep class com.mojang.**,net.minecraftforge.fml.**,cpw.mods.fml.**,com.google.gson.**,pro.gravit.repackage.**,org.fusesource.**, pro.gravit.launcher.client.api.**, pro.gravit.utils.**, pro.gravit.launcher.request.**, pro.gravit.launcher.events.**, pro.gravit.launcher.profiles.**, pro.gravit.launcher.LauncherEngineWrapper { +-keep class com.mojang.**,net.minecraftforge.fml.**,cpw.mods.fml.**,com.google.gson.**,pro.gravit.repackage.**,org.fusesource.**, pro.gravit.launcher.client.api.**, pro.gravit.utils.**, pro.gravit.launcher.base.request.**, pro.gravit.launcher.base.events.**, pro.gravit.launcher.base.profiles.**, pro.gravit.launcher.runtime.LauncherEngineWrapper { *; } diff --git a/LaunchServer/src/test/java/pro/gravit/launchserver/ConfigurationTest.java b/LaunchServer/src/test/java/pro/gravit/launchserver/ConfigurationTest.java index 89ce58eb..bf2d51a5 100644 --- a/LaunchServer/src/test/java/pro/gravit/launchserver/ConfigurationTest.java +++ b/LaunchServer/src/test/java/pro/gravit/launchserver/ConfigurationTest.java @@ -4,7 +4,7 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.base.Launcher; import pro.gravit.launchserver.config.LaunchServerConfig; import pro.gravit.launchserver.config.LaunchServerRuntimeConfig; import pro.gravit.launchserver.impl.TestLaunchServerConfigManager; diff --git a/LaunchServer/src/test/java/pro/gravit/launchserver/StartLaunchServerTest.java b/LaunchServer/src/test/java/pro/gravit/launchserver/StartLaunchServerTest.java index 88b8762a..9c663b15 100644 --- a/LaunchServer/src/test/java/pro/gravit/launchserver/StartLaunchServerTest.java +++ b/LaunchServer/src/test/java/pro/gravit/launchserver/StartLaunchServerTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.base.Launcher; import pro.gravit.launchserver.config.LaunchServerConfig; import pro.gravit.launchserver.config.LaunchServerRuntimeConfig; import pro.gravit.launchserver.impl.TestLaunchServerConfigManager; diff --git a/Launcher/build.gradle b/Launcher/build.gradle index b2a0c82b..2aa41a79 100644 --- a/Launcher/build.gradle +++ b/Launcher/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'org.openjfx.javafxplugin' apply plugin: 'com.github.johnrengelman.shadow' -String mainClassName = "pro.gravit.launcher.ClientLauncherWrapper" -String mainAgentName = "pro.gravit.launcher.LauncherAgent" +String mainClassName = "pro.gravit.launcher.start.ClientLauncherWrapper" +String mainAgentName = "pro.gravit.launcher.runtime.LauncherAgent" repositories { maven { @@ -50,11 +50,9 @@ shadowJar { dependencies { pack project(':LauncherAPI') - pack project(':LauncherModernCore') pack project(':LauncherClient') pack project(':LauncherStart') bundle group: 'com.github.oshi', name: 'oshi-core', version: rootProject['verOshiCore'] - pack group: 'io.netty', name: 'netty-codec-http', version: rootProject['verNetty'] } tasks.register('genRuntimeJS', Zip) { diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/LauncherEngine.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/LauncherEngine.java similarity index 86% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/LauncherEngine.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/LauncherEngine.java index 9c4be3e3..8de18308 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/LauncherEngine.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/LauncherEngine.java @@ -1,31 +1,30 @@ -package pro.gravit.launcher.client.runtime; +package pro.gravit.launcher.runtime; -import pro.gravit.launcher.*; -import pro.gravit.launcher.client.BasicLauncherEventHandler; -import pro.gravit.launcher.client.ClientLauncherMethods; -import pro.gravit.launcher.client.LauncherAgent; -import pro.gravit.launcher.client.runtime.client.*; -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.ClientPreGuiPhase; -import pro.gravit.launcher.client.runtime.console.GetPublicKeyCommand; -import pro.gravit.launcher.client.runtime.console.ModulesCommand; -import pro.gravit.launcher.client.runtime.console.SignDataCommand; -import pro.gravit.launcher.client.runtime.gui.NoRuntimeProvider; -import pro.gravit.launcher.client.runtime.gui.RuntimeProvider; -import pro.gravit.launcher.client.runtime.managers.ConsoleManager; -import pro.gravit.launcher.client.runtime.utils.NativeJVMHalt; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.LauncherConfig; +import pro.gravit.launcher.client.*; +import pro.gravit.launcher.runtime.client.*; +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.runtime.console.GetPublicKeyCommand; +import pro.gravit.launcher.runtime.console.ModulesCommand; +import pro.gravit.launcher.runtime.console.SignDataCommand; +import pro.gravit.launcher.runtime.gui.NoRuntimeProvider; +import pro.gravit.launcher.runtime.gui.RuntimeProvider; +import pro.gravit.launcher.runtime.managers.ConsoleManager; +import pro.gravit.launcher.client.utils.NativeJVMHalt; import pro.gravit.launcher.core.LauncherTrustManager; -import pro.gravit.launcher.modules.events.OfflineModeEvent; -import pro.gravit.launcher.modules.events.PreConfigPhase; -import pro.gravit.launcher.profiles.optional.actions.OptionalAction; -import pro.gravit.launcher.profiles.optional.triggers.OptionalTrigger; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.RequestException; -import pro.gravit.launcher.request.RequestService; -import pro.gravit.launcher.request.auth.*; -import pro.gravit.launcher.request.websockets.OfflineRequestService; -import pro.gravit.launcher.request.websockets.StdWebSocketService; +import pro.gravit.launcher.base.modules.events.OfflineModeEvent; +import pro.gravit.launcher.base.modules.events.PreConfigPhase; +import pro.gravit.launcher.base.profiles.optional.actions.OptionalAction; +import pro.gravit.launcher.base.profiles.optional.triggers.OptionalTrigger; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.RequestException; +import pro.gravit.launcher.base.request.RequestService; +import pro.gravit.launcher.base.request.auth.*; +import pro.gravit.launcher.base.request.websockets.OfflineRequestService; +import pro.gravit.launcher.base.request.websockets.StdWebSocketService; import pro.gravit.launcher.start.RuntimeModuleManager; import pro.gravit.utils.helper.*; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/LauncherEngineWrapper.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/LauncherEngineWrapper.java similarity index 97% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/LauncherEngineWrapper.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/LauncherEngineWrapper.java index 01d588aa..b0cd6306 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/LauncherEngineWrapper.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/LauncherEngineWrapper.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.client.runtime; +package pro.gravit.launcher.runtime; import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.utils.helper.IOHelper; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/NewLauncherSettings.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/NewLauncherSettings.java similarity index 73% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/NewLauncherSettings.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/NewLauncherSettings.java index bcb5c355..a58108ac 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/NewLauncherSettings.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/NewLauncherSettings.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.runtime; +package pro.gravit.launcher.runtime; -import pro.gravit.launcher.client.runtime.client.UserSettings; +import pro.gravit.launcher.runtime.client.UserSettings; import pro.gravit.launcher.core.LauncherNetworkAPI; import java.util.HashMap; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherProcess.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/ClientLauncherProcess.java similarity index 91% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherProcess.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/client/ClientLauncherProcess.java index 29239476..0a378b19 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherProcess.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/ClientLauncherProcess.java @@ -1,19 +1,21 @@ -package pro.gravit.launcher.client.runtime.client; +package pro.gravit.launcher.runtime.client; -import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.LauncherConfig; -import pro.gravit.launcher.client.runtime.LauncherEngine; -import pro.gravit.launcher.client.runtime.client.events.client.ClientProcessBuilderCreateEvent; -import pro.gravit.launcher.client.runtime.client.events.client.ClientProcessBuilderLaunchedEvent; -import pro.gravit.launcher.client.runtime.client.events.client.ClientProcessBuilderParamsWrittedEvent; -import pro.gravit.launcher.client.runtime.client.events.client.ClientProcessBuilderPreLaunchEvent; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.LauncherConfig; +import pro.gravit.launcher.client.ClientLauncherEntryPoint; +import pro.gravit.launcher.client.ClientParams; +import pro.gravit.launcher.runtime.LauncherEngine; +import pro.gravit.launcher.runtime.client.events.ClientProcessBuilderCreateEvent; +import pro.gravit.launcher.runtime.client.events.ClientProcessBuilderLaunchedEvent; +import pro.gravit.launcher.runtime.client.events.ClientProcessBuilderParamsWrittedEvent; +import pro.gravit.launcher.runtime.client.events.ClientProcessBuilderPreLaunchEvent; import pro.gravit.launcher.core.hasher.HashedDir; -import pro.gravit.launcher.profiles.ClientProfile; -import pro.gravit.launcher.profiles.PlayerProfile; -import pro.gravit.launcher.profiles.optional.OptionalView; -import pro.gravit.launcher.profiles.optional.actions.OptionalAction; -import pro.gravit.launcher.profiles.optional.actions.OptionalActionJvmArgs; -import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.base.profiles.ClientProfile; +import pro.gravit.launcher.base.profiles.PlayerProfile; +import pro.gravit.launcher.base.profiles.optional.OptionalView; +import pro.gravit.launcher.base.profiles.optional.actions.OptionalAction; +import pro.gravit.launcher.base.profiles.optional.actions.OptionalActionJvmArgs; +import pro.gravit.launcher.base.request.Request; import pro.gravit.launcher.core.serialize.HOutput; import pro.gravit.utils.helper.*; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/DirBridge.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/DirBridge.java similarity index 97% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/DirBridge.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/client/DirBridge.java index 3167bfef..f5e6c4fa 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/DirBridge.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/DirBridge.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.runtime.client; +package pro.gravit.launcher.runtime.client; -import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.base.Launcher; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.JVMHelper; import pro.gravit.utils.helper.LogHelper; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/RuntimeGsonManager.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/RuntimeGsonManager.java similarity index 81% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/RuntimeGsonManager.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/client/RuntimeGsonManager.java index 0ea95006..6f31c359 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/RuntimeGsonManager.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/RuntimeGsonManager.java @@ -1,10 +1,10 @@ -package pro.gravit.launcher.client.runtime.client; +package pro.gravit.launcher.runtime.client; import com.google.gson.GsonBuilder; import pro.gravit.launcher.start.RuntimeModuleManager; import pro.gravit.launcher.core.managers.GsonManager; -import pro.gravit.launcher.modules.events.PreGsonPhase; -import pro.gravit.launcher.request.websockets.ClientWebSocketService; +import pro.gravit.launcher.base.modules.events.PreGsonPhase; +import pro.gravit.launcher.base.request.websockets.ClientWebSocketService; import pro.gravit.utils.UniversalJsonAdapter; public class RuntimeGsonManager extends GsonManager { diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/ServerPinger.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/ServerPinger.java similarity index 98% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/ServerPinger.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/client/ServerPinger.java index f0a83ea1..53f113b2 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/ServerPinger.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/ServerPinger.java @@ -1,10 +1,10 @@ -package pro.gravit.launcher.client.runtime.client; +package pro.gravit.launcher.runtime.client; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import pro.gravit.launcher.profiles.ClientProfile; -import pro.gravit.launcher.profiles.ClientProfileVersions; +import pro.gravit.launcher.base.profiles.ClientProfile; +import pro.gravit.launcher.base.profiles.ClientProfileVersions; import pro.gravit.launcher.core.serialize.HInput; import pro.gravit.launcher.core.serialize.HOutput; import pro.gravit.utils.helper.IOHelper; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/UserSettings.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/UserSettings.java similarity index 74% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/UserSettings.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/client/UserSettings.java index 6a9b0c9d..37f4a105 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/UserSettings.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/UserSettings.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.client.runtime.client; +package pro.gravit.launcher.runtime.client; import pro.gravit.utils.ProviderMap; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientEngineInitPhase.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientEngineInitPhase.java similarity index 53% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientEngineInitPhase.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientEngineInitPhase.java index 1a54cc43..51f78965 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientEngineInitPhase.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientEngineInitPhase.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.client.runtime.client.events; +package pro.gravit.launcher.runtime.client.events; -import pro.gravit.launcher.client.runtime.LauncherEngine; -import pro.gravit.launcher.modules.events.InitPhase; +import pro.gravit.launcher.runtime.LauncherEngine; +import pro.gravit.launcher.base.modules.events.InitPhase; public class ClientEngineInitPhase extends InitPhase { public final LauncherEngine engine; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientGuiPhase.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientGuiPhase.java similarity index 57% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientGuiPhase.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientGuiPhase.java index daee9373..54fe9305 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientGuiPhase.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientGuiPhase.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.client.runtime.client.events; +package pro.gravit.launcher.runtime.client.events; -import pro.gravit.launcher.client.runtime.gui.RuntimeProvider; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.runtime.gui.RuntimeProvider; +import pro.gravit.launcher.base.modules.LauncherModule; public class ClientGuiPhase extends LauncherModule.Event { public final RuntimeProvider runtimeProvider; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientPreGuiPhase.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientPreGuiPhase.java similarity index 57% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientPreGuiPhase.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientPreGuiPhase.java index e3bce78d..39572c9b 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientPreGuiPhase.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientPreGuiPhase.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.client.runtime.client.events; +package pro.gravit.launcher.runtime.client.events; -import pro.gravit.launcher.client.runtime.gui.RuntimeProvider; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.runtime.gui.RuntimeProvider; +import pro.gravit.launcher.base.modules.LauncherModule; public class ClientPreGuiPhase extends LauncherModule.Event { public RuntimeProvider runtimeProvider; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderCreateEvent.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientProcessBuilderCreateEvent.java similarity index 59% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderCreateEvent.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientProcessBuilderCreateEvent.java index 7df12606..d0d1ebc7 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderCreateEvent.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientProcessBuilderCreateEvent.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.client.runtime.client.events.client; +package pro.gravit.launcher.runtime.client.events; -import pro.gravit.launcher.client.runtime.client.ClientLauncherProcess; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.runtime.client.ClientLauncherProcess; +import pro.gravit.launcher.base.modules.LauncherModule; public class ClientProcessBuilderCreateEvent extends LauncherModule.Event { public final ClientLauncherProcess processBuilder; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderLaunchedEvent.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientProcessBuilderLaunchedEvent.java similarity index 59% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderLaunchedEvent.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientProcessBuilderLaunchedEvent.java index 5383f328..3d9559fd 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderLaunchedEvent.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientProcessBuilderLaunchedEvent.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.client.runtime.client.events.client; +package pro.gravit.launcher.runtime.client.events; -import pro.gravit.launcher.client.runtime.client.ClientLauncherProcess; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.runtime.client.ClientLauncherProcess; +import pro.gravit.launcher.base.modules.LauncherModule; public class ClientProcessBuilderLaunchedEvent extends LauncherModule.Event { public final ClientLauncherProcess processBuilder; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderParamsWrittedEvent.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientProcessBuilderParamsWrittedEvent.java similarity index 57% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderParamsWrittedEvent.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientProcessBuilderParamsWrittedEvent.java index 469d92ad..c3a808e8 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderParamsWrittedEvent.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientProcessBuilderParamsWrittedEvent.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.client.runtime.client.events.client; +package pro.gravit.launcher.runtime.client.events; -import pro.gravit.launcher.client.runtime.client.ClientLauncherProcess; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.runtime.client.ClientLauncherProcess; +import pro.gravit.launcher.base.modules.LauncherModule; public class ClientProcessBuilderParamsWrittedEvent extends LauncherModule.Event { public final ClientLauncherProcess process; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderPreLaunchEvent.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientProcessBuilderPreLaunchEvent.java similarity index 59% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderPreLaunchEvent.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientProcessBuilderPreLaunchEvent.java index 188bd42d..ce013aa2 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderPreLaunchEvent.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/client/events/ClientProcessBuilderPreLaunchEvent.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.client.runtime.client.events.client; +package pro.gravit.launcher.runtime.client.events; -import pro.gravit.launcher.client.runtime.client.ClientLauncherProcess; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.runtime.client.ClientLauncherProcess; +import pro.gravit.launcher.base.modules.LauncherModule; public class ClientProcessBuilderPreLaunchEvent extends LauncherModule.Event { public final ClientLauncherProcess processBuilder; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/GetPublicKeyCommand.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/console/GetPublicKeyCommand.java similarity index 86% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/GetPublicKeyCommand.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/console/GetPublicKeyCommand.java index 7a63a5eb..2d2e1ec1 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/GetPublicKeyCommand.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/console/GetPublicKeyCommand.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.runtime.console; +package pro.gravit.launcher.runtime.console; -import pro.gravit.launcher.client.runtime.LauncherEngine; +import pro.gravit.launcher.runtime.LauncherEngine; import pro.gravit.utils.command.Command; import pro.gravit.utils.helper.LogHelper; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/ModulesCommand.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/console/ModulesCommand.java similarity index 86% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/ModulesCommand.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/console/ModulesCommand.java index e4d42437..060903e9 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/ModulesCommand.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/console/ModulesCommand.java @@ -1,10 +1,10 @@ -package pro.gravit.launcher.client.runtime.console; +package pro.gravit.launcher.runtime.console; -import pro.gravit.launcher.client.runtime.LauncherEngine; -import pro.gravit.launcher.client.runtime.managers.ConsoleManager; +import pro.gravit.launcher.runtime.LauncherEngine; +import pro.gravit.launcher.runtime.managers.ConsoleManager; import pro.gravit.launcher.core.LauncherTrustManager; -import pro.gravit.launcher.modules.LauncherModule; -import pro.gravit.launcher.modules.LauncherModuleInfo; +import pro.gravit.launcher.base.modules.LauncherModule; +import pro.gravit.launcher.base.modules.LauncherModuleInfo; import pro.gravit.utils.command.Command; import pro.gravit.utils.helper.LogHelper; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/SignDataCommand.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/console/SignDataCommand.java similarity index 88% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/SignDataCommand.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/console/SignDataCommand.java index f74051cb..7be082d0 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/SignDataCommand.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/console/SignDataCommand.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.runtime.console; +package pro.gravit.launcher.runtime.console; -import pro.gravit.launcher.client.runtime.LauncherEngine; +import pro.gravit.launcher.runtime.LauncherEngine; import pro.gravit.utils.command.Command; import pro.gravit.utils.helper.LogHelper; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/UnlockCommand.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/console/UnlockCommand.java similarity index 82% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/UnlockCommand.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/console/UnlockCommand.java index 4e1677c5..424949fb 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/UnlockCommand.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/console/UnlockCommand.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.client.runtime.console; +package pro.gravit.launcher.runtime.console; -import pro.gravit.launcher.client.runtime.managers.ConsoleManager; -import pro.gravit.launcher.client.runtime.managers.SettingsManager; +import pro.gravit.launcher.runtime.managers.ConsoleManager; +import pro.gravit.launcher.runtime.managers.SettingsManager; import pro.gravit.utils.command.Command; import pro.gravit.utils.helper.LogHelper; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/test/PrintHardwareInfoCommand.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/console/test/PrintHardwareInfoCommand.java similarity index 95% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/test/PrintHardwareInfoCommand.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/console/test/PrintHardwareInfoCommand.java index 3c4a3112..675026f1 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/test/PrintHardwareInfoCommand.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/console/test/PrintHardwareInfoCommand.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.runtime.console.test; +package pro.gravit.launcher.runtime.console.test; -import pro.gravit.launcher.client.runtime.utils.HWIDProvider; +import pro.gravit.launcher.runtime.utils.HWIDProvider; import pro.gravit.utils.command.Command; import pro.gravit.utils.helper.LogHelper; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/ClientRuntimeProvider.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/debug/ClientRuntimeProvider.java similarity index 91% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/ClientRuntimeProvider.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/debug/ClientRuntimeProvider.java index 254bbce9..cac5dc09 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/ClientRuntimeProvider.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/debug/ClientRuntimeProvider.java @@ -1,17 +1,17 @@ -package pro.gravit.launcher.client.runtime.debug; +package pro.gravit.launcher.runtime.debug; -import pro.gravit.launcher.ClientPermissions; -import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.client.api.AuthService; -import pro.gravit.launcher.client.api.ClientService; -import pro.gravit.launcher.client.runtime.LauncherEngine; -import pro.gravit.launcher.client.runtime.gui.RuntimeProvider; -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.Request; -import pro.gravit.launcher.request.auth.AuthRequest; -import pro.gravit.launcher.request.update.ProfilesRequest; +import pro.gravit.launcher.base.ClientPermissions; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.api.AuthService; +import pro.gravit.launcher.base.api.ClientService; +import pro.gravit.launcher.runtime.LauncherEngine; +import pro.gravit.launcher.runtime.gui.RuntimeProvider; +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.Request; +import pro.gravit.launcher.base.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.update.ProfilesRequest; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.LogHelper; import pro.gravit.utils.launch.*; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/DebugLauncherTrustManager.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/debug/DebugLauncherTrustManager.java similarity index 94% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/DebugLauncherTrustManager.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/debug/DebugLauncherTrustManager.java index 3be634d1..cfebabde 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/DebugLauncherTrustManager.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/debug/DebugLauncherTrustManager.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.client.runtime.debug; +package pro.gravit.launcher.runtime.debug; import pro.gravit.launcher.core.LauncherTrustManager; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/DebugMain.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/debug/DebugMain.java similarity index 84% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/DebugMain.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/debug/DebugMain.java index 39b33d2f..1d3ee6c3 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/DebugMain.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/debug/DebugMain.java @@ -1,19 +1,19 @@ -package pro.gravit.launcher.client.runtime.debug; +package pro.gravit.launcher.runtime.debug; -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.ClientLauncherMethods; -import pro.gravit.launcher.client.runtime.LauncherEngine; -import pro.gravit.launcher.client.runtime.client.RuntimeLauncherCoreModule; -import pro.gravit.launcher.client.runtime.managers.ConsoleManager; +import pro.gravit.launcher.runtime.LauncherEngine; +import pro.gravit.launcher.client.RuntimeLauncherCoreModule; +import pro.gravit.launcher.runtime.managers.ConsoleManager; import pro.gravit.launcher.start.RuntimeModuleManager; -import pro.gravit.launcher.modules.LauncherModule; -import pro.gravit.launcher.modules.events.OfflineModeEvent; -import pro.gravit.launcher.modules.events.PreConfigPhase; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.RequestService; -import pro.gravit.launcher.request.websockets.OfflineRequestService; -import pro.gravit.launcher.request.websockets.StdWebSocketService; +import pro.gravit.launcher.base.modules.LauncherModule; +import pro.gravit.launcher.base.modules.events.OfflineModeEvent; +import pro.gravit.launcher.base.modules.events.PreConfigPhase; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.RequestService; +import pro.gravit.launcher.base.request.websockets.OfflineRequestService; +import pro.gravit.launcher.base.request.websockets.StdWebSocketService; import pro.gravit.utils.helper.LogHelper; import java.lang.invoke.MethodHandles; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/gui/NoRuntimeProvider.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/gui/NoRuntimeProvider.java similarity index 89% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/gui/NoRuntimeProvider.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/gui/NoRuntimeProvider.java index 46ea445c..cb44fbab 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/gui/NoRuntimeProvider.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/gui/NoRuntimeProvider.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.client.runtime.gui; +package pro.gravit.launcher.runtime.gui; import javax.swing.*; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/gui/RuntimeProvider.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/gui/RuntimeProvider.java similarity index 72% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/gui/RuntimeProvider.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/gui/RuntimeProvider.java index 08f12cb2..2a99899d 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/gui/RuntimeProvider.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/gui/RuntimeProvider.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.client.runtime.gui; +package pro.gravit.launcher.runtime.gui; public interface RuntimeProvider { void run(String[] args); diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/managers/ConsoleManager.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/managers/ConsoleManager.java similarity index 85% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/managers/ConsoleManager.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/managers/ConsoleManager.java index 0a13e180..67fc9e0f 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/managers/ConsoleManager.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/managers/ConsoleManager.java @@ -1,10 +1,10 @@ -package pro.gravit.launcher.client.runtime.managers; +package pro.gravit.launcher.runtime.managers; -import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.client.runtime.LauncherEngine; -import pro.gravit.launcher.client.runtime.client.events.ClientUnlockConsoleEvent; -import pro.gravit.launcher.client.runtime.console.UnlockCommand; -import pro.gravit.launcher.client.runtime.console.test.PrintHardwareInfoCommand; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.runtime.LauncherEngine; +import pro.gravit.launcher.client.events.ClientUnlockConsoleEvent; +import pro.gravit.launcher.runtime.console.UnlockCommand; +import pro.gravit.launcher.runtime.console.test.PrintHardwareInfoCommand; import pro.gravit.utils.command.CommandHandler; import pro.gravit.utils.command.JLineCommandHandler; import pro.gravit.utils.command.StdCommandHandler; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/managers/SettingsManager.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/managers/SettingsManager.java similarity index 79% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/managers/SettingsManager.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/managers/SettingsManager.java index bff7307b..86ea4813 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/managers/SettingsManager.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/managers/SettingsManager.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.client.runtime.managers; +package pro.gravit.launcher.runtime.managers; -import pro.gravit.launcher.client.runtime.NewLauncherSettings; -import pro.gravit.launcher.client.runtime.client.DirBridge; -import pro.gravit.launcher.config.JsonConfigurable; +import pro.gravit.launcher.runtime.NewLauncherSettings; +import pro.gravit.launcher.runtime.client.DirBridge; +import pro.gravit.launcher.base.config.JsonConfigurable; import pro.gravit.utils.helper.LogHelper; public class SettingsManager extends JsonConfigurable { diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/utils/HWIDProvider.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/utils/HWIDProvider.java similarity index 96% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/utils/HWIDProvider.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/utils/HWIDProvider.java index 4e1c8d4c..9154a793 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/utils/HWIDProvider.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/utils/HWIDProvider.java @@ -1,9 +1,9 @@ -package pro.gravit.launcher.client.runtime.utils; +package pro.gravit.launcher.runtime.utils; import oshi.SystemInfo; import oshi.hardware.*; import oshi.software.os.OperatingSystem; -import pro.gravit.launcher.request.secure.HardwareReportRequest; +import pro.gravit.launcher.base.request.secure.HardwareReportRequest; import java.util.List; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/utils/LauncherUpdater.java b/Launcher/src/main/java/pro/gravit/launcher/runtime/utils/LauncherUpdater.java similarity index 92% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/utils/LauncherUpdater.java rename to Launcher/src/main/java/pro/gravit/launcher/runtime/utils/LauncherUpdater.java index f4998402..27d9edee 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/utils/LauncherUpdater.java +++ b/Launcher/src/main/java/pro/gravit/launcher/runtime/utils/LauncherUpdater.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.client.runtime.utils; +package pro.gravit.launcher.runtime.utils; -import pro.gravit.launcher.client.runtime.LauncherEngine; +import pro.gravit.launcher.runtime.LauncherEngine; import pro.gravit.launcher.core.LauncherInject; -import pro.gravit.launcher.request.update.LauncherRequest; +import pro.gravit.launcher.base.request.update.LauncherRequest; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.LogHelper; import pro.gravit.utils.helper.SecurityHelper; @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static pro.gravit.launcher.modern.Downloader.makeSSLSocketFactory; +import static pro.gravit.launcher.base.Downloader.makeSSLSocketFactory; public class LauncherUpdater { @LauncherInject("launcher.certificatePinning") diff --git a/LauncherAPI/build.gradle b/LauncherAPI/build.gradle index d50a567e..d66ee2a7 100644 --- a/LauncherAPI/build.gradle +++ b/LauncherAPI/build.gradle @@ -3,7 +3,6 @@ targetCompatibility = '17' dependencies { api project(':LauncherCore') - compileOnly group: 'io.netty', name: 'netty-codec-http', version: rootProject['verNetty'] testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: rootProject['verJunit'] } diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/ClientPermissions.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/ClientPermissions.java similarity index 99% rename from LauncherAPI/src/main/java/pro/gravit/launcher/ClientPermissions.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/ClientPermissions.java index 6edb6178..bfa23a50 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/ClientPermissions.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/ClientPermissions.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher; +package pro.gravit.launcher.base; import pro.gravit.launcher.core.LauncherNetworkAPI; diff --git a/LauncherModernCore/src/main/java/pro/gravit/launcher/modern/Downloader.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/Downloader.java similarity index 99% rename from LauncherModernCore/src/main/java/pro/gravit/launcher/modern/Downloader.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/Downloader.java index 1d7e052d..fa8035de 100644 --- a/LauncherModernCore/src/main/java/pro/gravit/launcher/modern/Downloader.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/Downloader.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.modern; +package pro.gravit.launcher.base; import pro.gravit.launcher.core.CertificatePinningTrustManager; import pro.gravit.launcher.core.LauncherInject; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/Launcher.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/Launcher.java similarity index 97% rename from LauncherAPI/src/main/java/pro/gravit/launcher/Launcher.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/Launcher.java index 261053be..2c7e98b4 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/Launcher.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/Launcher.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher; +package pro.gravit.launcher.base; import pro.gravit.launcher.core.managers.GsonManager; -import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.base.profiles.ClientProfile; import pro.gravit.launcher.core.serialize.HInput; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.JVMHelper; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/LauncherConfig.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/LauncherConfig.java similarity index 97% rename from LauncherAPI/src/main/java/pro/gravit/launcher/LauncherConfig.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/LauncherConfig.java index 4b923236..b0f92c46 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/LauncherConfig.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/LauncherConfig.java @@ -1,10 +1,10 @@ -package pro.gravit.launcher; +package pro.gravit.launcher.base; import pro.gravit.launcher.core.LauncherInject; import pro.gravit.launcher.core.LauncherInjectionConstructor; import pro.gravit.launcher.core.LauncherTrustManager; -import pro.gravit.launcher.modules.LauncherModule; -import pro.gravit.launcher.modules.LauncherModulesManager; +import pro.gravit.launcher.base.modules.LauncherModule; +import pro.gravit.launcher.base.modules.LauncherModulesManager; import pro.gravit.launcher.core.serialize.HInput; import pro.gravit.launcher.core.serialize.HOutput; import pro.gravit.launcher.core.serialize.stream.StreamObject; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/client/api/AuthService.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/api/AuthService.java similarity index 80% rename from LauncherAPI/src/main/java/pro/gravit/launcher/client/api/AuthService.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/api/AuthService.java index f6d99e5a..70750c57 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/client/api/AuthService.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/api/AuthService.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.client.api; +package pro.gravit.launcher.base.api; -import pro.gravit.launcher.ClientPermissions; -import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.base.ClientPermissions; +import pro.gravit.launcher.base.profiles.ClientProfile; import java.util.List; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/client/api/ClientService.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/api/ClientService.java similarity index 93% rename from LauncherAPI/src/main/java/pro/gravit/launcher/client/api/ClientService.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/api/ClientService.java index f7964574..6228e8ea 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/client/api/ClientService.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/api/ClientService.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.client.api; +package pro.gravit.launcher.base.api; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.JVMHelper; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/client/api/ConfigService.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/api/ConfigService.java similarity index 88% rename from LauncherAPI/src/main/java/pro/gravit/launcher/client/api/ConfigService.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/api/ConfigService.java index afa438f7..52809b6e 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/client/api/ConfigService.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/api/ConfigService.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.client.api; +package pro.gravit.launcher.base.api; public class ConfigService { public static boolean disableLogging; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/client/api/KeyService.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/api/KeyService.java similarity index 84% rename from LauncherAPI/src/main/java/pro/gravit/launcher/client/api/KeyService.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/api/KeyService.java index 4b3eac7e..69354de3 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/client/api/KeyService.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/api/KeyService.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.client.api; +package pro.gravit.launcher.base.api; import java.security.interfaces.ECPublicKey; import java.security.interfaces.RSAPublicKey; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/config/JsonConfigurable.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/config/JsonConfigurable.java similarity index 93% rename from LauncherAPI/src/main/java/pro/gravit/launcher/config/JsonConfigurable.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/config/JsonConfigurable.java index 482258d0..de468bf9 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/config/JsonConfigurable.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/config/JsonConfigurable.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.config; +package pro.gravit.launcher.base.config; import java.lang.reflect.Type; import java.nio.file.Path; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/config/JsonConfigurableInterface.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/config/JsonConfigurableInterface.java similarity index 96% rename from LauncherAPI/src/main/java/pro/gravit/launcher/config/JsonConfigurableInterface.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/config/JsonConfigurableInterface.java index 65c15c92..39686bbb 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/config/JsonConfigurableInterface.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/config/JsonConfigurableInterface.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.config; +package pro.gravit.launcher.base.config; import com.google.gson.Gson; -import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.base.Launcher; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.LogHelper; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/config/SimpleConfig.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/config/SimpleConfig.java similarity index 96% rename from LauncherAPI/src/main/java/pro/gravit/launcher/config/SimpleConfig.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/config/SimpleConfig.java index 1ac1398c..78d3a380 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/config/SimpleConfig.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/config/SimpleConfig.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.config; +package pro.gravit.launcher.base.config; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/config/SimpleConfigurable.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/config/SimpleConfigurable.java similarity index 95% rename from LauncherAPI/src/main/java/pro/gravit/launcher/config/SimpleConfigurable.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/config/SimpleConfigurable.java index 7306728f..01def3d9 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/config/SimpleConfigurable.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/config/SimpleConfigurable.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.config; +package pro.gravit.launcher.base.config; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/ExtendedTokenRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/ExtendedTokenRequestEvent.java similarity index 78% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/ExtendedTokenRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/ExtendedTokenRequestEvent.java index 084d4a72..228392ae 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/ExtendedTokenRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/ExtendedTokenRequestEvent.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.events; +package pro.gravit.launcher.base.events; public interface ExtendedTokenRequestEvent { String getExtendedTokenName(); diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/NotificationEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/NotificationEvent.java similarity index 89% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/NotificationEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/NotificationEvent.java index 3b492876..51e9e19a 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/NotificationEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/NotificationEvent.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.events; +package pro.gravit.launcher.base.events; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.request.WebSocketEvent; +import pro.gravit.launcher.base.request.WebSocketEvent; public class NotificationEvent implements WebSocketEvent { @LauncherNetworkAPI diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/RequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/RequestEvent.java similarity index 81% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/RequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/RequestEvent.java index 627ec74b..89c11b24 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/RequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/RequestEvent.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.events; +package pro.gravit.launcher.base.events; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.request.WebSocketEvent; +import pro.gravit.launcher.base.request.WebSocketEvent; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AdditionalDataRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/AdditionalDataRequestEvent.java similarity index 77% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AdditionalDataRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/AdditionalDataRequestEvent.java index a0680b10..2308702b 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AdditionalDataRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/AdditionalDataRequestEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; import java.util.Map; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AssetUploadInfoRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/AssetUploadInfoRequestEvent.java similarity index 83% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AssetUploadInfoRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/AssetUploadInfoRequestEvent.java index 34446fcc..1b2046cb 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AssetUploadInfoRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/AssetUploadInfoRequestEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; import java.util.Set; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AuthRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/AuthRequestEvent.java similarity index 93% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AuthRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/AuthRequestEvent.java index 0a614634..a03007d3 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AuthRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/AuthRequestEvent.java @@ -1,9 +1,9 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; -import pro.gravit.launcher.ClientPermissions; +import pro.gravit.launcher.base.ClientPermissions; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.RequestEvent; -import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launcher.base.events.RequestEvent; +import pro.gravit.launcher.base.profiles.PlayerProfile; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/BatchProfileByUsernameRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/BatchProfileByUsernameRequestEvent.java similarity index 76% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/BatchProfileByUsernameRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/BatchProfileByUsernameRequestEvent.java index 1bf0aad0..7acc3677 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/BatchProfileByUsernameRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/BatchProfileByUsernameRequestEvent.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.RequestEvent; -import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launcher.base.events.RequestEvent; +import pro.gravit.launcher.base.profiles.PlayerProfile; public class BatchProfileByUsernameRequestEvent extends RequestEvent { @LauncherNetworkAPI diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/CheckServerRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/CheckServerRequestEvent.java similarity index 83% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/CheckServerRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/CheckServerRequestEvent.java index c66ee020..17576643 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/CheckServerRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/CheckServerRequestEvent.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.RequestEvent; -import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launcher.base.events.RequestEvent; +import pro.gravit.launcher.base.profiles.PlayerProfile; import java.util.Map; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/CurrentUserRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/CurrentUserRequestEvent.java similarity index 68% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/CurrentUserRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/CurrentUserRequestEvent.java index e2aa68ba..f9c67018 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/CurrentUserRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/CurrentUserRequestEvent.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; -import pro.gravit.launcher.ClientPermissions; -import pro.gravit.launcher.events.RequestEvent; -import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launcher.base.ClientPermissions; +import pro.gravit.launcher.base.events.RequestEvent; +import pro.gravit.launcher.base.profiles.PlayerProfile; public class CurrentUserRequestEvent extends RequestEvent { public final UserInfo userInfo; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ErrorRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/ErrorRequestEvent.java similarity index 80% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ErrorRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/ErrorRequestEvent.java index 9bb510d8..5fad1217 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ErrorRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/ErrorRequestEvent.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ExitRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/ExitRequestEvent.java similarity index 76% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ExitRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/ExitRequestEvent.java index 084615c4..f1acc2ee 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ExitRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/ExitRequestEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; public class ExitRequestEvent extends RequestEvent { public final ExitReason reason; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/FeaturesRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/FeaturesRequestEvent.java similarity index 77% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/FeaturesRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/FeaturesRequestEvent.java index d6151b19..cec02ffc 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/FeaturesRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/FeaturesRequestEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; import java.util.Map; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/FetchClientProfileKeyRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/FetchClientProfileKeyRequestEvent.java similarity index 91% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/FetchClientProfileKeyRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/FetchClientProfileKeyRequestEvent.java index 82958bac..c93fa7a9 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/FetchClientProfileKeyRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/FetchClientProfileKeyRequestEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; import java.security.PrivateKey; import java.security.PublicKey; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAssetUploadUrlRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/GetAssetUploadUrlRequestEvent.java similarity index 83% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAssetUploadUrlRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/GetAssetUploadUrlRequestEvent.java index 9d4a7e66..a911df7b 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAssetUploadUrlRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/GetAssetUploadUrlRequestEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; public class GetAssetUploadUrlRequestEvent extends RequestEvent { public static final String FEATURE_NAME = "assetupload"; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/GetAvailabilityAuthRequestEvent.java similarity index 94% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/GetAvailabilityAuthRequestEvent.java index 629c82a4..efe0fbca 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/GetAvailabilityAuthRequestEvent.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; import pro.gravit.utils.TypeSerializeInterface; import java.util.List; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetPublicKeyRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/GetPublicKeyRequestEvent.java similarity index 87% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetPublicKeyRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/GetPublicKeyRequestEvent.java index aef691ca..068e5388 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetPublicKeyRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/GetPublicKeyRequestEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; import java.security.interfaces.ECPublicKey; import java.security.interfaces.RSAPublicKey; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetSecureLevelInfoRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/GetSecureLevelInfoRequestEvent.java similarity index 83% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetSecureLevelInfoRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/GetSecureLevelInfoRequestEvent.java index 2b8fa051..cd583424 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetSecureLevelInfoRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/GetSecureLevelInfoRequestEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; public class GetSecureLevelInfoRequestEvent extends RequestEvent { public final byte[] verifySecureKey; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/HardwareReportRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/HardwareReportRequestEvent.java similarity index 81% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/HardwareReportRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/HardwareReportRequestEvent.java index e9198109..e0126fdb 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/HardwareReportRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/HardwareReportRequestEvent.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; -import pro.gravit.launcher.events.ExtendedTokenRequestEvent; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.ExtendedTokenRequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; public class HardwareReportRequestEvent extends RequestEvent implements ExtendedTokenRequestEvent { public String extendedToken; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/JoinServerRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/JoinServerRequestEvent.java similarity index 82% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/JoinServerRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/JoinServerRequestEvent.java index 519c2c8d..3edef722 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/JoinServerRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/JoinServerRequestEvent.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/LauncherRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/LauncherRequestEvent.java similarity index 91% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/LauncherRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/LauncherRequestEvent.java index 9802973b..1cd8cc56 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/LauncherRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/LauncherRequestEvent.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.ExtendedTokenRequestEvent; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.ExtendedTokenRequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUUIDRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/ProfileByUUIDRequestEvent.java similarity index 80% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUUIDRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/ProfileByUUIDRequestEvent.java index 33c9aa43..dbdd3cfb 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUUIDRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/ProfileByUUIDRequestEvent.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.RequestEvent; -import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launcher.base.events.RequestEvent; +import pro.gravit.launcher.base.profiles.PlayerProfile; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUsernameRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/ProfileByUsernameRequestEvent.java similarity index 79% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUsernameRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/ProfileByUsernameRequestEvent.java index 6675cdc7..3e532500 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUsernameRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/ProfileByUsernameRequestEvent.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.RequestEvent; -import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launcher.base.events.RequestEvent; +import pro.gravit.launcher.base.profiles.PlayerProfile; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfilesRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/ProfilesRequestEvent.java similarity index 78% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfilesRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/ProfilesRequestEvent.java index 626f282e..bf182554 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfilesRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/ProfilesRequestEvent.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.RequestEvent; -import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.base.events.RequestEvent; +import pro.gravit.launcher.base.profiles.ClientProfile; import java.util.List; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/RefreshTokenRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/RefreshTokenRequestEvent.java similarity index 75% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/RefreshTokenRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/RefreshTokenRequestEvent.java index 0f1a5806..73a910a1 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/RefreshTokenRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/RefreshTokenRequestEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; public class RefreshTokenRequestEvent extends RequestEvent { public AuthRequestEvent.OAuthRequestEvent oauth; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/RestoreRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/RestoreRequestEvent.java similarity index 87% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/RestoreRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/RestoreRequestEvent.java index 6c9dd5a0..748a7e46 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/RestoreRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/RestoreRequestEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; import java.util.List; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/SecurityReportRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/SecurityReportRequestEvent.java similarity index 88% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/SecurityReportRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/SecurityReportRequestEvent.java index 2c9af856..ba7c1a91 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/SecurityReportRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/SecurityReportRequestEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; public class SecurityReportRequestEvent extends RequestEvent { public final ReportAction action; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/SetProfileRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/SetProfileRequestEvent.java similarity index 76% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/SetProfileRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/SetProfileRequestEvent.java index 7dd5cbe1..b3a92dbb 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/SetProfileRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/SetProfileRequestEvent.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.RequestEvent; -import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.base.events.RequestEvent; +import pro.gravit.launcher.base.profiles.ClientProfile; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateListRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/UpdateListRequestEvent.java similarity index 83% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateListRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/UpdateListRequestEvent.java index 7cfbc2ba..ba5962dc 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateListRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/UpdateListRequestEvent.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; import java.util.HashSet; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/UpdateRequestEvent.java similarity index 89% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/UpdateRequestEvent.java index 8c98b284..18ec2229 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/UpdateRequestEvent.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; import pro.gravit.launcher.core.hasher.HashedDir; public class UpdateRequestEvent extends RequestEvent { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/VerifySecureLevelKeyRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/VerifySecureLevelKeyRequestEvent.java similarity index 86% rename from LauncherAPI/src/main/java/pro/gravit/launcher/events/request/VerifySecureLevelKeyRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/VerifySecureLevelKeyRequestEvent.java index 2c818107..754f3020 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/VerifySecureLevelKeyRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/events/request/VerifySecureLevelKeyRequestEvent.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.events.request; +package pro.gravit.launcher.base.events.request; -import pro.gravit.launcher.events.ExtendedTokenRequestEvent; -import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.base.events.ExtendedTokenRequestEvent; +import pro.gravit.launcher.base.events.RequestEvent; public class VerifySecureLevelKeyRequestEvent extends RequestEvent implements ExtendedTokenRequestEvent { public boolean needHardwareInfo; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherInitContext.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/LauncherInitContext.java similarity index 50% rename from LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherInitContext.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/LauncherInitContext.java index 7738c826..6edbb6ce 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherInitContext.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/LauncherInitContext.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.modules; +package pro.gravit.launcher.base.modules; public interface LauncherInitContext { } diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherModule.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/LauncherModule.java similarity index 99% rename from LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherModule.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/LauncherModule.java index 26eee8be..6e1d2f68 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherModule.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/LauncherModule.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.modules; +package pro.gravit.launcher.base.modules; import pro.gravit.launcher.core.LauncherTrustManager; import pro.gravit.utils.Version; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherModuleInfo.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/LauncherModuleInfo.java similarity index 97% rename from LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherModuleInfo.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/LauncherModuleInfo.java index 0237a9ee..5b9e484b 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherModuleInfo.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/LauncherModuleInfo.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.modules; +package pro.gravit.launcher.base.modules; import pro.gravit.utils.Version; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherModulesContext.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/LauncherModulesContext.java similarity index 77% rename from LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherModulesContext.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/LauncherModulesContext.java index 317e2d31..5710af91 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherModulesContext.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/LauncherModulesContext.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.modules; +package pro.gravit.launcher.base.modules; public interface LauncherModulesContext { LauncherModulesManager getModulesManager(); diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherModulesManager.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/LauncherModulesManager.java similarity index 97% rename from LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherModulesManager.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/LauncherModulesManager.java index 0ac63a2c..4d3a30be 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherModulesManager.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/LauncherModulesManager.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.modules; +package pro.gravit.launcher.base.modules; import pro.gravit.utils.Version; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/ModulesConfigManager.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/ModulesConfigManager.java similarity index 87% rename from LauncherAPI/src/main/java/pro/gravit/launcher/modules/ModulesConfigManager.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/ModulesConfigManager.java index 570059a7..ee1364ce 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/ModulesConfigManager.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/ModulesConfigManager.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.modules; +package pro.gravit.launcher.base.modules; -import pro.gravit.launcher.config.SimpleConfigurable; +import pro.gravit.launcher.base.config.SimpleConfigurable; import java.nio.file.Path; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/ClosePhase.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/ClosePhase.java new file mode 100644 index 00000000..43235a4f --- /dev/null +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/ClosePhase.java @@ -0,0 +1,6 @@ +package pro.gravit.launcher.base.modules.events; + +import pro.gravit.launcher.base.modules.LauncherModule; + +public class ClosePhase extends LauncherModule.Event { +} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/InitPhase.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/InitPhase.java new file mode 100644 index 00000000..e2d18caf --- /dev/null +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/InitPhase.java @@ -0,0 +1,6 @@ +package pro.gravit.launcher.base.modules.events; + +import pro.gravit.launcher.base.modules.LauncherModule; + +public class InitPhase extends LauncherModule.Event { +} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/OfflineModeEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/OfflineModeEvent.java similarity index 54% rename from LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/OfflineModeEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/OfflineModeEvent.java index 28a92579..9c083864 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/OfflineModeEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/OfflineModeEvent.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.modules.events; +package pro.gravit.launcher.base.modules.events; -import pro.gravit.launcher.modules.LauncherModule; -import pro.gravit.launcher.request.RequestService; +import pro.gravit.launcher.base.modules.LauncherModule; +import pro.gravit.launcher.base.request.RequestService; public class OfflineModeEvent extends LauncherModule.Event { public RequestService service; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/PostInitPhase.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/PostInitPhase.java new file mode 100644 index 00000000..7fe2de69 --- /dev/null +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/PostInitPhase.java @@ -0,0 +1,6 @@ +package pro.gravit.launcher.base.modules.events; + +import pro.gravit.launcher.base.modules.LauncherModule; + +public class PostInitPhase extends LauncherModule.Event { +} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/PreConfigPhase.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/PreConfigPhase.java new file mode 100644 index 00000000..5d5e1e06 --- /dev/null +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/PreConfigPhase.java @@ -0,0 +1,6 @@ +package pro.gravit.launcher.base.modules.events; + +import pro.gravit.launcher.base.modules.LauncherModule; + +public class PreConfigPhase extends LauncherModule.Event { +} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/PreGsonPhase.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/PreGsonPhase.java similarity index 69% rename from LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/PreGsonPhase.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/PreGsonPhase.java index b47f2a6b..470a6fbf 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/PreGsonPhase.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/events/PreGsonPhase.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.modules.events; +package pro.gravit.launcher.base.modules.events; import com.google.gson.GsonBuilder; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.base.modules.LauncherModule; public class PreGsonPhase extends LauncherModule.Event { public final GsonBuilder gsonBuilder; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/impl/SimpleModuleContext.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/impl/SimpleModuleContext.java similarity index 71% rename from LauncherAPI/src/main/java/pro/gravit/launcher/modules/impl/SimpleModuleContext.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/impl/SimpleModuleContext.java index b6b2348d..2547f594 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/impl/SimpleModuleContext.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/impl/SimpleModuleContext.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.modules.impl; +package pro.gravit.launcher.base.modules.impl; -import pro.gravit.launcher.modules.LauncherModulesContext; -import pro.gravit.launcher.modules.LauncherModulesManager; -import pro.gravit.launcher.modules.ModulesConfigManager; +import pro.gravit.launcher.base.modules.LauncherModulesContext; +import pro.gravit.launcher.base.modules.LauncherModulesManager; +import pro.gravit.launcher.base.modules.ModulesConfigManager; public class SimpleModuleContext implements LauncherModulesContext { public final LauncherModulesManager modulesManager; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/impl/SimpleModuleManager.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/impl/SimpleModuleManager.java similarity index 98% rename from LauncherAPI/src/main/java/pro/gravit/launcher/modules/impl/SimpleModuleManager.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/impl/SimpleModuleManager.java index 6156b709..97bf724f 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/impl/SimpleModuleManager.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/impl/SimpleModuleManager.java @@ -1,8 +1,7 @@ -package pro.gravit.launcher.modules.impl; +package pro.gravit.launcher.base.modules.impl; import pro.gravit.launcher.core.LauncherTrustManager; -import pro.gravit.launcher.client.runtime.managers.SimpleModulesConfigManager; -import pro.gravit.launcher.modules.*; +import pro.gravit.launcher.base.modules.*; import pro.gravit.utils.PublicURLClassLoader; import pro.gravit.utils.Version; import pro.gravit.utils.helper.IOHelper; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/client/runtime/managers/SimpleModulesConfigManager.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/impl/SimpleModulesConfigManager.java similarity index 87% rename from LauncherAPI/src/main/java/pro/gravit/launcher/client/runtime/managers/SimpleModulesConfigManager.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/impl/SimpleModulesConfigManager.java index 3a57e209..9ac9b5df 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/client/runtime/managers/SimpleModulesConfigManager.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/modules/impl/SimpleModulesConfigManager.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.client.runtime.managers; +package pro.gravit.launcher.base.modules.impl; -import pro.gravit.launcher.config.SimpleConfigurable; -import pro.gravit.launcher.modules.ModulesConfigManager; +import pro.gravit.launcher.base.config.SimpleConfigurable; +import pro.gravit.launcher.base.modules.ModulesConfigManager; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.LogHelper; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/ClientProfile.java similarity index 98% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/ClientProfile.java index 19850f00..810e96b0 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/ClientProfile.java @@ -1,11 +1,11 @@ -package pro.gravit.launcher.profiles; +package pro.gravit.launcher.base.profiles; import com.google.gson.*; import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.core.hasher.FileNameMatcher; -import pro.gravit.launcher.profiles.optional.OptionalDepend; -import pro.gravit.launcher.profiles.optional.OptionalFile; -import pro.gravit.launcher.profiles.optional.triggers.OptionalTrigger; +import pro.gravit.launcher.base.profiles.optional.OptionalDepend; +import pro.gravit.launcher.base.profiles.optional.OptionalFile; +import pro.gravit.launcher.base.profiles.optional.triggers.OptionalTrigger; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.VerifyHelper; import pro.gravit.utils.launch.LaunchOptions; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfileBuilder.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/ClientProfileBuilder.java similarity index 97% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfileBuilder.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/ClientProfileBuilder.java index 5e6a09d6..a518db5c 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfileBuilder.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/ClientProfileBuilder.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.profiles; +package pro.gravit.launcher.base.profiles; -import pro.gravit.launcher.profiles.optional.OptionalFile; +import pro.gravit.launcher.base.profiles.optional.OptionalFile; import java.util.*; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfileVersions.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/ClientProfileVersions.java similarity index 97% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfileVersions.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/ClientProfileVersions.java index e1c70b82..5d21aced 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfileVersions.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/ClientProfileVersions.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.profiles; +package pro.gravit.launcher.base.profiles; public class ClientProfileVersions { private ClientProfileVersions() { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/PlayerProfile.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/PlayerProfile.java similarity index 97% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/PlayerProfile.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/PlayerProfile.java index b08cff5d..e0190993 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/PlayerProfile.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/PlayerProfile.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.profiles; +package pro.gravit.launcher.base.profiles; import pro.gravit.utils.helper.IOHelper; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/Texture.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/Texture.java similarity index 98% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/Texture.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/Texture.java index 1e4a637e..7f917e85 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/Texture.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/Texture.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.profiles; +package pro.gravit.launcher.base.profiles; import pro.gravit.launcher.core.serialize.HOutput; import pro.gravit.launcher.core.serialize.stream.StreamObject; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalDepend.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/OptionalDepend.java similarity index 72% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalDepend.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/OptionalDepend.java index 55c7c0a5..53feb0ee 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalDepend.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/OptionalDepend.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.profiles.optional; +package pro.gravit.launcher.base.profiles.optional; import pro.gravit.launcher.core.LauncherNetworkAPI; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalFile.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/OptionalFile.java similarity index 87% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalFile.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/OptionalFile.java index 1884e443..4d49cf23 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalFile.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/OptionalFile.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.profiles.optional; +package pro.gravit.launcher.base.profiles.optional; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.profiles.optional.actions.OptionalAction; +import pro.gravit.launcher.base.profiles.optional.actions.OptionalAction; import java.util.List; import java.util.Objects; @@ -18,7 +18,7 @@ public class OptionalFile { @LauncherNetworkAPI public String info; @LauncherNetworkAPI - public List triggersList; + public List triggersList; @LauncherNetworkAPI public OptionalDepend[] dependenciesFile; @LauncherNetworkAPI diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalView.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/OptionalView.java similarity index 97% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalView.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/OptionalView.java index 25fdb266..d257215e 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalView.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/OptionalView.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.profiles.optional; +package pro.gravit.launcher.base.profiles.optional; -import pro.gravit.launcher.profiles.ClientProfile; -import pro.gravit.launcher.profiles.optional.actions.OptionalAction; +import pro.gravit.launcher.base.profiles.ClientProfile; +import pro.gravit.launcher.base.profiles.optional.actions.OptionalAction; import java.util.HashMap; import java.util.HashSet; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalAction.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/actions/OptionalAction.java similarity index 91% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalAction.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/actions/OptionalAction.java index aabc8ccc..dd2a7437 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalAction.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/actions/OptionalAction.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.profiles.optional.actions; +package pro.gravit.launcher.base.profiles.optional.actions; import pro.gravit.utils.ProviderMap; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalActionClassPath.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/actions/OptionalActionClassPath.java similarity index 87% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalActionClassPath.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/actions/OptionalActionClassPath.java index a9093ff2..51a09abf 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalActionClassPath.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/actions/OptionalActionClassPath.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.profiles.optional.actions; +package pro.gravit.launcher.base.profiles.optional.actions; public class OptionalActionClassPath extends OptionalAction { public String[] args; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalActionClientArgs.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/actions/OptionalActionClientArgs.java similarity index 81% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalActionClientArgs.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/actions/OptionalActionClientArgs.java index 90bf980d..be164f6c 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalActionClientArgs.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/actions/OptionalActionClientArgs.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.profiles.optional.actions; +package pro.gravit.launcher.base.profiles.optional.actions; import java.util.List; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalActionFile.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/actions/OptionalActionFile.java similarity index 95% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalActionFile.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/actions/OptionalActionFile.java index 9f831635..00b0c3e8 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalActionFile.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/actions/OptionalActionFile.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.profiles.optional.actions; +package pro.gravit.launcher.base.profiles.optional.actions; import pro.gravit.launcher.core.hasher.HashedDir; import pro.gravit.utils.helper.LogHelper; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalActionJvmArgs.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/actions/OptionalActionJvmArgs.java similarity index 80% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalActionJvmArgs.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/actions/OptionalActionJvmArgs.java index 328a224c..900e78bc 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalActionJvmArgs.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/actions/OptionalActionJvmArgs.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.profiles.optional.actions; +package pro.gravit.launcher.base.profiles.optional.actions; import java.util.List; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/triggers/ArchTrigger.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/triggers/ArchTrigger.java similarity index 70% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/triggers/ArchTrigger.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/triggers/ArchTrigger.java index b507186a..19ea42f6 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/triggers/ArchTrigger.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/triggers/ArchTrigger.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.profiles.optional.triggers; +package pro.gravit.launcher.base.profiles.optional.triggers; -import pro.gravit.launcher.profiles.optional.OptionalFile; +import pro.gravit.launcher.base.profiles.optional.OptionalFile; import pro.gravit.utils.helper.JVMHelper; public class ArchTrigger extends OptionalTrigger { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/triggers/JavaTrigger.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/triggers/JavaTrigger.java similarity index 89% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/triggers/JavaTrigger.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/triggers/JavaTrigger.java index 46c08852..aa5e356f 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/triggers/JavaTrigger.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/triggers/JavaTrigger.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.profiles.optional.triggers; +package pro.gravit.launcher.base.profiles.optional.triggers; -import pro.gravit.launcher.profiles.optional.OptionalFile; +import pro.gravit.launcher.base.profiles.optional.OptionalFile; import pro.gravit.utils.helper.JavaHelper; public class JavaTrigger extends OptionalTrigger { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/triggers/OSTrigger.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/triggers/OSTrigger.java similarity index 73% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/triggers/OSTrigger.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/triggers/OSTrigger.java index edbd4590..00bcd3a1 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/triggers/OSTrigger.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/triggers/OSTrigger.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.profiles.optional.triggers; +package pro.gravit.launcher.base.profiles.optional.triggers; -import pro.gravit.launcher.profiles.optional.OptionalFile; +import pro.gravit.launcher.base.profiles.optional.OptionalFile; import pro.gravit.utils.helper.JVMHelper; public class OSTrigger extends OptionalTrigger { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/triggers/OptionalTrigger.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/triggers/OptionalTrigger.java similarity index 88% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/triggers/OptionalTrigger.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/triggers/OptionalTrigger.java index 8ba54011..36419867 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/triggers/OptionalTrigger.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/triggers/OptionalTrigger.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.profiles.optional.triggers; +package pro.gravit.launcher.base.profiles.optional.triggers; -import pro.gravit.launcher.profiles.optional.OptionalFile; +import pro.gravit.launcher.base.profiles.optional.OptionalFile; import pro.gravit.utils.ProviderMap; public abstract class OptionalTrigger { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/triggers/OptionalTriggerContext.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/triggers/OptionalTriggerContext.java similarity index 62% rename from LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/triggers/OptionalTriggerContext.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/triggers/OptionalTriggerContext.java index 46598ff2..cb6b3839 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/triggers/OptionalTriggerContext.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/optional/triggers/OptionalTriggerContext.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.profiles.optional.triggers; +package pro.gravit.launcher.base.profiles.optional.triggers; -import pro.gravit.launcher.ClientPermissions; -import pro.gravit.launcher.profiles.ClientProfile; -import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launcher.base.ClientPermissions; +import pro.gravit.launcher.base.profiles.ClientProfile; +import pro.gravit.launcher.base.profiles.PlayerProfile; import pro.gravit.utils.helper.JavaHelper; public interface OptionalTriggerContext { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/JsonResultSerializeAdapter.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/JsonResultSerializeAdapter.java similarity index 93% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/JsonResultSerializeAdapter.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/JsonResultSerializeAdapter.java index 3a46e1d3..b70471b6 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/JsonResultSerializeAdapter.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/JsonResultSerializeAdapter.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.request; +package pro.gravit.launcher.base.request; import com.google.gson.*; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/PingRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/PingRequest.java similarity index 76% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/PingRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/PingRequest.java index ee526029..249e567f 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/PingRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/PingRequest.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.request; +package pro.gravit.launcher.base.request; public final class PingRequest extends Request { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/Request.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/Request.java similarity index 94% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/Request.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/Request.java index 593e309b..d91f646f 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/Request.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/Request.java @@ -1,14 +1,14 @@ -package pro.gravit.launcher.request; +package pro.gravit.launcher.base.request; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.request.AuthRequestEvent; -import pro.gravit.launcher.events.request.CurrentUserRequestEvent; -import pro.gravit.launcher.events.request.RefreshTokenRequestEvent; -import pro.gravit.launcher.events.request.RestoreRequestEvent; -import pro.gravit.launcher.request.auth.RefreshTokenRequest; -import pro.gravit.launcher.request.auth.RestoreRequest; -import pro.gravit.launcher.request.websockets.StdWebSocketService; -import pro.gravit.launcher.request.websockets.WebSocketRequest; +import pro.gravit.launcher.base.events.request.AuthRequestEvent; +import pro.gravit.launcher.base.events.request.CurrentUserRequestEvent; +import pro.gravit.launcher.base.events.request.RefreshTokenRequestEvent; +import pro.gravit.launcher.base.events.request.RestoreRequestEvent; +import pro.gravit.launcher.base.request.auth.RefreshTokenRequest; +import pro.gravit.launcher.base.request.auth.RestoreRequest; +import pro.gravit.launcher.base.request.websockets.StdWebSocketService; +import pro.gravit.launcher.base.request.websockets.WebSocketRequest; import pro.gravit.utils.helper.LogHelper; import java.util.*; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/RequestException.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/RequestException.java similarity index 92% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/RequestException.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/RequestException.java index 93285c79..429b0c73 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/RequestException.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/RequestException.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.request; +package pro.gravit.launcher.base.request; import java.io.IOException; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/RequestService.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/RequestService.java similarity index 96% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/RequestService.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/RequestService.java index 41142326..bad2ebd1 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/RequestService.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/RequestService.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.request; +package pro.gravit.launcher.base.request; import java.io.IOException; import java.util.concurrent.CompletableFuture; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/WebSocketEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/WebSocketEvent.java similarity index 83% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/WebSocketEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/WebSocketEvent.java index 59d259d4..f72b8113 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/WebSocketEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/WebSocketEvent.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.request; +package pro.gravit.launcher.base.request; import pro.gravit.utils.TypeSerializeInterface; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/AdditionalDataRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/AdditionalDataRequest.java similarity index 70% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/AdditionalDataRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/AdditionalDataRequest.java index 32d10863..56e4037c 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/AdditionalDataRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/AdditionalDataRequest.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.request.auth; +package pro.gravit.launcher.base.request.auth; -import pro.gravit.launcher.events.request.AdditionalDataRequestEvent; -import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.base.events.request.AdditionalDataRequestEvent; +import pro.gravit.launcher.base.request.Request; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/AuthRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/AuthRequest.java similarity index 88% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/AuthRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/AuthRequest.java index da3081c2..5cbc489f 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/AuthRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/AuthRequest.java @@ -1,10 +1,10 @@ -package pro.gravit.launcher.request.auth; +package pro.gravit.launcher.base.request.auth; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.request.AuthRequestEvent; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.auth.password.*; -import pro.gravit.launcher.request.websockets.WebSocketRequest; +import pro.gravit.launcher.base.events.request.AuthRequestEvent; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.auth.password.*; +import pro.gravit.launcher.base.request.websockets.WebSocketRequest; import pro.gravit.utils.ProviderMap; public final class AuthRequest extends Request implements WebSocketRequest { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/CheckServerRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/CheckServerRequest.java similarity index 80% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/CheckServerRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/CheckServerRequest.java index 998fb903..aa23f58c 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/CheckServerRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/CheckServerRequest.java @@ -1,9 +1,9 @@ -package pro.gravit.launcher.request.auth; +package pro.gravit.launcher.base.request.auth; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.request.CheckServerRequestEvent; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.websockets.WebSocketRequest; +import pro.gravit.launcher.base.events.request.CheckServerRequestEvent; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.websockets.WebSocketRequest; import pro.gravit.utils.helper.VerifyHelper; public final class CheckServerRequest extends Request implements WebSocketRequest { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/CurrentUserRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/CurrentUserRequest.java new file mode 100644 index 00000000..0ed74fa0 --- /dev/null +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/CurrentUserRequest.java @@ -0,0 +1,11 @@ +package pro.gravit.launcher.base.request.auth; + +import pro.gravit.launcher.base.events.request.CurrentUserRequestEvent; +import pro.gravit.launcher.base.request.Request; + +public class CurrentUserRequest extends Request { + @Override + public String getType() { + return "currentUser"; + } +} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/ExitRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/ExitRequest.java similarity index 77% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/ExitRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/ExitRequest.java index 240c27a3..d0c2c3bf 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/ExitRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/ExitRequest.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.request.auth; +package pro.gravit.launcher.base.request.auth; -import pro.gravit.launcher.events.request.ExitRequestEvent; -import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.base.events.request.ExitRequestEvent; +import pro.gravit.launcher.base.request.Request; public class ExitRequest extends Request { public final boolean exitAll; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/FetchClientProfileKeyRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/FetchClientProfileKeyRequest.java similarity index 56% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/FetchClientProfileKeyRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/FetchClientProfileKeyRequest.java index 32fcf698..96104ce8 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/FetchClientProfileKeyRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/FetchClientProfileKeyRequest.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.request.auth; +package pro.gravit.launcher.base.request.auth; -import pro.gravit.launcher.events.request.FetchClientProfileKeyRequestEvent; -import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.base.events.request.FetchClientProfileKeyRequestEvent; +import pro.gravit.launcher.base.request.Request; public class FetchClientProfileKeyRequest extends Request { public FetchClientProfileKeyRequest() { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/GetAvailabilityAuthRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/GetAvailabilityAuthRequest.java similarity index 61% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/GetAvailabilityAuthRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/GetAvailabilityAuthRequest.java index 15092d2a..75e856f6 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/GetAvailabilityAuthRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/GetAvailabilityAuthRequest.java @@ -1,12 +1,12 @@ -package pro.gravit.launcher.request.auth; +package pro.gravit.launcher.base.request.auth; -import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent; -import pro.gravit.launcher.request.Request; -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.websockets.WebSocketRequest; +import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent; +import pro.gravit.launcher.base.request.Request; +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.websockets.WebSocketRequest; import pro.gravit.utils.ProviderMap; public class GetAvailabilityAuthRequest extends Request implements WebSocketRequest { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/GetPublicKeyRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/GetPublicKeyRequest.java similarity index 54% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/GetPublicKeyRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/GetPublicKeyRequest.java index 5119696c..3e6ae226 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/GetPublicKeyRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/GetPublicKeyRequest.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.request.auth; +package pro.gravit.launcher.base.request.auth; -import pro.gravit.launcher.events.request.GetPublicKeyRequestEvent; -import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.base.events.request.GetPublicKeyRequestEvent; +import pro.gravit.launcher.base.request.Request; public class GetPublicKeyRequest extends Request { public GetPublicKeyRequest() { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/JoinServerRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/JoinServerRequest.java similarity index 81% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/JoinServerRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/JoinServerRequest.java index 685c171d..41232121 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/JoinServerRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/JoinServerRequest.java @@ -1,9 +1,9 @@ -package pro.gravit.launcher.request.auth; +package pro.gravit.launcher.base.request.auth; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.request.JoinServerRequestEvent; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.websockets.WebSocketRequest; +import pro.gravit.launcher.base.events.request.JoinServerRequestEvent; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.websockets.WebSocketRequest; import pro.gravit.utils.helper.VerifyHelper; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/RefreshTokenRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/RefreshTokenRequest.java similarity index 68% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/RefreshTokenRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/RefreshTokenRequest.java index 0daa585e..5b48a8cb 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/RefreshTokenRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/RefreshTokenRequest.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.request.auth; +package pro.gravit.launcher.base.request.auth; -import pro.gravit.launcher.events.request.RefreshTokenRequestEvent; -import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.base.events.request.RefreshTokenRequestEvent; +import pro.gravit.launcher.base.request.Request; public class RefreshTokenRequest extends Request { public String authId; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/RestoreRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/RestoreRequest.java similarity index 78% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/RestoreRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/RestoreRequest.java index d23942b9..ff7b6471 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/RestoreRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/RestoreRequest.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.request.auth; +package pro.gravit.launcher.base.request.auth; -import pro.gravit.launcher.events.request.RestoreRequestEvent; -import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.base.events.request.RestoreRequestEvent; +import pro.gravit.launcher.base.request.Request; import java.util.Map; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/SetProfileRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/SetProfileRequest.java similarity index 57% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/SetProfileRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/SetProfileRequest.java index 9948243c..8e99693f 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/SetProfileRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/SetProfileRequest.java @@ -1,10 +1,10 @@ -package pro.gravit.launcher.request.auth; +package pro.gravit.launcher.base.request.auth; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.request.SetProfileRequestEvent; -import pro.gravit.launcher.profiles.ClientProfile; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.websockets.WebSocketRequest; +import pro.gravit.launcher.base.events.request.SetProfileRequestEvent; +import pro.gravit.launcher.base.profiles.ClientProfile; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.websockets.WebSocketRequest; public class SetProfileRequest extends Request implements WebSocketRequest { @LauncherNetworkAPI diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/details/AuthLoginOnlyDetails.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/details/AuthLoginOnlyDetails.java similarity index 57% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/details/AuthLoginOnlyDetails.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/details/AuthLoginOnlyDetails.java index 01b049b4..a5813a17 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/details/AuthLoginOnlyDetails.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/details/AuthLoginOnlyDetails.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.request.auth.details; +package pro.gravit.launcher.base.request.auth.details; -import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent; +import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent; public class AuthLoginOnlyDetails implements GetAvailabilityAuthRequestEvent.AuthAvailabilityDetails { @Override diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/details/AuthPasswordDetails.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/details/AuthPasswordDetails.java similarity index 57% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/details/AuthPasswordDetails.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/details/AuthPasswordDetails.java index 1f1022fb..825fa36f 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/details/AuthPasswordDetails.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/details/AuthPasswordDetails.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.request.auth.details; +package pro.gravit.launcher.base.request.auth.details; -import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent; +import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent; public class AuthPasswordDetails implements GetAvailabilityAuthRequestEvent.AuthAvailabilityDetails { @Override diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/details/AuthTotpDetails.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/details/AuthTotpDetails.java similarity index 77% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/details/AuthTotpDetails.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/details/AuthTotpDetails.java index df0c5ce2..80c4048e 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/details/AuthTotpDetails.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/details/AuthTotpDetails.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.request.auth.details; +package pro.gravit.launcher.base.request.auth.details; -import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent; +import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent; public class AuthTotpDetails implements GetAvailabilityAuthRequestEvent.AuthAvailabilityDetails { public final String alg; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/details/AuthWebViewDetails.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/details/AuthWebViewDetails.java similarity index 85% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/details/AuthWebViewDetails.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/details/AuthWebViewDetails.java index 25d30cec..3090d251 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/details/AuthWebViewDetails.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/details/AuthWebViewDetails.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.request.auth.details; +package pro.gravit.launcher.base.request.auth.details; -import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent; +import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent; public class AuthWebViewDetails implements GetAvailabilityAuthRequestEvent.AuthAvailabilityDetails { public final String url; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/Auth2FAPassword.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/Auth2FAPassword.java similarity index 81% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/Auth2FAPassword.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/Auth2FAPassword.java index d6b7baa5..05672942 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/Auth2FAPassword.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/Auth2FAPassword.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.request.auth.password; +package pro.gravit.launcher.base.request.auth.password; -import pro.gravit.launcher.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.auth.AuthRequest; public class Auth2FAPassword implements AuthRequest.AuthPasswordInterface { public AuthRequest.AuthPasswordInterface firstPassword; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthAESPassword.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthAESPassword.java similarity index 76% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthAESPassword.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthAESPassword.java index 545cd5a3..7ecfb921 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthAESPassword.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthAESPassword.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.request.auth.password; +package pro.gravit.launcher.base.request.auth.password; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.auth.AuthRequest; public class AuthAESPassword implements AuthRequest.AuthPasswordInterface { @LauncherNetworkAPI diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthCodePassword.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthCodePassword.java similarity index 69% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthCodePassword.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthCodePassword.java index d9595e34..5b3c6e03 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthCodePassword.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthCodePassword.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.request.auth.password; +package pro.gravit.launcher.base.request.auth.password; -import pro.gravit.launcher.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.auth.AuthRequest; public class AuthCodePassword implements AuthRequest.AuthPasswordInterface { public final String code; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthMultiPassword.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthMultiPassword.java similarity index 79% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthMultiPassword.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthMultiPassword.java index ddc9871c..829b57dd 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthMultiPassword.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthMultiPassword.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.request.auth.password; +package pro.gravit.launcher.base.request.auth.password; -import pro.gravit.launcher.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.auth.AuthRequest; import java.util.List; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthOAuthPassword.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthOAuthPassword.java similarity index 87% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthOAuthPassword.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthOAuthPassword.java index 9c72e5b0..810f8aaf 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthOAuthPassword.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthOAuthPassword.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.request.auth.password; +package pro.gravit.launcher.base.request.auth.password; -import pro.gravit.launcher.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.auth.AuthRequest; public class AuthOAuthPassword implements AuthRequest.AuthPasswordInterface { public final String accessToken; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthPlainPassword.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthPlainPassword.java similarity index 75% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthPlainPassword.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthPlainPassword.java index 1f0714b1..41f4caf4 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthPlainPassword.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthPlainPassword.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.request.auth.password; +package pro.gravit.launcher.base.request.auth.password; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.auth.AuthRequest; public class AuthPlainPassword implements AuthRequest.AuthPasswordInterface { @LauncherNetworkAPI diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthRSAPassword.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthRSAPassword.java similarity index 72% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthRSAPassword.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthRSAPassword.java index cf126905..aeae77bb 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthRSAPassword.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthRSAPassword.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.request.auth.password; +package pro.gravit.launcher.base.request.auth.password; -import pro.gravit.launcher.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.auth.AuthRequest; public class AuthRSAPassword implements AuthRequest.AuthPasswordInterface { public final byte[] password; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthSignaturePassword.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthSignaturePassword.java similarity index 78% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthSignaturePassword.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthSignaturePassword.java index 7a2f4eae..cb3ccbe0 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthSignaturePassword.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthSignaturePassword.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.request.auth.password; +package pro.gravit.launcher.base.request.auth.password; -import pro.gravit.launcher.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.auth.AuthRequest; public class AuthSignaturePassword implements AuthRequest.AuthPasswordInterface { public byte[] signature; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthTOTPPassword.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthTOTPPassword.java similarity index 60% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthTOTPPassword.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthTOTPPassword.java index 96679d29..4ddccec6 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthTOTPPassword.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/auth/password/AuthTOTPPassword.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.request.auth.password; +package pro.gravit.launcher.base.request.auth.password; -import pro.gravit.launcher.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.auth.AuthRequest; public class AuthTOTPPassword implements AuthRequest.AuthPasswordInterface { public String totp; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/cabinet/AssetUploadInfoRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/cabinet/AssetUploadInfoRequest.java new file mode 100644 index 00000000..be28f937 --- /dev/null +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/cabinet/AssetUploadInfoRequest.java @@ -0,0 +1,11 @@ +package pro.gravit.launcher.base.request.cabinet; + +import pro.gravit.launcher.base.events.request.AssetUploadInfoRequestEvent; +import pro.gravit.launcher.base.request.Request; + +public class AssetUploadInfoRequest extends Request { + @Override + public String getType() { + return "assetUploadInfo"; + } +} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/cabinet/GetAssetUploadUrl.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/cabinet/GetAssetUploadUrl.java similarity index 63% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/cabinet/GetAssetUploadUrl.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/cabinet/GetAssetUploadUrl.java index 56d9d976..fb1ef584 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/cabinet/GetAssetUploadUrl.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/cabinet/GetAssetUploadUrl.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.request.cabinet; +package pro.gravit.launcher.base.request.cabinet; -import pro.gravit.launcher.events.request.GetAssetUploadUrlRequestEvent; -import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.base.events.request.GetAssetUploadUrlRequestEvent; +import pro.gravit.launcher.base.request.Request; public class GetAssetUploadUrl extends Request { public String name; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/management/FeaturesRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/management/FeaturesRequest.java new file mode 100644 index 00000000..3e3ced73 --- /dev/null +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/management/FeaturesRequest.java @@ -0,0 +1,11 @@ +package pro.gravit.launcher.base.request.management; + +import pro.gravit.launcher.base.events.request.FeaturesRequestEvent; +import pro.gravit.launcher.base.request.Request; + +public class FeaturesRequest extends Request { + @Override + public String getType() { + return "features"; + } +} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/secure/GetSecureLevelInfoRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/secure/GetSecureLevelInfoRequest.java similarity index 50% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/secure/GetSecureLevelInfoRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/secure/GetSecureLevelInfoRequest.java index 47eb594e..b788d807 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/secure/GetSecureLevelInfoRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/secure/GetSecureLevelInfoRequest.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.request.secure; +package pro.gravit.launcher.base.request.secure; -import pro.gravit.launcher.events.request.GetSecureLevelInfoRequestEvent; -import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.base.events.request.GetSecureLevelInfoRequestEvent; +import pro.gravit.launcher.base.request.Request; public class GetSecureLevelInfoRequest extends Request { @Override diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/secure/HardwareReportRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/secure/HardwareReportRequest.java similarity index 89% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/secure/HardwareReportRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/secure/HardwareReportRequest.java index 1b7e2cb9..ebe1434f 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/secure/HardwareReportRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/secure/HardwareReportRequest.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.request.secure; +package pro.gravit.launcher.base.request.secure; -import pro.gravit.launcher.events.request.HardwareReportRequestEvent; -import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.base.events.request.HardwareReportRequestEvent; +import pro.gravit.launcher.base.request.Request; import java.util.Base64; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/secure/SecurityReportRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/secure/SecurityReportRequest.java similarity index 93% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/secure/SecurityReportRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/secure/SecurityReportRequest.java index 6048353a..eb4e2fc4 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/secure/SecurityReportRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/secure/SecurityReportRequest.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.request.secure; +package pro.gravit.launcher.base.request.secure; -import pro.gravit.launcher.events.request.SecurityReportRequestEvent; -import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.base.events.request.SecurityReportRequestEvent; +import pro.gravit.launcher.base.request.Request; public final class SecurityReportRequest extends Request { public final String reportType; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/secure/VerifySecureLevelKeyRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/secure/VerifySecureLevelKeyRequest.java similarity index 69% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/secure/VerifySecureLevelKeyRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/secure/VerifySecureLevelKeyRequest.java index b1d0bdb9..31b3e70c 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/secure/VerifySecureLevelKeyRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/secure/VerifySecureLevelKeyRequest.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.request.secure; +package pro.gravit.launcher.base.request.secure; -import pro.gravit.launcher.events.request.VerifySecureLevelKeyRequestEvent; -import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.base.events.request.VerifySecureLevelKeyRequestEvent; +import pro.gravit.launcher.base.request.Request; public class VerifySecureLevelKeyRequest extends Request { public final byte[] publicKey; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/LauncherRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/update/LauncherRequest.java similarity index 80% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/update/LauncherRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/update/LauncherRequest.java index 4e8d0be7..f84bd812 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/LauncherRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/update/LauncherRequest.java @@ -1,11 +1,11 @@ -package pro.gravit.launcher.request.update; +package pro.gravit.launcher.base.request.update; -import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.base.Launcher; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.request.LauncherRequestEvent; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.RequestService; -import pro.gravit.launcher.request.websockets.WebSocketRequest; +import pro.gravit.launcher.base.events.request.LauncherRequestEvent; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.RequestService; +import pro.gravit.launcher.base.request.websockets.WebSocketRequest; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.LogHelper; import pro.gravit.utils.helper.SecurityHelper; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/update/ProfilesRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/update/ProfilesRequest.java new file mode 100644 index 00000000..758831b4 --- /dev/null +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/update/ProfilesRequest.java @@ -0,0 +1,13 @@ +package pro.gravit.launcher.base.request.update; + +import pro.gravit.launcher.base.events.request.ProfilesRequestEvent; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.websockets.WebSocketRequest; + +public final class ProfilesRequest extends Request implements WebSocketRequest { + + @Override + public String getType() { + return "profiles"; + } +} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/update/UpdateListRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/update/UpdateListRequest.java new file mode 100644 index 00000000..1406e132 --- /dev/null +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/update/UpdateListRequest.java @@ -0,0 +1,13 @@ +package pro.gravit.launcher.base.request.update; + +import pro.gravit.launcher.base.events.request.UpdateListRequestEvent; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.websockets.WebSocketRequest; + +public final class UpdateListRequest extends Request implements WebSocketRequest { + + @Override + public String getType() { + return "updateList"; + } +} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/update/UpdateRequest.java similarity index 62% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/update/UpdateRequest.java index b851b55c..f4ad831e 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/update/UpdateRequest.java @@ -1,9 +1,9 @@ -package pro.gravit.launcher.request.update; +package pro.gravit.launcher.base.request.update; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.request.UpdateRequestEvent; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.websockets.WebSocketRequest; +import pro.gravit.launcher.base.events.request.UpdateRequestEvent; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.websockets.WebSocketRequest; public final class UpdateRequest extends Request implements WebSocketRequest { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/uuid/BatchProfileByUsernameRequest.java similarity index 79% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/uuid/BatchProfileByUsernameRequest.java index 8f4f3c4f..65509418 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/uuid/BatchProfileByUsernameRequest.java @@ -1,9 +1,9 @@ -package pro.gravit.launcher.request.uuid; +package pro.gravit.launcher.base.request.uuid; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.request.BatchProfileByUsernameRequestEvent; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.websockets.WebSocketRequest; +import pro.gravit.launcher.base.events.request.BatchProfileByUsernameRequestEvent; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.websockets.WebSocketRequest; import pro.gravit.utils.helper.IOHelper; import java.io.IOException; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUUIDRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/uuid/ProfileByUUIDRequest.java similarity index 66% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUUIDRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/uuid/ProfileByUUIDRequest.java index ea95fa98..cebec5a4 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUUIDRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/uuid/ProfileByUUIDRequest.java @@ -1,9 +1,9 @@ -package pro.gravit.launcher.request.uuid; +package pro.gravit.launcher.base.request.uuid; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.request.ProfileByUUIDRequestEvent; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.websockets.WebSocketRequest; +import pro.gravit.launcher.base.events.request.ProfileByUUIDRequestEvent; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.websockets.WebSocketRequest; import java.util.Objects; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUsernameRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/uuid/ProfileByUsernameRequest.java similarity index 63% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUsernameRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/uuid/ProfileByUsernameRequest.java index 784f710f..4638b574 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUsernameRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/uuid/ProfileByUsernameRequest.java @@ -1,9 +1,9 @@ -package pro.gravit.launcher.request.uuid; +package pro.gravit.launcher.base.request.uuid; import pro.gravit.launcher.core.LauncherNetworkAPI; -import pro.gravit.launcher.events.request.ProfileByUsernameRequestEvent; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.websockets.WebSocketRequest; +import pro.gravit.launcher.base.events.request.ProfileByUsernameRequestEvent; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.websockets.WebSocketRequest; public final class ProfileByUsernameRequest extends Request implements WebSocketRequest { @LauncherNetworkAPI diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/ClientJSONPoint.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/ClientJSONPoint.java new file mode 100644 index 00000000..7f65dadf --- /dev/null +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/ClientJSONPoint.java @@ -0,0 +1,112 @@ +package pro.gravit.launcher.base.request.websockets; + +import pro.gravit.launcher.base.Downloader; +import pro.gravit.utils.helper.LogHelper; + +import javax.net.ssl.SSLException; +import java.io.IOException; +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.WebSocket; +import java.security.KeyManagementException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; +import java.time.Duration; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Consumer; + +public abstract class ClientJSONPoint implements WebSocket.Listener { + private static final AtomicInteger counter = new AtomicInteger(); + private final URI uri; + public boolean isClosed; + private final WebSocket.Builder webSocketBuilder; + protected HttpClient httpClient; + protected WebSocket webSocket; + protected boolean ssl = false; + protected int port; + private final Object syncObject = new Object(); + private volatile StringBuilder builder = new StringBuilder(); + + public ClientJSONPoint(final String uri) throws SSLException { + this(URI.create(uri)); + } + + public ClientJSONPoint(URI uri) { + this.uri = uri; + String protocol = uri.getScheme(); + if (!"ws".equals(protocol) && !"wss".equals(protocol)) { + throw new IllegalArgumentException("Unsupported protocol: " + protocol); + } + if ("wss".equals(protocol)) { + ssl = true; + } + if (uri.getPort() == -1) { + if ("ws".equals(protocol)) port = 80; + else port = 443; + } else port = uri.getPort(); + try { + httpClient = HttpClient.newBuilder() + .sslContext(Downloader.makeSSLContext()).build(); + webSocketBuilder = httpClient.newWebSocketBuilder().connectTimeout(Duration.ofSeconds(30)); + } catch (NoSuchAlgorithmException | CertificateException | KeyStoreException | IOException | + KeyManagementException e) { + throw new RuntimeException(e); + } + } + + public void open() throws Exception { + webSocket = webSocketBuilder.buildAsync(uri, this).get(); + } + + public void openAsync(Runnable onConnect, Consumer onFail) { + webSocketBuilder.buildAsync(uri, this).thenAccept((e) -> { + this.webSocket = e; + onConnect.run(); + }).exceptionally((ex) -> { + onFail.accept(ex); + return null; + }); + } + + @Override + public CompletionStage onText(WebSocket webSocket, CharSequence data, boolean last) { + synchronized (syncObject) { + builder.append(data); + if(last) { + String message = builder.toString(); + builder = new StringBuilder(); + onMessage(message); + } + } + return WebSocket.Listener.super.onText(webSocket, data, last); + } + + @Override + public CompletionStage onClose(WebSocket webSocket, int statusCode, String reason) { + onDisconnect(statusCode, reason); + return WebSocket.Listener.super.onClose(webSocket, statusCode, reason); + } + + @Override + public void onError(WebSocket webSocket, Throwable error) { + LogHelper.error(error); + WebSocket.Listener.super.onError(webSocket, error); + } + + public void send(String text) { + webSocket.sendText(text, true); + } + + abstract void onMessage(String message); + + abstract void onDisconnect(int statusCode, String reason); + + abstract void onOpen(); + + public void close() throws InterruptedException { + webSocket.abort(); + } + +} \ No newline at end of file diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientWebSocketService.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/ClientWebSocketService.java similarity index 85% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientWebSocketService.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/ClientWebSocketService.java index 5d18b124..e5564f37 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientWebSocketService.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/ClientWebSocketService.java @@ -1,18 +1,18 @@ -package pro.gravit.launcher.request.websockets; +package pro.gravit.launcher.base.request.websockets; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.events.NotificationEvent; -import pro.gravit.launcher.events.request.*; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.events.NotificationEvent; +import pro.gravit.launcher.base.events.request.*; import pro.gravit.launcher.core.hasher.HashedEntry; import pro.gravit.launcher.core.hasher.HashedEntryAdapter; -import pro.gravit.launcher.profiles.ClientProfile; -import pro.gravit.launcher.profiles.optional.actions.OptionalAction; -import pro.gravit.launcher.profiles.optional.triggers.OptionalTrigger; -import pro.gravit.launcher.request.WebSocketEvent; -import pro.gravit.launcher.request.auth.AuthRequest; -import pro.gravit.launcher.request.auth.GetAvailabilityAuthRequest; +import pro.gravit.launcher.base.profiles.ClientProfile; +import pro.gravit.launcher.base.profiles.optional.actions.OptionalAction; +import pro.gravit.launcher.base.profiles.optional.triggers.OptionalTrigger; +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.utils.ProviderMap; import pro.gravit.utils.UniversalJsonAdapter; import pro.gravit.utils.helper.LogHelper; @@ -67,9 +67,9 @@ public abstract class ClientWebSocketService extends ClientJSONPoint { public abstract void eventHandle(T event); @Override - void onDisconnect() { - LogHelper.info("WebSocket client disconnect"); - if (onCloseCallback != null) onCloseCallback.onClose(0, "unsupported param", !isClosed); + void onDisconnect(int statusCode, String reason) { + LogHelper.info("WebSocket disconnected: %d: %s", statusCode, reason); + if (onCloseCallback != null) onCloseCallback.onClose(statusCode, reason, !isClosed); } @Override @@ -122,13 +122,13 @@ public abstract class ClientWebSocketService extends ClientJSONPoint { public void sendObject(Object obj) throws IOException { waitIfNotConnected(); - if (ch == null || !ch.isActive()) reconnectCallback.onReconnect(); + if (webSocket == null || webSocket.isInputClosed()) reconnectCallback.onReconnect(); send(gson.toJson(obj, WebSocketRequest.class)); } public void sendObject(Object obj, Type type) throws IOException { waitIfNotConnected(); - if (ch == null || !ch.isActive()) reconnectCallback.onReconnect(); + if (webSocket == null || webSocket.isInputClosed()) reconnectCallback.onReconnect(); send(gson.toJson(obj, type)); } diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/OfflineRequestService.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/OfflineRequestService.java similarity index 88% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/OfflineRequestService.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/OfflineRequestService.java index 66fb69e5..d995b73d 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/OfflineRequestService.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/OfflineRequestService.java @@ -1,10 +1,10 @@ -package pro.gravit.launcher.request.websockets; +package pro.gravit.launcher.base.request.websockets; -import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.RequestException; -import pro.gravit.launcher.request.RequestService; -import pro.gravit.launcher.request.WebSocketEvent; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.RequestException; +import pro.gravit.launcher.base.request.RequestService; +import pro.gravit.launcher.base.request.WebSocketEvent; import pro.gravit.utils.helper.LogHelper; import java.util.HashSet; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/StdWebSocketService.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/StdWebSocketService.java similarity index 92% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/StdWebSocketService.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/StdWebSocketService.java index c4946129..fe6dade9 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/StdWebSocketService.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/StdWebSocketService.java @@ -1,11 +1,11 @@ -package pro.gravit.launcher.request.websockets; +package pro.gravit.launcher.base.request.websockets; -import pro.gravit.launcher.events.RequestEvent; -import pro.gravit.launcher.events.request.ErrorRequestEvent; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.RequestException; -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.ErrorRequestEvent; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.RequestException; +import pro.gravit.launcher.base.request.RequestService; +import pro.gravit.launcher.base.request.WebSocketEvent; import pro.gravit.utils.helper.JVMHelper; import pro.gravit.utils.helper.LogHelper; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/VoidRequestService.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/VoidRequestService.java similarity index 76% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/VoidRequestService.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/VoidRequestService.java index 4d098833..0e26a494 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/VoidRequestService.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/VoidRequestService.java @@ -1,9 +1,9 @@ -package pro.gravit.launcher.request.websockets; +package pro.gravit.launcher.base.request.websockets; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.RequestException; -import pro.gravit.launcher.request.RequestService; -import pro.gravit.launcher.request.WebSocketEvent; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.RequestException; +import pro.gravit.launcher.base.request.RequestService; +import pro.gravit.launcher.base.request.WebSocketEvent; import java.util.concurrent.CompletableFuture; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/WebSocketRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/WebSocketRequest.java similarity index 72% rename from LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/WebSocketRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/WebSocketRequest.java index 05d3e899..69389897 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/WebSocketRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/WebSocketRequest.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.request.websockets; +package pro.gravit.launcher.base.request.websockets; import pro.gravit.utils.TypeSerializeInterface; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/ClosePhase.java b/LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/ClosePhase.java deleted file mode 100644 index b924d4c0..00000000 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/ClosePhase.java +++ /dev/null @@ -1,6 +0,0 @@ -package pro.gravit.launcher.modules.events; - -import pro.gravit.launcher.modules.LauncherModule; - -public class ClosePhase extends LauncherModule.Event { -} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/InitPhase.java b/LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/InitPhase.java deleted file mode 100644 index b4f24adb..00000000 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/InitPhase.java +++ /dev/null @@ -1,6 +0,0 @@ -package pro.gravit.launcher.modules.events; - -import pro.gravit.launcher.modules.LauncherModule; - -public class InitPhase extends LauncherModule.Event { -} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/PostInitPhase.java b/LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/PostInitPhase.java deleted file mode 100644 index 88d097a5..00000000 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/PostInitPhase.java +++ /dev/null @@ -1,6 +0,0 @@ -package pro.gravit.launcher.modules.events; - -import pro.gravit.launcher.modules.LauncherModule; - -public class PostInitPhase extends LauncherModule.Event { -} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/PreConfigPhase.java b/LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/PreConfigPhase.java deleted file mode 100644 index 01630a53..00000000 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/events/PreConfigPhase.java +++ /dev/null @@ -1,6 +0,0 @@ -package pro.gravit.launcher.modules.events; - -import pro.gravit.launcher.modules.LauncherModule; - -public class PreConfigPhase extends LauncherModule.Event { -} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/CurrentUserRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/CurrentUserRequest.java deleted file mode 100644 index 4a4437f5..00000000 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/CurrentUserRequest.java +++ /dev/null @@ -1,11 +0,0 @@ -package pro.gravit.launcher.request.auth; - -import pro.gravit.launcher.events.request.CurrentUserRequestEvent; -import pro.gravit.launcher.request.Request; - -public class CurrentUserRequest extends Request { - @Override - public String getType() { - return "currentUser"; - } -} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/cabinet/AssetUploadInfoRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/cabinet/AssetUploadInfoRequest.java deleted file mode 100644 index 3827e762..00000000 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/cabinet/AssetUploadInfoRequest.java +++ /dev/null @@ -1,11 +0,0 @@ -package pro.gravit.launcher.request.cabinet; - -import pro.gravit.launcher.events.request.AssetUploadInfoRequestEvent; -import pro.gravit.launcher.request.Request; - -public class AssetUploadInfoRequest extends Request { - @Override - public String getType() { - return "assetUploadInfo"; - } -} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/management/FeaturesRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/management/FeaturesRequest.java deleted file mode 100644 index d203cdff..00000000 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/management/FeaturesRequest.java +++ /dev/null @@ -1,11 +0,0 @@ -package pro.gravit.launcher.request.management; - -import pro.gravit.launcher.events.request.FeaturesRequestEvent; -import pro.gravit.launcher.request.Request; - -public class FeaturesRequest extends Request { - @Override - public String getType() { - return "features"; - } -} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/ProfilesRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/ProfilesRequest.java deleted file mode 100644 index 06f28ebc..00000000 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/ProfilesRequest.java +++ /dev/null @@ -1,13 +0,0 @@ -package pro.gravit.launcher.request.update; - -import pro.gravit.launcher.events.request.ProfilesRequestEvent; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.websockets.WebSocketRequest; - -public final class ProfilesRequest extends Request implements WebSocketRequest { - - @Override - public String getType() { - return "profiles"; - } -} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateListRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateListRequest.java deleted file mode 100644 index 463b58ed..00000000 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateListRequest.java +++ /dev/null @@ -1,13 +0,0 @@ -package pro.gravit.launcher.request.update; - -import pro.gravit.launcher.events.request.UpdateListRequestEvent; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.websockets.WebSocketRequest; - -public final class UpdateListRequest extends Request implements WebSocketRequest { - - @Override - public String getType() { - return "updateList"; - } -} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientJSONPoint.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientJSONPoint.java deleted file mode 100644 index 0afe1267..00000000 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientJSONPoint.java +++ /dev/null @@ -1,155 +0,0 @@ -package pro.gravit.launcher.request.websockets; - -import io.netty.bootstrap.Bootstrap; -import io.netty.channel.*; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.SocketChannel; -import io.netty.channel.socket.nio.NioSocketChannel; -import io.netty.handler.codec.http.EmptyHttpHeaders; -import io.netty.handler.codec.http.HttpClientCodec; -import io.netty.handler.codec.http.HttpObjectAggregator; -import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame; -import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; -import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakerFactory; -import io.netty.handler.codec.http.websocketx.WebSocketVersion; -import io.netty.handler.ssl.SslContext; -import io.netty.handler.ssl.SslContextBuilder; -import pro.gravit.launcher.core.CertificatePinningTrustManager; -import pro.gravit.launcher.core.LauncherInject; -import pro.gravit.utils.helper.LogHelper; - -import javax.net.ssl.SSLException; -import java.io.IOException; -import java.net.URI; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.cert.CertificateException; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Consumer; - -public abstract class ClientJSONPoint { - private static final AtomicInteger counter = new AtomicInteger(); - private static final ThreadFactory threadFactory = (runnable) -> { - Thread t = new Thread(runnable); - t.setName(String.format("Netty Thread #%d", counter.incrementAndGet())); - t.setDaemon(true); - return t; - }; - private static final EventLoopGroup group = new NioEventLoopGroup(threadFactory); - @LauncherInject("launcher.certificatePinning") - private static boolean isCertificatePinning; - protected final Bootstrap bootstrap = new Bootstrap(); - private final URI uri; - public boolean isClosed; - protected Channel ch; - protected WebSocketClientHandler webSocketClientHandler; - protected boolean ssl = false; - protected int port; - - public ClientJSONPoint(final String uri) throws SSLException { - this(URI.create(uri)); - } - - public ClientJSONPoint(URI uri) throws SSLException { - this.uri = uri; - String protocol = uri.getScheme(); - if (!"ws".equals(protocol) && !"wss".equals(protocol)) { - throw new IllegalArgumentException("Unsupported protocol: " + protocol); - } - if ("wss".equals(protocol)) { - ssl = true; - } - if (uri.getPort() == -1) { - if ("ws".equals(protocol)) port = 80; - else port = 443; - } else port = uri.getPort(); - final SslContext sslCtx; - if (ssl) { - SslContextBuilder sslContextBuilder = SslContextBuilder.forClient(); - if (isCertificatePinning) { - try { - sslContextBuilder.trustManager(CertificatePinningTrustManager.getTrustManager()); - } catch (KeyStoreException | NoSuchAlgorithmException | IOException | CertificateException e) { - LogHelper.error(e); - sslContextBuilder.trustManager(); - } - } - sslCtx = sslContextBuilder.build(); - } else sslCtx = null; - bootstrap.group(group) - .channel(NioSocketChannel.class) - .handler(new ChannelInitializer() { - @Override - public void initChannel(SocketChannel ch) { - ChannelPipeline pipeline = ch.pipeline(); - if (sslCtx != null) { - pipeline.addLast(sslCtx.newHandler(ch.alloc(), uri.getHost(), port)); - } - pipeline.addLast("http-codec", new HttpClientCodec()); - pipeline.addLast("aggregator", new HttpObjectAggregator(65536)); - pipeline.addLast("ws-handler", webSocketClientHandler); - } - }); - } - - public void open() throws Exception { - //System.out.println("WebSocket Client connecting"); - webSocketClientHandler = - new WebSocketClientHandler( - WebSocketClientHandshakerFactory.newHandshaker( - uri, WebSocketVersion.V13, null, false, EmptyHttpHeaders.INSTANCE, 12800000), this); - ch = bootstrap.connect(uri.getHost(), port).sync().channel(); - webSocketClientHandler.handshakeFuture().sync(); - } - - public void openAsync(Runnable onConnect, Consumer onFail) { - //System.out.println("WebSocket Client connecting"); - webSocketClientHandler = - new WebSocketClientHandler( - WebSocketClientHandshakerFactory.newHandshaker( - uri, WebSocketVersion.V13, null, false, EmptyHttpHeaders.INSTANCE, 12800000), this); - ChannelFuture future = bootstrap.connect(uri.getHost(), port); - future.addListener((l) -> { - if (l.isSuccess()) { - ch = future.channel(); - webSocketClientHandler.handshakeFuture().addListener((e) -> { - if (e.isSuccess()) { - onConnect.run(); - } else { - onFail.accept(webSocketClientHandler.handshakeFuture().cause()); - } - }); - } else { - onFail.accept(future.cause()); - } - }); - } - - public void send(String text) { - LogHelper.dev("Send: %s", text); - ch.writeAndFlush(new TextWebSocketFrame(text), ch.voidPromise()); - } - - abstract void onMessage(String message); - - abstract void onDisconnect(); - - abstract void onOpen(); - - public void close() throws InterruptedException { - //System.out.println("WebSocket Client sending close"); - isClosed = true; - if (ch != null && ch.isActive()) { - ch.writeAndFlush(new CloseWebSocketFrame(), ch.voidPromise()); - ch.closeFuture().sync(); - } - - group.shutdownGracefully(); - } - - public void eval(final String text) { - ch.writeAndFlush(new TextWebSocketFrame(text), ch.voidPromise()); - } - -} \ No newline at end of file diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/WebSocketClientHandler.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/WebSocketClientHandler.java deleted file mode 100644 index 99739729..00000000 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/WebSocketClientHandler.java +++ /dev/null @@ -1,89 +0,0 @@ -package pro.gravit.launcher.request.websockets; - -import io.netty.channel.*; -import io.netty.handler.codec.http.FullHttpResponse; -import io.netty.handler.codec.http.websocketx.*; -import io.netty.util.CharsetUtil; -import pro.gravit.utils.helper.LogHelper; - -import java.util.concurrent.TimeUnit; - -public class WebSocketClientHandler extends SimpleChannelInboundHandler { - - private final WebSocketClientHandshaker handshaker; - private final ClientJSONPoint clientJSONPoint; - private ChannelPromise handshakeFuture; - - public WebSocketClientHandler(final WebSocketClientHandshaker handshaker, ClientJSONPoint clientJSONPoint) { - this.handshaker = handshaker; - this.clientJSONPoint = clientJSONPoint; - } - - public ChannelFuture handshakeFuture() { - return handshakeFuture; - } - - @Override - public void handlerAdded(final ChannelHandlerContext ctx) { - handshakeFuture = ctx.newPromise(); - } - - @Override - public void channelActive(final ChannelHandlerContext ctx) { - handshaker.handshake(ctx.channel()); - clientJSONPoint.onOpen(); - ctx.executor().scheduleWithFixedDelay(() -> ctx.channel().writeAndFlush(new PingWebSocketFrame()), 20L, 20L, TimeUnit.SECONDS); - } - - @Override - public void channelInactive(final ChannelHandlerContext ctx) { - //System.out.println("WebSocket Client disconnected!"); - clientJSONPoint.onDisconnect(); - } - - @Override - protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception { - final Channel ch = ctx.channel(); - if (!handshaker.isHandshakeComplete()) { - // web socket client connected - handshaker.finishHandshake(ch, (FullHttpResponse) msg); - handshakeFuture.setSuccess(); - return; - } - - if (msg instanceof FullHttpResponse response) { - throw new Exception("Unexpected FullHttpResponse (getStatus=" + response.status() + ", content=" - + response.content().toString(CharsetUtil.UTF_8) + ')'); - } - - final WebSocketFrame frame = (WebSocketFrame) msg; - if (frame instanceof TextWebSocketFrame textFrame) { - if (LogHelper.isDevEnabled()) { - LogHelper.dev("Message: %s", textFrame.text()); - } - clientJSONPoint.onMessage(textFrame.text()); - // uncomment to print request - // logger.info(textFrame.text()); - } else if ((frame instanceof PingWebSocketFrame)) { - frame.content().retain(); - ch.writeAndFlush(new PongWebSocketFrame(frame.content()), ch.voidPromise()); - //return; - } else if (frame instanceof PongWebSocketFrame) { - } else if (frame instanceof CloseWebSocketFrame) - ch.close(); - else if (frame instanceof BinaryWebSocketFrame) { - // uncomment to print request - // logger.info(frame.content().toString()); - } - } - - @Override - public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) { - if (!handshakeFuture.isDone()) { - handshakeFuture.setFailure(cause); - } else { - LogHelper.error(cause); - } - ctx.close(); - } -} \ No newline at end of file diff --git a/LauncherAPI/src/test/java/pro/gravit/launcher/ClientVersionTest.java b/LauncherAPI/src/test/java/pro/gravit/launcher/ClientVersionTest.java index 205b495a..81ff8a28 100644 --- a/LauncherAPI/src/test/java/pro/gravit/launcher/ClientVersionTest.java +++ b/LauncherAPI/src/test/java/pro/gravit/launcher/ClientVersionTest.java @@ -2,7 +2,7 @@ package pro.gravit.launcher; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.base.profiles.ClientProfile; public class ClientVersionTest { @Test diff --git a/LauncherAPI/src/test/java/pro/gravit/launcher/ModulesTest.java b/LauncherAPI/src/test/java/pro/gravit/launcher/ModulesTest.java index c228df09..0f9ea313 100644 --- a/LauncherAPI/src/test/java/pro/gravit/launcher/ModulesTest.java +++ b/LauncherAPI/src/test/java/pro/gravit/launcher/ModulesTest.java @@ -7,8 +7,8 @@ import org.junit.jupiter.api.io.TempDir; import pro.gravit.launcher.impl.*; import pro.gravit.launcher.impl.event.CancelEvent; import pro.gravit.launcher.impl.event.NormalEvent; -import pro.gravit.launcher.modules.LauncherModule; -import pro.gravit.launcher.modules.impl.SimpleModuleManager; +import pro.gravit.launcher.base.modules.LauncherModule; +import pro.gravit.launcher.base.modules.impl.SimpleModuleManager; import java.nio.file.Path; diff --git a/LauncherAPI/src/test/java/pro/gravit/launcher/PermissionTest.java b/LauncherAPI/src/test/java/pro/gravit/launcher/PermissionTest.java index 74baf10c..581b5015 100644 --- a/LauncherAPI/src/test/java/pro/gravit/launcher/PermissionTest.java +++ b/LauncherAPI/src/test/java/pro/gravit/launcher/PermissionTest.java @@ -2,6 +2,7 @@ package pro.gravit.launcher; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import pro.gravit.launcher.base.ClientPermissions; public class PermissionTest { @Test diff --git a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/Cyclic2DependModule.java b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/Cyclic2DependModule.java index fa321bce..3d144bec 100644 --- a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/Cyclic2DependModule.java +++ b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/Cyclic2DependModule.java @@ -1,8 +1,8 @@ package pro.gravit.launcher.impl; -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; public class Cyclic2DependModule extends LauncherModule { diff --git a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/CyclicDependModule.java b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/CyclicDependModule.java index c13d8b58..090ce42a 100644 --- a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/CyclicDependModule.java +++ b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/CyclicDependModule.java @@ -1,8 +1,8 @@ package pro.gravit.launcher.impl; -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; public class CyclicDependModule extends LauncherModule { diff --git a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/Depend1Module.java b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/Depend1Module.java index a3f046b7..99da57e2 100644 --- a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/Depend1Module.java +++ b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/Depend1Module.java @@ -1,9 +1,9 @@ package pro.gravit.launcher.impl; import org.junit.jupiter.api.Assertions; -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; public class Depend1Module extends LauncherModule { diff --git a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/Depend2Module.java b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/Depend2Module.java index 2b50e4c1..466053d6 100644 --- a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/Depend2Module.java +++ b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/Depend2Module.java @@ -1,9 +1,9 @@ package pro.gravit.launcher.impl; import org.junit.jupiter.api.Assertions; -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; public class Depend2Module extends LauncherModule { diff --git a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/Depend3Module.java b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/Depend3Module.java index 3e63503a..bf264cc8 100644 --- a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/Depend3Module.java +++ b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/Depend3Module.java @@ -1,8 +1,8 @@ package pro.gravit.launcher.impl; -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; public class Depend3Module extends LauncherModule { public Depend3Module() { diff --git a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/InternalModule.java b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/InternalModule.java index 1cbe663e..acd36fca 100644 --- a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/InternalModule.java +++ b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/InternalModule.java @@ -1,8 +1,8 @@ package pro.gravit.launcher.impl; -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; public class InternalModule extends LauncherModule { public InternalModule() { diff --git a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/MainModule.java b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/MainModule.java index 22248da6..e4993574 100644 --- a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/MainModule.java +++ b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/MainModule.java @@ -1,9 +1,9 @@ package pro.gravit.launcher.impl; import org.junit.jupiter.api.Assertions; -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; public class MainModule extends LauncherModule { diff --git a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/ProvidedModule.java b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/ProvidedModule.java index dd201374..68fb5c0c 100644 --- a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/ProvidedModule.java +++ b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/ProvidedModule.java @@ -1,8 +1,8 @@ package pro.gravit.launcher.impl; -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; public class ProvidedModule extends LauncherModule implements VirtualInterface { diff --git a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/TestModule.java b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/TestModule.java index 9f247324..18500f2b 100644 --- a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/TestModule.java +++ b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/TestModule.java @@ -2,9 +2,9 @@ package pro.gravit.launcher.impl; import pro.gravit.launcher.impl.event.CancelEvent; import pro.gravit.launcher.impl.event.NormalEvent; -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; public class TestModule extends LauncherModule { diff --git a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/event/CancelEvent.java b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/event/CancelEvent.java index 4220f5f1..adb68520 100644 --- a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/event/CancelEvent.java +++ b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/event/CancelEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.impl.event; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.base.modules.LauncherModule; public class CancelEvent extends LauncherModule.Event { } diff --git a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/event/NormalEvent.java b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/event/NormalEvent.java index 210b88e2..84bc7d62 100644 --- a/LauncherAPI/src/test/java/pro/gravit/launcher/impl/event/NormalEvent.java +++ b/LauncherAPI/src/test/java/pro/gravit/launcher/impl/event/NormalEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.impl.event; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.base.modules.LauncherModule; public class NormalEvent extends LauncherModule.Event { public boolean passed; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/BasicLauncherEventHandler.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/BasicLauncherEventHandler.java index 8b36651f..87d03fa9 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/BasicLauncherEventHandler.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/BasicLauncherEventHandler.java @@ -1,12 +1,12 @@ package pro.gravit.launcher.client; import pro.gravit.launcher.client.api.DialogService; -import pro.gravit.launcher.events.ExtendedTokenRequestEvent; -import pro.gravit.launcher.events.NotificationEvent; -import pro.gravit.launcher.events.request.SecurityReportRequestEvent; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.RequestService; -import pro.gravit.launcher.request.WebSocketEvent; +import pro.gravit.launcher.base.events.ExtendedTokenRequestEvent; +import pro.gravit.launcher.base.events.NotificationEvent; +import pro.gravit.launcher.base.events.request.SecurityReportRequestEvent; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.RequestService; +import pro.gravit.launcher.base.request.WebSocketEvent; import pro.gravit.utils.helper.LogHelper; public class BasicLauncherEventHandler implements RequestService.EventHandler { diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientGsonManager.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientGsonManager.java similarity index 75% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientGsonManager.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/ClientGsonManager.java index 9a503091..7a4ce733 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientGsonManager.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientGsonManager.java @@ -1,9 +1,9 @@ -package pro.gravit.launcher.client.runtime.client; +package pro.gravit.launcher.client; import com.google.gson.GsonBuilder; import pro.gravit.launcher.core.managers.GsonManager; -import pro.gravit.launcher.modules.events.PreGsonPhase; -import pro.gravit.launcher.request.websockets.ClientWebSocketService; +import pro.gravit.launcher.base.modules.events.PreGsonPhase; +import pro.gravit.launcher.base.request.websockets.ClientWebSocketService; public class ClientGsonManager extends GsonManager { private final ClientModuleManager moduleManager; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherCoreModule.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherCoreModule.java similarity index 59% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherCoreModule.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherCoreModule.java index 5dd32863..9cfe8ddc 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherCoreModule.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherCoreModule.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.client.runtime.client; +package pro.gravit.launcher.client; -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; public class ClientLauncherCoreModule extends LauncherModule { diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherEntryPoint.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java similarity index 93% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherEntryPoint.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java index 9d3d6134..cc0a1b28 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherEntryPoint.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java @@ -1,28 +1,26 @@ -package pro.gravit.launcher.client.runtime.client; +package pro.gravit.launcher.client; -import pro.gravit.launcher.*; -import pro.gravit.launcher.client.BasicLauncherEventHandler; -import pro.gravit.launcher.client.ClientLauncherMethods; -import pro.gravit.launcher.client.LauncherAgent; -import pro.gravit.launcher.client.api.AuthService; -import pro.gravit.launcher.client.api.ClientService; -import pro.gravit.launcher.client.api.KeyService; -import pro.gravit.launcher.client.runtime.client.events.client.*; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.LauncherConfig; +import pro.gravit.launcher.base.api.AuthService; +import pro.gravit.launcher.base.api.ClientService; +import pro.gravit.launcher.base.api.KeyService; +import pro.gravit.launcher.client.events.*; import pro.gravit.launcher.core.hasher.FileNameMatcher; import pro.gravit.launcher.core.hasher.HashedDir; import pro.gravit.launcher.core.hasher.HashedEntry; -import pro.gravit.launcher.modules.events.PreConfigPhase; -import pro.gravit.launcher.profiles.ClientProfile; -import pro.gravit.launcher.profiles.ClientProfileVersions; -import pro.gravit.launcher.profiles.optional.actions.OptionalAction; -import pro.gravit.launcher.profiles.optional.actions.OptionalActionClassPath; -import pro.gravit.launcher.profiles.optional.actions.OptionalActionClientArgs; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.RequestException; -import pro.gravit.launcher.request.RequestService; -import pro.gravit.launcher.request.websockets.StdWebSocketService; +import pro.gravit.launcher.base.modules.events.PreConfigPhase; +import pro.gravit.launcher.base.profiles.ClientProfile; +import pro.gravit.launcher.base.profiles.ClientProfileVersions; +import pro.gravit.launcher.base.profiles.optional.actions.OptionalAction; +import pro.gravit.launcher.base.profiles.optional.actions.OptionalActionClassPath; +import pro.gravit.launcher.base.profiles.optional.actions.OptionalActionClientArgs; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.RequestException; +import pro.gravit.launcher.base.request.RequestService; +import pro.gravit.launcher.base.request.websockets.StdWebSocketService; import pro.gravit.launcher.core.serialize.HInput; -import pro.gravit.launcher.client.runtime.utils.DirWatcher; +import pro.gravit.launcher.client.utils.DirWatcher; import pro.gravit.utils.helper.*; import pro.gravit.utils.launch.*; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherMethods.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherMethods.java index 2774a122..09d8aef5 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherMethods.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherMethods.java @@ -1,29 +1,25 @@ package pro.gravit.launcher.client; -import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.client.events.ClientExitPhase; import pro.gravit.launcher.core.LauncherTrustManager; -import pro.gravit.launcher.client.runtime.client.ClientGsonManager; -import pro.gravit.launcher.client.runtime.client.ClientLauncherEntryPoint; -import pro.gravit.launcher.client.runtime.client.ClientModuleManager; -import pro.gravit.launcher.client.runtime.client.ClientParams; -import pro.gravit.launcher.client.runtime.client.events.ClientExitPhase; -import pro.gravit.launcher.events.request.*; -import pro.gravit.launcher.modules.LauncherModulesManager; -import pro.gravit.launcher.modules.events.OfflineModeEvent; -import pro.gravit.launcher.profiles.optional.actions.OptionalAction; -import pro.gravit.launcher.profiles.optional.triggers.OptionalTrigger; -import pro.gravit.launcher.request.RequestException; -import pro.gravit.launcher.request.RequestService; -import pro.gravit.launcher.request.auth.*; -import pro.gravit.launcher.request.auth.details.AuthLoginOnlyDetails; -import pro.gravit.launcher.request.management.FeaturesRequest; -import pro.gravit.launcher.request.secure.GetSecureLevelInfoRequest; -import pro.gravit.launcher.request.secure.SecurityReportRequest; -import pro.gravit.launcher.request.update.LauncherRequest; -import pro.gravit.launcher.request.uuid.ProfileByUUIDRequest; -import pro.gravit.launcher.request.uuid.ProfileByUsernameRequest; -import pro.gravit.launcher.request.websockets.OfflineRequestService; -import pro.gravit.launcher.client.runtime.utils.NativeJVMHalt; +import pro.gravit.launcher.base.events.request.*; +import pro.gravit.launcher.base.modules.LauncherModulesManager; +import pro.gravit.launcher.base.modules.events.OfflineModeEvent; +import pro.gravit.launcher.base.profiles.optional.actions.OptionalAction; +import pro.gravit.launcher.base.profiles.optional.triggers.OptionalTrigger; +import pro.gravit.launcher.base.request.RequestException; +import pro.gravit.launcher.base.request.RequestService; +import pro.gravit.launcher.base.request.auth.*; +import pro.gravit.launcher.base.request.auth.details.AuthLoginOnlyDetails; +import pro.gravit.launcher.base.request.management.FeaturesRequest; +import pro.gravit.launcher.base.request.secure.GetSecureLevelInfoRequest; +import pro.gravit.launcher.base.request.secure.SecurityReportRequest; +import pro.gravit.launcher.base.request.update.LauncherRequest; +import pro.gravit.launcher.base.request.uuid.ProfileByUUIDRequest; +import pro.gravit.launcher.base.request.uuid.ProfileByUsernameRequest; +import pro.gravit.launcher.base.request.websockets.OfflineRequestService; +import pro.gravit.launcher.client.utils.NativeJVMHalt; import pro.gravit.utils.helper.JVMHelper; import java.security.cert.X509Certificate; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientModuleManager.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientModuleManager.java similarity index 82% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientModuleManager.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/ClientModuleManager.java index e89b8af5..03a6f14e 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientModuleManager.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientModuleManager.java @@ -1,9 +1,9 @@ -package pro.gravit.launcher.client.runtime.client; +package pro.gravit.launcher.client; -import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.base.Launcher; import pro.gravit.launcher.core.LauncherTrustManager; -import pro.gravit.launcher.modules.LauncherModule; -import pro.gravit.launcher.modules.impl.SimpleModuleManager; +import pro.gravit.launcher.base.modules.LauncherModule; +import pro.gravit.launcher.base.modules.impl.SimpleModuleManager; import java.nio.file.Path; import java.util.Collections; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientParams.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientParams.java similarity index 88% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientParams.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/ClientParams.java index e8047887..ee8381d9 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientParams.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientParams.java @@ -1,14 +1,14 @@ -package pro.gravit.launcher.client.runtime.client; +package pro.gravit.launcher.client; -import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.events.request.AuthRequestEvent; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.events.request.AuthRequestEvent; import pro.gravit.launcher.core.hasher.HashedDir; -import pro.gravit.launcher.profiles.ClientProfile; -import pro.gravit.launcher.profiles.ClientProfileVersions; -import pro.gravit.launcher.profiles.PlayerProfile; -import pro.gravit.launcher.profiles.optional.actions.OptionalAction; -import pro.gravit.launcher.profiles.optional.actions.OptionalActionClientArgs; -import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.base.profiles.ClientProfile; +import pro.gravit.launcher.base.profiles.ClientProfileVersions; +import pro.gravit.launcher.base.profiles.PlayerProfile; +import pro.gravit.launcher.base.profiles.optional.actions.OptionalAction; +import pro.gravit.launcher.base.profiles.optional.actions.OptionalActionClientArgs; +import pro.gravit.launcher.base.request.Request; import pro.gravit.utils.Version; import java.util.*; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/LauncherAgent.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/LauncherAgent.java index 27924bba..0683af97 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/LauncherAgent.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/LauncherAgent.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.client; -import pro.gravit.launcher.client.runtime.utils.NativeJVMHalt; +import pro.gravit.launcher.client.utils.NativeJVMHalt; import pro.gravit.utils.helper.LogHelper; import java.io.File; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/RuntimeLauncherCoreModule.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/RuntimeLauncherCoreModule.java similarity index 59% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/RuntimeLauncherCoreModule.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/RuntimeLauncherCoreModule.java index 6b948c01..a4366843 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/RuntimeLauncherCoreModule.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/RuntimeLauncherCoreModule.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.client.runtime.client; +package pro.gravit.launcher.client; -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; public class RuntimeLauncherCoreModule extends LauncherModule { diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/api/CertificateService.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/api/CertificateService.java index 222c8de6..3c6a6e56 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/api/CertificateService.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/api/CertificateService.java @@ -2,7 +2,7 @@ package pro.gravit.launcher.client.api; import pro.gravit.launcher.client.ClientLauncherMethods; import pro.gravit.launcher.core.LauncherTrustManager; -import pro.gravit.launcher.client.runtime.utils.ApiBridgeService; +import pro.gravit.launcher.client.utils.ApiBridgeService; import java.security.cert.X509Certificate; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/api/DialogService.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/api/DialogService.java index 0132ef3d..aa26756f 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/api/DialogService.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/api/DialogService.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.client.api; -import pro.gravit.launcher.events.NotificationEvent; +import pro.gravit.launcher.base.events.NotificationEvent; import java.util.function.Consumer; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientExitPhase.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientExitPhase.java similarity index 57% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientExitPhase.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientExitPhase.java index 199bf0e4..ddad537c 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientExitPhase.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientExitPhase.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.runtime.client.events; +package pro.gravit.launcher.client.events; -import pro.gravit.launcher.modules.events.ClosePhase; +import pro.gravit.launcher.base.modules.events.ClosePhase; public class ClientExitPhase extends ClosePhase { public final int code; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessClassLoaderEvent.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientProcessClassLoaderEvent.java similarity index 76% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessClassLoaderEvent.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientProcessClassLoaderEvent.java index 7d193807..7ece2912 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessClassLoaderEvent.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientProcessClassLoaderEvent.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.client.runtime.client.events.client; +package pro.gravit.launcher.client.events; -import pro.gravit.launcher.modules.LauncherModule; -import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.base.modules.LauncherModule; +import pro.gravit.launcher.base.profiles.ClientProfile; import pro.gravit.utils.launch.ClassLoaderControl; import pro.gravit.utils.launch.Launch; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessInitPhase.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientProcessInitPhase.java similarity index 51% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessInitPhase.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientProcessInitPhase.java index a7f27384..82a1c556 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessInitPhase.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientProcessInitPhase.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.client.runtime.client.events.client; +package pro.gravit.launcher.client.events; -import pro.gravit.launcher.client.runtime.client.ClientParams; -import pro.gravit.launcher.modules.events.InitPhase; +import pro.gravit.launcher.client.ClientParams; +import pro.gravit.launcher.base.modules.events.InitPhase; public class ClientProcessInitPhase extends InitPhase { public final ClientParams params; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessLaunchEvent.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientProcessLaunchEvent.java similarity index 53% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessLaunchEvent.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientProcessLaunchEvent.java index 5954e801..9646c6d5 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessLaunchEvent.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientProcessLaunchEvent.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.client.runtime.client.events.client; +package pro.gravit.launcher.client.events; -import pro.gravit.launcher.client.runtime.client.ClientParams; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.client.ClientParams; +import pro.gravit.launcher.base.modules.LauncherModule; public class ClientProcessLaunchEvent extends LauncherModule.Event { public final ClientParams params; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessPreInvokeMainClassEvent.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientProcessPreInvokeMainClassEvent.java similarity index 66% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessPreInvokeMainClassEvent.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientProcessPreInvokeMainClassEvent.java index c84e7904..ef32888d 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessPreInvokeMainClassEvent.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientProcessPreInvokeMainClassEvent.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.client.runtime.client.events.client; +package pro.gravit.launcher.client.events; -import pro.gravit.launcher.client.runtime.client.ClientParams; -import pro.gravit.launcher.modules.LauncherModule; -import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.client.ClientParams; +import pro.gravit.launcher.base.modules.LauncherModule; +import pro.gravit.launcher.base.profiles.ClientProfile; import java.util.Collection; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessReadyEvent.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientProcessReadyEvent.java similarity index 51% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessReadyEvent.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientProcessReadyEvent.java index 87399ece..9df4dfad 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessReadyEvent.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientProcessReadyEvent.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.client.runtime.client.events.client; +package pro.gravit.launcher.client.events; -import pro.gravit.launcher.client.runtime.client.ClientParams; -import pro.gravit.launcher.modules.events.PostInitPhase; +import pro.gravit.launcher.client.ClientParams; +import pro.gravit.launcher.base.modules.events.PostInitPhase; public class ClientProcessReadyEvent extends PostInitPhase { public final ClientParams params; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientUnlockConsoleEvent.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientUnlockConsoleEvent.java similarity index 70% rename from Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientUnlockConsoleEvent.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientUnlockConsoleEvent.java index 814b5729..e73361fe 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientUnlockConsoleEvent.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientUnlockConsoleEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.runtime.client.events; +package pro.gravit.launcher.client.events; -import pro.gravit.launcher.modules.LauncherModule; +import pro.gravit.launcher.base.modules.LauncherModule; import pro.gravit.utils.command.CommandHandler; public class ClientUnlockConsoleEvent extends LauncherModule.Event { diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/ApiBridgeService.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/utils/ApiBridgeService.java similarity index 88% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/ApiBridgeService.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/utils/ApiBridgeService.java index ce675a57..f4defa2d 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/ApiBridgeService.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/utils/ApiBridgeService.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.runtime.utils; +package pro.gravit.launcher.client.utils; -import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.base.Launcher; import pro.gravit.launcher.core.LauncherTrustManager; import java.security.cert.X509Certificate; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/DirWatcher.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/utils/DirWatcher.java similarity index 98% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/DirWatcher.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/utils/DirWatcher.java index a3ab7053..5184035a 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/DirWatcher.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/utils/DirWatcher.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.client.runtime.utils; +package pro.gravit.launcher.client.utils; import pro.gravit.launcher.client.ClientLauncherMethods; import pro.gravit.launcher.core.hasher.FileNameMatcher; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/NativeJVMHalt.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/utils/NativeJVMHalt.java similarity index 94% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/NativeJVMHalt.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/utils/NativeJVMHalt.java index c442c264..03fae4f3 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/NativeJVMHalt.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/utils/NativeJVMHalt.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.client.runtime.utils; +package pro.gravit.launcher.client.utils; import pro.gravit.utils.helper.LogHelper; diff --git a/LauncherStart/src/main/java/pro/gravit/launcher/start/ClientLauncherWrapper.java b/LauncherStart/src/main/java/pro/gravit/launcher/start/ClientLauncherWrapper.java index a068b3db..82791f3f 100644 --- a/LauncherStart/src/main/java/pro/gravit/launcher/start/ClientLauncherWrapper.java +++ b/LauncherStart/src/main/java/pro/gravit/launcher/start/ClientLauncherWrapper.java @@ -1,9 +1,7 @@ package pro.gravit.launcher.start; -import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.LauncherConfig; -import pro.gravit.launcher.client.runtime.client.DirBridge; -import pro.gravit.launcher.client.runtime.utils.DirWatcher; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.LauncherConfig; import pro.gravit.launcher.core.LauncherInject; import pro.gravit.utils.Version; import pro.gravit.utils.helper.*; @@ -105,16 +103,12 @@ public class ClientLauncherWrapper { context.executePath = IOHelper.resolveJavaBin(context.javaVersion.jvmDir); String pathLauncher = IOHelper.getCodeSource(ClientLauncherWrapper.class).toString(); - context.mainClass = "pro.gravit.launcher.LauncherEngineWrapper"; + context.mainClass = "pro.gravit.launcher.runtime.LauncherEngineWrapper"; context.memoryLimit = launcherMemoryLimit; context.classpath.add(pathLauncher); context.jvmProperties.put(LogHelper.DEBUG_PROPERTY, Boolean.toString(LogHelper.isDebugEnabled())); context.jvmProperties.put(LogHelper.STACKTRACE_PROPERTY, Boolean.toString(LogHelper.isStacktraceEnabled())); context.jvmProperties.put(LogHelper.DEV_PROPERTY, Boolean.toString(LogHelper.isDevEnabled())); - context.addSystemProperty(DirBridge.CUSTOMDIR_PROPERTY); - context.addSystemProperty(DirBridge.USE_CUSTOMDIR_PROPERTY); - context.addSystemProperty(DirBridge.USE_OPTDIR_PROPERTY); - context.addSystemProperty(DirWatcher.IGN_OVERFLOW); context.jvmModules.add("javafx.base"); context.jvmModules.add("javafx.graphics"); context.jvmModules.add("javafx.fxml"); diff --git a/LauncherStart/src/main/java/pro/gravit/launcher/start/RuntimeModuleManager.java b/LauncherStart/src/main/java/pro/gravit/launcher/start/RuntimeModuleManager.java index 8f5a350c..ab9640cf 100644 --- a/LauncherStart/src/main/java/pro/gravit/launcher/start/RuntimeModuleManager.java +++ b/LauncherStart/src/main/java/pro/gravit/launcher/start/RuntimeModuleManager.java @@ -1,9 +1,9 @@ package pro.gravit.launcher.start; -import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.base.Launcher; import pro.gravit.launcher.core.LauncherTrustManager; -import pro.gravit.launcher.modules.LauncherModule; -import pro.gravit.launcher.modules.impl.SimpleModuleManager; +import pro.gravit.launcher.base.modules.LauncherModule; +import pro.gravit.launcher.base.modules.impl.SimpleModuleManager; import java.nio.file.Path; import java.util.Collections; diff --git a/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java index 77faaa45..a1c7e6d5 100644 --- a/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java +++ b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java @@ -1,22 +1,22 @@ package pro.gravit.launcher.server; -import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.LauncherConfig; -import pro.gravit.launcher.client.api.AuthService; -import pro.gravit.launcher.client.api.ClientService; -import pro.gravit.launcher.client.api.ConfigService; -import pro.gravit.launcher.client.api.KeyService; -import pro.gravit.launcher.config.JsonConfigurable; -import pro.gravit.launcher.events.request.AuthRequestEvent; -import pro.gravit.launcher.events.request.ProfilesRequestEvent; -import pro.gravit.launcher.profiles.ClientProfile; -import pro.gravit.launcher.profiles.optional.actions.OptionalAction; -import pro.gravit.launcher.profiles.optional.triggers.OptionalTrigger; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.auth.AuthRequest; -import pro.gravit.launcher.request.auth.GetAvailabilityAuthRequest; -import pro.gravit.launcher.request.update.ProfilesRequest; -import pro.gravit.launcher.request.websockets.StdWebSocketService; +import pro.gravit.launcher.base.Launcher; +import pro.gravit.launcher.base.LauncherConfig; +import pro.gravit.launcher.base.api.AuthService; +import pro.gravit.launcher.base.api.ClientService; +import pro.gravit.launcher.base.api.ConfigService; +import pro.gravit.launcher.base.api.KeyService; +import pro.gravit.launcher.base.config.JsonConfigurable; +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.profiles.optional.actions.OptionalAction; +import pro.gravit.launcher.base.profiles.optional.triggers.OptionalTrigger; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.auth.AuthRequest; +import pro.gravit.launcher.base.request.auth.GetAvailabilityAuthRequest; +import pro.gravit.launcher.base.request.update.ProfilesRequest; +import pro.gravit.launcher.base.request.websockets.StdWebSocketService; import pro.gravit.launcher.server.authlib.InstallAuthlib; import pro.gravit.launcher.server.setup.ServerWrapperSetup; import pro.gravit.utils.helper.IOHelper; diff --git a/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapperGsonManager.java b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapperGsonManager.java index 3c20fe6b..48b5f35d 100644 --- a/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapperGsonManager.java +++ b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapperGsonManager.java @@ -2,7 +2,7 @@ package pro.gravit.launcher.server; import com.google.gson.GsonBuilder; import pro.gravit.launcher.core.managers.GsonManager; -import pro.gravit.launcher.request.websockets.ClientWebSocketService; +import pro.gravit.launcher.base.request.websockets.ClientWebSocketService; public class ServerWrapperGsonManager extends GsonManager { diff --git a/ServerWrapper/src/main/java/pro/gravit/launcher/server/setup/ServerWrapperSetup.java b/ServerWrapper/src/main/java/pro/gravit/launcher/server/setup/ServerWrapperSetup.java index 9f2e24da..336f4889 100644 --- a/ServerWrapper/src/main/java/pro/gravit/launcher/server/setup/ServerWrapperSetup.java +++ b/ServerWrapper/src/main/java/pro/gravit/launcher/server/setup/ServerWrapperSetup.java @@ -1,11 +1,11 @@ package pro.gravit.launcher.server.setup; -import pro.gravit.launcher.events.request.GetPublicKeyRequestEvent; -import pro.gravit.launcher.profiles.ClientProfile; -import pro.gravit.launcher.profiles.ClientProfileVersions; -import pro.gravit.launcher.request.Request; -import pro.gravit.launcher.request.auth.GetPublicKeyRequest; -import pro.gravit.launcher.request.websockets.StdWebSocketService; +import pro.gravit.launcher.base.events.request.GetPublicKeyRequestEvent; +import pro.gravit.launcher.base.profiles.ClientProfile; +import pro.gravit.launcher.base.profiles.ClientProfileVersions; +import pro.gravit.launcher.base.request.Request; +import pro.gravit.launcher.base.request.auth.GetPublicKeyRequest; +import pro.gravit.launcher.base.request.websockets.StdWebSocketService; import pro.gravit.launcher.server.ServerWrapper; import pro.gravit.utils.PublicURLClassLoader; import pro.gravit.utils.helper.IOHelper; diff --git a/build.gradle b/build.gradle index 30340061..a586a61d 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'org.openjfx.javafxplugin' version '0.0.10' apply false } group = 'pro.gravit.launcher' -version = '5.5.3' +version = '5.6.0-SNAPSHOT' apply from: 'props.gradle' diff --git a/modules b/modules index 9b1740cc..ee11966e 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 9b1740ccc426de8a8ac332545c64afbe9c17f89f +Subproject commit ee11966e12eaa7de3b4dfe07c8425da5deee1f16 diff --git a/settings.gradle b/settings.gradle index 9566cd8d..dfdf4434 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,6 @@ rootProject.name = 'GravitLauncher' include 'Launcher' -include 'LauncherModernCore' include 'LauncherCore' include 'LauncherAPI' include 'LauncherClient'