[FIX] Навёл порядок в скриптах gradle. + [FIX] Удалил лишний мусор (остатки старого формата конфигов). + [ANY] Обновлены модули.

[FEATURE] DiscordRPC модуль. + [FIX] Переписал скрипты gradle.

LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/config.cfg

@@ -1,63 +0,0 @@
-{
-  "port": 7240,
-  "address": "xx.xx",
-  "bindAddress": "0.0.0.0",
-  "projectName": "XXX",
-  "mirrors": [
-    "http://mirror.gravitlauncher.ml/"
-  ],
-  "binaryName": "Launcher",
-  "env": "STD",
-  "authProvider": [
-    {
-      "message": "Настройте authProvider",
-      "type": "reject"
-    }
-  ],
-  "authHandler": {
-    "type": "memory"
-  },
-  "permissionsHandler": {
-    "filename": "permissions.json",
-    "type": "json"
-  },
-  "textureProvider": {
-    "skinURL": "http://example.com/skins/%username%.png",
-    "cloakURL": "http://example.com/cloaks/%username%.png",
-    "type": "request"
-  },
-  "hwidHandler": {
-    "type": "accept"
-  },
-  "threadCount": 2,
-  "threadCoreCount": 0,
-  "launch4j": {
-    "enabled": false,
-    "productName": "GravitLauncher",
-    "productVer": "4.2.0.0",
-    "fileDesc": "GravitLauncher 4.2.0",
-    "fileVer": "4.2.0.0",
-    "internalName": "Launcher",
-    "copyright": "© GravitLauncher Team",
-    "trademarks": "This product is licensed under GPLv3",
-    "txtFileVersion": "%s, build %d",
-    "txtProductVersion": "%s, build %d"
-  },
-  "buildPostTransform": {
-    "enabled": false
-  },
-  "compress": false,
-  "authRateLimit": 0,
-  "authRateLimitMilis": 0,
-  "authRejectString": "Превышен лимит авторизаций",
-  "whitelistRejectString": "Вас нет в белом списке",
-  "genMappings": true,
-  "isUsingWrapper": false,
-  "isDownloadJava": false,
-  "isWarningMissArchJava": true,
-  "enabledProGuard": true,
-  "updatesNotify": true,
-  "stripLineNumbers": true,
-  "deleteTempFiles": true,
-  "startScript": ".\\start.sh"
-}

Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java

@@ -306,6 +306,7 @@ private static void launch(ClientProfile profile, Params params) throws Throwabl
 	private static Process process = null;
     private static boolean clientStarted = false;
     private static Thread writeParamsThread;
+	public static PlayerProfile playerProfile;
 
     @LauncherAPI
     public static Process launch(
@@ -461,6 +462,7 @@ public static void main(String... args) throws Throwable {
             return;
         }
         Launcher.profile = profile;
+        playerProfile = params.pp;
         Request.setSession(params.session);
         checkJVMBitsAndVersion();
         Launcher.modulesManager.initModules();

Launcher/src/main/java/pro/gravit/launcher/client/ClientModuleManager.java

@@ -7,7 +7,8 @@
 import pro.gravit.launcher.managers.SimpleModuleManager;
 
 public class ClientModuleManager extends SimpleModuleManager {
-    public ClientModuleManager(LauncherEngine engine) {
+
+	public ClientModuleManager(LauncherEngine engine) {
         context = new ClientModuleContext(engine);
         modules = new ArrayList<>();
     }

Launcher/src/main/java/pro/gravit/launcher/gui/JSRuntimeProvider.java

@@ -62,7 +62,7 @@
 
 public class JSRuntimeProvider implements RuntimeProvider {
 
-    private final ScriptEngine engine = CommonHelper.newScriptEngine();
+    public final ScriptEngine engine = CommonHelper.newScriptEngine();
     private boolean isPreLoaded = false;
 
     @LauncherAPI

LauncherTest/build.gradle

@@ -1,4 +1,4 @@
-apply from: '../scripts/test_support.gradle'
+apply from: 'test_support.gradle'
 
 dependencies {
     compile project(':LaunchServer')

modules

@@ -1 +1 @@
-Subproject commit c5986c83c7d9a2c988a4846efc0ec99c4b8d0934
+Subproject commit 51bae9ce1d287ce453c4f7bfb5bb7bf463ec6af8

scripts/launch_module.gradle

@@ -1,8 +0,0 @@
-dependencies {
-    compileOnly project(':Launcher')
-}
-
-jar {
-    from { configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) } }
-}
-

scripts/lsrv_module.gradle

@@ -1,8 +0,0 @@
-dependencies {
-    compileOnly project(':LaunchServer')
-}
-
-jar {
-    from { configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) } }
-}
-

scripts/srvwrap_module.gradle

@@ -1,8 +0,0 @@
-dependencies {
-    compileOnly project(':ServerWrapper')
-}
-
-jar {
-    from { configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) } }
-}
-