diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle index d090969f..fde96714 100644 --- a/LaunchServer/build.gradle +++ b/LaunchServer/build.gradle @@ -41,7 +41,6 @@ } dependencies { - pack project(':libLauncher') pack project(':LauncherAPI') bundle project(':Radon') bundle 'mysql:mysql-connector-java:8.0.16' diff --git a/LauncherAPI/build.gradle b/LauncherAPI/build.gradle index 1e733b39..305be8ce 100644 --- a/LauncherAPI/build.gradle +++ b/LauncherAPI/build.gradle @@ -2,7 +2,7 @@ targetCompatibility = '1.8' dependencies { - compile project(':libLauncher') + compile project(':LauncherCore') compileOnly 'org.apache.httpcomponents:httpclient:4.5.7' compileOnly 'io.netty:netty-all:4.1.36.Final' } diff --git a/libLauncher/build.gradle b/LauncherCore/build.gradle similarity index 100% rename from libLauncher/build.gradle rename to LauncherCore/build.gradle diff --git a/libLauncher/src/main/java/ru/gravit/launcher/LauncherAPI.java b/LauncherCore/src/main/java/ru/gravit/launcher/LauncherAPI.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/LauncherAPI.java rename to LauncherCore/src/main/java/ru/gravit/launcher/LauncherAPI.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/LauncherNetworkAPI.java b/LauncherCore/src/main/java/ru/gravit/launcher/LauncherNetworkAPI.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/LauncherNetworkAPI.java rename to LauncherCore/src/main/java/ru/gravit/launcher/LauncherNetworkAPI.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/NeedGarbageCollection.java b/LauncherCore/src/main/java/ru/gravit/launcher/NeedGarbageCollection.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/NeedGarbageCollection.java rename to LauncherCore/src/main/java/ru/gravit/launcher/NeedGarbageCollection.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/hasher/FileNameMatcher.java b/LauncherCore/src/main/java/ru/gravit/launcher/hasher/FileNameMatcher.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/hasher/FileNameMatcher.java rename to LauncherCore/src/main/java/ru/gravit/launcher/hasher/FileNameMatcher.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedDir.java b/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedDir.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedDir.java rename to LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedDir.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedEntry.java b/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedEntry.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedEntry.java rename to LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedEntry.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedEntryAdapter.java b/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedEntryAdapter.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedEntryAdapter.java rename to LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedEntryAdapter.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedFile.java b/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedFile.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/hasher/HashedFile.java rename to LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedFile.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/managers/GarbageManager.java b/LauncherCore/src/main/java/ru/gravit/launcher/managers/GarbageManager.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/managers/GarbageManager.java rename to LauncherCore/src/main/java/ru/gravit/launcher/managers/GarbageManager.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/managers/GsonManager.java b/LauncherCore/src/main/java/ru/gravit/launcher/managers/GsonManager.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/managers/GsonManager.java rename to LauncherCore/src/main/java/ru/gravit/launcher/managers/GsonManager.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java b/LauncherCore/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java rename to LauncherCore/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java b/LauncherCore/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java rename to LauncherCore/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/modules/Module.java b/LauncherCore/src/main/java/ru/gravit/launcher/modules/Module.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/modules/Module.java rename to LauncherCore/src/main/java/ru/gravit/launcher/modules/Module.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/modules/ModuleContext.java b/LauncherCore/src/main/java/ru/gravit/launcher/modules/ModuleContext.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/modules/ModuleContext.java rename to LauncherCore/src/main/java/ru/gravit/launcher/modules/ModuleContext.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java b/LauncherCore/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java rename to LauncherCore/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/modules/ModulesManager.java b/LauncherCore/src/main/java/ru/gravit/launcher/modules/ModulesManager.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/modules/ModulesManager.java rename to LauncherCore/src/main/java/ru/gravit/launcher/modules/ModulesManager.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/serialize/HInput.java b/LauncherCore/src/main/java/ru/gravit/launcher/serialize/HInput.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/serialize/HInput.java rename to LauncherCore/src/main/java/ru/gravit/launcher/serialize/HInput.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/serialize/HOutput.java b/LauncherCore/src/main/java/ru/gravit/launcher/serialize/HOutput.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/serialize/HOutput.java rename to LauncherCore/src/main/java/ru/gravit/launcher/serialize/HOutput.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/serialize/SerializeLimits.java b/LauncherCore/src/main/java/ru/gravit/launcher/serialize/SerializeLimits.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/serialize/SerializeLimits.java rename to LauncherCore/src/main/java/ru/gravit/launcher/serialize/SerializeLimits.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/serialize/signed/DigestBytesHolder.java b/LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/DigestBytesHolder.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/serialize/signed/DigestBytesHolder.java rename to LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/DigestBytesHolder.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/serialize/signed/SignedBytesHolder.java b/LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/SignedBytesHolder.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/serialize/signed/SignedBytesHolder.java rename to LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/SignedBytesHolder.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/serialize/signed/SignedObjectHolder.java b/LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/SignedObjectHolder.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/serialize/signed/SignedObjectHolder.java rename to LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/SignedObjectHolder.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/serialize/stream/EnumSerializer.java b/LauncherCore/src/main/java/ru/gravit/launcher/serialize/stream/EnumSerializer.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/serialize/stream/EnumSerializer.java rename to LauncherCore/src/main/java/ru/gravit/launcher/serialize/stream/EnumSerializer.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/serialize/stream/StreamObject.java b/LauncherCore/src/main/java/ru/gravit/launcher/serialize/stream/StreamObject.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/serialize/stream/StreamObject.java rename to LauncherCore/src/main/java/ru/gravit/launcher/serialize/stream/StreamObject.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java b/LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java rename to LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java b/LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java rename to LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java b/LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java rename to LauncherCore/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/BiHookSet.java b/LauncherCore/src/main/java/ru/gravit/utils/BiHookSet.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/BiHookSet.java rename to LauncherCore/src/main/java/ru/gravit/utils/BiHookSet.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/HTTPRequest.java b/LauncherCore/src/main/java/ru/gravit/utils/HTTPRequest.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/HTTPRequest.java rename to LauncherCore/src/main/java/ru/gravit/utils/HTTPRequest.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/HookException.java b/LauncherCore/src/main/java/ru/gravit/utils/HookException.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/HookException.java rename to LauncherCore/src/main/java/ru/gravit/utils/HookException.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/HookSet.java b/LauncherCore/src/main/java/ru/gravit/utils/HookSet.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/HookSet.java rename to LauncherCore/src/main/java/ru/gravit/utils/HookSet.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/HttpDownloader.java b/LauncherCore/src/main/java/ru/gravit/utils/HttpDownloader.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/HttpDownloader.java rename to LauncherCore/src/main/java/ru/gravit/utils/HttpDownloader.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/ProviderMap.java b/LauncherCore/src/main/java/ru/gravit/utils/ProviderMap.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/ProviderMap.java rename to LauncherCore/src/main/java/ru/gravit/utils/ProviderMap.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/PublicURLClassLoader.java b/LauncherCore/src/main/java/ru/gravit/utils/PublicURLClassLoader.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/PublicURLClassLoader.java rename to LauncherCore/src/main/java/ru/gravit/utils/PublicURLClassLoader.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/UniversalJsonAdapter.java b/LauncherCore/src/main/java/ru/gravit/utils/UniversalJsonAdapter.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/UniversalJsonAdapter.java rename to LauncherCore/src/main/java/ru/gravit/utils/UniversalJsonAdapter.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/Version.java b/LauncherCore/src/main/java/ru/gravit/utils/Version.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/Version.java rename to LauncherCore/src/main/java/ru/gravit/utils/Version.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/BaseCommandCategory.java b/LauncherCore/src/main/java/ru/gravit/utils/command/BaseCommandCategory.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/BaseCommandCategory.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/BaseCommandCategory.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/Command.java b/LauncherCore/src/main/java/ru/gravit/utils/command/Command.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/Command.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/Command.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/CommandCategory.java b/LauncherCore/src/main/java/ru/gravit/utils/command/CommandCategory.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/CommandCategory.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/CommandCategory.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/CommandException.java b/LauncherCore/src/main/java/ru/gravit/utils/command/CommandException.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/CommandException.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/CommandException.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/CommandHandler.java b/LauncherCore/src/main/java/ru/gravit/utils/command/CommandHandler.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/CommandHandler.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/CommandHandler.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/JLineCommandHandler.java b/LauncherCore/src/main/java/ru/gravit/utils/command/JLineCommandHandler.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/JLineCommandHandler.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/JLineCommandHandler.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/StdCommandHandler.java b/LauncherCore/src/main/java/ru/gravit/utils/command/StdCommandHandler.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/StdCommandHandler.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/StdCommandHandler.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/basic/ClearCommand.java b/LauncherCore/src/main/java/ru/gravit/utils/command/basic/ClearCommand.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/basic/ClearCommand.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/basic/ClearCommand.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/basic/DebugCommand.java b/LauncherCore/src/main/java/ru/gravit/utils/command/basic/DebugCommand.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/basic/DebugCommand.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/basic/DebugCommand.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/basic/GCCommand.java b/LauncherCore/src/main/java/ru/gravit/utils/command/basic/GCCommand.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/basic/GCCommand.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/basic/GCCommand.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/command/basic/HelpCommand.java b/LauncherCore/src/main/java/ru/gravit/utils/command/basic/HelpCommand.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/command/basic/HelpCommand.java rename to LauncherCore/src/main/java/ru/gravit/utils/command/basic/HelpCommand.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/event/EventHandler.java b/LauncherCore/src/main/java/ru/gravit/utils/event/EventHandler.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/event/EventHandler.java rename to LauncherCore/src/main/java/ru/gravit/utils/event/EventHandler.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/event/EventInterface.java b/LauncherCore/src/main/java/ru/gravit/utils/event/EventInterface.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/event/EventInterface.java rename to LauncherCore/src/main/java/ru/gravit/utils/event/EventInterface.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/event/EventManager.java b/LauncherCore/src/main/java/ru/gravit/utils/event/EventManager.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/event/EventManager.java rename to LauncherCore/src/main/java/ru/gravit/utils/event/EventManager.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/CommonHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/CommonHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/CommonHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/CommonHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/EnvHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/EnvHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/EnvHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/EnvHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/FormatHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/FormatHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/FormatHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/FormatHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/IOHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/IOHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/IOHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/IOHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/JVMHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/JVMHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/JVMHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/JVMHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/JarHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/JarHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/JarHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/JarHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/LogHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/LogHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/LogHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/LogHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/SecurityHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/SecurityHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/SecurityHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/SecurityHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/UnpackHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/UnpackHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/UnpackHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/UnpackHelper.java diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/VerifyHelper.java b/LauncherCore/src/main/java/ru/gravit/utils/helper/VerifyHelper.java similarity index 100% rename from libLauncher/src/main/java/ru/gravit/utils/helper/VerifyHelper.java rename to LauncherCore/src/main/java/ru/gravit/utils/helper/VerifyHelper.java diff --git a/settings.gradle b/settings.gradle index 50775c2f..72971c4c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,7 +2,7 @@ include 'Launcher' include 'Radon' -include 'libLauncher' +include 'LauncherCore' include 'LauncherAPI' include 'LauncherAuthlib' include 'ServerWrapper'