diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle index 40de0096..89e28118 100644 --- a/LaunchServer/build.gradle +++ b/LaunchServer/build.gradle @@ -41,7 +41,6 @@ } dependencies { - pack project(':libLauncher') pack project(':LauncherAPI') bundle project(':Radon') bundle 'com.vk.api:sdk:1.0.2' diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java index ba529063..afb08b2d 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java @@ -259,6 +259,8 @@ public void close() { public static class ExeConf { public boolean enabled; + public boolean setMaxVersion; + public String maxVersion; public String productName; public String productVer; public String fileDesc; @@ -720,6 +722,7 @@ private void generateConfigIfNotExists(boolean testEnv) throws IOException { newConfig.launch4j.txtProductVersion = "%s, build %d"; newConfig.launch4j.productName = "GravitLauncher"; newConfig.launch4j.productVer = newConfig.launch4j.fileVer; + newConfig.launch4j.maxVersion = "1.8.999"; newConfig.env = LauncherConfig.LauncherEnvironment.STD; newConfig.startScript = JVMHelper.OS_TYPE.equals(JVMHelper.OS.MUSTDIE) ? "." + File.separator + "start.bat" : "." + File.separator + "start.sh"; newConfig.hwidHandler = new AcceptHWIDHandler(); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java index ea0826ea..2f2142b7 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java @@ -78,6 +78,8 @@ private void setConfig() { // Prepare JRE Jre jre = new Jre(); jre.setMinVersion("1.8.0"); + if(server.config.launch4j.setMaxVersion) + jre.setMaxVersion(server.config.launch4j.maxVersion); jre.setRuntimeBits(Jre.RUNTIME_BITS_64_AND_32); jre.setJdkPreference(Jre.JDK_PREFERENCE_PREFER_JRE); config.setJre(jre); diff --git a/Launcher/runtime/dialog/images/downloader/blured.jpg b/Launcher/runtime/dialog/images/downloader/blured.jpg index b721d11c..2b739312 100644 Binary files a/Launcher/runtime/dialog/images/downloader/blured.jpg and b/Launcher/runtime/dialog/images/downloader/blured.jpg differ diff --git a/Launcher/runtime/dialog/overlay/processing/processing.css b/Launcher/runtime/dialog/overlay/processing/processing.css index 39c74e65..c65c33dc 100644 --- a/Launcher/runtime/dialog/overlay/processing/processing.css +++ b/Launcher/runtime/dialog/overlay/processing/processing.css @@ -1,11 +1,14 @@ /*-- DrLeonardo Design --*/ -#overlay > #description { + +#overlay>#description { -fx-font-size: 12pt; -fx-text-fill: #fff; -fx-wrap-text: true; } -#overlay > #description.error { - -fx-text-fill: red; +#overlay>#description.error { + -fx-text-fill: #CE5757; } + + /*-- DrLeonardo Design --*/ \ No newline at end of file diff --git a/Launcher/runtime/dialog/overlay/update/update.css b/Launcher/runtime/dialog/overlay/update/update.css index 4035391a..51324077 100644 --- a/Launcher/runtime/dialog/overlay/update/update.css +++ b/Launcher/runtime/dialog/overlay/update/update.css @@ -20,7 +20,7 @@ #overlay > #description.error { } .downloadPane { - -fx-background-color: rgba(0, 0, 0, 0.2); + -fx-background-color: rgba(0, 0, 0, 0.1); } /* Progress bar */ diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/LauncherUpdateController.java b/Launcher/src/main/java/ru/gravit/launcher/client/LauncherUpdateController.java index a5dc40d6..be328d52 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/LauncherUpdateController.java +++ b/Launcher/src/main/java/ru/gravit/launcher/client/LauncherUpdateController.java @@ -17,7 +17,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicReference; @@ -39,7 +38,7 @@ public void postDiff(UpdateRequest request, UpdateRequestEvent e, HashedDir.Diff { LogHelper.info("Enabled HStore feature. Find"); AtomicReference lastEn = new AtomicReference<>(null); - ArrayList removed = new ArrayList<>(); + //ArrayList removed = new ArrayList<>(); diff.mismatch.walk(File.separator, (path, name, entry) -> { if(entry.getType() == HashedEntry.Type.DIR) { Files.createDirectories(request.getDir().resolve(path)); diff --git a/Launcher/src/main/java/ru/gravit/launcher/managers/ConsoleManager.java b/Launcher/src/main/java/ru/gravit/launcher/managers/ConsoleManager.java index ac22db8d..864ab65a 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/managers/ConsoleManager.java +++ b/Launcher/src/main/java/ru/gravit/launcher/managers/ConsoleManager.java @@ -20,9 +20,6 @@ import ru.gravit.utils.helper.LogHelper; import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; public class ConsoleManager { public static CommandHandler handler; 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/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java b/LauncherAPI/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 LauncherAPI/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java b/LauncherAPI/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 LauncherAPI/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/modules/Module.java b/LauncherAPI/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 LauncherAPI/src/main/java/ru/gravit/launcher/modules/Module.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/modules/ModuleContext.java b/LauncherAPI/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 LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModuleContext.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java b/LauncherAPI/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 LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/modules/ModulesManager.java b/LauncherAPI/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 LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModulesManager.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WaitEventHandler.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WaitEventHandler.java index d319714d..e9a4fb03 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WaitEventHandler.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WaitEventHandler.java @@ -4,7 +4,6 @@ import ru.gravit.launcher.request.ResultInterface; import ru.gravit.utils.helper.LogHelper; -import java.util.HashSet; import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; diff --git a/libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java b/LauncherAPI/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 LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java b/LauncherAPI/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 LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java diff --git a/libLauncher/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java b/LauncherAPI/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 LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java 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/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/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'