Merge pull request #2 from GravitLauncher/dev

Dev

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'

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();

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

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 {
+#overlay>#description.error {
-    -fx-text-fill: red;
+    -fx-text-fill: #CE5757;
 }
+
+
 /*-- DrLeonardo Design --*/

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 */

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<NewLauncherSettings.HashedStoreEntry> lastEn = new AtomicReference<>(null);
-            ArrayList<String> removed = new ArrayList<>();
+            //ArrayList<String> removed = new ArrayList<>();
             diff.mismatch.walk(File.separator, (path, name, entry) -> {
                 if(entry.getType() == HashedEntry.Type.DIR) {
                     Files.createDirectories(request.getDir().resolve(path));

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;

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'
 }

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;

settings.gradle

@@ -2,7 +2,7 @@
 
 include 'Launcher'
 include 'Radon'
-include 'libLauncher'
+include 'LauncherCore'
 include 'LauncherAPI'
 include 'LauncherAuthlib'
 include 'ServerWrapper'