diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java index d016db56..3482f317 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java @@ -5,7 +5,7 @@ import pro.gravit.launcher.Launcher; import pro.gravit.launcher.events.RequestEvent; import pro.gravit.launcher.events.request.ProfilesRequestEvent; -import pro.gravit.launcher.managers.ConfigManager; +import pro.gravit.launcher.client.runtime.managers.ConfigManager; import pro.gravit.launcher.modules.events.ClosePhase; import pro.gravit.launcher.profiles.ClientProfile; import pro.gravit.launchserver.auth.AuthProviderPair; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java b/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java index 19b7b01d..3072b4cb 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import org.bouncycastle.jce.provider.BouncyCastleProvider; import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.LauncherTrustManager; +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; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/asm/InjectClassAcceptor.java b/LaunchServer/src/main/java/pro/gravit/launchserver/asm/InjectClassAcceptor.java index c0e6d454..a673bbe0 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/asm/InjectClassAcceptor.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/asm/InjectClassAcceptor.java @@ -4,8 +4,8 @@ import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; import org.objectweb.asm.tree.*; -import pro.gravit.launcher.LauncherInject; -import pro.gravit.launcher.LauncherInjectionConstructor; +import pro.gravit.launcher.core.LauncherInject; +import pro.gravit.launcher.core.LauncherInjectionConstructor; import pro.gravit.launchserver.binary.BuildContext; import pro.gravit.launchserver.binary.tasks.MainBuildTask; 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 6d00a5cc..069a5e3c 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/BuildContext.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/BuildContext.java @@ -3,8 +3,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.serialize.HOutput; -import pro.gravit.launcher.serialize.stream.StreamObject; +import pro.gravit.launcher.core.serialize.HOutput; +import pro.gravit.launcher.core.serialize.stream.StreamObject; import pro.gravit.launchserver.binary.tasks.MainBuildTask; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.SecurityHelper; 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 d76c0b59..e535b365 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 @@ -2,7 +2,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pro.gravit.launcher.LauncherTrustManager; +import pro.gravit.launcher.core.LauncherTrustManager; import pro.gravit.launcher.modules.LauncherModule; import pro.gravit.launcher.modules.LauncherModuleInfo; import pro.gravit.launchserver.LaunchServer; 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 de2555f0..df68ff85 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java @@ -3,7 +3,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.LauncherTrustManager; +import pro.gravit.launcher.core.LauncherTrustManager; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.asm.InjectClassAcceptor; import pro.gravit.launchserver.binary.tasks.MainBuildTask; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/CertificateManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/CertificateManager.java index 51f63436..fa822fcf 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/CertificateManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/CertificateManager.java @@ -11,7 +11,7 @@ import org.bouncycastle.util.io.pem.PemObject; import org.bouncycastle.util.io.pem.PemReader; import org.bouncycastle.util.io.pem.PemWriter; -import pro.gravit.launcher.LauncherTrustManager; +import pro.gravit.launcher.core.LauncherTrustManager; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.JVMHelper; 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 8b5e3c14..c3f4e575 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/LaunchServerGsonManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/LaunchServerGsonManager.java @@ -3,7 +3,7 @@ import com.google.gson.GsonBuilder; import marcono1234.gson.recordadapter.RecordTypeAdapterFactory; import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent; -import pro.gravit.launcher.managers.GsonManager; +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; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/UpdatesManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/UpdatesManager.java index 47e9f4f6..848fa27b 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/UpdatesManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/UpdatesManager.java @@ -2,9 +2,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pro.gravit.launcher.hasher.HashedDir; -import pro.gravit.launcher.serialize.HInput; -import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.core.hasher.HashedDir; +import pro.gravit.launcher.core.serialize.HInput; +import pro.gravit.launcher.core.serialize.HOutput; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.modules.events.LaunchServerUpdatesSyncEvent; import pro.gravit.utils.helper.IOHelper; 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 daa4b592..1149eaa6 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,6 +1,6 @@ package pro.gravit.launchserver.modules.impl; -import pro.gravit.launcher.LauncherTrustManager; +import pro.gravit.launcher.core.LauncherTrustManager; import pro.gravit.launcher.modules.LauncherModule; import pro.gravit.launcher.modules.impl.SimpleModuleManager; import pro.gravit.launchserver.LaunchServer; 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 47f12185..f1a3cd1e 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 @@ -2,7 +2,7 @@ import io.netty.channel.ChannelHandlerContext; import pro.gravit.launcher.events.request.UpdateRequestEvent; -import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.core.hasher.HashedDir; import pro.gravit.launchserver.auth.protect.interfaces.ProfilesProtectHandler; import pro.gravit.launchserver.config.LaunchServerConfig; import pro.gravit.launchserver.socket.Client; 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 03507d17..ca10f5fa 100644 --- a/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/proguard.cfg +++ b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/proguard.cfg @@ -16,19 +16,19 @@ -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.** --keep class 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.**, 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.request.**, pro.gravit.launcher.events.**, pro.gravit.launcher.profiles.**, pro.gravit.launcher.LauncherEngineWrapper { *; } --keepclassmembers @pro.gravit.launcher.LauncherNetworkAPI class ** { +-keepclassmembers @pro.gravit.launcher.core.LauncherNetworkAPI class ** { ; ; } -keepclassmembers class ** { - @pro.gravit.launcher.LauncherNetworkAPI + @pro.gravit.launcher.core.LauncherNetworkAPI ; - @pro.gravit.launcher.LauncherNetworkAPI + @pro.gravit.launcher.core.LauncherNetworkAPI ; } diff --git a/LaunchServer/src/test/java/pro/gravit/launchserver/ASMTransformersTest.java b/LaunchServer/src/test/java/pro/gravit/launchserver/ASMTransformersTest.java index 112fbc13..1d9d8e2d 100644 --- a/LaunchServer/src/test/java/pro/gravit/launchserver/ASMTransformersTest.java +++ b/LaunchServer/src/test/java/pro/gravit/launchserver/ASMTransformersTest.java @@ -6,7 +6,7 @@ import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.tree.ClassNode; -import pro.gravit.launcher.LauncherInject; +import pro.gravit.launcher.core.LauncherInject; import pro.gravit.launchserver.asm.InjectClassAcceptor; import pro.gravit.utils.helper.JarHelper; diff --git a/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/LauncherEngine.java similarity index 90% rename from Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/LauncherEngine.java index 6acaa780..9c4be3e3 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/LauncherEngine.java @@ -1,15 +1,21 @@ -package pro.gravit.launcher; +package pro.gravit.launcher.client.runtime; -import pro.gravit.launcher.client.*; -import pro.gravit.launcher.client.events.ClientEngineInitPhase; -import pro.gravit.launcher.client.events.ClientExitPhase; -import pro.gravit.launcher.client.events.ClientPreGuiPhase; -import pro.gravit.launcher.console.GetPublicKeyCommand; -import pro.gravit.launcher.console.ModulesCommand; -import pro.gravit.launcher.console.SignDataCommand; -import pro.gravit.launcher.gui.NoRuntimeProvider; -import pro.gravit.launcher.gui.RuntimeProvider; -import pro.gravit.launcher.managers.ConsoleManager; +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.core.LauncherTrustManager; import pro.gravit.launcher.modules.events.OfflineModeEvent; import pro.gravit.launcher.modules.events.PreConfigPhase; import pro.gravit.launcher.profiles.optional.actions.OptionalAction; @@ -20,7 +26,7 @@ import pro.gravit.launcher.request.auth.*; import pro.gravit.launcher.request.websockets.OfflineRequestService; import pro.gravit.launcher.request.websockets.StdWebSocketService; -import pro.gravit.launcher.utils.NativeJVMHalt; +import pro.gravit.launcher.start.RuntimeModuleManager; import pro.gravit.utils.helper.*; import java.io.IOException; diff --git a/Launcher/src/main/java/pro/gravit/launcher/LauncherEngineWrapper.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/LauncherEngineWrapper.java similarity index 94% rename from Launcher/src/main/java/pro/gravit/launcher/LauncherEngineWrapper.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/LauncherEngineWrapper.java index a637a571..01d588aa 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/LauncherEngineWrapper.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/LauncherEngineWrapper.java @@ -1,5 +1,6 @@ -package pro.gravit.launcher; +package pro.gravit.launcher.client.runtime; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.launch.LaunchOptions; import pro.gravit.utils.launch.ModuleLaunch; diff --git a/Launcher/src/main/java/pro/gravit/launcher/NewLauncherSettings.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/NewLauncherSettings.java similarity index 54% rename from Launcher/src/main/java/pro/gravit/launcher/NewLauncherSettings.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/NewLauncherSettings.java index e7019d0a..bcb5c355 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/NewLauncherSettings.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/NewLauncherSettings.java @@ -1,12 +1,9 @@ -package pro.gravit.launcher; +package pro.gravit.launcher.client.runtime; -import pro.gravit.launcher.client.UserSettings; -import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.client.runtime.client.UserSettings; +import pro.gravit.launcher.core.LauncherNetworkAPI; -import java.nio.file.Path; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; public class NewLauncherSettings { diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherProcess.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherProcess.java similarity index 94% rename from Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherProcess.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherProcess.java index a224e176..29b42036 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherProcess.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherProcess.java @@ -1,20 +1,20 @@ -package pro.gravit.launcher.client; +package pro.gravit.launcher.client.runtime.client; import pro.gravit.launcher.Launcher; import pro.gravit.launcher.LauncherConfig; -import pro.gravit.launcher.LauncherEngine; -import pro.gravit.launcher.client.events.client.ClientProcessBuilderCreateEvent; -import pro.gravit.launcher.client.events.client.ClientProcessBuilderLaunchedEvent; -import pro.gravit.launcher.client.events.client.ClientProcessBuilderParamsWrittedEvent; -import pro.gravit.launcher.client.events.client.ClientProcessBuilderPreLaunchEvent; -import pro.gravit.launcher.hasher.HashedDir; +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.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.serialize.HOutput; +import pro.gravit.launcher.core.serialize.HOutput; import pro.gravit.utils.helper.*; import java.io.File; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/RuntimeGsonManager.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/RuntimeGsonManager.java similarity index 83% rename from Launcher/src/main/java/pro/gravit/launcher/client/RuntimeGsonManager.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/RuntimeGsonManager.java index b8789cf4..0ea95006 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/RuntimeGsonManager.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/RuntimeGsonManager.java @@ -1,7 +1,8 @@ -package pro.gravit.launcher.client; +package pro.gravit.launcher.client.runtime.client; import com.google.gson.GsonBuilder; -import pro.gravit.launcher.managers.GsonManager; +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.utils.UniversalJsonAdapter; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/RuntimeLauncherCoreModule.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/RuntimeLauncherCoreModule.java similarity index 90% rename from Launcher/src/main/java/pro/gravit/launcher/client/RuntimeLauncherCoreModule.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/RuntimeLauncherCoreModule.java index 76b85182..6b948c01 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/RuntimeLauncherCoreModule.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/RuntimeLauncherCoreModule.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.client; +package pro.gravit.launcher.client.runtime.client; import pro.gravit.launcher.modules.LauncherInitContext; import pro.gravit.launcher.modules.LauncherModule; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/ServerPinger.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/ServerPinger.java similarity index 98% rename from Launcher/src/main/java/pro/gravit/launcher/client/ServerPinger.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/ServerPinger.java index c798f3d3..f0a83ea1 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/ServerPinger.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/ServerPinger.java @@ -1,12 +1,12 @@ -package pro.gravit.launcher.client; +package pro.gravit.launcher.client.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.serialize.HInput; -import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.core.serialize.HInput; +import pro.gravit.launcher.core.serialize.HOutput; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.LogHelper; import pro.gravit.utils.helper.VerifyHelper; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/UserSettings.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/UserSettings.java similarity index 74% rename from Launcher/src/main/java/pro/gravit/launcher/client/UserSettings.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/UserSettings.java index 1f6fb9b5..6a9b0c9d 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/UserSettings.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/UserSettings.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.client; +package pro.gravit.launcher.client.runtime.client; import pro.gravit.utils.ProviderMap; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/events/ClientEngineInitPhase.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientEngineInitPhase.java similarity index 68% rename from Launcher/src/main/java/pro/gravit/launcher/client/events/ClientEngineInitPhase.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientEngineInitPhase.java index b877971f..1a54cc43 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/events/ClientEngineInitPhase.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientEngineInitPhase.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.events; +package pro.gravit.launcher.client.runtime.client.events; -import pro.gravit.launcher.LauncherEngine; +import pro.gravit.launcher.client.runtime.LauncherEngine; import pro.gravit.launcher.modules.events.InitPhase; public class ClientEngineInitPhase extends InitPhase { diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/events/ClientGuiPhase.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientGuiPhase.java similarity index 69% rename from Launcher/src/main/java/pro/gravit/launcher/client/events/ClientGuiPhase.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientGuiPhase.java index 2e70f857..daee9373 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/events/ClientGuiPhase.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientGuiPhase.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.events; +package pro.gravit.launcher.client.runtime.client.events; -import pro.gravit.launcher.gui.RuntimeProvider; +import pro.gravit.launcher.client.runtime.gui.RuntimeProvider; import pro.gravit.launcher.modules.LauncherModule; public class ClientGuiPhase extends LauncherModule.Event { diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/events/ClientPreGuiPhase.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientPreGuiPhase.java similarity index 69% rename from Launcher/src/main/java/pro/gravit/launcher/client/events/ClientPreGuiPhase.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientPreGuiPhase.java index ebbad380..e3bce78d 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/events/ClientPreGuiPhase.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientPreGuiPhase.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.events; +package pro.gravit.launcher.client.runtime.client.events; -import pro.gravit.launcher.gui.RuntimeProvider; +import pro.gravit.launcher.client.runtime.gui.RuntimeProvider; import pro.gravit.launcher.modules.LauncherModule; public class ClientPreGuiPhase extends LauncherModule.Event { diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/events/ClientUnlockConsoleEvent.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientUnlockConsoleEvent.java similarity index 84% rename from Launcher/src/main/java/pro/gravit/launcher/client/events/ClientUnlockConsoleEvent.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientUnlockConsoleEvent.java index 2bf5ba5b..814b5729 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/events/ClientUnlockConsoleEvent.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientUnlockConsoleEvent.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.client.events; +package pro.gravit.launcher.client.runtime.client.events; import pro.gravit.launcher.modules.LauncherModule; import pro.gravit.utils.command.CommandHandler; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessBuilderCreateEvent.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderCreateEvent.java similarity index 70% rename from Launcher/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessBuilderCreateEvent.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderCreateEvent.java index 2fe33846..7df12606 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessBuilderCreateEvent.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderCreateEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.events.client; +package pro.gravit.launcher.client.runtime.client.events.client; -import pro.gravit.launcher.client.ClientLauncherProcess; +import pro.gravit.launcher.client.runtime.client.ClientLauncherProcess; import pro.gravit.launcher.modules.LauncherModule; public class ClientProcessBuilderCreateEvent extends LauncherModule.Event { diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessBuilderLaunchedEvent.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderLaunchedEvent.java similarity index 70% rename from Launcher/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessBuilderLaunchedEvent.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderLaunchedEvent.java index dc5e4ffc..5383f328 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessBuilderLaunchedEvent.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderLaunchedEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.events.client; +package pro.gravit.launcher.client.runtime.client.events.client; -import pro.gravit.launcher.client.ClientLauncherProcess; +import pro.gravit.launcher.client.runtime.client.ClientLauncherProcess; import pro.gravit.launcher.modules.LauncherModule; public class ClientProcessBuilderLaunchedEvent extends LauncherModule.Event { diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessBuilderParamsWrittedEvent.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderParamsWrittedEvent.java similarity index 69% rename from Launcher/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessBuilderParamsWrittedEvent.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderParamsWrittedEvent.java index bb535568..469d92ad 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessBuilderParamsWrittedEvent.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderParamsWrittedEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.events.client; +package pro.gravit.launcher.client.runtime.client.events.client; -import pro.gravit.launcher.client.ClientLauncherProcess; +import pro.gravit.launcher.client.runtime.client.ClientLauncherProcess; import pro.gravit.launcher.modules.LauncherModule; public class ClientProcessBuilderParamsWrittedEvent extends LauncherModule.Event { diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessBuilderPreLaunchEvent.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderPreLaunchEvent.java similarity index 70% rename from Launcher/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessBuilderPreLaunchEvent.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderPreLaunchEvent.java index 2b9b1025..188bd42d 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessBuilderPreLaunchEvent.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderPreLaunchEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.events.client; +package pro.gravit.launcher.client.runtime.client.events.client; -import pro.gravit.launcher.client.ClientLauncherProcess; +import pro.gravit.launcher.client.runtime.client.ClientLauncherProcess; import pro.gravit.launcher.modules.LauncherModule; public class ClientProcessBuilderPreLaunchEvent extends LauncherModule.Event { diff --git a/Launcher/src/main/java/pro/gravit/launcher/console/GetPublicKeyCommand.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/GetPublicKeyCommand.java similarity index 86% rename from Launcher/src/main/java/pro/gravit/launcher/console/GetPublicKeyCommand.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/GetPublicKeyCommand.java index e20313fc..7a63a5eb 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/console/GetPublicKeyCommand.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/GetPublicKeyCommand.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.console; +package pro.gravit.launcher.client.runtime.console; -import pro.gravit.launcher.LauncherEngine; +import pro.gravit.launcher.client.runtime.LauncherEngine; import pro.gravit.utils.command.Command; import pro.gravit.utils.helper.LogHelper; diff --git a/Launcher/src/main/java/pro/gravit/launcher/console/ModulesCommand.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/ModulesCommand.java similarity index 88% rename from Launcher/src/main/java/pro/gravit/launcher/console/ModulesCommand.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/ModulesCommand.java index 94b03799..e4d42437 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/console/ModulesCommand.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/ModulesCommand.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.console; +package pro.gravit.launcher.client.runtime.console; -import pro.gravit.launcher.LauncherEngine; -import pro.gravit.launcher.LauncherTrustManager; -import pro.gravit.launcher.managers.ConsoleManager; +import pro.gravit.launcher.client.runtime.LauncherEngine; +import pro.gravit.launcher.client.runtime.managers.ConsoleManager; +import pro.gravit.launcher.core.LauncherTrustManager; import pro.gravit.launcher.modules.LauncherModule; import pro.gravit.launcher.modules.LauncherModuleInfo; import pro.gravit.utils.command.Command; diff --git a/Launcher/src/main/java/pro/gravit/launcher/console/SignDataCommand.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/SignDataCommand.java similarity index 88% rename from Launcher/src/main/java/pro/gravit/launcher/console/SignDataCommand.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/SignDataCommand.java index 2757a64a..f74051cb 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/console/SignDataCommand.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/SignDataCommand.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.console; +package pro.gravit.launcher.client.runtime.console; -import pro.gravit.launcher.LauncherEngine; +import pro.gravit.launcher.client.runtime.LauncherEngine; import pro.gravit.utils.command.Command; import pro.gravit.utils.helper.LogHelper; diff --git a/Launcher/src/main/java/pro/gravit/launcher/console/UnlockCommand.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/UnlockCommand.java similarity index 82% rename from Launcher/src/main/java/pro/gravit/launcher/console/UnlockCommand.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/UnlockCommand.java index 6d678051..4e1677c5 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/console/UnlockCommand.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/UnlockCommand.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.console; +package pro.gravit.launcher.client.runtime.console; -import pro.gravit.launcher.managers.ConsoleManager; -import pro.gravit.launcher.managers.SettingsManager; +import pro.gravit.launcher.client.runtime.managers.ConsoleManager; +import pro.gravit.launcher.client.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/console/test/PrintHardwareInfoCommand.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/test/PrintHardwareInfoCommand.java similarity index 95% rename from Launcher/src/main/java/pro/gravit/launcher/console/test/PrintHardwareInfoCommand.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/test/PrintHardwareInfoCommand.java index 93bbe490..3c4a3112 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/console/test/PrintHardwareInfoCommand.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/test/PrintHardwareInfoCommand.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.console.test; +package pro.gravit.launcher.client.runtime.console.test; -import pro.gravit.launcher.utils.HWIDProvider; +import pro.gravit.launcher.client.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/debug/ClientRuntimeProvider.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/ClientRuntimeProvider.java similarity index 96% rename from Launcher/src/main/java/pro/gravit/launcher/debug/ClientRuntimeProvider.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/ClientRuntimeProvider.java index f9a1a682..254bbce9 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/debug/ClientRuntimeProvider.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/ClientRuntimeProvider.java @@ -1,13 +1,13 @@ -package pro.gravit.launcher.debug; +package pro.gravit.launcher.client.runtime.debug; import pro.gravit.launcher.ClientPermissions; import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.LauncherEngine; -import pro.gravit.launcher.api.AuthService; -import pro.gravit.launcher.api.ClientService; +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.gui.RuntimeProvider; import pro.gravit.launcher.profiles.ClientProfile; import pro.gravit.launcher.request.Request; import pro.gravit.launcher.request.auth.AuthRequest; diff --git a/Launcher/src/main/java/pro/gravit/launcher/debug/DebugLauncherTrustManager.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/DebugLauncherTrustManager.java similarity index 89% rename from Launcher/src/main/java/pro/gravit/launcher/debug/DebugLauncherTrustManager.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/DebugLauncherTrustManager.java index e49d79d2..3be634d1 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/debug/DebugLauncherTrustManager.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/DebugLauncherTrustManager.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.debug; +package pro.gravit.launcher.client.runtime.debug; -import pro.gravit.launcher.LauncherTrustManager; +import pro.gravit.launcher.core.LauncherTrustManager; import java.security.cert.X509Certificate; diff --git a/Launcher/src/main/java/pro/gravit/launcher/debug/DebugMain.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/DebugMain.java similarity index 92% rename from Launcher/src/main/java/pro/gravit/launcher/debug/DebugMain.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/DebugMain.java index e3529e76..39b33d2f 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/debug/DebugMain.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/DebugMain.java @@ -1,12 +1,12 @@ -package pro.gravit.launcher.debug; +package pro.gravit.launcher.client.runtime.debug; -import pro.gravit.launcher.ClientLauncherMethods; import pro.gravit.launcher.Launcher; import pro.gravit.launcher.LauncherConfig; -import pro.gravit.launcher.LauncherEngine; -import pro.gravit.launcher.client.RuntimeLauncherCoreModule; -import pro.gravit.launcher.client.RuntimeModuleManager; -import pro.gravit.launcher.managers.ConsoleManager; +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.start.RuntimeModuleManager; import pro.gravit.launcher.modules.LauncherModule; import pro.gravit.launcher.modules.events.OfflineModeEvent; import pro.gravit.launcher.modules.events.PreConfigPhase; diff --git a/Launcher/src/main/java/pro/gravit/launcher/gui/NoRuntimeProvider.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/gui/NoRuntimeProvider.java similarity index 89% rename from Launcher/src/main/java/pro/gravit/launcher/gui/NoRuntimeProvider.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/gui/NoRuntimeProvider.java index 14e75afb..46ea445c 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/gui/NoRuntimeProvider.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/gui/NoRuntimeProvider.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.gui; +package pro.gravit.launcher.client.runtime.gui; import javax.swing.*; diff --git a/Launcher/src/main/java/pro/gravit/launcher/gui/RuntimeProvider.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/gui/RuntimeProvider.java similarity index 72% rename from Launcher/src/main/java/pro/gravit/launcher/gui/RuntimeProvider.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/gui/RuntimeProvider.java index bee04f48..08f12cb2 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/gui/RuntimeProvider.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/gui/RuntimeProvider.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.gui; +package pro.gravit.launcher.client.runtime.gui; public interface RuntimeProvider { void run(String[] args); diff --git a/Launcher/src/main/java/pro/gravit/launcher/managers/ConsoleManager.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/managers/ConsoleManager.java similarity index 87% rename from Launcher/src/main/java/pro/gravit/launcher/managers/ConsoleManager.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/managers/ConsoleManager.java index bffca63e..0a13e180 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/managers/ConsoleManager.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/managers/ConsoleManager.java @@ -1,10 +1,10 @@ -package pro.gravit.launcher.managers; +package pro.gravit.launcher.client.runtime.managers; import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.LauncherEngine; -import pro.gravit.launcher.client.events.ClientUnlockConsoleEvent; -import pro.gravit.launcher.console.UnlockCommand; -import pro.gravit.launcher.console.test.PrintHardwareInfoCommand; +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.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/managers/SettingsManager.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/managers/SettingsManager.java similarity index 64% rename from Launcher/src/main/java/pro/gravit/launcher/managers/SettingsManager.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/managers/SettingsManager.java index 54185d6f..bff7307b 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/managers/SettingsManager.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/managers/SettingsManager.java @@ -1,21 +1,10 @@ -package pro.gravit.launcher.managers; +package pro.gravit.launcher.client.runtime.managers; -import pro.gravit.launcher.NewLauncherSettings; -import pro.gravit.launcher.client.DirBridge; +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.hasher.HashedDir; -import pro.gravit.launcher.serialize.HInput; -import pro.gravit.launcher.serialize.HOutput; -import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.LogHelper; -import java.io.IOException; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.attribute.BasicFileAttributes; - public class SettingsManager extends JsonConfigurable { public static NewLauncherSettings settings; diff --git a/Launcher/src/main/java/pro/gravit/launcher/utils/HWIDProvider.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/utils/HWIDProvider.java similarity index 98% rename from Launcher/src/main/java/pro/gravit/launcher/utils/HWIDProvider.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/utils/HWIDProvider.java index 2cc8dd06..31e7b261 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/utils/HWIDProvider.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/utils/HWIDProvider.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.utils; +package pro.gravit.launcher.client.runtime.utils; import oshi.SystemInfo; import oshi.hardware.*; diff --git a/Launcher/src/main/java/pro/gravit/launcher/utils/LauncherUpdater.java b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/utils/LauncherUpdater.java similarity index 95% rename from Launcher/src/main/java/pro/gravit/launcher/utils/LauncherUpdater.java rename to Launcher/src/main/java/pro/gravit/launcher/client/runtime/utils/LauncherUpdater.java index f2712a0e..f4998402 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/utils/LauncherUpdater.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/runtime/utils/LauncherUpdater.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.utils; +package pro.gravit.launcher.client.runtime.utils; -import pro.gravit.launcher.LauncherEngine; -import pro.gravit.launcher.LauncherInject; +import pro.gravit.launcher.client.runtime.LauncherEngine; +import pro.gravit.launcher.core.LauncherInject; import pro.gravit.launcher.request.update.LauncherRequest; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.LogHelper; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/ClientPermissions.java b/LauncherAPI/src/main/java/pro/gravit/launcher/ClientPermissions.java index e42164cc..6edb6178 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/ClientPermissions.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/ClientPermissions.java @@ -1,5 +1,7 @@ package pro.gravit.launcher; +import pro.gravit.launcher.core.LauncherNetworkAPI; + import java.util.*; public class ClientPermissions { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/Launcher.java b/LauncherAPI/src/main/java/pro/gravit/launcher/Launcher.java index 165f2bfb..261053be 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/Launcher.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/Launcher.java @@ -1,8 +1,8 @@ package pro.gravit.launcher; -import pro.gravit.launcher.managers.GsonManager; +import pro.gravit.launcher.core.managers.GsonManager; import pro.gravit.launcher.profiles.ClientProfile; -import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.core.serialize.HInput; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.JVMHelper; import pro.gravit.utils.helper.LogHelper; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/LauncherConfig.java b/LauncherAPI/src/main/java/pro/gravit/launcher/LauncherConfig.java index 10fbcea4..19e26ccd 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/LauncherConfig.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/LauncherConfig.java @@ -1,10 +1,13 @@ package pro.gravit.launcher; +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.serialize.HInput; -import pro.gravit.launcher.serialize.HOutput; -import pro.gravit.launcher.serialize.stream.StreamObject; +import pro.gravit.launcher.core.serialize.HInput; +import pro.gravit.launcher.core.serialize.HOutput; +import pro.gravit.launcher.core.serialize.stream.StreamObject; import pro.gravit.utils.helper.JVMHelper; import pro.gravit.utils.helper.LogHelper; import pro.gravit.utils.helper.SecurityHelper; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/api/AuthService.java b/LauncherAPI/src/main/java/pro/gravit/launcher/client/api/AuthService.java similarity index 94% rename from LauncherAPI/src/main/java/pro/gravit/launcher/api/AuthService.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/client/api/AuthService.java index 0020d954..529c3b5b 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/api/AuthService.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/client/api/AuthService.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.api; +package pro.gravit.launcher.client.api; import pro.gravit.launcher.ClientPermissions; import pro.gravit.launcher.profiles.ClientProfile; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/api/ClientService.java b/LauncherAPI/src/main/java/pro/gravit/launcher/client/api/ClientService.java similarity index 93% rename from LauncherAPI/src/main/java/pro/gravit/launcher/api/ClientService.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/client/api/ClientService.java index 50c3a8da..f7964574 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/api/ClientService.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/client/api/ClientService.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.api; +package pro.gravit.launcher.client.api; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.JVMHelper; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/api/ConfigService.java b/LauncherAPI/src/main/java/pro/gravit/launcher/client/api/ConfigService.java similarity index 88% rename from LauncherAPI/src/main/java/pro/gravit/launcher/api/ConfigService.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/client/api/ConfigService.java index 01bafb3d..afa438f7 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/api/ConfigService.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/client/api/ConfigService.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.api; +package pro.gravit.launcher.client.api; public class ConfigService { public static boolean disableLogging; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/api/KeyService.java b/LauncherAPI/src/main/java/pro/gravit/launcher/client/api/KeyService.java similarity index 84% rename from LauncherAPI/src/main/java/pro/gravit/launcher/api/KeyService.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/client/api/KeyService.java index 5976d4f8..4b3eac7e 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/api/KeyService.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/client/api/KeyService.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.api; +package pro.gravit.launcher.client.api; import java.security.interfaces.ECPublicKey; import java.security.interfaces.RSAPublicKey; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/managers/ConfigManager.java b/LauncherAPI/src/main/java/pro/gravit/launcher/client/runtime/managers/ConfigManager.java similarity index 96% rename from LauncherAPI/src/main/java/pro/gravit/launcher/managers/ConfigManager.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/client/runtime/managers/ConfigManager.java index cda96970..a1843aaf 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/managers/ConfigManager.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/client/runtime/managers/ConfigManager.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.managers; +package pro.gravit.launcher.client.runtime.managers; import pro.gravit.launcher.config.JsonConfigurable; import pro.gravit.utils.helper.LogHelper; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/managers/SimpleModulesConfigManager.java b/LauncherAPI/src/main/java/pro/gravit/launcher/client/runtime/managers/SimpleModulesConfigManager.java similarity index 95% rename from LauncherAPI/src/main/java/pro/gravit/launcher/managers/SimpleModulesConfigManager.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/client/runtime/managers/SimpleModulesConfigManager.java index 4e954886..3a57e209 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/managers/SimpleModulesConfigManager.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/client/runtime/managers/SimpleModulesConfigManager.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.managers; +package pro.gravit.launcher.client.runtime.managers; import pro.gravit.launcher.config.SimpleConfigurable; import pro.gravit.launcher.modules.ModulesConfigManager; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/NotificationEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/NotificationEvent.java index a5fef64b..3b492876 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/NotificationEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/NotificationEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.events; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.request.WebSocketEvent; public class NotificationEvent implements WebSocketEvent { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/RequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/RequestEvent.java index 60323f61..627ec74b 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/RequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/RequestEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.events; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.request.WebSocketEvent; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AuthRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AuthRequestEvent.java index 3881ebe7..0a614634 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AuthRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AuthRequestEvent.java @@ -1,7 +1,7 @@ package pro.gravit.launcher.events.request; import pro.gravit.launcher.ClientPermissions; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.events.RequestEvent; import pro.gravit.launcher.profiles.PlayerProfile; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/BatchProfileByUsernameRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/BatchProfileByUsernameRequestEvent.java index c6d57f94..1bf0aad0 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/BatchProfileByUsernameRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/BatchProfileByUsernameRequestEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.events.request; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.events.RequestEvent; import pro.gravit.launcher.profiles.PlayerProfile; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/CheckServerRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/CheckServerRequestEvent.java index 47a78f93..c66ee020 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/CheckServerRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/CheckServerRequestEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.events.request; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.events.RequestEvent; import pro.gravit.launcher.profiles.PlayerProfile; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ErrorRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ErrorRequestEvent.java index e8c3b822..9bb510d8 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ErrorRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ErrorRequestEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.events.request; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.events.RequestEvent; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java index c0768207..629c82a4 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.events.request; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.events.RequestEvent; import pro.gravit.utils.TypeSerializeInterface; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/JoinServerRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/JoinServerRequestEvent.java index dc13f759..519c2c8d 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/JoinServerRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/JoinServerRequestEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.events.request; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.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/events/request/LauncherRequestEvent.java index 17d94488..9802973b 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/LauncherRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/LauncherRequestEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.events.request; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.events.ExtendedTokenRequestEvent; import pro.gravit.launcher.events.RequestEvent; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUUIDRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUUIDRequestEvent.java index b2bad307..33c9aa43 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUUIDRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUUIDRequestEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.events.request; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.events.RequestEvent; import pro.gravit.launcher.profiles.PlayerProfile; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUsernameRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUsernameRequestEvent.java index 6c3c532c..6675cdc7 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUsernameRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUsernameRequestEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.events.request; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.events.RequestEvent; import pro.gravit.launcher.profiles.PlayerProfile; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfilesRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfilesRequestEvent.java index 383becab..626f282e 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfilesRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfilesRequestEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.events.request; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.events.RequestEvent; import pro.gravit.launcher.profiles.ClientProfile; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/SetProfileRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/SetProfileRequestEvent.java index 6596ac9a..7dd5cbe1 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/SetProfileRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/SetProfileRequestEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.events.request; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.events.RequestEvent; import pro.gravit.launcher.profiles.ClientProfile; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateListRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateListRequestEvent.java index 5f54432c..7cfbc2ba 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateListRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateListRequestEvent.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.events.request; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.events.RequestEvent; import java.util.HashSet; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateRequestEvent.java index e5f357f8..8c98b284 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateRequestEvent.java @@ -1,8 +1,8 @@ package pro.gravit.launcher.events.request; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.events.RequestEvent; -import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.core.hasher.HashedDir; public class UpdateRequestEvent extends RequestEvent { @LauncherNetworkAPI diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherModule.java b/LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherModule.java index 65ed59a4..26eee8be 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherModule.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherModule.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.modules; -import pro.gravit.launcher.LauncherTrustManager; +import pro.gravit.launcher.core.LauncherTrustManager; import pro.gravit.utils.Version; import java.util.ArrayList; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/impl/SimpleModuleManager.java b/LauncherAPI/src/main/java/pro/gravit/launcher/modules/impl/SimpleModuleManager.java index 773e2f72..f754e6c8 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/modules/impl/SimpleModuleManager.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/modules/impl/SimpleModuleManager.java @@ -1,7 +1,7 @@ package pro.gravit.launcher.modules.impl; -import pro.gravit.launcher.LauncherTrustManager; -import pro.gravit.launcher.managers.SimpleModulesConfigManager; +import pro.gravit.launcher.core.LauncherTrustManager; +import pro.gravit.launcher.client.runtime.managers.SimpleModulesConfigManager; import pro.gravit.launcher.modules.*; import pro.gravit.utils.PublicURLClassLoader; import pro.gravit.utils.Version; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java index 70d9dd2a..dd789dbc 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java @@ -1,8 +1,8 @@ package pro.gravit.launcher.profiles; import com.google.gson.*; -import pro.gravit.launcher.LauncherNetworkAPI; -import pro.gravit.launcher.hasher.FileNameMatcher; +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; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/Texture.java b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/Texture.java index f4a070d9..1e4a637e 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/Texture.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/Texture.java @@ -1,7 +1,7 @@ package pro.gravit.launcher.profiles; -import pro.gravit.launcher.serialize.HOutput; -import pro.gravit.launcher.serialize.stream.StreamObject; +import pro.gravit.launcher.core.serialize.HOutput; +import pro.gravit.launcher.core.serialize.stream.StreamObject; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.SecurityHelper; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalDepend.java b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalDepend.java index c5acde22..55c7c0a5 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalDepend.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalDepend.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.profiles.optional; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; public class OptionalDepend { @LauncherNetworkAPI diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalFile.java b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalFile.java index 36b57c83..1884e443 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalFile.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalFile.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.profiles.optional; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.profiles.optional.actions.OptionalAction; 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/profiles/optional/actions/OptionalActionFile.java index e2999b22..9f831635 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalActionFile.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalActionFile.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.profiles.optional.actions; -import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.core.hasher.HashedDir; import pro.gravit.utils.helper.LogHelper; import java.util.Map; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/Request.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/Request.java index 47de5f3a..991a638d 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/Request.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/Request.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.request; -import pro.gravit.launcher.LauncherNetworkAPI; +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; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/AuthRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/AuthRequest.java index 679ae5bb..da3081c2 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/AuthRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/AuthRequest.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.request.auth; -import pro.gravit.launcher.LauncherNetworkAPI; +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.*; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/CheckServerRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/CheckServerRequest.java index 9e3ff5f6..998fb903 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/CheckServerRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/CheckServerRequest.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.request.auth; -import pro.gravit.launcher.LauncherNetworkAPI; +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; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/JoinServerRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/JoinServerRequest.java index 54c8df02..685c171d 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/JoinServerRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/JoinServerRequest.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.request.auth; -import pro.gravit.launcher.LauncherNetworkAPI; +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; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/SetProfileRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/SetProfileRequest.java index 3c72b502..9948243c 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/SetProfileRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/SetProfileRequest.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.request.auth; -import pro.gravit.launcher.LauncherNetworkAPI; +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; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthAESPassword.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthAESPassword.java index 974afbec..545cd5a3 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthAESPassword.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthAESPassword.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.request.auth.password; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.request.auth.AuthRequest; public class AuthAESPassword implements AuthRequest.AuthPasswordInterface { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthPlainPassword.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthPlainPassword.java index 9e83e6a2..1f0714b1 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthPlainPassword.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthPlainPassword.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.request.auth.password; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.launcher.request.auth.AuthRequest; public class AuthPlainPassword implements AuthRequest.AuthPasswordInterface { diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/LauncherRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/LauncherRequest.java index b2345410..4e8d0be7 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/LauncherRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/LauncherRequest.java @@ -1,7 +1,7 @@ package pro.gravit.launcher.request.update; import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.LauncherNetworkAPI; +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; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateRequest.java index 9f82311b..b851b55c 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateRequest.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.request.update; -import pro.gravit.launcher.LauncherNetworkAPI; +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; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java index a3f1ab2e..8f4f3c4f 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.request.uuid; -import pro.gravit.launcher.LauncherNetworkAPI; +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; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUUIDRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUUIDRequest.java index 4531f85c..ea95fa98 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUUIDRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUUIDRequest.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.request.uuid; -import pro.gravit.launcher.LauncherNetworkAPI; +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; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUsernameRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUsernameRequest.java index d164b28e..784f710f 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUsernameRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUsernameRequest.java @@ -1,6 +1,6 @@ package pro.gravit.launcher.request.uuid; -import pro.gravit.launcher.LauncherNetworkAPI; +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; 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 index 255c3267..0afe1267 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientJSONPoint.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientJSONPoint.java @@ -14,8 +14,8 @@ import io.netty.handler.codec.http.websocketx.WebSocketVersion; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; -import pro.gravit.launcher.CertificatePinningTrustManager; -import pro.gravit.launcher.LauncherInject; +import pro.gravit.launcher.core.CertificatePinningTrustManager; +import pro.gravit.launcher.core.LauncherInject; import pro.gravit.utils.helper.LogHelper; import javax.net.ssl.SSLException; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientWebSocketService.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientWebSocketService.java index c7c269fa..5d18b124 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientWebSocketService.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientWebSocketService.java @@ -5,8 +5,8 @@ import pro.gravit.launcher.Launcher; import pro.gravit.launcher.events.NotificationEvent; import pro.gravit.launcher.events.request.*; -import pro.gravit.launcher.hasher.HashedEntry; -import pro.gravit.launcher.hasher.HashedEntryAdapter; +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; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/BasicLauncherEventHandler.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/BasicLauncherEventHandler.java similarity index 94% rename from LauncherClient/src/main/java/pro/gravit/launcher/BasicLauncherEventHandler.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/BasicLauncherEventHandler.java index 3e5e5cd2..aea92c9d 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/BasicLauncherEventHandler.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/BasicLauncherEventHandler.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher; +package pro.gravit.launcher.client; -import pro.gravit.launcher.api.DialogService; +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; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/ClientLauncherMethods.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherMethods.java similarity index 92% rename from LauncherClient/src/main/java/pro/gravit/launcher/ClientLauncherMethods.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherMethods.java index 3715b1e5..2774a122 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/ClientLauncherMethods.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherMethods.java @@ -1,10 +1,12 @@ -package pro.gravit.launcher; +package pro.gravit.launcher.client; -import pro.gravit.launcher.client.ClientGsonManager; -import pro.gravit.launcher.client.ClientLauncherEntryPoint; -import pro.gravit.launcher.client.ClientModuleManager; -import pro.gravit.launcher.client.ClientParams; -import pro.gravit.launcher.client.events.ClientExitPhase; +import pro.gravit.launcher.Launcher; +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; @@ -21,7 +23,7 @@ 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.utils.NativeJVMHalt; +import pro.gravit.launcher.client.runtime.utils.NativeJVMHalt; import pro.gravit.utils.helper.JVMHelper; import java.security.cert.X509Certificate; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/LauncherAgent.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/LauncherAgent.java similarity index 94% rename from LauncherClient/src/main/java/pro/gravit/launcher/LauncherAgent.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/LauncherAgent.java index 63d96485..27924bba 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/LauncherAgent.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/LauncherAgent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher; +package pro.gravit.launcher.client; -import pro.gravit.launcher.utils.NativeJVMHalt; +import pro.gravit.launcher.client.runtime.utils.NativeJVMHalt; import pro.gravit.utils.helper.LogHelper; import java.io.File; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/api/CertificateService.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/api/CertificateService.java similarity index 94% rename from LauncherClient/src/main/java/pro/gravit/launcher/api/CertificateService.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/api/CertificateService.java index b21cb0b5..1bfbe960 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/api/CertificateService.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/api/CertificateService.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.api; +package pro.gravit.launcher.client.api; -import pro.gravit.launcher.ClientLauncherMethods; -import pro.gravit.launcher.LauncherTrustManager; -import pro.gravit.launcher.utils.ApiBridgeService; +import pro.gravit.launcher.client.ClientLauncherMethods; +import pro.gravit.launcher.core.LauncherTrustManager; +import pro.gravit.launcher.client.runtime.utils.ApiBridgeService; import java.security.cert.X509Certificate; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/api/DialogService.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/api/DialogService.java similarity index 98% rename from LauncherClient/src/main/java/pro/gravit/launcher/api/DialogService.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/api/DialogService.java index 7180c757..0132ef3d 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/api/DialogService.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/api/DialogService.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.api; +package pro.gravit.launcher.client.api; import pro.gravit.launcher.events.NotificationEvent; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/api/SystemService.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/api/SystemService.java similarity index 69% rename from LauncherClient/src/main/java/pro/gravit/launcher/api/SystemService.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/api/SystemService.java index 9d8aed49..4b7f2674 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/api/SystemService.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/api/SystemService.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.api; +package pro.gravit.launcher.client.api; -import pro.gravit.launcher.ClientLauncherMethods; +import pro.gravit.launcher.client.ClientLauncherMethods; public class SystemService { private SystemService() { diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientGsonManager.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientGsonManager.java similarity index 85% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/ClientGsonManager.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientGsonManager.java index bcd99ccc..9a503091 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientGsonManager.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientGsonManager.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.client; +package pro.gravit.launcher.client.runtime.client; import com.google.gson.GsonBuilder; -import pro.gravit.launcher.managers.GsonManager; +import pro.gravit.launcher.core.managers.GsonManager; import pro.gravit.launcher.modules.events.PreGsonPhase; import pro.gravit.launcher.request.websockets.ClientWebSocketService; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherCoreModule.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherCoreModule.java similarity index 90% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherCoreModule.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherCoreModule.java index 21e3c8af..5dd32863 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherCoreModule.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherCoreModule.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.client; +package pro.gravit.launcher.client.runtime.client; import pro.gravit.launcher.modules.LauncherInitContext; import pro.gravit.launcher.modules.LauncherModule; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherEntryPoint.java similarity index 95% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherEntryPoint.java index 15436bd5..e73b31cb 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherEntryPoint.java @@ -1,13 +1,16 @@ -package pro.gravit.launcher.client; +package pro.gravit.launcher.client.runtime.client; import pro.gravit.launcher.*; -import pro.gravit.launcher.api.AuthService; -import pro.gravit.launcher.api.ClientService; -import pro.gravit.launcher.api.KeyService; -import pro.gravit.launcher.client.events.client.*; -import pro.gravit.launcher.hasher.FileNameMatcher; -import pro.gravit.launcher.hasher.HashedDir; -import pro.gravit.launcher.hasher.HashedEntry; +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.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; @@ -18,8 +21,8 @@ import pro.gravit.launcher.request.RequestException; import pro.gravit.launcher.request.RequestService; import pro.gravit.launcher.request.websockets.StdWebSocketService; -import pro.gravit.launcher.serialize.HInput; -import pro.gravit.launcher.utils.DirWatcher; +import pro.gravit.launcher.core.serialize.HInput; +import pro.gravit.launcher.client.runtime.utils.DirWatcher; import pro.gravit.utils.helper.*; import pro.gravit.utils.launch.*; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientModuleManager.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientModuleManager.java similarity index 90% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/ClientModuleManager.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientModuleManager.java index 648685e7..046cbc33 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientModuleManager.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientModuleManager.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.client; +package pro.gravit.launcher.client.runtime.client; import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.LauncherTrustManager; +import pro.gravit.launcher.core.LauncherTrustManager; import pro.gravit.launcher.modules.LauncherModule; import pro.gravit.launcher.modules.impl.SimpleModuleManager; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientParams.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientParams.java similarity index 97% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/ClientParams.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientParams.java index da72aba6..e8047887 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/ClientParams.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientParams.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.client; +package pro.gravit.launcher.client.runtime.client; import pro.gravit.launcher.Launcher; import pro.gravit.launcher.events.request.AuthRequestEvent; -import pro.gravit.launcher.hasher.HashedDir; +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; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/DirBridge.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/DirBridge.java similarity index 98% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/DirBridge.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/DirBridge.java index 397c056d..3167bfef 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/DirBridge.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/DirBridge.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.client; +package pro.gravit.launcher.client.runtime.client; import pro.gravit.launcher.Launcher; import pro.gravit.utils.helper.IOHelper; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientExitPhase.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientExitPhase.java similarity index 78% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientExitPhase.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientExitPhase.java index 230ea6d8..199bf0e4 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/events/ClientExitPhase.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientExitPhase.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.client.events; +package pro.gravit.launcher.client.runtime.client.events; import pro.gravit.launcher.modules.events.ClosePhase; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessClassLoaderEvent.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessClassLoaderEvent.java similarity index 90% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessClassLoaderEvent.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessClassLoaderEvent.java index e42c17a9..7d193807 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessClassLoaderEvent.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessClassLoaderEvent.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.client.events.client; +package pro.gravit.launcher.client.runtime.client.events.client; import pro.gravit.launcher.modules.LauncherModule; import pro.gravit.launcher.profiles.ClientProfile; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessInitPhase.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessInitPhase.java similarity index 65% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessInitPhase.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessInitPhase.java index 613d696f..a7f27384 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessInitPhase.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessInitPhase.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.events.client; +package pro.gravit.launcher.client.runtime.client.events.client; -import pro.gravit.launcher.client.ClientParams; +import pro.gravit.launcher.client.runtime.client.ClientParams; import pro.gravit.launcher.modules.events.InitPhase; public class ClientProcessInitPhase extends InitPhase { diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessLaunchEvent.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessLaunchEvent.java similarity index 66% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessLaunchEvent.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessLaunchEvent.java index c43a9c5c..5954e801 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessLaunchEvent.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessLaunchEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.events.client; +package pro.gravit.launcher.client.runtime.client.events.client; -import pro.gravit.launcher.client.ClientParams; +import pro.gravit.launcher.client.runtime.client.ClientParams; import pro.gravit.launcher.modules.LauncherModule; public class ClientProcessLaunchEvent extends LauncherModule.Event { diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessPreInvokeMainClassEvent.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessPreInvokeMainClassEvent.java similarity index 81% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessPreInvokeMainClassEvent.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessPreInvokeMainClassEvent.java index 731f2c84..c84e7904 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessPreInvokeMainClassEvent.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessPreInvokeMainClassEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.events.client; +package pro.gravit.launcher.client.runtime.client.events.client; -import pro.gravit.launcher.client.ClientParams; +import pro.gravit.launcher.client.runtime.client.ClientParams; import pro.gravit.launcher.modules.LauncherModule; import pro.gravit.launcher.profiles.ClientProfile; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessReadyEvent.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessReadyEvent.java similarity index 66% rename from LauncherClient/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessReadyEvent.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessReadyEvent.java index 574814a6..87399ece 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessReadyEvent.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessReadyEvent.java @@ -1,6 +1,6 @@ -package pro.gravit.launcher.client.events.client; +package pro.gravit.launcher.client.runtime.client.events.client; -import pro.gravit.launcher.client.ClientParams; +import pro.gravit.launcher.client.runtime.client.ClientParams; import pro.gravit.launcher.modules.events.PostInitPhase; public class ClientProcessReadyEvent extends PostInitPhase { diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/utils/ApiBridgeService.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/ApiBridgeService.java similarity index 86% rename from LauncherClient/src/main/java/pro/gravit/launcher/utils/ApiBridgeService.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/ApiBridgeService.java index 8e0dcab9..ce675a57 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/utils/ApiBridgeService.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/ApiBridgeService.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.utils; +package pro.gravit.launcher.client.runtime.utils; import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.LauncherTrustManager; +import pro.gravit.launcher.core.LauncherTrustManager; import java.security.cert.X509Certificate; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/utils/DirWatcher.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/DirWatcher.java similarity index 93% rename from LauncherClient/src/main/java/pro/gravit/launcher/utils/DirWatcher.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/DirWatcher.java index 1ee0949b..a3ab7053 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/utils/DirWatcher.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/DirWatcher.java @@ -1,10 +1,10 @@ -package pro.gravit.launcher.utils; +package pro.gravit.launcher.client.runtime.utils; -import pro.gravit.launcher.ClientLauncherMethods; -import pro.gravit.launcher.hasher.FileNameMatcher; -import pro.gravit.launcher.hasher.HashedDir; -import pro.gravit.launcher.hasher.HashedEntry; -import pro.gravit.launcher.hasher.HashedFile; +import pro.gravit.launcher.client.ClientLauncherMethods; +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.core.hasher.HashedFile; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.JVMHelper; import pro.gravit.utils.helper.JVMHelper.OS; diff --git a/LauncherClient/src/main/java/pro/gravit/launcher/utils/NativeJVMHalt.java b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/NativeJVMHalt.java similarity index 94% rename from LauncherClient/src/main/java/pro/gravit/launcher/utils/NativeJVMHalt.java rename to LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/NativeJVMHalt.java index 34eea24c..c442c264 100644 --- a/LauncherClient/src/main/java/pro/gravit/launcher/utils/NativeJVMHalt.java +++ b/LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/utils/NativeJVMHalt.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.utils; +package pro.gravit.launcher.client.runtime.utils; import pro.gravit.utils.helper.LogHelper; diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/CertificatePinningTrustManager.java b/LauncherCore/src/main/java/pro/gravit/launcher/core/CertificatePinningTrustManager.java similarity index 98% rename from LauncherCore/src/main/java/pro/gravit/launcher/CertificatePinningTrustManager.java rename to LauncherCore/src/main/java/pro/gravit/launcher/core/CertificatePinningTrustManager.java index e60311eb..854c9422 100644 --- a/LauncherCore/src/main/java/pro/gravit/launcher/CertificatePinningTrustManager.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/core/CertificatePinningTrustManager.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher; +package pro.gravit.launcher.core; import pro.gravit.utils.helper.LogHelper; diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/LauncherInject.java b/LauncherCore/src/main/java/pro/gravit/launcher/core/LauncherInject.java similarity index 89% rename from LauncherCore/src/main/java/pro/gravit/launcher/LauncherInject.java rename to LauncherCore/src/main/java/pro/gravit/launcher/core/LauncherInject.java index b76203ad..8d9d43ff 100644 --- a/LauncherCore/src/main/java/pro/gravit/launcher/LauncherInject.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/core/LauncherInject.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher; +package pro.gravit.launcher.core; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/LauncherInjectionConstructor.java b/LauncherCore/src/main/java/pro/gravit/launcher/core/LauncherInjectionConstructor.java similarity index 89% rename from LauncherCore/src/main/java/pro/gravit/launcher/LauncherInjectionConstructor.java rename to LauncherCore/src/main/java/pro/gravit/launcher/core/LauncherInjectionConstructor.java index 9c2359df..27dc6dfe 100644 --- a/LauncherCore/src/main/java/pro/gravit/launcher/LauncherInjectionConstructor.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/core/LauncherInjectionConstructor.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher; +package pro.gravit.launcher.core; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/LauncherNetworkAPI.java b/LauncherCore/src/main/java/pro/gravit/launcher/core/LauncherNetworkAPI.java similarity index 94% rename from LauncherCore/src/main/java/pro/gravit/launcher/LauncherNetworkAPI.java rename to LauncherCore/src/main/java/pro/gravit/launcher/core/LauncherNetworkAPI.java index 9c2fad06..b767adbd 100644 --- a/LauncherCore/src/main/java/pro/gravit/launcher/LauncherNetworkAPI.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/core/LauncherNetworkAPI.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher; +package pro.gravit.launcher.core; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/LauncherTrustManager.java b/LauncherCore/src/main/java/pro/gravit/launcher/core/LauncherTrustManager.java similarity index 99% rename from LauncherCore/src/main/java/pro/gravit/launcher/LauncherTrustManager.java rename to LauncherCore/src/main/java/pro/gravit/launcher/core/LauncherTrustManager.java index 52a4f894..b5d0a268 100644 --- a/LauncherCore/src/main/java/pro/gravit/launcher/LauncherTrustManager.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/core/LauncherTrustManager.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher; +package pro.gravit.launcher.core; import pro.gravit.utils.helper.LogHelper; diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/hasher/FileNameMatcher.java b/LauncherCore/src/main/java/pro/gravit/launcher/core/hasher/FileNameMatcher.java similarity index 97% rename from LauncherCore/src/main/java/pro/gravit/launcher/hasher/FileNameMatcher.java rename to LauncherCore/src/main/java/pro/gravit/launcher/core/hasher/FileNameMatcher.java index de19d4a9..c1698d0e 100644 --- a/LauncherCore/src/main/java/pro/gravit/launcher/hasher/FileNameMatcher.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/core/hasher/FileNameMatcher.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.hasher; +package pro.gravit.launcher.core.hasher; import java.util.Collection; diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedDir.java b/LauncherCore/src/main/java/pro/gravit/launcher/core/hasher/HashedDir.java similarity index 98% rename from LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedDir.java rename to LauncherCore/src/main/java/pro/gravit/launcher/core/hasher/HashedDir.java index 71b28e17..14ed4211 100644 --- a/LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedDir.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/core/hasher/HashedDir.java @@ -1,9 +1,9 @@ -package pro.gravit.launcher.hasher; +package pro.gravit.launcher.core.hasher; -import pro.gravit.launcher.LauncherNetworkAPI; -import pro.gravit.launcher.serialize.HInput; -import pro.gravit.launcher.serialize.HOutput; -import pro.gravit.launcher.serialize.stream.EnumSerializer; +import pro.gravit.launcher.core.LauncherNetworkAPI; +import pro.gravit.launcher.core.serialize.HInput; +import pro.gravit.launcher.core.serialize.HOutput; +import pro.gravit.launcher.core.serialize.stream.EnumSerializer; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.VerifyHelper; diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedEntry.java b/LauncherCore/src/main/java/pro/gravit/launcher/core/hasher/HashedEntry.java similarity index 72% rename from LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedEntry.java rename to LauncherCore/src/main/java/pro/gravit/launcher/core/hasher/HashedEntry.java index d8e491c9..af21ce9f 100644 --- a/LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedEntry.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/core/hasher/HashedEntry.java @@ -1,9 +1,9 @@ -package pro.gravit.launcher.hasher; +package pro.gravit.launcher.core.hasher; -import pro.gravit.launcher.LauncherNetworkAPI; -import pro.gravit.launcher.serialize.HInput; -import pro.gravit.launcher.serialize.stream.EnumSerializer; -import pro.gravit.launcher.serialize.stream.StreamObject; +import pro.gravit.launcher.core.LauncherNetworkAPI; +import pro.gravit.launcher.core.serialize.HInput; +import pro.gravit.launcher.core.serialize.stream.EnumSerializer; +import pro.gravit.launcher.core.serialize.stream.StreamObject; import java.io.IOException; diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedEntryAdapter.java b/LauncherCore/src/main/java/pro/gravit/launcher/core/hasher/HashedEntryAdapter.java similarity index 96% rename from LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedEntryAdapter.java rename to LauncherCore/src/main/java/pro/gravit/launcher/core/hasher/HashedEntryAdapter.java index bc70cd91..1c555492 100644 --- a/LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedEntryAdapter.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/core/hasher/HashedEntryAdapter.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.hasher; +package pro.gravit.launcher.core.hasher; import com.google.gson.*; diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedFile.java b/LauncherCore/src/main/java/pro/gravit/launcher/core/hasher/HashedFile.java similarity index 92% rename from LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedFile.java rename to LauncherCore/src/main/java/pro/gravit/launcher/core/hasher/HashedFile.java index cc36bf50..f4712fa1 100644 --- a/LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedFile.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/core/hasher/HashedFile.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.hasher; +package pro.gravit.launcher.core.hasher; -import pro.gravit.launcher.LauncherNetworkAPI; -import pro.gravit.launcher.serialize.HInput; -import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.core.LauncherNetworkAPI; +import pro.gravit.launcher.core.serialize.HInput; +import pro.gravit.launcher.core.serialize.HOutput; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.SecurityHelper; import pro.gravit.utils.helper.SecurityHelper.DigestAlgorithm; diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/managers/GsonManager.java b/LauncherCore/src/main/java/pro/gravit/launcher/core/managers/GsonManager.java similarity index 86% rename from LauncherCore/src/main/java/pro/gravit/launcher/managers/GsonManager.java rename to LauncherCore/src/main/java/pro/gravit/launcher/core/managers/GsonManager.java index 5b06d10b..76466a63 100644 --- a/LauncherCore/src/main/java/pro/gravit/launcher/managers/GsonManager.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/core/managers/GsonManager.java @@ -1,9 +1,9 @@ -package pro.gravit.launcher.managers; +package pro.gravit.launcher.core.managers; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import pro.gravit.launcher.hasher.HashedEntry; -import pro.gravit.launcher.hasher.HashedEntryAdapter; +import pro.gravit.launcher.core.hasher.HashedEntry; +import pro.gravit.launcher.core.hasher.HashedEntryAdapter; import pro.gravit.utils.helper.CommonHelper; public class GsonManager { diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/serialize/HInput.java b/LauncherCore/src/main/java/pro/gravit/launcher/core/serialize/HInput.java similarity index 98% rename from LauncherCore/src/main/java/pro/gravit/launcher/serialize/HInput.java rename to LauncherCore/src/main/java/pro/gravit/launcher/core/serialize/HInput.java index 8e456425..9ee4e103 100644 --- a/LauncherCore/src/main/java/pro/gravit/launcher/serialize/HInput.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/core/serialize/HInput.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.serialize; +package pro.gravit.launcher.core.serialize; import pro.gravit.utils.helper.IOHelper; diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/serialize/HOutput.java b/LauncherCore/src/main/java/pro/gravit/launcher/core/serialize/HOutput.java similarity index 98% rename from LauncherCore/src/main/java/pro/gravit/launcher/serialize/HOutput.java rename to LauncherCore/src/main/java/pro/gravit/launcher/core/serialize/HOutput.java index 37ee3dc7..aa9f136e 100644 --- a/LauncherCore/src/main/java/pro/gravit/launcher/serialize/HOutput.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/core/serialize/HOutput.java @@ -1,4 +1,4 @@ -package pro.gravit.launcher.serialize; +package pro.gravit.launcher.core.serialize; import pro.gravit.utils.helper.IOHelper; diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/serialize/signed/DigestBytesHolder.java b/LauncherCore/src/main/java/pro/gravit/launcher/core/serialize/signed/DigestBytesHolder.java similarity index 86% rename from LauncherCore/src/main/java/pro/gravit/launcher/serialize/signed/DigestBytesHolder.java rename to LauncherCore/src/main/java/pro/gravit/launcher/core/serialize/signed/DigestBytesHolder.java index 34ae728f..b311ae29 100644 --- a/LauncherCore/src/main/java/pro/gravit/launcher/serialize/signed/DigestBytesHolder.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/core/serialize/signed/DigestBytesHolder.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.serialize.signed; +package pro.gravit.launcher.core.serialize.signed; -import pro.gravit.launcher.serialize.HInput; -import pro.gravit.launcher.serialize.HOutput; -import pro.gravit.launcher.serialize.stream.StreamObject; +import pro.gravit.launcher.core.serialize.HInput; +import pro.gravit.launcher.core.serialize.HOutput; +import pro.gravit.launcher.core.serialize.stream.StreamObject; import pro.gravit.utils.helper.SecurityHelper; import java.io.IOException; diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/serialize/stream/EnumSerializer.java b/LauncherCore/src/main/java/pro/gravit/launcher/core/serialize/stream/EnumSerializer.java similarity index 79% rename from LauncherCore/src/main/java/pro/gravit/launcher/serialize/stream/EnumSerializer.java rename to LauncherCore/src/main/java/pro/gravit/launcher/core/serialize/stream/EnumSerializer.java index e0bdf871..7c5a113d 100644 --- a/LauncherCore/src/main/java/pro/gravit/launcher/serialize/stream/EnumSerializer.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/core/serialize/stream/EnumSerializer.java @@ -1,8 +1,8 @@ -package pro.gravit.launcher.serialize.stream; +package pro.gravit.launcher.core.serialize.stream; -import pro.gravit.launcher.serialize.HInput; -import pro.gravit.launcher.serialize.HOutput; -import pro.gravit.launcher.serialize.stream.EnumSerializer.Itf; +import pro.gravit.launcher.core.serialize.HInput; +import pro.gravit.launcher.core.serialize.HOutput; +import pro.gravit.launcher.core.serialize.stream.EnumSerializer.Itf; import pro.gravit.utils.helper.VerifyHelper; import java.io.IOException; diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/serialize/stream/StreamObject.java b/LauncherCore/src/main/java/pro/gravit/launcher/core/serialize/stream/StreamObject.java similarity index 81% rename from LauncherCore/src/main/java/pro/gravit/launcher/serialize/stream/StreamObject.java rename to LauncherCore/src/main/java/pro/gravit/launcher/core/serialize/stream/StreamObject.java index c66c0741..d30bb14d 100644 --- a/LauncherCore/src/main/java/pro/gravit/launcher/serialize/stream/StreamObject.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/core/serialize/stream/StreamObject.java @@ -1,7 +1,7 @@ -package pro.gravit.launcher.serialize.stream; +package pro.gravit.launcher.core.serialize.stream; -import pro.gravit.launcher.serialize.HInput; -import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.core.serialize.HInput; +import pro.gravit.launcher.core.serialize.HOutput; import pro.gravit.utils.helper.IOHelper; import java.io.ByteArrayOutputStream; diff --git a/LauncherCore/src/main/java/pro/gravit/utils/helper/LogHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/LogHelper.java index d63fa7f6..36d6b00b 100644 --- a/LauncherCore/src/main/java/pro/gravit/utils/helper/LogHelper.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/LogHelper.java @@ -1,6 +1,6 @@ package pro.gravit.utils.helper; -import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.core.LauncherNetworkAPI; import pro.gravit.utils.logging.LogHelperAppender; import pro.gravit.utils.logging.SimpleLogHelperImpl; import pro.gravit.utils.logging.Slf4jLogHelperImpl; diff --git a/LauncherModernCore/src/main/java/pro/gravit/launcher/modern/Downloader.java b/LauncherModernCore/src/main/java/pro/gravit/launcher/modern/Downloader.java index 6cecfc9e..9ab8fae7 100644 --- a/LauncherModernCore/src/main/java/pro/gravit/launcher/modern/Downloader.java +++ b/LauncherModernCore/src/main/java/pro/gravit/launcher/modern/Downloader.java @@ -1,7 +1,7 @@ package pro.gravit.launcher.modern; -import pro.gravit.launcher.CertificatePinningTrustManager; -import pro.gravit.launcher.LauncherInject; +import pro.gravit.launcher.core.CertificatePinningTrustManager; +import pro.gravit.launcher.core.LauncherInject; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.LogHelper; diff --git a/LauncherStart/src/main/java/pro/gravit/launcher/ClientLauncherWrapper.java b/LauncherStart/src/main/java/pro/gravit/launcher/start/ClientLauncherWrapper.java similarity index 96% rename from LauncherStart/src/main/java/pro/gravit/launcher/ClientLauncherWrapper.java rename to LauncherStart/src/main/java/pro/gravit/launcher/start/ClientLauncherWrapper.java index 30e4301b..a068b3db 100644 --- a/LauncherStart/src/main/java/pro/gravit/launcher/ClientLauncherWrapper.java +++ b/LauncherStart/src/main/java/pro/gravit/launcher/start/ClientLauncherWrapper.java @@ -1,8 +1,10 @@ -package pro.gravit.launcher; +package pro.gravit.launcher.start; -import pro.gravit.launcher.client.RuntimeModuleManager; -import pro.gravit.launcher.client.DirBridge; -import pro.gravit.launcher.utils.DirWatcher; +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.core.LauncherInject; import pro.gravit.utils.Version; import pro.gravit.utils.helper.*; diff --git a/LauncherStart/src/main/java/pro/gravit/launcher/ClientWrapperModule.java b/LauncherStart/src/main/java/pro/gravit/launcher/start/ClientWrapperModule.java similarity index 60% rename from LauncherStart/src/main/java/pro/gravit/launcher/ClientWrapperModule.java rename to LauncherStart/src/main/java/pro/gravit/launcher/start/ClientWrapperModule.java index 6c4feafb..af380726 100644 --- a/LauncherStart/src/main/java/pro/gravit/launcher/ClientWrapperModule.java +++ b/LauncherStart/src/main/java/pro/gravit/launcher/start/ClientWrapperModule.java @@ -1,6 +1,4 @@ -package pro.gravit.launcher; - -import pro.gravit.launcher.ClientLauncherWrapper; +package pro.gravit.launcher.start; public interface ClientWrapperModule { void wrapperPhase(ClientLauncherWrapper.ClientLauncherWrapperContext context); diff --git a/LauncherStart/src/main/java/pro/gravit/launcher/client/RuntimeModuleManager.java b/LauncherStart/src/main/java/pro/gravit/launcher/start/RuntimeModuleManager.java similarity index 88% rename from LauncherStart/src/main/java/pro/gravit/launcher/client/RuntimeModuleManager.java rename to LauncherStart/src/main/java/pro/gravit/launcher/start/RuntimeModuleManager.java index c3f92075..597d086b 100644 --- a/LauncherStart/src/main/java/pro/gravit/launcher/client/RuntimeModuleManager.java +++ b/LauncherStart/src/main/java/pro/gravit/launcher/start/RuntimeModuleManager.java @@ -1,9 +1,7 @@ -package pro.gravit.launcher.client; +package pro.gravit.launcher.start; -import pro.gravit.launcher.ClientLauncherWrapper; -import pro.gravit.launcher.ClientWrapperModule; import pro.gravit.launcher.Launcher; -import pro.gravit.launcher.LauncherTrustManager; +import pro.gravit.launcher.core.LauncherTrustManager; import pro.gravit.launcher.modules.LauncherModule; import pro.gravit.launcher.modules.impl.SimpleModuleManager; 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 4b82b2a3..734fc1fa 100644 --- a/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java +++ b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java @@ -1,17 +1,15 @@ package pro.gravit.launcher.server; -import pro.gravit.launcher.ClientPermissions; import pro.gravit.launcher.Launcher; import pro.gravit.launcher.LauncherConfig; -import pro.gravit.launcher.api.AuthService; -import pro.gravit.launcher.api.ClientService; -import pro.gravit.launcher.api.ConfigService; -import pro.gravit.launcher.api.KeyService; +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.PlayerProfile; import pro.gravit.launcher.profiles.optional.actions.OptionalAction; import pro.gravit.launcher.profiles.optional.triggers.OptionalTrigger; import pro.gravit.launcher.request.Request; @@ -21,7 +19,6 @@ import pro.gravit.launcher.request.websockets.StdWebSocketService; import pro.gravit.launcher.server.authlib.InstallAuthlib; import pro.gravit.launcher.server.setup.ServerWrapperSetup; -import pro.gravit.utils.PublicURLClassLoader; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.LogHelper; import pro.gravit.utils.helper.SecurityHelper; 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 bb19fc5f..3c20fe6b 100644 --- a/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapperGsonManager.java +++ b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapperGsonManager.java @@ -1,7 +1,7 @@ package pro.gravit.launcher.server; import com.google.gson.GsonBuilder; -import pro.gravit.launcher.managers.GsonManager; +import pro.gravit.launcher.core.managers.GsonManager; import pro.gravit.launcher.request.websockets.ClientWebSocketService; public class ServerWrapperGsonManager extends GsonManager { diff --git a/modules b/modules index 7581b6c0..7f4eb168 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 7581b6c01470a5ec32ac67170635d10f6f589b0a +Subproject commit 7f4eb1684725565d161beeeda093f5964ab550ca