diff --git a/build.gradle b/build.gradle index 5a5d0dd4..6df7c05a 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ javafx { sourceCompatibility = '17' targetCompatibility = '17' group 'pro.gravit.launcher' -version '3.0.2' +version '3.0.3' def mainClassName = "pro.gravit.launcher.client.JavaRuntimeModule" task sourcesJar(type: Jar) { @@ -50,20 +50,20 @@ task runDev(type: JavaExec) { } repositories { + mavenLocal() maven { url "https://oss.sonatype.org/content/repositories/snapshots" } mavenCentral() - mavenLocal() } dependencies { - implementation "pro.gravit.launcher:launcher-core:5.5.2" - implementation "pro.gravit.launcher:launcher-modern-core:5.5.2" - implementation "pro.gravit.launcher:launcher-ws-api:5.5.2" - implementation "pro.gravit.launcher:launcher-client-api:5.5.2" - implementation "pro.gravit.launcher:launcher-client-start-api:5.5.2" - implementation "pro.gravit.launcher:launcher-client-starter-api:5.5.2" + implementation "pro.gravit.launcher:launcher-core:5.5.3" + implementation "pro.gravit.launcher:launcher-modern-core:5.5.3" + implementation "pro.gravit.launcher:launcher-ws-api:5.5.3" + implementation "pro.gravit.launcher:launcher-client-api:5.5.3" + implementation "pro.gravit.launcher:launcher-client-start-api:5.5.3" + implementation "pro.gravit.launcher:launcher-client-starter-api:5.5.3" 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_en.properties b/compat/lang/runtime_en.properties index 504d67e1..1bd044ae 100644 --- a/compat/lang/runtime_en.properties +++ b/compat/lang/runtime_en.properties @@ -42,8 +42,14 @@ runtime.overlay.processing.text.authAvailability=Updating available authorizatio runtime.overlay.processing.text.launcher=Check for launcher updates runtime.overlay.processing.text.setprofile=Change profile runtime.overlay.processing.text.profiles=Getting a list of servers +runtime.overlay.processing.text.uploadasset=Get upload asset configuration runtime.overlay.webauth.webauth.web-description=EXTERNAL AUTHORIZATION runtime.overlay.webauth.webauth.header-button-text=CANCEL +runtime.overlay.uploadasset.uploadskin=UPLOAD SKIN +runtime.overlay.uploadasset.uploadcape=Upload CAPE +runtime.overlay.uploadasset.useslim=Use slim model +runtime.overlay.uploadasset.success.header=Upload Asset +runtime.overlay.uploadasset.success.description=Upload was successful ###### Components ###### @@ -122,6 +128,8 @@ runtime.scenes.settings.properties.autoenter.name=Auto Enter runtime.scenes.settings.properties.autoenter.description=Enable auto enter to Minecraft server in start runtime.scenes.settings.properties.disabledownloadjava.name=Disable download Java runtime.scenes.settings.properties.disabledownloadjava.description=Disable Java auto-download from project server +runtime.scenes.settings.properties.waylandsupport.name=Wayland Support +runtime.scenes.settings.properties.waylandsupport.description=Use glfw with Wayland support. Works only on clients that support this option runtime.scenes.settings.langChanged.head=Locale change runtime.scenes.settings.langChanged.description=Restart launcher to apply changes runtime.scenes.settings.exitDialog.header=Sign out diff --git a/compat/lang/runtime_ru.properties b/compat/lang/runtime_ru.properties index dda34ea5..aed5f190 100644 --- a/compat/lang/runtime_ru.properties +++ b/compat/lang/runtime_ru.properties @@ -42,11 +42,14 @@ runtime.overlay.processing.text.authAvailability=Обновление досту runtime.overlay.processing.text.launcher=Проверка обновлений лаунчера runtime.overlay.processing.text.setprofile=Смена профиля runtime.overlay.processing.text.profiles=Получение списка серверов +runtime.overlay.processing.text.uploadasset=Получение конфигурации загрузки ассетов runtime.overlay.webauth.webauth.web-description=ВНЕШНЯЯ АВТОРИЗАЦИЯ runtime.overlay.webauth.webauth.header-button-text=ОТМЕНА runtime.overlay.uploadasset.uploadskin=ЗАГРУЗИТЬ СКИН runtime.overlay.uploadasset.uploadcape=ЗАГРУЗИТЬ ПЛАЩ runtime.overlay.uploadasset.useslim=Использовать slim модель +runtime.overlay.uploadasset.success.header=Загрузка ассета +runtime.overlay.uploadasset.success.description=Загрузка прошла успешно ###### Components ###### @@ -125,6 +128,8 @@ runtime.scenes.settings.properties.autoenter.name=Автовход runtime.scenes.settings.properties.autoenter.description=Включить автоматический вход на сервер Minecraft при запуске runtime.scenes.settings.properties.disabledownloadjava.name=Отключить загрузку Java runtime.scenes.settings.properties.disabledownloadjava.description=Отключить автоматическую загрузку Java с сервера проекта +runtime.scenes.settings.properties.waylandsupport.name=Поддержка Wayland +runtime.scenes.settings.properties.waylandsupport.description=Использовать glfw с поддержкой Wayland. Работает только на клиентах поддерживающих эту опцию runtime.scenes.settings.langChanged.head=Изменение языкового пакета runtime.scenes.settings.langChanged.description=Перезапустите лаунчер, чтобы применить изменения. runtime.scenes.settings.exitDialog.header=ВЫХОД ИЗ ПОД АККАУНТА diff --git a/runtime/runtime_en.properties b/runtime/runtime_en.properties index 504d67e1..88fc9e16 100644 --- a/runtime/runtime_en.properties +++ b/runtime/runtime_en.properties @@ -42,8 +42,14 @@ runtime.overlay.processing.text.authAvailability=Updating available authorizatio runtime.overlay.processing.text.launcher=Check for launcher updates runtime.overlay.processing.text.setprofile=Change profile runtime.overlay.processing.text.profiles=Getting a list of servers +runtime.overlay.processing.text.uploadasset=Get upload asset configuration runtime.overlay.webauth.webauth.web-description=EXTERNAL AUTHORIZATION runtime.overlay.webauth.webauth.header-button-text=CANCEL +runtime.overlay.uploadasset.uploadskin=UPLOAD SKIN +runtime.overlay.uploadasset.uploadcape=Upload CAPE +runtime.overlay.uploadasset.useslim=Use slim model +runtime.overlay.uploadasset.success.header=Upload Asset +runtime.overlay.uploadasset.success.header=Upload was successful ###### Components ###### @@ -122,6 +128,8 @@ runtime.scenes.settings.properties.autoenter.name=Auto Enter runtime.scenes.settings.properties.autoenter.description=Enable auto enter to Minecraft server in start runtime.scenes.settings.properties.disabledownloadjava.name=Disable download Java runtime.scenes.settings.properties.disabledownloadjava.description=Disable Java auto-download from project server +runtime.scenes.settings.properties.waylandsupport.name=Wayland Support +runtime.scenes.settings.properties.waylandsupport.description=Use glfw with Wayland support. Works only on clients that support this option runtime.scenes.settings.langChanged.head=Locale change runtime.scenes.settings.langChanged.description=Restart launcher to apply changes runtime.scenes.settings.exitDialog.header=Sign out diff --git a/runtime/runtime_ru.properties b/runtime/runtime_ru.properties index 76f6cbb9..09ad7e06 100644 --- a/runtime/runtime_ru.properties +++ b/runtime/runtime_ru.properties @@ -42,11 +42,14 @@ runtime.overlay.processing.text.authAvailability=\u041e\u0431\u043d\u043e\u0432\ runtime.overlay.processing.text.launcher=\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0439 \u043b\u0430\u0443\u043d\u0447\u0435\u0440\u0430 runtime.overlay.processing.text.setprofile=\u0421\u043c\u0435\u043d\u0430 \u043f\u0440\u043e\u0444\u0438\u043b\u044f runtime.overlay.processing.text.profiles=\u041f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u0435 \u0441\u043f\u0438\u0441\u043a\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u0432 +runtime.overlay.processing.text.uploadasset=\u041f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u0435 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0430\u0441\u0441\u0435\u0442\u043e\u0432 runtime.overlay.webauth.webauth.web-description=\u0412\u041d\u0415\u0428\u041d\u042f\u042f \u0410\u0412\u0422\u041e\u0420\u0418\u0417\u0410\u0426\u0418\u042f runtime.overlay.webauth.webauth.header-button-text=\u041e\u0422\u041c\u0415\u041d\u0410 runtime.overlay.uploadasset.uploadskin=\u0417\u0410\u0413\u0420\u0423\u0417\u0418\u0422\u042c \u0421\u041a\u0418\u041d runtime.overlay.uploadasset.uploadcape=\u0417\u0410\u0413\u0420\u0423\u0417\u0418\u0422\u042c \u041f\u041b\u0410\u0429 runtime.overlay.uploadasset.useslim=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c slim \u043c\u043e\u0434\u0435\u043b\u044c +runtime.overlay.uploadasset.success.header=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0430\u0441\u0441\u0435\u0442\u0430 +runtime.overlay.uploadasset.success.header=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u043f\u0440\u043e\u0448\u043b\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e ###### Components ###### @@ -125,6 +128,8 @@ runtime.scenes.settings.properties.autoenter.name=\u0410\u0432\u0442\u043e\u0432 runtime.scenes.settings.properties.autoenter.description=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u0432\u0445\u043e\u0434 \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440 Minecraft \u043f\u0440\u0438 \u0437\u0430\u043f\u0443\u0441\u043a\u0435 runtime.scenes.settings.properties.disabledownloadjava.name=\u041e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0443 Java runtime.scenes.settings.properties.disabledownloadjava.description=\u041e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0443\u044e \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0443 Java \u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u043f\u0440\u043e\u0435\u043a\u0442\u0430 +runtime.scenes.settings.properties.waylandsupport.name=\u041f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430 Wayland +runtime.scenes.settings.properties.waylandsupport.description=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c glfw \u0441 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u043e\u0439 Wayland. \u0420\u0430\u0431\u043e\u0442\u0430\u0435\u0442 \u0442\u043e\u043b\u044c\u043a\u043e \u043d\u0430 \u043a\u043b\u0438\u0435\u043d\u0442\u0430\u0445 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u044e\u0449\u0438\u0445 \u044d\u0442\u0443 \u043e\u043f\u0446\u0438\u044e runtime.scenes.settings.langChanged.head=\u0418\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0435 \u044f\u0437\u044b\u043a\u043e\u0432\u043e\u0433\u043e \u043f\u0430\u043a\u0435\u0442\u0430 runtime.scenes.settings.langChanged.description=\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u0435 \u043b\u0430\u0443\u043d\u0447\u0435\u0440, \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f. runtime.scenes.settings.exitDialog.header=\u0412\u042b\u0425\u041e\u0414 \u0418\u0417 \u041f\u041e\u0414 \u0410\u041a\u041a\u0410\u0423\u041d\u0422\u0410 diff --git a/src/main/java/pro/gravit/launcher/client/JavaRuntimeModule.java b/src/main/java/pro/gravit/launcher/client/JavaRuntimeModule.java index 2af876bc..93b2a746 100644 --- a/src/main/java/pro/gravit/launcher/client/JavaRuntimeModule.java +++ b/src/main/java/pro/gravit/launcher/client/JavaRuntimeModule.java @@ -30,7 +30,7 @@ public class JavaRuntimeModule extends LauncherModule { public JavaRuntimeModule() { super(new LauncherModuleInfo("StdJavaRuntime", - new Version(3, 0, 2, 1, Version.Type.STABLE), + new Version(3, 0, 3, 1, Version.Type.STABLE), 0, new String[]{}, new String[]{"runtime"})); } diff --git a/src/main/java/pro/gravit/launcher/client/gui/config/RuntimeSettings.java b/src/main/java/pro/gravit/launcher/client/gui/config/RuntimeSettings.java index c5810fbe..b98a4e29 100644 --- a/src/main/java/pro/gravit/launcher/client/gui/config/RuntimeSettings.java +++ b/src/main/java/pro/gravit/launcher/client/gui/config/RuntimeSettings.java @@ -85,6 +85,8 @@ public static class ProfileSettings { public boolean autoEnter; @LauncherNetworkAPI public String javaPath; + @LauncherNetworkAPI + public boolean waylandSupport; public static ProfileSettings getDefault(JavaService javaService, ClientProfile profile) { ProfileSettings settings = new ProfileSettings(); @@ -111,6 +113,7 @@ public static class ProfileSettingsView { public boolean fullScreen; public boolean autoEnter; public String javaPath; + public boolean waylandSupport; public ProfileSettingsView(ProfileSettings settings) { ram = settings.ram; @@ -118,6 +121,7 @@ public ProfileSettingsView(ProfileSettings settings) { fullScreen = settings.fullScreen; autoEnter = settings.autoEnter; javaPath = settings.javaPath; + waylandSupport = settings.waylandSupport; this.settings = settings; } @@ -127,6 +131,7 @@ public void apply() { settings.autoEnter = autoEnter; settings.fullScreen = fullScreen; settings.javaPath = javaPath; + settings.waylandSupport = waylandSupport; } } } diff --git a/src/main/java/pro/gravit/launcher/client/gui/dialogs/InfoDialog.java b/src/main/java/pro/gravit/launcher/client/gui/dialogs/InfoDialog.java index 8517c180..5fe50f05 100644 --- a/src/main/java/pro/gravit/launcher/client/gui/dialogs/InfoDialog.java +++ b/src/main/java/pro/gravit/launcher/client/gui/dialogs/InfoDialog.java @@ -42,7 +42,7 @@ public String getName() { @Override protected void doInit() { textHeader = LookupHelper.lookup(layout, "#headingDialog"); - textDescription = LookupHelper.lookup(layout, "#dialogDescription"); + textDescription = LookupHelper.lookup(layout, "#textDialog"); textHeader.setText(header); textDescription.setText(text); LookupHelper.