diff --git a/build.gradle b/build.gradle index 0f46431c..35d6b014 100644 --- a/build.gradle +++ b/build.gradle @@ -58,11 +58,11 @@ repositories { } dependencies { - implementation "pro.gravit.launcher:launcher-core:5.6.0" - implementation "pro.gravit.launcher:launcher-ws-api:5.6.0" - implementation "pro.gravit.launcher:launcher-client-api:5.6.0" - implementation "pro.gravit.launcher:launcher-client-start-api:5.6.0" - implementation "pro.gravit.launcher:launcher-client-starter-api:5.6.0" + implementation "pro.gravit.launcher:launcher-core:5.6.1" + implementation "pro.gravit.launcher:launcher-ws-api:5.6.1" + implementation "pro.gravit.launcher:launcher-client-api:5.6.1" + implementation "pro.gravit.launcher:launcher-client-start-api:5.6.1" + implementation "pro.gravit.launcher:launcher-client-starter-api:5.6.1" 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/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd491..e6441136 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2ea3535d..e7646dea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/runtime/components/buttons/customization.css b/runtime/components/buttons/customization.css index 7152cdce..24366a42 100644 --- a/runtime/components/buttons/customization.css +++ b/runtime/components/buttons/customization.css @@ -1,5 +1,5 @@ #customization { - -fx-background-color: rgba(0,0,0,0.7); + -fx-background-color: -fx-colors-text; -fx-background-radius: 4px; -fx-opacity: 0; -fx-effect: none; diff --git a/runtime/components/components.css b/runtime/components/components.css index 2cd48393..77e6681e 100644 --- a/runtime/components/components.css +++ b/runtime/components/components.css @@ -15,7 +15,7 @@ -fx-font-size: 14px; } #notificationText { - -fx-fill: -fx-colors-text; + -fx-text-fill: -fx-colors-text; -fx-font-size: 10px; } /*-- Блок сервера --*/ diff --git a/runtime/dialogs/dialogs.css b/runtime/dialogs/dialogs.css index b9a00093..943952b1 100644 --- a/runtime/dialogs/dialogs.css +++ b/runtime/dialogs/dialogs.css @@ -10,6 +10,7 @@ #textDialog { -fx-background-color: -fx-bg2; -fx-background-radius: 10px; + -fx-text-fill: -fx-colors-text; -fx-font-size: 12px; -fx-padding: 10px 15px 10px 15px; } diff --git a/runtime/scenes/update/update.css b/runtime/scenes/update/update.css index 86fa84c9..a2020191 100644 --- a/runtime/scenes/update/update.css +++ b/runtime/scenes/update/update.css @@ -21,6 +21,10 @@ #speed-text { -fx-font-size: 14px; -fx-font-weight: bold; + -fx-text-fill: -fx-colors-text; +} +#volume { + -fx-text-fill: -fx-colors-text; } .speedError { -fx-text-fill: -fx-red; diff --git a/src/main/java/pro/gravit/launcher/gui/JavaFXApplication.java b/src/main/java/pro/gravit/launcher/gui/JavaFXApplication.java index 4c1bd4be..72bd3c93 100644 --- a/src/main/java/pro/gravit/launcher/gui/JavaFXApplication.java +++ b/src/main/java/pro/gravit/launcher/gui/JavaFXApplication.java @@ -95,9 +95,6 @@ public PrimaryStage getMainStage() { @Override public void init() throws Exception { - if(JVMHelper.OS_TYPE == JVMHelper.OS.MUSTDIE) { - System.setProperty("prism.lcdtext", "false"); - } guiModuleConfig = new GuiModuleConfig(); settingsManager = new StdSettingsManager(); UserSettings.providers.register(JavaRuntimeModule.RUNTIME_NAME, RuntimeSettings.class); diff --git a/src/main/java/pro/gravit/launcher/gui/JavaRuntimeModule.java b/src/main/java/pro/gravit/launcher/gui/JavaRuntimeModule.java index cf6da540..135bb2db 100644 --- a/src/main/java/pro/gravit/launcher/gui/JavaRuntimeModule.java +++ b/src/main/java/pro/gravit/launcher/gui/JavaRuntimeModule.java @@ -29,7 +29,7 @@ public class JavaRuntimeModule extends LauncherModule { public JavaRuntimeModule() { super(new LauncherModuleInfo("StdJavaRuntime", - new Version(4, 0, 0, 1, Version.Type.STABLE), + new Version(4, 0, 1, 1, Version.Type.STABLE), 0, new String[]{}, new String[]{"runtime"})); } diff --git a/src/main/java/pro/gravit/launcher/gui/components/ServerButton.java b/src/main/java/pro/gravit/launcher/gui/components/ServerButton.java index 836f1aa6..592712f2 100644 --- a/src/main/java/pro/gravit/launcher/gui/components/ServerButton.java +++ b/src/main/java/pro/gravit/launcher/gui/components/ServerButton.java @@ -19,6 +19,7 @@ public class ServerButton extends AbstractVisualComponent { private static final String SERVER_BUTTON_FXML = "components/serverButton.fxml"; + private static final String SERVER_BUTTON_CUSTOM_FXML = "components/serverButton/%s.fxml"; private static final String SERVER_BUTTON_DEFAULT_IMAGE = "images/servers/example.png"; private static final String SERVER_BUTTON_CUSTOM_IMAGE = "images/servers/%s.png"; public ClientProfile profile; @@ -27,7 +28,7 @@ public class ServerButton extends AbstractVisualComponent { private Region serverLogo; protected ServerButton(JavaFXApplication application, ClientProfile profile) { - super(SERVER_BUTTON_FXML, application); + super(getServerButtonFxml(application, profile), application); this.profile = profile; } @@ -35,6 +36,15 @@ public static ServerButton createServerButton(JavaFXApplication application, Cli return new ServerButton(application, profile); } + private static String getServerButtonFxml(JavaFXApplication application, ClientProfile profile) { + String customFxml = String.format(SERVER_BUTTON_CUSTOM_FXML, profile.getUUID().toString()); + URL fxml = application.tryResource(customFxml); + if(fxml != null) { + return customFxml; + } + return SERVER_BUTTON_FXML; + } + @Override public String getName() { return "serverButton"; diff --git a/src/main/java/pro/gravit/launcher/gui/scenes/login/methods/WebAuthMethod.java b/src/main/java/pro/gravit/launcher/gui/scenes/login/methods/WebAuthMethod.java index cf4fb1ba..f6a1ef30 100644 --- a/src/main/java/pro/gravit/launcher/gui/scenes/login/methods/WebAuthMethod.java +++ b/src/main/java/pro/gravit/launcher/gui/scenes/login/methods/WebAuthMethod.java @@ -55,13 +55,8 @@ public CompletableFuture show(AuthWebViewDetails details) { public CompletableFuture auth(AuthWebViewDetails details) { overlay.future = new CompletableFuture<>(); overlay.follow(details.url, details.redirectUrl, (r) -> { - String code = r; - LogHelper.debug("Code: %s", code); - if (code.startsWith("?code=")) { - code = r.substring("?code=".length(), r.indexOf("&")); - } - LogHelper.debug("Code: %s", code); - overlay.future.complete(new AuthFlow.LoginAndPasswordResult(null, new AuthCodePassword(code))); + LogHelper.dev("Redirect uri: %s", r); + overlay.future.complete(new AuthFlow.LoginAndPasswordResult(null, new AuthCodePassword(r))); }); return overlay.future; } @@ -119,16 +114,16 @@ protected void doInit() { } public void follow(String url, String redirectUrl, Consumer redirectCallback) { - LogHelper.debug("Load url %s", url); + LogHelper.dev("Load url %s", url); webView.getEngine().setJavaScriptEnabled(true); webView.getEngine().load(url); if (redirectCallback != null) { webView.getEngine().locationProperty().addListener((obs, oldLocation, newLocation) -> { if (newLocation != null) { - LogHelper.debug("Location: %s", newLocation); + LogHelper.dev("Location: %s", newLocation); if (redirectUrl != null) { if (newLocation.startsWith(redirectUrl)) { - redirectCallback.accept(newLocation.substring(redirectUrl.length())); + redirectCallback.accept(newLocation); } } else { redirectCallback.accept(newLocation);