Merge branch 'release/5.0.2'

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'

LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java

@@ -252,6 +252,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;
@@ -263,8 +265,8 @@ public static class ExeConf {
         public String txtFileVersion;
         public String txtProductVersion;
     }
-    public static class NettyUpdatesBind
+
-    {
+    public static class NettyUpdatesBind {
         public String url;
         public boolean zip;
     }
@@ -705,6 +707,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);

LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateResponse.java

@@ -40,8 +40,7 @@ public void execute(ChannelHandlerContext ctx, Client client) {
         }
         String url = LaunchServer.server.config.netty.downloadURL.replace("%dirname%", dirName);
         boolean zip = false;
-        if (server.config.netty.bindings.get(dirName) != null)
+        if (server.config.netty.bindings.get(dirName) != null) {
-        {
             LaunchServer.NettyUpdatesBind bind = server.config.netty.bindings.get(dirName);
             url = bind.url;
             zip = bind.zip;

Launcher/runtime/dialog/overlay/settings/settings.fxml

@@ -13,55 +13,39 @@
 
 <!-- DrLeonardo Design -->
 
-<Pane fx:id="overlay" prefHeight="450.0" prefWidth="693.0" xmlns="http://javafx.com/javafx/8.0.201"
+<Pane fx:id="overlay" prefHeight="450.0" prefWidth="693.0" xmlns="http://javafx.com/javafx/8.0.201" xmlns:fx="http://javafx.com/fxml/1">
-      xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <Pane id="holder" prefHeight="450.0" prefWidth="694.0">
             <children>
-                <JFXCheckBox fx:id="autoEnter" checkedColor="#5fd97a" layoutX="14.0" layoutY="137.0"
+                <JFXCheckBox fx:id="autoEnter" checkedColor="#5fd97a" layoutX="14.0" layoutY="137.0" text="Автовход на сервер" unCheckedColor="#909090" />
-                             text="Автовход на сервер" unCheckedColor="#909090"/>
+                <Text fill="#8c8c8c" layoutX="40.0" layoutY="153.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение авто-входа означает что вы сразу после загрузки клиента попадете на сервер" wrappingWidth="636.9999872148037" y="15.0" />
-                <Text fill="#8c8c8c" layoutX="40.0" layoutY="153.0" strokeType="OUTSIDE" strokeWidth="0.0"
+                <JFXCheckBox fx:id="fullScreen" checkedColor="#5fd97a" layoutX="13.0" layoutY="244.0" text="Клиент в полный экран" unCheckedColor="#909090" />
-                      text="Включение авто-входа означает что вы сразу после загрузки клиента попадете на сервер"
+                <Text fill="#8c8c8c" layoutX="40.0" layoutY="261.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение данной функции позволяет запустить игру сразу в полноэкранном режиме" wrappingWidth="636.9999872148037" y="15.0" />
-                      wrappingWidth="636.9999872148037" y="15.0"/>
+                <JFXCheckBox id="debug" checkedColor="#5fd97a" layoutX="13.0" layoutY="183.0" text="Режим Отладки" unCheckedColor="#909090" />
-                <JFXCheckBox fx:id="fullScreen" checkedColor="#5fd97a" layoutX="13.0" layoutY="260.0"
+                <Text fill="#8c8c8c" layoutX="40.0" layoutY="198.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Режим отладки позволяет просмотреть лог запуска и работы программы в реальном времени прямо из лаунчера, что упрощает поиск нужной информации" wrappingWidth="637.0000016447157" y="15.0" />
-                             text="Клиент в полный экран" unCheckedColor="#909090"/>
-                <Text fill="#8c8c8c" layoutX="40.0" layoutY="277.0" strokeType="OUTSIDE" strokeWidth="0.0"
-                      text="Включение данной функции позволяет запустить игру сразу в полноэкранном режиме"
-                      wrappingWidth="636.9999872148037" y="15.0"/>
-                <JFXCheckBox id="debug" checkedColor="#5fd97a" layoutX="13.0" layoutY="193.0" text="Режим Отладки"
-                             unCheckedColor="#909090"/>
-                <Text fill="#8c8c8c" layoutX="40.0" layoutY="208.0" strokeType="OUTSIDE" strokeWidth="0.0"
-                      text="Режим отладки позволяет просмотреть лог запуска и работы программы в реальном времени прямо из лаунчера, что упрощает поиск нужной информации"
-                      wrappingWidth="637.0000016447157" y="15.0"/>
                 <TextFlow layoutX="126.0" layoutY="15.0" prefHeight="16.0" prefWidth="112.0">
                     <Text fx:id="ramLabel" />
                 </TextFlow>
-                <JFXButton fx:id="deleteDir" layoutX="370.0" layoutY="380.0" prefHeight="25.0" prefWidth="245.0"
+                <JFXButton fx:id="deleteDir" layoutX="370.0" layoutY="380.0" prefHeight="25.0" prefWidth="245.0" text="Удалить клиенты" textAlignment="CENTER" wrapText="true" />
-                           text="Удалить клиенты" textAlignment="CENTER" wrapText="true"/>
+                <JFXButton fx:id="changeDir" layoutY="419.0" prefHeight="30.0" prefWidth="200.0" text="Сменить директорию загрузки" textAlignment="CENTER" wrapText="true" />
-                <JFXButton fx:id="changeDir" layoutY="419.0" prefHeight="30.0" prefWidth="200.0"
+                <Hyperlink id="dirLabel" alignment="BASELINE_LEFT" layoutX="201.0" layoutY="420.0" prefHeight="30.0" prefWidth="493.0" text="C:/Users" />
-                           text="Сменить директорию загрузки" textAlignment="CENTER" wrapText="true"/>
+                <JFXButton fx:id="apply" defaultButton="true" layoutX="530.0" layoutY="380.0" prefHeight="23.0" prefWidth="100.0" text="Применить" />
-                <Hyperlink id="dirLabel" alignment="BASELINE_LEFT" layoutX="201.0" layoutY="420.0" prefHeight="30.0"
-                           prefWidth="493.0" text="C:/Users"/>
-                <JFXButton fx:id="apply" defaultButton="true" layoutX="530.0" layoutY="380.0" prefHeight="23.0"
-                           prefWidth="100.0" text="Применить"/>
                 <Text layoutX="16.0" layoutY="28.0">Выделение памяти:</Text>
                 <JFXSlider fx:id="ramSlider" layoutX="14.0" layoutY="76.0" prefHeight="14.0" prefWidth="663.0" />
                 <Pane fx:id="transferDialog" prefHeight="425.0" prefWidth="694.0" visible="false">
                     <children>
-                        <Text fill="WHITE" layoutX="147.0" layoutY="198.0" strokeType="OUTSIDE" strokeWidth="0.0"
+                        <Text fill="WHITE" layoutX="147.0" layoutY="198.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Перенести все данные в новую директорию?" wrappingWidth="400.13671875">
-                              text="Перенести все данные в новую директорию?" wrappingWidth="400.13671875">
                             <font>
                                 <Font size="19.0" />
                             </font>
                         </Text>
-                        <JFXButton fx:id="applyTransfer" layoutX="165.0" layoutY="226.0" mnemonicParsing="false"
+                        <JFXButton fx:id="applyTransfer" layoutX="165.0" layoutY="226.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="124.0" text="Да, перенести!" />
-                                   prefHeight="25.0" prefWidth="124.0" text="Да, перенести!"/>
+                        <JFXButton fx:id="cancelTransfer" layoutX="379.0" layoutY="226.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="124.0" text="Нет, не нужно." />
-                        <JFXButton fx:id="cancelTransfer" layoutX="379.0" layoutY="226.0" mnemonicParsing="false"
-                                   prefHeight="25.0" prefWidth="124.0" text="Нет, не нужно."/>
                     </children>
                 </Pane>
-                <Line endX="594.0" layoutX="100.0" layoutY="420.0" startX="-100.0" stroke="#5b3636"
+                <Line endX="594.0" layoutX="100.0" layoutY="420.0" startX="-100.0" stroke="#5b3636" styleClass="lineHead" />
-                      styleClass="lineHead"/>
+            <JFXCheckBox fx:id="featureStore" checkedColor="#5fd97a" layoutX="13.0" layoutY="292.0" text="Поиск файлов в других клиентах" unCheckedColor="#909090" />
+            <Text fill="#8c8c8c" layoutX="40.0" layoutY="309.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Используется для экономии вашего трафика, аналогичные файлы будут скопированы с других игровых клиентов" wrappingWidth="636.9999872148037" y="15.0" />
             </children>
         </Pane>
     </children>

Launcher/runtime/dialog/overlay/settings/settings.js

@@ -33,6 +33,11 @@ var settingsOverlay = {
             }
         });
 
+        var featureStore = holder.lookup("#featureStore");
+        featureStore.setSelected(settings.featureStore);
+        featureStore.selectedProperty()["addListener(javafx.beans.value.ChangeListener)"](
+            function(o, ov, nv) settings.featureStore = nv);
+
         var fullScreenBox = holder.lookup("#fullScreen");
         fullScreenBox.setSelected(settings.fullScreen);
         fullScreenBox.selectedProperty()["addListener(javafx.beans.value.ChangeListener)"](
@@ -145,7 +150,7 @@ LogHelper.debug("Dir: %s", DirBridge.dir);
 var cliParams = {
     login: null, password: null, profile: -1, autoLogin: false,
     updatesDir: null, autoEnter: null, fullScreen: null, ram: -1,
-    offline: false,
+    offline: false, featureStore: null,
 
     init: function(params) {
         var named = params.getNamed();
@@ -167,6 +172,10 @@ var cliParams = {
         if (autoEnter !== null) {
             cliParams.autoEnter = java.lang.Boolean.parseBoolean(autoEnter);
         }
+        var featureStore = named.get("featureStore");
+        if (featureStore !== null) {
+            cliParams.featureStore = java.lang.Boolean.parseBoolean(featureStore);
+        }
         var fullScreen = named.get("fullScreen");
         if (fullScreen !== null) {
             cliParams.fullScreen = java.lang.Boolean.parseBoolean(fullScreen);
@@ -175,7 +184,6 @@ var cliParams = {
         if (ram !== null) {
             cliParams.ram = java.lang.Integer.parseInt(ram);
         }
-
         var offline = named.get("offline");
         if (offline !== null) {
             cliParams.offline = java.lang.Boolean.parseBoolean(offline);
@@ -192,19 +200,20 @@ var cliParams = {
         if (cliParams.profile >= 0) {
             settings.profile = cliParams.profile;
         }
-
         if (cliParams.updatesDir !== null) {
         }
         if (cliParams.autoEnter !== null) {
             settings.autoLogin = cliParams.autoEnter;
         }
+        if (cliParams.featureStore !== null) {
+            settings.featureStore = cliParams.featureStore;
+        }
         if (cliParams.fullScreen !== null) {
             settings.fullScreen = cliParams.fullScreen;
         }
         if (cliParams.ram >= 0) {
             settingsOverlay.setRAM(cliParams.ram);
         }
-
         if (cliParams.offline !== null) {
             settings.offline = cliParams.offline;
         }

Launcher/runtime/dialog/scenes/options/options.fxml

@@ -18,9 +18,9 @@
        <Pane id="optionsPane" prefHeight="450.0" prefWidth="692.0" styleClass="optionsPane">
            <children>
            <Line endX="595.0" layoutX="100.0" layoutY="46.0" startX="-100.0" stroke="#5b3636" styleClass="lineHead" />
-           <ScrollPane id="modlist" layoutY="46.0" prefHeight="402.0" prefWidth="693.0">
+           <ScrollPane id="modlist" layoutY="46.0" prefHeight="404.0" prefWidth="693.0">
                <content>
-                   <VBox prefHeight="397.0" prefWidth="678.0">
+                   <VBox prefHeight="394.0" prefWidth="678.0">
                        <children>
                        </children>
                        <padding>

Launcher/runtime/dialog/scenes/options/options.js

@@ -137,11 +137,11 @@ var options = {
                              textDescr = new javafx.scene.text.Text(modDescription);
                              if(subLevel > 1) {
                                  for(var i = 1; i < subLevel; i++){
-                                    textDescr.setWrappingWidth(630-(25*i));
+                                    textDescr.setWrappingWidth(620-(25*i));
                                     textDescr.setTranslateX(25+(25*i));
                                  }
                              } else {
-                                 textDescr.setWrappingWidth(630);
+                                 textDescr.setWrappingWidth(620);
                                  textDescr.setTranslateX(25);
                              }
                              textDescr.setTextAlignment(javafx.scene.text.TextAlignment.JUSTIFY);

Launcher/src/main/java/ru/gravit/launcher/bridge/GravitGuardBridge.java

@@ -0,0 +1,22 @@
+package ru.gravit.launcher.bridge;
+
+import ru.gravit.launcher.LauncherAPI;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+@LauncherAPI
+public class GravitGuardBridge {
+    @LauncherAPI
+    public static native void callGuard();
+
+    @LauncherAPI
+    public static int sendHTTPRequest(String strurl) throws IOException {
+        URL url = new URL(strurl);
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        connection.setRequestMethod("GET");
+        connection.setRequestProperty("Content-Language", "en-US");
+        return connection.getResponseCode();
+    }
+}

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;
 
@@ -35,11 +34,10 @@ public void preDiff(UpdateRequest request, UpdateRequestEvent e) {
     @Override
     public void postDiff(UpdateRequest request, UpdateRequestEvent e, HashedDir.Diff diff) throws IOException {
         if (e.zip) return;
-        if(SettingsManager.settings.featureStore)
+        if (SettingsManager.settings.featureStore) {
-        {
             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));
@@ -48,24 +46,19 @@ public void postDiff(UpdateRequest request, UpdateRequestEvent e, HashedDir.Diff
                 HashedFile file = (HashedFile) entry;
                 //Первый экспериментальный способ - честно обходим все возможные Store
                 Path ret = null;
-                if(lastEn.get() == null)
+                if (lastEn.get() == null) {
-                {
+                    for (NewLauncherSettings.HashedStoreEntry en : SettingsManager.settings.lastHDirs) {
-                    for(NewLauncherSettings.HashedStoreEntry en : SettingsManager.settings.lastHDirs)
-                    {
                         ret = tryFind(en, file);
                         if (ret != null) {
                             lastEn.set(en);
                             break;
                         }
                     }
-                }
+                } else {
-                else {
                     ret = tryFind(lastEn.get(), file);
                 }
-                if(ret == null)
+                if (ret == null) {
-                {
+                    for (NewLauncherSettings.HashedStoreEntry en : SettingsManager.settings.lastHDirs) {
-                    for(NewLauncherSettings.HashedStoreEntry en : SettingsManager.settings.lastHDirs)
-                    {
                         ret = tryFind(en, file);
                         if (ret != null) {
                             lastEn.set(en);
@@ -73,8 +66,7 @@ public void postDiff(UpdateRequest request, UpdateRequestEvent e, HashedDir.Diff
                         }
                     }
                 }
-                if(ret != null)
+                if (ret != null) {
-                {
                     //Еще раз проверим корректность хеша
                     //Возможно эта проверка избыточна
                     //if(file.isSame(ret, true))
@@ -83,8 +75,7 @@ public void postDiff(UpdateRequest request, UpdateRequestEvent e, HashedDir.Diff
                         LogHelper.debug("Copy file %s to %s", ret.toAbsolutePath().toString(), source.toAbsolutePath().toString());
                         //Let's go!
                         Files.copy(ret, source);
-                        try(InputStream input = IOHelper.newInput(ret))
+                        try (InputStream input = IOHelper.newInput(ret)) {
-                        {
                             IOHelper.transfer(input, source);
                         }
                         entry.flag = true;
@@ -95,25 +86,22 @@ public void postDiff(UpdateRequest request, UpdateRequestEvent e, HashedDir.Diff
             });
         }
     }
-    public Path tryFind(NewLauncherSettings.HashedStoreEntry en, HashedFile file) throws IOException
+
-    {
+    public Path tryFind(NewLauncherSettings.HashedStoreEntry en, HashedFile file) throws IOException {
         AtomicReference<Path> ret = new AtomicReference<>(null);
         en.hdir.walk(File.separator, (path, name, entry) -> {
             if (entry.getType() == HashedEntry.Type.DIR) return HashedDir.WalkAction.CONTINUE;
             HashedFile tfile = (HashedFile) entry;
-            if(tfile.isSame(file))
+            if (tfile.isSame(file)) {
-            {
                 LogHelper.dev("[DIR:%s] Found file %s in %s", en.name, name, path);
                 Path tdir = Paths.get(en.fullPath).resolve(path);
                 try {
-                    if(tfile.isSame(tdir, true))
+                    if (tfile.isSame(tdir, true)) {
-                    {
                         LogHelper.dev("[DIR:%s] Confirmed file %s in %s", en.name, name, path);
                         ret.set(tdir);
                         return HashedDir.WalkAction.STOP;
                     }
-                } catch (IOException e)
+                } catch (IOException e) {
-                {
                     LogHelper.error("Check file error %s %s", e.getClass().getName(), e.getMessage());
                 }
             }

Launcher/src/main/java/ru/gravit/launcher/console/FeatureCommand.java

@@ -19,15 +19,12 @@ public String getUsageDescription() {
     public void invoke(String... args) throws Exception {
         verifyArgs(args, 2);
         boolean enabled = Boolean.valueOf(args[1]);
-        switch (args[0])
+        switch (args[0]) {
-        {
+            case "store": {
-            case "store":
-            {
                 SettingsManager.settings.featureStore = enabled;
                 break;
             }
-            default:
+            default: {
-            {
                 LogHelper.info("Features: [store]");
                 return;
             }

Launcher/src/main/java/ru/gravit/launcher/console/store/CopyStoreDirCommand.java

@@ -26,20 +26,16 @@ public void invoke(String... args) throws Exception {
         int ind = 1;
         int index = Integer.valueOf(args[0]);
         boolean overwrite = Boolean.valueOf(args[1]);
-        for(NewLauncherSettings.HashedStoreEntry e : SettingsManager.settings.lastHDirs)
+        for (NewLauncherSettings.HashedStoreEntry e : SettingsManager.settings.lastHDirs) {
-        {
+            if (ind == index) {
-            if(ind == index)
-            {
                 LogHelper.info("Copy [%d] FullPath: %s name: %s", ind, e.fullPath, e.name);
                 Path path = Paths.get(e.fullPath);
-                if(!Files.isDirectory(path))
+                if (!Files.isDirectory(path)) {
-                {
                     LogHelper.error("Directory %s not found", path.toAbsolutePath().toString());
                     return;
                 }
                 Path target = Paths.get(SettingsManager.settings.updatesDirPath).resolve(e.name);
-                if(Files.exists(target) && !overwrite)
+                if (Files.exists(target) && !overwrite) {
-                {
                     LogHelper.error("Directory %s found, flag overwrite not found", target.toAbsolutePath().toString());
                     return;
                 }

Launcher/src/main/java/ru/gravit/launcher/console/store/LinkStoreDirCommand.java

@@ -26,20 +26,16 @@ public void invoke(String... args) throws Exception {
         verifyArgs(args, 1);
         int ind = 1;
         int index = Integer.valueOf(args[0]);
-        for(NewLauncherSettings.HashedStoreEntry e : SettingsManager.settings.lastHDirs)
+        for (NewLauncherSettings.HashedStoreEntry e : SettingsManager.settings.lastHDirs) {
-        {
+            if (ind == index) {
-            if(ind == index)
-            {
                 LogHelper.info("Copy [%d] FullPath: %s name: %s", ind, e.fullPath, e.name);
                 Path path = Paths.get(e.fullPath);
-                if(!Files.isDirectory(path))
+                if (!Files.isDirectory(path)) {
-                {
                     LogHelper.error("Directory %s not found", path.toAbsolutePath().toString());
                     return;
                 }
                 Path target = Paths.get(SettingsManager.settings.updatesDirPath).resolve(e.name);
-                if(Files.exists(target))
+                if (Files.exists(target)) {
-                {
                     LogHelper.error("Directory %s already exists", target.toAbsolutePath().toString());
                     return;
                 }

Launcher/src/main/java/ru/gravit/launcher/console/store/StoreListCommand.java

@@ -19,8 +19,7 @@ public String getUsageDescription() {
     @Override
     public void invoke(String... args) throws Exception {
         int ind = 1;
-        for(NewLauncherSettings.HashedStoreEntry e : SettingsManager.settings.lastHDirs)
+        for (NewLauncherSettings.HashedStoreEntry e : SettingsManager.settings.lastHDirs) {
-        {
             LogHelper.info("[%d] FullPath: %s name: %s", ind, e.fullPath, e.name);
             ind++;
         }

Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGravitGuard.java

@@ -0,0 +1,94 @@
+package ru.gravit.launcher.guard;
+
+import ru.gravit.launcher.Launcher;
+import ru.gravit.launcher.LauncherConfig;
+import ru.gravit.launcher.bridge.GravitGuardBridge;
+import ru.gravit.launcher.client.ClientLauncher;
+import ru.gravit.launcher.client.ClientLauncherContext;
+import ru.gravit.launcher.client.DirBridge;
+import ru.gravit.utils.helper.IOHelper;
+import ru.gravit.utils.helper.JVMHelper;
+import ru.gravit.utils.helper.UnpackHelper;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.Map;
+
+//Используется для всех типов защит, совместимых с новым GravitGuard API
+public class LauncherGravitGuard implements LauncherGuardInterface {
+    public String protectToken;
+    public Path javaBinPath;
+
+    @Override
+    public String getName() {
+        return "wrapper";
+    }
+
+    @Override
+    public Path getJavaBinPath() {
+        if (JVMHelper.OS_TYPE == JVMHelper.OS.MUSTDIE) {
+            String projectName = Launcher.getConfig().projectname;
+            String wrapperUnpackName = JVMHelper.JVM_BITS == 64 ? projectName.concat("64.exe") : projectName.concat("32.exe");
+            return DirBridge.getGuardDir().resolve(wrapperUnpackName);
+        } else if (ClientLauncher.getJavaBinPath() != null) {
+            javaBinPath = ClientLauncher.getJavaBinPath();
+            String projectName = Launcher.getConfig().projectname;
+            String wrapperUnpackName = JVMHelper.JVM_BITS == 64 ? projectName.concat("64.exe") : projectName.concat("32.exe");
+            return DirBridge.getGuardDir().resolve(wrapperUnpackName);
+        } else
+            return IOHelper.resolveJavaBin(Paths.get(System.getProperty("java.home")));
+    }
+
+    @Override
+    public int getClientJVMBits() {
+        return JVMHelper.JVM_BITS;
+    }
+
+    @Override
+    public void init(boolean clientInstance) {
+        try {
+            String wrapperName = JVMHelper.JVM_BITS == 64 ? "wrapper64.exe" : "wrapper32.exe";
+            String projectName = Launcher.getConfig().projectname;
+            String wrapperUnpackName = JVMHelper.JVM_BITS == 64 ? projectName.concat("64.exe") : projectName.concat("32.exe");
+            String antiInjectName = JVMHelper.JVM_BITS == 64 ? "AntiInject64.dll" : "AntiInject32.dll";
+            UnpackHelper.unpack(Launcher.getResourceURL(wrapperName, "guard"), DirBridge.getGuardDir().resolve(wrapperUnpackName));
+            UnpackHelper.unpack(Launcher.getResourceURL(antiInjectName, "guard"), DirBridge.getGuardDir().resolve(antiInjectName));
+        } catch (IOException e) {
+            throw new SecurityException(e);
+        }
+        if (clientInstance) GravitGuardBridge.callGuard();
+    }
+
+    @Override
+    public void addCustomParams(ClientLauncherContext context) {
+        Collections.addAll(context.args, "-Djava.class.path=".concat(context.pathLauncher));
+    }
+
+    @Override
+    public void addCustomEnv(ClientLauncherContext context) {
+        Map<String, String> env = context.builder.environment();
+        if (javaBinPath == null)
+            env.put("JAVA_HOME", System.getProperty("java.home"));
+        else
+            env.put("JAVA_HOME", javaBinPath.toAbsolutePath().toString());
+        LauncherConfig config = Launcher.getConfig();
+        env.put("GUARD_BRIDGE", GravitGuardBridge.class.getName());
+        env.put("GUARD_USERNAME", context.playerProfile.username);
+        env.put("GUARD_PUBLICKEY", config.publicKey.getModulus().toString(16));
+        env.put("GUARD_PROJECTNAME", config.projectname);
+        if (protectToken != null)
+            env.put("GUARD_TOKEN", protectToken);
+        if (config.guardLicenseName != null)
+            env.put("GUARD_LICENSE_NAME", config.guardLicenseName);
+        if (config.guardLicenseKey != null) {
+            env.put("GUARD_LICENSE_KEY", config.guardLicenseKey);
+        }
+    }
+
+    @Override
+    public void setProtectToken(String token) {
+        protectToken = token;
+    }
+}

Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardManager.java

@@ -11,6 +11,10 @@ public class LauncherGuardManager {
     public static void initGuard(boolean clientInstance) {
         LauncherConfig config = Launcher.getConfig();
         switch (config.guardType) {
+            case "gravitguard": {
+                guard = new LauncherGravitGuard();
+                break;
+            }
             case "wrapper": {
                 guard = new LauncherWrapperGuard();
                 break;

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;

Launcher/src/main/java/ru/gravit/launcher/managers/SettingsManager.java

@@ -25,8 +25,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
                 String fullPath = input.readString(1024);
                 HashedDir dir = new HashedDir(input);
                 settings.lastHDirs.add(new NewLauncherSettings.HashedStoreEntry(dir, dirName, fullPath));
-            } catch (IOException e)
+            } catch (IOException e) {
-            {
                 LogHelper.error("Skip file %s exception: %s", file.toAbsolutePath().toString(), e.getMessage());
             }
             return super.visitFile(file, attrs);
@@ -61,10 +60,8 @@ public void setConfig(NewLauncherSettings config) {
         settings = config;
         if (settings.updatesDirPath != null)
             settings.updatesDir = Paths.get(settings.updatesDirPath);
-        if(settings.consoleUnlockKey != null && !ConsoleManager.isConsoleUnlock)
+        if (settings.consoleUnlockKey != null && !ConsoleManager.isConsoleUnlock) {
-        {
+            if (ConsoleManager.checkUnlockKey(settings.consoleUnlockKey)) {
-            if(ConsoleManager.checkUnlockKey(settings.consoleUnlockKey))
-            {
                 ConsoleManager.unlock();
                 LogHelper.info("Console auto unlocked");
             }

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/config/JsonConfigurable.java

@@ -33,7 +33,7 @@ public JsonConfigurable(Type type, Path configPath) {
     @LauncherAPI
     public void saveConfig(Path configPath) throws IOException {
         try (BufferedWriter writer = IOHelper.newWriter(configPath)) {
-            Launcher.gsonManager.gson.toJson(getConfig(), type, writer);
+            Launcher.gsonManager.configGson.toJson(getConfig(), type, writer);
         }
     }
 
@@ -41,7 +41,7 @@ public void saveConfig(Path configPath) throws IOException {
     public void loadConfig(Path configPath) throws IOException {
         if (generateConfigIfNotExists(configPath)) return;
         try (BufferedReader reader = IOHelper.newReader(configPath)) {
-            setConfig(Launcher.gsonManager.gson.fromJson(reader, type));
+            setConfig(Launcher.gsonManager.configGson.fromJson(reader, type));
         }
     }
 

LauncherAPI/src/main/java/ru/gravit/launcher/downloader/ListDownloader.java

@@ -62,6 +62,7 @@ public void download(String base, List<DownloadTask> applies, Path dstDirFile, D
             }
         }
     }
+
     public void downloadZip(String base, Path dstDirFile, DownloadCallback callback, DownloadTotalCallback totalCallback) throws IOException, URISyntaxException {
         /*try (CloseableHttpClient httpclient = HttpClients.custom()
                 .setRedirectStrategy(new LaxRedirectStrategy())
@@ -132,23 +133,18 @@ public FileDownloadResponseHandler(Path target, DownloadCallback callback, Downl
         @Override
         public Path handleResponse(HttpResponse response) throws IOException {
             InputStream source = response.getEntity().getContent();
-            if(zip)
+            if (zip) {
-            {
+                try (ZipInputStream input = IOHelper.newZipInput(source)) {
-                try(ZipInputStream input = IOHelper.newZipInput(source))
-                {
                     ZipEntry entry = input.getNextEntry();
-                    while(entry != null)
+                    while (entry != null) {
-                    {
+                        if (entry.isDirectory()) {
-                        if(entry.isDirectory())
-                        {
                             entry = input.getNextEntry();
                             continue;
                         }
                         long size = entry.getSize();
                         String filename = entry.getName();
                         Path target = this.target.resolve(filename);
-                        if(callback != null)
+                        if (callback != null) {
-                        {
                             callback.stateChanged(entry.getName(), 0, entry.getSize());
                         }
                         LogHelper.dev("Resolved filename %s to %s", filename, target.toAbsolutePath().toString());

LauncherAPI/src/main/java/ru/gravit/launcher/request/UpdateAction.java

@@ -1,60 +0,0 @@
-package ru.gravit.launcher.request;
-
-import ru.gravit.launcher.hasher.HashedEntry;
-import ru.gravit.launcher.serialize.HInput;
-import ru.gravit.launcher.serialize.HOutput;
-import ru.gravit.launcher.serialize.stream.EnumSerializer;
-import ru.gravit.launcher.serialize.stream.StreamObject;
-import ru.gravit.utils.helper.IOHelper;
-
-import java.io.IOException;
-
-public final class UpdateAction extends StreamObject {
-    public enum Type implements EnumSerializer.Itf {
-        CD(1), CD_BACK(2), GET(3), FINISH(255);
-        private static final EnumSerializer<Type> SERIALIZER = new EnumSerializer<>(Type.class);
-
-        public static Type read(HInput input) throws IOException {
-            return SERIALIZER.read(input);
-        }
-
-        private final int n;
-
-        Type(int n) {
-            this.n = n;
-        }
-
-        @Override
-        public int getNumber() {
-            return n;
-        }
-    }
-
-    public static final UpdateAction CD_BACK = new UpdateAction(Type.CD_BACK, null, null);
-
-    public static final UpdateAction FINISH = new UpdateAction(Type.FINISH, null, null);
-    // Instance
-    public final Type type;
-    public final String name;
-
-    public final HashedEntry entry;
-
-    public UpdateAction(HInput input) throws IOException {
-        type = Type.read(input);
-        name = type == Type.CD || type == Type.GET ? IOHelper.verifyFileName(input.readString(255)) : null;
-        entry = null;
-    }
-
-    public UpdateAction(Type type, String name, HashedEntry entry) {
-        this.type = type;
-        this.name = name;
-        this.entry = entry;
-    }
-
-    @Override
-    public void write(HOutput output) throws IOException {
-        EnumSerializer.write(output, type);
-        if (type == Type.CD || type == Type.GET)
-            output.writeString(name, 255);
-    }
-}

LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java

@@ -27,15 +27,20 @@
 import java.util.Objects;
 
 public final class UpdateRequest extends Request<UpdateRequestEvent> implements RequestInterface {
-    public interface UpdateController
+    public interface UpdateController {
-    {
         void preUpdate(UpdateRequest request, UpdateRequestEvent e) throws IOException;
+
         void preDiff(UpdateRequest request, UpdateRequestEvent e) throws IOException;
+
         void postDiff(UpdateRequest request, UpdateRequestEvent e, HashedDir.Diff diff) throws IOException;
+
         void preDownload(UpdateRequest request, UpdateRequestEvent e, List<ListDownloader.DownloadTask> adds) throws IOException;
+
         void postDownload(UpdateRequest request, UpdateRequestEvent e) throws IOException;
+
         void postUpdate(UpdateRequest request, UpdateRequestEvent e) throws IOException;
     }
+
     private static UpdateController controller;
 
     public static void setController(UpdateController controller) {
@@ -194,8 +199,7 @@ public UpdateRequestEvent requestDo(StandartClientWebSocketService service) thro
         if (controller != null) controller.preDownload(this, e, adds);
         diff.mismatch.walk(IOHelper.CROSS_SEPARATOR, (path, name, entry) -> {
             if (entry.getType().equals(HashedEntry.Type.FILE)) {
-                if(!entry.flag)
+                if (!entry.flag) {
-                {
                     HashedFile file = (HashedFile) entry;
                     totalSize += file.size;
                     adds.add(new ListDownloader.DownloadTask(path, file.size));
@@ -214,12 +218,9 @@ public UpdateRequestEvent requestDo(StandartClientWebSocketService service) thro
         updateState("UnknownFile", 0L, 100);
         ListDownloader listDownloader = new ListDownloader();
         LogHelper.info("Download %s to %s", dirName, dir.toAbsolutePath().toString());
-        if(e.zip && !adds.isEmpty())
+        if (e.zip && !adds.isEmpty()) {
-        {
             listDownloader.downloadZip(e.url, dir, this::updateState, (add) -> totalDownloaded += add);
-        }
+        } else {
-        else
-        {
             listDownloader.download(e.url, adds, dir, this::updateState, (add) -> totalDownloaded += add);
         }
         if (controller != null) controller.postDownload(this, e);

LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/StandartClientWebSocketService.java

@@ -63,7 +63,7 @@ public ResultInterface get() throws InterruptedException, ExecutionException {
             }
             ResultInterface result = event.result;
             waitEventHandler.requests.remove(event);
-            if (event.result.getType().equals("error")) {
+            if (event.result.getType().equals("error") || event.result.getType().equals("exception")) {
                 ErrorRequestEvent errorRequestEvent = (ErrorRequestEvent) event.result;
                 throw new ExecutionException(new RequestException(errorRequestEvent.error));
             }
@@ -80,7 +80,7 @@ public ResultInterface get(long timeout, TimeUnit unit) throws InterruptedExcept
             }
             ResultInterface result = event.result;
             waitEventHandler.requests.remove(event);
-            if (event.result.getType().equals("error")) {
+            if (event.result.getType().equals("error") || event.result.getType().equals("exception")) {
                 ErrorRequestEvent errorRequestEvent = (ErrorRequestEvent) event.result;
                 throw new ExecutionException(new RequestException(errorRequestEvent.error));
             }

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;

LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java

@@ -32,9 +32,9 @@ public void handlerAdded(final ChannelHandlerContext ctx) throws Exception {
     public void channelActive(final ChannelHandlerContext ctx) throws Exception {
         handshaker.handshake(ctx.channel());
         clientJSONPoint.onOpen();
-        ctx.executor().schedule(() -> {
+        ctx.executor().scheduleWithFixedDelay(() -> {
             ctx.channel().writeAndFlush(new PingWebSocketFrame());
-        }, 20L, TimeUnit.SECONDS);
+        }, 20L, 20L, TimeUnit.SECONDS);
     }
 
     @Override
@@ -66,6 +66,10 @@ protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Except
             LogHelper.dev("Message: %s", textFrame.text());
             // uncomment to print request
             // logger.info(textFrame.text());
+        } else if ((frame instanceof PingWebSocketFrame)) {
+            frame.content().retain();
+            ctx.channel().writeAndFlush(new PongWebSocketFrame(frame.content()));
+            //return;
         } else if (frame instanceof PongWebSocketFrame) {
         } else if (frame instanceof CloseWebSocketFrame)
             ch.close();

LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedDir.java

@@ -342,8 +342,8 @@ public void walk(CharSequence separator, WalkCallback callback) throws IOExcepti
         String append = "";
         walk(append, separator, callback, true);
     }
-    public enum WalkAction
+
-    {
+    public enum WalkAction {
         STOP, CONTINUE
     }
 
@@ -356,13 +356,10 @@ private WalkAction walk(String append, CharSequence separator, WalkCallback call
         for (Map.Entry<String, HashedEntry> entry : map.entrySet()) {
             HashedEntry e = entry.getValue();
             if (e.getType() == Type.FILE) {
-                if (noSeparator)
+                if (noSeparator) {
-                {
                     WalkAction a = callback.walked(append + entry.getKey(), entry.getKey(), e);
                     if (a == WalkAction.STOP) return a;
-                }
+                } else {
-                else
-                {
                     WalkAction a = callback.walked(append + separator + entry.getKey(), entry.getKey(), e);
                     if (a == WalkAction.STOP) return a;
                 }

LauncherCore/src/main/java/ru/gravit/utils/Version.java

@@ -17,7 +17,7 @@ public final class Version {
     public final Type release;
     public static final int MAJOR = 5;
     public static final int MINOR = 0;
-    public static final int PATCH = 1;
+    public static final int PATCH = 2;
     public static final int BUILD = 1;
     public static final Version.Type RELEASE = Version.Type.STABLE;
 

LauncherCore/src/main/java/ru/gravit/utils/helper/LogHelper.java

@@ -113,8 +113,7 @@ public static void debug(String format, Object... args) {
 
     @LauncherAPI
     public static void dev(String format, Object... args) {
-        if(isDevEnabled())
+        if (isDevEnabled()) {
-        {
             dev(String.format(format, args));
         }
     }

modules

@@ -1 +1 @@
-Subproject commit b599517693c9d1c9a9045982ffa8068e1ed620c4
+Subproject commit 5c3aa4d10e6973799315c5befed2ecb7cd98b203

settings.gradle

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