Merge branch 'release/4.0.5'

GravitLauncher · Oct 13, 2024 · 09db4b0 · 09db4b0
2 parents f1da265 + 7587853
commit 09db4b0
Show file tree

Hide file tree

Showing 26 changed files with 104 additions and 56 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ javafx {
 sourceCompatibility = '17'
 targetCompatibility = '17'
 group 'pro.gravit.launcher'
-version '4.0.4'
+version '4.0.5'
 def mainClassName = "pro.gravit.launcher.gui.JavaRuntimeModule"
 
 task sourcesJar(type: Jar) {
@@ -46,7 +46,7 @@ task runDev(type: JavaExec) {
     description = "Run the main class with JavaExecTask"
     classpath = sourceSets.main.runtimeClasspath
     jvmArgs = ["-Dlauncherdebug.modules="+mainClassName, "-Dlauncherdebug.env=DEBUG"]
-    mainClass = "pro.gravit.launcher.debug.DebugMain"
+    mainClass = "pro.gravit.launcher.runtime.debug.DebugMain"
 }
 
 repositories {
@@ -61,11 +61,11 @@ repositories {
 }
 
 dependencies {
-    implementation "pro.gravit.launcher:launcher-core:5.6.6"
-    implementation "pro.gravit.launcher:launcher-ws-api:5.6.6"
-    implementation "pro.gravit.launcher:launcher-client-api:5.6.6"
-    implementation "pro.gravit.launcher:launcher-client-start-api:5.6.6"
-    implementation "pro.gravit.launcher:launcher-client-starter-api:5.6.6"
+    implementation "pro.gravit.launcher:launcher-core:5.6.8"
+    implementation "pro.gravit.launcher:launcher-ws-api:5.6.8"
+    implementation "pro.gravit.launcher:launcher-client-api:5.6.8"
+    implementation "pro.gravit.launcher:launcher-client-start-api:5.6.8"
+    implementation "pro.gravit.launcher:launcher-client-starter-api:5.6.8"
     implementation "pro.gravit.utils.enfs:enfs:2.0.1-SNAPSHOT"
     implementation 'io.netty:netty-codec-http:4.1.67.Final'
     implementation 'com.github.oshi:oshi-core:5.8.1'

diff --git a/compat/lang/runtime_be.properties b/compat/lang/runtime_be.properties
@@ -126,6 +126,9 @@ runtime.scenes.settings.ram={0} МБ
 # Properties #
 runtime.scenes.settings.properties.prismvsync.name=VSync
 runtime.scenes.settings.properties.prismvsync.description=Уключае вертыкальную сінхранізацыю пры паказе інтэрфейсу Лаўнчэра
+runtime.scenes.settings.properties.debugallclients.name=Рэжым адладкі
+runtime.scenes.settings.properties.debugallclients.description=Уключыць рэжым адладкі для ўсіх кліентаў гульні пры запуску
+runtime.scenes.settings.properties.debug.disabled=Для змянення гэтага параметру неабходна адключыць яго ў глабальных наладах
 runtime.scenes.settings.properties.debug.name=Debug-рэжым
 runtime.scenes.settings.properties.debug.description=Уключыць рэжым адладкі пры запуску гульнявога кліента
 runtime.scenes.settings.properties.fullscreen.name=Поўны экран

diff --git a/compat/lang/runtime_en.properties b/compat/lang/runtime_en.properties
@@ -126,6 +126,9 @@ runtime.scenes.settings.ram={0} MiB
 # Properties #
 runtime.scenes.settings.properties.prismvsync.name=VSync
 runtime.scenes.settings.properties.prismvsync.description=Enables vertical sync when showing the Launcher interface
+runtime.scenes.settings.properties.debugallclients.name=Debug Mode
+runtime.scenes.settings.properties.debugallclients.description=Enable debug mode for all game clients upon startup
+runtime.scenes.settings.properties.debug.disabled=To modify this parameter, it must be disabled in the global settings
 runtime.scenes.settings.properties.debug.name=Debug
 runtime.scenes.settings.properties.debug.description=Enable debug mode when starting the game client
 runtime.scenes.settings.properties.fullscreen.name=Fullscreen

diff --git a/compat/lang/runtime_pl.properties b/compat/lang/runtime_pl.properties
@@ -126,6 +126,9 @@ runtime.scenes.settings.ram={0} MB
 # Properties #
 runtime.scenes.settings.properties.prismvsync.name=VSync
 runtime.scenes.settings.properties.prismvsync.description=Włącza synchronizację pionową podczas wyświetlania interfejsu programu uruchamiającego
+runtime.scenes.settings.properties.debugallclients.name=Tryb debugowania
+runtime.scenes.settings.properties.debugallclients.description=Włącz tryb debugowania dla wszystkich klientów gry podczas uruchamiania
+runtime.scenes.settings.properties.debug.disabled=Aby zmienić ten parametr, należy wyłączyć go w ustawieniach globalnych
 runtime.scenes.settings.properties.debug.name=Tryb debugowania
 runtime.scenes.settings.properties.debug.description=Włącza tryb debugowania podczas uruchamiania klienta gry
 runtime.scenes.settings.properties.fullscreen.name=Pełny ekran

diff --git a/compat/lang/runtime_ru.properties b/compat/lang/runtime_ru.properties
@@ -126,6 +126,9 @@ runtime.scenes.settings.ram={0} МБ
 # Properties #
 runtime.scenes.settings.properties.prismvsync.name=VSync
 runtime.scenes.settings.properties.prismvsync.description=Включает вертикальную синхронизацию при показе интерфейса Лаунчера
+runtime.scenes.settings.properties.debugallclients.name=Debug-режим
+runtime.scenes.settings.properties.debugallclients.description=Включить режим отладки для всех клиентов игры при запуске
+runtime.scenes.settings.properties.debug.disabled=Для изменения этого параметра, необходимо выключить его в глобальных настройках
 runtime.scenes.settings.properties.debug.name=Debug-режим
 runtime.scenes.settings.properties.debug.description=Включить режим отладки при запуске игрового клиента
 runtime.scenes.settings.properties.fullscreen.name=Полный экран

diff --git a/compat/lang/runtime_uk.properties b/compat/lang/runtime_uk.properties
@@ -126,6 +126,9 @@ runtime.scenes.settings.ram={0} МБ
 # Properties #
 runtime.scenes.settings.properties.prismvsync.name=VSync
 runtime.scenes.settings.properties.prismvsync.description=Включає вертикальну синхронізацію під час показу інтерфейсу Лаунчера
+runtime.scenes.settings.properties.debugallclients.name=Режим відладки
+runtime.scenes.settings.properties.debugallclients.description=Увімкнути режим відладки для всіх клієнтів гри під час запуску
+runtime.scenes.settings.properties.debug.disabled=Щоб змінити цей параметр, необхідно вимкнути його в глобальних налаштуваннях
 runtime.scenes.settings.properties.debug.name=Debug-режим
 runtime.scenes.settings.properties.debug.description=Увімкнути режим відладки при запуску ігрового клієнта
 runtime.scenes.settings.properties.fullscreen.name=Повний екран

diff --git a/runtime/components/panels/leftpanel.fxml b/runtime/components/panels/leftpanel.fxml
@@ -1,22 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Pane?>
 
 <AnchorPane id="leftpanel" prefWidth="300.0" stylesheets="@leftpanel.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
   <children>
-    <fx:include source="../buttons/back.fxml" AnchorPane.leftAnchor="28.0" AnchorPane.topAnchor="34.0" />
-    <Pane id="userBlock" AnchorPane.leftAnchor="74.0" AnchorPane.topAnchor="34.0">
-      <children>
-        <fx:include source="../userBlock.fxml" AnchorPane.leftAnchor="28.0" AnchorPane.topAnchor="34.0" />
-      </children>
-    </Pane>
-    <HBox alignment="CENTER" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="130.0">
-      <children>
-        <!-- Блок сервера -->
-        <Pane id="serverButton" />
-      </children>
-    </HBox>
+      <AnchorPane maxHeight="-Infinity" prefHeight="80.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+          <fx:include source="../buttons/back.fxml" AnchorPane.leftAnchor="28.0" AnchorPane.topAnchor="34.0" />
+          <Pane id="userBlock" AnchorPane.leftAnchor="74.0" AnchorPane.topAnchor="34.0">
+            <children>
+              <fx:include source="../userBlock.fxml" AnchorPane.leftAnchor="28.0" AnchorPane.topAnchor="34.0" />
+            </children>
+          </Pane>
+         </children>
+      </AnchorPane>
+      <FlowPane alignment="CENTER" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="80.0">
+         <children>
+          <HBox alignment="CENTER">
+            <children>
+              <!-- Блок сервера -->
+              <Pane id="serverButton" />
+            </children>
+          </HBox>
+         </children>
+      </FlowPane>
   </children>
-</AnchorPane>
+</AnchorPane>
diff --git a/runtime/runtime_be.properties b/runtime/runtime_be.properties
@@ -126,6 +126,9 @@ runtime.scenes.settings.ram={0} \u041c\u0411
 # Properties #
 runtime.scenes.settings.properties.prismvsync.name=VSync
 runtime.scenes.settings.properties.prismvsync.description=\u0423\u043a\u043b\u044e\u0447\u0430\u0435 \u0432\u0435\u0440\u0442\u044b\u043a\u0430\u043b\u044c\u043d\u0443\u044e \u0441\u0456\u043d\u0445\u0440\u0430\u043d\u0456\u0437\u0430\u0446\u044b\u044e \u043f\u0440\u044b \u043f\u0430\u043a\u0430\u0437\u0435 \u0456\u043d\u0442\u044d\u0440\u0444\u0435\u0439\u0441\u0443 \u041b\u0430\u045e\u043d\u0447\u044d\u0440\u0430
+runtime.scenes.settings.properties.debugallclients.name=\u0420\u044D\u0436\u044B\u043C \u0430\u0434\u043B\u0430\u0434\u043A\u0456
+runtime.scenes.settings.properties.debugallclients.description=\u0423\u043A\u043B\u044E\u0447\u044B\u0446\u044C \u0440\u044D\u0436\u044B\u043C \u0430\u0434\u043B\u0430\u0434\u043A\u0456 \u0434\u043B\u044F \u045E\u0441\u0456\u0445 \u043A\u043B\u0456\u0435\u043D\u0442\u0430\u045E \u0433\u0443\u043B\u044C\u043D\u0456 \u043F\u0440\u044B \u0437\u0430\u043F\u0443\u0441\u043A\u0443
+runtime.scenes.settings.properties.debug.disabled=\u0414\u043B\u044F \u0437\u043C\u044F\u043D\u0435\u043D\u043D\u044F \u0433\u044D\u0442\u0430\u0433\u0430 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0443 \u043D\u0435\u0430\u0431\u0445\u043E\u0434\u043D\u0430 \u0430\u0434\u043A\u043B\u044E\u0447\u044B\u0446\u044C \u044F\u0433\u043E \u045E \u0433\u043B\u0430\u0431\u0430\u043B\u044C\u043D\u044B\u0445 \u043D\u0430\u043B\u0430\u0434\u0430\u0445
 runtime.scenes.settings.properties.debug.name=Debug-\u0440\u044d\u0436\u044b\u043c
 runtime.scenes.settings.properties.debug.description=\u0423\u043a\u043b\u044e\u0447\u044b\u0446\u044c \u0440\u044d\u0436\u044b\u043c \u0430\u0434\u043b\u0430\u0434\u043a\u0456 \u043f\u0440\u044b \u0437\u0430\u043f\u0443\u0441\u043a\u0443 \u0433\u0443\u043b\u044c\u043d\u044f\u0432\u043e\u0433\u0430 \u043a\u043b\u0456\u0435\u043d\u0442\u0430
 runtime.scenes.settings.properties.fullscreen.name=\u041f\u043e\u045e\u043d\u044b \u044d\u043a\u0440\u0430\u043d

diff --git a/runtime/runtime_en.properties b/runtime/runtime_en.properties
@@ -126,6 +126,9 @@ runtime.scenes.settings.ram={0} MiB
 # Properties #
 runtime.scenes.settings.properties.prismvsync.name=VSync
 runtime.scenes.settings.properties.prismvsync.description=Enables vertical sync when showing the Launcher interface
+runtime.scenes.settings.properties.debugallclients.name=Debug Mode
+runtime.scenes.settings.properties.debugallclients.description=Enable debug mode for all game clients upon startup
+runtime.scenes.settings.properties.debug.disabled=To modify this parameter, it must be disabled in the global settings
 runtime.scenes.settings.properties.debug.name=Debug
 runtime.scenes.settings.properties.debug.description=Enable debug mode when starting the game client
 runtime.scenes.settings.properties.fullscreen.name=Fullscreen

diff --git a/runtime/runtime_pl.properties b/runtime/runtime_pl.properties
@@ -126,6 +126,9 @@ runtime.scenes.settings.ram={0} MB
 # Properties #
 runtime.scenes.settings.properties.prismvsync.name=VSync
 runtime.scenes.settings.properties.prismvsync.description=W\u0142\u0105cza synchronizacj\u0119 pionow\u0105 podczas wy\u015bwietlania interfejsu programu uruchamiaj\u0105cego
+runtime.scenes.settings.properties.debugallclients.name=Tryb debugowania
+runtime.scenes.settings.properties.debugallclients.description=W\u0142\u0105cz tryb debugowania dla wszystkich klient\u00F3w gry podczas uruchamiania
+runtime.scenes.settings.properties.debug.disabled=Aby zmieni\u0107 ten parametr, nale\u017Cy wy\u0142\u0105czy\u0107 go w ustawieniach globalnych
 runtime.scenes.settings.properties.debug.name=Tryb debugowania
 runtime.scenes.settings.properties.debug.description=W\u0142\u0105cza tryb debugowania podczas uruchamiania klienta gry
 runtime.scenes.settings.properties.fullscreen.name=Pe\u0142ny ekran

diff --git a/runtime/runtime_ru.properties b/runtime/runtime_ru.properties
@@ -126,6 +126,9 @@ runtime.scenes.settings.ram={0} \u041c\u0411
 # Properties #
 runtime.scenes.settings.properties.prismvsync.name=VSync
 runtime.scenes.settings.properties.prismvsync.description=\u0412\u043a\u043b\u044e\u0447\u0430\u0435\u0442 \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u0443\u044e \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044e \u043f\u0440\u0438 \u043f\u043e\u043a\u0430\u0437\u0435 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430 \u041b\u0430\u0443\u043d\u0447\u0435\u0440\u0430
+runtime.scenes.settings.properties.debugallclients.name=Debug-\u0440\u0435\u0436\u0438\u043C
+runtime.scenes.settings.properties.debugallclients.description=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0440\u0435\u0436\u0438\u043C \u043E\u0442\u043B\u0430\u0434\u043A\u0438 \u0434\u043B\u044F \u0432\u0441\u0435\u0445 \u043A\u043B\u0438\u0435\u043D\u0442\u043E\u0432 \u0438\u0433\u0440\u044B \u043F\u0440\u0438 \u0437\u0430\u043F\u0443\u0441\u043A\u0435
+runtime.scenes.settings.properties.debug.disabled=\u0414\u043B\u044F \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F \u044D\u0442\u043E\u0433\u043E \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430, \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E \u0432\u044B\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0435\u0433\u043E \u0432 \u0433\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u044B\u0445 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430\u0445
 runtime.scenes.settings.properties.debug.name=Debug-\u0440\u0435\u0436\u0438\u043c
 runtime.scenes.settings.properties.debug.description=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0440\u0435\u0436\u0438\u043c \u043e\u0442\u043b\u0430\u0434\u043a\u0438 \u043f\u0440\u0438 \u0437\u0430\u043f\u0443\u0441\u043a\u0435 \u0438\u0433\u0440\u043e\u0432\u043e\u0433\u043e \u043a\u043b\u0438\u0435\u043d\u0442\u0430
 runtime.scenes.settings.properties.fullscreen.name=\u041f\u043e\u043b\u043d\u044b\u0439 \u044d\u043a\u0440\u0430\u043d

diff --git a/runtime/runtime_uk.properties b/runtime/runtime_uk.properties
@@ -126,6 +126,9 @@ runtime.scenes.settings.ram={0} \u041c\u0411
 # Properties #
 runtime.scenes.settings.properties.prismvsync.name=VSync
 runtime.scenes.settings.properties.prismvsync.description=\u0412\u043a\u043b\u044e\u0447\u0430\u0454 \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u0443 \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0456\u0437\u0430\u0446\u0456\u044e \u043f\u0456\u0434 \u0447\u0430\u0441 \u043f\u043e\u043a\u0430\u0437\u0443 \u0456\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0443 \u041b\u0430\u0443\u043d\u0447\u0435\u0440\u0430
+runtime.scenes.settings.properties.debugallclients.name=\u0420\u0435\u0436\u0438\u043C \u0432\u0456\u0434\u043B\u0430\u0434\u043A\u0438
+runtime.scenes.settings.properties.debugallclients.description=\u0423\u0432\u0456\u043C\u043A\u043D\u0443\u0442\u0438 \u0440\u0435\u0436\u0438\u043C \u0432\u0456\u0434\u043B\u0430\u0434\u043A\u0438 \u0434\u043B\u044F \u0432\u0441\u0456\u0445 \u043A\u043B\u0456\u0454\u043D\u0442\u0456\u0432 \u0433\u0440\u0438 \u043F\u0456\u0434 \u0447\u0430\u0441 \u0437\u0430\u043F\u0443\u0441\u043A\u0443
+runtime.scenes.settings.properties.debug.disabled=\u0429\u043E\u0431 \u0437\u043C\u0456\u043D\u0438\u0442\u0438 \u0446\u0435\u0439 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440, \u043D\u0435\u043E\u0431\u0445\u0456\u0434\u043D\u043E \u0432\u0438\u043C\u043A\u043D\u0443\u0442\u0438 \u0439\u043E\u0433\u043E \u0432 \u0433\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u0438\u0445 \u043D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F\u0445
 runtime.scenes.settings.properties.debug.name=Debug-\u0440\u0435\u0436\u0438\u043c
 runtime.scenes.settings.properties.debug.description=\u0423\u0432\u0456\u043c\u043a\u043d\u0443\u0442\u0438 \u0440\u0435\u0436\u0438\u043c \u0432\u0456\u0434\u043b\u0430\u0434\u043a\u0438 \u043f\u0440\u0438 \u0437\u0430\u043f\u0443\u0441\u043a\u0443 \u0456\u0433\u0440\u043e\u0432\u043e\u0433\u043e \u043a\u043b\u0456\u0454\u043d\u0442\u0430
 runtime.scenes.settings.properties.fullscreen.name=\u041f\u043e\u0432\u043d\u0438\u0439 \u0435\u043a\u0440\u0430\u043d

diff --git a/runtime/scenes/login/login.fxml b/runtime/scenes/login/login.fxml
@@ -4,8 +4,6 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.ContextMenu?>
-<?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
@@ -15,16 +13,15 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Rectangle?>
-<?import javafx.scene.shape.SVGPath?>
 <?import javafx.scene.text.Text?>
 
 <AnchorPane id="layout" fx:id="loginPane" prefHeight="560.0" prefWidth="930.0" styleClass="background" stylesheets="@login.css" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
 
     <!-- Вертикальная полоса -->
     <AnchorPane id="loginLeftPane" prefWidth="380.0" styleClass="vline" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
-        <VBox layoutX="35.0" layoutY="366.0" spacing="5.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+        <VBox alignment="CENTER" layoutX="35.0" layoutY="366.0" spacing="20.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
             <children>
-            <FlowPane alignment="CENTER" orientation="VERTICAL">
+            <FlowPane alignment="CENTER" maxHeight="-Infinity" minHeight="-Infinity" orientation="VERTICAL" prefHeight="320.0">
                <children>
                     <ImageView id="logo" pickOnBounds="true" preserveRatio="true">
                         <image>
@@ -33,7 +30,7 @@
                     </ImageView>
                </children>
             </FlowPane>
-                <VBox spacing="5.0">
+                <VBox spacing="10.0">
                     <children>
                         <!-- Чекбоксы -->
                         <CheckBox id="autoenter" prefHeight="18.0" prefWidth="276.0" text="%runtime.scenes.login.autoenter" wrapText="true">
@@ -51,7 +48,7 @@
                         <Insets left="20.0" />
                     </padding>
                 </VBox>
-                <ComboBox id="authList" maxWidth="1.7976931348623157E308" prefHeight="70.0" />
+                <ComboBox id="authList" maxWidth="1.7976931348623157E308" minHeight="60.0" />
             </children>
         </VBox>
     </AnchorPane>