Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 03:31:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

[REFACTOR] Renaming

Browse source
This commit is contained in:
Gravita 2023-12-23 12:05:23 +07:00
parent f6f6ea13ad
commit c9b6b0279a
133 changed files with 287 additions and 288 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java
View file

@ -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;

2
LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java
View file

@ -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;

4
LaunchServer/src/main/java/pro/gravit/launchserver/asm/InjectClassAcceptor.java
View file

@ -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;

4
LaunchServer/src/main/java/pro/gravit/launchserver/binary/BuildContext.java
View file

@ -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;

2
LaunchServer/src/main/java/pro/gravit/launchserver/command/modules/ModulesCommand.java
View file

@ -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;

2
LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java
View file

@ -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;

2
LaunchServer/src/main/java/pro/gravit/launchserver/manangers/CertificateManager.java
View file

@ -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;

2
LaunchServer/src/main/java/pro/gravit/launchserver/manangers/LaunchServerGsonManager.java
View file

@ -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;

6
LaunchServer/src/main/java/pro/gravit/launchserver/manangers/UpdatesManager.java
View file

@ -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;

2
LaunchServer/src/main/java/pro/gravit/launchserver/modules/impl/LaunchServerModulesManager.java
View file

@ -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;

2
LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/UpdateResponse.java
View file

@ -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;

8
LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/proguard.cfg
View file

@ -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 ** {
<fields>;
<methods>;
}
-keepclassmembers class ** {
@pro.gravit.launcher.LauncherNetworkAPI
@pro.gravit.launcher.core.LauncherNetworkAPI
<fields>;
@pro.gravit.launcher.LauncherNetworkAPI
@pro.gravit.launcher.core.LauncherNetworkAPI
<methods>;
}

2
LaunchServer/src/test/java/pro/gravit/launchserver/ASMTransformersTest.java
View file

@ -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;

30
Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/LauncherEngine.java
View file

@ -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;

3
Launcher/src/main/java/pro/gravit/launcher/LauncherEngineWrapper.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/LauncherEngineWrapper.java
View file

@ -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;

9
Launcher/src/main/java/pro/gravit/launcher/NewLauncherSettings.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/NewLauncherSettings.java
View file

@ -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 {

16
Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherProcess.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherProcess.java
View file

@ -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;

5
Launcher/src/main/java/pro/gravit/launcher/client/RuntimeGsonManager.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/RuntimeGsonManager.java
View file

@ -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;

2
Launcher/src/main/java/pro/gravit/launcher/client/RuntimeLauncherCoreModule.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/RuntimeLauncherCoreModule.java
View file

@ -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;

6
Launcher/src/main/java/pro/gravit/launcher/client/ServerPinger.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/ServerPinger.java
View file

@ -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;

2
Launcher/src/main/java/pro/gravit/launcher/client/UserSettings.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/UserSettings.java
View file

@ -1,4 +1,4 @@
package pro.gravit.launcher.client;
package pro.gravit.launcher.client.runtime.client;
import pro.gravit.utils.ProviderMap;

4
Launcher/src/main/java/pro/gravit/launcher/client/events/ClientEngineInitPhase.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientEngineInitPhase.java
View file

@ -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 {

4
Launcher/src/main/java/pro/gravit/launcher/client/events/ClientGuiPhase.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientGuiPhase.java
View file

@ -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 {

4
Launcher/src/main/java/pro/gravit/launcher/client/events/ClientPreGuiPhase.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientPreGuiPhase.java
View file

@ -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 {

2
Launcher/src/main/java/pro/gravit/launcher/client/events/ClientUnlockConsoleEvent.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/ClientUnlockConsoleEvent.java
View file

@ -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;

4
Launcher/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessBuilderCreateEvent.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderCreateEvent.java
View file

@ -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 {

4
Launcher/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessBuilderLaunchedEvent.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderLaunchedEvent.java
View file

@ -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 {

4
Launcher/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessBuilderParamsWrittedEvent.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderParamsWrittedEvent.java
View file

@ -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 {

4
Launcher/src/main/java/pro/gravit/launcher/client/events/client/ClientProcessBuilderPreLaunchEvent.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/client/events/client/ClientProcessBuilderPreLaunchEvent.java
View file

@ -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 {

4
Launcher/src/main/java/pro/gravit/launcher/console/GetPublicKeyCommand.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/GetPublicKeyCommand.java
View file

@ -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;

8
Launcher/src/main/java/pro/gravit/launcher/console/ModulesCommand.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/ModulesCommand.java
View file

@ -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;

4
Launcher/src/main/java/pro/gravit/launcher/console/SignDataCommand.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/SignDataCommand.java
View file

@ -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;

6
Launcher/src/main/java/pro/gravit/launcher/console/UnlockCommand.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/UnlockCommand.java
View file

@ -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;

4
Launcher/src/main/java/pro/gravit/launcher/console/test/PrintHardwareInfoCommand.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/console/test/PrintHardwareInfoCommand.java
View file

@ -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;

10
Launcher/src/main/java/pro/gravit/launcher/debug/ClientRuntimeProvider.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/ClientRuntimeProvider.java
View file

@ -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;

4
Launcher/src/main/java/pro/gravit/launcher/debug/DebugLauncherTrustManager.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/DebugLauncherTrustManager.java
View file

@ -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;

12
Launcher/src/main/java/pro/gravit/launcher/debug/DebugMain.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/debug/DebugMain.java
View file

@ -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;

2
Launcher/src/main/java/pro/gravit/launcher/gui/NoRuntimeProvider.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/gui/NoRuntimeProvider.java
View file

@ -1,4 +1,4 @@
package pro.gravit.launcher.gui;
package pro.gravit.launcher.client.runtime.gui;
import javax.swing.*;

2
Launcher/src/main/java/pro/gravit/launcher/gui/RuntimeProvider.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/gui/RuntimeProvider.java
View file

@ -1,4 +1,4 @@
package pro.gravit.launcher.gui;
package pro.gravit.launcher.client.runtime.gui;
public interface RuntimeProvider {
void run(String[] args);

10
Launcher/src/main/java/pro/gravit/launcher/managers/ConsoleManager.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/managers/ConsoleManager.java
View file

@ -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;

17
Launcher/src/main/java/pro/gravit/launcher/managers/SettingsManager.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/managers/SettingsManager.java
View file

@ -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<NewLauncherSettings> {
public static NewLauncherSettings settings;

2
Launcher/src/main/java/pro/gravit/launcher/utils/HWIDProvider.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/utils/HWIDProvider.java
View file

@ -1,4 +1,4 @@
package pro.gravit.launcher.utils;
package pro.gravit.launcher.client.runtime.utils;
import oshi.SystemInfo;
import oshi.hardware.*;

6
Launcher/src/main/java/pro/gravit/launcher/utils/LauncherUpdater.java → Launcher/src/main/java/pro/gravit/launcher/client/runtime/utils/LauncherUpdater.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/ClientPermissions.java
View file

@ -1,5 +1,7 @@
package pro.gravit.launcher;
import pro.gravit.launcher.core.LauncherNetworkAPI;
import java.util.*;
public class ClientPermissions {

4
LauncherAPI/src/main/java/pro/gravit/launcher/Launcher.java
View file

@ -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;

9
LauncherAPI/src/main/java/pro/gravit/launcher/LauncherConfig.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/api/AuthService.java → LauncherAPI/src/main/java/pro/gravit/launcher/client/api/AuthService.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/api/ClientService.java → LauncherAPI/src/main/java/pro/gravit/launcher/client/api/ClientService.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/api/ConfigService.java → LauncherAPI/src/main/java/pro/gravit/launcher/client/api/ConfigService.java
View file

@ -1,4 +1,4 @@
package pro.gravit.launcher.api;
package pro.gravit.launcher.client.api;
public class ConfigService {
public static boolean disableLogging;

2
LauncherAPI/src/main/java/pro/gravit/launcher/api/KeyService.java → LauncherAPI/src/main/java/pro/gravit/launcher/client/api/KeyService.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/managers/ConfigManager.java → LauncherAPI/src/main/java/pro/gravit/launcher/client/runtime/managers/ConfigManager.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/managers/SimpleModulesConfigManager.java → LauncherAPI/src/main/java/pro/gravit/launcher/client/runtime/managers/SimpleModulesConfigManager.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/events/NotificationEvent.java
View file

@ -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 {

2
LauncherAPI/src/main/java/pro/gravit/launcher/events/RequestEvent.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AuthRequestEvent.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/events/request/BatchProfileByUsernameRequestEvent.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/events/request/CheckServerRequestEvent.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ErrorRequestEvent.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/events/request/JoinServerRequestEvent.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/events/request/LauncherRequestEvent.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUUIDRequestEvent.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUsernameRequestEvent.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfilesRequestEvent.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/events/request/SetProfileRequestEvent.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateListRequestEvent.java
View file

@ -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;

4
LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateRequestEvent.java
View file

@ -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

2
LauncherAPI/src/main/java/pro/gravit/launcher/modules/LauncherModule.java
View file

@ -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;

4
LauncherAPI/src/main/java/pro/gravit/launcher/modules/impl/SimpleModuleManager.java
View file

@ -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;

4
LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java
View file

@ -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;

4
LauncherAPI/src/main/java/pro/gravit/launcher/profiles/Texture.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalDepend.java
View file

@ -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

2
LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalFile.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/actions/OptionalActionFile.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/request/Request.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/AuthRequest.java
View file

@ -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.*;

2
LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/CheckServerRequest.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/JoinServerRequest.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/SetProfileRequest.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthAESPassword.java
View file

@ -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 {

2
LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/password/AuthPlainPassword.java
View file

@ -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 {

2
LauncherAPI/src/main/java/pro/gravit/launcher/request/update/LauncherRequest.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateRequest.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUUIDRequest.java
View file

@ -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;

2
LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUsernameRequest.java
View file

@ -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;

4
LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientJSONPoint.java
View file

@ -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;

4
LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientWebSocketService.java
View file

@ -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;

4
LauncherClient/src/main/java/pro/gravit/launcher/BasicLauncherEventHandler.java → LauncherClient/src/main/java/pro/gravit/launcher/client/BasicLauncherEventHandler.java
View file

@ -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;

16
LauncherClient/src/main/java/pro/gravit/launcher/ClientLauncherMethods.java → LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherMethods.java
View file

@ -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;

4
LauncherClient/src/main/java/pro/gravit/launcher/LauncherAgent.java → LauncherClient/src/main/java/pro/gravit/launcher/client/LauncherAgent.java
View file

@ -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;

8
LauncherClient/src/main/java/pro/gravit/launcher/api/CertificateService.java → LauncherClient/src/main/java/pro/gravit/launcher/client/api/CertificateService.java
View file

@ -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;

2
LauncherClient/src/main/java/pro/gravit/launcher/api/DialogService.java → LauncherClient/src/main/java/pro/gravit/launcher/client/api/DialogService.java
View file

@ -1,4 +1,4 @@
package pro.gravit.launcher.api;
package pro.gravit.launcher.client.api;
import pro.gravit.launcher.events.NotificationEvent;

4
LauncherClient/src/main/java/pro/gravit/launcher/api/SystemService.java → LauncherClient/src/main/java/pro/gravit/launcher/client/api/SystemService.java
View file

@ -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() {

4
LauncherClient/src/main/java/pro/gravit/launcher/client/ClientGsonManager.java → LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientGsonManager.java
View file

@ -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;

2
LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherCoreModule.java → LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherCoreModule.java
View file

@ -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;

23
LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java → LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientLauncherEntryPoint.java
View file

@ -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.*;

4
LauncherClient/src/main/java/pro/gravit/launcher/client/ClientModuleManager.java → LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientModuleManager.java
View file

@ -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;

4
LauncherClient/src/main/java/pro/gravit/launcher/client/ClientParams.java → LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/ClientParams.java
View file

@ -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;

2
LauncherClient/src/main/java/pro/gravit/launcher/client/DirBridge.java → LauncherClient/src/main/java/pro/gravit/launcher/client/runtime/client/DirBridge.java
View file

@ -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;

Some files were not shown because too many files have changed in this diff Show more