Merge branch 'release/2.0.3'

GravitLauncher · Oct 13, 2021 · e0c8a44 · e0c8a44
2 parents 4854da1 + 2a2b6d7
commit e0c8a44
Show file tree

Hide file tree

Showing 17 changed files with 369 additions and 230 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ javafx {
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 group 'pro.gravit.launcher'
-version '2.0.2'
+version '2.0.3'
 def mainClassName = "pro.gravit.launcher.client.JavaRuntimeModule"
 
 task sourcesJar(type: Jar) {
@@ -55,9 +55,9 @@ repositories {
 }
 
 dependencies {
-    implementation "pro.gravit.launcher:launcher-core:5.2.2"
-    implementation "pro.gravit.launcher:launcher-ws-api:5.2.2"
-    implementation "pro.gravit.launcher:launcher-client-api:5.2.2"
+    implementation "pro.gravit.launcher:launcher-core:5.2.3-SNAPSHOT"
+    implementation "pro.gravit.launcher:launcher-ws-api:5.2.3-SNAPSHOT"
+    implementation "pro.gravit.launcher:launcher-client-api:5.2.3-SNAPSHOT"
     implementation "pro.gravit.utils.enfs:enfs:1.0.0-SNAPSHOT"
     implementation 'io.netty:netty-codec-http:4.1.67.Final'
     implementation 'com.github.oshi:oshi-core:5.8.1'

diff --git a/runtime/scenes/settings/settings.fxml b/runtime/scenes/settings/settings.fxml
@@ -13,8 +13,10 @@
       xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
 
     <!-- Навбар -->
-    <Pane id="header" prefHeight="100.0" prefWidth="900.0"><!-- Кнопки управления -->
-        <Pane id="controls" layoutX="31.0" layoutY="34.0" prefHeight="32.0" prefWidth="835.0"><!-- Кнопка назад -->
+    <Pane id="header" prefHeight="100.0" prefWidth="900.0">
+    <!-- Кнопки управления -->
+        <Pane id="controls" layoutX="31.0" layoutY="34.0" prefHeight="32.0" prefWidth="835.0">
+        <!-- Кнопка назад -->
             <Button id="back" layoutX="-25.0" layoutY="-6.0" mnemonicParsing="false" prefHeight="44.0"
                     prefWidth="56.0" styleClass="icon-button">
                 <graphic>
@@ -112,7 +114,8 @@
     </Pane>
 
     <!-- Папка проекта-->
-    <Pane id="folder" layoutX="241.0" layoutY="418.0" prefHeight="40.0" prefWidth="624.0"><!-- Путь к папкам-->
+    <Pane id="folder" layoutX="241.0" layoutY="418.0" prefHeight="40.0" prefWidth="624.0">
+    <!-- Путь к папкам-->
         <Hyperlink id="path" focusTraversable="false" prefHeight="40.0" prefWidth="478.0" text="C:/Users">
             <padding>
                 <Insets left="28.0" right="10.0"/>

diff --git a/src/main/java/pro/gravit/launcher/client/JavaRuntimeModule.java b/src/main/java/pro/gravit/launcher/client/JavaRuntimeModule.java
@@ -22,7 +22,7 @@ public class JavaRuntimeModule extends LauncherModule {
     private RuntimeProvider provider;
 
     public JavaRuntimeModule() {
-        super(new LauncherModuleInfo("StdJavaRuntime", new Version(2, 0, 2, 1, Version.Type.STABLE),
+        super(new LauncherModuleInfo("StdJavaRuntime", new Version(2, 0, 3, 1, Version.Type.STABLE),
                 0, new String[]{}, new String[]{"runtime"}));
     }
 

diff --git a/src/main/java/pro/gravit/launcher/client/gui/JavaFXApplication.java b/src/main/java/pro/gravit/launcher/client/gui/JavaFXApplication.java
@@ -18,6 +18,7 @@
 import pro.gravit.launcher.client.gui.impl.*;
 import pro.gravit.launcher.client.gui.scenes.AbstractScene;
 import pro.gravit.launcher.client.gui.service.JavaService;
+import pro.gravit.launcher.client.gui.service.PingService;
 import pro.gravit.launcher.client.gui.service.RuntimeDialogService;
 import pro.gravit.launcher.client.gui.service.StateService;
 import pro.gravit.launcher.client.gui.stage.PrimaryStage;
@@ -64,6 +65,7 @@ public class JavaFXApplication extends Application {
     public SkinManager skinManager;
     public FXMLFactory fxmlFactory;
     public JavaService javaService;
+    public PingService pingService;
     public TriggerManager triggerManager;
     private SettingsManager settingsManager;
     private PrimaryStage mainStage;
@@ -112,6 +114,7 @@ public void init() throws Exception {
         skinManager = new SkinManager(this);
         triggerManager = new TriggerManager(this);
         javaService = new JavaService(this);
+        pingService = new PingService();
         registerCommands();
     }
 

diff --git a/src/main/java/pro/gravit/launcher/client/gui/config/GuiModuleConfig.java b/src/main/java/pro/gravit/launcher/client/gui/config/GuiModuleConfig.java
@@ -16,12 +16,15 @@ public class GuiModuleConfig {
     public boolean forceDownloadJava;
     @LauncherInject(value = "modules.javaruntime.javalist")
     public Map<String, String> javaList;
+    @LauncherInject(value = "modules.javaruntime.lazy")
+    public boolean lazy;
 
     public static Object getDefault() {
         GuiModuleConfig config = new GuiModuleConfig();
         config.createAccountURL = "https://gravit.pro/createAccount.php";
         config.forgotPassURL = "https://gravit.pro/fogotPass.php";
         config.hastebinServer = "https://hastebin.com";
+        config.lazy = true;
         config.javaList = new HashMap<>();
         return config;
     }

diff --git a/src/main/java/pro/gravit/launcher/client/gui/impl/AbstractVisualComponent.java b/src/main/java/pro/gravit/launcher/client/gui/impl/AbstractVisualComponent.java
@@ -12,6 +12,7 @@
 import pro.gravit.launcher.request.RequestException;
 import pro.gravit.utils.helper.LogHelper;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
 
@@ -22,13 +23,17 @@ public abstract class AbstractVisualComponent {
     protected Pane layout;
     private String sysFxmlPath;
     private Parent sysFxmlRoot;
+    private CompletableFuture<Node> sysFxmlFuture;
     boolean isInit;
     protected boolean isResetOnShow = false;
 
     protected AbstractVisualComponent(String fxmlPath, JavaFXApplication application) {
         this.application = application;
         this.sysFxmlPath = fxmlPath;
         this.contextHelper = new ContextHelper(this);
+        if(application.guiModuleConfig.lazy) {
+            this.sysFxmlFuture = application.fxmlFactory.getAsync(sysFxmlPath);
+        }
     }
 
     public static void fade(Node region, double delay, double from, double to, EventHandler<ActionEvent> onFinished) {
@@ -54,7 +59,10 @@ public boolean isInit() {
     protected synchronized Parent getFxmlRoot() {
         try {
             if (sysFxmlRoot == null) {
-                sysFxmlRoot = (Parent) application.fxmlFactory.getAsync(sysFxmlPath).get();
+                if(sysFxmlFuture == null) {
+                    this.sysFxmlFuture = application.fxmlFactory.getAsync(sysFxmlPath);
+                }
+                sysFxmlRoot = (Parent) sysFxmlFuture.get();
             }
             return sysFxmlRoot;
         } catch (InterruptedException e) {