优化 SettingsPage 内边距 (#5077)

resolves #4940

.cnb/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: QQ 群
+    url: https://docs.hmcl.net/groups.html
+    about: Hello Minecraft! Launcher 的官方 QQ 交流群。
+  - name: Discord 服务器
+    url: https://discord.gg/jVvC7HfM6U
+    about: Hello Minecraft! Launcher 的官方 Discord 服务器。

.github/workflows/check-update.yml

@@ -1,79 +0,0 @@
-name: Check Update
-
-on:
-  workflow_dispatch:
-#  schedule:
-#    - cron: '30 * * * *'
-
-permissions:
-  contents: write
-
-jobs:
-  check-update:
-    if: ${{ github.repository_owner == 'HMCL-dev' }}
-    strategy:
-      fail-fast: false
-      max-parallel: 1
-      matrix:
-        include:
-          - channel: dev
-            task: checkUpdateDev
-          - channel: stable
-            task: checkUpdateStable
-    runs-on: ubuntu-latest
-    name: check-update-${{ matrix.channel }}
-    steps:
-      - uses: actions/checkout@v5
-      - name: Set up JDK
-        uses: actions/setup-java@v5
-        with:
-          distribution: 'temurin'
-          java-version: '25'
-      - name: Fetch tags
-        run: git fetch --all --tags
-      - name: Fetch last version
-        run: ./gradlew ${{ matrix.task }} --no-daemon --info --stacktrace
-      - name: Check for existing tags
-        run: if [ -z "$(git tag -l "$HMCL_TAG_NAME")" ]; then echo "continue=true" >> $GITHUB_ENV; fi
-      - name: Download artifacts
-        if: ${{ env.continue == 'true' }}
-        run: |
-          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.exe"
-          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.exe.sha256"
-          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.jar"
-          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.jar.sha256"
-          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.sh"
-          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.sh.sha256"
-        env:
-          GH_DOWNLOAD_BASE_URL: https://github.com/HMCL-dev/HMCL/releases/download
-      - name: Generate release note
-        if: ${{ env.continue == 'true' }}
-        run: |
-          if [ "${{ matrix.channel }}" = "stable" ]; then
-            echo "**This version is a stable version.**" >> RELEASE_NOTE
-            echo "" >> RELEASE_NOTE
-          fi
-          echo "The full changelogs can be found on the website: https://docs.hmcl.net/changelog/${{ matrix.channel }}.html" >> RELEASE_NOTE
-          echo "" >> RELEASE_NOTE
-          echo "*Notice: changelogs are written in Chinese.*" >> RELEASE_NOTE
-          echo "" >> RELEASE_NOTE
-          echo "| File Name | SHA-256 Checksum |"  >> RELEASE_NOTE
-          echo "| ---  | --- |" >> RELEASE_NOTE
-          echo "| [HMCL-$HMCL_VERSION.exe]($GH_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.exe) | \`$(cat HMCL-$HMCL_VERSION.exe.sha256)\` |" >> RELEASE_NOTE
-          echo "| [HMCL-$HMCL_VERSION.jar]($GH_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.jar) | \`$(cat HMCL-$HMCL_VERSION.jar.sha256)\` |" >> RELEASE_NOTE
-          echo "| [HMCL-$HMCL_VERSION.sh]($GH_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.sh)   | \`$(cat HMCL-$HMCL_VERSION.sh.sha256)\` |"  >> RELEASE_NOTE
-        env:
-          GH_DOWNLOAD_BASE_URL: https://github.com/HMCL-dev/HMCL/releases/download
-      - name: Create release
-        if: ${{ env.continue == 'true' }}
-        uses: softprops/action-gh-release@v2
-        with:
-          body_path: RELEASE_NOTE
-          files: |
-            HMCL-${{ env.HMCL_VERSION }}.exe
-            HMCL-${{ env.HMCL_VERSION }}.jar
-            HMCL-${{ env.HMCL_VERSION }}.sh
-          target_commitish: ${{ env.HMCL_COMMIT_SHA }}
-          name: ${{ env.HMCL_TAG_NAME }}
-          tag_name: ${{ env.HMCL_TAG_NAME }}
-          prerelease: true

.github/workflows/gitee.yml

@@ -1,21 +0,0 @@
-name: Sync to Gitee
-
-on:
-  push
-
-jobs:
-  run:
-    if: ${{ github.repository_owner == 'HMCL-dev' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Mirror GitHub to Gitee
-        uses: Yikun/hub-mirror-action@v1.4
-        with:
-          src: github/HMCL-dev
-          dst: gitee/huanghongxun
-          static_list: 'HMCL'
-          force_update: true
-          debug: true
-          dst_key: ${{ secrets.GITEE_SYNC_BOT_PRIVATE_KEY }}
-          dst_token: ${{ secrets.GITEE_SYNC_BOT_TOKEN }}
-          cache_path: /github/workspace/hub-mirror-cache

.github/workflows/mirror.yml

@@ -0,0 +1,33 @@
+name: Mirror Repository
+
+on:
+  workflow_dispatch:
+  push:
+
+concurrency:
+  group: mirror-repository
+  cancel-in-progress: true
+
+jobs:
+  mirror:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Gitee
+            repo: gitee.com/huanghongxun/HMCL
+            user: 'hmcl-sync'
+            token: 'GITEE_SYNC_TOKEN'
+          - name: CNB
+            repo: cnb.cool/HMCL-dev/HMCL
+            user: 'cnb'
+            token: 'CNB_SYNC_TOKEN'
+    name: Mirror to ${{ matrix.name }}
+    if: ${{ github.repository == 'HMCL-dev/HMCL' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Mirror GitHub to ${{ matrix.name }}
+        run: |
+          git clone --mirror "https://github.com/${{ github.repository }}.git" -- repo
+          cd repo
+          git push -f --prune "https://${{ matrix.user }}:${{ secrets[matrix.token] }}@${{ matrix.repo }}.git" "refs/heads/*:refs/heads/*" "refs/tags/*:refs/tags/*"

.github/workflows/release.yml

@@ -0,0 +1,125 @@
+name: Create Release
+
+on:
+  workflow_dispatch:
+#  schedule:
+#    - cron: '30 * * * *'
+
+permissions:
+  contents: write
+
+jobs:
+  check-update:
+    if: ${{ github.repository_owner == 'HMCL-dev' }}
+    strategy:
+      fail-fast: false
+      max-parallel: 1
+      matrix:
+        include:
+          - channel: dev
+            task: checkUpdateDev
+          - channel: stable
+            task: checkUpdateStable
+    runs-on: ubuntu-latest
+    name: check-update-${{ matrix.channel }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+      - name: Set up JDK
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: '25'
+      - name: Fetch last version
+        run: ./gradlew ${{ matrix.task }} --no-daemon --info --stacktrace
+      - name: Check for existing tags
+        run: if [ -z "$(git tag -l "$HMCL_TAG_NAME")" ]; then echo "continue=true" >> $GITHUB_ENV; fi
+      - name: Download artifacts
+        if: ${{ env.continue == 'true' }}
+        run: |
+          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.exe"
+          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.exe.sha256"
+          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.jar"
+          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.jar.sha256"
+          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.sh"
+          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.sh.sha256"
+      - name: Verify artifacts
+        if: ${{ env.continue == 'true' }}
+        run: |
+          export JAR_SHA256=$(cat HMCL-$HMCL_VERSION.jar.sha256 | tr -d '\n')
+          export EXE_SHA256=$(cat HMCL-$HMCL_VERSION.exe.sha256 | tr -d '\n')
+          export SH_SHA256=$(cat HMCL-$HMCL_VERSION.sh.sha256 | tr -d '\n')
+          
+          echo "$JAR_SHA256  HMCL-$HMCL_VERSION.jar" | sha256sum -c
+          echo "$EXE_SHA256  HMCL-$HMCL_VERSION.exe" | sha256sum -c
+          echo "$SH_SHA256  HMCL-$HMCL_VERSION.sh" | sha256sum -c
+      - name: Generate release note
+        if: ${{ env.continue == 'true' }}
+        run: |
+          # GitHub Release Note
+          echo " **[Changelog](https://docs.hmcl.net/changelog/${{ matrix.channel }}.html#HMCL-$HMCL_VERSION)** (Chinese)" >> RELEASE_NOTE
+          echo "" >> RELEASE_NOTE
+          echo "| File | SHA-256 Checksum |"  >> RELEASE_NOTE
+          echo "| ---  | --- |" >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.exe]($GH_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.exe) | \`$(cat HMCL-$HMCL_VERSION.exe.sha256)\` |" >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.jar]($GH_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.jar) | \`$(cat HMCL-$HMCL_VERSION.jar.sha256)\` |" >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.sh]($GH_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.sh)   | \`$(cat HMCL-$HMCL_VERSION.sh.sha256)\` |"  >> RELEASE_NOTE
+          
+          # CNB Release Note
+          echo "[更新日志](https://docs.hmcl.net/changelog/${{ matrix.channel }}.html#HMCL-$HMCL_VERSION)" >> CNB_RELEASE_NOTE
+          echo "" >> CNB_RELEASE_NOTE
+          echo "| 文件 | SHA-256 校验码 |"  >> CNB_RELEASE_NOTE
+          echo "| :---  | --- |" >> CNB_RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.exe]($CNB_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.exe) | \`$(cat HMCL-$HMCL_VERSION.exe.sha256)\` |" >> CNB_RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.jar]($CNB_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.jar) | \`$(cat HMCL-$HMCL_VERSION.jar.sha256)\` |" >> CNB_RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.sh]($CNB_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.sh)   | \`$(cat HMCL-$HMCL_VERSION.sh.sha256)\` |"  >> CNB_RELEASE_NOTE
+        env:
+          GH_DOWNLOAD_BASE_URL: https://github.com/${{ github.repository }}/releases/download
+          CNB_DOWNLOAD_BASE_URL: https://cnb.cool/HMCL-dev/HMCL/-/releases/download
+      - name: Create GitHub release
+        if: ${{ env.continue == 'true' }}
+        run: |
+          gh release create "${{ env.HMCL_TAG_NAME }}" \
+            "HMCL-${{ env.HMCL_VERSION }}.exe" \
+            "HMCL-${{ env.HMCL_VERSION }}.jar" \
+            "HMCL-${{ env.HMCL_VERSION }}.sh" \
+            --target "${{ env.HMCL_COMMIT_SHA }}" \
+            --title "${{ env.HMCL_TAG_NAME }}" \
+            --notes-file RELEASE_NOTE \
+            --prerelease
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install git-cnb
+        if: ${{ env.continue == 'true' }}
+        run: go install "cnb.cool/looc/git-cnb@$GIT_CNB_VERSION"
+        env:
+          GIT_CNB_VERSION: '1.1.2'
+      - name: Create CNB release
+        if: ${{ env.continue == 'true' }}
+        run: |
+          echo "Uploading tags to CNB"
+          git fetch --tags
+          git push "https://cnb:${{ secrets.CNB_SYNC_TOKEN }}@cnb.cool/$CNB_REPO.git" "$HMCL_TAG_NAME"
+          
+          echo "Creating CNB release"
+          ~/go/bin/git-cnb release create \
+             --repo "$CNB_REPO" \
+             --tag "$HMCL_TAG_NAME" \
+             --name "HMCL $HMCL_VERSION" \
+             --body "$(cat CNB_RELEASE_NOTE)" \
+             --prerelease true
+
+           echo "Uploading HMCL-$HMCL_VERSION.jar"
+           ~/go/bin/git-cnb release asset-upload --repo="$CNB_REPO" --tag-name "$HMCL_TAG_NAME" --file-name "HMCL-$HMCL_VERSION.jar"
+
+           echo "Uploading HMCL-$HMCL_VERSION.exe"
+           ~/go/bin/git-cnb release asset-upload --repo="$CNB_REPO" --tag-name "$HMCL_TAG_NAME" --file-name "HMCL-$HMCL_VERSION.exe"
+
+           echo "Uploading HMCL-$HMCL_VERSION.sh"
+           ~/go/bin/git-cnb release asset-upload --repo="$CNB_REPO" --tag-name "$HMCL_TAG_NAME" --file-name "HMCL-$HMCL_VERSION.sh"
+        env:
+          CNB_TOKEN: ${{ secrets.CNB_SYNC_TOKEN }}
+          CNB_REPO: HMCL-dev/HMCL

HMCL/build.gradle.kts

@@ -128,11 +128,13 @@ val addOpens = listOf(
     "javafx.base/javafx.beans.property",
     "javafx.graphics/javafx.css",
     "javafx.graphics/javafx.stage",
+    "javafx.graphics/com.sun.glass.ui",
     "javafx.graphics/com.sun.javafx.stage",
     "javafx.graphics/com.sun.javafx.util",
     "javafx.graphics/com.sun.prism",
     "javafx.controls/com.sun.javafx.scene.control",
     "javafx.controls/com.sun.javafx.scene.control.behavior",
+    "javafx.graphics/com.sun.javafx.tk.quantum",
     "javafx.controls/javafx.scene.control.skin",
     "jdk.attach/sun.tools.attach",
 )

HMCL/src/main/java/com/jfoenix/controls/JFXPopup.java

@@ -0,0 +1,171 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.skins.JFXPopupSkin;
+import javafx.application.Platform;
+import javafx.beans.DefaultProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.geometry.Point2D;
+import javafx.scene.Node;
+import javafx.scene.control.PopupControl;
+import javafx.scene.control.Skin;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.Region;
+import javafx.stage.Window;
+
+/// JFXPopup is the material design implementation of a popup.
+///
+/// @author Shadi Shaheen
+/// @version 2.0
+/// @since 2017-03-01
+@DefaultProperty(value = "popupContent")
+public class JFXPopup extends PopupControl {
+
+    public enum PopupHPosition {
+        RIGHT, LEFT
+    }
+
+    public enum PopupVPosition {
+        TOP, BOTTOM
+    }
+
+    /// Creates empty popup.
+    public JFXPopup() {
+        this(null);
+    }
+
+    /// creates popup with a specified container and content
+    ///
+    /// @param content the node that will be shown in the popup
+    public JFXPopup(Region content) {
+        setPopupContent(content);
+        initialize();
+    }
+
+    private void initialize() {
+        this.setAutoFix(false);
+        this.setAutoHide(true);
+        this.setHideOnEscape(true);
+        this.setConsumeAutoHidingEvents(false);
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new JFXPopupSkin(this);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Setters / Getters                                                       *
+     *                                                                         *
+     **************************************************************************/
+
+    private final ObjectProperty<Region> popupContent = new SimpleObjectProperty<>(new Pane());
+
+    public final ObjectProperty<Region> popupContentProperty() {
+        return this.popupContent;
+    }
+
+    public final Region getPopupContent() {
+        return this.popupContentProperty().get();
+    }
+
+    public final void setPopupContent(final Region popupContent) {
+        this.popupContentProperty().set(popupContent);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /// show the popup using the default position
+    public void show(Node node) {
+        this.show(node, PopupVPosition.TOP, PopupHPosition.LEFT, 0, 0);
+    }
+
+    /// show the popup according to the specified position
+    ///
+    /// @param vAlign can be TOP/BOTTOM
+    /// @param hAlign can be LEFT/RIGHT
+    public void show(Node node, PopupVPosition vAlign, PopupHPosition hAlign) {
+        this.show(node, vAlign, hAlign, 0, 0);
+    }
+
+    /// show the popup according to the specified position with a certain offset
+    ///
+    /// @param vAlign      can be TOP/BOTTOM
+    /// @param hAlign      can be LEFT/RIGHT
+    /// @param initOffsetX on the x-axis
+    /// @param initOffsetY on the y-axis
+    public void show(Node node, PopupVPosition vAlign, PopupHPosition hAlign, double initOffsetX, double initOffsetY) {
+        if (!isShowing()) {
+            if (node.getScene() == null || node.getScene().getWindow() == null) {
+                throw new IllegalStateException("Can not show popup. The node must be attached to a scene/window.");
+            }
+            Window parent = node.getScene().getWindow();
+            final Point2D origin = node.localToScene(0, 0);
+            final double anchorX = parent.getX() + origin.getX()
+                    + node.getScene().getX() + (hAlign == PopupHPosition.RIGHT ? ((Region) node).getWidth() : 0);
+            final double anchorY = parent.getY() + origin.getY()
+                    + node.getScene()
+                    .getY() + (vAlign == PopupVPosition.BOTTOM ? ((Region) node).getHeight() : 0);
+            this.show(parent, anchorX, anchorY);
+            ((JFXPopupSkin) getSkin()).reset(vAlign, hAlign, initOffsetX, initOffsetY);
+            Platform.runLater(() -> ((JFXPopupSkin) getSkin()).animate());
+        }
+    }
+
+    public void show(Window window, double x, double y, PopupVPosition vAlign, PopupHPosition hAlign, double initOffsetX, double initOffsetY) {
+        if (!isShowing()) {
+            if (window == null) {
+                throw new IllegalStateException("Can not show popup. The node must be attached to a scene/window.");
+            }
+            Window parent = window;
+            final double anchorX = parent.getX() + x + initOffsetX;
+            final double anchorY = parent.getY() + y + initOffsetY;
+            this.show(parent, anchorX, anchorY);
+            ((JFXPopupSkin) getSkin()).reset(vAlign, hAlign, initOffsetX, initOffsetY);
+            Platform.runLater(() -> ((JFXPopupSkin) getSkin()).animate());
+        }
+    }
+
+    @Override
+    public void hide() {
+        super.hide();
+        ((JFXPopupSkin) getSkin()).init();
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Stylesheet Handling                                                     *
+     *                                                                         *
+     **************************************************************************/
+
+    /// Initialize the style class to 'jfx-popup'.
+    ///
+    /// This is the selector class from which CSS can be used to style
+    /// this control.
+    private static final String DEFAULT_STYLE_CLASS = "jfx-popup";
+}

HMCL/src/main/java/com/jfoenix/skins/JFXColorPickerSkin.java

@@ -28,6 +28,8 @@ import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.css.*;
 import javafx.css.converter.BooleanConverter;
 import javafx.geometry.Insets;
@@ -60,6 +62,9 @@ public final class JFXColorPickerSkin extends JFXGenericPickerSkin<Color> {
             "colorLabelVisible",
             true);
 
+    private final ObjectProperty<Color> textFill = new SimpleObjectProperty<>(Color.BLACK);
+    private final ObjectProperty<Background> colorBoxBackground = new SimpleObjectProperty<>(null);
+
     public JFXColorPickerSkin(final ColorPicker colorPicker) {
         super(colorPicker);
 
@@ -67,14 +72,16 @@ public final class JFXColorPickerSkin extends JFXGenericPickerSkin<Color> {
         displayNode = new Label("");
         displayNode.getStyleClass().add("color-label");
         displayNode.setMouseTransparent(true);
+        displayNode.textFillProperty().bind(textFill);
 
         // label graphic
         colorBox = new JFXClippedPane(displayNode);
         colorBox.getStyleClass().add("color-box");
         colorBox.setManaged(false);
+        colorBox.backgroundProperty().bind(colorBoxBackground);
         initColor();
         final JFXRippler rippler = new JFXRippler(colorBox, JFXRippler.RipplerMask.FIT);
-        rippler.ripplerFillProperty().bind(displayNode.textFillProperty());
+        rippler.ripplerFillProperty().bind(textFill);
         getChildren().setAll(rippler);
         JFXDepthManager.setDepth(getSkinnable(), 1);
         getSkinnable().setPickOnBounds(false);
@@ -168,13 +175,13 @@ public final class JFXColorPickerSkin extends JFXGenericPickerSkin<Color> {
                             200,
                             Interpolator.EASE_BOTH)));
             animateColor.setOnFinished((finish) -> {
-                JFXNodeUtils.updateBackground(colorBox.getBackground(), colorBox, colorCircle.getFill());
+                colorBoxBackground.set(new Background(new BackgroundFill(colorCircle.getFill(), new CornerRadii(3), Insets.EMPTY)));
                 colorBox.getChildren().remove(colorCircle);
             });
             animateColor.play();
         }
         // update label color
-        displayNode.setTextFill(circleColor.grayscale().getRed() < 0.5 ? Color.valueOf(
+        textFill.set(circleColor.grayscale().getRed() < 0.5 ? Color.valueOf(
                 "rgba(255, 255, 255, 0.87)") : Color.valueOf("rgba(0, 0, 0, 0.87)"));
         if (colorLabelVisible.get()) {
             displayNode.setText(JFXNodeUtils.colorToHex(circleColor));
@@ -188,9 +195,9 @@ public final class JFXColorPickerSkin extends JFXGenericPickerSkin<Color> {
         Color color = colorPicker.getValue();
         Color circleColor = color == null ? Color.WHITE : color;
         // update picker box color
-        colorBox.setBackground(new Background(new BackgroundFill(circleColor, new CornerRadii(3), Insets.EMPTY)));
+        colorBoxBackground.set(new Background(new BackgroundFill(circleColor, new CornerRadii(3), Insets.EMPTY)));
         // update label color
-        displayNode.setTextFill(circleColor.grayscale().getRed() < 0.5 ? Color.valueOf(
+        textFill.set(circleColor.grayscale().getRed() < 0.5 ? Color.valueOf(
                 "rgba(255, 255, 255, 0.87)") : Color.valueOf("rgba(0, 0, 0, 0.87)"));
         if (colorLabelVisible.get()) {
             displayNode.setText(JFXNodeUtils.colorToHex(circleColor));

HMCL/src/main/java/com/jfoenix/skins/JFXCustomColorPickerDialog.java

@@ -32,9 +32,7 @@ import javafx.beans.property.SimpleObjectProperty;
 import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Rectangle2D;
-import javafx.scene.Node;
 import javafx.scene.Scene;
-import javafx.scene.control.Label;
 import javafx.scene.control.Tab;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.*;
@@ -118,9 +116,9 @@ public class JFXCustomColorPickerDialog extends StackPane {
         Tab hexTab = new Tab("HEX");
         hexTab.setContent(hexField);
 
+        tabs.getTabs().add(hexTab);
         tabs.getTabs().add(rgbTab);
         tabs.getTabs().add(hsbTab);
-        tabs.getTabs().add(hexTab);
 
         curvedColorPicker.selectedPath.addListener((o, oldVal, newVal) -> {
             if (paraTransition != null) {
@@ -156,15 +154,15 @@ public class JFXCustomColorPickerDialog extends StackPane {
                     Color fontColor = ((Color) newVal.getFills().get(0).getFill()).grayscale()
                             .getRed() > 0.5 ? Color.valueOf(
                             "rgba(40, 40, 40, 0.87)") : Color.valueOf("rgba(255, 255, 255, 0.87)");
-                    for (Node tabNode : tabs.lookupAll(".tab")) {
-                        for (Node node : tabNode.lookupAll(".tab-label")) {
-                            ((Label) node).setTextFill(fontColor);
-                        }
-                        for (Node node : tabNode.lookupAll(".jfx-rippler")) {
-                            ((JFXRippler) node).setRipplerFill(fontColor);
-                        }
-                    }
-                    ((Pane) tabs.lookup(".tab-selected-line")).setBackground(new Background(new BackgroundFill(fontColor, CornerRadii.EMPTY, Insets.EMPTY)));
+//                    for (Node tabNode : tabs.lookupAll(".tab")) {
+//                        for (Node node : tabNode.lookupAll(".tab-label")) {
+//                            ((Label) node).setTextFill(fontColor);
+//                        }
+//                        for (Node node : tabNode.lookupAll(".jfx-rippler")) {
+//                            ((JFXRippler) node).setRipplerFill(fontColor);
+//                        }
+//                    }
+//                    ((Pane) tabs.lookup(".tab-selected-line")).setBackground(new Background(new BackgroundFill(fontColor, CornerRadii.EMPTY, Insets.EMPTY)));
                     pickerDecorator.lookupAll(".jfx-decorator-button").forEach(button -> {
                         ((JFXButton) button).setRipplerFill(fontColor);
                         ((SVGGlyph) ((JFXButton) button).getGraphic()).setFill(fontColor);

HMCL/src/main/java/com/jfoenix/skins/JFXListViewSkin.java

@@ -20,26 +20,24 @@
  */
 package com.jfoenix.skins;
 
-import com.jfoenix.adapters.skins.ListViewSkin;
 import com.jfoenix.controls.JFXListView;
 import com.jfoenix.effects.JFXDepthManager;
 import javafx.scene.control.ListCell;
+import javafx.scene.control.skin.ListViewSkin;
 import javafx.scene.control.skin.VirtualFlow;
-import javafx.scene.layout.Region;
 import org.jackhuang.hmcl.ui.FXUtils;
 
-// https://github.com/HMCL-dev/HMCL/issues/4720
 public class JFXListViewSkin<T> extends ListViewSkin<T> {
 
-    private final VirtualFlow<ListCell<T>> flow;
-
-    @SuppressWarnings("unchecked")
     public JFXListViewSkin(final JFXListView<T> listView) {
         super(listView);
-        flow = (VirtualFlow<ListCell<T>>) getChildren().get(0);
+        VirtualFlow<ListCell<T>> flow = getVirtualFlow();
         JFXDepthManager.setDepth(flow, listView.depthProperty().get());
         listView.depthProperty().addListener((o, oldVal, newVal) -> JFXDepthManager.setDepth(flow, newVal));
-        FXUtils.smoothScrolling(flow);
+
+        if (!Boolean.TRUE.equals(listView.getProperties().get("no-smooth-scrolling"))) {
+            FXUtils.smoothScrolling(flow);
+        }
     }
 
     @Override
@@ -47,47 +45,4 @@ public class JFXListViewSkin<T> extends ListViewSkin<T> {
         return 200;
     }
 
-    @Override
-    protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final int itemsCount = getSkinnable().getItems().size();
-        if (getSkinnable().maxHeightProperty().isBound() || itemsCount <= 0) {
-            return super.computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
-        }
-
-        final double fixedCellSize = getSkinnable().getFixedCellSize();
-        double computedHeight = fixedCellSize != Region.USE_COMPUTED_SIZE ?
-                fixedCellSize * itemsCount + snapVerticalInsets() : estimateHeight();
-        double height = super.computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
-        if (height > computedHeight) {
-            height = computedHeight;
-        }
-
-        if (getSkinnable().getMaxHeight() > 0 && computedHeight > getSkinnable().getMaxHeight()) {
-            return getSkinnable().getMaxHeight();
-        }
-
-        return height;
-    }
-
-    private double estimateHeight() {
-        // compute the border/padding for the list
-        double borderWidth = snapVerticalInsets();
-        // compute the gap between list cells
-
-        JFXListView<T> listview = (JFXListView<T>) getSkinnable();
-        double gap = listview.isExpanded() ? ((JFXListView<T>) getSkinnable()).getVerticalGap() * (getSkinnable().getItems()
-                .size()) : 0;
-        // compute the height of each list cell
-        double cellsHeight = 0;
-        for (int i = 0; i < flow.getCellCount(); i++) {
-            ListCell<T> cell = flow.getCell(i);
-            cellsHeight += cell.getHeight();
-        }
-        return cellsHeight + gap + borderWidth;
-    }
-
-    private double snapVerticalInsets() {
-        return getSkinnable().snappedBottomInset() + getSkinnable().snappedTopInset();
-    }
-
 }

HMCL/src/main/java/com/jfoenix/skins/JFXPopupSkin.java

@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2016 JFoenix
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.jfoenix.skins;
+
+import com.jfoenix.controls.JFXPopup;
+import com.jfoenix.controls.JFXPopup.PopupHPosition;
+import com.jfoenix.controls.JFXPopup.PopupVPosition;
+import com.jfoenix.effects.JFXDepthManager;
+import javafx.animation.*;
+import javafx.animation.Animation.Status;
+import javafx.scene.Node;
+import javafx.scene.control.Skin;
+import javafx.scene.layout.*;
+import javafx.scene.transform.Scale;
+import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.animation.AnimationUtils;
+import org.jackhuang.hmcl.ui.animation.Motion;
+
+/// # Material Design Popup Skin
+/// TODO: REWORK
+///
+/// @author Shadi Shaheen
+/// @version 2.0
+/// @since 2017-03-01
+public class JFXPopupSkin implements Skin<JFXPopup> {
+
+    protected JFXPopup control;
+    protected StackPane container = new StackPane();
+    protected Region popupContent;
+    protected Node root;
+
+    private Animation animation;
+    protected Scale scale;
+
+    public JFXPopupSkin(JFXPopup control) {
+        this.control = control;
+        // set scale y to 0.01 instead of 0 to allow layout of the content,
+        // otherwise it will cause exception in traverse engine, when focusing the 1st node
+        scale = new Scale(1.0, 0.01, 0, 0);
+        popupContent = control.getPopupContent();
+        container.getStyleClass().add("jfx-popup-container");
+        container.getChildren().add(popupContent);
+        container.getTransforms().add(scale);
+        container.setOpacity(0);
+        root = JFXDepthManager.createMaterialNode(container, 4);
+        animation = AnimationUtils.isAnimationEnabled() ? getAnimation() : null;
+    }
+
+    public void reset(PopupVPosition vAlign, PopupHPosition hAlign, double offsetX, double offsetY) {
+        // postion the popup according to its animation
+        scale.setPivotX(hAlign == PopupHPosition.RIGHT ? container.getWidth() : 0);
+        scale.setPivotY(vAlign == PopupVPosition.BOTTOM ? container.getHeight() : 0);
+        root.setTranslateX(hAlign == PopupHPosition.RIGHT ? -container.getWidth() + offsetX : offsetX);
+        root.setTranslateY(vAlign == PopupVPosition.BOTTOM ? -container.getHeight() + offsetY : offsetY);
+    }
+
+    public final void animate() {
+        if (animation != null) {
+            if (animation.getStatus() == Status.STOPPED) {
+                container.setOpacity(1);
+                animation.playFromStart();
+            }
+        } else {
+            container.setOpacity(1);
+            popupContent.setOpacity(1);
+            scale.setX(1.0);
+            scale.setY(1.0);
+        }
+    }
+
+    @Override
+    public JFXPopup getSkinnable() {
+        return control;
+    }
+
+    @Override
+    public Node getNode() {
+        return root;
+    }
+
+    @Override
+    public void dispose() {
+        if (animation != null) {
+            animation.stop();
+            animation = null;
+        }
+        container = null;
+        control = null;
+        popupContent = null;
+        root = null;
+    }
+
+    protected Animation getAnimation() {
+        Interpolator interpolator = Motion.EASE;
+        return new Timeline(
+                new KeyFrame(
+                        Duration.ZERO,
+                        new KeyValue(popupContent.opacityProperty(), 0, interpolator),
+                        new KeyValue(scale.xProperty(), 0, interpolator),
+                        new KeyValue(scale.yProperty(), 0, interpolator)
+                ),
+                new KeyFrame(Motion.SHORT4,
+                        new KeyValue(popupContent.opacityProperty(), 0, interpolator),
+                        new KeyValue(scale.xProperty(), 1, interpolator)
+                ),
+                new KeyFrame(Motion.MEDIUM2,
+                        new KeyValue(popupContent.opacityProperty(), 1, interpolator),
+                        new KeyValue(scale.yProperty(), 1, interpolator)
+                )
+        );
+    }
+
+    public void init() {
+        if (animation != null)
+            animation.stop();
+        container.setOpacity(0);
+        scale.setX(1.0);
+        scale.setY(0.01);
+    }
+}

HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java

@@ -20,11 +20,13 @@ package org.jackhuang.hmcl;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.value.ObservableBooleanValue;
+import javafx.geometry.Rectangle2D;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonType;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.DataFormat;
+import javafx.stage.Screen;
 import javafx.stage.Stage;
 import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.setting.SambaException;
@@ -54,6 +56,7 @@ import java.net.CookieManager;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Objects;
@@ -79,6 +82,18 @@ public final class Launcher extends Application {
         LOG.info("Dark Mode: " + Optional.ofNullable(FXUtils.DARK_MODE).map(ObservableBooleanValue::get).orElse(false));
         LOG.info("Reduced Motion: " + Objects.requireNonNullElse(FXUtils.REDUCED_MOTION, false));
 
+        if (Screen.getScreens().isEmpty()) {
+            LOG.info("No screen");
+        } else {
+            StringBuilder builder = new StringBuilder("Screens:");
+            int count = 0;
+            for (Screen screen : Screen.getScreens()) {
+                builder.append("\n - Screen ").append(++count).append(": ");
+                appendScreen(builder, screen);
+            }
+            LOG.info(builder.toString());
+        }
+
         try {
             try {
                 ConfigHolder.init();
@@ -131,6 +146,38 @@ public final class Launcher extends Application {
         }
     }
 
+    private static void appendScreen(StringBuilder builder, Screen screen) {
+        Rectangle2D bounds = screen.getBounds();
+        double scale = screen.getOutputScaleX();
+
+        builder.append(Math.round(bounds.getWidth() * scale));
+        builder.append('x');
+        builder.append(Math.round(bounds.getHeight() * scale));
+
+        DecimalFormat decimalFormat = new DecimalFormat("#.##");
+
+        if (scale != 1.0) {
+            builder.append(" @ ");
+            builder.append(decimalFormat.format(scale));
+            builder.append('x');
+        }
+
+        double dpi = screen.getDpi();
+        builder.append(' ');
+        builder.append(decimalFormat.format(dpi));
+        builder.append("dpi");
+
+        builder.append(" in ")
+                .append(Math.round(Math.sqrt(bounds.getWidth() * bounds.getWidth() + bounds.getHeight() * bounds.getHeight()) / dpi))
+                .append('"');
+
+        builder.append(" (").append(decimalFormat.format(bounds.getMinX()))
+                .append(", ").append(decimalFormat.format(bounds.getMinY()))
+                .append(", ").append(decimalFormat.format(bounds.getMaxX()))
+                .append(", ").append(decimalFormat.format(bounds.getMaxY()))
+                .append(")");
+    }
+
     private static ButtonType showAlert(AlertType alertType, String contentText, ButtonType... buttons) {
         return new Alert(alertType, contentText, buttons).showAndWait().orElse(null);
     }

HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java

@@ -25,20 +25,20 @@ import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.event.Event;
 import org.jackhuang.hmcl.event.EventManager;
+import org.jackhuang.hmcl.java.JavaRuntime;
 import org.jackhuang.hmcl.mod.ModAdviser;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.mod.ModpackConfiguration;
 import org.jackhuang.hmcl.mod.ModpackProvider;
 import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.util.FileSaver;
 import org.jackhuang.hmcl.setting.VersionIconType;
 import org.jackhuang.hmcl.setting.VersionSetting;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.util.FileSaver;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
-import org.jackhuang.hmcl.java.JavaRuntime;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jackhuang.hmcl.util.platform.SystemInfo;
 import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
@@ -55,8 +55,8 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.Pair.pair;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
 public final class HMCLGameRepository extends DefaultGameRepository {
     private final Profile profile;
@@ -338,7 +338,7 @@ public final class HMCLGameRepository extends DefaultGameRepository {
                 GameVersionNumber versionNumber = GameVersionNumber.asGameVersion(gameVersion);
                 if (versionNumber.isAprilFools()) {
                     return VersionIconType.APRIL_FOOLS.getIcon();
-                } else if (versionNumber instanceof GameVersionNumber.Snapshot) {
+                } else if (versionNumber instanceof GameVersionNumber.LegacySnapshot) {
                     return VersionIconType.COMMAND.getIcon();
                 } else if (versionNumber instanceof GameVersionNumber.Old) {
                     return VersionIconType.CRAFT_TABLE.getIcon();
@@ -387,7 +387,7 @@ public final class HMCLGameRepository extends DefaultGameRepository {
             vs.setUsesGlobal(true);
     }
 
-    public LaunchOptions getLaunchOptions(String version, JavaRuntime javaVersion, Path gameDir, List<String> javaAgents, List<String> javaArguments, boolean makeLaunchScript) {
+    public LaunchOptions.Builder getLaunchOptions(String version, JavaRuntime javaVersion, Path gameDir, List<String> javaAgents, List<String> javaArguments, boolean makeLaunchScript) {
         VersionSetting vs = getVersionSetting(version);
 
         LaunchOptions.Builder builder = new LaunchOptions.Builder()
@@ -418,7 +418,6 @@ public final class HMCLGameRepository extends DefaultGameRepository {
                 .setWidth(vs.getWidth())
                 .setHeight(vs.getHeight())
                 .setFullscreen(vs.isFullscreen())
-                .setServerIp(vs.getServerIp())
                 .setWrapper(vs.getWrapper())
                 .setPreLaunchCommand(vs.getPreLaunchCommand())
                 .setPostExitCommand(vs.getPostExitCommand())
@@ -428,12 +427,17 @@ public final class HMCLGameRepository extends DefaultGameRepository {
                 .setNativesDir(vs.getNativesDir())
                 .setProcessPriority(vs.getProcessPriority())
                 .setRenderer(vs.getRenderer())
+                .setEnableDebugLogOutput(vs.isEnableDebugLogOutput())
                 .setUseNativeGLFW(vs.isUseNativeGLFW())
                 .setUseNativeOpenAL(vs.isUseNativeOpenAL())
                 .setDaemon(!makeLaunchScript && vs.getLauncherVisibility().isDaemon())
                 .setJavaAgents(javaAgents)
                 .setJavaArguments(javaArguments);
 
+        if (StringUtils.isNotBlank(vs.getServerIp())) {
+            builder.setQuickPlayOption(new QuickPlayOption.MultiPlayer(vs.getServerIp()));
+        }
+
         if (config().hasProxy()) {
             builder.setProxyType(config().getProxyType());
             builder.setProxyHost(config().getProxyHost());
@@ -460,7 +464,7 @@ public final class HMCLGameRepository extends DefaultGameRepository {
         if (vs.isAutoMemory() && builder.getJavaArguments().stream().anyMatch(it -> it.startsWith("-Xmx")))
             builder.setMaxMemory(null);
 
-        return builder.create();
+        return builder;
     }
 
     @Override

HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java

@@ -22,6 +22,7 @@ import javafx.stage.Stage;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.*;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloadException;
+import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
@@ -51,6 +52,7 @@ import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.lang.ref.WeakReference;
 import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.nio.file.AccessDeniedException;
@@ -60,7 +62,6 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
-import java.lang.ref.WeakReference;
 
 import static javafx.application.Platform.runLater;
 import static javafx.application.Platform.setImplicitExit;
@@ -81,6 +82,8 @@ public final class LauncherHelper {
     private final VersionSetting setting;
     private LauncherVisibility launcherVisibility;
     private boolean showLogs;
+    private QuickPlayOption quickPlayOption;
+    private boolean disableOfflineSkin = false;
 
     public LauncherHelper(Profile profile, Account account, String selectedVersion) {
         this.profile = Objects.requireNonNull(profile);
@@ -111,6 +114,14 @@ public final class LauncherHelper {
         launcherVisibility = LauncherVisibility.KEEP;
     }
 
+    public void setQuickPlayOption(QuickPlayOption quickPlayOption) {
+        this.quickPlayOption = quickPlayOption;
+    }
+
+    public void setDisableOfflineSkin() {
+        disableOfflineSkin = true;
+    }
+
     public void launch() {
         FXUtils.checkFxUserThread();
 
@@ -188,8 +199,15 @@ public final class LauncherHelper {
                 .thenComposeAsync(() -> gameVersion.map(s -> new GameVerificationFixTask(dependencyManager, s, version.get())).orElse(null))
                 .thenComposeAsync(() -> logIn(account).withStage("launch.state.logging_in"))
                 .thenComposeAsync(authInfo -> Task.supplyAsync(() -> {
-                    LaunchOptions launchOptions = repository.getLaunchOptions(
+                    LaunchOptions.Builder launchOptionsBuilder = repository.getLaunchOptions(
                             selectedVersion, javaVersionRef.get(), profile.getGameDir(), javaAgents, javaArguments, scriptFile != null);
+                    if (disableOfflineSkin) {
+                        launchOptionsBuilder.setDaemon(false);
+                    }
+                    if (quickPlayOption != null) {
+                        launchOptionsBuilder.setQuickPlayOption(quickPlayOption);
+                    }
+                    LaunchOptions launchOptions = launchOptionsBuilder.create();
 
                     LOG.info("Here's the structure of game mod directory:\n" + FileUtils.printFileStructure(repository.getModsDirectory(selectedVersion), 10));
 
@@ -639,10 +657,13 @@ public final class LauncherHelper {
         return future;
     }
 
-    private static Task<AuthInfo> logIn(Account account) {
+    private Task<AuthInfo> logIn(Account account) {
         return Task.composeAsync(() -> {
             try {
-                return Task.completed(account.logIn());
+                if (disableOfflineSkin && account instanceof OfflineAccount offlineAccount)
+                    return Task.completed(offlineAccount.logInWithoutSkin());
+                else
+                    return Task.completed(account.logIn());
             } catch (CredentialExpiredException e) {
                 LOG.info("Credential has expired", e);
 

HMCL/src/main/java/org/jackhuang/hmcl/setting/GlobalConfig.java

@@ -19,131 +19,109 @@ package org.jackhuang.hmcl.setting;
 
 import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
+import com.google.gson.annotations.SerializedName;
 import javafx.beans.property.*;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
-import org.jackhuang.hmcl.util.javafx.ObservableHelper;
-import org.jackhuang.hmcl.util.javafx.PropertyUtils;
+import org.jackhuang.hmcl.util.gson.ObservableSetting;
 import org.jetbrains.annotations.Nullable;
 
-import java.lang.reflect.Type;
 import java.util.*;
 
-@JsonAdapter(GlobalConfig.Serializer.class)
-public final class GlobalConfig implements Observable {
+@JsonAdapter(GlobalConfig.Adapter.class)
+public final class GlobalConfig extends ObservableSetting {
 
     @Nullable
     public static GlobalConfig fromJson(String json) throws JsonParseException {
-        GlobalConfig loaded = Config.CONFIG_GSON.fromJson(json, GlobalConfig.class);
-        if (loaded == null) {
-            return null;
-        }
-        GlobalConfig instance = new GlobalConfig();
-        PropertyUtils.copyProperties(loaded, instance);
-        instance.unknownFields.putAll(loaded.unknownFields);
-        return instance;
+        return Config.CONFIG_GSON.fromJson(json, GlobalConfig.class);
     }
 
-    private final IntegerProperty agreementVersion = new SimpleIntegerProperty();
-
-    private final IntegerProperty terracottaAgreementVersion = new SimpleIntegerProperty();
-
-    private final IntegerProperty platformPromptVersion = new SimpleIntegerProperty();
-
-    private final IntegerProperty logRetention = new SimpleIntegerProperty();
-
-    private final BooleanProperty enableOfflineAccount = new SimpleBooleanProperty(false);
-
-    private final StringProperty fontAntiAliasing = new SimpleStringProperty();
-
-    private final ObservableSet<String> userJava = FXCollections.observableSet(new LinkedHashSet<>());
-
-    private final ObservableSet<String> disabledJava = FXCollections.observableSet(new LinkedHashSet<>());
-
-    private final Map<String, Object> unknownFields = new HashMap<>();
-
-    private final transient ObservableHelper helper = new ObservableHelper(this);
-
     public GlobalConfig() {
-        PropertyUtils.attachListener(this, helper);
-    }
-
-    @Override
-    public void addListener(InvalidationListener listener) {
-        helper.addListener(listener);
-    }
-
-    @Override
-    public void removeListener(InvalidationListener listener) {
-        helper.removeListener(listener);
+        register();
     }
 
     public String toJson() {
         return Config.CONFIG_GSON.toJson(this);
     }
 
-    public int getAgreementVersion() {
-        return agreementVersion.get();
-    }
+    @SerializedName("agreementVersion")
+    private final IntegerProperty agreementVersion = new SimpleIntegerProperty();
 
     public IntegerProperty agreementVersionProperty() {
         return agreementVersion;
     }
 
+    public int getAgreementVersion() {
+        return agreementVersion.get();
+    }
+
     public void setAgreementVersion(int agreementVersion) {
         this.agreementVersion.set(agreementVersion);
     }
 
-    public int getTerracottaAgreementVersion() {
-        return terracottaAgreementVersion.get();
-    }
+    @SerializedName("terracottaAgreementVersion")
+    private final IntegerProperty terracottaAgreementVersion = new SimpleIntegerProperty();
 
     public IntegerProperty terracottaAgreementVersionProperty() {
         return terracottaAgreementVersion;
     }
 
+    public int getTerracottaAgreementVersion() {
+        return terracottaAgreementVersion.get();
+    }
+
     public void setTerracottaAgreementVersion(int terracottaAgreementVersion) {
         this.terracottaAgreementVersion.set(terracottaAgreementVersion);
     }
 
-    public int getPlatformPromptVersion() {
-        return platformPromptVersion.get();
-    }
+    @SerializedName("platformPromptVersion")
+    private final IntegerProperty platformPromptVersion = new SimpleIntegerProperty();
 
     public IntegerProperty platformPromptVersionProperty() {
         return platformPromptVersion;
     }
 
+    public int getPlatformPromptVersion() {
+        return platformPromptVersion.get();
+    }
+
     public void setPlatformPromptVersion(int platformPromptVersion) {
         this.platformPromptVersion.set(platformPromptVersion);
     }
 
-    public int getLogRetention() {
-        return logRetention.get();
-    }
+    @SerializedName("logRetention")
+    private final IntegerProperty logRetention = new SimpleIntegerProperty(20);
 
     public IntegerProperty logRetentionProperty() {
         return logRetention;
     }
 
+    public int getLogRetention() {
+        return logRetention.get();
+    }
+
     public void setLogRetention(int logRetention) {
         this.logRetention.set(logRetention);
     }
 
-    public boolean isEnableOfflineAccount() {
-        return enableOfflineAccount.get();
-    }
+    @SerializedName("enableOfflineAccount")
+    private final BooleanProperty enableOfflineAccount = new SimpleBooleanProperty(false);
 
     public BooleanProperty enableOfflineAccountProperty() {
         return enableOfflineAccount;
     }
 
+    public boolean isEnableOfflineAccount() {
+        return enableOfflineAccount.get();
+    }
+
     public void setEnableOfflineAccount(boolean value) {
         enableOfflineAccount.set(value);
     }
 
+    @SerializedName("fontAntiAliasing")
+    private final StringProperty fontAntiAliasing = new SimpleStringProperty();
+
     public StringProperty fontAntiAliasingProperty() {
         return fontAntiAliasing;
     }
@@ -156,89 +134,24 @@ public final class GlobalConfig implements Observable {
         this.fontAntiAliasing.set(value);
     }
 
+    @SerializedName("userJava")
+    private final ObservableSet<String> userJava = FXCollections.observableSet(new LinkedHashSet<>());
+
     public ObservableSet<String> getUserJava() {
         return userJava;
     }
 
+    @SerializedName("disabledJava")
+    private final ObservableSet<String> disabledJava = FXCollections.observableSet(new LinkedHashSet<>());
+
     public ObservableSet<String> getDisabledJava() {
         return disabledJava;
     }
 
-    public static final class Serializer implements JsonSerializer<GlobalConfig>, JsonDeserializer<GlobalConfig> {
-        private static final Set<String> knownFields = new HashSet<>(Arrays.asList(
-                "agreementVersion",
-                "terracottaAgreementVersion",
-                "platformPromptVersion",
-                "logRetention",
-                "userJava",
-                "disabledJava",
-                "enableOfflineAccount",
-                "fontAntiAliasing"
-        ));
-
+    static final class Adapter extends ObservableSetting.Adapter<GlobalConfig> {
         @Override
-        public JsonElement serialize(GlobalConfig src, Type typeOfSrc, JsonSerializationContext context) {
-            if (src == null) {
-                return JsonNull.INSTANCE;
-            }
-
-            JsonObject jsonObject = new JsonObject();
-            jsonObject.add("agreementVersion", context.serialize(src.getAgreementVersion()));
-            jsonObject.add("terracottaAgreementVersion", context.serialize(src.getTerracottaAgreementVersion()));
-            jsonObject.add("platformPromptVersion", context.serialize(src.getPlatformPromptVersion()));
-            jsonObject.add("logRetention", context.serialize(src.getLogRetention()));
-            jsonObject.add("fontAntiAliasing", context.serialize(src.getFontAntiAliasing()));
-            if (src.enableOfflineAccount.get())
-                jsonObject.addProperty("enableOfflineAccount", true);
-
-            if (!src.getUserJava().isEmpty())
-                jsonObject.add("userJava", context.serialize(src.getUserJava()));
-
-            if (!src.getDisabledJava().isEmpty())
-                jsonObject.add("disabledJava", context.serialize(src.getDisabledJava()));
-
-            for (Map.Entry<String, Object> entry : src.unknownFields.entrySet()) {
-                jsonObject.add(entry.getKey(), context.serialize(entry.getValue()));
-            }
-
-            return jsonObject;
-        }
-
-        @Override
-        public GlobalConfig deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            if (!(json instanceof JsonObject)) return null;
-
-            JsonObject obj = (JsonObject) json;
-
-            GlobalConfig config = new GlobalConfig();
-            config.setAgreementVersion(Optional.ofNullable(obj.get("agreementVersion")).map(JsonElement::getAsInt).orElse(0));
-            config.setTerracottaAgreementVersion(Optional.ofNullable(obj.get("terracottaAgreementVersion")).map(JsonElement::getAsInt).orElse(0));
-            config.setPlatformPromptVersion(Optional.ofNullable(obj.get("platformPromptVersion")).map(JsonElement::getAsInt).orElse(0));
-            config.setLogRetention(Optional.ofNullable(obj.get("logRetention")).map(JsonElement::getAsInt).orElse(20));
-            config.setEnableOfflineAccount(Optional.ofNullable(obj.get("enableOfflineAccount")).map(JsonElement::getAsBoolean).orElse(false));
-            config.setFontAntiAliasing(Optional.ofNullable(obj.get("fontAntiAliasing")).map(JsonElement::getAsString).orElse(null));
-
-            JsonElement userJava = obj.get("userJava");
-            if (userJava != null && userJava.isJsonArray()) {
-                for (JsonElement element : userJava.getAsJsonArray()) {
-                    config.userJava.add(element.getAsString());
-                }
-            }
-
-            JsonElement disabledJava = obj.get("disabledJava");
-            if (disabledJava != null && disabledJava.isJsonArray()) {
-                for (JsonElement element : disabledJava.getAsJsonArray()) {
-                    config.disabledJava.add(element.getAsString());
-                }
-            }
-
-            for (Map.Entry<String, JsonElement> entry : obj.entrySet()) {
-                if (!knownFields.contains(entry.getKey())) {
-                    config.unknownFields.put(entry.getKey(), context.deserialize(entry.getValue(), Object.class));
-                }
-            }
-
-            return config;
+        protected GlobalConfig createInstance() {
+            return new GlobalConfig();
         }
     }
 }

HMCL/src/main/java/org/jackhuang/hmcl/setting/StyleSheets.java

@@ -47,6 +47,7 @@ import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 public final class StyleSheets {
     private static final int FONT_STYLE_SHEET_INDEX = 0;
     private static final int THEME_STYLE_SHEET_INDEX = 1;
+    private static final int BRIGHTNESS_SHEET_INDEX = 2;
 
     private static final ObservableList<String> stylesheets;
 
@@ -54,12 +55,16 @@ public final class StyleSheets {
         String[] array = new String[]{
                 getFontStyleSheet(),
                 getThemeStyleSheet(),
+                getBrightnessStyleSheet(),
                 "/assets/css/root.css"
         };
         stylesheets = FXCollections.observableList(Arrays.asList(array));
 
         FontManager.fontProperty().addListener(o -> stylesheets.set(FONT_STYLE_SHEET_INDEX, getFontStyleSheet()));
-        Themes.colorSchemeProperty().addListener(o -> stylesheets.set(THEME_STYLE_SHEET_INDEX, getThemeStyleSheet()));
+        Themes.colorSchemeProperty().addListener(o -> {
+            stylesheets.set(THEME_STYLE_SHEET_INDEX, getThemeStyleSheet());
+            stylesheets.set(BRIGHTNESS_SHEET_INDEX, getBrightnessStyleSheet());
+        });
     }
 
     private static String toStyleSheetUri(String styleSheet, String fallback) {
@@ -131,6 +136,12 @@ public final class StyleSheets {
         return toStyleSheetUri(builder.toString(), defaultCss);
     }
 
+    private static String getBrightnessStyleSheet() {
+        return Themes.getColorScheme().getBrightness() == Brightness.LIGHT
+                ? "/assets/css/brightness-light.css"
+                : "/assets/css/brightness-dark.css";
+    }
+
     private static void addColor(StringBuilder builder, String name, Color color) {
         builder.append("  ").append(name)
                 .append(": ").append(ThemeColor.getColorDisplayName(color)).append(";\n");
@@ -170,13 +181,7 @@ public final class StyleSheets {
         addColor(builder, scheme, ColorRole.ON_SURFACE_VARIANT, 0.38);
         addColor(builder, scheme, ColorRole.SURFACE_CONTAINER_LOW, 0.8);
         addColor(builder, scheme, ColorRole.SECONDARY_CONTAINER, 0.8);
-
-        // If we use -monet-error-container as the tag color, there may be a conflict between the tag and background colors on the mod management page
-        if (scheme.getBrightness() == Brightness.LIGHT) {
-            addColor(builder, "-warning-tag-background", Color.web("#f1aeb5"));
-        } else {
-            addColor(builder, "-warning-tag-background", Color.web("#2c0b0e"));
-        }
+        addColor(builder, scheme, ColorRole.INVERSE_SURFACE, 0.8);
 
         builder.append("}\n");
         return toStyleSheetUri(builder.toString(), blueCss);

HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java

@@ -459,6 +459,20 @@ public final class VersionSetting implements Cloneable, Observable {
         showLogsProperty.set(showLogs);
     }
 
+    private final BooleanProperty enableDebugLogOutputProperty = new SimpleBooleanProperty(this, "enableDebugLogOutput", false);
+
+    public BooleanProperty enableDebugLogOutputProperty() {
+        return enableDebugLogOutputProperty;
+    }
+
+    public boolean isEnableDebugLogOutput() {
+        return enableDebugLogOutputProperty.get();
+    }
+
+    public void setEnableDebugLogOutput(boolean u) {
+        this.enableDebugLogOutputProperty.set(u);
+    }
+
     // Minecraft settings.
 
     private final StringProperty serverIpProperty = new SimpleStringProperty(this, "serverIp", "");
@@ -776,6 +790,7 @@ public final class VersionSetting implements Cloneable, Observable {
             obj.addProperty("notCheckJVM", src.isNotCheckJVM());
             obj.addProperty("notPatchNatives", src.isNotPatchNatives());
             obj.addProperty("showLogs", src.isShowLogs());
+            obj.addProperty("enableDebugLogOutput", src.isEnableDebugLogOutput());
             obj.addProperty("gameDir", src.getGameDir());
             obj.addProperty("launcherVisibility", src.getLauncherVisibility().ordinal());
             obj.addProperty("processPriority", src.getProcessPriority().ordinal());
@@ -847,6 +862,7 @@ public final class VersionSetting implements Cloneable, Observable {
             vs.setNotCheckJVM(Optional.ofNullable(obj.get("notCheckJVM")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setNotPatchNatives(Optional.ofNullable(obj.get("notPatchNatives")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setShowLogs(Optional.ofNullable(obj.get("showLogs")).map(JsonElement::getAsBoolean).orElse(false));
+            vs.setEnableDebugLogOutput(Optional.ofNullable(obj.get("enableDebugLogOutput")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setLauncherVisibility(parseJsonPrimitive(obj.getAsJsonPrimitive("launcherVisibility"), LauncherVisibility.class, LauncherVisibility.HIDE));
             vs.setProcessPriority(parseJsonPrimitive(obj.getAsJsonPrimitive("processPriority"), ProcessPriority.class, ProcessPriority.NORMAL));
             vs.setUseNativeGLFW(Optional.ofNullable(obj.get("useNativeGLFW")).map(JsonElement::getAsBoolean).orElse(false));

HMCL/src/main/java/org/jackhuang/hmcl/theme/Themes.java

@@ -113,8 +113,16 @@ public final class Themes {
         return colorScheme.get();
     }
 
+    private static final ObjectBinding<Color> titleFill = Bindings.createObjectBinding(
+            () -> config().isTitleTransparent()
+                    ? getColorScheme().getOnSurface()
+                    : getColorScheme().getOnPrimaryContainer(),
+            colorSchemeProperty(),
+            config().titleTransparentProperty()
+    );
+
     public static ObservableValue<Color> titleFillProperty() {
-        return colorSchemeProperty().getOnPrimaryContainer();
+        return titleFill;
     }
 
     public static BooleanBinding darkModeProperty() {

HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java

@@ -1188,7 +1188,14 @@ public final class FXUtils {
 
     public static Task<Image> getRemoteImageTask(String url, int requestedWidth, int requestedHeight, boolean preserveRatio, boolean smooth) {
         return new CacheFileTask(url)
-                .thenApplyAsync(file -> loadImage(file, requestedWidth, requestedHeight, preserveRatio, smooth));
+                .thenApplyAsync(file -> loadImage(file, requestedWidth, requestedHeight, preserveRatio, smooth))
+                .setSignificance(Task.TaskSignificance.MINOR);
+    }
+
+    public static Task<Image> getRemoteImageTask(URI uri, int requestedWidth, int requestedHeight, boolean preserveRatio, boolean smooth) {
+        return new CacheFileTask(uri)
+                .thenApplyAsync(file -> loadImage(file, requestedWidth, requestedHeight, preserveRatio, smooth))
+                .setSignificance(Task.TaskSignificance.MINOR);
     }
 
     public static ObservableValue<Image> newRemoteImage(String url, int requestedWidth, int requestedHeight, boolean preserveRatio, boolean smooth) {
@@ -1302,17 +1309,11 @@ public final class FXUtils {
     }
 
     public static <T> Callback<ListView<T>, ListCell<T>> jfxListCellFactory(Function<T, Node> graphicBuilder) {
-        Holder<Object> lastCell = new Holder<>();
         return view -> new JFXListCell<T>() {
             @Override
             public void updateItem(T item, boolean empty) {
                 super.updateItem(item, empty);
 
-                // https://mail.openjdk.org/pipermail/openjfx-dev/2022-July/034764.html
-                if (this == lastCell.value && !isVisible())
-                    return;
-                lastCell.value = this;
-
                 if (!empty) {
                     setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
                     setGraphic(graphicBuilder.apply(item));
@@ -1357,7 +1358,7 @@ public final class FXUtils {
 
     public static void onClicked(Node node, Runnable action) {
         node.addEventHandler(MouseEvent.MOUSE_CLICKED, e -> {
-            if (e.getButton() == MouseButton.PRIMARY && e.getClickCount() == 1) {
+            if (e.getButton() == MouseButton.PRIMARY) {
                 action.run();
                 e.consume();
             }
@@ -1468,7 +1469,6 @@ public final class FXUtils {
                             hyperlinkAction.accept(link);
                         });
                         text.setCursor(Cursor.HAND);
-                        text.setFill(Color.web("#0070E0"));
                         text.setUnderline(true);
                         texts.add(text);
                     } else if ("b".equals(element.getTagName())) {

HMCL/src/main/java/org/jackhuang/hmcl/ui/GameCrashWindow.java

@@ -93,7 +93,7 @@ public class GameCrashWindow extends Stage {
         this.logs = logs;
         this.analyzer = LibraryAnalyzer.analyze(version, repository.getGameVersion(version).orElse(null));
 
-        memory = Optional.ofNullable(launchOptions.getMaxMemory()).map(i -> i + " MB").orElse("-");
+        memory = Optional.ofNullable(launchOptions.getMaxMemory()).map(i -> i + " " + i18n("settings.memory.unit.mib")).orElse("-");
 
         total_memory = MEGABYTES.formatBytes(SystemInfo.getTotalMemorySize());
 
@@ -400,6 +400,8 @@ public class GameCrashWindow extends Stage {
                 reasonPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
                 reasonPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
 
+                feedbackTextFlow.getStyleClass().add("crash-reason-text-flow");
+
                 gameDirPane.setPadding(new Insets(8));
                 VBox.setVgrow(gameDirPane, Priority.ALWAYS);
                 FXUtils.onChangeAndOperate(feedbackTextFlow.visibleProperty(), visible -> {

HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java

@@ -21,6 +21,7 @@ import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXCheckBox;
 import com.jfoenix.controls.JFXComboBox;
 import com.jfoenix.controls.JFXListView;
+import com.sun.jna.Pointer;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
@@ -28,6 +29,7 @@ import javafx.beans.property.*;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.css.PseudoClass;
+import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Scene;
@@ -37,17 +39,20 @@ import javafx.scene.input.KeyCode;
 import javafx.scene.input.MouseButton;
 import javafx.scene.layout.*;
 import javafx.stage.Stage;
+import javafx.stage.WindowEvent;
 import org.jackhuang.hmcl.game.GameDumpGenerator;
 import org.jackhuang.hmcl.game.Log;
 import org.jackhuang.hmcl.setting.StyleSheets;
+import org.jackhuang.hmcl.theme.Themes;
 import org.jackhuang.hmcl.ui.construct.NoneMultipleSelectionModel;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
-import org.jackhuang.hmcl.util.Holder;
 import org.jackhuang.hmcl.util.CircularArrayList;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.Log4jLevel;
-import org.jackhuang.hmcl.util.platform.ManagedProcess;
-import org.jackhuang.hmcl.util.platform.SystemUtils;
+import org.jackhuang.hmcl.util.platform.*;
+import org.jackhuang.hmcl.util.platform.windows.Dwmapi;
+import org.jackhuang.hmcl.util.platform.windows.WinConstants;
+import org.jackhuang.hmcl.util.platform.windows.WinTypes;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -84,6 +89,36 @@ public final class LogWindow extends Stage {
     private final LogWindowImpl impl;
     private final ManagedProcess gameProcess;
 
+    @SuppressWarnings("unused")
+    private Object windowsDarkModeListenerHolder;
+
+    {
+        if (OperatingSystem.SYSTEM_VERSION.isAtLeast(OSVersion.WINDOWS_11) && NativeUtils.USE_JNA && Dwmapi.INSTANCE != null) {
+            this.addEventFilter(WindowEvent.WINDOW_SHOWN, new EventHandler<>() {
+                @Override
+                public void handle(WindowEvent event) {
+                    LogWindow.this.removeEventFilter(WindowEvent.WINDOW_SHOWN, this);
+
+                    windowsDarkModeListenerHolder = FXUtils.onWeakChangeAndOperate(Themes.darkModeProperty(), darkMode -> {
+                        if (LogWindow.this.isShowing()) {
+                            WindowsNativeUtils.getWindowHandle(LogWindow.this).ifPresent(handle -> {
+                                if (handle == WinTypes.HANDLE.INVALID_VALUE)
+                                    return;
+
+                                Dwmapi.INSTANCE.DwmSetWindowAttribute(
+                                        new WinTypes.HANDLE(Pointer.createConstant(handle)),
+                                        WinConstants.DWMWA_USE_IMMERSIVE_DARK_MODE,
+                                        new WinTypes.BOOLByReference(new WinTypes.BOOL(darkMode)),
+                                        WinTypes.BOOL.SIZE
+                                );
+                            });
+                        }
+                    });
+                }
+            });
+        }
+    }
+
     public LogWindow(ManagedProcess gameProcess) {
         this(gameProcess, new CircularArrayList<>());
     }
@@ -168,6 +203,7 @@ public final class LogWindow extends Stage {
         LogWindowImpl() {
             getStyleClass().add("log-window");
 
+            listView.getProperties().put("no-smooth-scrolling", true);
             listView.setItems(FXCollections.observableList(new CircularArrayList<>(logs.size())));
 
             for (int i = 0; i < LEVELS.length; i++) {
@@ -264,7 +300,6 @@ public final class LogWindow extends Stage {
 
             VBox vbox = new VBox(3);
             vbox.setPadding(new Insets(3, 0, 3, 0));
-            vbox.setStyle("-fx-background-color: white");
             getChildren().setAll(vbox);
 
             {
@@ -286,8 +321,7 @@ public final class LogWindow extends Stage {
                     HBox hBox = new HBox(3);
                     for (int i = 0; i < LEVELS.length; i++) {
                         ToggleButton button = new ToggleButton();
-                        button.setStyle("-fx-background-color: " + FXUtils.toWeb(LEVELS[i].getColor()) + ";");
-                        button.getStyleClass().add("log-toggle");
+                        button.getStyleClass().addAll("log-toggle", LEVELS[i].name().toLowerCase(Locale.ROOT));
                         button.textProperty().bind(control.buttonText[i]);
                         button.setSelected(true);
                         control.showLevel[i].bind(button.selectedProperty());
@@ -309,8 +343,7 @@ public final class LogWindow extends Stage {
 
                 listView.setStyle("-fx-font-family: \"" + Lang.requireNonNullElse(config().getFontFamily(), FXUtils.DEFAULT_MONOSPACE_FONT)
                         + "\"; -fx-font-size: " + config().getFontSize() + "px;");
-                Holder<Object> lastCell = new Holder<>();
-                listView.setCellFactory(x -> new ListCell<Log>() {
+                listView.setCellFactory(x -> new ListCell<>() {
                     {
                         x.setSelectionModel(new NoneMultipleSelectionModel<>());
                         getStyleClass().add("log-window-list-cell");
@@ -354,11 +387,6 @@ public final class LogWindow extends Stage {
                     protected void updateItem(Log item, boolean empty) {
                         super.updateItem(item, empty);
 
-                        // https://mail.openjdk.org/pipermail/openjfx-dev/2022-July/034764.html
-                        if (this == lastCell.value && !isVisible())
-                            return;
-                        lastCell.value = this;
-
                         pseudoClassStateChanged(EMPTY, empty);
                         pseudoClassStateChanged(FATAL, !empty && item.getLevel() == Log4jLevel.FATAL);
                         pseudoClassStateChanged(ERROR, !empty && item.getLevel() == Log4jLevel.ERROR);

HMCL/src/main/java/org/jackhuang/hmcl/ui/ScrollUtils.java

@@ -25,7 +25,6 @@ import javafx.animation.Animation.Status;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.event.EventHandler;
-import javafx.scene.control.IndexedCell;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.skin.VirtualFlow;
 import javafx.scene.input.MouseEvent;
@@ -226,7 +225,6 @@ final class ScrollUtils {
         final double[] derivatives = new double[FRICTIONS.length];
 
         Timeline timeline = new Timeline();
-        Holder<ScrollDirection> scrollDirectionHolder = new Holder<>();
         final EventHandler<MouseEvent> mouseHandler = event -> timeline.stop();
         final EventHandler<ScrollEvent> scrollHandler = event -> {
             if (event.getEventType() == ScrollEvent.SCROLL) {
@@ -234,7 +232,6 @@ final class ScrollUtils {
                 if (scrollDirection == ScrollDirection.LEFT || scrollDirection == ScrollDirection.RIGHT) {
                     return;
                 }
-                scrollDirectionHolder.value = scrollDirection;
                 double currentSpeed = isTrackPad(event, scrollDirection) ? speed / trackPadAdjustment : speed;
 
                 derivatives[0] += scrollDirection.intDirection * currentSpeed;
@@ -256,15 +253,7 @@ final class ScrollUtils {
             }
 
             double dy = derivatives[derivatives.length - 1];
-
-            int cellCount = virtualFlow.getCellCount();
-            IndexedCell<?> firstVisibleCell = virtualFlow.getFirstVisibleCell();
-            double height = firstVisibleCell != null ? firstVisibleCell.getHeight() * cellCount : 0.0;
-
-            double delta = height > 0.0
-                    ? dy / height
-                    : (scrollDirectionHolder.value == ScrollDirection.DOWN ? 0.001 : -0.001);
-            virtualFlow.setPosition(Math.min(Math.max(virtualFlow.getPosition() + delta, 0), 1));
+            virtualFlow.scrollPixels(dy);
 
             if (Math.abs(dy) < 0.001) {
                 timeline.stop();

HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java

@@ -19,8 +19,8 @@ package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialogLayout;
+import com.jfoenix.controls.JFXSpinner;
 import javafx.scene.control.Label;
-import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.ScrollPane;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.task.Schedulers;
@@ -48,7 +48,7 @@ public final class UpgradeDialog extends JFXDialogLayout {
         maxHeightProperty().bind(Controllers.getScene().heightProperty().multiply(0.7));
 
         setHeading(new Label(i18n("update.changelog")));
-        setBody(new ProgressIndicator());
+        setBody(new JFXSpinner());
 
         String url = CHANGELOG_URL + remoteVersion.getChannel().channelName + ".html";
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/WindowsNativeUtils.java

@@ -0,0 +1,60 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2025 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui;
+
+import javafx.stage.Stage;
+import javafx.stage.Window;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.util.OptionalLong;
+
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+
+/// @author Glavo
+public final class WindowsNativeUtils {
+
+    public static OptionalLong getWindowHandle(Stage stage) {
+        try {
+            Class<?> windowStageClass = Class.forName("com.sun.javafx.tk.quantum.WindowStage");
+            Class<?> glassWindowClass = Class.forName("com.sun.glass.ui.Window");
+            Class<?> tkStageClass = Class.forName("com.sun.javafx.tk.TKStage");
+
+            Object tkStage = MethodHandles.privateLookupIn(Window.class, MethodHandles.lookup())
+                    .findVirtual(Window.class, "getPeer", MethodType.methodType(tkStageClass))
+                    .invoke(stage);
+
+            MethodHandles.Lookup windowStageLookup = MethodHandles.privateLookupIn(windowStageClass, MethodHandles.lookup());
+            MethodHandle getPlatformWindow = windowStageLookup.findVirtual(windowStageClass, "getPlatformWindow", MethodType.methodType(glassWindowClass));
+            Object platformWindow = getPlatformWindow.invoke(tkStage);
+
+            long handle = (long) MethodHandles.privateLookupIn(glassWindowClass, MethodHandles.lookup())
+                    .findVirtual(glassWindowClass, "getNativeWindow", MethodType.methodType(long.class))
+                    .invoke(platformWindow);
+
+            return OptionalLong.of(handle);
+        } catch (Throwable ex) {
+            LOG.warning("Failed to get window handle", ex);
+            return OptionalLong.empty();
+        }
+    }
+
+    private WindowsNativeUtils() {
+    }
+}

HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountAdvancedListItem.java

@@ -68,6 +68,10 @@ public class AccountAdvancedListItem extends AdvancedListItem {
     };
 
     public AccountAdvancedListItem() {
+        this(null);
+    }
+
+    public AccountAdvancedListItem(Account account) {
         tooltip = new Tooltip();
         FXUtils.installFastTooltip(this, tooltip);
 
@@ -76,9 +80,13 @@ public class AccountAdvancedListItem extends AdvancedListItem {
 
         setActionButtonVisible(false);
 
-        FXUtils.onScroll(this, Accounts.getAccounts(),
-                accounts -> accounts.indexOf(account.get()),
-                Accounts::setSelectedAccount);
+        if (account != null) {
+            this.accountProperty().set(account);
+        } else {
+            FXUtils.onScroll(this, Accounts.getAccounts(),
+                    accounts -> accounts.indexOf(accountProperty().get()),
+                    Accounts::setSelectedAccount);
+        }
     }
 
     public ObjectProperty<Account> accountProperty() {

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/HintPane.java

@@ -28,7 +28,6 @@ import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.SVG;
 
 import java.util.Locale;
 
@@ -45,29 +44,9 @@ public class HintPane extends VBox {
         setFillWidth(true);
         getStyleClass().addAll("hint", type.name().toLowerCase(Locale.ROOT));
 
-        SVG svg;
-        switch (type) {
-            case INFO:
-                svg = SVG.INFO;
-                break;
-            case ERROR:
-                svg = SVG.ERROR;
-                break;
-            case SUCCESS:
-                svg = SVG.CHECK_CIRCLE;
-                break;
-            case WARNING:
-                svg = SVG.WARNING;
-                break;
-            case QUESTION:
-                svg = SVG.HELP;
-                break;
-            default:
-                throw new IllegalArgumentException("Unrecognized message box message type " + type);
-        }
-
-        HBox hbox = new HBox(svg.createIcon(16), new Text(type.getDisplayName()));
+        HBox hbox = new HBox(type.getIcon().createIcon(16), new Text(type.getDisplayName()));
         hbox.setAlignment(Pos.CENTER_LEFT);
+        hbox.setSpacing(2);
         flow.getChildren().setAll(label);
         getChildren().setAll(hbox, flow);
         label.textProperty().bind(text);

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/IconedMenuItem.java

@@ -24,7 +24,7 @@ import org.jackhuang.hmcl.ui.SVG;
 public final class IconedMenuItem extends IconedItem {
 
     public IconedMenuItem(SVG icon, String text, Runnable action, JFXPopup popup) {
-        super(icon != null ? icon.createIcon(14) : null, text);
+        super(icon != null ? FXUtils.limitingSize(icon.createIcon(14), 14, 14) : null, text);
 
         getStyleClass().setAll("iconed-menu-item");
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java

@@ -30,7 +30,7 @@ import java.util.concurrent.CompletableFuture;
 import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-public class InputDialogPane extends JFXDialogLayout {
+public class InputDialogPane extends JFXDialogLayout implements DialogAware {
     private final CompletableFuture<String> future = new CompletableFuture<>();
 
     private final JFXTextField textField;
@@ -70,9 +70,15 @@ public class InputDialogPane extends JFXDialogLayout {
             });
         });
 
+        textField.setOnAction(event -> acceptButton.fire());
         onEscPressed(this, cancelButton::fire);
     }
 
+    @Override
+    public void onDialogShown() {
+        textField.requestFocus();
+    }
+
     public CompletableFuture<String> getCompletableFuture() {
         return future;
     }

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/JFXCheckBoxTableCell.java

@@ -0,0 +1,68 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2025 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import com.jfoenix.controls.JFXCheckBox;
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.BooleanProperty;
+import javafx.scene.control.TableCell;
+import javafx.scene.control.TableColumn;
+import javafx.util.Callback;
+
+/// @author Glavo
+public final class JFXCheckBoxTableCell<S, T> extends TableCell<S, T> {
+    public static <S> Callback<TableColumn<S, Boolean>, TableCell<S, Boolean>> forTableColumn(
+            final TableColumn<S, Boolean> column) {
+        return list -> new JFXCheckBoxTableCell<>();
+    }
+
+    private final JFXCheckBox checkBox = new JFXCheckBox();
+    private BooleanProperty booleanProperty;
+
+    public JFXCheckBoxTableCell() {
+        this.getStyleClass().add("jfx-checkbox-table-cell");
+    }
+
+    @Override
+    protected void updateItem(T item, boolean empty) {
+        super.updateItem(item, empty);
+
+        if (empty) {
+            setText(null);
+            setGraphic(null);
+            checkBox.disableProperty().unbind();
+        } else {
+            setGraphic(checkBox);
+
+            if (booleanProperty != null) {
+                checkBox.selectedProperty().unbindBidirectional(booleanProperty);
+            }
+            if (getTableColumn().getCellObservableValue(getIndex()) instanceof BooleanProperty obsValue) {
+                booleanProperty = obsValue;
+                checkBox.selectedProperty().bindBidirectional(booleanProperty);
+            }
+
+            checkBox.disableProperty().bind(Bindings.not(
+                    getTableView().editableProperty().and(
+                            getTableColumn().editableProperty()).and(
+                            editableProperty())
+            ));
+        }
+    }
+
+}

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MDListCell.java

@@ -24,17 +24,14 @@ import javafx.scene.control.ListCell;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.util.Holder;
 
 public abstract class MDListCell<T> extends ListCell<T> {
     private final PseudoClass SELECTED = PseudoClass.getPseudoClass("selected");
 
     private final StackPane container = new StackPane();
     private final StackPane root = new StackPane();
-    private final Holder<Object> lastCell;
 
-    public MDListCell(JFXListView<T> listView, Holder<Object> lastCell) {
-        this.lastCell = lastCell;
+    public MDListCell(JFXListView<T> listView) {
 
         setText(null);
         setGraphic(null);
@@ -58,13 +55,6 @@ public abstract class MDListCell<T> extends ListCell<T> {
     protected void updateItem(T item, boolean empty) {
         super.updateItem(item, empty);
 
-        // https://mail.openjdk.org/pipermail/openjfx-dev/2022-July/034764.html
-        if (lastCell != null) {
-            if (this == lastCell.value && !isVisible())
-                return;
-            lastCell.value = this;
-        }
-
         updateControl(item, empty);
         if (empty) {
             setGraphic(null);

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java

@@ -46,11 +46,21 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 public final class MessageDialogPane extends HBox {
 
     public enum MessageType {
-        ERROR,
-        INFO,
-        WARNING,
-        QUESTION,
-        SUCCESS;
+        ERROR(SVG.ERROR),
+        INFO(SVG.INFO),
+        WARNING(SVG.WARNING),
+        QUESTION(SVG.HELP),
+        SUCCESS(SVG.CHECK_CIRCLE);
+
+        private final SVG icon;
+
+        MessageType(SVG icon) {
+            this.icon = icon;
+        }
+
+        public SVG getIcon() {
+            return icon;
+        }
 
         public String getDisplayName() {
             return i18n("message." + name().toLowerCase(Locale.ROOT));
@@ -70,27 +80,7 @@ public final class MessageDialogPane extends HBox {
         graphic.setTranslateY(10);
         graphic.setMinSize(40, 40);
         graphic.setMaxSize(40, 40);
-        SVG svg;
-        switch (type) {
-            case INFO:
-                svg = SVG.INFO;
-                break;
-            case ERROR:
-                svg = SVG.ERROR;
-                break;
-            case SUCCESS:
-                svg = SVG.CHECK_CIRCLE;
-                break;
-            case WARNING:
-                svg = SVG.WARNING;
-                break;
-            case QUESTION:
-                svg = SVG.HELP;
-                break;
-            default:
-                throw new IllegalArgumentException("Unrecognized message box message type " + type);
-        }
-        graphic.setGraphic(svg.createIcon(40));
+        graphic.setGraphic(type.getIcon().createIcon(40));
 
         VBox vbox = new VBox();
         HBox.setHgrow(vbox, Priority.ALWAYS);

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/OptionToggleButton.java

@@ -25,8 +25,6 @@ import javafx.beans.property.StringProperty;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
-import javafx.scene.input.MouseButton;
-import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
@@ -51,8 +49,9 @@ public class OptionToggleButton extends StackPane {
         Label titleLabel = new Label();
         titleLabel.textProperty().bind(title);
         Label subtitleLabel = new Label();
-        subtitleLabel.setMouseTransparent(true);
         subtitleLabel.setWrapText(true);
+        subtitleLabel.setMouseTransparent(true);
+        subtitleLabel.getStyleClass().add("subtitle");
         subtitleLabel.textProperty().bind(subtitle);
         pane.setCenter(left);
         left.setAlignment(Pos.CENTER_LEFT);
@@ -63,12 +62,7 @@ public class OptionToggleButton extends StackPane {
         toggleButton.setSize(8);
         FXUtils.setLimitHeight(toggleButton, 30);
 
-        container.addEventHandler(MouseEvent.MOUSE_CLICKED, e -> {
-            if (e.getButton() == MouseButton.PRIMARY) {
-                toggleButton.setSelected(!toggleButton.isSelected());
-                e.consume();
-            }
-        });
+        FXUtils.onClicked(container, () -> toggleButton.setSelected(!toggleButton.isSelected()));
 
         FXUtils.onChangeAndOperate(subtitleProperty(), subtitle -> {
             if (StringUtils.isNotBlank(subtitle)) {

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TaskListPane.java

@@ -92,8 +92,6 @@ public final class TaskListPane extends StackPane {
     private final ObjectProperty<Insets> progressNodePadding = new SimpleObjectProperty<>(Insets.EMPTY);
     private final DoubleProperty cellWidth = new SimpleDoubleProperty();
 
-    private Cell lastCell;
-
     public TaskListPane() {
         listView.setPadding(new Insets(12, 0, 0, 0));
         listView.setCellFactory(l -> new Cell());
@@ -316,11 +314,6 @@ public final class TaskListPane extends StackPane {
         protected void updateItem(Node item, boolean empty) {
             super.updateItem(item, empty);
 
-            // https://mail.openjdk.org/pipermail/openjfx-dev/2022-July/034764.html
-            if (this == lastCell && !isVisible())
-                return;
-            lastCell = this;
-
             pane.paddingProperty().unbind();
             title.textProperty().unbind();
             message.textProperty().unbind();

HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorController.java

@@ -373,9 +373,8 @@ public class DecoratorController {
         if (navigator.getCurrentPage() instanceof DecoratorPage) {
             DecoratorPage page = (DecoratorPage) navigator.getCurrentPage();
 
-            // FIXME: Get WorldPage working first, and revisit this later
-            page.closePage();
             if (page.isPageCloseable()) {
+                page.closePage();
                 return;
             }
         }

HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorSkin.java

@@ -304,6 +304,7 @@ public class DecoratorSkin extends SkinBase<Decorator> {
             BorderPane center = new BorderPane();
             if (title != null) {
                 Label titleLabel = new Label();
+                titleLabel.textFillProperty().bind(Themes.titleFillProperty());
                 BorderPane.setAlignment(titleLabel, Pos.CENTER_LEFT);
                 titleLabel.getStyleClass().add("jfx-decorator-title");
                 if (titleNode == null) {

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/DownloadPage.java

@@ -200,6 +200,10 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage
         tab.select(modpackTab, false);
     }
 
+    public void showResourcepackDownloads() {
+        tab.select(resourcePackTab, false);
+    }
+
     public DownloadListPage showModDownloads() {
         tab.select(modTab, false);
         return modTab.getNode();

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java

@@ -57,7 +57,6 @@ import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 import org.jackhuang.hmcl.ui.wizard.Navigation;
 import org.jackhuang.hmcl.ui.wizard.Refreshable;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
-import org.jackhuang.hmcl.util.Holder;
 import org.jackhuang.hmcl.util.NativePatcher;
 import org.jackhuang.hmcl.util.SettingsMap;
 import org.jackhuang.hmcl.util.StringUtils;
@@ -164,10 +163,7 @@ public final class VersionsPage extends Control implements WizardPage, Refreshab
         private final ImageView imageView = new ImageView();
         private final StackPane pane = new StackPane();
 
-        private final Holder<RemoteVersionListCell> lastCell;
-
-        RemoteVersionListCell(Holder<RemoteVersionListCell> lastCell, VersionsPage control) {
-            this.lastCell = lastCell;
+        RemoteVersionListCell(VersionsPage control) {
             this.control = control;
 
             HBox hbox = new HBox(16);
@@ -222,18 +218,13 @@ public final class VersionsPage extends Control implements WizardPage, Refreshab
         public void updateItem(RemoteVersion remoteVersion, boolean empty) {
             super.updateItem(remoteVersion, empty);
 
-            // https://mail.openjdk.org/pipermail/openjfx-dev/2022-July/034764.html
-            if (this == lastCell.value && !isVisible())
-                return;
-            lastCell.value = this;
-
             if (empty) {
                 setGraphic(null);
                 return;
             }
             setGraphic(pane);
 
-            twoLineListItem.setTitle(I18n.getDisplaySelfVersion(remoteVersion));
+            twoLineListItem.setTitle(I18n.getDisplayVersion(remoteVersion));
             if (remoteVersion.getReleaseDate() != null) {
                 twoLineListItem.setSubtitle(I18n.formatDateTime(remoteVersion.getReleaseDate()));
             } else {
@@ -398,8 +389,7 @@ public final class VersionsPage extends Control implements WizardPage, Refreshab
 
                         control.versions.addListener((InvalidationListener) o -> updateList());
 
-                        Holder<RemoteVersionListCell> lastCell = new Holder<>();
-                        list.setCellFactory(listView -> new RemoteVersionListCell(lastCell, control));
+                        list.setCellFactory(listView -> new RemoteVersionListCell(control));
 
                         ComponentList.setVgrow(list, Priority.ALWAYS);
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackFileSelectionPage.java

@@ -18,10 +18,10 @@
 package org.jackhuang.hmcl.ui.export;
 
 import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXCheckBox;
 import com.jfoenix.controls.JFXTreeView;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
-import javafx.scene.control.CheckBox;
 import javafx.scene.control.CheckBoxTreeItem;
 import javafx.scene.control.Label;
 import javafx.scene.control.TreeItem;
@@ -43,8 +43,8 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
+import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
 import static org.jackhuang.hmcl.util.Lang.mapOf;
 import static org.jackhuang.hmcl.util.Pair.pair;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -68,6 +68,8 @@ public final class ModpackFileSelectionPage extends BorderPane implements Wizard
         rootNode = getTreeItem(profile.getRepository().getRunDirectory(version), "minecraft");
         treeView.setRoot(rootNode);
         treeView.setSelectionModel(new NoneMultipleSelectionModel<>());
+        onEscPressed(treeView, () -> controller.onPrev(true));
+        setMargin(treeView, new Insets(10, 10, 5, 10));
         this.setCenter(treeView);
 
         HBox nextPane = new HBox();
@@ -93,9 +95,22 @@ public final class ModpackFileSelectionPage extends BorderPane implements Wizard
         ModAdviser.ModSuggestion state = ModAdviser.ModSuggestion.SUGGESTED;
         if (basePath.length() > "minecraft/".length()) {
             state = adviser.advise(StringUtils.substringAfter(basePath, "minecraft/") + (isDirectory ? "/" : ""), isDirectory);
-            if (!isDirectory && Objects.equals(FileUtils.getNameWithoutExtension(file), version))
-                state = ModAdviser.ModSuggestion.HIDDEN;
-            if (isDirectory && Objects.equals(FileUtils.getName(file), version + "-natives")) // Ignore <version>-natives
+
+            String fileName = FileUtils.getName(file);
+
+            if (!isDirectory) {
+                switch (fileName) {
+                    case ".DS_Store", // macOS system file
+                         "desktop.ini", "Thumbs.db" // Windows system files
+                            -> state = ModAdviser.ModSuggestion.HIDDEN;
+                }
+                if (fileName.startsWith("._")) // macOS system file
+                    state = ModAdviser.ModSuggestion.HIDDEN;
+                if (FileUtils.getNameWithoutExtension(file).equals(version))
+                    state = ModAdviser.ModSuggestion.HIDDEN;
+            }
+
+            if (isDirectory && fileName.equals(version + "-natives")) // Ignore <version>-natives
                 state = ModAdviser.ModSuggestion.HIDDEN;
             if (state == ModAdviser.ModSuggestion.HIDDEN)
                 return null;
@@ -130,15 +145,14 @@ public final class ModpackFileSelectionPage extends BorderPane implements Wizard
         }
 
         HBox graphic = new HBox();
-        CheckBox checkBox = new CheckBox();
+        JFXCheckBox checkBox = new JFXCheckBox();
         checkBox.selectedProperty().bindBidirectional(node.selectedProperty());
         checkBox.indeterminateProperty().bindBidirectional(node.indeterminateProperty());
         graphic.getChildren().add(checkBox);
 
         if (TRANSLATION.containsKey(basePath)) {
-            Label comment = new Label();
-            comment.setText(TRANSLATION.get(basePath));
-            comment.setStyle("-fx-text-fill: gray;");
+            Label comment = new Label(TRANSLATION.get(basePath));
+            comment.setStyle("-fx-text-fill: -monet-on-surface-variant;");
             comment.setMouseTransparent(true);
             graphic.getChildren().add(comment);
         }

HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackTypeSelectionPage.java

@@ -20,10 +20,10 @@ package org.jackhuang.hmcl.ui.export;
 import com.jfoenix.controls.JFXButton;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
+import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
-import javafx.scene.shape.SVGPath;
 import org.jackhuang.hmcl.mod.ModpackExportInfo;
 import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackExportTask;
 import org.jackhuang.hmcl.mod.multimc.MultiMCModpackExportTask;
@@ -77,8 +77,7 @@ public final class ModpackTypeSelectionPage extends VBox implements WizardPage {
         graphic.setMouseTransparent(true);
         graphic.setLeft(new TwoLineListItem(i18n("modpack.type." + type), i18n("modpack.type." + type + ".export")));
 
-        SVGPath arrow = new SVGPath();
-        arrow.setContent(SVG.ARROW_FORWARD.getPath());
+        Node arrow = SVG.ARROW_FORWARD.createIcon();
         BorderPane.setAlignment(arrow, Pos.CENTER);
         graphic.setRight(arrow);
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/FeedbackPage.java

@@ -43,34 +43,41 @@ public class FeedbackPage extends SpinnerPane {
         FXUtils.smoothScrolling(scrollPane);
         setContent(scrollPane);
 
-        ComponentList community = new ComponentList();
+        ComponentList groups = new ComponentList();
         {
             IconedTwoLineListItem users = new IconedTwoLineListItem();
             users.setImage(FXUtils.newBuiltinImage("/assets/img/icon.png"));
-            users.setTitle(i18n("feedback.qq_group"));
-            users.setSubtitle(i18n("feedback.qq_group.statement"));
+            users.setTitle(i18n("contact.chat.qq_group"));
+            users.setSubtitle(i18n("contact.chat.qq_group.statement"));
             users.setExternalLink(Metadata.GROUPS_URL);
 
+            IconedTwoLineListItem discord = new IconedTwoLineListItem();
+            discord.setImage(FXUtils.newBuiltinImage("/assets/img/discord.png"));
+            discord.setTitle(i18n("contact.chat.discord"));
+            discord.setSubtitle(i18n("contact.chat.discord.statement"));
+            discord.setExternalLink("https://discord.gg/jVvC7HfM6U");
+
+            groups.getContent().setAll(users, discord);
+        }
+
+        ComponentList feedback = new ComponentList();
+        {
             IconedTwoLineListItem github = new IconedTwoLineListItem();
             github.imageProperty().bind(Bindings.when(Themes.darkModeProperty())
                     .then(FXUtils.newBuiltinImage("/assets/img/github-white.png"))
                     .otherwise(FXUtils.newBuiltinImage("/assets/img/github.png")));
-            github.setTitle(i18n("feedback.github"));
-            github.setSubtitle(i18n("feedback.github.statement"));
+            github.setTitle(i18n("contact.feedback.github"));
+            github.setSubtitle(i18n("contact.feedback.github.statement"));
             github.setExternalLink("https://github.com/HMCL-dev/HMCL/issues/new/choose");
 
-            IconedTwoLineListItem discord = new IconedTwoLineListItem();
-            discord.setImage(FXUtils.newBuiltinImage("/assets/img/discord.png"));
-            discord.setTitle(i18n("feedback.discord"));
-            discord.setSubtitle(i18n("feedback.discord.statement"));
-            discord.setExternalLink("https://discord.gg/jVvC7HfM6U");
-
-            community.getContent().setAll(users, github, discord);
+            feedback.getContent().setAll(github);
         }
 
         content.getChildren().addAll(
-                ComponentList.createComponentListTitle(i18n("feedback.channel")),
-                community
+                ComponentList.createComponentListTitle(i18n("contact.chat")),
+                groups,
+                ComponentList.createComponentListTitle(i18n("contact.feedback")),
+                feedback
         );
 
         this.setContent(content);

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/LauncherSettingsPage.java

@@ -69,7 +69,7 @@ public class LauncherSettingsPage extends DecoratorAnimatedPage implements Decor
                 .addNavigationDrawerTab(tab, downloadTab, i18n("download"), SVG.DOWNLOAD)
                 .startCategory(i18n("help").toUpperCase(Locale.ROOT))
                 .addNavigationDrawerTab(tab, helpTab, i18n("help"), SVG.HELP, SVG.HELP_FILL)
-                .addNavigationDrawerTab(tab, feedbackTab, i18n("feedback"), SVG.FEEDBACK, SVG.FEEDBACK_FILL)
+                .addNavigationDrawerTab(tab, feedbackTab, i18n("contact"), SVG.FEEDBACK, SVG.FEEDBACK_FILL)
                 .addNavigationDrawerTab(tab, aboutTab, i18n("about"), SVG.INFO, SVG.INFO_FILL);
         FXUtils.setLimitWidth(sideBar, 200);
         setLeft(sideBar);

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java

@@ -52,6 +52,7 @@ import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.theme.Themes;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
@@ -120,6 +121,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
             titleLabel.setRotate(180);
         }
         titleLabel.getStyleClass().add("jfx-decorator-title");
+        titleLabel.textFillProperty().bind(Themes.titleFillProperty());
         titleNode.getChildren().setAll(titleIcon, titleLabel);
 
         state.setValue(new State(null, titleNode, false, false, true));
@@ -186,16 +188,13 @@ public final class MainPage extends StackPane implements DecoratorPage {
             StackPane.setAlignment(hBox, Pos.CENTER_LEFT);
             StackPane.setMargin(hBox, new Insets(9, 12, 9, 16));
             {
-                Label lblIcon = new Label();
-                lblIcon.setGraphic(SVG.UPDATE.createIcon(20));
-
                 TwoLineListItem prompt = new TwoLineListItem();
                 prompt.setSubtitle(i18n("update.bubble.subtitle"));
                 prompt.setPickOnBounds(false);
                 prompt.titleProperty().bind(BindingMapping.of(latestVersionProperty()).map(latestVersion ->
                         latestVersion == null ? "" : i18n("update.bubble.title", latestVersion.getVersion())));
 
-                hBox.getChildren().setAll(lblIcon, prompt);
+                hBox.getChildren().setAll(SVG.UPDATE.createIcon(20), prompt);
             }
 
             JFXButton closeUpdateButton = new JFXButton();
@@ -347,7 +346,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
 
     private void launch() {
         Profile profile = Profiles.getSelectedProfile();
-        Versions.launch(profile, profile.getSelectedVersion(), null);
+        Versions.launch(profile, profile.getSelectedVersion());
     }
 
     private void launchNoGame() {
@@ -392,7 +391,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
         Node contentNode;
         if (menu.getContent().isEmpty()) {
             Label placeholder = new Label(i18n("version.empty"));
-            placeholder.setStyle("-fx-padding: 10px; -fx-text-fill: gray; -fx-font-style: italic;");
+            placeholder.setStyle("-fx-padding: 10px; -fx-text-fill: -monet-on-surface-variant; -fx-font-style: italic;");
             contentNode = placeholder;
         } else {
             contentNode = menu;

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/PersonalizationPage.java

@@ -44,6 +44,7 @@ import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.javafx.SafeStringConverter;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
 
@@ -86,8 +87,11 @@ public class PersonalizationPage extends StackPane {
 
             brightnessPane.setLeft(left);
 
-            JFXComboBox<String> cboBrightness = new JFXComboBox<>(
-                    FXCollections.observableArrayList("auto", "light", "dark"));
+            JFXComboBox<String> cboBrightness = new JFXComboBox<>(FXCollections.observableArrayList(
+                    FXUtils.DARK_MODE != null
+                            ? List.of("auto", "light", "dark")
+                            : List.of("light", "dark")
+            ));
             cboBrightness.setConverter(FXUtils.stringConverter(name -> i18n("settings.launcher.brightness." + name)));
             cboBrightness.valueProperty().bindBidirectional(config().themeBrightnessProperty());
             brightnessPane.setRight(cboBrightness);
@@ -122,6 +126,7 @@ public class PersonalizationPage extends StackPane {
             themeList.getContent().add(animationButton);
             animationButton.selectedProperty().bindBidirectional(config().animationDisabledProperty());
             animationButton.setTitle(i18n("settings.launcher.turn_off_animations"));
+            animationButton.setSubtitle(i18n("settings.take_effect_after_restart"));
         }
         content.getChildren().addAll(ComponentList.createComponentListTitle(i18n("settings.launcher.appearance")), themeList);
 
@@ -168,6 +173,7 @@ public class PersonalizationPage extends StackPane {
                 slider.setMinorTickCount(1);
                 slider.setBlockIncrement(5);
                 slider.setSnapToTicks(true);
+                slider.setPadding(new Insets(9, 0, 0, 0));
                 HBox.setHgrow(slider, Priority.ALWAYS);
 
                 if (config().getBackgroundImageType() == EnumBackgroundImage.TRANSLUCENT) {
@@ -295,8 +301,12 @@ public class PersonalizationPage extends StackPane {
             {
                 BorderPane fontAntiAliasingPane = new BorderPane();
                 {
-                    Label left = new Label(i18n("settings.launcher.font.anti_aliasing"));
-                    BorderPane.setAlignment(left, Pos.CENTER_LEFT);
+                    VBox left = new VBox();
+                    Label title = new Label(i18n("settings.launcher.font.anti_aliasing"));
+                    title.getStyleClass().add("title");
+                    Label subtitle = new Label(i18n("settings.take_effect_after_restart"));
+                    subtitle.getStyleClass().add("subtitle");
+                    left.getChildren().setAll(title, subtitle);
                     fontAntiAliasingPane.setLeft(left);
                 }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/RootPage.java

@@ -17,9 +17,12 @@
  */
 package org.jackhuang.hmcl.ui.main;
 
+import com.jfoenix.controls.JFXPopup;
 import javafx.beans.property.ReadOnlyObjectProperty;
-
+import javafx.scene.control.Label;
+import javafx.scene.input.MouseButton;
 import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
@@ -39,6 +42,7 @@ import org.jackhuang.hmcl.ui.animation.AnimationUtils;
 import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
 import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
+import org.jackhuang.hmcl.ui.construct.PopupMenu;
 import org.jackhuang.hmcl.ui.decorator.DecoratorAnimatedPage;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.ui.download.ModpackInstallWizardProvider;
@@ -64,8 +68,8 @@ import java.util.stream.Collectors;
 
 import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.ui.versions.VersionPage.wrap;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
 public class RootPage extends DecoratorAnimatedPage implements DecoratorPage {
     private MainPage mainPage = null;
@@ -144,6 +148,12 @@ public class RootPage extends DecoratorAnimatedPage implements DecoratorPage {
             // first item in left sidebar
             AccountAdvancedListItem accountListItem = new AccountAdvancedListItem();
             accountListItem.setOnAction(e -> Controllers.navigate(Controllers.getAccountListPage()));
+            accountListItem.setOnMouseClicked(e -> {
+                if (e.getButton() == MouseButton.SECONDARY) {
+                    showAccountListPopupMenu(accountListItem);
+                    e.consume();
+                }
+            });
             accountListItem.accountProperty().bind(Accounts.selectedAccountProperty());
 
             // second item in left sidebar
@@ -234,13 +244,45 @@ public class RootPage extends DecoratorAnimatedPage implements DecoratorPage {
                     .startCategory(i18n("settings.launcher.general").toUpperCase(Locale.ROOT))
                     .add(launcherSettingsItem)
                     .add(terracottaItem)
-                    .addNavigationDrawerItem(i18n("chat"), SVG.CHAT, () -> FXUtils.openLink(Metadata.GROUPS_URL));
+                    .addNavigationDrawerItem(i18n("contact.chat"), SVG.CHAT, () -> {
+                        Controllers.getSettingsPage().showFeedback();
+                        Controllers.navigate(Controllers.getSettingsPage());
+                    });
 
             // the root page, with the sidebar in left, navigator in center.
             setLeft(sideBar);
             setCenter(getSkinnable().getMainPage());
         }
 
+        public void showAccountListPopupMenu(
+                AccountAdvancedListItem accountListItem
+        ) {
+            PopupMenu popupMenu = new PopupMenu();
+            JFXPopup popup = new JFXPopup(popupMenu);
+            AdvancedListBox scrollPane = new AdvancedListBox();
+            scrollPane.getStyleClass().add("no-padding");
+            scrollPane.setPrefWidth(220);
+            scrollPane.setPrefHeight(-1);
+            scrollPane.setMaxHeight(260);
+
+            if (Accounts.getAccounts().isEmpty()) {
+                Label placeholder = new Label(i18n("account.empty"));
+                placeholder.setStyle("-fx-padding: 10px; -fx-text-fill: -monet-on-surface-variant; -fx-font-style: italic;");
+                scrollPane.add(placeholder);
+            } else {
+                for (Account account : Accounts.getAccounts()) {
+                    AccountAdvancedListItem item = new AccountAdvancedListItem(account);
+                    item.setOnAction(e -> {
+                        Accounts.setSelectedAccount(account);
+                        popup.hide();
+                    });
+                    scrollPane.add(item);
+                }
+            }
+
+            popupMenu.getContent().add(scrollPane);
+            popup.show(accountListItem, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.LEFT, accountListItem.getWidth(), 0);
+        }
     }
 
     private boolean checkedModpack = false;

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsPage.java

@@ -17,22 +17,40 @@
  */
 package org.jackhuang.hmcl.ui.main;
 
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXComboBox;
+import com.jfoenix.controls.JFXRadioButton;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.WeakInvalidationListener;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.geometry.VPos;
+import javafx.scene.Cursor;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.control.ToggleGroup;
+import javafx.scene.layout.*;
+import javafx.scene.text.TextAlignment;
 import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.setting.EnumCommonDirectory;
 import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.ui.construct.ComponentList;
+import org.jackhuang.hmcl.ui.construct.ComponentSublist;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
+import org.jackhuang.hmcl.ui.construct.MultiFileItem;
+import org.jackhuang.hmcl.ui.construct.OptionToggleButton;
 import org.jackhuang.hmcl.upgrade.RemoteVersion;
 import org.jackhuang.hmcl.upgrade.UpdateChannel;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.upgrade.UpdateHandler;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.i18n.SupportedLocale;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.IOUtils;
@@ -45,6 +63,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.zip.GZIPInputStream;
@@ -52,79 +71,258 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
 import static org.jackhuang.hmcl.util.Lang.thread;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.selectedItemPropertyFor;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
-public final class SettingsPage extends SettingsView {
+public final class SettingsPage extends ScrollPane {
 
-    private InvalidationListener updateListener;
+    @SuppressWarnings("FieldCanBeLocal")
+    private final ToggleGroup updateChannelGroup;
+    @SuppressWarnings("FieldCanBeLocal")
+    private final InvalidationListener updateListener;
 
     public SettingsPage() {
-        FXUtils.smoothScrolling(scroll);
+        this.setFitToWidth(true);
 
-        // ==== Languages ====
-        cboLanguage.getItems().setAll(SupportedLocale.getSupportedLocales());
-        selectedItemPropertyFor(cboLanguage).bindBidirectional(config().localizationProperty());
+        VBox rootPane = new VBox();
+        rootPane.setPadding(new Insets(10));
+        this.setContent(rootPane);
+        FXUtils.smoothScrolling(this);
 
-        disableAutoGameOptionsPane.selectedProperty().bindBidirectional(config().disableAutoGameOptionsProperty());
-        // ====
+        ComponentList settingsPane = new ComponentList();
+        {
+            {
+                StackPane sponsorPane = new StackPane();
+                sponsorPane.setCursor(Cursor.HAND);
+                FXUtils.onClicked(sponsorPane, this::onSponsor);
+                sponsorPane.setPadding(new Insets(8, 0, 8, 0));
 
-        fileCommonLocation.selectedDataProperty().bindBidirectional(config().commonDirTypeProperty());
-        fileCommonLocationSublist.subtitleProperty().bind(
-                Bindings.createObjectBinding(() -> Optional.ofNullable(Settings.instance().getCommonDirectory())
-                                .orElse(i18n("launcher.cache_directory.disabled")),
-                        config().commonDirectoryProperty(), config().commonDirTypeProperty()));
+                GridPane gridPane = new GridPane();
 
-        // ==== Update ====
-        FXUtils.installFastTooltip(btnUpdate, i18n("update.tooltip"));
-        updateListener = any -> {
-            btnUpdate.setVisible(UpdateChecker.isOutdated());
+                ColumnConstraints col = new ColumnConstraints();
+                col.setHgrow(Priority.SOMETIMES);
+                col.setMaxWidth(Double.POSITIVE_INFINITY);
 
-            if (UpdateChecker.isOutdated()) {
-                lblUpdateSub.setText(i18n("update.newest_version", UpdateChecker.getLatestVersion().getVersion()));
-                lblUpdateSub.getStyleClass().setAll("update-label");
+                gridPane.getColumnConstraints().setAll(col);
 
-                lblUpdate.setText(i18n("update.found"));
-                lblUpdate.getStyleClass().setAll("update-label");
-            } else if (UpdateChecker.isCheckingUpdate()) {
-                lblUpdateSub.setText(i18n("update.checking"));
-                lblUpdateSub.getStyleClass().setAll("subtitle-label");
+                RowConstraints row = new RowConstraints();
+                row.setMinHeight(Double.NEGATIVE_INFINITY);
+                row.setValignment(VPos.TOP);
+                row.setVgrow(Priority.SOMETIMES);
+                gridPane.getRowConstraints().setAll(row);
 
-                lblUpdate.setText(i18n("update"));
-                lblUpdate.getStyleClass().setAll("title-label");
-            } else {
-                lblUpdateSub.setText(i18n("update.latest"));
-                lblUpdateSub.getStyleClass().setAll("subtitle-label");
+                {
+                    Label label = new Label(i18n("sponsor.hmcl"));
+                    label.setWrapText(true);
+                    label.setTextAlignment(TextAlignment.JUSTIFY);
+                    GridPane.setRowIndex(label, 0);
+                    GridPane.setColumnIndex(label, 0);
+                    gridPane.getChildren().add(label);
+                }
 
-                lblUpdate.setText(i18n("update"));
-                lblUpdate.getStyleClass().setAll("title-label");
+                sponsorPane.getChildren().setAll(gridPane);
+                settingsPane.getContent().add(sponsorPane);
             }
-        };
-        UpdateChecker.latestVersionProperty().addListener(new WeakInvalidationListener(updateListener));
-        UpdateChecker.outdatedProperty().addListener(new WeakInvalidationListener(updateListener));
-        UpdateChecker.checkingUpdateProperty().addListener(new WeakInvalidationListener(updateListener));
-        updateListener.invalidated(null);
 
-        ToggleGroup updateChannelGroup = new ToggleGroup();
-        chkUpdateDev.setToggleGroup(updateChannelGroup);
-        chkUpdateDev.setUserData(UpdateChannel.DEVELOPMENT);
-        chkUpdateStable.setToggleGroup(updateChannelGroup);
-        chkUpdateStable.setUserData(UpdateChannel.STABLE);
-        ObjectProperty<UpdateChannel> updateChannel = selectedItemPropertyFor(updateChannelGroup, UpdateChannel.class);
-        updateChannel.set(UpdateChannel.getChannel());
+            {
+                ComponentSublist updatePane = new ComponentSublist();
+                updatePane.setTitle(i18n("update"));
+                updatePane.setHasSubtitle(true);
 
-        InvalidationListener checkUpdateListener = e -> {
-            UpdateChecker.requestCheckUpdate(updateChannel.get(), previewPane.isSelected());
-        };
-        updateChannel.addListener(checkUpdateListener);
-        previewPane.selectedProperty().addListener(checkUpdateListener);
-        // ====
+                final Label lblUpdate;
+                final Label lblUpdateSub;
+                {
+                    VBox headerLeft = new VBox();
+
+                    lblUpdate = new Label(i18n("update"));
+                    lblUpdate.getStyleClass().add("title-label");
+                    lblUpdateSub = new Label();
+                    lblUpdateSub.getStyleClass().add("subtitle-label");
+
+                    headerLeft.getChildren().setAll(lblUpdate, lblUpdateSub);
+                    updatePane.setHeaderLeft(headerLeft);
+                }
+
+                {
+                    JFXButton btnUpdate = new JFXButton();
+                    btnUpdate.setOnAction(e -> onUpdate());
+                    btnUpdate.getStyleClass().add("toggle-icon4");
+                    btnUpdate.setGraphic(SVG.UPDATE.createIcon(20));
+                    FXUtils.installFastTooltip(btnUpdate, i18n("update.tooltip"));
+
+                    updateListener = any -> {
+                        btnUpdate.setVisible(UpdateChecker.isOutdated());
+
+                        if (UpdateChecker.isOutdated()) {
+                            lblUpdateSub.setText(i18n("update.newest_version", UpdateChecker.getLatestVersion().getVersion()));
+                            lblUpdateSub.getStyleClass().setAll("update-label");
+
+                            lblUpdate.setText(i18n("update.found"));
+                            lblUpdate.getStyleClass().setAll("update-label");
+                        } else if (UpdateChecker.isCheckingUpdate()) {
+                            lblUpdateSub.setText(i18n("update.checking"));
+                            lblUpdateSub.getStyleClass().setAll("subtitle-label");
+
+                            lblUpdate.setText(i18n("update"));
+                            lblUpdate.getStyleClass().setAll("title-label");
+                        } else {
+                            lblUpdateSub.setText(i18n("update.latest"));
+                            lblUpdateSub.getStyleClass().setAll("subtitle-label");
+
+                            lblUpdate.setText(i18n("update"));
+                            lblUpdate.getStyleClass().setAll("title-label");
+                        }
+                    };
+                    UpdateChecker.latestVersionProperty().addListener(new WeakInvalidationListener(updateListener));
+                    UpdateChecker.outdatedProperty().addListener(new WeakInvalidationListener(updateListener));
+                    UpdateChecker.checkingUpdateProperty().addListener(new WeakInvalidationListener(updateListener));
+                    updateListener.invalidated(null);
+
+                    updatePane.setHeaderRight(btnUpdate);
+                }
+
+                {
+                    VBox content = new VBox();
+                    content.setSpacing(8);
+
+                    JFXRadioButton chkUpdateStable = new JFXRadioButton(i18n("update.channel.stable"));
+                    JFXRadioButton chkUpdateDev = new JFXRadioButton(i18n("update.channel.dev"));
+
+                    updateChannelGroup = new ToggleGroup();
+                    chkUpdateDev.setToggleGroup(updateChannelGroup);
+                    chkUpdateDev.setUserData(UpdateChannel.DEVELOPMENT);
+                    chkUpdateStable.setToggleGroup(updateChannelGroup);
+                    chkUpdateStable.setUserData(UpdateChannel.STABLE);
+
+                    Label noteWrapper = new Label(i18n("update.note"));
+                    VBox.setMargin(noteWrapper, new Insets(10, 0, 0, 0));
+
+                    content.getChildren().setAll(chkUpdateStable, chkUpdateDev, noteWrapper);
+
+                    updatePane.getContent().add(content);
+                }
+                settingsPane.getContent().add(updatePane);
+            }
+
+            {
+                OptionToggleButton previewPane = new OptionToggleButton();
+                previewPane.setTitle(i18n("update.preview"));
+                previewPane.setSubtitle(i18n("update.preview.subtitle"));
+                previewPane.selectedProperty().bindBidirectional(config().acceptPreviewUpdateProperty());
+
+                ObjectProperty<UpdateChannel> updateChannel = selectedItemPropertyFor(updateChannelGroup, UpdateChannel.class);
+                updateChannel.set(UpdateChannel.getChannel());
+                InvalidationListener checkUpdateListener = e -> {
+                    UpdateChecker.requestCheckUpdate(updateChannel.get(), previewPane.isSelected());
+                };
+                updateChannel.addListener(checkUpdateListener);
+                previewPane.selectedProperty().addListener(checkUpdateListener);
+
+                settingsPane.getContent().add(previewPane);
+            }
+
+            {
+                MultiFileItem<EnumCommonDirectory> fileCommonLocation = new MultiFileItem<>();
+                fileCommonLocation.selectedDataProperty().bindBidirectional(config().commonDirTypeProperty());
+                fileCommonLocation.loadChildren(Arrays.asList(
+                        new MultiFileItem.Option<>(i18n("launcher.cache_directory.default"), EnumCommonDirectory.DEFAULT),
+                        new MultiFileItem.FileOption<>(i18n("settings.custom"), EnumCommonDirectory.CUSTOM)
+                                .setChooserTitle(i18n("launcher.cache_directory.choose"))
+                                .setDirectory(true)
+                                .bindBidirectional(config().commonDirectoryProperty())
+                ));
+
+                ComponentSublist fileCommonLocationSublist = new ComponentSublist();
+                fileCommonLocationSublist.getContent().add(fileCommonLocation);
+                fileCommonLocationSublist.setTitle(i18n("launcher.cache_directory"));
+                fileCommonLocationSublist.setHasSubtitle(true);
+                fileCommonLocationSublist.subtitleProperty().bind(
+                        Bindings.createObjectBinding(() -> Optional.ofNullable(Settings.instance().getCommonDirectory())
+                                        .orElse(i18n("launcher.cache_directory.disabled")),
+                                config().commonDirectoryProperty(), config().commonDirTypeProperty()));
+
+                JFXButton cleanButton = FXUtils.newBorderButton(i18n("launcher.cache_directory.clean"));
+                cleanButton.setOnAction(e -> clearCacheDirectory());
+                fileCommonLocationSublist.setHeaderRight(cleanButton);
+
+                settingsPane.getContent().add(fileCommonLocationSublist);
+            }
+
+            {
+                BorderPane languagePane = new BorderPane();
+
+                VBox left = new VBox();
+                Label title = new Label(i18n("settings.launcher.language"));
+                title.getStyleClass().add("title");
+                Label subtitle = new Label(i18n("settings.take_effect_after_restart"));
+                subtitle.getStyleClass().add("subtitle");
+                left.getChildren().setAll(title, subtitle);
+                languagePane.setLeft(left);
+
+                SupportedLocale currentLocale = I18n.getLocale();
+                JFXComboBox<SupportedLocale> cboLanguage = new JFXComboBox<>();
+                cboLanguage.setConverter(stringConverter(locale -> {
+                    if (locale.isDefault())
+                        return locale.getDisplayName(currentLocale);
+                    else if (locale.isSameLanguage(currentLocale))
+                        return locale.getDisplayName(locale);
+                    else
+                        return locale.getDisplayName(currentLocale) + " - " + locale.getDisplayName(locale);
+                }));
+                cboLanguage.getItems().setAll(SupportedLocale.getSupportedLocales());
+                selectedItemPropertyFor(cboLanguage).bindBidirectional(config().localizationProperty());
+
+                FXUtils.setLimitWidth(cboLanguage, 300);
+                languagePane.setRight(cboLanguage);
+
+                settingsPane.getContent().add(languagePane);
+            }
+
+            {
+                OptionToggleButton disableAutoGameOptionsPane = new OptionToggleButton();
+                disableAutoGameOptionsPane.setTitle(i18n("settings.launcher.disable_auto_game_options"));
+                disableAutoGameOptionsPane.selectedProperty().bindBidirectional(config().disableAutoGameOptionsProperty());
+
+                settingsPane.getContent().add(disableAutoGameOptionsPane);
+            }
+
+            {
+                BorderPane debugPane = new BorderPane();
+
+                Label left = new Label(i18n("settings.launcher.debug"));
+                BorderPane.setAlignment(left, Pos.CENTER_LEFT);
+                debugPane.setLeft(left);
+
+                JFXButton openLogFolderButton = new JFXButton(i18n("settings.launcher.launcher_log.reveal"));
+                openLogFolderButton.setOnAction(e -> openLogFolder());
+                openLogFolderButton.getStyleClass().add("jfx-button-border");
+                if (LOG.getLogFile() == null)
+                    openLogFolderButton.setDisable(true);
+
+                JFXButton logButton = FXUtils.newBorderButton(i18n("settings.launcher.launcher_log.export"));
+                logButton.setOnAction(e -> onExportLogs());
+
+                HBox buttonBox = new HBox();
+                buttonBox.setSpacing(10);
+                buttonBox.getChildren().addAll(openLogFolderButton, logButton);
+                BorderPane.setAlignment(buttonBox, Pos.CENTER_RIGHT);
+                debugPane.setRight(buttonBox);
+
+                settingsPane.getContent().add(debugPane);
+            }
+
+            rootPane.getChildren().add(settingsPane);
+        }
     }
 
-    @Override
-    protected void onUpdate() {
+    private void openLogFolder() {
+        FXUtils.openFolder(LOG.getLogFile().getParent());
+    }
+
+    private void onUpdate() {
         RemoteVersion target = UpdateChecker.getLatestVersion();
         if (target == null) {
             return;
@@ -168,8 +366,7 @@ public final class SettingsPage extends SettingsView {
         }
     }
 
-    @Override
-    protected void onExportLogs() {
+    private void onExportLogs() {
         thread(() -> {
             String nameBase = "hmcl-exported-logs-" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss"));
             List<Path> recentLogFiles = LOG.findRecentLogFiles(5);
@@ -249,13 +446,11 @@ public final class SettingsPage extends SettingsView {
         });
     }
 
-    @Override
-    protected void onSponsor() {
+    private void onSponsor() {
         FXUtils.openLink("https://github.com/HMCL-dev/HMCL");
     }
 
-    @Override
-    protected void clearCacheDirectory() {
+    private void clearCacheDirectory() {
         String commonDirectory = Settings.instance().getCommonDirectory();
         if (commonDirectory != null) {
             FileUtils.cleanDirectoryQuietly(Path.of(commonDirectory, "cache"));

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java

@@ -1,255 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui.main;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXComboBox;
-import com.jfoenix.controls.JFXRadioButton;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
-import javafx.geometry.VPos;
-import javafx.scene.Cursor;
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.layout.*;
-import javafx.scene.text.TextAlignment;
-import org.jackhuang.hmcl.setting.EnumCommonDirectory;
-import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.SVG;
-import org.jackhuang.hmcl.ui.construct.ComponentList;
-import org.jackhuang.hmcl.ui.construct.ComponentSublist;
-import org.jackhuang.hmcl.ui.construct.MultiFileItem;
-import org.jackhuang.hmcl.ui.construct.OptionToggleButton;
-import org.jackhuang.hmcl.util.i18n.I18n;
-import org.jackhuang.hmcl.util.i18n.SupportedLocale;
-
-import java.util.Arrays;
-
-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
-
-public abstract class SettingsView extends StackPane {
-    protected final JFXComboBox<SupportedLocale> cboLanguage;
-    protected final OptionToggleButton disableAutoGameOptionsPane;
-    protected final MultiFileItem<EnumCommonDirectory> fileCommonLocation;
-    protected final ComponentSublist fileCommonLocationSublist;
-    protected final Label lblUpdate;
-    protected final Label lblUpdateSub;
-    protected final JFXRadioButton chkUpdateStable;
-    protected final JFXRadioButton chkUpdateDev;
-    protected final JFXButton btnUpdate;
-    protected final OptionToggleButton previewPane;
-    protected final ScrollPane scroll;
-
-    public SettingsView() {
-        scroll = new ScrollPane();
-        getChildren().setAll(scroll);
-        scroll.setStyle("-fx-font-size: 14;");
-        scroll.setFitToWidth(true);
-
-        {
-            VBox rootPane = new VBox();
-            rootPane.setPadding(new Insets(32, 10, 32, 10));
-            {
-                ComponentList settingsPane = new ComponentList();
-                {
-                    {
-                        StackPane sponsorPane = new StackPane();
-                        sponsorPane.setCursor(Cursor.HAND);
-                        FXUtils.onClicked(sponsorPane, this::onSponsor);
-                        sponsorPane.setPadding(new Insets(8, 0, 8, 0));
-
-                        GridPane gridPane = new GridPane();
-
-                        ColumnConstraints col = new ColumnConstraints();
-                        col.setHgrow(Priority.SOMETIMES);
-                        col.setMaxWidth(Double.POSITIVE_INFINITY);
-
-                        gridPane.getColumnConstraints().setAll(col);
-
-                        RowConstraints row = new RowConstraints();
-                        row.setMinHeight(Double.NEGATIVE_INFINITY);
-                        row.setValignment(VPos.TOP);
-                        row.setVgrow(Priority.SOMETIMES);
-                        gridPane.getRowConstraints().setAll(row);
-
-                        {
-                            Label label = new Label(i18n("sponsor.hmcl"));
-                            label.setWrapText(true);
-                            label.setTextAlignment(TextAlignment.JUSTIFY);
-                            GridPane.setRowIndex(label, 0);
-                            GridPane.setColumnIndex(label, 0);
-                            gridPane.getChildren().add(label);
-                        }
-
-                        sponsorPane.getChildren().setAll(gridPane);
-                        settingsPane.getContent().add(sponsorPane);
-                    }
-                }
-
-                {
-                    ComponentSublist updatePane = new ComponentSublist();
-                    updatePane.setTitle(i18n("update"));
-                    updatePane.setHasSubtitle(true);
-                    {
-                        VBox headerLeft = new VBox();
-
-                        lblUpdate = new Label(i18n("update"));
-                        lblUpdate.getStyleClass().add("title-label");
-                        lblUpdateSub = new Label();
-                        lblUpdateSub.getStyleClass().add("subtitle-label");
-
-                        headerLeft.getChildren().setAll(lblUpdate, lblUpdateSub);
-                        updatePane.setHeaderLeft(headerLeft);
-                    }
-
-                    {
-                        btnUpdate = new JFXButton();
-                        btnUpdate.setOnAction(e -> onUpdate());
-                        btnUpdate.getStyleClass().add("toggle-icon4");
-                        btnUpdate.setGraphic(SVG.UPDATE.createIcon(20));
-
-                        updatePane.setHeaderRight(btnUpdate);
-                    }
-
-                    {
-                        VBox content = new VBox();
-                        content.setSpacing(8);
-
-                        chkUpdateStable = new JFXRadioButton(i18n("update.channel.stable"));
-                        chkUpdateDev = new JFXRadioButton(i18n("update.channel.dev"));
-
-                        Label noteWrapper = new Label(i18n("update.note"));
-                        VBox.setMargin(noteWrapper, new Insets(10, 0, 0, 0));
-
-                        content.getChildren().setAll(chkUpdateStable, chkUpdateDev, noteWrapper);
-
-                        updatePane.getContent().add(content);
-                    }
-                    settingsPane.getContent().add(updatePane);
-                }
-
-                {
-                    previewPane = new OptionToggleButton();
-                    previewPane.setTitle(i18n("update.preview"));
-                    previewPane.selectedProperty().bindBidirectional(config().acceptPreviewUpdateProperty());
-                    FXUtils.installFastTooltip(previewPane, i18n("update.preview.tooltip"));
-
-                    settingsPane.getContent().add(previewPane);
-                }
-
-                {
-                    fileCommonLocation = new MultiFileItem<>();
-                    fileCommonLocationSublist = new ComponentSublist();
-                    fileCommonLocationSublist.getContent().add(fileCommonLocation);
-                    fileCommonLocationSublist.setTitle(i18n("launcher.cache_directory"));
-                    fileCommonLocationSublist.setHasSubtitle(true);
-                    fileCommonLocation.loadChildren(Arrays.asList(
-                            new MultiFileItem.Option<>(i18n("launcher.cache_directory.default"), EnumCommonDirectory.DEFAULT),
-                            new MultiFileItem.FileOption<>(i18n("settings.custom"), EnumCommonDirectory.CUSTOM)
-                                    .setChooserTitle(i18n("launcher.cache_directory.choose"))
-                                    .setDirectory(true)
-                                    .bindBidirectional(config().commonDirectoryProperty())
-                    ));
-
-                    {
-                        JFXButton cleanButton = FXUtils.newBorderButton(i18n("launcher.cache_directory.clean"));
-                        cleanButton.setOnAction(e -> clearCacheDirectory());
-
-                        fileCommonLocationSublist.setHeaderRight(cleanButton);
-                    }
-
-                    settingsPane.getContent().add(fileCommonLocationSublist);
-                }
-
-                {
-                    BorderPane languagePane = new BorderPane();
-
-                    Label left = new Label(i18n("settings.launcher.language"));
-                    BorderPane.setAlignment(left, Pos.CENTER_LEFT);
-                    languagePane.setLeft(left);
-
-                    SupportedLocale currentLocale = I18n.getLocale();
-                    cboLanguage = new JFXComboBox<>();
-                    cboLanguage.setConverter(stringConverter(locale -> {
-                        if (locale.isDefault())
-                            return locale.getDisplayName(currentLocale);
-                        else if (locale.isSameLanguage(currentLocale))
-                            return locale.getDisplayName(locale);
-                        else
-                            return locale.getDisplayName(currentLocale) + " - " + locale.getDisplayName(locale);
-                    }));
-
-                    FXUtils.setLimitWidth(cboLanguage, 300);
-                    languagePane.setRight(cboLanguage);
-
-                    settingsPane.getContent().add(languagePane);
-                }
-
-                {
-                    disableAutoGameOptionsPane = new OptionToggleButton();
-                    disableAutoGameOptionsPane.setTitle(i18n("settings.launcher.disable_auto_game_options"));
-
-                    settingsPane.getContent().add(disableAutoGameOptionsPane);
-                }
-
-                {
-                    BorderPane debugPane = new BorderPane();
-
-                    Label left = new Label(i18n("settings.launcher.debug"));
-                    BorderPane.setAlignment(left, Pos.CENTER_LEFT);
-                    debugPane.setLeft(left);
-
-                    JFXButton openLogFolderButton = new JFXButton(i18n("settings.launcher.launcher_log.reveal"));
-                    openLogFolderButton.setOnAction(e -> openLogFolder());
-                    openLogFolderButton.getStyleClass().add("jfx-button-border");
-                    if (LOG.getLogFile() == null)
-                        openLogFolderButton.setDisable(true);
-
-                    JFXButton logButton = FXUtils.newBorderButton(i18n("settings.launcher.launcher_log.export"));
-                    logButton.setOnAction(e -> onExportLogs());
-
-                    HBox buttonBox = new HBox();
-                    buttonBox.setSpacing(10);
-                    buttonBox.getChildren().addAll(openLogFolderButton, logButton);
-                    BorderPane.setAlignment(buttonBox, Pos.CENTER_RIGHT);
-                    debugPane.setRight(buttonBox);
-
-                    settingsPane.getContent().add(debugPane);
-                }
-
-                rootPane.getChildren().add(settingsPane);
-            }
-            scroll.setContent(rootPane);
-        }
-    }
-
-    public void openLogFolder() {
-        FXUtils.openFolder(LOG.getLogFile().getParent());
-    }
-
-    protected abstract void onUpdate();
-
-    protected abstract void onExportLogs();
-
-    protected abstract void onSponsor();
-
-    protected abstract void clearCacheDirectory();
-}

HMCL/src/main/java/org/jackhuang/hmcl/ui/nbt/NBTEditorPage.java

@@ -89,7 +89,10 @@ public final class NBTEditorPage extends SpinnerPane implements DecoratorPage {
                 .whenComplete(Schedulers.javafx(), (result, exception) -> {
                     if (exception == null) {
                         setLoading(false);
-                        root.setCenter(new NBTTreeView(result));
+                        NBTTreeView view = new NBTTreeView(result);
+                        BorderPane.setMargin(view, new Insets(10));
+                        onEscPressed(view, cancelButton::fire);
+                        root.setCenter(view);
                     } else {
                         LOG.warning("Fail to open nbt file", exception);
                         Controllers.dialog(i18n("nbt.open.failed") + "\n\n" + StringUtils.getStackTrace(exception), null, MessageDialogPane.MessageType.WARNING, cancelButton::fire);

HMCL/src/main/java/org/jackhuang/hmcl/ui/nbt/NBTTreeView.java

@@ -20,11 +20,13 @@ package org.jackhuang.hmcl.ui.nbt;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.ListTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
-import javafx.scene.control.*;
+import com.jfoenix.controls.JFXTreeView;
+import javafx.scene.control.TreeCell;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeView;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.util.Callback;
-import org.jackhuang.hmcl.util.Holder;
 
 import java.lang.reflect.Array;
 import java.util.EnumMap;
@@ -34,7 +36,7 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 /**
  * @author Glavo
  */
-public final class NBTTreeView extends TreeView<Tag> {
+public final class NBTTreeView extends JFXTreeView<Tag> {
 
     public NBTTreeView(NBTTreeView.Item tree) {
         this.setRoot(tree);
@@ -42,10 +44,9 @@ public final class NBTTreeView extends TreeView<Tag> {
     }
 
     private static Callback<TreeView<Tag>, TreeCell<Tag>> cellFactory() {
-        Holder<Object> lastCell = new Holder<>();
         EnumMap<NBTTagType, Image> icons = new EnumMap<>(NBTTagType.class);
 
-        return view -> new TreeCell<Tag>() {
+        return view -> new TreeCell<>() {
             private void setTagText(String text) {
                 String name = ((Item) getTreeItem()).getName();
 
@@ -66,11 +67,6 @@ public final class NBTTreeView extends TreeView<Tag> {
             public void updateItem(Tag item, boolean empty) {
                 super.updateItem(item, empty);
 
-                // https://mail.openjdk.org/pipermail/openjfx-dev/2022-July/034764.html
-                if (this == lastCell.value && !isVisible())
-                    return;
-                lastCell.value = this;
-
                 ImageView imageView = (ImageView) this.getGraphic();
                 if (imageView == null) {
                     imageView = new ImageView();
@@ -85,6 +81,8 @@ public final class NBTTreeView extends TreeView<Tag> {
 
                 NBTTagType tagType = NBTTagType.typeOf(item);
                 imageView.setImage(icons.computeIfAbsent(tagType, type -> new Image(type.getIconUrl())));
+                imageView.setFitHeight(16);
+                imageView.setFitWidth(16);
 
                 if (((Item) getTreeItem()).getText() != null) {
                     setText(((Item) getTreeItem()).getText());

HMCL/src/main/java/org/jackhuang/hmcl/ui/terracotta/TerracottaControllerPage.java

@@ -40,7 +40,6 @@ import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
 import org.jackhuang.hmcl.game.LauncherHelper;
@@ -168,6 +167,7 @@ public class TerracottaControllerPage extends StackPane {
                 progressProperty.set(0);
 
                 TextFlow body = FXUtils.segmentToTextFlow(i18n("terracotta.confirm.desc"), Controllers::onHyperlinkAction);
+                body.getStyleClass().add("terracotta-hint");
                 body.setLineSpacing(4);
 
                 LineButton download = LineButton.of();
@@ -211,6 +211,7 @@ public class TerracottaControllerPage extends StackPane {
                 progressProperty.set(1);
 
                 TextFlow flow = FXUtils.segmentToTextFlow(i18n("terracotta.confirm.desc"), Controllers::onHyperlinkAction);
+                flow.getStyleClass().add("terracotta-hint");
                 flow.setLineSpacing(4);
 
                 LineButton host = LineButton.of();
@@ -231,7 +232,10 @@ public class TerracottaControllerPage extends StackPane {
                                 MessageDialogPane.MessageType.QUESTION
                         ).addAction(i18n("version.launch"), () -> {
                             Profile profile = Profiles.getSelectedProfile();
-                            Versions.launch(profile, profile.getSelectedVersion(), LauncherHelper::setKeep);
+                            Versions.launch(profile, profile.getSelectedVersion(), launcherHelper -> {
+                                launcherHelper.setKeep();
+                                launcherHelper.setDisableOfflineSkin();
+                            });
                         }).addCancel(i18n("terracotta.status.waiting.host.launch.skip"), () -> {
                             TerracottaState.HostScanning s1 = TerracottaManager.setScanning();
                             if (s1 != null) {
@@ -282,6 +286,7 @@ public class TerracottaControllerPage extends StackPane {
                 progressProperty.set(-1);
 
                 TextFlow body = FXUtils.segmentToTextFlow(i18n("terracotta.status.scanning.desc"), Controllers::onHyperlinkAction);
+                body.getStyleClass().add("terracotta-hint");
                 body.setLineSpacing(4);
 
                 LineButton room = LineButton.of();
@@ -626,9 +631,9 @@ public class TerracottaControllerPage extends StackPane {
                         }
 
                         HBox secondLine = new HBox();
+                        secondLine.getStyleClass().add("second-line");
                         {
                             Text text = new Text(button.subTitle.get());
-                            text.setFill(new Color(0, 0, 0, 0.5));
 
                             TextFlow lblSubtitle = new TextFlow(text);
                             lblSubtitle.getStyleClass().add("subtitle");

HMCL/src/main/java/org/jackhuang/hmcl/ui/terracotta/TerracottaPage.java

@@ -24,7 +24,6 @@ import javafx.geometry.Insets;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.game.LauncherHelper;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.terracotta.TerracottaMetadata;
@@ -71,7 +70,10 @@ public class TerracottaPage extends DecoratorAnimatedPage implements DecoratorPa
         AdvancedListBox toolbar = new AdvancedListBox()
                 .addNavigationDrawerItem(i18n("version.launch"), SVG.ROCKET_LAUNCH, () -> {
                     Profile profile = Profiles.getSelectedProfile();
-                    Versions.launch(profile, profile.getSelectedVersion(), LauncherHelper::setKeep);
+                    Versions.launch(profile, profile.getSelectedVersion(), launcherHelper -> {
+                        launcherHelper.setKeep();
+                        launcherHelper.setDisableOfflineSkin();
+                    });
                 }, item -> {
                     instanceChangeListenerHolder = FXUtils.onWeakChangeAndOperate(Profiles.selectedVersionProperty(),
                             instanceName -> item.setSubtitle(StringUtils.isNotBlank(instanceName) ? instanceName : i18n("version.empty"))

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DatapackListPageSkin.java

@@ -54,7 +54,6 @@ import org.jackhuang.hmcl.ui.construct.ComponentList;
 import org.jackhuang.hmcl.ui.construct.MDListCell;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
-import org.jackhuang.hmcl.util.Holder;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
 import org.jetbrains.annotations.Nullable;
 
@@ -180,8 +179,7 @@ final class DatapackListPageSkin extends SkinBase<DatapackListPage> {
             center.getStyleClass().add("large-spinner-pane");
             center.loadingProperty().bind(skinnable.loadingProperty());
 
-            Holder<Object> lastCell = new Holder<>();
-            listView.setCellFactory(x -> new DatapackInfoListCell(listView, lastCell));
+            listView.setCellFactory(x -> new DatapackInfoListCell(listView));
             listView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
             this.listView.setItems(filteredList);
 
@@ -304,8 +302,8 @@ final class DatapackListPageSkin extends SkinBase<DatapackListPage> {
         final TwoLineListItem content = new TwoLineListItem();
         BooleanProperty booleanProperty;
 
-        DatapackInfoListCell(JFXListView<DatapackInfoObject> listView, Holder<Object> lastCell) {
-            super(listView, lastCell);
+        DatapackInfoListCell(JFXListView<DatapackInfoObject> listView) {
+            super(listView);
 
             HBox container = new HBox(8);
             container.setPickOnBounds(false);

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadListPage.java

@@ -35,6 +35,7 @@ import javafx.scene.control.Control;
 import javafx.scene.control.Label;
 import javafx.scene.control.Skin;
 import javafx.scene.control.SkinBase;
+import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
@@ -60,16 +61,24 @@ import org.jackhuang.hmcl.util.Holder;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.i18n.I18n;
+import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.jackhuang.hmcl.util.javafx.BindingMapping;
 import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
+import org.jetbrains.annotations.NotNull;
 
+import java.lang.ref.WeakReference;
+import java.net.URI;
 import java.util.*;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 import java.util.stream.Collectors;
 
 import static org.jackhuang.hmcl.ui.FXUtils.ignoreEvent;
 import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.selectedItemPropertyFor;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
 public class DownloadListPage extends Control implements DecoratorPage, VersionPage.VersionLoadable {
     protected final ReadOnlyObjectWrapper<State> state = new ReadOnlyObjectWrapper<>();
@@ -523,6 +532,7 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
 
                 // ListViewBehavior would consume ESC pressed event, preventing us from handling it, so we ignore it here
                 ignoreEvent(listView, KeyEvent.KEY_PRESSED, e -> e.getCode() == KeyCode.ESCAPE);
+                var iconCache = new WeakHashMap<String, WeakReference<CompletableFuture<Image>>>();
                 listView.setCellFactory(x -> new FloatListCell<>(listView) {
                     private final TwoLineListItem content = new TwoLineListItem();
                     private final ImageView imageView = new ImageView();
@@ -549,8 +559,64 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
                         dataItem.getCategories().stream()
                                 .map(category -> getSkinnable().getLocalizedCategory(category))
                                 .forEach(content::addTag);
-                        if (StringUtils.isNotBlank(dataItem.getIconUrl())) {
-                            imageView.imageProperty().bind(FXUtils.newRemoteImage(dataItem.getIconUrl(), 80, 80, true, true));
+                        loadIcon(dataItem);
+                    }
+
+                    private void loadIcon(RemoteMod mod) {
+                        if (StringUtils.isBlank(mod.getIconUrl())) {
+                            imageView.setImage(null);
+                            return;
+                        }
+
+                        WeakReference<CompletableFuture<Image>> cacheRef = iconCache.get(mod.getIconUrl());
+                        CompletableFuture<Image> cache;
+                        if (cacheRef != null && (cache = cacheRef.get()) != null) {
+                            loadIcon(cache, mod.getIconUrl());
+                            return;
+                        }
+
+                        URI iconUrl = NetworkUtils.toURIOrNull(mod.getIconUrl());
+                        if (iconUrl == null) {
+                            imageView.setImage(null);
+                            return;
+                        }
+
+                        CompletableFuture<Image> future = new CompletableFuture<>();
+                        WeakReference<CompletableFuture<Image>> futureRef = new WeakReference<>(future);
+                        iconCache.put(mod.getIconUrl(), futureRef);
+
+                        FXUtils.getRemoteImageTask(iconUrl, 80, 80, true, true)
+                                .whenComplete(Schedulers.defaultScheduler(), (result, exception) -> {
+                                    if (exception == null) {
+                                        future.complete(result);
+                                    } else {
+                                        LOG.warning("Failed to load image from " + iconUrl, exception);
+                                        future.completeExceptionally(exception);
+                                    }
+                                }).start();
+                        loadIcon(future, mod.getIconUrl());
+                    }
+
+                    private void loadIcon(@NotNull CompletableFuture<Image> future,
+                                          @NotNull String iconUrl) {
+                        Image image;
+                        try {
+                            image = future.getNow(null);
+                        } catch (CancellationException | CompletionException ignored) {
+                            imageView.setImage(null);
+                            return;
+                        }
+
+                        if (image != null) {
+                            imageView.setImage(image);
+                        } else {
+                            imageView.setImage(null);
+                            future.thenAcceptAsync(result -> {
+                                RemoteMod item = getItem();
+                                if (item != null && iconUrl.equals(item.getIconUrl())) {
+                                    this.imageView.setImage(result);
+                                }
+                            }, Schedulers.javafx());
                         }
                     }
                 });

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItem.java

@@ -85,10 +85,14 @@ public class GameListItem extends Control {
         Versions.openFolder(profile, version);
     }
 
-    public void launch() {
+    public void testGame() {
         Versions.testGame(profile, version);
     }
 
+    public void launch() {
+        Versions.launch(profile, version);
+    }
+
     public void modifyGameSettings() {
         Versions.modifyGameSettings(profile, version);
     }

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java

@@ -44,7 +44,7 @@ public class GameListItemSkin extends SkinBase<GameListItem> {
         JFXPopup popup = new JFXPopup(menu);
 
         menu.getContent().setAll(
-                new IconedMenuItem(SVG.ROCKET_LAUNCH, i18n("version.launch.test"), () -> currentSkinnable.launch(), popup),
+                new IconedMenuItem(SVG.ROCKET_LAUNCH, i18n("version.launch.test"), () -> currentSkinnable.testGame(), popup),
                 new IconedMenuItem(SVG.SCRIPT, i18n("version.launch_script"), () -> currentSkinnable.generateLaunchScript(), popup),
                 new MenuSeparator(),
                 new IconedMenuItem(SVG.SETTINGS, i18n("version.manage.manage"), () -> currentSkinnable.modifyGameSettings(), popup),
@@ -87,7 +87,7 @@ public class GameListItemSkin extends SkinBase<GameListItem> {
 
         {
             JFXButton btnLaunch = new JFXButton();
-            btnLaunch.setOnAction(e -> skinnable.launch());
+            btnLaunch.setOnAction(e -> skinnable.testGame());
             btnLaunch.getStyleClass().add("toggle-icon4");
             BorderPane.setAlignment(btnLaunch, Pos.CENTER);
             btnLaunch.setGraphic(FXUtils.limitingSize(SVG.ROCKET_LAUNCH.createIcon(24), 24, 24));

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java

@@ -23,7 +23,6 @@ import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
-import javafx.beans.value.ChangeListener;
 import javafx.collections.ListChangeListener;
 import javafx.css.PseudoClass;
 import javafx.geometry.Insets;
@@ -93,9 +92,6 @@ final class ModListPageSkin extends SkinBase<ModListPage> {
     // FXThread
     private boolean isSearching = false;
 
-    @SuppressWarnings({"FieldCanBeLocal", "unused"})
-    private final ChangeListener<Boolean> holder;
-
     ModListPageSkin(ModListPage skinnable) {
         super(skinnable);
 
@@ -107,12 +103,6 @@ final class ModListPageSkin extends SkinBase<ModListPage> {
         root.getStyleClass().add("no-padding");
         listView = new JFXListView<>();
 
-        this.holder = FXUtils.onWeakChange(skinnable.loadingProperty(), loading -> {
-            if (!loading) {
-                listView.scrollTo(0);
-            }
-        });
-
         {
             toolbarPane = new TransitionPane();
 
@@ -199,8 +189,7 @@ final class ModListPageSkin extends SkinBase<ModListPage> {
             center.getStyleClass().add("large-spinner-pane");
             center.loadingProperty().bind(skinnable.loadingProperty());
 
-            Holder<Object> lastCell = new Holder<>();
-            listView.setCellFactory(x -> new ModInfoListCell(listView, lastCell));
+            listView.setCellFactory(x -> new ModInfoListCell(listView));
             listView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
             Bindings.bindContent(listView.getItems(), skinnable.getItems());
             skinnable.getItems().addListener((ListChangeListener<? super ModInfoObject>) c -> {
@@ -572,8 +561,8 @@ final class ModListPageSkin extends SkinBase<ModListPage> {
 
         Tooltip warningTooltip;
 
-        ModInfoListCell(JFXListView<ModInfoObject> listView, Holder<Object> lastCell) {
-            super(listView, lastCell);
+        ModInfoListCell(JFXListView<ModInfoObject> listView) {
+            super(listView);
 
             this.getStyleClass().add("mod-info-list-cell");
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModUpdatesPage.java

@@ -18,16 +18,15 @@
 package org.jackhuang.hmcl.ui.versions;
 
 import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXCheckBox;
 import javafx.beans.property.*;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
-import javafx.scene.control.CheckBox;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
-import javafx.scene.control.cell.CheckBoxTableCell;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import org.jackhuang.hmcl.mod.LocalModFile;
@@ -38,6 +37,7 @@ import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.construct.JFXCheckBoxTableCell;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
 import org.jackhuang.hmcl.ui.construct.PageCloseEvent;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
@@ -72,9 +72,10 @@ public class ModUpdatesPage extends BorderPane implements DecoratorPage {
         getStyleClass().add("gray-background");
 
         TableColumn<ModUpdateObject, Boolean> enabledColumn = new TableColumn<>();
-        CheckBox allEnabledBox = new CheckBox();
+        var allEnabledBox = new JFXCheckBox();
+        enabledColumn.setStyle("-fx-alignment: CENTER;");
         enabledColumn.setGraphic(allEnabledBox);
-        enabledColumn.setCellFactory(CheckBoxTableCell.forTableColumn(enabledColumn));
+        enabledColumn.setCellFactory(JFXCheckBoxTableCell.forTableColumn(enabledColumn));
         setupCellValueFactory(enabledColumn, ModUpdateObject::enabledProperty);
         enabledColumn.setEditable(true);
         enabledColumn.setMaxWidth(40);
@@ -101,6 +102,7 @@ public class ModUpdatesPage extends BorderPane implements DecoratorPage {
         TableView<ModUpdateObject> table = new TableView<>(objects);
         table.setEditable(true);
         table.getColumns().setAll(enabledColumn, fileNameColumn, currentVersionColumn, targetVersionColumn, sourceColumn);
+        setMargin(table, new Insets(10, 10, 5, 10));
 
         setCenter(table);
 
@@ -117,6 +119,7 @@ public class ModUpdatesPage extends BorderPane implements DecoratorPage {
         JFXButton cancelButton = FXUtils.newRaisedButton(i18n("button.cancel"));
         cancelButton.setOnAction(e -> fireEvent(new PageCloseEvent()));
         onEscPressed(this, cancelButton::fire);
+        onEscPressed(table, cancelButton::fire);
 
         actions.getChildren().setAll(exportListButton, nextButton, cancelButton);
         setBottom(actions);

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ResourcepackListPage.java

@@ -0,0 +1,280 @@
+package org.jackhuang.hmcl.ui.versions;
+
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXListView;
+import javafx.beans.binding.Bindings;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.Skin;
+import javafx.scene.control.SkinBase;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.StackPane;
+import javafx.stage.FileChooser;
+import org.jackhuang.hmcl.mod.LocalModFile;
+import org.jackhuang.hmcl.resourcepack.ResourcepackFile;
+import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.ListPageBase;
+import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.ui.construct.*;
+import org.jackhuang.hmcl.util.io.FileUtils;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+import static org.jackhuang.hmcl.ui.ToolbarListPageSkin.createToolbarButton2;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+
+public final class ResourcepackListPage extends ListPageBase<ResourcepackListPage.ResourcepackInfoObject> implements VersionPage.VersionLoadable {
+    private Path resourcepackDirectory;
+
+    public ResourcepackListPage() {
+        FXUtils.applyDragListener(this, file -> file.getFileName().toString().endsWith(".zip"), this::addFiles);
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new ResourcepackListPageSkin(this);
+    }
+
+    @Override
+    public void loadVersion(Profile profile, String version) {
+        this.resourcepackDirectory = profile.getRepository().getResourcepacksDirectory(version);
+
+        try {
+            if (!Files.exists(resourcepackDirectory)) {
+                Files.createDirectories(resourcepackDirectory);
+            }
+        } catch (IOException e) {
+            LOG.warning("Failed to create resourcepack directory" + resourcepackDirectory, e);
+        }
+        refresh();
+    }
+
+    public void refresh() {
+        if (resourcepackDirectory == null || !Files.isDirectory(resourcepackDirectory)) return;
+        setLoading(true);
+        Task.supplyAsync(Schedulers.io(), () -> {
+            try (Stream<Path> stream = Files.list(resourcepackDirectory)) {
+                return stream.sorted(Comparator.comparing(FileUtils::getName))
+                        .flatMap(item -> {
+                            try {
+                                return Stream.of(ResourcepackFile.parse(item)).filter(Objects::nonNull).map(ResourcepackInfoObject::new);
+                            } catch (IOException e) {
+                                LOG.warning("Failed to load resourcepack " + item, e);
+                                return Stream.empty();
+                            }
+                        })
+                        .toList();
+            }
+        }).whenComplete(Schedulers.javafx(), ((result, exception) -> {
+            if (exception == null) {
+                getItems().setAll(result);
+            } else {
+                LOG.warning("Failed to load resourcepacks", exception);
+                getItems().clear();
+            }
+            setLoading(false);
+        })).start();
+    }
+
+    public void addFiles(List<Path> files) {
+        if (resourcepackDirectory == null) return;
+
+        try {
+            for (Path file : files) {
+                Path target = resourcepackDirectory.resolve(file.getFileName());
+                if (!Files.exists(target)) {
+                    Files.copy(file, target);
+                }
+            }
+        } catch (IOException e) {
+            LOG.warning("Failed to add resourcepacks", e);
+            Controllers.dialog(i18n("resourcepack.add.failed"), i18n("message.error"), MessageDialogPane.MessageType.ERROR);
+        }
+
+        refresh();
+    }
+
+    public void onAddFiles() {
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle(i18n("resourcepack.add"));
+        fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("resourcepack"), "*.zip"));
+        List<Path> files = FileUtils.toPaths(fileChooser.showOpenMultipleDialog(Controllers.getStage()));
+        if (files != null && !files.isEmpty()) {
+            addFiles(files);
+        }
+    }
+
+    private void onDownload() {
+        Controllers.getDownloadPage().showResourcepackDownloads();
+        Controllers.navigate(Controllers.getDownloadPage());
+    }
+
+    private static final class ResourcepackListPageSkin extends SkinBase<ResourcepackListPage> {
+        private final JFXListView<ResourcepackInfoObject> listView;
+
+        private ResourcepackListPageSkin(ResourcepackListPage control) {
+            super(control);
+
+            StackPane pane = new StackPane();
+            pane.setPadding(new Insets(10));
+            pane.getStyleClass().addAll("notice-pane");
+
+            ComponentList root = new ComponentList();
+            root.getStyleClass().add("no-padding");
+            listView = new JFXListView<>();
+
+            HBox toolbar = new HBox();
+            toolbar.setAlignment(Pos.CENTER_LEFT);
+            toolbar.setPickOnBounds(false);
+            toolbar.getChildren().setAll(
+                    createToolbarButton2(i18n("button.refresh"), SVG.REFRESH, control::refresh),
+                    createToolbarButton2(i18n("resourcepack.add"), SVG.ADD, control::onAddFiles),
+                    createToolbarButton2(i18n("resourcepack.download"), SVG.DOWNLOAD, control::onDownload)
+            );
+            root.getContent().add(toolbar);
+
+            SpinnerPane center = new SpinnerPane();
+            ComponentList.setVgrow(center, Priority.ALWAYS);
+            center.getStyleClass().add("large-spinner-pane");
+            center.loadingProperty().bind(control.loadingProperty());
+
+            listView.setCellFactory(x -> new ResourcepackListCell(listView, control));
+            Bindings.bindContent(listView.getItems(), control.getItems());
+
+            center.setContent(listView);
+            root.getContent().add(center);
+
+            pane.getChildren().setAll(root);
+            getChildren().setAll(pane);
+        }
+    }
+
+    public static class ResourcepackInfoObject {
+        private final ResourcepackFile file;
+        private WeakReference<Image> iconCache;
+
+        public ResourcepackInfoObject(ResourcepackFile file) {
+            this.file = file;
+        }
+
+        public ResourcepackFile getFile() {
+            return file;
+        }
+
+        Image getIcon() {
+            Image image = null;
+            if (iconCache != null && (image = iconCache.get()) != null) {
+                return image;
+            }
+            byte[] iconData = file.getIcon();
+            if (iconData != null) {
+                try (ByteArrayInputStream inputStream = new ByteArrayInputStream(iconData)) {
+                    image = new Image(inputStream, 64, 64, true, true);
+                } catch (Exception e) {
+                    LOG.warning("Failed to load resourcepack icon " + file.getPath(), e);
+                }
+            }
+
+            if (image == null || image.isError() || image.getWidth() <= 0 || image.getHeight() <= 0 ||
+                    (Math.abs(image.getWidth() - image.getHeight()) >= 1)) {
+                image = FXUtils.newBuiltinImage("/assets/img/unknown_pack.png");
+            }
+            iconCache = new WeakReference<>(image);
+            return image;
+        }
+    }
+
+    private static final class ResourcepackListCell extends MDListCell<ResourcepackInfoObject> {
+        private final ImageView imageView = new ImageView();
+        private final TwoLineListItem content = new TwoLineListItem();
+        private final JFXButton btnReveal = new JFXButton();
+        private final JFXButton btnDelete = new JFXButton();
+        private final ResourcepackListPage page;
+
+        public ResourcepackListCell(JFXListView<ResourcepackInfoObject> listView, ResourcepackListPage page) {
+            super(listView);
+
+            this.page = page;
+
+            BorderPane root = new BorderPane();
+            root.getStyleClass().add("md-list-cell");
+            root.setPadding(new Insets(8));
+
+            HBox left = new HBox(8);
+            left.setAlignment(Pos.CENTER);
+            FXUtils.limitSize(imageView, 32, 32);
+            left.getChildren().add(imageView);
+            left.setPadding(new Insets(0, 8, 0, 0));
+            FXUtils.setLimitWidth(left, 48);
+            root.setLeft(left);
+
+            HBox.setHgrow(content, Priority.ALWAYS);
+            root.setCenter(content);
+
+            btnReveal.getStyleClass().add("toggle-icon4");
+            btnReveal.setGraphic(SVG.FOLDER_OPEN.createIcon());
+
+            btnDelete.getStyleClass().add("toggle-icon4");
+            btnDelete.setGraphic(SVG.DELETE_FOREVER.createIcon());
+
+            HBox right = new HBox(8);
+            right.setAlignment(Pos.CENTER_RIGHT);
+            right.getChildren().setAll(btnReveal, btnDelete);
+            root.setRight(right);
+
+            getContainer().getChildren().add(new RipplerContainer(root));
+        }
+
+        @Override
+        protected void updateControl(ResourcepackListPage.ResourcepackInfoObject item, boolean empty) {
+            if (empty || item == null) {
+                return;
+            }
+
+            ResourcepackFile file = item.getFile();
+            imageView.setImage(item.getIcon());
+
+            content.setTitle(file.getName());
+            LocalModFile.Description description = file.getDescription();
+            content.setSubtitle(description != null ? description.toString() : "");
+
+            FXUtils.installFastTooltip(btnReveal, i18n("reveal.in_file_manager"));
+            btnReveal.setOnAction(event -> FXUtils.showFileInExplorer(file.getPath()));
+
+            btnDelete.setOnAction(event ->
+                    Controllers.confirm(i18n("button.remove.confirm"), i18n("button.remove"),
+                            () -> onDelete(file), null));
+        }
+
+        private void onDelete(ResourcepackFile file) {
+            try {
+                if (Files.isDirectory(file.getPath())) {
+                    FileUtils.deleteDirectory(file.getPath());
+                } else {
+                    Files.delete(file.getPath());
+                }
+                page.refresh();
+            } catch (IOException e) {
+                Controllers.dialog(i18n("resourcepack.delete.failed", e.getMessage()), i18n("message.error"), MessageDialogPane.MessageType.ERROR);
+                LOG.warning("Failed to delete resourcepack", e);
+            }
+        }
+    }
+}

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java

@@ -56,6 +56,7 @@ public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage
     private final TabHeader.Tab<ModListPage> modListTab = new TabHeader.Tab<>("modListTab");
     private final TabHeader.Tab<WorldListPage> worldListTab = new TabHeader.Tab<>("worldList");
     private final TabHeader.Tab<SchematicsPage> schematicsTab = new TabHeader.Tab<>("schematicsTab");
+    private final TabHeader.Tab<ResourcepackListPage> resourcePackTab = new TabHeader.Tab<>("resourcePackTab");
     private final TransitionPane transitionPane = new TransitionPane();
     private final BooleanProperty currentVersionUpgradable = new SimpleBooleanProperty();
     private final ObjectProperty<Profile.ProfileVersion> version = new SimpleObjectProperty<>();
@@ -67,10 +68,11 @@ public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage
         versionSettingsTab.setNodeSupplier(loadVersionFor(() -> new VersionSettingsPage(false)));
         installerListTab.setNodeSupplier(loadVersionFor(InstallerListPage::new));
         modListTab.setNodeSupplier(loadVersionFor(ModListPage::new));
+        resourcePackTab.setNodeSupplier(loadVersionFor(ResourcepackListPage::new));
         worldListTab.setNodeSupplier(loadVersionFor(WorldListPage::new));
         schematicsTab.setNodeSupplier(loadVersionFor(SchematicsPage::new));
 
-        tab = new TabHeader(transitionPane, versionSettingsTab, installerListTab, modListTab, worldListTab, schematicsTab);
+        tab = new TabHeader(transitionPane, versionSettingsTab, installerListTab, modListTab, resourcePackTab, worldListTab, schematicsTab);
         tab.select(versionSettingsTab);
 
         addEventHandler(Navigator.NavigationEvent.NAVIGATED, this::onNavigated);
@@ -130,6 +132,8 @@ public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage
             installerListTab.getNode().loadVersion(profile, version);
         if (modListTab.isInitialized())
             modListTab.getNode().loadVersion(profile, version);
+        if (resourcePackTab.isInitialized())
+            resourcePackTab.getNode().loadVersion(profile, version);
         if (worldListTab.isInitialized())
             worldListTab.getNode().loadVersion(profile, version);
         if (schematicsTab.isInitialized())
@@ -238,6 +242,7 @@ public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage
                         .addNavigationDrawerTab(control.tab, control.versionSettingsTab, i18n("settings.game"), SVG.SETTINGS, SVG.SETTINGS_FILL)
                         .addNavigationDrawerTab(control.tab, control.installerListTab, i18n("settings.tabs.installers"), SVG.DEPLOYED_CODE, SVG.DEPLOYED_CODE_FILL)
                         .addNavigationDrawerTab(control.tab, control.modListTab, i18n("mods.manage"), SVG.EXTENSION, SVG.EXTENSION_FILL)
+                        .addNavigationDrawerTab(control.tab, control.resourcePackTab, i18n("resourcepack.manage"), SVG.TEXTURE)
                         .addNavigationDrawerTab(control.tab, control.worldListTab, i18n("world.manage"), SVG.PUBLIC)
                         .addNavigationDrawerTab(control.tab, control.schematicsTab, i18n("schematics.manage"), SVG.SCHEMA, SVG.SCHEMA_FILL);
                 VBox.setVgrow(sideBar, Priority.ALWAYS);
@@ -247,12 +252,12 @@ public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage
                 browseList.getContent().setAll(
                         new IconedMenuItem(SVG.STADIA_CONTROLLER, i18n("folder.game"), () -> control.onBrowse(""), browsePopup),
                         new IconedMenuItem(SVG.EXTENSION, i18n("folder.mod"), () -> control.onBrowse("mods"), browsePopup),
-                        new IconedMenuItem(SVG.SETTINGS, i18n("folder.config"), () -> control.onBrowse("config"), browsePopup),
                         new IconedMenuItem(SVG.TEXTURE, i18n("folder.resourcepacks"), () -> control.onBrowse("resourcepacks"), browsePopup),
-                        new IconedMenuItem(SVG.WB_SUNNY, i18n("folder.shaderpacks"), () -> control.onBrowse("shaderpacks"), browsePopup),
-                        new IconedMenuItem(SVG.SCHEMA, i18n("folder.schematics"), () -> control.onBrowse("schematics"), browsePopup),
-                        new IconedMenuItem(SVG.SCREENSHOT_MONITOR, i18n("folder.screenshots"), () -> control.onBrowse("screenshots"), browsePopup),
                         new IconedMenuItem(SVG.PUBLIC, i18n("folder.saves"), () -> control.onBrowse("saves"), browsePopup),
+                        new IconedMenuItem(SVG.SCHEMA, i18n("folder.schematics"), () -> control.onBrowse("schematics"), browsePopup),
+                        new IconedMenuItem(SVG.WB_SUNNY, i18n("folder.shaderpacks"), () -> control.onBrowse("shaderpacks"), browsePopup),
+                        new IconedMenuItem(SVG.SCREENSHOT_MONITOR, i18n("folder.screenshots"), () -> control.onBrowse("screenshots"), browsePopup),
+                        new IconedMenuItem(SVG.SETTINGS, i18n("folder.config"), () -> control.onBrowse("config"), browsePopup),
                         new IconedMenuItem(SVG.SCRIPT, i18n("folder.logs"), () -> control.onBrowse("logs"), browsePopup)
                 );
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java

@@ -111,6 +111,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
     private final MultiFileItem.FileOption<GameDirectoryType> gameDirCustomOption;
     private final JFXComboBox<ProcessPriority> cboProcessPriority;
     private final OptionToggleButton showLogsPane;
+    private final OptionToggleButton enableDebugLogOutputPane;
     private final ImagePickerItem iconPickerItem;
 
     private final ChangeListener<Collection<JavaRuntime>> javaListChangeListener;
@@ -410,6 +411,9 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
             showLogsPane = new OptionToggleButton();
             showLogsPane.setTitle(i18n("settings.show_log"));
 
+            enableDebugLogOutputPane = new OptionToggleButton();
+            enableDebugLogOutputPane.setTitle(i18n("settings.enable_debug_log_output"));
+
             BorderPane processPriorityPane = new BorderPane();
             {
                 Label label = new Label(i18n("settings.advanced.process_priority"));
@@ -474,6 +478,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
                     launcherVisibilityPane,
                     dimensionPane,
                     showLogsPane,
+                    enableDebugLogOutputPane,
                     processPriorityPane,
                     serverPane,
                     showAdvancedSettingPane
@@ -551,6 +556,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
             chkAutoAllocate.selectedProperty().unbindBidirectional(lastVersionSetting.autoMemoryProperty());
             chkFullscreen.selectedProperty().unbindBidirectional(lastVersionSetting.fullscreenProperty());
             showLogsPane.selectedProperty().unbindBidirectional(lastVersionSetting.showLogsProperty());
+            enableDebugLogOutputPane.selectedProperty().unbindBidirectional(lastVersionSetting.enableDebugLogOutputProperty());
             FXUtils.unbindEnum(cboLauncherVisibility, lastVersionSetting.launcherVisibilityProperty());
             FXUtils.unbindEnum(cboProcessPriority, lastVersionSetting.processPriorityProperty());
 
@@ -585,6 +591,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
         chkAutoAllocate.selectedProperty().bindBidirectional(versionSetting.autoMemoryProperty());
         chkFullscreen.selectedProperty().bindBidirectional(versionSetting.fullscreenProperty());
         showLogsPane.selectedProperty().bindBidirectional(versionSetting.showLogsProperty());
+        enableDebugLogOutputPane.selectedProperty().bindBidirectional(versionSetting.enableDebugLogOutputProperty());
         FXUtils.bindEnum(cboLauncherVisibility, versionSetting.launcherVisibilityProperty());
         FXUtils.bindEnum(cboProcessPriority, versionSetting.processPriorityProperty());
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java

@@ -23,10 +23,7 @@ import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
 import org.jackhuang.hmcl.download.game.GameAssetDownloadTask;
-import org.jackhuang.hmcl.game.GameDirectoryType;
-import org.jackhuang.hmcl.game.GameRepository;
-import org.jackhuang.hmcl.game.HMCLGameRepository;
-import org.jackhuang.hmcl.game.LauncherHelper;
+import org.jackhuang.hmcl.game.*;
 import org.jackhuang.hmcl.mod.RemoteMod;
 import org.jackhuang.hmcl.setting.*;
 import org.jackhuang.hmcl.task.*;
@@ -200,7 +197,8 @@ public final class Versions {
         }
     }
 
-    public static void generateLaunchScript(Profile profile, String id) {
+    @SafeVarargs
+    public static void generateLaunchScript(Profile profile, String id, Consumer<LauncherHelper>... injecters) {
         if (!checkVersionForLaunching(profile, id))
             return;
         ensureSelectedAccount(account -> {
@@ -209,23 +207,35 @@ public final class Versions {
             if (Files.isDirectory(repository.getRunDirectory(id)))
                 chooser.setInitialDirectory(repository.getRunDirectory(id).toFile());
             chooser.setTitle(i18n("version.launch_script.save"));
+            if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
+                chooser.getExtensionFilters().add(
+                        new FileChooser.ExtensionFilter(i18n("extension.command"), "*.command")
+                );
+            }
             chooser.getExtensionFilters().add(OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS
                     ? new FileChooser.ExtensionFilter(i18n("extension.bat"), "*.bat")
                     : new FileChooser.ExtensionFilter(i18n("extension.sh"), "*.sh"));
             chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("extension.ps1"), "*.ps1"));
             Path file = FileUtils.toPath(chooser.showSaveDialog(Controllers.getStage()));
-            if (file != null)
-                new LauncherHelper(profile, account, id).makeLaunchScript(file);
+            if (file != null) {
+                LauncherHelper launcherHelper = new LauncherHelper(profile, account, id);
+                for (Consumer<LauncherHelper> injecter : injecters) {
+                    injecter.accept(launcherHelper);
+                }
+                launcherHelper.makeLaunchScript(file);
+            }
         });
     }
 
-    public static void launch(Profile profile, String id, Consumer<LauncherHelper> injecter) {
+    @SafeVarargs
+    public static void launch(Profile profile, String id, Consumer<LauncherHelper>... injecters) {
         if (!checkVersionForLaunching(profile, id))
             return;
         ensureSelectedAccount(account -> {
             LauncherHelper launcherHelper = new LauncherHelper(profile, account, id);
-            if (injecter != null)
+            for (Consumer<LauncherHelper> injecter : injecters) {
                 injecter.accept(launcherHelper);
+            }
             launcherHelper.launch();
         });
     }
@@ -234,6 +244,16 @@ public final class Versions {
         launch(profile, id, LauncherHelper::setTestMode);
     }
 
+    public static void launchAndEnterWorld(Profile profile, String id, String worldFolderName) {
+        launch(profile, id, launcherHelper ->
+                launcherHelper.setQuickPlayOption(new QuickPlayOption.SinglePlayer(worldFolderName)));
+    }
+
+    public static void generateLaunchScriptForQuickEnterWorld(Profile profile, String id, String worldFolderName) {
+        generateLaunchScript(profile, id, launcherHelper ->
+                launcherHelper.setQuickPlayOption(new QuickPlayOption.SinglePlayer(worldFolderName)));
+    }
+
     private static boolean checkVersionForLaunching(Profile profile, String id) {
         if (id == null || !profile.getRepository().isLoaded() || !profile.getRepository().hasVersion(id)) {
             JFXButton gotoDownload = new JFXButton(i18n("version.empty.launch.goto_download"));

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldBackupsPage.java

@@ -39,6 +39,7 @@ import org.jackhuang.hmcl.ui.construct.RipplerContainer;
 import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 import org.jackhuang.hmcl.util.Pair;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jetbrains.annotations.NotNull;
 
 import java.nio.file.*;
@@ -245,7 +246,7 @@ public final class WorldBackupsPage extends ListPageBase<WorldBackupsPage.Backup
                 item.setSubtitle(formatDateTime(skinnable.getBackupTime()) + (skinnable.count == 0 ? "" : " (" + skinnable.count + ")"));
 
                 if (world.getGameVersion() != null)
-                    item.addTag(world.getGameVersion());
+                    item.addTag(I18n.getDisplayVersion(world.getGameVersion()));
             }
 
             {

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldExportPage.java

@@ -23,6 +23,7 @@ import javafx.scene.control.Skin;
 import org.jackhuang.hmcl.game.World;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.wizard.WizardSinglePage;
+import org.jackhuang.hmcl.util.i18n.I18n;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -41,7 +42,8 @@ public class WorldExportPage extends WizardSinglePage {
         this.world = world;
 
         path.set(export.toString());
-        gameVersion.set(world.getGameVersion());
+        if (world.getGameVersion() != null)
+            gameVersion.set(I18n.getDisplayVersion(world.getGameVersion()));
         worldName.set(world.getWorldName());
     }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldInfoPage.java

@@ -122,7 +122,8 @@ public final class WorldInfoPage extends SpinnerPane {
 
                 Label gameVersionLabel = new Label();
                 FXUtils.copyOnDoubleClick(gameVersionLabel);
-                gameVersionLabel.setText(world.getGameVersion());
+                if (world.getGameVersion() != null)
+                    gameVersionLabel.setText(world.getGameVersion().toNormalizedString());
                 BorderPane.setAlignment(gameVersionLabel, Pos.CENTER_RIGHT);
                 gameVersionPane.setRight(gameVersionLabel);
             }

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListItem.java

@@ -22,6 +22,7 @@ import javafx.scene.control.Skin;
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.game.World;
 import org.jackhuang.hmcl.game.WorldLockedException;
+import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
@@ -39,11 +40,15 @@ public final class WorldListItem extends Control {
     private final World world;
     private final Path backupsDir;
     private final WorldListPage parent;
+    private final Profile profile;
+    private final String id;
 
-    public WorldListItem(WorldListPage parent, World world, Path backupsDir) {
+    public WorldListItem(WorldListPage parent, World world, Path backupsDir, Profile profile, String id) {
         this.world = world;
         this.backupsDir = backupsDir;
         this.parent = parent;
+        this.profile = profile;
+        this.id = id;
     }
 
     @Override
@@ -91,6 +96,14 @@ public final class WorldListItem extends Control {
     }
 
     public void showManagePage() {
-        Controllers.navigate(new WorldManagePage(world, backupsDir));
+        Controllers.navigate(new WorldManagePage(world, backupsDir, profile, id));
+    }
+
+    public void launch() {
+        Versions.launchAndEnterWorld(profile, id, world.getFileName());
+    }
+
+    public void generateLaunchScript() {
+        Versions.generateLaunchScriptForQuickEnterWorld(profile, id, world.getFileName());
     }
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListItemSkin.java

@@ -32,7 +32,7 @@ import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.util.ChunkBaseApp;
-import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
+import org.jackhuang.hmcl.util.i18n.I18n;
 
 import java.time.Instant;
 
@@ -72,10 +72,10 @@ public final class WorldListItemSkin extends SkinBase<WorldListItem> {
             item.setMouseTransparent(true);
             if (world.getWorldName() != null)
                 item.setTitle(parseColorEscapes(world.getWorldName()));
-            item.setSubtitle(i18n("world.datetime", formatDateTime(Instant.ofEpochMilli(world.getLastPlayed())), world.getGameVersion() == null ? i18n("message.unknown") : world.getGameVersion()));
+            item.setSubtitle(i18n("world.datetime", formatDateTime(Instant.ofEpochMilli(world.getLastPlayed()))));
 
             if (world.getGameVersion() != null)
-                item.addTag(world.getGameVersion());
+                item.addTag(I18n.getDisplayVersion(world.getGameVersion()));
             if (world.isLocked())
                 item.addTag(i18n("world.locked"));
         }
@@ -115,8 +115,19 @@ public final class WorldListItemSkin extends SkinBase<WorldListItem> {
         WorldListItem item = getSkinnable();
         World world = item.getWorld();
 
-        popupMenu.getContent().addAll(
-                new IconedMenuItem(SVG.SETTINGS, i18n("world.manage.button"), item::showManagePage, popup));
+        if (world.getGameVersion() != null && world.getGameVersion().isAtLeast("1.20", "23w14a")) {
+
+            IconedMenuItem launchItem = new IconedMenuItem(SVG.ROCKET_LAUNCH, i18n("version.launch_and_enter_world"), item::launch, popup);
+            launchItem.setDisable(world.isLocked());
+            popupMenu.getContent().add(launchItem);
+
+            popupMenu.getContent().addAll(
+                    new IconedMenuItem(SVG.SCRIPT, i18n("version.launch_script"), item::generateLaunchScript, popup),
+                    new MenuSeparator()
+            );
+        }
+
+        popupMenu.getContent().add(new IconedMenuItem(SVG.SETTINGS, i18n("world.manage.button"), item::showManagePage, popup));
 
         if (ChunkBaseApp.isSupported(world)) {
             popupMenu.getContent().addAll(
@@ -126,7 +137,7 @@ public final class WorldListItemSkin extends SkinBase<WorldListItem> {
                     new IconedMenuItem(SVG.FORT, i18n("world.chunkbase.nether_fortress"), () -> ChunkBaseApp.openNetherFortressFinder(world), popup)
             );
 
-            if (GameVersionNumber.compare(world.getGameVersion(), "1.13") >= 0) {
+            if (world.getGameVersion() != null && world.getGameVersion().compareTo("1.13") >= 0) {
                 popupMenu.getContent().add(new IconedMenuItem(SVG.LOCATION_CITY, i18n("world.chunkbase.end_city"),
                         () -> ChunkBaseApp.openEndCityFinder(world), popup));
             }

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListPage.java

@@ -28,6 +28,7 @@ import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.*;
 import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 
 import java.io.IOException;
 import java.nio.file.FileAlreadyExistsException;
@@ -49,7 +50,7 @@ public final class WorldListPage extends ListPageBase<WorldListItem> implements
     private List<World> worlds;
     private Profile profile;
     private String id;
-    private String gameVersion;
+    private GameVersionNumber gameVersion;
 
     public WorldListPage() {
         FXUtils.applyDragListener(this, it -> "zip".equals(FileUtils.getExtension(it)), modpacks -> {
@@ -60,7 +61,7 @@ public final class WorldListPage extends ListPageBase<WorldListItem> implements
             if (worlds != null)
                 itemsProperty().setAll(worlds.stream()
                         .filter(world -> isShowAll() || world.getGameVersion() == null || world.getGameVersion().equals(gameVersion))
-                        .map(world -> new WorldListItem(this, world, backupsDir)).toList());
+                        .map(world -> new WorldListItem(this, world, backupsDir, profile, id)).toList());
         });
     }
 
@@ -87,7 +88,7 @@ public final class WorldListPage extends ListPageBase<WorldListItem> implements
             return;
 
         setLoading(true);
-        Task.runAsync(() -> gameVersion = profile.getRepository().getGameVersion(id).orElse(null))
+        Task.runAsync(() -> gameVersion = profile.getRepository().getGameVersion(id).map(GameVersionNumber::asGameVersion).orElse(null))
                 .thenApplyAsync(unused -> {
                     try (Stream<World> stream = World.getWorlds(savesDir)) {
                         return stream.parallel().collect(Collectors.toList());
@@ -99,7 +100,7 @@ public final class WorldListPage extends ListPageBase<WorldListItem> implements
                     if (exception == null) {
                         itemsProperty().setAll(result.stream()
                                 .filter(world -> isShowAll() || world.getGameVersion() == null || world.getGameVersion().equals(gameVersion))
-                                .map(world -> new WorldListItem(this, world, backupsDir))
+                                .map(world -> new WorldListItem(this, world, backupsDir, profile, id))
                                 .collect(Collectors.toList()));
                     } else {
                         LOG.warning("Failed to load world list page", exception);
@@ -130,7 +131,7 @@ public final class WorldListPage extends ListPageBase<WorldListItem> implements
                     Controllers.prompt(i18n("world.name.enter"), (name, resolve, reject) -> {
                         Task.runAsync(() -> world.install(savesDir, name))
                                 .whenComplete(Schedulers.javafx(), () -> {
-                                    itemsProperty().add(new WorldListItem(this, new World(savesDir.resolve(name)), backupsDir));
+                                    itemsProperty().add(new WorldListItem(this, new World(savesDir.resolve(name)), backupsDir, profile, id));
                                     resolve.run();
                                 }, e -> {
                                     if (e instanceof FileAlreadyExistsException)

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldManagePage.java

@@ -26,6 +26,7 @@ import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.game.World;
+import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.animation.TransitionPane;
@@ -33,7 +34,6 @@ import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.ui.decorator.DecoratorAnimatedPage;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.util.ChunkBaseApp;
-import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 
 import java.io.IOException;
 import java.nio.channels.FileChannel;
@@ -50,6 +50,8 @@ public final class WorldManagePage extends DecoratorAnimatedPage implements Deco
     private final ObjectProperty<State> state;
     private final World world;
     private final Path backupsDir;
+    private final Profile profile;
+    private final String id;
 
     private final TabHeader header;
     private final TabHeader.Tab<WorldInfoPage> worldInfoTab = new TabHeader.Tab<>("worldInfoPage");
@@ -60,10 +62,13 @@ public final class WorldManagePage extends DecoratorAnimatedPage implements Deco
 
     private FileChannel sessionLockChannel;
 
-    public WorldManagePage(World world, Path backupsDir) {
+    public WorldManagePage(World world, Path backupsDir, Profile profile, String id) {
         this.world = world;
         this.backupsDir = backupsDir;
 
+        this.profile = profile;
+        this.id = id;
+
         this.worldInfoTab.setNodeSupplier(() -> new WorldInfoPage(this));
         this.worldBackupsTab.setNodeSupplier(() -> new WorldBackupsPage(this));
         this.datapackTab.setNodeSupplier(() -> new DatapackListPage(this));
@@ -72,6 +77,13 @@ public final class WorldManagePage extends DecoratorAnimatedPage implements Deco
         this.header = new TabHeader(transitionPane, worldInfoTab, worldBackupsTab);
         header.select(worldInfoTab);
 
+        // Does it need to be done in the background?
+        try {
+            sessionLockChannel = world.lock();
+            LOG.info("Acquired lock on world " + world.getFileName());
+        } catch (IOException ignored) {
+        }
+
         setCenter(transitionPane);
 
         BorderPane left = new BorderPane();
@@ -84,7 +96,7 @@ public final class WorldManagePage extends DecoratorAnimatedPage implements Deco
                 .addNavigationDrawerTab(header, worldBackupsTab, i18n("world.backup"), SVG.ARCHIVE, SVG.ARCHIVE_FILL);
 
         if (world.getGameVersion() != null && // old game will not write game version to level.dat
-                GameVersionNumber.asGameVersion(world.getGameVersion()).isAtLeast("1.13", "17w43a")) {
+                world.getGameVersion().isAtLeast("1.13", "17w43a")) {
             header.getTabs().add(datapackTab);
             sideBar.addNavigationDrawerTab(header, datapackTab, i18n("world.datapack"), SVG.EXTENSION, SVG.EXTENSION_FILL);
         }
@@ -92,6 +104,12 @@ public final class WorldManagePage extends DecoratorAnimatedPage implements Deco
         left.setTop(sideBar);
 
         AdvancedListBox toolbar = new AdvancedListBox();
+
+        if (world.getGameVersion() != null && world.getGameVersion().isAtLeast("1.20", "23w14a")) {
+            toolbar.addNavigationDrawerItem(i18n("version.launch"), SVG.ROCKET_LAUNCH, this::launch, null);
+            toolbar.addNavigationDrawerItem(i18n("version.launch_script"), SVG.SCRIPT, this::generateLaunchScript, null);
+        }
+
         if (ChunkBaseApp.isSupported(world)) {
             PopupMenu popupMenu = new PopupMenu();
             JFXPopup popup = new JFXPopup(popupMenu);
@@ -102,7 +120,7 @@ public final class WorldManagePage extends DecoratorAnimatedPage implements Deco
                     new IconedMenuItem(SVG.FORT, i18n("world.chunkbase.nether_fortress"), () -> ChunkBaseApp.openNetherFortressFinder(world), popup)
             );
 
-            if (GameVersionNumber.compare(world.getGameVersion(), "1.13") >= 0) {
+            if (world.getGameVersion() != null && world.getGameVersion().compareTo("1.13") >= 0) {
                 popupMenu.getContent().add(
                         new IconedMenuItem(SVG.LOCATION_CITY, i18n("world.chunkbase.end_city"), () -> ChunkBaseApp.openEndCityFinder(world), popup));
             }
@@ -118,12 +136,7 @@ public final class WorldManagePage extends DecoratorAnimatedPage implements Deco
         BorderPane.setMargin(toolbar, new Insets(0, 0, 12, 0));
         left.setBottom(toolbar);
 
-        // Does it need to be done in the background?
-        try {
-            sessionLockChannel = world.lock();
-            LOG.info("Acquired lock on world " + world.getFileName());
-        } catch (IOException ignored) {
-        }
+        this.addEventHandler(Navigator.NavigationEvent.EXITED, this::onExited);
     }
 
     @Override
@@ -143,14 +156,7 @@ public final class WorldManagePage extends DecoratorAnimatedPage implements Deco
         return sessionLockChannel == null;
     }
 
-    @Override
-    public boolean back() {
-        closePage();
-        return true;
-    }
-
-    @Override
-    public void closePage() {
+    public void onExited(Navigator.NavigationEvent event) {
         if (sessionLockChannel != null) {
             try {
                 sessionLockChannel.close();
@@ -162,4 +168,13 @@ public final class WorldManagePage extends DecoratorAnimatedPage implements Deco
             sessionLockChannel = null;
         }
     }
+
+    public void launch() {
+        fireEvent(new PageCloseEvent());
+        Versions.launchAndEnterWorld(profile, id, world.getFileName());
+    }
+
+    public void generateLaunchScript() {
+        Versions.generateLaunchScriptForQuickEnterWorld(profile, id, world.getFileName());
+    }
 }

HMCL/src/main/java/org/jackhuang/hmcl/util/ChunkBaseApp.java

@@ -49,7 +49,7 @@ public final class ChunkBaseApp {
 
     public static boolean isSupported(@NotNull World world) {
         return world.getSeed() != null && world.getGameVersion() != null &&
-                GameVersionNumber.asGameVersion(world.getGameVersion()).compareTo(MIN_GAME_VERSION) >= 0;
+                world.getGameVersion().compareTo(MIN_GAME_VERSION) >= 0;
     }
 
     public static ChunkBaseApp newBuilder(String app, long seed) {
@@ -60,7 +60,7 @@ public final class ChunkBaseApp {
         assert isSupported(world);
 
         newBuilder("seed-map", Objects.requireNonNull(world.getSeed()))
-                .addPlatform(GameVersionNumber.asGameVersion(world.getGameVersion()), world.isLargeBiomes(), SEED_MAP_GAME_VERSIONS)
+                .addPlatform(world.getGameVersion(), world.isLargeBiomes(), SEED_MAP_GAME_VERSIONS)
                 .open();
     }
 
@@ -68,7 +68,7 @@ public final class ChunkBaseApp {
         assert isSupported(world);
 
         newBuilder("stronghold-finder", Objects.requireNonNull(world.getSeed()))
-                .addPlatform(GameVersionNumber.asGameVersion(world.getGameVersion()), world.isLargeBiomes(), STRONGHOLD_FINDER_GAME_VERSIONS)
+                .addPlatform(world.getGameVersion(), world.isLargeBiomes(), STRONGHOLD_FINDER_GAME_VERSIONS)
                 .open();
     }
 
@@ -76,7 +76,7 @@ public final class ChunkBaseApp {
         assert isSupported(world);
 
         newBuilder("nether-fortress-finder", Objects.requireNonNull(world.getSeed()))
-                .addPlatform(GameVersionNumber.asGameVersion(world.getGameVersion()), false, NETHER_FORTRESS_GAME_VERSIONS)
+                .addPlatform(world.getGameVersion(), false, NETHER_FORTRESS_GAME_VERSIONS)
                 .open();
     }
 
@@ -84,7 +84,7 @@ public final class ChunkBaseApp {
         assert isSupported(world);
 
         newBuilder("endcity-finder", Objects.requireNonNull(world.getSeed()))
-                .addPlatform(GameVersionNumber.asGameVersion(world.getGameVersion()), false, END_CITY_GAME_VERSIONS)
+                .addPlatform(world.getGameVersion(), false, END_CITY_GAME_VERSIONS)
                 .open();
     }
 

HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java

@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.util.i18n;
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.download.game.GameRemoteVersion;
 import org.jackhuang.hmcl.util.i18n.translator.Translator;
+import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.PropertyKey;
 
@@ -76,7 +77,11 @@ public final class I18n {
         return getTranslator().formatSpeed(bytes);
     }
 
-    public static String getDisplaySelfVersion(RemoteVersion version) {
+    public static String getDisplayVersion(RemoteVersion version) {
+        return getTranslator().getDisplayVersion(version);
+    }
+
+    public static String getDisplayVersion(GameVersionNumber version) {
         return getTranslator().getDisplayVersion(version);
     }
 

HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/MinecraftWiki.java

@@ -72,7 +72,7 @@ public final class MinecraftWiki {
                 else if (wikiVersion.startsWith("1.0.0-rc2"))
                     wikiVersion = "1.0.0-rc2";
             }
-        } else if (gameVersion instanceof GameVersionNumber.Snapshot) {
+        } else if (gameVersion instanceof GameVersionNumber.LegacySnapshot) {
             return locale.i18n("wiki.version.game.snapshot", wikiVersion) + variantSuffix;
         } else {
             if (wikiVersion.length() >= 6 && wikiVersion.charAt(2) == 'w') {

HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/translator/Translator.java

@@ -19,6 +19,7 @@ package org.jackhuang.hmcl.util.i18n.translator;
 
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.util.i18n.SupportedLocale;
+import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -47,6 +48,10 @@ public class Translator {
         return remoteVersion.getSelfVersion();
     }
 
+    public String getDisplayVersion(GameVersionNumber versionNumber) {
+        return versionNumber.toNormalizedString();
+    }
+
     /// @see [#formatDateTime(TemporalAccessor)]
     protected DateTimeFormatter dateTimeFormatter;
 

HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/translator/Translator_lzh.java

@@ -92,22 +92,38 @@ public class Translator_lzh extends Translator {
                 appendDigitByDigit(builder, String.valueOf(release.getPatch()));
             }
 
-            //noinspection StatementWithEmptyBody
-            if (release.getEaType() == GameVersionNumber.Release.TYPE_GA) {
-                // do nothing
-            } else if (release.getEaType() == GameVersionNumber.Release.TYPE_PRE) {
-                builder.append("之預");
-                appendDigitByDigit(builder, release.getEaVersion().toString());
-            } else if (release.getEaType() == GameVersionNumber.Release.TYPE_RC) {
-                builder.append("之候");
-                appendDigitByDigit(builder, release.getEaVersion().toString());
-            } else {
-                // Unsupported
-                return gameVersion.toString();
+            switch (release.getEaType()) {
+                case GA -> {
+                    // do nothing
+                }
+                case PRE_RELEASE -> {
+                    builder.append("之預");
+                    appendDigitByDigit(builder, release.getEaVersion().toString());
+                }
+                case RELEASE_CANDIDATE -> {
+                    builder.append("之候");
+                    appendDigitByDigit(builder, release.getEaVersion().toString());
+                }
+                default -> {
+                    // Unsupported
+                    return gameVersion.toString();
+                }
+            }
+
+            switch (release.getAdditional()) {
+                case NONE -> {
+                }
+                case UNOBFUSCATED -> {
+                    builder.append("涇渭");
+                }
+                default -> {
+                    // Unsupported
+                    return gameVersion.toString();
+                }
             }
 
             return builder.toString();
-        } else if (gameVersion instanceof GameVersionNumber.Snapshot snapshot) {
+        } else if (gameVersion instanceof GameVersionNumber.LegacySnapshot snapshot) {
             StringBuilder builder = new StringBuilder();
 
             appendDigitByDigit(builder, String.valueOf(snapshot.getYear()));
@@ -120,6 +136,9 @@ public class Translator_lzh extends Translator {
             else
                 builder.append(suffix);
 
+            if (snapshot.isUnobfuscated())
+                builder.append("涇渭");
+
             return builder.toString();
         } else if (gameVersion instanceof GameVersionNumber.Special) {
             String version = gameVersion.toString();
@@ -130,6 +149,7 @@ public class Translator_lzh extends Translator {
                 case "2.0_purple" -> "二點〇紫";
                 case "1.rv-pre1" -> "一點真視之預一";
                 case "3d shareware v1.34" -> "躍然享件一點三四";
+                case "13w12~" -> "一三週一二閏";
                 case "20w14infinite", "20w14~", "20w14∞" -> "二〇週一四宇";
                 case "22w13oneblockatatime" -> "二二週一三典";
                 case "23w13a_or_b" -> "二三週一三暨";
@@ -179,6 +199,11 @@ public class Translator_lzh extends Translator {
             return translateGenericVersion(remoteVersion.getSelfVersion());
     }
 
+    @Override
+    public String getDisplayVersion(GameVersionNumber versionNumber) {
+        return translateGameVersion(versionNumber);
+    }
+
     @Override
     public String formatDateTime(TemporalAccessor time) {
         LocalDateTime localDateTime;

HMCL/src/main/resources/assets/css/blue.css

@@ -56,5 +56,5 @@
     -monet-on-surface-variant-transparent-38: #45465161;
     -monet-surface-container-low-transparent-80: #F5F2FACC;
     -monet-secondary-container-transparent-80: #D0D5FDCC;
-    -warning-tag-background: #F1AEB5;
+    -monet-inverse-surface-transparent-80: #303036CC;
 }

HMCL/src/main/resources/assets/css/brightness-dark.css

@@ -0,0 +1,20 @@
+.hint {
+    -fx-hyperlink-fill: -monet-inverse-primary;
+}
+
+.two-line-list-item {
+    -fixed-warning-tag-background: #2c0b0e;
+}
+
+.log-window {
+    -fixed-log-toggle-selected: #DEE2E6;
+    -fixed-log-toggle-unselected: #6C757D;
+    -fixed-log-text-fill: #FFFFFF;
+    -fixed-log-trace: #495057;
+    -fixed-log-debug: #343A40;
+    -fixed-log-info: #212529;
+    -fixed-log-warn: #331904;
+    -fixed-log-error: #58151C;
+    -fixed-log-fatal: #842029;
+    -fixed-log-selected: #6C757D;
+}

HMCL/src/main/resources/assets/css/brightness-light.css

@@ -0,0 +1,20 @@
+.hint {
+    -fx-hyperlink-fill: -monet-primary;
+}
+
+.two-line-list-item {
+    -fixed-warning-tag-background: #F1AEB5;
+}
+
+.log-window {
+    -fixed-log-toggle-selected: #000000;
+    -fixed-log-toggle-unselected: #6C757D;
+    -fixed-log-text-fill: #000000;
+    -fixed-log-trace: #EEE9E0;
+    -fixed-log-debug: #EEE9E0;
+    -fixed-log-info: #FFFFFF;
+    -fixed-log-warn: #FFEECC;
+    -fixed-log-error: #FFCCBB;
+    -fixed-log-fatal: #F7A699;
+    -fixed-log-selected: #C4C4C4;
+}

HMCL/src/main/resources/assets/css/root.css

@@ -41,6 +41,14 @@
     -fx-text-fill: -monet-on-surface-variant;
 }
 
+.hyperlink {
+    -fx-text-fill: -monet-primary;
+}
+
+.hyperlink:focused {
+    -fx-border-color: -monet-primary;
+}
+
 .hint {
     -fx-background-radius: 5;
     -fx-border-width: 1;
@@ -48,6 +56,11 @@
     -fx-padding: 6;
 }
 
+.hint .hyperlink {
+    -fx-fill: -monet-primary;
+    -fx-text-fill: -monet-primary;
+}
+
 .hint.info {
     -fx-background-color: -monet-primary-fixed-dim;
     -fx-border-color: -monet-outline;
@@ -76,12 +89,17 @@
 }
 
 .hint.warning {
-    -fx-background-color: -monet-tertiary-container;
+    -fx-background-color: -monet-tertiary-fixed-dim;
     -fx-border-color: -monet-outline;
 }
 
 .hint.warning Text, .hint.warning .svg {
-    -fx-fill: -monet-on-tertiary-container;
+    -fx-fill: -monet-on-tertiary-fixed;
+}
+
+.hint.warning .hyperlink {
+    -fx-fill: -fx-hyperlink-fill;
+    -fx-text-fill: -fx-hyperlink-fill;
 }
 
 .skin-pane .jfx-text-field {
@@ -145,12 +163,16 @@
 }
 
 .announcement .hyperlink {
-    -fx-fill: #0070E0;
+    -fx-fill: -monet-primary;
     -fx-font-size: 13px;
 }
 
 .rippler-container {
-    -jfx-rippler-fill: #a2a2a2;
+    -jfx-rippler-fill: -monet-on-surface-variant;
+}
+
+.advanced-list-item .rippler-container {
+    -jfx-rippler-fill: -monet-on-secondary-container;
 }
 
 .advanced-list-item > .rippler-container > .container {
@@ -243,6 +265,10 @@
     -fx-spacing: 0;
 }
 
+.no-padding .advanced-list-box-content {
+    -fx-padding: 0 0 0 0;
+}
+
 .iconed-item {
     -jfx-rippler-fill: -monet-secondary-container;
 }
@@ -289,6 +315,10 @@
     -fx-font-size: 12px;
 }
 
+.two-line-list-item > .second-line > .subtitle Text {
+    -fx-fill: -monet-on-surface-variant;
+}
+
 .two-line-list-item > .first-line > .tag {
     -fx-text-fill: -monet-on-secondary-container;
     -fx-background-color: -monet-secondary-container;
@@ -299,7 +329,7 @@
 
 .two-line-list-item > .first-line > .tag-warning {
     -fx-text-fill: -monet-on-error-container;
-    -fx-background-color: -warning-tag-background;
+    -fx-background-color: -fixed-warning-tag-background;
     -fx-padding: 2;
     -fx-font-weight: normal;
     -fx-font-size: 12px;
@@ -320,6 +350,10 @@
     -fx-font-size: 15px;
 }
 
+.terracotta-hint Text {
+    -fx-fill: -monet-on-surface;
+}
+
 .game-crash-window {
     -fx-background-color: -monet-surface-container;
 }
@@ -329,7 +363,7 @@
 }
 
 .game-crash-window .crash-reason-text-flow .hyperlink {
-    -fx-fill: #0070E0;
+    -fx-fill: -monet-primary;
 }
 
 .wrap-text > HBox > .subtitle {
@@ -337,14 +371,17 @@
 }
 
 .bubble {
-    -fx-background-color: rgba(0, 0, 0, 0.5);
+    -fx-background-color: -monet-inverse-surface-transparent-80;
     -fx-background-radius: 2px;
-    -fx-text-fill: white;
 }
 
 .bubble > HBox > .two-line-list-item > .first-line > .title,
 .bubble > HBox > .two-line-list-item > HBox > .subtitle {
-    -fx-text-fill: white;
+    -fx-text-fill: -monet-inverse-on-surface;
+}
+
+.bubble .svg {
+    -fx-fill: -monet-inverse-on-surface;
 }
 
 .sponsor-pane {
@@ -408,17 +445,6 @@
     -fx-fill: -monet-primary-container;
 }
 
-/*******************************************************************************
- *                                                                             *
- * Tooltip                                                                     *
- *                                                                             *
- ******************************************************************************/
-
-.tooltip {
-    -fx-text-fill: -monet-inverse-on-surface;
-    -fx-background-color: -monet-inverse-surface;
-}
-
 /*******************************************************************************
  *                                                                             *
  * JFX Tab Pane                                                                *
@@ -653,11 +679,6 @@
     -fx-padding: 10.0;
 }
 
-.jfx-tool-bar-button .jfx-rippler {
-    -jfx-rippler-fill: -monet-on-surface;
-    -jfx-mask-type: CIRCLE;
-}
-
 .jfx-decorator-button {
     -fx-max-width: 40px;
     -fx-background-radius: 5px;
@@ -742,7 +763,7 @@
 }
 
 .jfx-button .jfx-rippler {
-    -jfx-rippler-fill: -monet-on-primary;
+    -jfx-rippler-fill: -monet-on-surface;
     -jfx-mask-type: CIRCLE;
     -fx-padding: 0.0;
 }
@@ -752,6 +773,7 @@
 }
 
 .jfx-button-raised .jfx-rippler {
+    -jfx-rippler-fill: -monet-on-primary;
     -jfx-mask-type: CIRCLE;
     -fx-padding: 0.0;
 }
@@ -795,6 +817,10 @@
     -jfx-unchecked-color: transparent;
 }
 
+.table-view .jfx-check-box .jfx-rippler {
+    -jfx-rippler-disabled: true;
+}
+
 /*******************************************************************************
 *                                                                              *
 * JFX Progress Bar                                                             *
@@ -826,6 +852,7 @@
 
 .jfx-text-field, .jfx-password-field, .jfx-text-area {
     -fx-background-color: -monet-surface-container-highest;
+    -fx-highlight-fill: -monet-primary;
     -fx-text-fill: -monet-on-surface;
     -fx-font-weight: BOLD;
     -fx-prompt-text-fill: -monet-on-surface-variant;
@@ -982,6 +1009,10 @@
     -fx-text-fill: -monet-on-surface;
 }
 
+.options-list-item .label.subtitle {
+    -fx-text-fill: -monet-on-surface-variant;
+}
+
 .options-list-item.no-padding {
     -fx-padding: 0;
 }
@@ -1194,28 +1225,62 @@
 *                                                                              *
 *******************************************************************************/
 
-.log-toggle:selected {
-    -fx-background-color: transparent;
+.log-toggle {
     -fx-border: 1px;
-    -fx-border-color: black;
-    -fx-text-fill: black;
+    -fx-border-color: -fixed-log-toggle-unselected;
+    -fx-text-fill: -fixed-log-toggle-unselected;
 }
 
-.log-toggle {
-    -fx-background-color: transparent;
+.log-toggle:selected {
     -fx-border: 1px;
-    -fx-border-color: gray;
-    -fx-text-fill: gray;
+    -fx-border-color: -fixed-log-toggle-selected;
+    -fx-text-fill: -fixed-log-toggle-selected;
+}
+
+.log-toggle.fatal {
+    -fx-background-color: -fixed-log-fatal;
+}
+
+.log-toggle.error {
+    -fx-background-color: -fixed-log-error;
+}
+
+.log-toggle.warn {
+    -fx-background-color: -fixed-log-warn;
+}
+
+.log-toggle.info {
+    -fx-background-color: -fixed-log-info;
+}
+
+.log-toggle.debug {
+    -fx-background-color: -fixed-log-debug;
+}
+
+.log-toggle.trace {
+    -fx-background-color: -fixed-log-trace;
+}
+
+.log-window-list-cell:selected {
+    -fx-background-color: -fixed-log-selected;
+}
+
+.log-window {
+    -fx-background-color: -monet-surface-container;
 }
 
 .log-window .scroll-bar .thumb {
-    -fx-fill: rgba(0, 0, 0, 0.5);
+    -fx-fill: -monet-surface-tint;
+}
+
+.log-window .jfx-button {
+    -fx-text-fill: -monet-on-surface;
 }
 
 .log-window-list-cell {
-    -fx-text-fill: black;
+    -fx-text-fill: -fixed-log-text-fill;
     -fx-border-width: 0 0 1 0;
-    -fx-border-color: #dddddd;
+    -fx-border-color: -monet-outline-variant;
 }
 
 .log-window-list-cell:empty {
@@ -1223,31 +1288,38 @@
 }
 
 .log-window-list-cell:fatal {
-    -fx-background-color: #F7A699;
+    -fx-text-fill: -fixed-log-text-fill;
+    -fx-background-color: -fixed-log-fatal;
 }
 
 .log-window-list-cell:error {
-    -fx-background-color: #FFCCBB;
+    -fx-text-fill: -fixed-log-text-fill;
+    -fx-background-color: -fixed-log-error;
 }
 
 .log-window-list-cell:warn {
-    -fx-background-color: #FFEECC;
+    -fx-text-fill: -fixed-log-text-fill;
+    -fx-background-color: -fixed-log-warn;
 }
 
 .log-window-list-cell:info {
-    -fx-background-color: #FFFFFF;
+    -fx-text-fill: -fixed-log-text-fill;
+    -fx-background-color: -fixed-log-info;
 }
 
 .log-window-list-cell:debug {
-    -fx-background-color: #EEE9E0;
+    -fx-text-fill: -fixed-log-text-fill;
+    -fx-background-color: -fixed-log-debug;
 }
 
 .log-window-list-cell:trace {
-    -fx-background-color: #EEE9E0;
+    -fx-text-fill: -fixed-log-text-fill;
+    -fx-background-color: -fixed-log-trace;
 }
 
 .log-window-list-cell:selected {
-    -fx-background-color: #C4C4C4;
+    -fx-text-fill: -fixed-log-text-fill;
+    -fx-background-color: -fixed-log-selected;
 }
 
 /*******************************************************************************
@@ -1360,6 +1432,10 @@
     -fx-fill: -monet-on-surface;
 }
 
+.jfx-combo-box .text-field {
+    -fx-text-fill: -monet-on-surface;
+}
+
 .combo-box-popup .list-view {
     -fx-background-color: -monet-surface-container;
 }
@@ -1405,17 +1481,6 @@
     -fx-min-height: 25px;
 }
 
-.jfx-color-picker > .jfx-rippler > .color-box {
-    -fx-background-color: -monet-primary-seed;
-    -fx-background-radius: 3px;
-    -fx-background-insets: 0px;
-}
-
-.jfx-color-picker > .jfx-rippler > .color-box:disabled {
-    -fx-background-color: transparent;
-}
-
-
 .color-palette-region {
 }
 
@@ -1439,6 +1504,116 @@
     -fx-max-width: 300;
 }
 
+.custom-color-dialog .tab .tab-label {
+    -fx-text-fill: -monet-on-surface;
+}
+
+.custom-color-dialog .tab .jfx-rippler {
+    -jfx-rippler-fill: -monet-on-surface;
+}
+
+.custom-color-dialog .tab-selected-line {
+    -fx-background-color: -monet-on-surface;
+}
+
+/*******************************************************************************
+ *                                                                             *
+ * Table View                                                                  *
+ *                                                                             *
+ ******************************************************************************/
+
+/* WE DEFINITELY NEED JFX TABLE-VIEW */
+
+.table-view {
+    -fx-padding: 3;
+    -fx-background-color: -monet-surface-container-low;
+}
+
+.table-view,
+.table-view .column-header,
+.table-view .filler,
+.table-view .column-header-background,
+.table-row-cell {
+    -fx-background-radius: 6;
+    -fx-border-radius: 6;
+}
+
+.table-view .column-header,
+.table-view .filler {
+    -fx-background-color: transparent;
+}
+
+.table-view .column-header-background {
+    -fx-background-color: -monet-surface-container-highest;
+}
+
+.table-row-cell {
+    -fx-background-color: -monet-surface-container;
+    -fx-table-cell-border-color: -monet-surface-container-lowest;
+}
+
+.table-row-cell:odd {
+    -fx-background-color: -monet-surface-container-high;
+}
+
+.table-cell {
+    -fx-background-color: transparent;
+    -fx-text-fill: -monet-on-surface;
+}
+
+.table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected {
+    -fx-background-color: -monet-secondary-container;
+}
+
+.table-view > .virtual-flow > .scroll-bar {
+    -fx-skin: "org.jackhuang.hmcl.ui.construct.FloatScrollBarSkin";
+}
+
+.table-view > .virtual-flow > .scroll-bar .track {
+    -fx-fill: transparent;
+}
+
+/*******************************************************************************
+ *                                                                             *
+ * JFX Tree View                                                               *
+ *                                                                             *
+ ******************************************************************************/
+
+.tree-view {
+    -fx-padding: 5;
+    -fx-background-radius: 6;
+    -fx-background-color: -monet-surface-container-low;
+    -fx-border-radius: 6;
+}
+
+.tree-cell {
+    -fx-padding: 5;
+    -fx-background-radius: 6;
+    -fx-background-color: transparent;
+    -fx-text-fill: -monet-on-surface;
+    -fx-border-radius: 6;
+}
+
+.tree-cell:focused {
+    -fx-background-color: -monet-secondary-container;
+}
+
+.tree-cell .arrow {
+    -fx-background-color: -monet-on-surface;
+}
+
+.tree-cell .jfx-rippler {
+    -jfx-rippler-disabled: true;
+}
+
+.tree-view > .virtual-flow > .scroll-bar {
+    -fx-skin: "org.jackhuang.hmcl.ui.construct.FloatScrollBarSkin";
+}
+
+.tree-view > .virtual-flow > .scroll-bar .track {
+    -fx-fill: transparent;
+}
+
 /*******************************************************************************
 *                                                                              *
 * JFX Decorator                                                                *
@@ -1454,14 +1629,9 @@
 }
 
 .jfx-decorator-title {
-    -fx-text-fill: -monet-on-primary-container;
     -fx-font-size: 14;
 }
 
-.jfx-decorator-title:transparent {
-    -fx-text-fill: black;
-}
-
 .window {
     -fx-background-color: transparent;
     -fx-padding: 8;
@@ -1485,7 +1655,6 @@
  * Scroll Bar			                                                       *
  *                                                                             *
  ******************************************************************************/
-/* unsued? */
 
 .scroll-bar:vertical > .track-background, .scroll-bar:horizontal > .track-background {
     -fx-background-color: #F1F1F1;
@@ -1518,6 +1687,14 @@
     -fx-shape: "M298 598l214-214 214 214h-428z";
 }
 
+.jfx-combo-box .scroll-bar {
+    -fx-skin: "org.jackhuang.hmcl.ui.construct.FloatScrollBarSkin";
+}
+
+.jfx-combo-box .scroll-bar .track {
+    -fx-fill: transparent;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Scroll Pane			                                                       *
@@ -1598,7 +1775,7 @@
 }
 
 .html-hyperlink {
-    -fx-fill: blue;
+    -fx-fill: -monet-primary;
 }
 
 .html-h1 {
@@ -1620,3 +1797,18 @@
 .html-italic {
     -fx-font-style: italic;
 }
+
+/*******************************************************************************
+ *                                                                             *
+ * Tooltip                                                                     *
+ *                                                                             *
+ ******************************************************************************/
+
+.tooltip {
+    -fx-text-fill: -monet-inverse-on-surface;
+    -fx-background-color: -monet-inverse-surface;
+}
+
+.tooltip .text {
+    -fx-fill: -monet-inverse-on-surface;
+}