From 439a417f5b6fd25621a158bec96256a233c5e00d Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Thu, 10 Jan 2019 23:39:35 +0400 Subject: [PATCH] [FIX] Profiles property: "info" + [FIX] Recenter mouse on stage. + [FIX] Auto-generating config generation (param: "isWarningMissArchJava"). --- .../java/ru/gravit/launchserver/LaunchServer.java | 2 ++ .../ru/gravit/launchserver/defaults/config.cfg | 12 ++++++------ .../gravit/launchserver/defaults/profile1.10.2.cfg | 1 + .../gravit/launchserver/defaults/profile1.11.2.cfg | 1 + .../gravit/launchserver/defaults/profile1.12.2.cfg | 1 + .../gravit/launchserver/defaults/profile1.13.1.cfg | 1 + .../ru/gravit/launchserver/defaults/profile1.13.cfg | 1 + .../ru/gravit/launchserver/defaults/profile1.4.7.cfg | 1 + .../ru/gravit/launchserver/defaults/profile1.5.2.cfg | 1 + .../ru/gravit/launchserver/defaults/profile1.6.4.cfg | 1 + .../gravit/launchserver/defaults/profile1.7.10.cfg | 1 + .../ru/gravit/launchserver/defaults/profile1.7.2.cfg | 1 + .../ru/gravit/launchserver/defaults/profile1.8.9.cfg | 1 + .../ru/gravit/launchserver/defaults/profile1.9.4.cfg | 1 + Launcher/runtime/init.js | 1 - 15 files changed, 20 insertions(+), 7 deletions(-) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java index f2421da7..e800ffae 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java @@ -584,6 +584,8 @@ private void generateConfigIfNotExists() throws IOException { newConfig.enabledProGuard = true; newConfig.stripLineNumbers = true; newConfig.deleteTempFiles = true; + newConfig.isWarningMissArchJava = true; + // Set server address LogHelper.println("LaunchServer address: "); newConfig.setAddress(commandHandler.readLine()); diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg index 32a03972..e2862de7 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg @@ -1,8 +1,8 @@ { "port": 7240, - "address": "xx.xx", + "address": "127.0.0.1", "bindAddress": "0.0.0.0", - "projectName": "XXX", + "projectName": "Test", "mirrors": [ "http://mirror.gravitlauncher.ml/" ], @@ -10,8 +10,7 @@ "env": "STD", "authProvider": [ { - "message": "Настройте authProvider", - "type": "reject" + "type": "accept" } ], "authHandler": { @@ -51,11 +50,12 @@ "authRateLimitMilis": 0, "authRejectString": "Превышен лимит авторизаций", "whitelistRejectString": "Вас нет в белом списке", - "genMappings": false, + "genMappings": true, "isUsingWrapper": false, "isDownloadJava": false, - "isWarningMissArchJava": false, + "isWarningMissArchJava": true, "enabledProGuard": true, "stripLineNumbers": true, + "deleteTempFiles": true, "startScript": ".\\start.sh" } \ No newline at end of file diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.10.2.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.10.2.cfg index 5c76b19b..b1fc0afd 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.10.2.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.10.2.cfg @@ -3,6 +3,7 @@ "assetIndex": "1.10.2", "assetDir": "asset1.10", "dir": "HiTech", + "info": "My Info", "sortIndex": 0, "title": "xxxxxxxx", "serverAddress": "localhost", diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.11.2.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.11.2.cfg index 66167135..6337cdae 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.11.2.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.11.2.cfg @@ -3,6 +3,7 @@ "assetIndex": "1.11.2", "assetDir": "asset1.11", "dir": "HiTech", + "info": "My Info", "sortIndex": 0, "title": "xxxxxxxx", "serverAddress": "localhost", diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.12.2.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.12.2.cfg index aaf069d5..5869c484 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.12.2.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.12.2.cfg @@ -3,6 +3,7 @@ "assetIndex": "1.12.2", "assetDir": "asset1.12", "dir": "HiTech", + "info": "My Info", "sortIndex": 0, "title": "xxxxxxxx", "serverAddress": "localhost", diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.1.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.1.cfg index c7966228..0b832494 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.1.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.1.cfg @@ -3,6 +3,7 @@ "assetIndex": "1.13.1", "assetDir": "asset1.13.1", "dir": "HiTech", + "info": "My Info", "sortIndex": 0, "title": "xxxxxxxx", "serverAddress": "localhost", diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.cfg index 74d024e5..d0bbdb1a 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.cfg @@ -3,6 +3,7 @@ "assetIndex": "1.13", "assetDir": "asset1.13", "dir": "HiTech", + "info": "My Info", "sortIndex": 0, "title": "xxxxxxxx", "serverAddress": "localhost", diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.4.7.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.4.7.cfg index 710653c8..a6517b83 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.4.7.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.4.7.cfg @@ -3,6 +3,7 @@ "assetIndex": "---", "assetDir": "asset1.4.7", "dir": "xxxxxxx", + "info": "My Info", "sortIndex": 0, "title": "Test1.4.7", "serverAddress": "localhost", diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.5.2.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.5.2.cfg index a7dfedc8..66c5a67b 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.5.2.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.5.2.cfg @@ -3,6 +3,7 @@ "assetIndex": "---", "assetDir": "asset1.5.2", "dir": "xxxxxxx", + "info": "My Info", "sortIndex": 0, "title": "Test1.5.2", "serverAddress": "localhost", diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.6.4.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.6.4.cfg index b8fdf49b..2937adc1 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.6.4.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.6.4.cfg @@ -3,6 +3,7 @@ "assetIndex": "---", "assetDir": "asset1.6.4", "dir": "xxxxxxx", + "info": "My Info", "sortIndex": 0, "title": "Test1.6.4", "serverAddress": "localhost", diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.10.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.10.cfg index 69ed799e..6bf71d1b 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.10.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.10.cfg @@ -3,6 +3,7 @@ "assetIndex": "1.7.10", "assetDir": "asset1.7.10", "dir": "xxxxxxx", + "info": "My Info", "sortIndex": 0, "title": "Test1.7.10", "serverAddress": "localhost", diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.2.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.2.cfg index 77b56668..598164f3 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.2.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.2.cfg @@ -3,6 +3,7 @@ "assetIndex": "1.7.2", "assetDir": "asset1.7.2", "dir": "xxxxxxx", + "info": "My Info", "sortIndex": 0, "title": "Test1.7.2", "serverAddress": "localhost", diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.8.9.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.8.9.cfg index b91d21c6..34d26418 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.8.9.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.8.9.cfg @@ -3,6 +3,7 @@ "assetIndex": "1.8.9", "assetDir": "asset1.8.9", "dir": "xxxxxxx", + "info": "My Info", "sortIndex": 0, "title": "Test1.8.9", "serverAddress": "localhost", diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.9.4.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.9.4.cfg index b8cacf46..4d4dde69 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.9.4.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.9.4.cfg @@ -3,6 +3,7 @@ "assetIndex": "1.9.4", "assetDir": "asset1.9.4", "dir": "xxxxxxx", + "info": "My Info", "sortIndex": 0, "title": "Test1.9.4", "serverAddress": "localhost", diff --git a/Launcher/runtime/init.js b/Launcher/runtime/init.js index 34fca1c3..6763c970 100644 --- a/Launcher/runtime/init.js +++ b/Launcher/runtime/init.js @@ -52,7 +52,6 @@ function setCurrentScene(scene) { rootPane = scene.getRoot(); dimPane = rootPane.lookup("#mask"); stage.sizeToScene(); - stage.centerOnScreen(); stage.show(); }