From f4d511040f43b1e775264ace852469cbf04ecf0e Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Thu, 2 Nov 2023 01:11:09 +0700
Subject: [PATCH 01/15] [FIX] uploadAsset proguard

---
 .../launcher/client/gui/overlays/UploadAssetOverlay.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/pro/gravit/launcher/client/gui/overlays/UploadAssetOverlay.java b/src/main/java/pro/gravit/launcher/client/gui/overlays/UploadAssetOverlay.java
index 35d72e17..ce1c9e2d 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/overlays/UploadAssetOverlay.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/overlays/UploadAssetOverlay.java
@@ -4,6 +4,7 @@
 import javafx.scene.control.CheckBox;
 import javafx.stage.FileChooser;
 import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.LauncherNetworkAPI;
 import pro.gravit.launcher.client.gui.JavaFXApplication;
 import pro.gravit.launcher.client.gui.helper.LookupHelper;
 import pro.gravit.launcher.events.request.AssetUploadInfoRequestEvent;
@@ -171,7 +172,7 @@ public record UploadError(String error) {
 
     }
 
-    public record UserTexture(String url, String digest, Map<String, String> metadata) {
+    public record UserTexture(@LauncherNetworkAPI String url,@LauncherNetworkAPI String digest,@LauncherNetworkAPI Map<String, String> metadata) {
 
         Texture toLauncherTexture() {
             return new Texture(url, SecurityHelper.fromHex(digest), metadata);

From 0e3314f9683375d415e523d154fe7ac71e5633cf Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Thu, 2 Nov 2023 04:07:52 +0700
Subject: [PATCH 02/15] [FIX] Skin upload

---
 .../gravit/launcher/client/gui/overlays/UploadAssetOverlay.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/pro/gravit/launcher/client/gui/overlays/UploadAssetOverlay.java b/src/main/java/pro/gravit/launcher/client/gui/overlays/UploadAssetOverlay.java
index ce1c9e2d..ead282e4 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/overlays/UploadAssetOverlay.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/overlays/UploadAssetOverlay.java
@@ -156,6 +156,7 @@ public void uploadAsset(String name, AssetOptions options) {
     }
 
     public static final class AssetOptions {
+        @LauncherNetworkAPI
         private final boolean modelSlim;
 
         public AssetOptions(boolean modelSlim) {

From 3c2b696ad52c15fa2278100a0b083aeaf2e69694 Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Thu, 2 Nov 2023 04:08:50 +0700
Subject: [PATCH 03/15] [FIX] Skin upload error

---
 .../gravit/launcher/client/gui/overlays/UploadAssetOverlay.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/pro/gravit/launcher/client/gui/overlays/UploadAssetOverlay.java b/src/main/java/pro/gravit/launcher/client/gui/overlays/UploadAssetOverlay.java
index ead282e4..298c4b0f 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/overlays/UploadAssetOverlay.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/overlays/UploadAssetOverlay.java
@@ -169,7 +169,7 @@ public boolean modelSlim() {
 
     }
 
-    public record UploadError(String error) {
+    public record UploadError(@LauncherNetworkAPI String error) {
 
     }
 

From 27df89b21ab141bb998cea805723a24b8056c1ba Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Thu, 2 Nov 2023 04:11:04 +0700
Subject: [PATCH 04/15] [FIX] Avatar position

---
 runtime/scenes/serverinfo/serverinfo.fxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/scenes/serverinfo/serverinfo.fxml b/runtime/scenes/serverinfo/serverinfo.fxml
index 57ea07d7..0a684098 100644
--- a/runtime/scenes/serverinfo/serverinfo.fxml
+++ b/runtime/scenes/serverinfo/serverinfo.fxml
@@ -74,7 +74,7 @@
 
 
          <!-- Аватар игрока -->
-         <ImageView id="avatar" fitHeight="32.0" fitWidth="32.0" layoutX="53.0" layoutY="31.0" smooth="false" AnchorPane.leftAnchor="73.0" AnchorPane.topAnchor="34.0">
+         <ImageView id="avatar" fitHeight="32.0" fitWidth="32.0" layoutX="53.0" layoutY="31.0" smooth="false" AnchorPane.leftAnchor="73.0" AnchorPane.topAnchor="31.0">
              <Image url="@../../images/icons/default.png" />
          </ImageView>
 

From 40fb38875e394cdf8f340fa5072b064c88e1c696 Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Thu, 2 Nov 2023 04:23:38 +0700
Subject: [PATCH 05/15] [FIX] options.json

---
 .../gui/scenes/options/OptionsScene.java      | 32 ----------
 .../client/gui/service/ProfilesService.java   | 59 +++++++++++++++----
 2 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/options/OptionsScene.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/options/OptionsScene.java
index 22b9e193..992068c2 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/scenes/options/OptionsScene.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/scenes/options/OptionsScene.java
@@ -1,6 +1,5 @@
 package pro.gravit.launcher.client.gui.scenes.options;
 
-import javafx.application.Platform;
 import javafx.geometry.Insets;
 import javafx.scene.control.*;
 import javafx.scene.layout.HBox;
@@ -152,35 +151,4 @@ public Consumer<Boolean> add(String tab, String name, String description, boolea
         return checkBox::setSelected;
     }
 
-    public static class OptionalListEntryPair {
-        public String name;
-        public boolean mark;
-        public OptionalView.OptionalFileInstallInfo installInfo;
-
-        public OptionalListEntryPair(OptionalFile optionalFile, boolean enabled,
-                OptionalView.OptionalFileInstallInfo installInfo) {
-            name = optionalFile.name;
-            mark = enabled;
-            this.installInfo = installInfo;
-        }
-    }
-
-    public static class OptionalListEntry {
-        public List<OptionalListEntryPair> enabled = new LinkedList<>();
-        public String name;
-        public UUID profileUUID;
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            OptionalListEntry that = (OptionalListEntry) o;
-            return Objects.equals(profileUUID, that.profileUUID) && Objects.equals(name, that.name);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(name, profileUUID);
-        }
-    }
 }
diff --git a/src/main/java/pro/gravit/launcher/client/gui/service/ProfilesService.java b/src/main/java/pro/gravit/launcher/client/gui/service/ProfilesService.java
index c8735edd..f1f0f88d 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/service/ProfilesService.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/service/ProfilesService.java
@@ -2,8 +2,8 @@
 
 import com.google.gson.reflect.TypeToken;
 import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.LauncherNetworkAPI;
 import pro.gravit.launcher.client.DirBridge;
-import pro.gravit.launcher.client.gui.scenes.options.OptionsScene;
 import pro.gravit.launcher.events.request.ProfilesRequestEvent;
 import pro.gravit.launcher.profiles.ClientProfile;
 import pro.gravit.launcher.profiles.optional.OptionalFile;
@@ -17,10 +17,7 @@
 import java.lang.reflect.Type;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class ProfilesService {
     private List<ClientProfile> profiles;
@@ -73,9 +70,9 @@ public void setProfile(ClientProfile profile) {
     public void saveAll() throws IOException {
         if (profiles == null) return;
         Path optionsFile = DirBridge.dir.resolve("options.json");
-        List<OptionsScene.OptionalListEntry> list = new ArrayList<>(5);
+        List<OptionalListEntry> list = new ArrayList<>(5);
         for (ClientProfile clientProfile : profiles) {
-            OptionsScene.OptionalListEntry entry = new OptionsScene.OptionalListEntry();
+            OptionalListEntry entry = new OptionalListEntry();
             entry.name = clientProfile.getTitle();
             entry.profileUUID = clientProfile.getUUID();
             OptionalView view = optionalViewMap.get(clientProfile);
@@ -83,7 +80,7 @@ public void saveAll() throws IOException {
                 if (optionalFile.visible) {
                     boolean isEnabled = view.enabled.contains(optionalFile);
                     OptionalView.OptionalFileInstallInfo installInfo = view.installInfo.get(optionalFile);
-                    entry.enabled.add(new OptionsScene.OptionalListEntryPair(optionalFile, isEnabled, installInfo));
+                    entry.enabled.add(new OptionalListEntryPair(optionalFile, isEnabled, installInfo));
                 }
             }));
             list.add(entry);
@@ -98,12 +95,12 @@ public void loadAll() throws IOException {
         Path optionsFile = DirBridge.dir.resolve("options.json");
         if (!Files.exists(optionsFile)) return;
 
-        Type collectionType = new TypeToken<List<OptionsScene.OptionalListEntry>>() {
+        Type collectionType = new TypeToken<List<OptionalListEntry>>() {
         }.getType();
 
         try (Reader reader = IOHelper.newReader(optionsFile)) {
-            List<OptionsScene.OptionalListEntry> list = Launcher.gsonManager.gson.fromJson(reader, collectionType);
-            for (OptionsScene.OptionalListEntry entry : list) {
+            List<OptionalListEntry> list = Launcher.gsonManager.gson.fromJson(reader, collectionType);
+            for (OptionalListEntry entry : list) {
                 ClientProfile selectedProfile = null;
                 for (ClientProfile clientProfile : profiles) {
                     if (entry.profileUUID != null
@@ -115,7 +112,7 @@ public void loadAll() throws IOException {
                     continue;
                 }
                 OptionalView view = optionalViewMap.get(selectedProfile);
-                for (OptionsScene.OptionalListEntryPair entryPair : entry.enabled) {
+                for (OptionalListEntryPair entryPair : entry.enabled) {
                     try {
                         OptionalFile file = selectedProfile.getOptionalFile(entryPair.name);
                         if (file.visible) {
@@ -132,4 +129,42 @@ public void loadAll() throws IOException {
             }
         }
     }
+
+    public static class OptionalListEntryPair {
+        @LauncherNetworkAPI
+        public String name;
+        @LauncherNetworkAPI
+        public boolean mark;
+        @LauncherNetworkAPI
+        public OptionalView.OptionalFileInstallInfo installInfo;
+
+        public OptionalListEntryPair(OptionalFile optionalFile, boolean enabled,
+                OptionalView.OptionalFileInstallInfo installInfo) {
+            name = optionalFile.name;
+            mark = enabled;
+            this.installInfo = installInfo;
+        }
+    }
+
+    public static class OptionalListEntry {
+        @LauncherNetworkAPI
+        public List<OptionalListEntryPair> enabled = new LinkedList<>();
+        @LauncherNetworkAPI
+        public String name;
+        @LauncherNetworkAPI
+        public UUID profileUUID;
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            OptionalListEntry that = (OptionalListEntry) o;
+            return Objects.equals(profileUUID, that.profileUUID) && Objects.equals(name, that.name);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(name, profileUUID);
+        }
+    }
 }
\ No newline at end of file

From de079a6a2adb88c5c4c1ce514277aa893bb9a4af Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Thu, 2 Nov 2023 19:29:31 +0700
Subject: [PATCH 06/15] [FIX] Server description

---
 runtime/scenes/serverinfo/serverinfo.fxml                  | 2 +-
 .../client/gui/scenes/serverinfo/ServerInfoScene.java      | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/runtime/scenes/serverinfo/serverinfo.fxml b/runtime/scenes/serverinfo/serverinfo.fxml
index 0a684098..799c34bc 100644
--- a/runtime/scenes/serverinfo/serverinfo.fxml
+++ b/runtime/scenes/serverinfo/serverinfo.fxml
@@ -92,7 +92,7 @@
 
      <!-- Блок сервера-->
      <Pane id="serverButton" layoutX="34.0" layoutY="119.0" prefHeight="350.0" prefWidth="175.0" AnchorPane.leftAnchor="62.0" AnchorPane.topAnchor="148.0" />
-   <ScrollPane fitToWidth="true" hbarPolicy="NEVER" layoutX="320.0" layoutY="100.0" pannable="true" AnchorPane.bottomAnchor="20.0" AnchorPane.leftAnchor="320.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="100.0">
+   <ScrollPane id="serverDescriptionPane" fitToWidth="true" hbarPolicy="NEVER" layoutX="320.0" layoutY="100.0" pannable="true" AnchorPane.bottomAnchor="20.0" AnchorPane.leftAnchor="320.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="100.0">
       <content>
             <Label id="serverDescription" alignment="TOP_LEFT" maxWidth="1.7976931348623157E308" prefWidth="149.0" text="Server description" wrapText="true" />
       </content>
diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/serverinfo/ServerInfoScene.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/serverinfo/ServerInfoScene.java
index 057d2464..8574935a 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/scenes/serverinfo/ServerInfoScene.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/scenes/serverinfo/ServerInfoScene.java
@@ -4,6 +4,7 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBase;
 import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.Pane;
@@ -73,8 +74,10 @@ public void reset() {
         avatar.setImage(originalAvatarImage);
         ClientProfile profile = application.profilesService.getProfile();
         LookupHelper.<Label>lookupIfPossible(layout, "#serverName").ifPresent((e) -> e.setText(profile.getTitle()));
-        LookupHelper.<Label>lookupIfPossible(layout, "#serverDescription")
-                    .ifPresent((e) -> e.setText(profile.getInfo()));
+        LookupHelper.<ScrollPane>lookupIfPossible(layout, "#serverDescriptionPane").ifPresent((e) -> {
+            var label = (Label) e.getContent();
+            label.setText(profile.getInfo());
+        });
         LookupHelper.<Label>lookupIfPossible(layout, "#nickname")
                     .ifPresent((e) -> e.setText(application.authService.getUsername()));
         Pane serverButtonContainer = LookupHelper.lookup(layout, "#serverButton");

From fd4dffffa7c5bdc15605d0152d77151112723c51 Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Sat, 4 Nov 2023 21:15:13 +0700
Subject: [PATCH 07/15] [FIX] InfoDialog

---
 .../pro/gravit/launcher/client/gui/dialogs/InfoDialog.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 5b27d4c7..8517c180 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
@@ -1,6 +1,7 @@
 package pro.gravit.launcher.client.gui.dialogs;
 
 import javafx.scene.control.Button;
+import javafx.scene.control.Label;
 import javafx.scene.text.Text;
 import pro.gravit.launcher.client.gui.JavaFXApplication;
 import pro.gravit.launcher.client.gui.helper.LookupHelper;
@@ -12,8 +13,8 @@ public class InfoDialog extends AbstractDialog {
     private final Runnable onAccept;
     private final Runnable onClose;
 
-    private Text textHeader;
-    private Text textDescription;
+    private Label textHeader;
+    private Label textDescription;
 
     public InfoDialog(JavaFXApplication application, String header, String text, Runnable onAccept, Runnable onClose) {
         super("dialogs/info/dialog.fxml", application);

From 5aac801e59315d70dc9a51bf0ae4ba71cff7badf Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Fri, 10 Nov 2023 00:55:45 +0700
Subject: [PATCH 08/15] [FIX] Optional mods, welcome overlay

---
 .../gravit/launcher/client/gui/JavaFXApplication.java  |  2 +-
 .../launcher/client/gui/overlays/WelcomeOverlay.java   | 10 +++++++++-
 .../launcher/client/gui/scenes/login/LoginScene.java   |  4 ----
 .../client/gui/scenes/options/OptionsScene.java        |  1 +
 .../client/gui/scenes/serverinfo/ServerInfoScene.java  |  1 -
 .../client/gui/scenes/servermenu/ServerMenuScene.java  |  1 -
 .../launcher/client/gui/service/ProfilesService.java   | 10 +++++++++-
 7 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/main/java/pro/gravit/launcher/client/gui/JavaFXApplication.java b/src/main/java/pro/gravit/launcher/client/gui/JavaFXApplication.java
index 157ce9c7..8eb5e640 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/JavaFXApplication.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/JavaFXApplication.java
@@ -113,7 +113,7 @@ public void init() throws Exception {
         service.registerEventHandler(new GuiEventHandler(this));
         authService = new AuthService(this);
         launchService = new LaunchService(this);
-        profilesService = new ProfilesService();
+        profilesService = new ProfilesService(this);
         messageManager = new MessageManager(this);
         securityService = new RuntimeSecurityService(this);
         skinManager = new SkinManager(this);
diff --git a/src/main/java/pro/gravit/launcher/client/gui/overlays/WelcomeOverlay.java b/src/main/java/pro/gravit/launcher/client/gui/overlays/WelcomeOverlay.java
index e27e9c50..1d07b047 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/overlays/WelcomeOverlay.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/overlays/WelcomeOverlay.java
@@ -10,6 +10,7 @@
 import pro.gravit.utils.helper.LogHelper;
 
 public class WelcomeOverlay extends AbstractOverlay {
+    private Image originalImage;
     public WelcomeOverlay(JavaFXApplication application) {
         super("overlay/welcome/welcome.fxml", application);
     }
@@ -33,7 +34,14 @@ public void reset() {
                 JavaFxUtils.setStaticRadius(h, DesignConstants.AVATAR_IMAGE_RADIUS);
                 Image image = application.skinManager.getScaledFxSkinHead(
                         application.authService.getUsername(), (int) h.getFitWidth(), (int) h.getFitHeight());
-                if (image != null) h.setImage(image);
+                if (image != null) {
+                    if(originalImage == null) {
+                        originalImage = h.getImage();
+                    }
+                    h.setImage(image);
+                } else if(originalImage != null) {
+                    h.setImage(originalImage);
+                }
             } catch (Throwable e) {
                 LogHelper.warning("Skin head error");
             }
diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/login/LoginScene.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/login/LoginScene.java
index fce5e802..e4ccbf3b 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/scenes/login/LoginScene.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/scenes/login/LoginScene.java
@@ -344,10 +344,6 @@ public void onGetProfiles() {
                    (profiles) -> {
                        application.profilesService.setProfilesResult(profiles);
                        application.runtimeSettings.profiles = profiles.profiles;
-                       for (ClientProfile profile : profiles.profiles) {
-                           application.triggerManager
-                                   .process(profile, application.profilesService.getOptionalView(profile));
-                       }
                        contextHelper.runInFxThread(() -> {
                            application.securityService.startRequest();
                            if (application.gui.optionsScene != null) {
diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/options/OptionsScene.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/options/OptionsScene.java
index 992068c2..2c4e7f41 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/scenes/options/OptionsScene.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/scenes/options/OptionsScene.java
@@ -61,6 +61,7 @@ public void reset() {
                 errorHandle(exception);
             }
         }));
+        addProfileOptionals(application.profilesService.getOptionalView());
     }
 
     @Override
diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/serverinfo/ServerInfoScene.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/serverinfo/ServerInfoScene.java
index 8574935a..a9a142bf 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/scenes/serverinfo/ServerInfoScene.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/scenes/serverinfo/ServerInfoScene.java
@@ -53,7 +53,6 @@ protected void doInit() {
                 if (application.profilesService.getProfile() == null) return;
                 switchScene(application.gui.optionsScene);
                 application.gui.optionsScene.reset();
-                application.gui.optionsScene.addProfileOptionals(application.profilesService.getOptionalView());
             } catch (Exception ex) {
                 errorHandle(ex);
             }
diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/servermenu/ServerMenuScene.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/servermenu/ServerMenuScene.java
index 0ecaa510..4aa3b877 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/scenes/servermenu/ServerMenuScene.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/scenes/servermenu/ServerMenuScene.java
@@ -82,7 +82,6 @@ public void reset() {
             cache.serverButton = getServerButton(application, profile);
             cache.position = position;
             serverButtonCacheMap.put(profile, cache);
-            profile.updateOptionalGraph();
             position++;
         }
         ScrollPane scrollPane = LookupHelper.lookup(layout, "#servers");
diff --git a/src/main/java/pro/gravit/launcher/client/gui/service/ProfilesService.java b/src/main/java/pro/gravit/launcher/client/gui/service/ProfilesService.java
index f1f0f88d..9c41795a 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/service/ProfilesService.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/service/ProfilesService.java
@@ -4,6 +4,7 @@
 import pro.gravit.launcher.Launcher;
 import pro.gravit.launcher.LauncherNetworkAPI;
 import pro.gravit.launcher.client.DirBridge;
+import pro.gravit.launcher.client.gui.JavaFXApplication;
 import pro.gravit.launcher.events.request.ProfilesRequestEvent;
 import pro.gravit.launcher.profiles.ClientProfile;
 import pro.gravit.launcher.profiles.optional.OptionalFile;
@@ -20,11 +21,13 @@
 import java.util.*;
 
 public class ProfilesService {
+    private final JavaFXApplication application;
     private List<ClientProfile> profiles;
     private ClientProfile profile;
     private Map<ClientProfile, OptionalView> optionalViewMap;
 
-    public ProfilesService() {
+    public ProfilesService(JavaFXApplication application) {
+        this.application = application;
     }
 
     public Map<ClientProfile, OptionalView> getOptionalViewMap() {
@@ -48,10 +51,15 @@ public void setProfilesResult(ProfilesRequestEvent rawProfilesResult) {
         this.profiles.sort(ClientProfile::compareTo);
         if (this.optionalViewMap == null) this.optionalViewMap = new HashMap<>();
         for (ClientProfile profile : profiles) {
+            profile.updateOptionalGraph();
             OptionalView oldView = this.optionalViewMap.get(profile);
             OptionalView newView = oldView != null ? new OptionalView(profile, oldView) : new OptionalView(profile);
             this.optionalViewMap.put(profile, newView);
         }
+        for (ClientProfile profile : profiles) {
+            application.triggerManager
+                    .process(profile, getOptionalView(profile));
+        }
     }
 
     public List<ClientProfile> getProfiles() {

From 392cd21dc31764b2857f14311713c1c475ced291 Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Fri, 10 Nov 2023 01:13:41 +0700
Subject: [PATCH 09/15] [FIX] Tab focus

---
 runtime/scenes/options/options.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/runtime/scenes/options/options.css b/runtime/scenes/options/options.css
index 5c870669..0c702489 100644
--- a/runtime/scenes/options/options.css
+++ b/runtime/scenes/options/options.css
@@ -55,4 +55,8 @@
     -fx-font-weight: 800;
     -fx-text-fill: -fx-white;
 }
+
+#tabPane:focused .tab {
+    -fx-focus-color: transparent;
+}
 /*-- DrLeonardo styles refactor --*/
\ No newline at end of file

From 3b397856725d98549044c7cbde82607e034e1f43 Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Fri, 10 Nov 2023 03:22:15 +0700
Subject: [PATCH 10/15] [FIX] CSS

---
 runtime/scenes/serverinfo/serverinfo.css | 2 +-
 runtime/styles/global.css                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/runtime/scenes/serverinfo/serverinfo.css b/runtime/scenes/serverinfo/serverinfo.css
index 0e80d540..610a043e 100644
--- a/runtime/scenes/serverinfo/serverinfo.css
+++ b/runtime/scenes/serverinfo/serverinfo.css
@@ -3,7 +3,7 @@
     -fx-font-style: normal;
     -fx-font-weight: normal;
     -fx-font-size: 14px;
-    -fx-text-color: -fx-black2C;
+    -fx-text-fill: -fx-black2C;
 }
 /*-- Фон сервера --*/
 #serverImage {
diff --git a/runtime/styles/global.css b/runtime/styles/global.css
index 97bd7c84..efd5c1a8 100644
--- a/runtime/styles/global.css
+++ b/runtime/styles/global.css
@@ -40,7 +40,7 @@ RadioButton {
 .scene-header {
     -fx-font-weight: bold;
     -fx-font-size: 24px;
-    -fx-text-color: -fx-black2C;
+    -fx-text-fill: -fx-black2C;
 }
 /*-- Вид блоков --*/
 .blocks {
@@ -112,7 +112,7 @@ RadioButton {
     -fx-font-size: 14px;
     -fx-text-fill: -fx-black2C;
 }
-#money {
+#role {
     -fx-font-weight: normal;
     -fx-font-size: 12px;
     -fx-text-fill: -fx-black2C;
@@ -142,7 +142,7 @@ RadioButton {
     -fx-background-radius: 0;
     -fx-padding: 10px;
     -fx-font-size: 12px;
-    -fx-text-color: -fx-black2C;
+    -fx-text-fill: -fx-black2C;
 }
 #output-detail>#output .content,
 #output-detail>#output .content {

From 1a92509e797e8bb3a1cc9475b5913b64b2931e87 Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Fri, 10 Nov 2023 05:40:20 +0700
Subject: [PATCH 11/15] [FIX] Options Scene

---
 runtime/scenes/options/options.css                 |  1 +
 .../client/gui/scenes/options/OptionsScene.java    | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/runtime/scenes/options/options.css b/runtime/scenes/options/options.css
index 0c702489..fd43cf3a 100644
--- a/runtime/scenes/options/options.css
+++ b/runtime/scenes/options/options.css
@@ -7,6 +7,7 @@
 .optional-container {
     -fx-background-color: transparent;
     -fx-padding: 15 0 0 15px;
+    -fx-cursor: hand;
 }
 .optional-checkbox {
     -fx-fill: -fx-black2C;
diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/options/OptionsScene.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/options/OptionsScene.java
index 2c4e7f41..8c109662 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/scenes/options/OptionsScene.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/scenes/options/OptionsScene.java
@@ -2,6 +2,7 @@
 
 import javafx.geometry.Insets;
 import javafx.scene.control.*;
+import javafx.scene.input.MouseButton;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
@@ -105,6 +106,7 @@ public VBox addTab(String name, String displayName) {
         VBox vbox = new VBox();
         ScrollPane scrollPane = new ScrollPane();
         scrollPane.setContent(vbox);
+        scrollPane.setFitToWidth(true);
         tab.setContent(scrollPane);
         tabs.put(name, tab);
         tabPane.getTabs().add(tab);
@@ -119,10 +121,20 @@ public Consumer<Boolean> add(String tab, String name, String description, boolea
         vBox.getChildren().add(checkBox);
         vBox.getChildren().add(label);
         VBox.setMargin(vBox, new Insets(0, 0, 0, 30 * --padding));
+        vBox.setOnMouseClicked((e) -> {
+            if(e.getButton() == MouseButton.PRIMARY) {
+                checkBox.setSelected(!checkBox.isSelected());
+                onChanged.accept(checkBox.isSelected());
+            }
+        });
+        vBox.setOnTouchPressed((e) -> {
+            checkBox.setSelected(!checkBox.isSelected());
+            onChanged.accept(checkBox.isSelected());
+        });
         vBox.getStyleClass().add("optional-container");
         checkBox.setSelected(value);
         checkBox.setText(name);
-        checkBox.setOnAction((e) -> onChanged.accept(checkBox.isSelected()));
+        checkBox.setOnAction((e) -> {onChanged.accept(checkBox.isSelected());});
         checkBox.getStyleClass().add("optional-checkbox");
         label.setText(description);
         label.setWrapText(true);

From 36f17fcff0c7cd52d56012a23c12653cceff0f07 Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Sun, 12 Nov 2023 18:28:17 +0700
Subject: [PATCH 12/15] [FIX] Design fixes

---
 runtime/scenes/debug/debug.fxml               | 13 +++++++-----
 runtime/scenes/options/options.fxml           | 10 ----------
 runtime/scenes/settings/settings.fxml         |  2 +-
 runtime/scenes/update/update.fxml             |  2 +-
 runtime/styles/global.css                     |  6 +++---
 runtime/styles/variables.css                  |  1 +
 .../client/gui/config/DesignConstants.java    |  1 +
 .../client/gui/impl/AbstractStage.java        | 20 +++++++++++++++++--
 .../client/gui/scenes/AbstractScene.java      |  6 ------
 .../client/gui/stage/ConsoleStage.java        |  2 ++
 .../client/gui/stage/DialogStage.java         |  2 ++
 .../client/gui/stage/PrimaryStage.java        |  2 ++
 12 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/runtime/scenes/debug/debug.fxml b/runtime/scenes/debug/debug.fxml
index eede4f96..b3247da0 100644
--- a/runtime/scenes/debug/debug.fxml
+++ b/runtime/scenes/debug/debug.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.shape.SVGPath?>
 
 <!-- DrLeonardo refactor -->
@@ -28,7 +28,7 @@
       </Label>
 
       <!-- Заголовок сцены -->
-      <Label id="headingDialog" layoutX="62.0" layoutY="39.0" prefHeight="25.0" prefWidth="417.0" text="%runtime.scenes.debug.headingDebug" AnchorPane.topAnchor="39.0" />
+      <Label layoutX="62.0" layoutY="39.0" prefHeight="25.0" prefWidth="417.0" styleClass="scene-header" text="%runtime.scenes.debug.headingDebug" AnchorPane.topAnchor="39.0" />
 
 
       <!-- Кнопка назад -->
@@ -87,9 +87,12 @@
       </HBox>
    </AnchorPane>
 
-   <Pane id="output-detail" layoutX="20.0" layoutY="98.0" prefHeight="381.0" prefWidth="860.0">
-      <TextArea id="output" editable="false" layoutX="7.0" layoutY="6.0" prefHeight="390.0" prefWidth="844.0" wrapText="true" />
-   </Pane>
+   <StackPane id="output-detail" layoutX="20.0" layoutY="98.0" prefHeight="381.0" prefWidth="860.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="50.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="110.0">
+      <TextArea id="output" editable="false" layoutX="7.0" layoutY="6.0" wrapText="true">
+         <padding>
+            <Insets bottom="15.0" left="20.0" right="20.0" top="15.0" />
+         </padding></TextArea>
+   </StackPane>
 
    <!-- Подключение стилей-->
    <stylesheets>
diff --git a/runtime/scenes/options/options.fxml b/runtime/scenes/options/options.fxml
index 4b123959..95457b59 100644
--- a/runtime/scenes/options/options.fxml
+++ b/runtime/scenes/options/options.fxml
@@ -32,16 +32,6 @@
         <!-- Заголовок сцены -->
         <HBox id="controls" spacing="10.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="30.0">
 
-            <!-- Кнопка консоли -->
-            <Button id="console" layoutX="676.0" layoutY="-2.0" mnemonicParsing="false" styleClass="icon-button">
-                <graphic>
-                    <SVGPath content="M3.35715 0C1.78599 0 0.5 1.28599 0.5 2.85714V21.1428C0.5 22.714 1.78599 24 3.35715 24H21.6429C23.214 24 24.5 22.714 24.5 21.1428V2.85714C24.5 1.28599 23.214 0 21.6429 0H3.35715ZM3.35715 1.14286H21.6429C22.5963 1.14286 23.3571 1.90372 23.3571 2.85714V21.1428C23.3571 22.0963 22.5963 22.8571 21.6429 22.8571H3.35715C2.40373 22.8571 1.64285 22.0963 1.64285 21.1428V2.85714C1.64285 1.90372 2.40373 1.14286 3.35715 1.14286Z M5.5 6V18H19.5V6H5.5ZM6.66667 7.09091H18.3333V8.18182H6.66667V7.09091ZM6.66667 9.27273H18.3333V16.9091H6.66667V9.27273ZM9.71094 10.7898L8.8724 11.5739L10.4948 13.0909L8.8724 14.608L9.71094 15.392L11.7526 13.483L12.1536 13.0909L11.7526 12.6989L9.71094 10.7898ZM12.5 14.1818V15.2727H16V14.1818H12.5Z" styleClass="icon-button-color" />
-                </graphic>
-                <tooltip>
-                    <Tooltip id="consoleTooltip" text="%runtime.scenes.settings.consoleTooltip" />
-                </tooltip>
-            </Button>
-
             <!-- Кнопка языка -->
             <Button id="lang" layoutX="718.0" mnemonicParsing="false" styleClass="icon-button">
                 <graphic>
diff --git a/runtime/scenes/settings/settings.fxml b/runtime/scenes/settings/settings.fxml
index e990d2b4..9e41e76f 100644
--- a/runtime/scenes/settings/settings.fxml
+++ b/runtime/scenes/settings/settings.fxml
@@ -106,7 +106,7 @@
                   <Label styleClass="settings-header" text="%runtime.scenes.settings.header.java" />
                   <HBox spacing="10.0">
                      <children>
-                           <ComboBox id="javaCombo" prefWidth="240.0" styleClass="combo-box" />
+                           <ComboBox id="javaCombo" prefWidth="240.0" />
                            <Text styleClass="javaDesc" text="%runtime.scenes.settings.javaDesc" textOrigin="CENTER" wrappingWidth="323.0" />
                      </children>
                   </HBox>
diff --git a/runtime/scenes/update/update.fxml b/runtime/scenes/update/update.fxml
index 8384e612..97647a3f 100644
--- a/runtime/scenes/update/update.fxml
+++ b/runtime/scenes/update/update.fxml
@@ -21,7 +21,7 @@
     <!-- Навбар -->
     <AnchorPane id="header" layoutX="523.2000122070312" layoutY="30.0" prefHeight="100.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <!-- Заголовок сцены -->
-        <Text id="headingDialog" layoutX="26.0" layoutY="51.0" text="%runtime.scenes.update.headingDialog" />
+        <Label layoutX="26.0" styleClass="scene-header" layoutY="51.0" text="%runtime.scenes.update.headingDialog" />
         <!-- Кнопки управления -->
         <HBox id="controls" spacing="10.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="30.0">
 
diff --git a/runtime/styles/global.css b/runtime/styles/global.css
index efd5c1a8..d21f6d58 100644
--- a/runtime/styles/global.css
+++ b/runtime/styles/global.css
@@ -39,7 +39,7 @@ RadioButton {
 }
 .scene-header {
     -fx-font-weight: bold;
-    -fx-font-size: 24px;
+    -fx-font-size: 20px;
     -fx-text-fill: -fx-black2C;
 }
 /*-- Вид блоков --*/
@@ -133,8 +133,8 @@ RadioButton {
 }
 /*-- Блок вывода --*/
 #output-detail {
-    -fx-background-color: -fx-glass;
-    -fx-background-radius: 20px;
+    -fx-background-color: -fx-scene-card;
+    -fx-background-radius: 15px 15px 0px 0px;
 }
 /* Вывод лога */
 #output-detail>#output {
diff --git a/runtime/styles/variables.css b/runtime/styles/variables.css
index b5e9a94c..1fc4f651 100644
--- a/runtime/styles/variables.css
+++ b/runtime/styles/variables.css
@@ -27,6 +27,7 @@
     -fx-violetTr: rgba(107, 54, 255, 0.18);
     -fx-header: #A4B3BA;
     -fx-header-hover: #D0D6D9;
+    -fx-scene-card: rgba(250, 250, 255, 0.50);
     -fx-violetGR: linear-gradient(#8D4CE0 10.39%, #5D35B9 68.07%, #FAFAFF 68.07%);
     -fx-ramGR: linear-gradient(from 50% 50% to 100% 100%, -fx-green, -fx-violet);
     -fx-updateGR: linear-gradient(from 20% 20% to 100% 100%, -fx-violet, #5D35B9);
diff --git a/src/main/java/pro/gravit/launcher/client/gui/config/DesignConstants.java b/src/main/java/pro/gravit/launcher/client/gui/config/DesignConstants.java
index e1af4064..940ae8f5 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/config/DesignConstants.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/config/DesignConstants.java
@@ -2,4 +2,5 @@
 
 public class DesignConstants {
     public static final double AVATAR_IMAGE_RADIUS = 8.0;
+    public static final double SCENE_CLIP_RADIUS = 10.0;
 }
diff --git a/src/main/java/pro/gravit/launcher/client/gui/impl/AbstractStage.java b/src/main/java/pro/gravit/launcher/client/gui/impl/AbstractStage.java
index 678651d7..8b34ad63 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/impl/AbstractStage.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/impl/AbstractStage.java
@@ -9,8 +9,10 @@
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
+import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 import pro.gravit.launcher.client.gui.JavaFXApplication;
+import pro.gravit.launcher.client.gui.config.DesignConstants;
 import pro.gravit.utils.helper.LogHelper;
 
 import java.io.IOException;
@@ -37,6 +39,17 @@ protected AbstractStage(Stage stage) {
         } catch (IOException e) {
             LogHelper.error(e);
         }
+        {
+        }
+    }
+
+    protected void setClipRadius(double width, double height) {
+        Rectangle rect = new Rectangle(stackPane.getPrefWidth(), stackPane.getPrefHeight());
+        rect.heightProperty().bind(stackPane.heightProperty());
+        rect.widthProperty().bind(stackPane.widthProperty());
+        rect.setArcHeight(height);
+        rect.setArcWidth(width);
+        stackPane.setClip(rect);
     }
 
     public void hide() {
@@ -81,8 +94,9 @@ public void setScene(AbstractVisualComponent visualComponent) throws Exception {
             stackPane.getChildren().add(visualComponent.getFxmlRoot());
         } else {
             var old = stackPane.getChildren().get(0);
-            if(old.getEffect() instanceof GaussianBlur) { // TODO: MAY BE BLUR NEW SCENE (?)
+            if(old.getEffect() instanceof GaussianBlur blur) {
                 old.setEffect(null);
+                visualComponent.getFxmlRootPrivate().setEffect(blur);
             }
             stackPane.getChildren().set(0, visualComponent.getFxmlRoot());
         }
@@ -151,8 +165,9 @@ public void show() {
 
     public void disable() {
         if (disableCounter.incrementAndGet() != 1) return;
+        LogHelper.dev("Disable scene: stack_num: %s | blur: %s",stackPane.getChildren().size(), disablePane == null ? "null" : "not null");
         Pane layout = (Pane) stackPane.getChildren().get(0);
-        layout.setEffect(new GaussianBlur(20));
+        layout.setEffect(new GaussianBlur(150));
         if (disablePane == null) {
             disablePane = new Pane();
             disablePane.setPrefHeight(layout.getPrefHeight());
@@ -164,6 +179,7 @@ public void disable() {
 
     public void enable() {
         if (disableCounter.decrementAndGet() != 0) return;
+        LogHelper.dev("Enable scene: stack_num: %s | blur: %s",stackPane.getChildren().size(), disablePane == null ? "null" : "not null");
         Pane layout = (Pane) stackPane.getChildren().get(0);
         layout.setEffect(null);
         disablePane.setVisible(false);
diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/AbstractScene.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/AbstractScene.java
index 0a58fb6b..2923e604 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/scenes/AbstractScene.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/scenes/AbstractScene.java
@@ -39,12 +39,6 @@ protected AbstractStage getCurrentStage() {
 
     public void init() throws Exception {
         layout = (Pane) LookupHelper.lookupIfPossible(getFxmlRoot(), "#layout").orElse(getFxmlRoot());
-        Rectangle rect = new Rectangle(layout.getPrefWidth(), layout.getPrefHeight());
-        rect.heightProperty().bind(layout.heightProperty());
-        rect.widthProperty().bind(layout.widthProperty());
-        rect.setArcHeight(15);
-        rect.setArcWidth(15);
-        layout.setClip(rect);
         header = (Pane) LookupHelper.lookupIfPossible(layout, "#header").orElse(null);
         sceneBaseInit();
         super.init();
diff --git a/src/main/java/pro/gravit/launcher/client/gui/stage/ConsoleStage.java b/src/main/java/pro/gravit/launcher/client/gui/stage/ConsoleStage.java
index 5d436e22..e2fa7b7a 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/stage/ConsoleStage.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/stage/ConsoleStage.java
@@ -1,6 +1,7 @@
 package pro.gravit.launcher.client.gui.stage;
 
 import pro.gravit.launcher.client.gui.JavaFXApplication;
+import pro.gravit.launcher.client.gui.config.DesignConstants;
 import pro.gravit.launcher.client.gui.impl.AbstractStage;
 
 public class ConsoleStage extends AbstractStage {
@@ -8,5 +9,6 @@ public ConsoleStage(JavaFXApplication application) {
         super(application.newStage());
         stage.setTitle("%s Launcher Console".formatted(application.config.projectName));
         stage.setResizable(false);
+        setClipRadius(DesignConstants.SCENE_CLIP_RADIUS, DesignConstants.SCENE_CLIP_RADIUS);
     }
 }
diff --git a/src/main/java/pro/gravit/launcher/client/gui/stage/DialogStage.java b/src/main/java/pro/gravit/launcher/client/gui/stage/DialogStage.java
index 9d882d75..138c9784 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/stage/DialogStage.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/stage/DialogStage.java
@@ -6,6 +6,7 @@
 import javafx.stage.Screen;
 import javafx.stage.StageStyle;
 import pro.gravit.launcher.client.gui.JavaFXApplication;
+import pro.gravit.launcher.client.gui.config.DesignConstants;
 import pro.gravit.launcher.client.gui.dialogs.AbstractDialog;
 import pro.gravit.launcher.client.gui.helper.LookupHelper;
 import pro.gravit.launcher.client.gui.impl.AbstractStage;
@@ -27,6 +28,7 @@ public DialogStage(JavaFXApplication application, String title, AbstractDialog d
         } catch (IOException e) {
             LogHelper.error(e);
         }
+        setClipRadius(DesignConstants.SCENE_CLIP_RADIUS, DesignConstants.SCENE_CLIP_RADIUS);
         setScene(dialog);
         enableMouseDrag(dialog.getLayout());
         Screen screen = Screen.getPrimary();
diff --git a/src/main/java/pro/gravit/launcher/client/gui/stage/PrimaryStage.java b/src/main/java/pro/gravit/launcher/client/gui/stage/PrimaryStage.java
index 76757e91..3147b983 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/stage/PrimaryStage.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/stage/PrimaryStage.java
@@ -6,6 +6,7 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import pro.gravit.launcher.client.gui.JavaFXApplication;
+import pro.gravit.launcher.client.gui.config.DesignConstants;
 import pro.gravit.launcher.client.gui.impl.AbstractStage;
 import pro.gravit.utils.helper.LogHelper;
 
@@ -25,6 +26,7 @@ public PrimaryStage(Stage primaryStage, String title) {
         } catch (IOException e) {
             LogHelper.error(e);
         }
+        setClipRadius(DesignConstants.SCENE_CLIP_RADIUS, DesignConstants.SCENE_CLIP_RADIUS);
     }
 
     @Override

From f0cac1e6c6e5ae19a06232d0f6f3bf108b0b3846 Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Sun, 12 Nov 2023 18:45:08 +0700
Subject: [PATCH 13/15] [FIX] enable in errorHandle

---
 .../gravit/launcher/client/gui/impl/AbstractStage.java    | 8 +++++---
 .../launcher/client/gui/scenes/login/LoginScene.java      | 1 -
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/pro/gravit/launcher/client/gui/impl/AbstractStage.java b/src/main/java/pro/gravit/launcher/client/gui/impl/AbstractStage.java
index 8b34ad63..11bdebb3 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/impl/AbstractStage.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/impl/AbstractStage.java
@@ -164,8 +164,9 @@ public void show() {
     }
 
     public void disable() {
-        if (disableCounter.incrementAndGet() != 1) return;
-        LogHelper.dev("Disable scene: stack_num: %s | blur: %s",stackPane.getChildren().size(), disablePane == null ? "null" : "not null");
+        var value = disableCounter.incrementAndGet();
+        LogHelper.dev("Disable scene: stack_num: %s | blur: %s | counter: %s",stackPane.getChildren().size(), disablePane == null ? "null" : "not null", disableCounter.get());
+        if (value != 1) return;
         Pane layout = (Pane) stackPane.getChildren().get(0);
         layout.setEffect(new GaussianBlur(150));
         if (disablePane == null) {
@@ -178,7 +179,8 @@ public void disable() {
     }
 
     public void enable() {
-        if (disableCounter.decrementAndGet() != 0) return;
+        var value = disableCounter.decrementAndGet();
+        if (value != 0) return;
         LogHelper.dev("Enable scene: stack_num: %s | blur: %s",stackPane.getChildren().size(), disablePane == null ? "null" : "not null");
         Pane layout = (Pane) stackPane.getChildren().get(0);
         layout.setEffect(null);
diff --git a/src/main/java/pro/gravit/launcher/client/gui/scenes/login/LoginScene.java b/src/main/java/pro/gravit/launcher/client/gui/scenes/login/LoginScene.java
index e4ccbf3b..2a165a54 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/scenes/login/LoginScene.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/scenes/login/LoginScene.java
@@ -191,7 +191,6 @@ public <T extends WebSocketEvent> void processing(Request<T> request, String tex
     public void errorHandle(Throwable e) {
         super.errorHandle(e);
         contextHelper.runInFxThread(() -> {
-            enable();
             authButton.setState(LoginAuthButtonComponent.AuthButtonState.ERROR);
         });
     }

From f891c8a9541e3e57049c673caa6c7d54bedecab1 Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Sun, 12 Nov 2023 18:47:27 +0700
Subject: [PATCH 14/15] [FIX] dev log

---
 .../pro/gravit/launcher/client/gui/impl/AbstractStage.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/pro/gravit/launcher/client/gui/impl/AbstractStage.java b/src/main/java/pro/gravit/launcher/client/gui/impl/AbstractStage.java
index 11bdebb3..1008ca94 100644
--- a/src/main/java/pro/gravit/launcher/client/gui/impl/AbstractStage.java
+++ b/src/main/java/pro/gravit/launcher/client/gui/impl/AbstractStage.java
@@ -165,7 +165,7 @@ public void show() {
 
     public void disable() {
         var value = disableCounter.incrementAndGet();
-        LogHelper.dev("Disable scene: stack_num: %s | blur: %s | counter: %s",stackPane.getChildren().size(), disablePane == null ? "null" : "not null", disableCounter.get());
+        LogHelper.dev("Disable scene: stack_num: %s | blur: %s | counter: %s",stackPane.getChildren().size(), disablePane == null ? "null" : "not null", value);
         if (value != 1) return;
         Pane layout = (Pane) stackPane.getChildren().get(0);
         layout.setEffect(new GaussianBlur(150));
@@ -180,8 +180,8 @@ public void disable() {
 
     public void enable() {
         var value = disableCounter.decrementAndGet();
+        LogHelper.dev("Enable scene: stack_num: %s | blur: %s | counter: %s",stackPane.getChildren().size(), disablePane == null ? "null" : "not null", value);
         if (value != 0) return;
-        LogHelper.dev("Enable scene: stack_num: %s | blur: %s",stackPane.getChildren().size(), disablePane == null ? "null" : "not null");
         Pane layout = (Pane) stackPane.getChildren().get(0);
         layout.setEffect(null);
         disablePane.setVisible(false);

From d7e58486dbb08caea7469e062488affa5779e70e Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Mon, 20 Nov 2023 17:46:53 +0700
Subject: [PATCH 15/15] 3.0.2 stable runtime for 5.5.2

---
 build.gradle                                       | 14 +++++++-------
 .../gravit/launcher/client/JavaRuntimeModule.java  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index f3ebcd7a..5a5d0dd4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ javafx {
 sourceCompatibility = '17'
 targetCompatibility = '17'
 group 'pro.gravit.launcher'
-version '3.0.1'
+version '3.0.2'
 def mainClassName = "pro.gravit.launcher.client.JavaRuntimeModule"
 
 task sourcesJar(type: Jar) {
@@ -58,12 +58,12 @@ repositories {
 }
 
 dependencies {
-    implementation "pro.gravit.launcher:launcher-core:5.5.1"
-    implementation "pro.gravit.launcher:launcher-modern-core:5.5.1"
-    implementation "pro.gravit.launcher:launcher-ws-api:5.5.1"
-    implementation "pro.gravit.launcher:launcher-client-api:5.5.1"
-    implementation "pro.gravit.launcher:launcher-client-start-api:5.5.1"
-    implementation "pro.gravit.launcher:launcher-client-starter-api:5.5.1"
+    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.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/src/main/java/pro/gravit/launcher/client/JavaRuntimeModule.java b/src/main/java/pro/gravit/launcher/client/JavaRuntimeModule.java
index a0555337..2af876bc 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, 1, 1, Version.Type.STABLE),
+                                     new Version(3, 0, 2, 1, Version.Type.STABLE),
                                      0, new String[]{}, new String[]{"runtime"}));
     }