使用 WebURL for Java 解析 URI (#6084 )

缓解离线皮肤 CSL 输入框打一个字弹窗一个 toast “操作失败” 问题 (#5789 )
支持断点续传 (#4558 )
2026-05-12 21:43:19 +08:00 · 2026-05-09 21:26:06 +08:00 · 2026-05-09 21:02:27 +08:00 · 2026-05-09 08:54:14 +08:00 · 2026-05-08 12:13:06 +08:00 · 2026-05-07 21:51:20 +08:00
299 changed files with 13738 additions and 5662 deletions
@@ -0,0 +1,3 @@
+code_review:
+  pull_request_opened:
+    code_review: false
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: QQ 群
+    url: https://docs.hmcl.net/groups.html
+    about: Hello Minecraft! Launcher 的官方 QQ 交流群。
@@ -14,9 +14,9 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'zulu'
          java-version: '17'
@@ -12,9 +12,9 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
    - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
      with:
        distribution: 'zulu'
        java-version: '17'
@@ -27,28 +27,30 @@ jobs:
      run: ./gradlew build --no-daemon --parallel
      env:
        MICROSOFT_AUTH_ID: ${{ secrets.MICROSOFT_AUTH_ID }}
-        MICROSOFT_AUTH_SECRET: ${{ secrets.MICROSOFT_AUTH_SECRET }}
        CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
    - name: Get short SHA
      run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
    - name: Upload JAR
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
      with:
        name: HMCL-${{ env.SHORT_SHA }}-jar
-        path: |
-          HMCL/build/libs/HMCL-*.jar
-          HMCL/build/libs/HMCL-*.jar.sha256
+        path: HMCL/build/libs/HMCL-*.jar
+        archive: false
    - name: Upload EXE
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
      with:
        name: HMCL-${{ env.SHORT_SHA }}-exe
-        path: |
-          HMCL/build/libs/HMCL-*.exe
-          HMCL/build/libs/HMCL-*.exe.sha256
+        path: HMCL/build/libs/HMCL-*.exe
+        archive: false
    - name: Upload SH
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
      with:
        name: HMCL-${{ env.SHORT_SHA }}-sh
-        path: |
-          HMCL/build/libs/HMCL-*.sh
-          HMCL/build/libs/HMCL-*.sh.sha256
+        path: HMCL/build/libs/HMCL-*.sh
+        archive: false
+    - name: Upload DEB
+      uses: actions/upload-artifact@v7
+      with:
+        name: HMCL-${{ env.SHORT_SHA }}-deb
+        path: HMCL/build/libs/HMCL-*.deb
+        archive: false
@@ -46,16 +46,20 @@ jobs:
          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"
+          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.deb"
+          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.deb.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')
+          export DEB_SHA256=$(cat HMCL-$HMCL_VERSION.deb.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
+          echo "$DEB_SHA256  HMCL-$HMCL_VERSION.deb" | sha256sum -c
      - name: Generate release note
        if: ${{ env.continue == 'true' }}
        run: |
@@ -67,6 +71,7 @@ jobs:
          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
+          echo "| [HMCL-$HMCL_VERSION.deb]($GH_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.deb) | \`$(cat HMCL-$HMCL_VERSION.deb.sha256)\` |"  >> RELEASE_NOTE
          
          # CNB Release Note
          echo "[更新日志](https://docs.hmcl.net/changelog/${{ matrix.channel }}.html#HMCL-$HMCL_VERSION)" >> CNB_RELEASE_NOTE
@@ -76,6 +81,8 @@ jobs:
          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
+          echo "| [HMCL-$HMCL_VERSION.deb]($CNB_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.deb) | \`$(cat HMCL-$HMCL_VERSION.deb.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
@@ -86,6 +93,7 @@ jobs:
            "HMCL-${{ env.HMCL_VERSION }}.exe" \
            "HMCL-${{ env.HMCL_VERSION }}.jar" \
            "HMCL-${{ env.HMCL_VERSION }}.sh" \
+            "HMCL-${{ env.HMCL_VERSION }}.deb" \
            --target "${{ env.HMCL_COMMIT_SHA }}" \
            --title "${{ env.HMCL_TAG_NAME }}" \
            --notes-file RELEASE_NOTE \
@@ -120,6 +128,9 @@ jobs:

           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"
+          
+          echo "Uploading HMCL-$HMCL_VERSION.deb"
+           ~/go/bin/git-cnb release asset-upload --repo="$CNB_REPO" --tag-name "$HMCL_TAG_NAME" --file-name "HMCL-$HMCL_VERSION.deb"
        env:
          CNB_TOKEN: ${{ secrets.CNB_SYNC_TOKEN }}
          CNB_REPO: HMCL-dev/HMCL
@@ -64,4 +64,10 @@ language-subtag-registry
 # test
 /hmcl.json
 /.hmcl.json
-/.hmcl/
+/.hmcl/
+
+# AI
+/.gemini/
+!/.gemini/config.yaml
+.codex
+/.gradle-*/
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="Hello Minecraft! Launcher&#10;Copyright (C) &amp;#36;today.year huangyuhui &lt;huanghongxun2008@126.com&gt; and contributors&#10;&#10;This program is free software: you can redistribute it and/or modify&#10;it under the terms of the GNU General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or&#10;(at your option) any later version.&#10;&#10;This program is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#10;GNU General Public License for more details.&#10;&#10;You should have received a copy of the GNU General Public License&#10;along with this program.  If not, see &lt;https://www.gnu.org/licenses/&gt;." />
+    <option name="myName" value="HMCL" />
+  </copyright>
+</component>
@@ -0,0 +1,8 @@
+<component name="CopyrightManager">
+  <settings default="HMCL">
+    <LanguageOptions name="JAVA">
+      <option name="fileTypeOverride" value="3" />
+      <option name="addBlankAfter" value="false" />
+    </LanguageOptions>
+  </settings>
+</component>
@@ -0,0 +1,27 @@
+# Java Code Style Requirements
+
+These rules apply to all Java code written or modified in this repository.
+
+## Nullability
+
+- Annotate every class with JetBrains Annotations `@NotNullByDefault`.
+- Any type, field, parameter, return value, local variable, or generic type argument that may be `null` must be explicitly annotated with `@Nullable`.
+- Nullability must never be implicit.
+
+## Immutability
+
+- Immutable arrays and collections must be explicitly annotated with JetBrains Annotations `@Unmodifiable` or `@UnmodifiableView` as appropriate.
+- For arrays, use type-use syntax such as `String @Unmodifiable []`.
+
+## Documentation
+
+- Every class, field, and method must have documentation.
+- Documentation must use `///` Markdown-style Javadoc comments.
+- Keep documentation accurate and specific to the actual behavior, constraints, and side effects.
+- Add concise implementation comments inside complex logic whenever they materially improve readability or explain non-obvious behavior.
+
+## Gradle
+
+- When invoking Gradle in this repository, always set `GRADLE_USER_HOME` to the workspace-local `.gradle-user-home` directory.
+- Prefer commands such as `./gradlew -g .gradle-user-home ...` or the equivalent environment-variable-based configuration.
+- When running Gradle `test` tasks, use a higher timeout of ten minutes.
@@ -6,6 +6,8 @@ import org.jackhuang.hmcl.gradle.l10n.CreateLanguageList
 import org.jackhuang.hmcl.gradle.l10n.CreateLocaleNamesResourceBundle
 import org.jackhuang.hmcl.gradle.l10n.UpsideDownTranslate
 import org.jackhuang.hmcl.gradle.mod.ParseModDataTask
+import org.jackhuang.hmcl.gradle.pack.CreateDeb
+import org.jackhuang.hmcl.gradle.pack.ReleaseType
 import org.jackhuang.hmcl.gradle.utils.PropertiesUtils
 import java.net.URI
 import java.nio.file.FileSystems
@@ -56,7 +58,8 @@ dependencies {
    implementation(project(":HMCLCore"))
    implementation(project(":HMCLBoot"))
    implementation("libs:JFoenix")
-    implementation(libs.twelvemonkeys.imageio.webp)
+    implementation(libs.jwebp)
+    implementation(libs.fxsvgimage)
    implementation(libs.java.info)
    implementation(libs.monet.fx)
    implementation(libs.nayuki.qrcodegen)
@@ -66,6 +69,7 @@ dependencies {
    }

    embedResources(libs.authlib.injector)
+    embedResources(libs.lwjgl.unsafe.agent)
 }

 fun digest(algorithm: String, bytes: ByteArray): ByteArray = MessageDigest.getInstance(algorithm).digest(bytes)
@@ -155,6 +159,7 @@ val hmclProperties = buildList {
    add("hmcl.microsoft.auth.id" to microsoftAuthId)
    add("hmcl.curseforge.apikey" to curseForgeApiKey)
    add("hmcl.authlib-injector.version" to libs.authlib.injector.get().version!!)
+    add("hmcl.lwjgl-unsafe-agent.version" to libs.lwjgl.unsafe.agent.get().version!!)
 }

 val hmclPropertiesFile = layout.buildDirectory.file("hmcl.properties")
@@ -192,7 +197,7 @@ tasks.shadowJar {
    exclude("META-INF/services/javax.imageio.spi.ImageInputStreamSpi")

    listOf(
-        "aix-*", "sunos-*", "openbsd-*", "dragonflybsd-*", "freebsd-*", "linux-*", "darwin-*",
+        "aix-*", "sunos-*", "openbsd-*", "dragonflybsd-*", "freebsd-*", "linux-*",
        "*-ppc", "*-ppc64le", "*-s390x", "*-armel",
    ).forEach { exclude("com/sun/jna/$it/**") }

@@ -248,20 +253,22 @@ tasks.processResources {
    }
 }

+fun artifactFile(ext: String) = jarPath.resolveSibling(jarPath.nameWithoutExtension + '.' + ext)
+
 val makeExecutables by tasks.registering {
    val extensions = listOf("exe", "sh")

    dependsOn(tasks.jar)

    inputs.file(jarPath)
-    outputs.files(extensions.map { File(jarPath.parentFile, jarPath.nameWithoutExtension + '.' + it) })
+    outputs.files(extensions.map { artifactFile(it) })

    doLast {
        val jarContent = jarPath.readBytes()

        ZipFile(jarPath).use { zipFile ->
            for (extension in extensions) {
-                val output = File(jarPath.parentFile, jarPath.nameWithoutExtension + '.' + extension)
+                val output = artifactFile(extension)
                val entry = zipFile.getEntry("assets/HMCLauncher.$extension")
                    ?: throw GradleException("HMCLauncher.$extension not found")

@@ -276,8 +283,31 @@ val makeExecutables by tasks.registering {
    }
 }

+val makeDeb by tasks.registering(CreateDeb::class) {
+    dependsOn(makeExecutables)
+
+    val debFile = layout.file(provider { artifactFile("deb") })
+
+    val debChannel = when (versionType) {
+        "stable" -> ReleaseType.STABLE
+        "dev" -> ReleaseType.DEVELOPMENT
+        else -> ReleaseType.NIGHTLY
+    }
+
+    version.set(project.version.toString())
+    releaseType.set(debChannel)
+    appShFile.set(layout.file(provider { artifactFile("sh") }))
+    iconFile.set(layout.projectDirectory.file("image/hmcl.png"))
+    outputFile.set(debFile)
+
+    doLast {
+        createChecksum(debFile.get().asFile)
+    }
+}
+
 tasks.build {
    dependsOn(makeExecutables)
+    dependsOn(makeDeb)
 }

 fun parseToolOptions(options: String?): MutableList<String> {
@@ -374,12 +404,14 @@ val upgradeTerracottaConfig = tasks.register<TerracottaConfigUpgradeTask>("upgra
    val destination = layout.projectDirectory.file("src/main/resources/assets/terracotta.json")
    val source = layout.projectDirectory.file("terracotta-template.json");

-    classifiers.set(listOf(
-        "windows-x86_64", "windows-arm64",
-        "macos-x86_64", "macos-arm64",
-        "linux-x86_64", "linux-arm64", "linux-loongarch64", "linux-riscv64",
-        "freebsd-x86_64"
-    ))
+    classifiers.set(
+        listOf(
+            "windows-x86_64", "windows-arm64",
+            "macos-x86_64", "macos-arm64",
+            "linux-x86_64", "linux-arm64", "linux-loongarch64", "linux-riscv64",
+            "freebsd-x86_64"
+        )
+    )

    version.set(libs.versions.terracotta)
    downloadURL.set($$"https://github.com/burningtnt/Terracotta/releases/download/v${version}/terracotta-${version}-${classifier}-pkg.tar.gz")
@@ -23,21 +23,13 @@ import com.jfoenix.controls.events.JFXDialogEvent;
 import com.jfoenix.converters.DialogTransitionConverter;
 import com.jfoenix.effects.JFXDepthManager;
 import com.jfoenix.transitions.CachedTransition;
-import javafx.animation.Interpolator;
-import javafx.animation.KeyFrame;
-import javafx.animation.KeyValue;
-import javafx.animation.Timeline;
-import javafx.animation.Transition;
+import javafx.animation.*;
 import javafx.beans.DefaultProperty;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ObjectPropertyBase;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.css.CssMetaData;
-import javafx.css.SimpleStyleableObjectProperty;
-import javafx.css.Styleable;
-import javafx.css.StyleableObjectProperty;
-import javafx.css.StyleableProperty;
+import javafx.css.*;
 import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.geometry.Pos;
@@ -49,7 +41,6 @@ import javafx.scene.image.WritableImage;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Background;
 import javafx.scene.layout.BackgroundFill;
-import javafx.scene.layout.CornerRadii;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
@@ -155,7 +146,6 @@ public class JFXDialog extends StackPane {
        });

        contentHolder = new StackPane();
-        contentHolder.setBackground(new Background(new BackgroundFill(Color.WHITE, new CornerRadii(2), null)));
        JFXDepthManager.setDepth(contentHolder, 4);
        contentHolder.setPickOnBounds(false);
        // ensure stackpane is never resized beyond it's preferred size
@@ -381,6 +371,14 @@ public class JFXDialog extends StackPane {
            setCycleDuration(Duration.seconds(0.4));
            setDelay(Duration.ZERO);
        }
+
+        @Override
+        protected void starting() {
+        }
+
+        @Override
+        protected void stopping() {
+        }
    }

    /***************************************************************************
@@ -20,8 +20,6 @@
 package com.jfoenix.controls;

 import com.jfoenix.skins.JFXProgressBarSkin;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.SimpleDoubleProperty;
 import javafx.scene.control.ProgressBar;
 import javafx.scene.control.Skin;

@@ -51,26 +49,18 @@ public class JFXProgressBar extends ProgressBar {
        return new JFXProgressBarSkin(this);
    }

+    private boolean smoothProgress = true;
+
+    public boolean isSmoothProgress() {
+        return smoothProgress;
+    }
+
+    public void setSmoothProgress(boolean smoothProgress) {
+        this.smoothProgress = smoothProgress;
+    }
+
    private void initialize() {
        setPrefWidth(200);
        getStyleClass().add(DEFAULT_STYLE_CLASS);
    }
-
-
-    private DoubleProperty secondaryProgress;
-
-    public DoubleProperty secondaryProgressProperty() {
-        if (secondaryProgress == null) {
-            secondaryProgress = new SimpleDoubleProperty(this, "secondaryProgress", INDETERMINATE_PROGRESS);
-        }
-        return secondaryProgress;
-    }
-
-    public double getSecondaryProgress() {
-        return secondaryProgress == null ? INDETERMINATE_PROGRESS : secondaryProgress.get();
-    }
-
-    public void setSecondaryProgress(double secondaryProgress) {
-        secondaryProgressProperty().set(secondaryProgress);
-    }
 }
@@ -231,10 +231,11 @@ public class JFXRippler extends StackPane {
     *
     * @return the ripple radius size
     */
-    protected double computeRippleRadius() {
-        double width2 = control.getLayoutBounds().getWidth() * control.getLayoutBounds().getWidth();
-        double height2 = control.getLayoutBounds().getHeight() * control.getLayoutBounds().getHeight();
-        return Math.min(Math.sqrt(width2 + height2), RIPPLE_MAX_RADIUS) * 1.1 + 5;
+    protected double computeRippleRadius(double centerX, double centerY) {
+        double dx = Math.max(centerX, control.getLayoutBounds().getWidth() - centerX);
+        double dy = Math.max(centerY, control.getLayoutBounds().getHeight() - centerY);
+
+        return (Math.sqrt(dx * dx + dy * dy) / 0.9) + 2;
    }

    protected void setOverLayBounds(Rectangle overlay) {
@@ -473,7 +474,7 @@ public class JFXRippler extends StackPane {
                super(centerX,
                        centerY,
                        getRipplerRadius() == Region.USE_COMPUTED_SIZE ?
-                                computeRippleRadius() : getRipplerRadius(), null);
+                                computeRippleRadius(centerX, centerY) : getRipplerRadius(), null);
                setCache(true);
                setCacheHint(CacheHint.SPEED);
                setCacheShape(true);
@@ -518,7 +519,7 @@ public class JFXRippler extends StackPane {
                        new KeyValue(opacityProperty(),
                                1,
                                RIPPLE_INTERPOLATOR)
-                ), new KeyFrame(Duration.millis(900), inKeyValues));
+                ), new KeyFrame(Duration.millis(600), inKeyValues));

                setScaleX(0);
                setScaleY(0);
@@ -31,6 +31,7 @@ import javafx.scene.control.Skin;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;

 /// JFXSpinner is the material design implementation of a loading spinner.
 ///
@@ -71,10 +72,10 @@ public class JFXSpinner extends ProgressIndicator {
    /// this control.
    private static final String DEFAULT_STYLE_CLASS = "jfx-spinner";

-    private static final double DEFAULT_RADIUS = 12.0;
+    private static final double DEFAULT_RADIUS = 16.0;

    /**
-     * specifies the radius of the spinner node, by default it's set to `12.0`
+     * specifies the radius of the spinner node, by default it's set to `16.0`
     */
    private StyleableDoubleProperty radius;

@@ -96,25 +97,8 @@ public class JFXSpinner extends ProgressIndicator {
        this.radiusProperty().set(radius);
    }

-    /// specifies from which angle the spinner should start spinning
-    private StyleableDoubleProperty startingAngle;
-
-    public final StyleableDoubleProperty startingAngleProperty() {
-        if (this.startingAngle == null) {
-            startingAngle = new SimpleStyleableDoubleProperty(StyleableProperties.STARTING_ANGLE,
-                    JFXSpinner.this,
-                    "startingAngle",
-                    0.0);
-        }
-        return this.startingAngle;
-    }
-
-    public final double getStartingAngle() {
-        return startingAngle != null ? startingAngle.get() : 0.0;
-    }
-
-    public final void setStartingAngle(final double startingAngle) {
-        this.startingAngleProperty().set(startingAngle);
+    public double getStartingAngle() {
+        return 360 - ThreadLocalRandom.current().nextDouble() * 720;
    }

    private static final class StyleableProperties {
@@ -128,21 +112,7 @@ public class JFXSpinner extends ProgressIndicator {

                    @Override
                    public StyleableDoubleProperty getStyleableProperty(JFXSpinner control) {
-                        return control.radius;
-                    }
-                };
-
-        private static final CssMetaData<JFXSpinner, Number> STARTING_ANGLE =
-                new CssMetaData<>("-jfx-starting-angle",
-                        SizeConverter.getInstance(), 0.0) {
-                    @Override
-                    public boolean isSettable(JFXSpinner control) {
-                        return control.startingAngle == null || !control.startingAngle.isBound();
-                    }
-
-                    @Override
-                    public StyleableDoubleProperty getStyleableProperty(JFXSpinner control) {
-                        return control.startingAngle;
+                        return control.radiusProperty();
                    }
                };

@@ -151,7 +121,7 @@ public class JFXSpinner extends ProgressIndicator {
        static {
            final List<CssMetaData<? extends Styleable, ?>> styleables =
                    new ArrayList<>(ProgressIndicator.getClassCssMetaData());
-            Collections.addAll(styleables, RADIUS, STARTING_ANGLE);
+            Collections.addAll(styleables, RADIUS);
            CHILD_STYLEABLES = List.copyOf(styleables);
        }
    }
@@ -88,6 +88,14 @@ public class JFXTextField extends TextField {
        useJFXContextMenu(this);
    }

+    // https://github.com/HMCL-dev/HMCL/issues/5822
+    // TODO: This method may no longer be needed after we update JFXTextFieldSkin
+    @Override
+    protected void layoutChildren() {
+        super.layoutChildren();
+        this.setNeedsLayout(false);
+    }
+
    /***************************************************************************
     *                                                                         *
     * Properties                                                              *
@@ -42,11 +42,11 @@ public final class JFXDepthManager {

    private static final DropShadow[] depth = new DropShadow[] {
            new DropShadow(BlurType.GAUSSIAN, Color.TRANSPARENT, 0, 0, 0, 0),
-            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.12), 4, 0, 0, 1),
-            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.16), 6, 0, 0, 2),
-            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.20), 10, 0, 0, 3),
-            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.24), 14, 0, 0, 4),
-            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.28), 20, 0, 0, 6)
+            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.12), 4, 0, 0, 0),
+            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.16), 8, 0, 0, 4),
+            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.20), 12, 0, 0, 4),
+            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.24), 16, 0, 0, 4),
+            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.28), 20, 0, 0, 8)
    };

    /**
@@ -0,0 +1,277 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.jfoenix.skins;
+
+import com.jfoenix.adapters.skins.ComboBoxListViewSkin;
+import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.controls.JFXComboBox;
+import com.jfoenix.transitions.CachedTransition;
+import javafx.animation.*;
+import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.ComboBoxBase;
+import javafx.scene.layout.*;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+import javafx.scene.text.Text;
+import javafx.scene.transform.Scale;
+import javafx.util.Duration;
+
+public class JFXComboBoxListViewSkin<T> extends ComboBoxListViewSkin<T> {
+    protected final ObjectProperty<Paint> promptTextFill;
+    private boolean invalid = true;
+    private final StackPane customPane;
+    private final StackPane line = new StackPane();
+    private final StackPane focusedLine = new StackPane();
+    private final Text promptText = new Text();
+    private final double initScale = 0.05;
+    private final Scale scale;
+    private final Timeline linesAnimation;
+    private ParallelTransition transition;
+    private CachedTransition promptTextUpTransition;
+    private CachedTransition promptTextDownTransition;
+    private CachedTransition promptTextColorTransition;
+    private final Scale promptTextScale;
+    private Paint oldPromptTextFill;
+    private final BooleanBinding usePromptText;
+
+    public JFXComboBoxListViewSkin(JFXComboBox<T> comboBox) {
+        super(comboBox);
+        this.scale = new Scale(this.initScale, 1.0F);
+        this.linesAnimation = new Timeline(new KeyFrame(Duration.ZERO, new KeyValue(this.scale.xProperty(), this.initScale, Interpolator.EASE_BOTH), new KeyValue(this.focusedLine.opacityProperty(), 0, Interpolator.EASE_BOTH)), new KeyFrame(Duration.millis(1.0F), new KeyValue(this.focusedLine.opacityProperty(), 1, Interpolator.EASE_BOTH)), new KeyFrame(Duration.millis(160.0F), new KeyValue(this.scale.xProperty(), 1, Interpolator.EASE_BOTH)));
+        this.promptTextScale = new Scale(1.0F, 1.0F, 0.0F, 0.0F);
+        this.promptTextFill = new SimpleObjectProperty(Color.valueOf("#B2B2B2"));
+        this.usePromptText = Bindings.createBooleanBinding(this::usePromptText, ((JFXComboBox) this.getSkinnable()).valueProperty(), this.getSkinnable().promptTextProperty());
+        this.getArrowButton().setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, null, null)));
+        this.promptText.textProperty().bind(comboBox.promptTextProperty());
+        this.promptText.fillProperty().bind(this.promptTextFill);
+        this.promptText.getStyleClass().addAll("text", "prompt-text");
+        this.promptText.getTransforms().add(this.promptTextScale);
+        if (!comboBox.isLabelFloat()) {
+            this.promptText.visibleProperty().bind(this.usePromptText);
+        }
+
+        this.customPane = new StackPane();
+        this.customPane.setMouseTransparent(true);
+        this.customPane.getStyleClass().add("combo-box-button-container");
+        this.customPane.backgroundProperty().bindBidirectional(this.getSkinnable().backgroundProperty());
+        this.customPane.setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, null, null)));
+        this.customPane.getChildren().add(this.promptText);
+        this.getChildren().add(0, this.customPane);
+        StackPane.setAlignment(this.promptText, Pos.CENTER_LEFT);
+        this.line.getStyleClass().add("input-line");
+        this.focusedLine.getStyleClass().add("input-focused-line");
+        this.getChildren().add(this.line);
+        this.getChildren().add(this.focusedLine);
+        this.line.setPrefHeight(1.0F);
+        this.line.setTranslateY(1.0F);
+        this.line.setManaged(false);
+        this.line.setBackground(new Background(new BackgroundFill(((JFXComboBox) this.getSkinnable()).getUnFocusColor(), CornerRadii.EMPTY, Insets.EMPTY)));
+        if (this.getSkinnable().isDisabled()) {
+            this.line.setBorder(new Border(new BorderStroke(((JFXComboBox) this.getSkinnable()).getUnFocusColor(), BorderStrokeStyle.DASHED, CornerRadii.EMPTY, new BorderWidths(1.0F))));
+            this.line.setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, CornerRadii.EMPTY, Insets.EMPTY)));
+        }
+
+        this.focusedLine.setPrefHeight(2.0F);
+        this.focusedLine.setTranslateY(0.0F);
+        this.focusedLine.setBackground(new Background(new BackgroundFill(((JFXComboBox) this.getSkinnable()).getFocusColor(), CornerRadii.EMPTY, Insets.EMPTY)));
+        this.focusedLine.setOpacity(0.0F);
+        this.focusedLine.getTransforms().add(this.scale);
+        this.focusedLine.setManaged(false);
+        if (comboBox.isEditable()) {
+            comboBox.getEditor().setStyle("-fx-background-color:TRANSPARENT;-fx-padding: 4 8 4 8");
+            comboBox.getEditor().promptTextProperty().unbind();
+            comboBox.getEditor().setPromptText(null);
+            comboBox.getEditor().textProperty().addListener((o, oldVal, newVal) -> {
+                this.usePromptText.invalidate();
+                comboBox.setValue(this.getConverter().fromString(newVal));
+            });
+        }
+
+        comboBox.labelFloatProperty().addListener((o, oldVal, newVal) -> {
+            if (newVal) {
+                this.promptText.visibleProperty().unbind();
+                JFXUtilities.runInFX(() -> this.createFloatingAnimation());
+            } else {
+                this.promptText.visibleProperty().bind(this.usePromptText);
+            }
+
+            this.createFocusTransition();
+        });
+        comboBox.focusColorProperty().addListener((o, oldVal, newVal) -> {
+            if (newVal != null) {
+                this.focusedLine.setBackground(new Background(new BackgroundFill(newVal, CornerRadii.EMPTY, Insets.EMPTY)));
+                if (((JFXComboBox) this.getSkinnable()).isLabelFloat()) {
+                    this.promptTextColorTransition = new CachedTransition(this.customPane, new Timeline(new KeyFrame(Duration.millis(1300.0F), new KeyValue(this.promptTextFill, newVal, Interpolator.EASE_BOTH)))) {
+                        {
+                            this.setDelay(Duration.millis(0.0F));
+                            this.setCycleDuration(Duration.millis(160.0F));
+                        }
+
+                        protected void starting() {
+                            super.starting();
+                            JFXComboBoxListViewSkin.this.oldPromptTextFill = JFXComboBoxListViewSkin.this.promptTextFill.get();
+                        }
+                    };
+                    this.transition = null;
+                }
+            }
+
+        });
+        comboBox.unFocusColorProperty().addListener((o, oldVal, newVal) -> {
+            if (newVal != null) {
+                this.line.setBackground(new Background(new BackgroundFill(newVal, CornerRadii.EMPTY, Insets.EMPTY)));
+            }
+
+        });
+        comboBox.disabledProperty().addListener((o, oldVal, newVal) -> {
+            this.line.setBorder(newVal ? new Border(new BorderStroke(((JFXComboBox) this.getSkinnable()).getUnFocusColor(), BorderStrokeStyle.DASHED, CornerRadii.EMPTY, new BorderWidths(this.line.getHeight()))) : Border.EMPTY);
+            this.line.setBackground(new Background(new BackgroundFill(newVal ? Color.TRANSPARENT : ((JFXComboBox) this.getSkinnable()).getUnFocusColor(), CornerRadii.EMPTY, Insets.EMPTY)));
+        });
+        comboBox.focusedProperty().addListener((o, oldVal, newVal) -> {
+            if (newVal) {
+                this.focus();
+            } else {
+                this.unFocus();
+            }
+
+        });
+        comboBox.valueProperty().addListener((o, oldVal, newVal) -> {
+            if (((JFXComboBox) this.getSkinnable()).isLabelFloat()) {
+                this.animateFloatingLabel(newVal != null && !newVal.toString().isEmpty());
+            }
+
+        });
+    }
+
+    protected void layoutChildren(double x, double y, double w, double h) {
+        super.layoutChildren(x, y, w, h);
+        this.customPane.resizeRelocate(x, y, w, h);
+        if (this.invalid) {
+            this.invalid = false;
+            if (!this.getSkinnable().isEditable()) {
+                Text javaPromptText = (Text) super.getDisplayNode().lookup(".text");
+                if (javaPromptText != null) {
+                    this.promptTextFill.set(javaPromptText.getFill());
+                }
+            }
+
+            this.createFloatingAnimation();
+            if (((ComboBoxBase) this.getSkinnable()).getValue() != null) {
+                this.animateFloatingLabel(true);
+            }
+        }
+
+        this.focusedLine.resizeRelocate(x, this.getSkinnable().getHeight(), w, this.focusedLine.prefHeight(-1.0F));
+        this.line.resizeRelocate(x, this.getSkinnable().getHeight(), w, this.line.prefHeight(-1.0F));
+        this.scale.setPivotX(w / (double) 2.0F);
+    }
+
+    private void createFloatingAnimation() {
+        this.promptTextUpTransition = new CachedTransition(this.customPane, new Timeline(new KeyFrame(Duration.millis(1300.0F), new KeyValue(this.promptText.translateYProperty(), -this.customPane.getHeight() + 6.05, Interpolator.EASE_BOTH), new KeyValue(this.promptTextScale.xProperty(), 0.85, Interpolator.EASE_BOTH), new KeyValue(this.promptTextScale.yProperty(), 0.85, Interpolator.EASE_BOTH)))) {
+            {
+                this.setDelay(Duration.millis(0.0F));
+                this.setCycleDuration(Duration.millis(240.0F));
+            }
+        };
+        this.promptTextColorTransition = new CachedTransition(this.customPane, new Timeline(new KeyFrame(Duration.millis(1300.0F), new KeyValue(this.promptTextFill, ((JFXComboBox) this.getSkinnable()).getFocusColor(), Interpolator.EASE_BOTH)))) {
+            {
+                this.setDelay(Duration.millis(0.0F));
+                this.setCycleDuration(Duration.millis(160.0F));
+            }
+
+            protected void starting() {
+                super.starting();
+                JFXComboBoxListViewSkin.this.oldPromptTextFill = JFXComboBoxListViewSkin.this.promptTextFill.get();
+            }
+        };
+        this.promptTextDownTransition = new CachedTransition(this.customPane, new Timeline(new KeyFrame(Duration.millis(1300.0F), new KeyValue(this.promptText.translateYProperty(), 0, Interpolator.EASE_BOTH), new KeyValue(this.promptTextScale.xProperty(), 1, Interpolator.EASE_BOTH), new KeyValue(this.promptTextScale.yProperty(), 1, Interpolator.EASE_BOTH)))) {
+            {
+                this.setDelay(Duration.millis(0.0F));
+                this.setCycleDuration(Duration.millis(240.0F));
+            }
+        };
+        this.promptTextDownTransition.setOnFinished((finish) -> {
+            this.promptText.setTranslateY(0.0F);
+            this.promptTextScale.setX(1.0F);
+            this.promptTextScale.setY(1.0F);
+        });
+    }
+
+    private void focus() {
+        if (this.transition == null) {
+            this.createFocusTransition();
+        }
+
+        this.transition.play();
+    }
+
+    private void animateFloatingLabel(boolean up) {
+        if (this.promptText == null) {
+            Platform.runLater(() -> this.animateFloatingLabel(up));
+        } else {
+            if (this.transition != null) {
+                this.transition.stop();
+                this.transition.getChildren().remove(this.promptTextUpTransition);
+                this.transition.getChildren().remove(this.promptTextColorTransition);
+                this.transition = null;
+            }
+
+            if (up && this.promptText.getTranslateY() == (double) 0.0F) {
+                this.promptTextDownTransition.stop();
+                this.promptTextUpTransition.play();
+                if (this.getSkinnable().isFocused()) {
+                    this.promptTextColorTransition.play();
+                }
+            } else if (!up) {
+                this.promptTextUpTransition.stop();
+                if (this.getSkinnable().isFocused()) {
+                    this.promptTextFill.set(this.oldPromptTextFill);
+                }
+
+                this.promptTextDownTransition.play();
+            }
+        }
+
+    }
+
+    private void createFocusTransition() {
+        this.transition = new ParallelTransition();
+        if (((JFXComboBox) this.getSkinnable()).isLabelFloat()) {
+            this.transition.getChildren().add(this.promptTextUpTransition);
+            this.transition.getChildren().add(this.promptTextColorTransition);
+        }
+
+        this.transition.getChildren().add(this.linesAnimation);
+    }
+
+    private void unFocus() {
+        if (this.transition != null) {
+            this.transition.stop();
+        }
+
+        this.scale.setX(this.initScale);
+        this.focusedLine.setOpacity(0.0F);
+        if (((JFXComboBox) this.getSkinnable()).isLabelFloat() && this.oldPromptTextFill != null) {
+            this.promptTextFill.set(this.oldPromptTextFill);
+            if (this.usePromptText()) {
+                this.promptTextDownTransition.play();
+            }
+        }
+
+    }
+
+    private boolean usePromptText() {
+        Object txt = ((JFXComboBox) this.getSkinnable()).getValue();
+        String promptTxt = this.getSkinnable().getPromptText();
+        return (txt == null || txt.toString().isEmpty()) && promptTxt != null && !promptTxt.isEmpty() && !this.promptTextFill.get().equals(Color.TRANSPARENT);
+    }
+}
@@ -40,12 +40,16 @@ import javafx.scene.layout.*;
 import javafx.scene.paint.Color;
 import javafx.stage.*;
 import javafx.util.Duration;
+import org.glavo.monetfx.ColorScheme;
 import org.jackhuang.hmcl.setting.StyleSheets;
+import org.jackhuang.hmcl.theme.Themes;
 import org.jackhuang.hmcl.util.StringUtils;

 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;

+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 /**
 * @author Shadi Shaheen
 */
@@ -78,7 +82,7 @@ public class JFXCustomColorPickerDialog extends StackPane {

        // create JFX Decorator
        pickerDecorator = new JFXDecorator(dialog, this, false, false, false);
-        pickerDecorator.setOnCloseButtonAction(this::updateColor);
+        pickerDecorator.setOnCloseButtonAction(this::close);
        pickerDecorator.setPickOnBounds(false);
        customScene = new Scene(pickerDecorator, Color.TRANSPARENT);
        StyleSheets.init(customScene);
@@ -153,6 +157,22 @@ public class JFXCustomColorPickerDialog extends StackPane {
            paraTransition.play();
        });

+        container.getChildren().add(tabs);
+
+        HBox actionsHBox = new HBox();
+        actionsHBox.getStyleClass().add("jfx-color-dialog-actions");
+
+        JFXButton acceptButton = new JFXButton(i18n("button.ok"));
+        acceptButton.setOnAction(event -> updateColor());
+        acceptButton.getStyleClass().add("jfx-color-dialog-accept");
+
+        JFXButton cancelButton = new JFXButton(i18n("button.cancel"));
+        cancelButton.setOnAction(event -> close());
+        cancelButton.getStyleClass().add("jfx-color-dialog-cancel");
+
+        actionsHBox.getChildren().addAll(acceptButton, cancelButton);
+        container.getChildren().add(actionsHBox);
+
        initRun = () -> {
            // change tabs labels font color according to the selected color
            pane.backgroundProperty().addListener((o, oldVal, newVal) -> {
@@ -179,7 +199,7 @@ public class JFXCustomColorPickerDialog extends StackPane {
                            (int) (newColor.getRed() * 255),
                            (int) (newColor.getGreen() * 255),
                            (int) (newColor.getBlue() * 255));
-                    String rgb = String.format("rgba(%d, %d, %d, 1)",
+                    String rgb = String.format("rgb(%d, %d, %d)",
                            (int) (newColor.getRed() * 255),
                            (int) (newColor.getGreen() * 255),
                            (int) (newColor.getBlue() * 255));
@@ -232,7 +252,13 @@ public class JFXCustomColorPickerDialog extends StackPane {
                hexField.focusColorProperty().bind(Bindings.createObjectBinding(() -> {
                    return pane.getBackground().getFills().get(0).getFill();
                }, pane.backgroundProperty()));
-
+                acceptButton.textFillProperty().bind(Bindings.createObjectBinding(() -> {
+                    Color fill = (Color) pane.getBackground().getFills().get(0).getFill();
+                    return ColorScheme.newBuilder(Themes.getColorScheme())
+                            .setPrimaryColorSeed(fill)
+                            .build()
+                            .getPrimary();
+                }, pane.backgroundProperty()));

                ((Pane) pickerDecorator.lookup(".jfx-decorator-buttons-container")).backgroundProperty()
                        .bind(Bindings.createObjectBinding(() -> {
@@ -262,9 +288,6 @@ public class JFXCustomColorPickerDialog extends StackPane {
            });
        };

-
-        container.getChildren().add(tabs);
-
        this.getChildren().add(container);
        this.setPadding(new Insets(0));

@@ -294,7 +317,11 @@ public class JFXCustomColorPickerDialog extends StackPane {
        if (!systemChange) {
            userChange = true;
            try {
-                curvedColorPicker.setColor(Color.valueOf(colorWebString));
+                Color color = Color.valueOf(colorWebString);
+                if (color.getOpacity() != 1.0) {
+                    color = Color.color(color.getRed(), color.getGreen(), color.getBlue());
+                }
+                curvedColorPicker.setColor(color);
            } catch (IllegalArgumentException ignored) {
                // if color is not valid then do nothing
            }
@@ -309,6 +336,9 @@ public class JFXCustomColorPickerDialog extends StackPane {

    public void setCurrentColor(Color currentColor) {
        this.currentColorProperty.set(currentColor);
+        if (curvedColorPicker != null && currentColor != null) {
+            curvedColorPicker.setColor(currentColor);
+        }
    }

    Color getCurrentColor() {
@@ -20,61 +20,38 @@
 package com.jfoenix.skins;

 import com.jfoenix.controls.JFXProgressBar;
-import com.jfoenix.utils.JFXNodeUtils;
 import com.jfoenix.utils.TreeShowingProperty;
 import javafx.animation.*;
-import javafx.geometry.Insets;
 import javafx.scene.Node;
-import javafx.scene.control.ProgressIndicator;
-import javafx.scene.control.skin.ProgressIndicatorSkin;
+import javafx.scene.control.SkinBase;
 import javafx.scene.layout.*;
-import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.animation.AnimationUtils;

 /// # Material Design ProgressBar Skin
 ///
 /// @author Shadi Shaheen
 /// @version 2.0
 /// @since 2017-10-06
-public class JFXProgressBarSkin extends ProgressIndicatorSkin {
+public class JFXProgressBarSkin extends SkinBase<JFXProgressBar> {

-    private StackPane track;
-    private StackPane secondaryBar;
-    private StackPane bar;
-    private double barWidth = 0;
-    private double secondaryBarWidth = 0;
-    private Timeline indeterminateTransition;
-    private Region clip;
+    private static final double DEFAULT_HEIGHT = 4;
+
+    private final StackPane track;
+    private final StackPane bar;
+    private final Rectangle clip;
+    private Animation transition;
    private final TreeShowingProperty treeShowingProperty;
+    private double fullWidth;

-    public JFXProgressBarSkin(JFXProgressBar bar) {
-        super(bar);
+    public JFXProgressBarSkin(JFXProgressBar control) {
+        super(control);

-        this.treeShowingProperty = new TreeShowingProperty(bar);
+        this.treeShowingProperty = new TreeShowingProperty(control);

-        bar.widthProperty().addListener(observable -> {
-            updateProgress();
-            updateSecondaryProgress();
-        });
-
-        registerChangeListener(bar.progressProperty(), (obs) -> updateProgress());
-        registerChangeListener(bar.secondaryProgressProperty(), obs -> updateSecondaryProgress());
-        registerChangeListener(bar.visibleProperty(), obs -> updateAnimation());
-        registerChangeListener(bar.parentProperty(), obs -> updateAnimation());
-        registerChangeListener(bar.sceneProperty(), obs -> updateAnimation());
-
-        unregisterChangeListeners(treeShowingProperty);
-        unregisterChangeListeners(bar.indeterminateProperty());
-
-        registerChangeListener(treeShowingProperty, obs -> this.updateAnimation());
-        registerChangeListener(bar.indeterminateProperty(), obs -> initialize());
-
-        initialize();
-
-        getSkinnable().requestLayout();
-    }
-
-    protected void initialize() {
+        registerChangeListener(treeShowingProperty, obs -> updateProgress(false));
+        registerChangeListener(control.progressProperty(), obs -> updateProgress(true));

        track = new StackPane();
        track.getStyleClass().setAll("track");
@@ -82,14 +59,14 @@ public class JFXProgressBarSkin extends ProgressIndicatorSkin {
        bar = new StackPane();
        bar.getStyleClass().setAll("bar");

-        secondaryBar = new StackPane();
-        secondaryBar.getStyleClass().setAll("secondary-bar");
+        clip = new Rectangle();
+        clip.setArcWidth(DEFAULT_HEIGHT);
+        clip.setArcHeight(DEFAULT_HEIGHT);
+        bar.setClip(clip);

-        clip = new Region();
-        clip.setBackground(new Background(new BackgroundFill(Color.BLACK, CornerRadii.EMPTY, Insets.EMPTY)));
-        bar.backgroundProperty().addListener(observable -> JFXNodeUtils.updateBackground(bar.getBackground(), clip));
+        getChildren().setAll(track, bar);

-        getChildren().setAll(track, secondaryBar, bar);
+        getSkinnable().requestLayout();
    }

    @Override
@@ -104,7 +81,7 @@ public class JFXProgressBarSkin extends ProgressIndicatorSkin {

    @Override
    protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return topInset + bar.prefHeight(width) + bottomInset;
+        return topInset + DEFAULT_HEIGHT + bottomInset;
    }

    @Override
@@ -120,105 +97,129 @@ public class JFXProgressBarSkin extends ProgressIndicatorSkin {
    @Override
    protected void layoutChildren(double x, double y, double w, double h) {
        track.resizeRelocate(x, y, w, h);
-        secondaryBar.resizeRelocate(x, y, secondaryBarWidth, h);
-        bar.resizeRelocate(x, y, getSkinnable().isIndeterminate() ? w : barWidth, h);
-        clip.resizeRelocate(0, 0, w, h);
+        bar.resizeRelocate(x, y, w, h);

-        if (getSkinnable().isIndeterminate()) {
-            createIndeterminateTimeline();
-            if (JFXNodeUtils.isTreeShowing(getSkinnable())) {
-                indeterminateTransition.play();
-            }
-            // apply clip
-            bar.setClip(clip);
-        } else if (indeterminateTransition != null) {
+        clip.relocate(0, 0);
+        clip.setWidth(0);
+        clip.setHeight(h);
+        clip.setTranslateX(0);
+
+        fullWidth = w;
+
+        clearAnimation();
+        updateProgress(false);
+    }
+
+    private boolean wasIndeterminate = false;
+
+    private void updateProgress(boolean playProgressAnimation) {
+        double progress = Math.min(getSkinnable().getProgress(), 1.0);
+        boolean isIndeterminate = progress < 0.0;
+        boolean isTreeShowing = treeShowingProperty.get();
+
+        if (isIndeterminate != wasIndeterminate) {
+            wasIndeterminate = isIndeterminate;
            clearAnimation();
-            // remove clip
-            bar.setClip(null);
+            clip.setTranslateX(0);
        }
-    }

-    protected void updateSecondaryProgress() {
-        final JFXProgressBar control = (JFXProgressBar) getSkinnable();
-        secondaryBarWidth = ((int) (control.getWidth() - snappedLeftInset() - snappedRightInset()) * 2
-                * Math.min(1, Math.max(0, control.getSecondaryProgress()))) / 2.0F;
-        control.requestLayout();
-    }
-
-    boolean wasIndeterminate = false;
-
-    protected void pauseTimeline(boolean pause) {
-        if (getSkinnable().isIndeterminate()) {
-            if (indeterminateTransition == null) {
-                createIndeterminateTimeline();
+        if (isIndeterminate) { // indeterminate
+            if (isTreeShowing) {
+                if (transition == null) {
+                    transition = createIndeterminateTransition();
+                    transition.playFromStart();
+                } else {
+                    transition.play();
+                }
+            } else if (transition != null) {
+                transition.pause();
            }
-            if (pause) {
-                indeterminateTransition.pause();
+        } else { // determinate
+            clearAnimation();
+            if (isTreeShowing && playProgressAnimation
+                    && AnimationUtils.isAnimationEnabled()
+                    && getSkinnable().isSmoothProgress()) {
+                transition = createDeterminateTransition(progress);
+                transition.playFromStart();
            } else {
-                indeterminateTransition.play();
+                clip.setWidth(computeBarWidth(progress));
            }
        }
    }

-    private void updateAnimation() {
-        final boolean isTreeShowing = treeShowingProperty.get();
-        if (indeterminateTransition != null) {
-            pauseTimeline(!isTreeShowing);
-        } else if (isTreeShowing) {
-            createIndeterminateTimeline();
-        }
+    private static final Duration INDETERMINATE_DURATION = Duration.seconds(1);
+
+    private Transition createIndeterminateTransition() {
+        double minWidth = 0;
+        double maxWidth = fullWidth * 0.4;
+        Transition transition = new Transition() {
+            {
+                setInterpolator(Interpolator.LINEAR);
+                setCycleDuration(INDETERMINATE_DURATION);
+            }
+
+            @Override
+            protected void interpolate(double frac) {
+                double currentWidth;
+
+                if (frac <= 0.5) {
+                    currentWidth = Interpolator.EASE_IN.interpolate(minWidth, maxWidth, frac / 0.5);
+                } else {
+                    currentWidth = Interpolator.EASE_OUT.interpolate(maxWidth, minWidth, (frac - 0.5) / 0.5);
+                }
+
+                double targetCenter;
+                if (frac <= 0.1) {
+                    targetCenter = 0.0;
+                } else if (frac >= 0.9) {
+                    targetCenter = fullWidth;
+                } else {
+                    targetCenter = ((frac - 0.1) / 0.8) * fullWidth;
+                }
+
+                clip.setWidth(currentWidth);
+                clip.setTranslateX(targetCenter - currentWidth / 2.0);
+            }
+        };
+
+        transition.setCycleCount(Timeline.INDEFINITE);
+        return transition;
    }

-    private void updateProgress() {
-        final ProgressIndicator control = getSkinnable();
-        final boolean isIndeterminate = control.isIndeterminate();
-        if (!(isIndeterminate && wasIndeterminate)) {
-            barWidth = ((int) (control.getWidth() - snappedLeftInset() - snappedRightInset()) * 2
-                    * Math.min(1, Math.max(0, control.getProgress()))) / 2.0F;
-            control.requestLayout();
-        }
-        wasIndeterminate = isIndeterminate;
-    }
+    private static final Duration DETERMINATE_DURATION = Duration.seconds(0.2);

-    private void createIndeterminateTimeline() {
-        if (indeterminateTransition != null) {
-            clearAnimation();
-        }
-        double dur = 1;
-        ProgressIndicator control = getSkinnable();
-        final double w = control.getWidth() - (snappedLeftInset() + snappedRightInset());
-        indeterminateTransition = new Timeline(new KeyFrame(
-                Duration.ZERO,
-                new KeyValue(clip.scaleXProperty(), 0.0, Interpolator.EASE_IN),
-                new KeyValue(clip.translateXProperty(), -w / 2, Interpolator.LINEAR)
-        ),
-                new KeyFrame(
-                        Duration.seconds(0.5 * dur),
-                        new KeyValue(clip.scaleXProperty(), 0.4, Interpolator.LINEAR)
-                ),
-                new KeyFrame(
-                        Duration.seconds(0.9 * dur),
-                        new KeyValue(clip.translateXProperty(), w / 2, Interpolator.LINEAR)
-                ),
-                new KeyFrame(
-                        Duration.seconds(1 * dur),
-                        new KeyValue(clip.scaleXProperty(), 0.0, Interpolator.EASE_OUT)
-                ));
-        indeterminateTransition.setCycleCount(Timeline.INDEFINITE);
+    private Timeline createDeterminateTransition(double targetProgress) {
+        Timeline timeline = new Timeline(
+                new KeyFrame(Duration.ZERO,
+                        new KeyValue(clip.widthProperty(), clip.getWidth(), Interpolator.EASE_OUT)),
+                new KeyFrame(DETERMINATE_DURATION,
+                        new KeyValue(clip.widthProperty(), computeBarWidth(targetProgress), Interpolator.EASE_OUT))
+        );
+        timeline.setOnFinished(e -> {
+            if (transition == timeline) {
+                transition = null;
+            }
+        });
+        return timeline;
    }

    private void clearAnimation() {
-        indeterminateTransition.stop();
-        indeterminateTransition.getKeyFrames().clear();
-        indeterminateTransition = null;
+        if (transition != null) {
+            transition.stop();
+            transition = null;
+        }
    }

    @Override
    public void dispose() {
        super.dispose();
        treeShowingProperty.dispose();
-        if (indeterminateTransition != null) {
-            clearAnimation();
-        }
+        clearAnimation();
+    }
+
+    private double computeBarWidth(double progress) {
+        assert progress >= 0 && progress <= 1;
+        double barWidth = ((int) fullWidth * 2 * progress) / 2.0;
+        return progress > 0 ? Math.max(barWidth, DEFAULT_HEIGHT) : barWidth;
    }
 }
@@ -20,25 +20,24 @@
 package com.jfoenix.skins;

 import com.jfoenix.controls.JFXSpinner;
-import com.jfoenix.utils.JFXNodeUtils;
 import com.jfoenix.utils.TreeShowingProperty;
 import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
 import javafx.scene.Group;
-import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.SkinBase;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
 import javafx.scene.shape.Arc;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.shape.StrokeLineCap;
-import javafx.scene.text.Font;
-import javafx.scene.text.Text;
 import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.animation.AnimationUtils;
+
+import java.util.ArrayList;
+import java.util.List;

 /// JFXSpinner material design skin
 ///
@@ -47,10 +46,7 @@ import javafx.util.Duration;
 /// @since 2017-09-25
 public class JFXSpinnerSkin extends SkinBase<JFXSpinner> {

-    private static final Color GREEN_COLOR = Color.valueOf("#0F9D58");
-    private static final Color RED_COLOR = Color.valueOf("#db4437");
-    private static final Color YELLOW_COLOR = Color.valueOf("#f4b400");
-    private static final Color BLUE_COLOR = Color.valueOf("#4285f4");
+    private static final double DEFAULT_STROKE_WIDTH = 4;

    private JFXSpinner control;
    private final TreeShowingProperty treeShowingProperty;
@@ -61,110 +57,62 @@ public class JFXSpinnerSkin extends SkinBase<JFXSpinner> {
    private Arc track;
    private final StackPane arcPane;
    private final Rectangle fillRect;
-    private double arcLength = -1;
-    private final Text text;
+
+    private final double startingAngle;

    public JFXSpinnerSkin(JFXSpinner control) {
        super(control);

        this.control = control;
        this.treeShowingProperty = new TreeShowingProperty(control);
+        this.startingAngle = control.getStartingAngle();

        arc = new Arc();
        arc.setManaged(false);
-        arc.setStartAngle(0);
        arc.setLength(180);
        arc.getStyleClass().setAll("arc");
        arc.setFill(Color.TRANSPARENT);
-        arc.setStrokeWidth(3);
+        arc.setStrokeWidth(DEFAULT_STROKE_WIDTH);
        arc.setStrokeLineCap(StrokeLineCap.ROUND);

        track = new Arc();
        track.setManaged(false);
-        track.setStartAngle(0);
        track.setLength(360);
-        track.setStrokeWidth(3);
+        track.setStrokeWidth(DEFAULT_STROKE_WIDTH);
        track.getStyleClass().setAll("track");
        track.setFill(Color.TRANSPARENT);

        fillRect = new Rectangle();
        fillRect.setFill(Color.TRANSPARENT);
-        text = new Text();
-        text.setStyle("-fx-font-size:null");
-        text.getStyleClass().setAll("text", "percentage");
-        final Group group = new Group(fillRect, track, arc, text);
+        final Group group = new Group(fillRect, track, arc);
        group.setManaged(false);
        arcPane = new StackPane(group);
        arcPane.setPrefSize(50, 50);
        getChildren().setAll(arcPane);

        // register listeners
-        registerChangeListener(control.indeterminateProperty(), obs -> initialize());
        registerChangeListener(control.progressProperty(), obs -> updateProgress());
-        registerChangeListener(treeShowingProperty, obs -> updateAnimation());
-        registerChangeListener(control.sceneProperty(), obs -> updateAnimation());
+        registerChangeListener(treeShowingProperty, obs -> updateProgress());
    }

-    private void initialize() {
-        if (getSkinnable().isIndeterminate()) {
-            if (timeline == null) {
-                createTransition();
-                if (JFXNodeUtils.isTreeShowing(getSkinnable())) {
+    private void updateProgress() {
+        double progress = Double.min(getSkinnable().getProgress(), 1.0);
+        if (progress < 0) { // indeterminate
+            boolean treeShowing = treeShowingProperty.get();
+            if (treeShowing) {
+                if (timeline == null) {
+                    timeline = createTransition();
+                    timeline.playFromStart();
+                } else {
                    timeline.play();
                }
+            } else if (timeline != null) {
+                timeline.pause();
            }
-        } else {
+        } else { // determinate
            clearAnimation();
            arc.setStartAngle(90);
-            updateProgress();
-        }
-    }
-
-    private KeyFrame[] getKeyFrames(double angle, double duration, Paint color) {
-        KeyFrame[] frames = new KeyFrame[4];
-        frames[0] = new KeyFrame(Duration.seconds(duration),
-                new KeyValue(arc.lengthProperty(), 5, Interpolator.LINEAR),
-                new KeyValue(arc.startAngleProperty(),
-                        angle + 45 + control.getStartingAngle(),
-                        Interpolator.LINEAR));
-        frames[1] = new KeyFrame(Duration.seconds(duration + 0.4),
-                new KeyValue(arc.lengthProperty(), 250, Interpolator.LINEAR),
-                new KeyValue(arc.startAngleProperty(),
-                        angle + 90 + control.getStartingAngle(),
-                        Interpolator.LINEAR));
-        frames[2] = new KeyFrame(Duration.seconds(duration + 0.7),
-                new KeyValue(arc.lengthProperty(), 250, Interpolator.LINEAR),
-                new KeyValue(arc.startAngleProperty(),
-                        angle + 135 + control.getStartingAngle(),
-                        Interpolator.LINEAR));
-        frames[3] = new KeyFrame(Duration.seconds(duration + 1.1),
-                new KeyValue(arc.lengthProperty(), 5, Interpolator.LINEAR),
-                new KeyValue(arc.startAngleProperty(),
-                        angle + 435 + control.getStartingAngle(),
-                        Interpolator.LINEAR),
-                new KeyValue(arc.strokeProperty(), color, Interpolator.EASE_BOTH));
-        return frames;
-    }
-
-    private void pauseTimeline(boolean pause) {
-        if (getSkinnable().isIndeterminate()) {
-            if (timeline == null) {
-                createTransition();
-            }
-            if (pause) {
-                timeline.pause();
-            } else {
-                timeline.play();
-            }
-        }
-    }
-
-    private void updateAnimation() {
-        final boolean isTreeShowing = treeShowingProperty.get();
-        if (timeline != null) {
-            pauseTimeline(!isTreeShowing);
-        } else if (isTreeShowing) {
-            createTransition();
+            arc.setLength(-360 * progress);
        }
    }

@@ -214,7 +162,7 @@ public class JFXSpinnerSkin extends SkinBase<JFXSpinner> {
    @Override
    protected void layoutChildren(double contentX, double contentY, double contentWidth, double contentHeight) {
        final double strokeWidth = arc.getStrokeWidth();
-        final double radius = Math.min(contentWidth, contentHeight) / 2 - strokeWidth / 2;
+        double radius = control.getRadius();
        final double arcSize = snapSizeX(radius * 2 + strokeWidth);

        arcPane.resizeRelocate((contentWidth - arcSize) / 2 + 1, (contentHeight - arcSize) / 2 + 1, arcSize, arcSize);
@@ -224,21 +172,9 @@ public class JFXSpinnerSkin extends SkinBase<JFXSpinner> {
        fillRect.setHeight(arcSize);

        if (!isValid) {
-            initialize();
+            updateProgress();
            isValid = true;
        }
-
-        if (!getSkinnable().isIndeterminate()) {
-            arc.setLength(arcLength);
-            if (text.isVisible()) {
-                final double progress = control.getProgress();
-                int intProgress = (int) Math.round(progress * 100.0);
-                Font font = text.getFont();
-                text.setFont(Font.font(font.getFamily(), radius / 1.7));
-                text.setText((progress > 1 ? 100 : intProgress) + "%");
-                text.relocate((arcSize - text.getLayoutBounds().getWidth()) / 2, (arcSize - text.getLayoutBounds().getHeight()) / 2);
-            }
-        }
    }

    private void updateArcLayout(double radius, double arcSize) {
@@ -254,66 +190,64 @@ public class JFXSpinnerSkin extends SkinBase<JFXSpinner> {
        track.setStrokeWidth(arc.getStrokeWidth());
    }

-    boolean wasIndeterminate = false;
-
-    protected void updateProgress() {
-        final ProgressIndicator control = getSkinnable();
-        final boolean isIndeterminate = control.isIndeterminate();
-        if (!(isIndeterminate && wasIndeterminate)) {
-            arcLength = -360 * control.getProgress();
-            control.requestLayout();
-        }
-        wasIndeterminate = isIndeterminate;
-    }
-
-    private void createTransition() {
-        if (!getSkinnable().isIndeterminate()) return;
-        final Paint initialColor = arc.getStroke();
-        if (initialColor == null) {
-            arc.setStroke(BLUE_COLOR);
-        }
-
-        KeyFrame[] blueFrame = getKeyFrames(0, 0, initialColor == null ? BLUE_COLOR : initialColor);
-        KeyFrame[] redFrame = getKeyFrames(450, 1.4, initialColor == null ? RED_COLOR : initialColor);
-        KeyFrame[] yellowFrame = getKeyFrames(900, 2.8, initialColor == null ? YELLOW_COLOR : initialColor);
-        KeyFrame[] greenFrame = getKeyFrames(1350, 4.2, initialColor == null ? GREEN_COLOR : initialColor);
-
-        KeyFrame endingFrame = new KeyFrame(Duration.seconds(5.6),
+    private void addKeyFrames(List<KeyFrame> frames, double angle, double duration) {
+        frames.add(new KeyFrame(Duration.seconds(duration),
                new KeyValue(arc.lengthProperty(), 5, Interpolator.LINEAR),
                new KeyValue(arc.startAngleProperty(),
-                        1845 + control.getStartingAngle(),
-                        Interpolator.LINEAR));
+                        angle + 45 + startingAngle,
+                        Interpolator.LINEAR)));
+        frames.add(new KeyFrame(Duration.seconds(duration + 0.4),
+                new KeyValue(arc.lengthProperty(), 250, Interpolator.LINEAR),
+                new KeyValue(arc.startAngleProperty(),
+                        angle + 90 + startingAngle,
+                        Interpolator.LINEAR)));
+        frames.add(new KeyFrame(Duration.seconds(duration + 0.7),
+                new KeyValue(arc.lengthProperty(), 250, Interpolator.LINEAR),
+                new KeyValue(arc.startAngleProperty(),
+                        angle + 135 + startingAngle,
+                        Interpolator.LINEAR)));
+        frames.add(new KeyFrame(Duration.seconds(duration + 1.1),
+                new KeyValue(arc.lengthProperty(), 5, Interpolator.LINEAR),
+                new KeyValue(arc.startAngleProperty(),
+                        angle + 435 + startingAngle,
+                        Interpolator.LINEAR)));
+    }

-        if (timeline != null) {
-            timeline.stop();
-            timeline.getKeyFrames().clear();
+    private Timeline createTransition() {
+        Timeline timeline;
+        if (AnimationUtils.isAnimationEnabled()) {
+            var keyFrames = new ArrayList<KeyFrame>(17);
+            addKeyFrames(keyFrames, 0, 0);
+            addKeyFrames(keyFrames, 450, 1.4);
+            addKeyFrames(keyFrames, 900, 2.8);
+            addKeyFrames(keyFrames, 1350, 4.2);
+            keyFrames.add(new KeyFrame(Duration.seconds(5.6),
+                    new KeyValue(arc.lengthProperty(), 5, Interpolator.LINEAR),
+                    new KeyValue(arc.startAngleProperty(),
+                            1845 + startingAngle,
+                            Interpolator.LINEAR)));
+
+            timeline = new Timeline();
+            timeline.getKeyFrames().setAll(keyFrames);
+        } else {
+            final double arcLength = 250;
+            timeline = new Timeline(
+                    new KeyFrame(Duration.ZERO,
+                            new KeyValue(arc.startAngleProperty(), 45 + startingAngle, Interpolator.LINEAR),
+                            new KeyValue(arc.lengthProperty(), arcLength, Interpolator.DISCRETE)),
+                    new KeyFrame(Duration.seconds(1.2),
+                            new KeyValue(arc.startAngleProperty(), 45 + 360 + startingAngle, Interpolator.LINEAR),
+                            new KeyValue(arc.lengthProperty(), arcLength, Interpolator.DISCRETE))
+            );
        }
-        timeline = new Timeline(blueFrame[0],
-                blueFrame[1],
-                blueFrame[2],
-                blueFrame[3],
-                redFrame[0],
-                redFrame[1],
-                redFrame[2],
-                redFrame[3],
-                yellowFrame[0],
-                yellowFrame[1],
-                yellowFrame[2],
-                yellowFrame[3],
-                greenFrame[0],
-                greenFrame[1],
-                greenFrame[2],
-                greenFrame[3],
-                endingFrame);
+
        timeline.setCycleCount(Timeline.INDEFINITE);
-        timeline.setDelay(Duration.ZERO);
-        timeline.playFromStart();
+        return timeline;
    }

    private void clearAnimation() {
        if (timeline != null) {
            timeline.stop();
-            timeline.getKeyFrames().clear();
            timeline = null;
        }
    }
@@ -25,6 +25,7 @@ import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.JarUtils;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;

+import javax.swing.JOptionPane;
 import java.io.IOException;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -49,6 +50,8 @@ public final class EntryPoint {
        createHMCLDirectories();
        LOG.start(Metadata.HMCL_CURRENT_DIRECTORY.resolve("logs"));

+        checkWine();
+
        setupJavaFXVMOptions();

        if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
@@ -220,6 +223,20 @@ public final class EntryPoint {
        }
    }

+    private static void checkWine() {
+        if (OperatingSystem.isRunningUnderWine()) {
+            SwingUtils.initLookAndFeel();
+            LOG.warning("HMCL is running under Wine or its distributions!");
+
+            int result = JOptionPane.showOptionDialog(null, i18n("fatal.wine_warning"), i18n("message.warning"), JOptionPane.OK_CANCEL_OPTION,
+                    JOptionPane.WARNING_MESSAGE, null, null, null);
+
+            if (result == JOptionPane.CANCEL_OPTION || result == JOptionPane.CLOSED_OPTION) {
+                exit(1);
+            }
+        }
+    }
+
    private static void addEnableNativeAccess() {
        if (JavaRuntime.CURRENT_VERSION > 21) {
            try {
@@ -17,35 +17,34 @@
 */
 package org.jackhuang.hmcl;

+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
 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.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.DataFormat;
 import javafx.stage.Screen;
 import javafx.stage.Stage;
+import javafx.util.Duration;
 import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.setting.SambaException;
-import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.util.FileSaver;
 import org.jackhuang.hmcl.task.AsyncTaskExecutor;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.theme.Themes;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.upgrade.UpdateHandler;
-import org.jackhuang.hmcl.util.CrashReporter;
-import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.io.JarUtils;
-import org.jackhuang.hmcl.util.platform.Architecture;
-import org.jackhuang.hmcl.util.platform.CommandBuilder;
-import org.jackhuang.hmcl.util.platform.NativeUtils;
-import org.jackhuang.hmcl.util.platform.OperatingSystem;
-import org.jackhuang.hmcl.util.platform.SystemInfo;
+import org.jackhuang.hmcl.util.platform.*;

 import java.io.File;
 import java.io.IOException;
@@ -65,8 +64,8 @@ import java.util.concurrent.TimeUnit;

 import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.DataSizeUnit.MEGABYTES;
-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 final class Launcher extends Application {
    public static final CookieManager COOKIE_MANAGER = new CookieManager();
@@ -111,7 +110,7 @@ public final class Launcher extends Application {
            if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS
                    && ConfigHolder.isNewlyCreated()
                    && System.getProperty("user.dir").startsWith("/private/var/folders/")) {
-                if (showAlert(AlertType.WARNING, i18n("fatal.mac_app_translocation"), ButtonType.YES, ButtonType.NO) == ButtonType.NO)
+                if (!confirmWithCountdown(AlertType.WARNING, i18n("fatal.mac_app_translocation"), 5))
                    return;
            } else {
                checkConfigInTempDir();
@@ -137,6 +136,9 @@ public final class Launcher extends Application {
                Platform.setImplicitExit(false);
                Controllers.initialize(primaryStage);

+                if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS)
+                    Themes.applyNativeDarkMode(primaryStage);
+
                UpdateChecker.init();

                primaryStage.show();
@@ -182,6 +184,27 @@ public final class Launcher extends Application {
        return new Alert(alertType, contentText, buttons).showAndWait().orElse(null);
    }

+    private static boolean confirmWithCountdown(Alert.AlertType alertType, String contentText, int seconds) {
+        Alert alert = new Alert(alertType, contentText, ButtonType.YES, ButtonType.NO);
+        Button okButton = (Button) alert.getDialogPane().lookupButton(ButtonType.YES);
+
+        okButton.setDisable(true);
+
+        KeyFrame[] keyFrames = new KeyFrame[seconds + 1];
+        for (int i = 0; i < seconds; i++) {
+            keyFrames[i] = new KeyFrame(Duration.seconds(i),
+                    new KeyValue(okButton.textProperty(), i18n("button.ok.countdown", seconds - i)));
+        }
+        keyFrames[seconds] = new KeyFrame(Duration.seconds(seconds),
+                new KeyValue(okButton.textProperty(), i18n("button.ok")),
+                new KeyValue(okButton.disableProperty(), false));
+
+        Timeline timeline = new Timeline(keyFrames);
+        alert.setOnShown(e -> timeline.play());
+        alert.setOnCloseRequest(e -> timeline.stop());
+        return alert.showAndWait().orElse(null) == ButtonType.YES;
+    }
+
    private static boolean isConfigInTempDir() {
        String configPath = ConfigHolder.configLocation().toString();

@@ -221,7 +244,7 @@ public final class Launcher extends Application {

    private static void checkConfigInTempDir() {
        if (ConfigHolder.isNewlyCreated() && isConfigInTempDir()
-                && showAlert(AlertType.WARNING, i18n("fatal.config_in_temp_dir"), ButtonType.YES, ButtonType.NO) == ButtonType.NO) {
+                && !confirmWithCountdown(AlertType.WARNING, i18n("fatal.config_in_temp_dir"), 5)) {
            EntryPoint.exit(0);
        }
    }
@@ -321,6 +344,8 @@ public final class Launcher extends Application {
                LOG.info("XDG Current Desktop: " + System.getenv("XDG_CURRENT_DESKTOP"));
            }

+            LOG.info("Zlib Compatible: " + ZlibUtils.IS_ZLIB_COMPATIBLE);
+
            Lang.thread(SystemInfo::initialize, "Detection System Information", true);

            launch(Launcher.class, args);
@@ -24,7 +24,6 @@ import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jetbrains.annotations.Nullable;

 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.EnumSet;

 /**
@@ -46,9 +45,9 @@ public final class Metadata {
    public static final int RECOMMENDED_JAVA_VERSION = 21;

    public static final String PUBLISH_URL = "https://hmcl.huangyuhui.net";
-    public static final String ABOUT_URL = PUBLISH_URL + "/about";
    public static final String DOWNLOAD_URL = PUBLISH_URL + "/download";
    public static final String HMCL_UPDATE_URL = System.getProperty("hmcl.update_source.override", PUBLISH_URL + "/api/update_link");
+    public static final String MANUAL_UPDATE_URL = "https://github.com/HMCL-dev/HMCL/releases";

    public static final String DOCS_URL = "https://docs.hmcl.net";
    public static final String CONTACT_URL = DOCS_URL + "/help.html";
@@ -59,34 +58,38 @@ public final class Metadata {
    public static final String BUILD_CHANNEL = JarUtils.getAttribute("hmcl.version.type", "nightly");
    public static final String GITHUB_SHA = JarUtils.getAttribute("hmcl.version.hash", null);

-    public static final Path CURRENT_DIRECTORY = Paths.get(System.getProperty("user.dir")).toAbsolutePath().normalize();
+    public static final Path CURRENT_DIRECTORY = Path.of(System.getProperty("user.dir")).toAbsolutePath().normalize();
    public static final Path MINECRAFT_DIRECTORY = OperatingSystem.getWorkingDirectory("minecraft");
    public static final Path HMCL_GLOBAL_DIRECTORY;
    public static final Path HMCL_CURRENT_DIRECTORY;
    public static final Path DEPENDENCIES_DIRECTORY;

    static {
-        String hmclHome = System.getProperty("hmcl.home");
-        if (hmclHome == null) {
+        String hmclHome = System.getProperty("hmcl.home", System.getenv("HMCL_USER_HOME"));
+        if (StringUtils.isBlank(hmclHome)) {
            if (OperatingSystem.CURRENT_OS.isLinuxOrBSD()) {
                String xdgData = System.getenv("XDG_DATA_HOME");
                if (StringUtils.isNotBlank(xdgData)) {
-                    HMCL_GLOBAL_DIRECTORY = Paths.get(xdgData, "hmcl").toAbsolutePath().normalize();
+                    HMCL_GLOBAL_DIRECTORY = Path.of(xdgData, "hmcl").toAbsolutePath().normalize();
                } else {
-                    HMCL_GLOBAL_DIRECTORY = Paths.get(System.getProperty("user.home"), ".local", "share", "hmcl").toAbsolutePath().normalize();
+                    HMCL_GLOBAL_DIRECTORY = Path.of(System.getProperty("user.home"), ".local", "share", "hmcl").toAbsolutePath().normalize();
                }
            } else {
                HMCL_GLOBAL_DIRECTORY = OperatingSystem.getWorkingDirectory("hmcl");
            }
        } else {
-            HMCL_GLOBAL_DIRECTORY = Paths.get(hmclHome).toAbsolutePath().normalize();
+            HMCL_GLOBAL_DIRECTORY = Path.of(hmclHome).toAbsolutePath().normalize();
        }

-        String hmclCurrentDir = System.getProperty("hmcl.dir");
-        HMCL_CURRENT_DIRECTORY = hmclCurrentDir != null
-                ? Paths.get(hmclCurrentDir).toAbsolutePath().normalize()
+        String hmclCurrentDir = System.getProperty("hmcl.dir", System.getenv("HMCL_LOCAL_HOME"));
+        HMCL_CURRENT_DIRECTORY = StringUtils.isNotBlank(hmclCurrentDir)
+                ? Path.of(hmclCurrentDir).toAbsolutePath().normalize()
                : CURRENT_DIRECTORY.resolve(".hmcl");
-        DEPENDENCIES_DIRECTORY = HMCL_CURRENT_DIRECTORY.resolve("dependencies");
+
+        String hmclDependencies = System.getProperty("hmcl.dependencies.dir", System.getenv("HMCL_DEPENDENCIES_DIR"));
+        DEPENDENCIES_DIRECTORY = StringUtils.isNotBlank(hmclDependencies)
+                ? Path.of(hmclDependencies).toAbsolutePath().normalize()
+                : HMCL_CURRENT_DIRECTORY.resolve("dependencies");
    }

    public static boolean isStable() {
@@ -1,3 +1,20 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 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.countly;

 import org.jackhuang.hmcl.Metadata;
@@ -21,12 +21,16 @@ import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.launch.DefaultLauncher;
 import org.jackhuang.hmcl.launch.ProcessListener;
+import org.jackhuang.hmcl.util.NativePatcher;
 import org.jackhuang.hmcl.util.i18n.LocaleUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.io.JarUtils;
+import org.jackhuang.hmcl.util.platform.CommandBuilder;
 import org.jackhuang.hmcl.util.platform.ManagedProcess;
 import org.jackhuang.hmcl.util.versioning.GameVersionNumber;

 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.*;
 import java.util.*;
 import java.util.stream.Stream;
@@ -150,4 +154,60 @@ public final class HMCLGameLauncher extends DefaultLauncher {
        generateOptionsTxt();
        super.makeLaunchScript(scriptFile);
    }
+
+    @Override
+    protected void appendJvmArgs(CommandBuilder result) {
+        super.appendJvmArgs(result);
+
+        if (config().getAllowAutoAgent()
+                && !options.isNoGeneratedJVMArgs()
+                && !options.isNoGeneratedOptimizingJVMArgs()
+                && NativePatcher.needPatchMemoryUtil(version, options.getJava().getParsedVersion())) {
+            LOG.info("Attempting to patch game with lwjgl-unsafe-agent");
+            try {
+                result.add("-javaagent:" + extractLwjglUnsafeAgent());
+            } catch (Exception e) {
+                LOG.warning("Failed to extract lwjgl-unsafe-agent", e);
+            }
+        }
+    }
+
+    private Path extractLwjglUnsafeAgent() throws IOException {
+        String agentVersion = JarUtils.getAttribute("hmcl.lwjgl-unsafe-agent.version", null);
+        if (agentVersion == null) {
+            throw new IOException("Missing hmcl.lwjgl-unsafe-agent.version attribute");
+        }
+
+        Library library = new Library(new Artifact("org.glavo", "lwjgl-unsafe-agent", agentVersion));
+        String fileName = library.getArtifact().getFileName();
+
+        Path agentPath = repository.getLibraryFile(version, library).toAbsolutePath().normalize();
+        if (agentPath.toString().contains("=")) {
+            throw new IOException("Invalid library path: " + agentPath);
+        }
+
+        byte[] bytes;
+        try (InputStream input = DefaultLauncher.class.getResourceAsStream("/assets/" + fileName)) {
+            if (input == null) {
+                throw new IOException("/assets/" + fileName + " not found");
+            }
+
+            bytes = input.readAllBytes();
+        }
+
+        if (Files.isRegularFile(agentPath)) {
+            try {
+                if (Files.size(agentPath) == bytes.length) {
+                    return agentPath;
+                }
+            } catch (IOException e) {
+                LOG.warning("Failed to check size of " + agentPath, e);
+            }
+        }
+
+        Files.createDirectories(agentPath.getParent());
+        FileUtils.saveSafely(agentPath, output -> output.write(bytes));
+        return agentPath;
+    }
+
 }
@@ -310,7 +310,7 @@ public final class HMCLGameRepository extends DefaultGameRepository {
            Optional<Path> iconFile = getVersionIconFile(id);
            if (iconFile.isPresent()) {
                try {
-                    return FXUtils.loadImage(iconFile.get());
+                    return FXUtils.loadImage(iconFile.get(), 64, 64, true, true);
                } catch (Exception e) {
                    LOG.warning("Failed to load version icon of " + id, e);
                }
@@ -430,6 +430,7 @@ public final class HMCLGameRepository extends DefaultGameRepository {
                .setNativesDirType(vs.getNativesDirType())
                .setNativesDir(vs.getNativesDir())
                .setProcessPriority(vs.getProcessPriority())
+                .setGraphicsBackend(vs.getGraphicsBackend())
                .setRenderer(vs.getRenderer())
                .setEnableDebugLogOutput(vs.isEnableDebugLogOutput())
                .setUseNativeGLFW(vs.isUseNativeGLFW())
@@ -514,7 +515,7 @@ public final class HMCLGameRepository extends DefaultGameRepository {
                FORBIDDEN_VERSION_IDS.contains(id.toLowerCase(Locale.ROOT)))
            return false;

-        return FileUtils.isNameValid(id);
+        return FileUtils.isNameValidForJar(id);
    }

    /**
@@ -65,16 +65,18 @@ import java.util.stream.Collectors;

 import static javafx.application.Platform.runLater;
 import static javafx.application.Platform.setImplicitExit;
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.DataSizeUnit.MEGABYTES;
 import static org.jackhuang.hmcl.util.Lang.resolveException;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.platform.Platform.SYSTEM_PLATFORM;
-import static org.jackhuang.hmcl.util.platform.Platform.isCompatibleWithX86Java;

 public final class LauncherHelper {

+    private static final String LWJGL_3_4_1_TIP = "lwjgl3.4.1-ffm";
+
    private final Profile profile;
    private Account account;
    private final String selectedVersion;
@@ -170,33 +172,55 @@ public final class LauncherHelper {
                                }
                            }),
                            Task.composeAsync(() -> {
-                                Renderer renderer = setting.getRenderer();
-                                if (renderer != Renderer.DEFAULT && OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
-                                    Library lib = NativePatcher.getWindowsMesaLoader(java, renderer, OperatingSystem.SYSTEM_VERSION);
-                                    if (lib == null)
-                                        return null;
-                                    Path file = dependencyManager.getGameRepository().getLibraryFile(version.get(), lib);
-                                    if (file.toAbsolutePath().toString().indexOf('=') >= 0) {
-                                        LOG.warning("Invalid character '=' in the libraries directory path, unable to attach software renderer loader");
-                                        return null;
-                                    }
+                                if (OperatingSystem.CURRENT_OS != OperatingSystem.WINDOWS
+                                        || !(setting.getRenderer() instanceof Renderer.Driver renderer)
+                                        || renderer.mesaDriverName() == null)
+                                    return null;

-                                    String agent = FileUtils.getAbsolutePath(file) + "=" + renderer.name().toLowerCase(Locale.ROOT);
+                                Library lib = NativePatcher.getWindowsMesaLoader(java, renderer, OperatingSystem.SYSTEM_VERSION);
+                                if (lib == null)
+                                    return null;
+                                Path file = dependencyManager.getGameRepository().getLibraryFile(version.get(), lib);
+                                if (file.toAbsolutePath().toString().indexOf('=') >= 0) {
+                                    LOG.warning("Invalid character '=' in the libraries directory path, unable to attach software renderer loader");
+                                    return null;
+                                }

-                                    if (GameLibrariesTask.shouldDownloadLibrary(repository, version.get(), lib, integrityCheck)) {
-                                        return new LibraryDownloadTask(dependencyManager, file, lib)
-                                                .thenRunAsync(() -> javaAgents.add(agent));
-                                    } else {
-                                        javaAgents.add(agent);
-                                        return null;
-                                    }
+                                String agent = FileUtils.getAbsolutePath(file) + "=" + renderer.mesaDriverName();
+
+                                if (GameLibrariesTask.shouldDownloadLibrary(repository, version.get(), lib, integrityCheck)) {
+                                    return new LibraryDownloadTask(dependencyManager, file, lib)
+                                            .thenRunAsync(() -> javaAgents.add(agent));
                                } else {
+                                    javaAgents.add(agent);
                                    return null;
                                }
                            })
                    );
                }).withStage("launch.state.dependencies")
                .thenComposeAsync(() -> gameVersion.map(s -> new GameVerificationFixTask(dependencyManager, s, version.get())).orElse(null))
+                .thenComposeAsync(() -> {
+                    if (config().getAllowAutoAgent()
+                            || setting.isNoJVMArgs()
+                            || setting.isNoOptimizingJVMArgs()
+                            || Boolean.TRUE.equals(config().getShownTips().get(LWJGL_3_4_1_TIP))
+                            || !NativePatcher.needPatchMemoryUtil(version.get(), javaVersionRef.get().getParsedVersion())) {
+                        return Task.completed(null);
+                    } else {
+                        CompletableFuture<Void> future = new CompletableFuture<>();
+                        runInFX(() -> {
+                            Controllers.confirm(i18n("launch.advice.lwjgl_3_4_1"), i18n("launch.advice.lwjgl_3_4_1.title"), MessageType.QUESTION, () -> {
+                                config().getShownTips().put(LWJGL_3_4_1_TIP, true);
+                                config().setAllowAutoAgent(true);
+                                future.complete(null);
+                            }, () -> {
+                                config().getShownTips().put(LWJGL_3_4_1_TIP, true);
+                                future.complete(null);
+                            });
+                        });
+                        return Task.fromCompletableFuture(future);
+                    }
+                })
                .thenComposeAsync(() -> logIn(account).withStage("launch.state.logging_in"))
                .thenComposeAsync(authInfo -> Task.supplyAsync(() -> {
                    LaunchOptions.Builder launchOptionsBuilder = repository.getLaunchOptions(
@@ -207,6 +231,7 @@ public final class LauncherHelper {
                    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));
@@ -387,7 +412,16 @@ public final class LauncherHelper {
                if (setting.getJavaVersionType() == JavaVersionType.VERSION) {
                    try {
                        int targetJavaVersionMajor = Integer.parseInt(setting.getJavaVersion());
-                        GameJavaVersion minimumJavaVersion = GameJavaVersion.getMinimumJavaVersion(gameVersion);
+                        GameJavaVersion minimumJavaVersion = null;
+                        if (gameVersion.compareTo("1.12.2") == 0) {
+                            Optional<String> cleanroomVersion = analyzer.getVersion(LibraryAnalyzer.LibraryType.CLEANROOM);
+                            if (cleanroomVersion.isPresent()) {
+                                minimumJavaVersion = GameJavaVersion.getCleanroomJavaVersion(cleanroomVersion.get());
+                            }
+                        }
+
+                        if (minimumJavaVersion == null)
+                            minimumJavaVersion = GameJavaVersion.getMinimumJavaVersion(gameVersion);

                        if (minimumJavaVersion != null && targetJavaVersionMajor < minimumJavaVersion.majorVersion()) {
                            Controllers.dialog(
@@ -402,8 +436,17 @@ public final class LauncherHelper {
                        targetJavaVersion = GameJavaVersion.get(targetJavaVersionMajor);
                    } catch (NumberFormatException ignored) {
                    }
-                } else
-                    targetJavaVersion = version.getJavaVersion();
+                } else {
+                    if (gameVersion.compareTo("1.12.2") == 0) {
+                        Optional<String> cleanroomVersion = analyzer.getVersion(LibraryAnalyzer.LibraryType.CLEANROOM);
+                        if (cleanroomVersion.isPresent()) {
+                            targetJavaVersion = GameJavaVersion.getCleanroomJavaVersion(cleanroomVersion.get());
+                        }
+                    }
+
+                    if (targetJavaVersion == null)
+                        targetJavaVersion = version.getJavaVersion();
+                }

                if (targetJavaVersion != null && supportedVersions.contains(targetJavaVersion)) {
                    downloadJava(targetJavaVersion, profile)
@@ -433,7 +476,7 @@ public final class LauncherHelper {
                if (java != null) {
                    for (JavaVersionConstraint constraint : JavaVersionConstraint.ALL) {
                        if (constraint.appliesToVersion(gameVersion, version, java, analyzer)) {
-                            if (!constraint.checkJava(gameVersion, version, java)) {
+                            if (!constraint.checkJava(gameVersion, version, java, analyzer)) {
                                if (constraint.isMandatory()) {
                                    violatedMandatoryConstraints.add(constraint);
                                } else {
@@ -468,9 +511,14 @@ public final class LauncherHelper {
                        return result;
                    } else {
                        GameJavaVersion gameJavaVersion;
-                        if (violatedMandatoryConstraints.contains(JavaVersionConstraint.CLEANROOM_JAVA_21))
-                            gameJavaVersion = GameJavaVersion.JAVA_21;
-                        else if (violatedMandatoryConstraints.contains(JavaVersionConstraint.GAME_JSON))
+                        if (violatedMandatoryConstraints.contains(JavaVersionConstraint.CLEANROOM)) {
+                            String cleanroomVersion = analyzer.getVersion(LibraryAnalyzer.LibraryType.CLEANROOM)
+                                    .orElse("");
+
+                            gameJavaVersion = !cleanroomVersion.isEmpty()
+                                    ? GameJavaVersion.getCleanroomJavaVersion(cleanroomVersion)
+                                    : GameJavaVersion.JAVA_21;
+                        } else if (violatedMandatoryConstraints.contains(JavaVersionConstraint.GAME_JSON))
                            gameJavaVersion = version.getJavaVersion();
                        else if (violatedMandatoryConstraints.contains(JavaVersionConstraint.VANILLA))
                            gameJavaVersion = GameJavaVersion.getMinimumJavaVersion(gameVersion);
@@ -560,9 +608,14 @@ public final class LauncherHelper {
                        case MODDED_JAVA_21:
                            suggestions.add(i18n("launch.advice.modded_java", 21, gameVersion));
                            break;
-                        case CLEANROOM_JAVA_21:
-                            suggestions.add(i18n("launch.advice.cleanroom"));
+                        case CLEANROOM: {
+                            String cleanroomVersion = analyzer.getVersion(LibraryAnalyzer.LibraryType.CLEANROOM).orElse("");
+                            if (!cleanroomVersion.isEmpty())
+                                suggestions.add(i18n("launch.advice.cleanroom", GameJavaVersion.getCleanroomJavaVersion(cleanroomVersion).majorVersion(), cleanroomVersion));
+                            else
+                                suggestions.add(i18n("launch.advice.cleanroom", 21, ""));
                            break;
+                        }
                        case VANILLA_JAVA_8_51:
                            suggestions.add(i18n("launch.advice.java8_51_1_13"));
                            break;
@@ -571,7 +624,7 @@ public final class LauncherHelper {
                            break;
                        case VANILLA_X86:
                            if (setting.getNativesDirType() == NativesDirectoryType.VERSION_FOLDER
-                                    && isCompatibleWithX86Java()) {
+                                    && Platform.isSupportedTranslationX86_64()) {
                                suggestions.add(i18n("launch.advice.vanilla_x86.translation"));
                            }
                            break;
@@ -115,8 +115,8 @@ public abstract class LocalizedRemoteModRepository implements RemoteModRepositor
    }

    @Override
-    public RemoteMod getModById(String id) throws IOException {
-        return getBackedRemoteModRepository().getModById(id);
+    public RemoteMod getModById(DownloadProvider downloadProvider, String id) throws IOException {
+        return getBackedRemoteModRepository().getModById(downloadProvider, id);
    }

    @Override
@@ -125,7 +125,7 @@ public abstract class LocalizedRemoteModRepository implements RemoteModRepositor
    }

    @Override
-    public Stream<RemoteMod.Version> getRemoteVersionsById(String id) throws IOException {
-        return getBackedRemoteModRepository().getRemoteVersionsById(id);
+    public Stream<RemoteMod.Version> getRemoteVersionsById(DownloadProvider downloadProvider, String id) throws IOException {
+        return getBackedRemoteModRepository().getRemoteVersionsById(downloadProvider, id);
    }
 }
@@ -31,7 +31,6 @@ public final class Log {

    private final String log;
    private Log4jLevel level;
-    private boolean selected = false;

    public Log(String log) {
        this.log = log;
@@ -57,14 +56,6 @@ public final class Log {
        return level;
    }

-    public boolean isSelected() {
-        return selected;
-    }
-
-    public void setSelected(boolean selected) {
-        this.selected = selected;
-    }
-
    @Override
    public String toString() {
        return log;
@@ -51,7 +51,10 @@ import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Stream;

 import static org.jackhuang.hmcl.util.Lang.mapOf;
@@ -167,7 +170,7 @@ public final class ModpackHelper {

        return new ServerModpackRemoteInstallTask(profile.getDependency(), manifest, name)
                .whenComplete(Schedulers.defaultScheduler(), success, failure)
-                .withStagesHints("hmcl.modpack", "hmcl.modpack.download");
+                .withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
    }

    public static boolean isExternalGameNameConflicts(String name) {
@@ -211,16 +214,16 @@ public final class ModpackHelper {
            return modpack.getInstallTask(profile.getDependency(), zipFile, name, iconUrl)
                    .whenComplete(Schedulers.defaultScheduler(), success, failure)
                    .thenComposeAsync(createMultiMCPostInstallTask(profile, (MultiMCInstanceConfiguration) modpack.getManifest(), name))
-                    .withStagesHints("hmcl.modpack", "hmcl.modpack.download");
+                    .withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
        else if (modpack.getManifest() instanceof McbbsModpackManifest)
            return modpack.getInstallTask(profile.getDependency(), zipFile, name, iconUrl)
                    .whenComplete(Schedulers.defaultScheduler(), success, failure)
                    .thenComposeAsync(createMcbbsPostInstallTask(profile, (McbbsModpackManifest) modpack.getManifest(), name))
-                    .withStagesHints("hmcl.modpack", "hmcl.modpack.download");
+                    .withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
        else
            return modpack.getInstallTask(profile.getDependency(), zipFile, name, iconUrl)
                    .whenComplete(Schedulers.javafx(), success, failure)
-                    .withStagesHints("hmcl.modpack", "hmcl.modpack.download");
+                    .withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
    }

    public static Task<Void> getUpdateTask(Profile profile, ServerModpackManifest manifest, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException {
@@ -228,7 +231,7 @@ public final class ModpackHelper {
            case ServerModpackRemoteInstallTask.MODPACK_TYPE:
                return new ModpackUpdateTask(profile.getRepository(), name, new ServerModpackRemoteInstallTask(profile.getDependency(), manifest, name))
                        .thenComposeAsync(profile.getRepository().refreshVersionsAsync())
-                        .withStagesHints("hmcl.modpack", "hmcl.modpack.download");
+                        .withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
            default:
                throw new UnsupportedModpackException();
        }
@@ -163,6 +163,13 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
        return newFixedLengthResponse(Response.Status.OK, "text/html; charset=UTF-8", html);
    }

+    @Override
+    public void close() {
+        if (!future.isDone())
+            future.completeExceptionally(new AuthenticationException("OAuth server is closing"));
+        stop();
+    }
+
    public static class Factory implements OAuth.Callback {
        public final EventManager<GrantDeviceCodeEvent> onGrantDeviceCode = new EventManager<>();
        public final EventManager<OpenBrowserEvent> onOpenBrowserAuthorizationCode = new EventManager<>();
@@ -99,7 +99,7 @@ public final class HMCLJavaRepository implements JavaRepository {
        return getJavaExecutable(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.component());
    }

-    private static void getAllJava(List<JavaRuntime> list, Platform platform, Path platformRoot, boolean isManaged) {
+    private static void getAllJava(List<Path> list, Platform platform, Path platformRoot) {
        try (DirectoryStream<Path> stream = Files.newDirectoryStream(platformRoot)) {
            for (Path file : stream) {
                try {
@@ -117,8 +117,7 @@ public final class HMCLJavaRepository implements JavaRepository {
                        }

                        if (Files.isDirectory(javaDir)) {
-                            JavaManifest manifest = JsonUtils.fromJsonFile(file, JavaManifest.class);
-                            list.add(JavaRuntime.of(executable, manifest.getInfo(), isManaged));
+                            list.add(executable);
                        }
                    }
                } catch (Throwable e) {
@@ -131,28 +130,23 @@ public final class HMCLJavaRepository implements JavaRepository {
    }

    @Override
-    public Collection<JavaRuntime> getAllJava(Platform platform) {
+    public Collection<Path> getAllJava(Platform platform) {
        Path platformRoot = getPlatformRoot(platform);
        if (!Files.isDirectory(platformRoot))
            return Collections.emptyList();

-        ArrayList<JavaRuntime> list = new ArrayList<>();
-
-        getAllJava(list, platform, platformRoot, true);
-        if (platform.getOperatingSystem() == OperatingSystem.MACOS) {
-            platformRoot = root.resolve(platform.getOperatingSystem().getMojangName() + "-" + platform.getArchitecture().getCheckedName());
-            if (Files.isDirectory(platformRoot))
-                getAllJava(list, platform, platformRoot, false);
-        }
+        ArrayList<Path> list = new ArrayList<>();

+        getAllJava(list, platform, platformRoot);
        return list;
    }

    @Override
    public Task<JavaRuntime> getDownloadJavaTask(DownloadProvider downloadProvider, Platform platform, GameJavaVersion gameJavaVersion) {
        Path javaDir = getJavaDir(platform, gameJavaVersion);
+        Path tempDir = getPlatformRoot(platform).resolve(".tmp").resolve(javaDir.getFileName());

-        return new MojangJavaDownloadTask(downloadProvider, javaDir, gameJavaVersion, JavaManager.getMojangJavaPlatform(platform)).thenApplyAsync(result -> {
+        return new MojangJavaDownloadTask(downloadProvider, javaDir, tempDir, gameJavaVersion, JavaManager.getMojangJavaPlatform(platform)).thenApplyAsync(result -> {
            Path executable;
            try {
                executable = JavaManager.getExecutable(javaDir).toRealPath();
@@ -165,16 +159,16 @@ public final class HMCLJavaRepository implements JavaRepository {

            JavaInfo info;
            if (JavaManager.isCompatible(platform))
-                info = JavaInfoUtils.fromExecutable(executable, false);
+                info = JavaInfoUtils.fromExecutable(executable);
            else
-                info = new JavaInfo(platform, result.download.getVersion().getName(), null);
+                info = new JavaInfo(platform, result.download().version().name(), null);

            Map<String, Object> update = new LinkedHashMap<>();
            update.put("provider", "mojang");
            update.put("component", gameJavaVersion.component());

            Map<String, JavaLocalFiles.Local> files = new LinkedHashMap<>();
-            result.remoteFiles.getFiles().forEach((path, file) -> {
+            result.remoteFiles().getFiles().forEach((path, file) -> {
                if (file instanceof MojangJavaRemoteFiles.RemoteFile) {
                    DownloadInfo downloadInfo = ((MojangJavaRemoteFiles.RemoteFile) file).getDownloads().get("raw");
                    if (downloadInfo != null) {
@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.java;

 import com.google.gson.annotations.SerializedName;
+import org.jackhuang.hmcl.util.gson.JsonSerializable;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.JarUtils;
 import org.jackhuang.hmcl.util.platform.Architecture;
@@ -27,7 +28,6 @@ import org.jackhuang.hmcl.util.platform.SystemUtils;
 import org.jetbrains.annotations.NotNull;

 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;

 /**
@@ -39,35 +39,10 @@ public final class JavaInfoUtils {
    private JavaInfoUtils() {
    }

-    private static Path tryFindReleaseFile(Path executable) {
-        Path parent = executable.getParent();
-        if (parent != null && parent.getFileName() != null && parent.getFileName().toString().equals("bin")) {
-            Path javaHome = parent.getParent();
-            if (javaHome != null && javaHome.getFileName() != null) {
-                Path releaseFile = javaHome.resolve("release");
-                String javaHomeName = javaHome.getFileName().toString();
-                if ((javaHomeName.contains("jre") || javaHomeName.contains("jdk") || javaHomeName.contains("openj9"))
-                        && Files.isRegularFile(releaseFile)) {
-                    return releaseFile;
-                }
-            }
-        }
-        return null;
-    }
-
-    public static @NotNull JavaInfo fromExecutable(Path executable, boolean tryFindReleaseFile) throws IOException {
+    public static @NotNull JavaInfo fromExecutable(Path executable) throws IOException {
        assert executable.isAbsolute();

-        Path releaseFile;
-        if (tryFindReleaseFile && (releaseFile = tryFindReleaseFile(executable)) != null) {
-            try {
-                return JavaInfo.fromReleaseFile(releaseFile);
-            } catch (IOException ignored) {
-            }
-        }
-
        Path thisPath = JarUtils.thisJarPath();
-
        if (thisPath == null) {
            throw new IOException("Failed to find current HMCL location");
        }
@@ -94,7 +69,6 @@ public final class JavaInfoUtils {
                            ? architecture
                            : Architecture.SYSTEM_ARCH);

-
            return new JavaInfo(platform, result.javaVersion, result.javaVendor);
        } catch (IOException e) {
            throw e;
@@ -103,14 +77,9 @@ public final class JavaInfoUtils {
        }
    }

-    private static final class Result {
-        @SerializedName("os.name")
-        public String osName;
-        @SerializedName("os.arch")
-        public String osArch;
-        @SerializedName("java.version")
-        public String javaVersion;
-        @SerializedName("java.vendor")
-        public String javaVendor;
+    @JsonSerializable
+    private record Result(@SerializedName("os.name") String osName, @SerializedName("os.arch") String osArch,
+                          @SerializedName("java.version") String javaVersion,
+                          @SerializedName("java.vendor") String javaVendor) {
    }
 }
@@ -17,6 +17,8 @@
 */
 package org.jackhuang.hmcl.java;

+import com.google.gson.*;
+import com.google.gson.stream.JsonWriter;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import org.jackhuang.hmcl.Metadata;
@@ -30,7 +32,9 @@ import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.CacheRepository;
+import org.jackhuang.hmcl.util.DigestUtils;
 import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.*;
 import org.jackhuang.hmcl.util.platform.windows.WinReg;
@@ -40,9 +44,14 @@ import org.jetbrains.annotations.Nullable;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;

 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
@@ -55,6 +64,16 @@ public final class JavaManager {
    private JavaManager() {
    }

+    private static final String[] KNOWN_VENDOR_DIRECTORIES = {
+            "Java",
+            "BellSoft",
+            "AdoptOpenJDK",
+            "Zulu",
+            "Microsoft",
+            "Eclipse Foundation",
+            "Semeru"
+    };
+
    public static final HMCLJavaRepository REPOSITORY = new HMCLJavaRepository(Metadata.HMCL_GLOBAL_DIRECTORY.resolve("java"));
    public static final HMCLJavaRepository LOCAL_REPOSITORY = new HMCLJavaRepository(Metadata.HMCL_CURRENT_DIRECTORY.resolve("java"));

@@ -103,16 +122,27 @@ public final class JavaManager {
        switch (OperatingSystem.CURRENT_OS) {
            case WINDOWS:
                if (Architecture.SYSTEM_ARCH == Architecture.X86_64)
+                    // Windows x86-64 platform is compatible with x86 programs
                    return architecture == Architecture.X86;
-                if (Architecture.SYSTEM_ARCH == Architecture.ARM64)
-                    return OperatingSystem.SYSTEM_BUILD_NUMBER >= 21277 && architecture == Architecture.X86_64 || architecture == Architecture.X86;
+                if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
+
+                    // Since Windows 10 Build 21277, Windows Arm64 has been compatible with x86-64 programs via translation
+                    if (architecture == Architecture.X86_64 && Platform.isSupportedTranslationX86_64())
+                        return true;
+
+                    // Windows Arm64 is compatible with x86 programs via translation
+                    if (architecture == Architecture.X86)
+                        return true;
+                    return false;
+                }
                break;
            case LINUX:
                if (Architecture.SYSTEM_ARCH == Architecture.X86_64)
                    return architecture == Architecture.X86;
                break;
            case MACOS:
-                if (Architecture.SYSTEM_ARCH == Architecture.ARM64)
+                // macOS Arm64 compatible with x86-64 programs via Rosetta 2.
+                if (Architecture.SYSTEM_ARCH == Architecture.ARM64 && Platform.isSupportedTranslationX86_64())
                    return architecture == Architecture.X86_64;
                break;
        }
@@ -160,12 +190,12 @@ public final class JavaManager {
            return javaRuntime;
        }

-        JavaInfo info = JavaInfoUtils.fromExecutable(executable, true);
+        JavaInfo info = JavaInfoUtils.fromExecutable(executable);
        return JavaRuntime.of(executable, info, false);
    }

    public static void refresh() {
-        Task.supplyAsync(JavaManager::searchPotentialJavaExecutables).whenComplete(Schedulers.javafx(), (result, exception) -> {
+        Task.supplyAsync(() -> searchPotentialJavaExecutables(false)).whenComplete(Schedulers.javafx(), (result, exception) -> {
            if (result != null) {
                LATCH.await();
                allJava = result;
@@ -304,7 +334,7 @@ public final class JavaManager {

            for (JavaVersionConstraint constraint : JavaVersionConstraint.ALL) {
                if (constraint.appliesToVersion(gameVersion, version, java, analyzer)) {
-                    if (!constraint.checkJava(gameVersion, version, java)) {
+                    if (!constraint.checkJava(gameVersion, version, java, analyzer)) {
                        if (constraint.isMandatory()) {
                            violationMandatory = true;
                        } else {
@@ -326,7 +356,7 @@ public final class JavaManager {
    }

    public static void initialize() {
-        Map<Path, JavaRuntime> allJava = searchPotentialJavaExecutables();
+        Map<Path, JavaRuntime> allJava = searchPotentialJavaExecutables(true);
        JavaManager.allJava = allJava;
        LATCH.countDown();
        FXUtils.runInFX(() -> updateAllJavaProperty(allJava));
@@ -334,56 +364,56 @@ public final class JavaManager {

    // search java

-    private static Map<Path, JavaRuntime> searchPotentialJavaExecutables() {
-        Map<Path, JavaRuntime> javaRuntimes = new HashMap<>();
-        searchAllJavaInRepository(javaRuntimes, Platform.SYSTEM_PLATFORM);
+    private static Map<Path, JavaRuntime> searchPotentialJavaExecutables(boolean useCache) {
+        Searcher searcher = new Searcher(Metadata.HMCL_GLOBAL_DIRECTORY.resolve("javaCache.json"));
+        if (useCache)
+            searcher.loadCache();
+
+        searcher.searchAllJavaInRepository(Platform.SYSTEM_PLATFORM);
        switch (OperatingSystem.CURRENT_OS) {
            case WINDOWS:
                if (Architecture.SYSTEM_ARCH == Architecture.X86_64)
-                    searchAllJavaInRepository(javaRuntimes, Platform.WINDOWS_X86);
+                    searcher.searchAllJavaInRepository(Platform.WINDOWS_X86);
                if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
-                    if (OperatingSystem.SYSTEM_BUILD_NUMBER >= 21277)
-                        searchAllJavaInRepository(javaRuntimes, Platform.WINDOWS_X86_64);
-                    searchAllJavaInRepository(javaRuntimes, Platform.WINDOWS_X86);
+                    if (Platform.isSupportedTranslationX86_64())
+                        searcher.searchAllJavaInRepository(Platform.WINDOWS_X86_64);
+                    searcher.searchAllJavaInRepository(Platform.WINDOWS_X86);
                }
                break;
            case MACOS:
-                if (Architecture.SYSTEM_ARCH == Architecture.ARM64)
-                    searchAllJavaInRepository(javaRuntimes, Platform.MACOS_X86_64);
+                if (Architecture.SYSTEM_ARCH == Architecture.ARM64 && Platform.isSupportedTranslationX86_64())
+                    searcher.searchAllJavaInRepository(Platform.MACOS_X86_64);
                break;
        }

        switch (OperatingSystem.CURRENT_OS) {
            case WINDOWS:
-                queryJavaInRegistryKey(javaRuntimes, WinReg.HKEY.HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\Java Runtime Environment");
-                queryJavaInRegistryKey(javaRuntimes, WinReg.HKEY.HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\Java Development Kit");
-                queryJavaInRegistryKey(javaRuntimes, WinReg.HKEY.HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\JRE");
-                queryJavaInRegistryKey(javaRuntimes, WinReg.HKEY.HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\JDK");
+                searcher.queryJavaInRegistryKey(WinReg.HKEY.HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\Java Runtime Environment");
+                searcher.queryJavaInRegistryKey(WinReg.HKEY.HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\Java Development Kit");
+                searcher.queryJavaInRegistryKey(WinReg.HKEY.HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\JRE");
+                searcher.queryJavaInRegistryKey(WinReg.HKEY.HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\JDK");

-                searchJavaInProgramFiles(javaRuntimes, "ProgramFiles", "C:\\Program Files");
-                searchJavaInProgramFiles(javaRuntimes, "ProgramFiles(x86)", "C:\\Program Files (x86)");
-                if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
-                    searchJavaInProgramFiles(javaRuntimes, "ProgramFiles(ARM)", "C:\\Program Files (ARM)");
-                }
+                searcher.searchJavaInProgramFiles("ProgramFiles", "C:\\Program Files");
+                searcher.searchJavaInProgramFiles("ProgramFiles(x86)", "C:\\Program Files (x86)");
                break;
            case LINUX:
-                searchAllJavaInDirectory(javaRuntimes, Paths.get("/usr/java"));      // Oracle RPMs
-                searchAllJavaInDirectory(javaRuntimes, Paths.get("/usr/lib/jvm"));   // General locations
-                searchAllJavaInDirectory(javaRuntimes, Paths.get("/usr/lib32/jvm")); // General locations
-                searchAllJavaInDirectory(javaRuntimes, Paths.get("/usr/lib64/jvm")); // General locations
-                searchAllJavaInDirectory(javaRuntimes, Paths.get(System.getProperty("user.home"), "/.sdkman/candidates/java")); // SDKMAN!
+                searcher.searchAllJavaInDirectory(Path.of("/usr/java"));      // Oracle RPMs
+                searcher.searchAllJavaInDirectory(Path.of("/usr/lib/jvm"));   // General locations
+                searcher.searchAllJavaInDirectory(Path.of("/usr/lib32/jvm")); // General locations
+                searcher.searchAllJavaInDirectory(Path.of("/usr/lib64/jvm")); // General locations
+                searcher.searchAllJavaInDirectory(Path.of(System.getProperty("user.home"), "/.sdkman/candidates/java")); // SDKMAN!
                break;
            case MACOS:
-                searchJavaInMacJavaVirtualMachines(javaRuntimes, Paths.get("/Library/Java/JavaVirtualMachines"));
-                searchJavaInMacJavaVirtualMachines(javaRuntimes, Paths.get(System.getProperty("user.home"), "/Library/Java/JavaVirtualMachines"));
-                tryAddJavaExecutable(javaRuntimes, Paths.get("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java"));
-                tryAddJavaExecutable(javaRuntimes, Paths.get("/Applications/Xcode.app/Contents/Applications/Application Loader.app/Contents/MacOS/itms/java/bin/java"));
+                searcher.searchJavaInMacJavaVirtualMachines(Path.of("/Library/Java/JavaVirtualMachines"));
+                searcher.searchJavaInMacJavaVirtualMachines(Path.of(System.getProperty("user.home"), "/Library/Java/JavaVirtualMachines"));
+                searcher.tryAddJavaExecutable(Path.of("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java"));
+                searcher.tryAddJavaExecutable(Path.of("/Applications/Xcode.app/Contents/Applications/Application Loader.app/Contents/MacOS/itms/java/bin/java"));
                // Homebrew
-                tryAddJavaExecutable(javaRuntimes, Paths.get("/opt/homebrew/opt/java/bin/java"));
-                searchAllJavaInDirectory(javaRuntimes, Paths.get("/opt/homebrew/Cellar/openjdk"));
-                try (DirectoryStream<Path> dirs = Files.newDirectoryStream(Paths.get("/opt/homebrew/Cellar"), "openjdk@*")) {
+                searcher.tryAddJavaExecutable(Path.of("/opt/homebrew/opt/java/bin/java"));
+                searcher.searchAllJavaInDirectory(Path.of("/opt/homebrew/Cellar/openjdk"));
+                try (DirectoryStream<Path> dirs = Files.newDirectoryStream(Path.of("/opt/homebrew/Cellar"), "openjdk@*")) {
                    for (Path dir : dirs) {
-                        searchAllJavaInDirectory(javaRuntimes, dir);
+                        searcher.searchAllJavaInDirectory(dir);
                    }
                } catch (IOException e) {
                    LOG.warning("Failed to get subdirectories of /opt/homebrew/Cellar");
@@ -397,16 +427,16 @@ public final class JavaManager {
        // Search Minecraft bundled runtimes
        if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS && Architecture.SYSTEM_ARCH.isX86()) {
            FileUtils.tryGetPath(System.getenv("localappdata"), "Packages\\Microsoft.4297127D64EC6_8wekyb3d8bbwe\\LocalCache\\Local\\runtime")
-                    .ifPresent(it -> searchAllOfficialJava(javaRuntimes, it, false));
+                    .ifPresent(it -> searcher.searchAllOfficialJava(it, false));

            FileUtils.tryGetPath(Lang.requireNonNullElse(System.getenv("ProgramFiles(x86)"), "C:\\Program Files (x86)"), "Minecraft Launcher\\runtime")
-                    .ifPresent(it -> searchAllOfficialJava(javaRuntimes, it, false));
+                    .ifPresent(it -> searcher.searchAllOfficialJava(it, false));
        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX && Architecture.SYSTEM_ARCH == Architecture.X86_64) {
-            searchAllOfficialJava(javaRuntimes, Paths.get(System.getProperty("user.home"), ".minecraft/runtime"), false);
+            searcher.searchAllOfficialJava(Path.of(System.getProperty("user.home"), ".minecraft/runtime"), false);
        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
-            searchAllOfficialJava(javaRuntimes, Paths.get(System.getProperty("user.home"), "Library/Application Support/minecraft/runtime"), false);
+            searcher.searchAllOfficialJava(Path.of(System.getProperty("user.home"), "Library/Application Support/minecraft/runtime"), false);
        }
-        searchAllOfficialJava(javaRuntimes, CacheRepository.getInstance().getCacheDirectory().resolve("java"), true);
+        searcher.searchAllOfficialJava(CacheRepository.getInstance().getCacheDirectory().resolve("java"), true);

        // Search in PATH.
        if (System.getenv("PATH") != null) {
@@ -420,7 +450,7 @@ public final class JavaManager {
                }

                try {
-                    tryAddJavaExecutable(javaRuntimes, Path.of(path, OperatingSystem.CURRENT_OS.getJavaExecutable()));
+                    searcher.tryAddJavaExecutable(Path.of(path, OperatingSystem.CURRENT_OS.getJavaExecutable()));
                } catch (InvalidPathException ignored) {
                }
            }
@@ -430,16 +460,17 @@ public final class JavaManager {
            String[] paths = System.getenv("HMCL_JRES").split(File.pathSeparator);
            for (String path : paths) {
                try {
-                    tryAddJavaHome(javaRuntimes, Paths.get(path));
+                    searcher.tryAddJavaHome(Path.of(path));
                } catch (InvalidPathException ignored) {
                }
            }
        }
-        searchAllJavaInDirectory(javaRuntimes, Paths.get(System.getProperty("user.home"), ".jdks"));
+
+        searcher.searchAllJavaInDirectory(Path.of(System.getProperty("user.home"), ".jdks"));

        for (String javaPath : ConfigHolder.globalConfig().getUserJava()) {
            try {
-                tryAddJavaExecutable(javaRuntimes, Paths.get(javaPath));
+                searcher.tryAddJavaExecutable(Path.of(javaPath));
            } catch (InvalidPathException e) {
                LOG.warning("Invalid Java path: " + javaPath);
            }
@@ -447,233 +478,406 @@ public final class JavaManager {

        JavaRuntime currentJava = JavaRuntime.CURRENT_JAVA;
        if (currentJava != null
-                && !javaRuntimes.containsKey(currentJava.getBinary())
+                && !searcher.javaRuntimes.containsKey(currentJava.getBinary())
                && !ConfigHolder.globalConfig().getDisabledJava().contains(currentJava.getBinary().toString())) {
-            javaRuntimes.put(currentJava.getBinary(), currentJava);
+            searcher.addResult(currentJava.getBinary(), currentJava);
        }

-        LOG.trace(javaRuntimes.values().stream().sorted()
+        searcher.saveCache();
+
+        LOG.trace(searcher.javaRuntimes.values().stream().sorted()
                .map(it -> String.format(" - %s %s (%s, %s): %s",
                        it.isJDK() ? "JDK" : "JRE",
                        it.getVersion(),
                        it.getPlatform().getArchitecture().getDisplayName(),
                        Lang.requireNonNullElse(it.getVendor(), "Unknown"),
                        it.getBinary()))
-                .collect(Collectors.joining("\n", "Finished Java lookup, found " + javaRuntimes.size() + "\n", "")));
-
-        return javaRuntimes;
+                .collect(Collectors.joining("\n", "Finished Java lookup, found " + searcher.javaRuntimes.size() + "\n", "")));
+        return searcher.javaRuntimes;
    }

-    private static void tryAddJavaHome(Map<Path, JavaRuntime> javaRuntimes, Path javaHome) {
-        Path executable = getExecutable(javaHome);
-        if (!Files.isRegularFile(executable)) {
-            return;
+    private static final class Searcher {
+        private final Path cacheFile;
+        final Map<Path, JavaRuntime> javaRuntimes = new HashMap<>();
+        private final LinkedHashMap<Path, JavaInfoCache> caches = new LinkedHashMap<>();
+        private final Set<Path> failed = new HashSet<>();
+        private boolean needRefreshCache = false;
+
+        Searcher(Path cacheFile) {
+            this.cacheFile = cacheFile;
        }

-        try {
-            executable = executable.toRealPath();
-        } catch (IOException e) {
-            LOG.warning("Failed to resolve path " + executable, e);
-            return;
+        private static final Pattern CACHE_VERSION_PATTERN = Pattern.compile("(?<major>\\d+)(?:\\.(?<minor>\\d+))?");
+        private static final int CACHE_MAJOR_VERSION = 0;
+        private static final int CACHE_MINOR_VERSION = 0;
+
+        private record JavaInfoCache(String key, JavaInfo info) {
        }

-        if (javaRuntimes.containsKey(executable) || ConfigHolder.globalConfig().getDisabledJava().contains(executable.toString())) {
-            return;
-        }
+        void loadCache() {
+            if (Files.notExists(cacheFile))
+                return;

-        JavaInfo info = null;
-
-        Path releaseFile = javaHome.resolve("release");
-        if (Files.exists(releaseFile)) {
            try {
-                info = JavaInfo.fromReleaseFile(releaseFile);
-            } catch (IOException e) {
-                LOG.warning("Failed to read release file " + releaseFile, e);
+                JsonObject jsonFile = JsonUtils.fromJsonFile(cacheFile, JsonObject.class);
+                JsonElement fileVersion = jsonFile.get("version");
+
+                Matcher matcher;
+                if (fileVersion instanceof JsonPrimitive version
+                        && (matcher = CACHE_VERSION_PATTERN.matcher(version.getAsString())).matches()) {
+                    int major = Integer.parseInt(matcher.group("major"));
+
+                    String minorString = matcher.group("minor");
+                    int minor = minorString != null ? Integer.parseInt(minorString) : 0;
+
+                    if (major != CACHE_MAJOR_VERSION || minor < CACHE_MINOR_VERSION)
+                        throw new IOException("Unsupported cache file, version: %s".formatted(version.getAsString()));
+                } else
+                    throw new IOException("Invalid version JSON: " + fileVersion);
+
+                JsonArray cachesArray = jsonFile.getAsJsonArray("caches");
+
+                for (JsonElement element : cachesArray) {
+                    try {
+                        var obj = (JsonObject) element;
+
+                        Path realPath = Path.of(obj.getAsJsonPrimitive("path").getAsString()).toRealPath();
+                        String key = obj.getAsJsonPrimitive("key").getAsString();
+
+                        OperatingSystem osName = OperatingSystem.parseOSName(obj.getAsJsonPrimitive("os.name").getAsString());
+                        Architecture osArch = Architecture.parseArchName(obj.getAsJsonPrimitive("os.arch").getAsString());
+                        String javaVersion = obj.getAsJsonPrimitive("java.version").getAsString();
+
+                        JavaInfo.Builder infoBuilder = JavaInfo.newBuilder(Platform.getPlatform(osName, osArch), javaVersion);
+
+                        if (obj.get("java.vendor") instanceof JsonPrimitive vendor)
+                            infoBuilder.setVendor(vendor.getAsString());
+
+                        caches.put(realPath, new JavaInfoCache(key, infoBuilder.build()));
+                    } catch (Exception e) {
+                        LOG.warning("Invalid cache: " + element);
+                        needRefreshCache = true;
+                    }
+                }
+            } catch (Exception ex) {
+                LOG.warning("Failed to load cache file: " + cacheFile);
+                needRefreshCache = true;
            }
        }

-        if (info == null) {
+        void saveCache() {
+            if (!needRefreshCache)
+                return;
+
+            needRefreshCache = false;
            try {
-                info = JavaInfoUtils.fromExecutable(executable, false);
+                FileUtils.saveSafely(cacheFile, output -> {
+                    try (var writer = new JsonWriter(new OutputStreamWriter(output, StandardCharsets.UTF_8))) {
+                        writer.beginObject();
+
+                        writer.name("version").value("%d.%d".formatted(CACHE_MAJOR_VERSION, CACHE_MINOR_VERSION));
+
+                        writer.name("caches");
+                        writer.beginArray();
+                        for (Map.Entry<Path, JavaInfoCache> entry : caches.entrySet()) {
+                            Path path = entry.getKey();
+                            JavaInfoCache cache = entry.getValue();
+                            JavaInfo info = cache.info();
+
+                            writer.beginObject();
+
+                            writer.name("path").value(path.toString());
+                            writer.name("key").value(cache.key());
+
+                            writer.name("os.name").value(info.getPlatform().os().getCheckedName());
+                            writer.name("os.arch").value(info.getPlatform().arch().getCheckedName());
+                            writer.name("java.version").value(info.getVersion());
+                            if (info.getVendor() != null)
+                                writer.name("java.vendor").value(info.getVendor());
+
+                            writer.endObject();
+                        }
+                        writer.endArray();
+
+                        writer.endObject();
+                    }
+                });
+            } catch (Exception e) {
+                LOG.warning("Failed to save cache file: " + cacheFile);
+            }
+        }
+
+        private static @Nullable String createCacheKey(Path realPath) {
+            Path binDir = realPath.getParent();
+            if (binDir == null || !FileUtils.getName(binDir).equals("bin"))
+                return null;
+
+            if (Files.isRegularFile(realPath.resolveSibling("ikvm.properties")))
+                return null;
+
+            Path javaHome = binDir.getParent();
+            if (javaHome == null)
+                return null;
+
+            Path libDir = javaHome.resolve("lib");
+            if (!Files.isDirectory(libDir))
+                return null;
+
+            BasicFileAttributes launcherAttributes;
+            String releaseHash = null;
+            BasicFileAttributes coreLibsAttributes = null;
+
+            try {
+                launcherAttributes = Files.readAttributes(realPath, BasicFileAttributes.class);
+
+                Path releaseFile = javaHome.resolve("release");
+                if (Files.exists(releaseFile)) {
+                    releaseHash = DigestUtils.digestToString("SHA-1", releaseFile);
+                } else {
+                    Path coreLibsFile = libDir.resolve("rt.jar");
+                    if (!Files.isRegularFile(coreLibsFile)) {
+                        coreLibsFile = javaHome.resolve("jre/lib/rt.jar");
+                        if (!Files.isRegularFile(coreLibsFile))
+                            return null;
+
+                        coreLibsAttributes = Files.readAttributes(coreLibsFile, BasicFileAttributes.class);
+                    }
+                }
+            } catch (Exception e) {
+                LOG.warning("Failed to create cache key for " + realPath, e);
+                return null;
+            }
+
+            StringJoiner joiner = new StringJoiner(",");
+
+            joiner.add("sz:" + launcherAttributes.size());
+            joiner.add("lm:" + launcherAttributes.lastModifiedTime().toMillis());
+
+            if (releaseHash != null)
+                joiner.add(releaseHash);
+
+            if (coreLibsAttributes != null) {
+                joiner.add("rsz:" + coreLibsAttributes.size());
+                joiner.add("rlm:" + coreLibsAttributes.lastModifiedTime().toMillis());
+            }
+
+            return joiner.toString();
+        }
+
+        void addResult(Path realPath, JavaRuntime javaRuntime) {
+            javaRuntimes.put(realPath, javaRuntime);
+        }
+
+        void tryAddJavaHome(Path javaHome) {
+            tryAddJavaExecutable(getExecutable(javaHome));
+        }
+
+        void tryAddJavaExecutable(Path executable) {
+            tryAddJavaExecutable(executable, false);
+        }
+
+        void tryAddJavaExecutable(Path executable, boolean isManaged) {
+            try {
+                executable = executable.toRealPath();
+            } catch (IOException e) {
+                return;
+            }
+
+            if (javaRuntimes.containsKey(executable)
+                    || failed.contains(executable)
+                    || ConfigHolder.globalConfig().getDisabledJava().contains(executable.toString())) {
+                return;
+            }
+
+            String cacheKey = createCacheKey(executable);
+            if (cacheKey != null) {
+                JavaInfoCache cache = caches.get(executable);
+                if (cache != null) {
+                    if (isCompatible(cache.info().getPlatform()) && cacheKey.equals(cache.key())) {
+                        javaRuntimes.put(executable, JavaRuntime.of(executable, cache.info(), isManaged));
+                        return;
+                    } else {
+                        caches.remove(executable);
+                        needRefreshCache = true;
+                    }
+                }
+            } else if (caches.remove(executable) != null) {
+                needRefreshCache = true;
+            }
+
+            JavaInfo info;
+            try {
+                info = JavaInfoUtils.fromExecutable(executable);
            } catch (IOException e) {
                LOG.warning("Failed to lookup Java executable at " + executable, e);
+                failed.add(executable);
+                return;
+            }
+
+            if (cacheKey != null) {
+                caches.put(executable, new JavaInfoCache(cacheKey, info));
+                needRefreshCache = true;
+            }
+
+            javaRuntimes.put(executable, JavaRuntime.of(executable, info, isManaged));
+        }
+
+        void tryAddJavaInComponentDir(String platform, Path component, boolean verify) {
+            Path sha1File = component.resolve(platform).resolve(component.getFileName() + ".sha1");
+            if (!Files.isRegularFile(sha1File))
+                return;
+
+            Path dir = component.resolve(platform).resolve(component.getFileName());
+
+            if (verify) {
+                try (BufferedReader reader = Files.newBufferedReader(sha1File)) {
+                    String line;
+                    while ((line = reader.readLine()) != null) {
+                        if (line.isEmpty()) continue;
+
+                        int idx = line.indexOf(" /#//");
+                        if (idx <= 0)
+                            throw new IOException("Illegal line: " + line);
+
+                        Path file = dir.resolve(line.substring(0, idx));
+
+                        // Should we check the sha1 of files? This will take a lot of time.
+                        if (Files.notExists(file))
+                            throw new NoSuchFileException(file.toAbsolutePath().toString());
+                    }
+                } catch (IOException e) {
+                    LOG.warning("Failed to verify Java in " + component, e);
+                    return;
+                }
+            }
+
+            if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
+                Path macPath = dir.resolve("jre.bundle/Contents/Home");
+                if (Files.exists(macPath)) {
+                    tryAddJavaHome(macPath);
+                    return;
+                } else
+                    LOG.warning("The Java is not in 'jre.bundle/Contents/Home'");
+            }
+
+            tryAddJavaHome(dir);
+        }
+
+        void searchAllJavaInRepository(Platform platform) {
+            for (Path java : REPOSITORY.getAllJava(platform)) {
+                tryAddJavaExecutable(java, true);
+            }
+
+            for (Path java : LOCAL_REPOSITORY.getAllJava(platform)) {
+                tryAddJavaExecutable(java, true);
+            }
+
+            if (platform.os() == OperatingSystem.MACOS) {
+                // In the past, we used 'osx' as the checked name for macOS
+                Path platformRoot = REPOSITORY.getPlatformRoot(platform).resolveSibling("osx-" + platform.getArchitecture().getCheckedName());
+                searchAllJavaInDirectory(platformRoot);
            }
        }

-        if (info != null && isCompatible(info.getPlatform()))
-            javaRuntimes.put(executable, JavaRuntime.of(executable, info, false));
-    }
+        void searchAllOfficialJava(Path directory, boolean verify) {
+            if (!Files.isDirectory(directory))
+                return;
+            // Examples:
+            // $HOME/Library/Application Support/minecraft/runtime/java-runtime-beta/mac-os/java-runtime-beta/jre.bundle/Contents/Home
+            // $HOME/.minecraft/runtime/java-runtime-beta/linux/java-runtime-beta

-    private static void tryAddJavaExecutable(Map<Path, JavaRuntime> javaRuntimes, Path executable) {
-        try {
-            executable = executable.toRealPath();
-        } catch (IOException e) {
-            return;
+            String javaPlatform = getMojangJavaPlatform(Platform.SYSTEM_PLATFORM);
+            if (javaPlatform != null) {
+                searchAllOfficialJava(directory, javaPlatform, verify);
+            }
+
+            if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
+                if (Architecture.SYSTEM_ARCH == Architecture.X86_64) {
+                    searchAllOfficialJava(directory, getMojangJavaPlatform(Platform.WINDOWS_X86), verify);
+                } else if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
+                    if (Platform.isSupportedTranslationX86_64()) {
+                        searchAllOfficialJava(directory, getMojangJavaPlatform(Platform.WINDOWS_X86_64), verify);
+                    }
+                    searchAllOfficialJava(directory, getMojangJavaPlatform(Platform.WINDOWS_X86), verify);
+                }
+            } else if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
+                if (Architecture.SYSTEM_ARCH == Architecture.ARM64 && Platform.isSupportedTranslationX86_64()) {
+                    searchAllOfficialJava(directory, getMojangJavaPlatform(Platform.MACOS_X86_64), verify);
+                }
+            }
        }

-        if (javaRuntimes.containsKey(executable) || ConfigHolder.globalConfig().getDisabledJava().contains(executable.toString())) {
-            return;
-        }
-
-        JavaInfo info = null;
-        try {
-            info = JavaInfoUtils.fromExecutable(executable, true);
-        } catch (IOException e) {
-            LOG.warning("Failed to lookup Java executable at " + executable, e);
-        }
-
-        if (info != null && isCompatible(info.getPlatform())) {
-            javaRuntimes.put(executable, JavaRuntime.of(executable, info, false));
-        }
-    }
-
-    private static void tryAddJavaInComponentDir(Map<Path, JavaRuntime> javaRuntimes, String platform, Path component, boolean verify) {
-        Path sha1File = component.resolve(platform).resolve(component.getFileName() + ".sha1");
-        if (!Files.isRegularFile(sha1File))
-            return;
-
-        Path dir = component.resolve(platform).resolve(component.getFileName());
-
-        if (verify) {
-            try (BufferedReader reader = Files.newBufferedReader(sha1File)) {
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    if (line.isEmpty()) continue;
-
-                    int idx = line.indexOf(" /#//");
-                    if (idx <= 0)
-                        throw new IOException("Illegal line: " + line);
-
-                    Path file = dir.resolve(line.substring(0, idx));
-
-                    // Should we check the sha1 of files? This will take a lot of time.
-                    if (Files.notExists(file))
-                        throw new NoSuchFileException(file.toAbsolutePath().toString());
+        void searchAllOfficialJava(Path directory, String platform, boolean verify) {
+            try (DirectoryStream<Path> dir = Files.newDirectoryStream(directory)) {
+                // component can be jre-legacy, java-runtime-alpha, java-runtime-beta, java-runtime-gamma or any other being added in the future.
+                for (Path component : dir) {
+                    tryAddJavaInComponentDir(platform, component, verify);
                }
            } catch (IOException e) {
-                LOG.warning("Failed to verify Java in " + component, e);
-                return;
+                LOG.warning("Failed to list java-runtime directory " + directory, e);
            }
        }

-        if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
-            Path macPath = dir.resolve("jre.bundle/Contents/Home");
-            if (Files.exists(macPath)) {
-                tryAddJavaHome(javaRuntimes, macPath);
+        void searchAllJavaInDirectory(Path directory) {
+            if (!Files.isDirectory(directory)) {
                return;
-            } else
-                LOG.warning("The Java is not in 'jre.bundle/Contents/Home'");
-        }
+            }

-        tryAddJavaHome(javaRuntimes, dir);
-    }
-
-    private static void searchAllJavaInRepository(Map<Path, JavaRuntime> javaRuntimes, Platform platform) {
-        for (JavaRuntime java : REPOSITORY.getAllJava(platform)) {
-            javaRuntimes.put(java.getBinary(), java);
-        }
-
-        for (JavaRuntime java : LOCAL_REPOSITORY.getAllJava(platform)) {
-            javaRuntimes.put(java.getBinary(), java);
-        }
-    }
-
-    private static void searchAllOfficialJava(Map<Path, JavaRuntime> javaRuntimes, Path directory, boolean verify) {
-        if (!Files.isDirectory(directory))
-            return;
-        // Examples:
-        // $HOME/Library/Application Support/minecraft/runtime/java-runtime-beta/mac-os/java-runtime-beta/jre.bundle/Contents/Home
-        // $HOME/.minecraft/runtime/java-runtime-beta/linux/java-runtime-beta
-
-        String javaPlatform = getMojangJavaPlatform(Platform.SYSTEM_PLATFORM);
-        if (javaPlatform != null) {
-            searchAllOfficialJava(javaRuntimes, directory, javaPlatform, verify);
-        }
-
-        if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
-            if (Architecture.SYSTEM_ARCH == Architecture.X86_64) {
-                searchAllOfficialJava(javaRuntimes, directory, getMojangJavaPlatform(Platform.WINDOWS_X86), verify);
-            } else if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
-                if (OperatingSystem.SYSTEM_BUILD_NUMBER >= 21277) {
-                    searchAllOfficialJava(javaRuntimes, directory, getMojangJavaPlatform(Platform.WINDOWS_X86_64), verify);
+            try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory)) {
+                for (Path subDir : stream) {
+                    tryAddJavaHome(subDir);
                }
-                searchAllOfficialJava(javaRuntimes, directory, getMojangJavaPlatform(Platform.WINDOWS_X86), verify);
+            } catch (IOException e) {
+                LOG.warning("Failed to find Java in " + directory, e);
            }
-        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS && Architecture.CURRENT_ARCH == Architecture.ARM64) {
-            searchAllOfficialJava(javaRuntimes, directory, getMojangJavaPlatform(Platform.MACOS_X86_64), verify);
        }
-    }

-    private static void searchAllOfficialJava(Map<Path, JavaRuntime> javaRuntimes, Path directory, String platform, boolean verify) {
-        try (DirectoryStream<Path> dir = Files.newDirectoryStream(directory)) {
-            // component can be jre-legacy, java-runtime-alpha, java-runtime-beta, java-runtime-gamma or any other being added in the future.
-            for (Path component : dir) {
-                tryAddJavaInComponentDir(javaRuntimes, platform, component, verify);
+        void searchJavaInProgramFiles(String env, String defaultValue) {
+            String programFiles = Lang.requireNonNullElse(System.getenv(env), defaultValue);
+            Path path;
+            try {
+                path = Path.of(programFiles);
+            } catch (InvalidPathException ignored) {
+                return;
            }
-        } catch (IOException e) {
-            LOG.warning("Failed to list java-runtime directory " + directory, e);
-        }
-    }

-    private static void searchAllJavaInDirectory(Map<Path, JavaRuntime> javaRuntimes, Path directory) {
-        if (!Files.isDirectory(directory)) {
-            return;
-        }
-
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory)) {
-            for (Path subDir : stream) {
-                tryAddJavaHome(javaRuntimes, subDir);
+            for (String vendor : KNOWN_VENDOR_DIRECTORIES) {
+                searchAllJavaInDirectory(path.resolve(vendor));
            }
-        } catch (IOException e) {
-            LOG.warning("Failed to find Java in " + directory, e);
-        }
-    }
-
-    private static void searchJavaInProgramFiles(Map<Path, JavaRuntime> javaRuntimes, String env, String defaultValue) {
-        String programFiles = Lang.requireNonNullElse(System.getenv(env), defaultValue);
-        Path path;
-        try {
-            path = Paths.get(programFiles);
-        } catch (InvalidPathException ignored) {
-            return;
        }

-        for (String vendor : new String[]{"Java", "BellSoft", "AdoptOpenJDK", "Zulu", "Microsoft", "Eclipse Foundation", "Semeru"}) {
-            searchAllJavaInDirectory(javaRuntimes, path.resolve(vendor));
-        }
-    }
-
-    private static void searchJavaInMacJavaVirtualMachines(Map<Path, JavaRuntime> javaRuntimes, Path directory) {
-        if (!Files.isDirectory(directory)) {
-            return;
-        }
-
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory)) {
-            for (Path subDir : stream) {
-                tryAddJavaHome(javaRuntimes, subDir.resolve("Contents/Home"));
+        void searchJavaInMacJavaVirtualMachines(Path directory) {
+            if (!Files.isDirectory(directory)) {
+                return;
+            }
+
+            try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory)) {
+                for (Path subDir : stream) {
+                    tryAddJavaHome(subDir.resolve("Contents/Home"));
+                }
+            } catch (IOException e) {
+                LOG.warning("Failed to find Java in " + directory, e);
            }
-        } catch (IOException e) {
-            LOG.warning("Failed to find Java in " + directory, e);
        }
-    }

-    // ==== Windows Registry Support ====
-    private static void queryJavaInRegistryKey(Map<Path, JavaRuntime> javaRuntimes, WinReg.HKEY hkey, String location) {
-        WinReg reg = WinReg.INSTANCE;
-        if (reg == null)
-            return;
+        // ==== Windows Registry Support ====
+        void queryJavaInRegistryKey(WinReg.HKEY hkey, String location) {
+            WinReg reg = WinReg.INSTANCE;
+            if (reg == null)
+                return;

-        for (String java : reg.querySubKeys(hkey, location)) {
-            if (!reg.querySubKeys(hkey, java).contains(java + "\\MSI"))
-                continue;
-            Object home = reg.queryValue(hkey, java, "JavaHome");
-            if (home instanceof String) {
-                try {
-                    tryAddJavaHome(javaRuntimes, Paths.get((String) home));
-                } catch (InvalidPathException e) {
-                    LOG.warning("Invalid Java path in system registry: " + home);
+            for (String java : reg.querySubKeys(hkey, location)) {
+                if (!reg.querySubKeys(hkey, java).contains(java + "\\MSI"))
+                    continue;
+                if (reg.queryValue(hkey, java, "JavaHome") instanceof String home) {
+                    try {
+                        tryAddJavaHome(Path.of(home));
+                    } catch (InvalidPathException e) {
+                        LOG.warning("Invalid Java path in system registry: " + home);
+                    }
                }
            }
        }
+
    }
 }
@@ -468,7 +468,9 @@ public final class Accounts {
            }
        } else if (exception instanceof MicrosoftService.XBox400Exception) {
            return i18n("account.methods.microsoft.error.wrong_verify_method");
-        } else if (exception instanceof MicrosoftService.NoMinecraftJavaEditionProfileException) {
+        } else if (exception instanceof MicrosoftService.MinecraftJavaEditionLicenseNotFoundException) {
+            return i18n("account.methods.microsoft.error.no_license");
+        } else if (exception instanceof MicrosoftService.MinecraftJavaEditionProfileNotFoundException) {
            return i18n("account.methods.microsoft.error.no_character");
        } else if (exception instanceof MicrosoftService.NoXuiException) {
            return i18n("account.methods.microsoft.error.add_family");
@@ -222,6 +222,36 @@ public final class Config extends ObservableSetting {
        this.acceptPreviewUpdate.set(acceptPreviewUpdate);
    }

+    @SerializedName("disableAutoShowUpdateDialog")
+    private final BooleanProperty disableAutoShowUpdateDialog = new SimpleBooleanProperty(false);
+
+    public BooleanProperty disableAutoShowUpdateDialogProperty() {
+        return disableAutoShowUpdateDialog;
+    }
+
+    public boolean isDisableAutoShowUpdateDialog() {
+        return disableAutoShowUpdateDialog.get();
+    }
+
+    public void setDisableAutoShowUpdateDialog(boolean disableAutoShowUpdateDialog) {
+        this.disableAutoShowUpdateDialog.set(disableAutoShowUpdateDialog);
+    }
+
+    @SerializedName("disableAprilFools")
+    private final BooleanProperty disableAprilFools = new SimpleBooleanProperty(false);
+
+    public BooleanProperty disableAprilFoolsProperty() {
+        return disableAprilFools;
+    }
+
+    public boolean isDisableAprilFools() {
+        return disableAprilFools.get();
+    }
+
+    public void setDisableAprilFools(boolean disableAprilFools) {
+        this.disableAprilFools.set(disableAprilFools);
+    }
+
    @SerializedName("shownTips")
    private final ObservableMap<String, Object> shownTips = FXCollections.observableHashMap();

@@ -537,6 +567,21 @@ public final class Config extends ObservableSetting {
        this.versionListSource.set(versionListSource);
    }

+    @SerializedName("defaultAddonSource")
+    private final StringProperty defaultAddonSource = new SimpleStringProperty("modrinth");
+
+    public StringProperty defaultAddonSourceProperty() {
+        return defaultAddonSource;
+    }
+
+    public String getDefaultAddonSource() {
+        return defaultAddonSource.get();
+    }
+
+    public void setDefaultAddonSource(String defaultAddonSource) {
+        this.defaultAddonSource.set(defaultAddonSource);
+    }
+
    @SerializedName("hasProxy")
    private final BooleanProperty hasProxy = new SimpleBooleanProperty();

@@ -659,6 +704,21 @@ public final class Config extends ObservableSetting {
        this.disableAutoGameOptions.set(disableAutoGameOptions);
    }

+    @SerializedName("allowAutoAgent")
+    private final BooleanProperty allowAutoAgent = new SimpleBooleanProperty(false);
+
+    public BooleanProperty allowAutoAgentProperty() {
+        return allowAutoAgent;
+    }
+
+    public boolean getAllowAutoAgent() {
+        return allowAutoAgent.get();
+    }
+
+    public void setAllowAutoAgent(boolean allowAutoAgent) {
+        this.allowAutoAgent.set(allowAutoAgent);
+    }
+
    // Accounts

    @SerializedName("authlibInjectorServers")
@@ -1,3 +1,20 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 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.setting;

 public final class SambaException extends RuntimeException {
@@ -45,7 +45,7 @@ public enum VersionIconType {
    public static VersionIconType getIconType(ModLoaderType modLoaderType) {
        return switch (modLoaderType) {
            case FORGE -> VersionIconType.FORGE;
-            case NEO_FORGED -> VersionIconType.NEO_FORGE;
+            case NEO_FORGE -> VersionIconType.NEO_FORGE;
            case FABRIC -> VersionIconType.FABRIC;
            case QUILT -> VersionIconType.QUILT;
            case LITE_LOADER -> VersionIconType.CHICKEN;
@@ -603,6 +603,20 @@ public final class VersionSetting implements Cloneable, Observable {
        processPriorityProperty.set(processPriority);
    }

+    private final ObjectProperty<GraphicsAPI> graphicsBackend = new SimpleObjectProperty<>(this, "graphicsBackend", GraphicsAPI.DEFAULT);
+
+    public ObjectProperty<GraphicsAPI> graphicsBackendProperty() {
+        return graphicsBackend;
+    }
+
+    public GraphicsAPI getGraphicsBackend() {
+        return graphicsBackendProperty().get();
+    }
+
+    public void setGraphicsBackend(GraphicsAPI api) {
+        graphicsBackendProperty().set(api);
+    }
+
    private final ObjectProperty<Renderer> rendererProperty = new SimpleObjectProperty<>(this, "renderer", Renderer.DEFAULT);

    public Renderer getRenderer() {
@@ -820,8 +834,9 @@ public final class VersionSetting implements Cloneable, Observable {
            }
            obj.addProperty("java", java);

+            obj.addProperty("graphicsBackend", src.getGraphicsBackend().name());
            obj.addProperty("renderer", src.getRenderer().name());
-            if (src.getRenderer() == Renderer.LLVMPIPE)
+            if (src.getRenderer() == Renderer.OpenGL.LLVMPIPE)
                obj.addProperty("useSoftwareRenderer", true);

            return obj;
@@ -894,16 +909,19 @@ public final class VersionSetting implements Cloneable, Observable {
            }

            vs.setRenderer(Optional.ofNullable(obj.get("renderer")).map(JsonElement::getAsString)
+                    .map(Renderer::of).orElseGet(() -> {
+                        boolean useSoftwareRenderer = Optional.ofNullable(obj.get("useSoftwareRenderer")).map(JsonElement::getAsBoolean).orElse(false);
+                        return useSoftwareRenderer ? Renderer.OpenGL.LLVMPIPE : Renderer.DEFAULT;
+                    }));
+
+            vs.setGraphicsBackend(Optional.ofNullable(obj.get("graphicsBackend")).map(JsonElement::getAsString)
                    .flatMap(name -> {
                        try {
-                            return Optional.of(Renderer.valueOf(name.toUpperCase(Locale.ROOT)));
+                            return Optional.of(GraphicsAPI.valueOf(name.toUpperCase(Locale.ROOT)));
                        } catch (IllegalArgumentException ignored) {
                            return Optional.empty();
                        }
-                    }).orElseGet(() -> {
-                        boolean useSoftwareRenderer = Optional.ofNullable(obj.get("useSoftwareRenderer")).map(JsonElement::getAsBoolean).orElse(false);
-                        return useSoftwareRenderer ? Renderer.LLVMPIPE : Renderer.DEFAULT;
-                    }));
+                    }).orElseGet(() -> vs.getRenderer() instanceof Renderer.Driver renderer ? renderer.api() : GraphicsAPI.DEFAULT));

            return vs;
        }
@@ -71,9 +71,15 @@ public final class TerracottaBundle {
                            return new Context() {
                                @Override
                                public void withResult(boolean success) {
+                                    super.withResult(success);
                                    delegate.withResult(success);
                                }

+                                @Override
+                                public void reset() throws IOException {
+                                    delegate.reset();
+                                }
+
                                @Override
                                public void write(byte[] buffer, int offset, int len) throws IOException {
                                    context.checkCancellation();
@@ -113,7 +119,7 @@ public final class TerracottaBundle {
                        throw new ArtifactMalformedException(String.format("Expecting %s file in terracotta bundle.", file));
                    }

-                    MessageDigest digest = DigestUtils.getDigest(check.getAlgorithm());
+                    MessageDigest digest = DigestUtils.getDigest(check.algorithm());
                    try (
                            InputStream is = tree.getInputStream(archive);
                            OutputStream os = new DigestOutputStream(Files.newOutputStream(path), digest)
@@ -122,8 +128,8 @@ public final class TerracottaBundle {
                    }

                    String hash = HexFormat.of().formatHex(digest.digest());
-                    if (!check.getChecksum().equalsIgnoreCase(hash)) {
-                        throw new ChecksumMismatchException(check.getAlgorithm(), check.getChecksum(), hash);
+                    if (!check.checksum().equalsIgnoreCase(hash)) {
+                        throw new ChecksumMismatchException(check.algorithm(), check.checksum(), hash);
                    }

                    switch (OperatingSystem.CURRENT_OS) {
@@ -172,7 +178,7 @@ public final class TerracottaBundle {
                return false;
            }

-            MessageDigest digest = DigestUtils.getDigest(check.getAlgorithm());
+            MessageDigest digest = DigestUtils.getDigest(check.algorithm());
            try (InputStream is = new DigestInputStream(Files.newInputStream(path), digest)) {
                int n;
                while ((n = is.read(buffer)) >= 0) {
@@ -182,7 +188,7 @@ public final class TerracottaBundle {
                    }
                }
            }
-            if (!HexFormat.of().formatHex(digest.digest()).equalsIgnoreCase(check.getChecksum())) {
+            if (!HexFormat.of().formatHex(digest.digest()).equalsIgnoreCase(check.checksum())) {
                return false;
            }
        }
@@ -36,8 +36,9 @@ import org.glavo.monetfx.beans.property.ColorSchemeProperty;
 import org.glavo.monetfx.beans.property.ReadOnlyColorSchemeProperty;
 import org.glavo.monetfx.beans.property.SimpleColorSchemeProperty;
 import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.ui.MacOSNativeUtils;
 import org.jackhuang.hmcl.ui.WindowsNativeUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.NativeUtils;
 import org.jackhuang.hmcl.util.platform.OSVersion;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
@@ -233,6 +234,11 @@ public final class Themes {
                    }
                });
            }
+        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS && MacOSNativeUtils.isSupported()) {
+            MacOSNativeUtils.setAppearance(darkModeProperty().get());
+
+            ChangeListener<Boolean> listener = FXUtils.onWeakChange(Themes.darkModeProperty(), MacOSNativeUtils::setAppearance);
+            stage.getProperties().put("Themes.applyNativeDarkMode.listener", listener);
        }
    }

@@ -23,6 +23,7 @@ import com.jfoenix.validation.base.ValidatorBase;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
+import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.WeakInvalidationListener;
 import javafx.beans.property.DoubleProperty;
@@ -64,12 +65,17 @@ import org.jackhuang.hmcl.ui.versions.GameListPage;
 import org.jackhuang.hmcl.ui.versions.VersionPage;
 import org.jackhuang.hmcl.ui.versions.Versions;
 import org.jackhuang.hmcl.util.*;
+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.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

+import java.io.IOException;
 import java.nio.file.Path;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;

@@ -82,6 +88,7 @@ public final class Controllers {
    public static final String JAVA_VERSION_TIP = "javaVersion";
    public static final String JAVA_INTERPRETED_MODE_TIP = "javaInterpretedMode";
    public static final String SOFTWARE_RENDERING = "softwareRendering";
+    public static final String APRIL_FOOLS = "aprilFools";

    public static final int MIN_WIDTH = 800 + 2 + 16; // bg width + border width*2 + shadow width*2
    public static final int MIN_HEIGHT = 450 + 2 + 40 + 16; // bg height + border width*2 + toolbar height + shadow width*2
@@ -99,9 +106,14 @@ public final class Controllers {
        GameListPage gameListPage = new GameListPage();
        gameListPage.selectedProfileProperty().bindBidirectional(Profiles.selectedProfileProperty());
        gameListPage.profilesProperty().bindContent(Profiles.profilesProperty());
-        FXUtils.applyDragListener(gameListPage, ModpackHelper::isFileModpackByExtension, modpacks -> {
-            Path modpack = modpacks.get(0);
-            Controllers.getDecorator().startWizard(new ModpackInstallWizardProvider(Profiles.getSelectedProfile(), modpack), i18n("install.modpack"));
+        FXUtils.applyDragListener(gameListPage, file -> ModpackHelper.isFileModpackByExtension(file) || "json".equalsIgnoreCase(FileUtils.getNameWithoutExtension(file)), files -> {
+            Path file = files.get(0);
+
+            if (ModpackHelper.isFileModpackByExtension(file)) {
+                Controllers.getDecorator().startWizard(new ModpackInstallWizardProvider(Profiles.getSelectedProfile(), file), i18n("install.modpack"));
+            } else if ("json".equalsIgnoreCase(FileUtils.getExtension(file))) {
+                Versions.installFromJson(Profiles.getSelectedProfile(), file);
+            }
        });
        return gameListPage;
    });
@@ -202,6 +214,21 @@ public final class Controllers {
        return decorator;
    }

+    public static void saveWindowStates() {
+        if (stageX != null) {
+            config().setX(stageX.get() / SCREEN.getBounds().getWidth());
+        }
+        if (stageY != null) {
+            config().setY(stageY.get() / SCREEN.getBounds().getHeight());
+        }
+        if (stageHeight != null) {
+            config().setHeight(stageHeight.get());
+        }
+        if (stageWidth != null) {
+            config().setWidth(stageWidth.get());
+        }
+    }
+
    public static void onApplicationStop() {
        stageSizeChangeListener = null;
        if (stageX != null) {
@@ -225,6 +252,8 @@ public final class Controllers {
    public static void initialize(Stage stage) {
        LOG.info("Start initializing application");

+        LOG.info("April Fools: " + AprilFools.isEnabled());
+
        if (System.getProperty("prism.lcdtext") == null) {
            String fontAntiAliasing = globalConfig().getFontAntiAliasing();
            if ("lcd".equalsIgnoreCase(fontAntiAliasing)) {
@@ -362,7 +391,7 @@ public final class Controllers {
            Runnable continueAction = () -> globalConfig().setPlatformPromptVersion(1);

            if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS && Architecture.SYSTEM_ARCH == Architecture.ARM64) {
-                Controllers.dialog(i18n("fatal.unsupported_platform.macos_arm64"), null, MessageType.INFO, continueAction);
+                continueAction.run();
            } else if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS && Architecture.SYSTEM_ARCH == Architecture.ARM64) {
                Controllers.dialog(i18n("fatal.unsupported_platform.windows_arm64"), null, MessageType.INFO, continueAction);
            } else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX &&
@@ -432,6 +461,53 @@ public final class Controllers {
            agreementPane.setActions(agreementLink, yesButton, noButton);
            Controllers.dialog(agreementPane);
        }
+
+        aprilFools:
+        if (AprilFools.isEnabled()) {
+            int currentYear = LocalDate.now().getYear();
+            if (config().getShownTips().get(APRIL_FOOLS) instanceof Number year && year.intValue() >= currentYear)
+                break aprilFools;
+
+            if (!I18n.getLocale().getLocale().getLanguage().equals("zh"))
+                break aprilFools;
+
+            SupportedLocale lzh = SupportedLocale.getSupportedLocales().stream()
+                    .filter(locale -> "lzh".equals(locale.getName()))
+                    .findFirst().orElse(null);
+
+            if (lzh == null) {
+                LOG.warning("No supported locale found for lzh");
+                break aprilFools;
+            }
+
+            Runnable updateShowTips = () -> config().getShownTips().put(APRIL_FOOLS, currentYear);
+
+            Controllers.confirmWithCountdown(i18n("launcher.april_fools.switch_lzh"), null, 10,
+                    MessageType.QUESTION, () -> {
+                        Controllers.confirm(i18n("launcher.april_fools.switch_lzh.confirm"), null, MessageType.QUESTION, () -> {
+                            LOG.info("Switching locale to " + lzh);
+
+                            updateShowTips.run();
+                            config().setLocalization(lzh);
+
+                            Controllers.onApplicationStop();
+
+                            try {
+                                FileSaver.waitForAllSaves();
+                            } catch (InterruptedException ignored) {
+                                // Ignore
+                            }
+
+                            try {
+                                Restarter.restartSelf();
+                            } catch (IOException e) {
+                                LOG.warning("Failed to restart self", e);
+                            }
+
+                            Platform.exit();
+                        }, updateShowTips);
+                    }, updateShowTips);
+        }
    }

    public static void dialog(Region content) {
@@ -519,7 +595,7 @@ public final class Controllers {
        return pane.getCompletableFuture();
    }

-    public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title, TaskCancellationAction onCancel) {
+    public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title, @NotNull TaskCancellationAction onCancel) {
        TaskExecutorDialogPane pane = new TaskExecutorDialogPane(onCancel);
        pane.setTitle(title);
        pane.setExecutor(executor);
@@ -527,7 +603,7 @@ public final class Controllers {
        return pane;
    }

-    public static TaskExecutorDialogPane taskDialog(Task<?> task, String title, TaskCancellationAction onCancel) {
+    public static TaskExecutorDialogPane taskDialog(Task<?> task, String title, @NotNull TaskCancellationAction onCancel) {
        TaskExecutor executor = task.executor();
        TaskExecutorDialogPane pane = taskDialog(executor, title, onCancel);
        executor.start();
@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.ui;
 import com.jfoenix.controls.*;
 import javafx.animation.Animation;
 import javafx.animation.Interpolator;
+import javafx.animation.PauseTransition;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -37,7 +38,6 @@ import javafx.event.EventDispatcher;
 import javafx.event.EventHandler;
 import javafx.event.EventType;
 import javafx.geometry.Bounds;
-import javafx.geometry.Pos;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.Cursor;
 import javafx.scene.Node;
@@ -51,7 +51,6 @@ import javafx.scene.input.*;
 import javafx.scene.layout.ColumnConstraints;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.Rectangle;
@@ -63,11 +62,13 @@ import javafx.stage.Stage;
 import javafx.util.Callback;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
+import org.glavo.url.WebURL;
 import org.jackhuang.hmcl.setting.StyleSheets;
 import org.jackhuang.hmcl.task.CacheFileTask;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.animation.AnimationUtils;
+import org.jackhuang.hmcl.ui.animation.Motion;
 import org.jackhuang.hmcl.ui.construct.IconedMenuItem;
 import org.jackhuang.hmcl.ui.construct.MenuSeparator;
 import org.jackhuang.hmcl.ui.construct.PopupMenu;
@@ -235,8 +236,8 @@ public final class FXUtils {

    public static final String DEFAULT_MONOSPACE_FONT = OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? "Consolas" : "Monospace";

-    public static final List<String> IMAGE_EXTENSIONS = Lang.immutableListOf(
-            "png", "jpg", "jpeg", "bmp", "gif", "webp", "apng"
+    public static final List<String> IMAGE_EXTENSIONS = List.of(
+            "png", "jpg", "jpeg", "bmp", "gif", "webp", "svg", "apng"
    );

    private static final Map<String, Image> builtinImageCache = new ConcurrentHashMap<>();
@@ -417,14 +418,6 @@ public final class FXUtils {
        return region.getMaxHeight();
    }

-    public static Node limitingSize(Node node, double width, double height) {
-        StackPane pane = new StackPane(node);
-        pane.setAlignment(Pos.CENTER);
-        FXUtils.setLimitWidth(pane, width);
-        FXUtils.setLimitHeight(pane, height);
-        return pane;
-    }
-
    public static void limitCellWidth(ListView<?> listView, ListCell<?> cell) {
        ReadOnlyDoubleProperty widthProperty;

@@ -1174,12 +1167,10 @@ public final class FXUtils {
        }
    }

-    public static Image loadImage(String url) throws Exception {
-        URI uri = NetworkUtils.toURI(url);
-
-        URLConnection connection = NetworkUtils.createConnection(uri);
-        if (connection instanceof HttpURLConnection)
-            connection = NetworkUtils.resolveConnection((HttpURLConnection) connection);
+    public static Image loadImage(WebURL url) throws Exception {
+        URLConnection connection = NetworkUtils.createConnection(url);
+        if (connection instanceof HttpURLConnection httpConnection)
+            connection = NetworkUtils.resolveConnection(httpConnection);

        try (BufferedInputStream input = new BufferedInputStream(connection.getInputStream())) {
            String contentType = Objects.requireNonNull(connection.getContentType(), "");
@@ -1249,8 +1240,8 @@ public final class FXUtils {
                .setSignificance(Task.TaskSignificance.MINOR);
    }

-    public static Task<Image> getRemoteImageTask(URI uri, int requestedWidth, int requestedHeight, boolean preserveRatio, boolean smooth) {
-        return new CacheFileTask(uri)
+    public static Task<Image> getRemoteImageTask(List<URI> uris, int requestedWidth, int requestedHeight, boolean preserveRatio, boolean smooth) {
+        return new CacheFileTask(uris)
                .setSignificance(Task.TaskSignificance.MINOR)
                .thenApplyAsync(file -> loadImage(file, requestedWidth, requestedHeight, preserveRatio, smooth))
                .setSignificance(Task.TaskSignificance.MINOR);
@@ -1291,6 +1282,30 @@ public final class FXUtils {
        return button;
    }

+    public static JFXButton newToggleButton4(SVG icon, int size) {
+        JFXButton button = new JFXButton();
+        button.getStyleClass().add("toggle-icon4");
+        button.setGraphic(icon.createIcon(size));
+        return button;
+    }
+
+    public static void setOnActionWithCooldown(ButtonBase button, Runnable action) {
+        setOnActionWithCooldown(button, action, Motion.SHORT4);
+    }
+
+    public static void setOnActionWithCooldown(ButtonBase button, Runnable action, Duration cooldown) {
+        button.setOnAction(e -> {
+            button.setDisable(true);
+
+            var pause = new PauseTransition(cooldown);
+            pause.setOnFinished(event -> button.setDisable(false));
+            pause.play();
+
+            action.run();
+            e.consume();
+        });
+    }
+
    public static Label newSafeTruncatedLabel() {
        Label label = new Label();
        label.setTextOverrun(OverrunStyle.CENTER_WORD_ELLIPSIS);
@@ -42,6 +42,7 @@ import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.theme.Themes;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.Log4jLevel;
@@ -273,10 +274,10 @@ public class GameCrashWindow extends Stage {
        logWindow.show();
    }

-    private void exportGameCrashInfo() {
+    private CompletableFuture<Path> exportGameCrashInfo() {
        Path logFile = Paths.get("minecraft-exported-crash-info-" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss")) + ".zip").toAbsolutePath();

-        CompletableFuture.supplyAsync(() ->
+        return CompletableFuture.supplyAsync(() ->
                        logs.stream().map(Log::getLog).collect(Collectors.joining("\n")))
                .thenComposeAsync(logs -> {
                    long processStartTime = managedProcess.getProcess().info()
@@ -301,20 +302,7 @@ public class GameCrashWindow extends Stage {
                                    return false;
                                }
                            });
-                })
-                .handleAsync((result, exception) -> {
-                    if (exception == null) {
-                        FXUtils.showFileInExplorer(logFile);
-                        var dialog = new MessageDialogPane.Builder(i18n("settings.launcher.launcher_log.export.success", logFile), i18n("message.success"), MessageDialogPane.MessageType.SUCCESS).ok(null).build();
-                        DialogUtils.show(stackPane, dialog);
-                    } else {
-                        LOG.warning("Failed to export game crash info", exception);
-                        var dialog = new MessageDialogPane.Builder(i18n("settings.launcher.launcher_log.export.failed") + "\n" + StringUtils.getStackTrace(exception), i18n("message.error"), MessageDialogPane.MessageType.ERROR).ok(null).build();
-                        DialogUtils.show(stackPane, dialog);
-                    }
-
-                    return null;
-                }, Schedulers.javafx());
+                }).thenApply(ignored -> logFile);
    }

    private final class View extends VBox {
@@ -444,8 +432,35 @@ public class GameCrashWindow extends Stage {
            HBox toolBar = new HBox();
            VBox.setMargin(toolBar, new Insets(0, 0, 4, 0));
            {
-                JFXButton exportGameCrashInfoButton = FXUtils.newRaisedButton(i18n("logwindow.export_game_crash_logs"));
-                exportGameCrashInfoButton.setOnAction(e -> exportGameCrashInfo());
+                SpinnerPane exportButtonPane = new SpinnerPane();
+                exportButtonPane.getStyleClass().add("small-spinner-pane");
+
+                JFXButton exportButton = FXUtils.newRaisedButton(i18n("logwindow.export_game_crash_logs"));
+                exportButtonPane.setContent(exportButton);
+                exportButton.setOnAction(e -> {
+                    exportButtonPane.showSpinner();
+                    exportGameCrashInfo().whenCompleteAsync((result, exception) -> {
+                        exportButtonPane.hideSpinner();
+
+                        if (exception == null) {
+                            FXUtils.showFileInExplorer(result);
+                            var dialog = new MessageDialogPane.Builder(
+                                    i18n("settings.launcher.launcher_log.export.success", result),
+                                    i18n("message.success"),
+                                    MessageDialogPane.MessageType.SUCCESS
+                            ).ok(null).build();
+                            DialogUtils.show(stackPane, dialog);
+                        } else {
+                            LOG.warning("Failed to export game crash info", exception);
+                            var dialog = new MessageDialogPane.Builder(
+                                    i18n("settings.launcher.launcher_log.export.failed") + "\n" + StringUtils.getStackTrace(exception),
+                                    i18n("message.error"),
+                                    MessageDialogPane.MessageType.ERROR
+                            ).ok(null).build();
+                            DialogUtils.show(stackPane, dialog);
+                        }
+                    }, Schedulers.javafx());
+                });

                JFXButton logButton = FXUtils.newRaisedButton(i18n("logwindow.title"));
                logButton.setOnAction(e -> showLogWindow());
@@ -457,7 +472,7 @@ public class GameCrashWindow extends Stage {
                toolBar.setPadding(new Insets(8));
                toolBar.setSpacing(8);
                toolBar.getStyleClass().add("jfx-tool-bar");
-                toolBar.getChildren().setAll(exportGameCrashInfoButton, logButton, helpButton);
+                toolBar.getChildren().setAll(exportButtonPane, logButton, helpButton);
            }

            getChildren().setAll(titlePane, infoPane, moddedPane, gameDirPane, toolBar);
@@ -37,6 +37,7 @@ import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 * @author Glavo
 */
 public final class HTMLRenderer {
+    private static final String INDENT = "  ";
    private static URI resolveLink(Node linkNode) {
        String href = linkNode.absUrl("href");
        if (href.isEmpty())
@@ -57,6 +58,7 @@ public final class HTMLRenderer {
    private boolean underline;
    private boolean strike;
    private boolean highlight;
+    private int indentLevel;
    private String headerLevel;
    private Node hyperlink;

@@ -218,7 +220,7 @@ public final class HTMLRenderer {
                appendImage(node);
                break;
            case "li":
-                appendText("\n \u2022 ");
+                appendText("\n" + INDENT.repeat(indentLevel) + " \u2022 ");
                break;
            case "dt":
                appendText(" ");
@@ -237,11 +239,14 @@ public final class HTMLRenderer {
        }

        if (node.childNodeSize() > 0) {
+            boolean isLiNode = "li".equals(name);
+            if (isLiNode) indentLevel++;
            pushNode(node);
            for (Node childNode : node.childNodes()) {
                appendNode(childNode);
            }
            popNode();
+            if (isLiNode) indentLevel--;
        }

        switch (name) {
@@ -28,16 +28,15 @@ import javafx.css.PseudoClass;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Cursor;
-import javafx.scene.Node;
 import javafx.scene.control.Control;
 import javafx.scene.control.Label;
 import javafx.scene.control.Skin;
 import javafx.scene.control.SkinBase;
-import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseButton;
 import javafx.scene.layout.*;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.setting.VersionIconType;
+import org.jackhuang.hmcl.ui.construct.ImageContainer;
 import org.jackhuang.hmcl.ui.construct.RipplerContainer;
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
@@ -295,14 +294,14 @@ public class InstallerItem extends Control {
            paneWrapper.pseudoClassStateChanged(CARD, control.style == Style.CARD);

            if (control.iconType != null) {
-                ImageView view = new ImageView(control.iconType.getIcon());
-                Node node = FXUtils.limitingSize(view, 32, 32);
-                node.setMouseTransparent(true);
-                node.getStyleClass().add("installer-item-image");
-                pane.getChildren().add(node);
+                var imageContainer = new ImageContainer(32);
+                imageContainer.setImage(control.iconType.getIcon());
+                imageContainer.setMouseTransparent(true);
+                imageContainer.getStyleClass().add("installer-item-image");
+                pane.getChildren().add(imageContainer);

                if (control.style == Style.CARD) {
-                    VBox.setMargin(node, new Insets(8, 0, 16, 0));
+                    VBox.setMargin(imageContainer, new Insets(8, 0, 16, 0));
                }
            }

@@ -348,9 +347,7 @@ public class InstallerItem extends Control {
            buttonsContainer.setAlignment(Pos.CENTER);
            pane.getChildren().add(buttonsContainer);

-            JFXButton removeButton = new JFXButton();
-            removeButton.setGraphic(SVG.CLOSE.createIcon());
-            removeButton.getStyleClass().add("toggle-icon4");
+            JFXButton removeButton = FXUtils.newToggleButton4(SVG.CLOSE);
            if (control.id.equals(MINECRAFT.getPatchId())) {
                removeButton.setVisible(false);
            } else {
@@ -30,15 +30,14 @@ import javafx.geometry.Pos;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
 import javafx.scene.input.KeyCode;
-import javafx.scene.input.MouseButton;
 import javafx.scene.layout.*;
 import javafx.stage.Stage;
 import org.jackhuang.hmcl.game.GameDumpGenerator;
 import org.jackhuang.hmcl.game.Log;
 import org.jackhuang.hmcl.setting.StyleSheets;
+import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.theme.Themes;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
-import org.jackhuang.hmcl.ui.construct.NoneMultipleSelectionModel;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.util.CircularArrayList;
 import org.jackhuang.hmcl.util.Lang;
@@ -169,6 +168,7 @@ public final class LogWindow extends Stage {
        LogWindowImpl() {
            getStyleClass().add("log-window");

+            listView.getStyleClass().add("no-horizontal-scrollbar");
            listView.getProperties().put("no-smooth-scrolling", true);
            listView.setItems(FXCollections.observableList(new CircularArrayList<>(logs.size())));

@@ -241,6 +241,10 @@ public final class LogWindow extends Stage {
            });
        }

+        private ManagedProcess getGameProcess() {
+            return gameProcess;
+        }
+
        @Override
        protected Skin<?> createDefaultSkin() {
            return new LogWindowSkin(this);
@@ -255,9 +259,6 @@ public final class LogWindow extends Stage {
        private static final PseudoClass INFO = PseudoClass.getPseudoClass("info");
        private static final PseudoClass DEBUG = PseudoClass.getPseudoClass("debug");
        private static final PseudoClass TRACE = PseudoClass.getPseudoClass("trace");
-        private static final PseudoClass SELECTED = PseudoClass.getPseudoClass("selected");
-
-        private final Set<ListCell<Log>> selected = new HashSet<>();
        private final JFXSnackbar snackbar = new JFXSnackbar();

        LogWindowSkin(LogWindowImpl control) {
@@ -303,6 +304,7 @@ public final class LogWindow extends Stage {

            {
                ListView<Log> listView = control.listView;
+                listView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
                listView.getItems().addListener((InvalidationListener) observable -> {
                    if (!listView.getItems().isEmpty() && control.autoScroll.get())
                        listView.scrollTo(listView.getItems().size() - 1);
@@ -312,7 +314,6 @@ public final class LogWindow extends Stage {
                        + "\"; -fx-font-size: " + config().getFontSize() + "px;");
                listView.setCellFactory(x -> new ListCell<>() {
                    {
-                        x.setSelectionModel(new NoneMultipleSelectionModel<>());
                        getStyleClass().add("log-window-list-cell");
                        Region clippedContainer = (Region) listView.lookup(".clipped-container");
                        if (clippedContainer != null) {
@@ -322,32 +323,6 @@ public final class LogWindow extends Stage {
                        setPadding(new Insets(2));
                        setWrapText(true);
                        setGraphic(null);
-
-                        setOnMouseClicked(event -> {
-                            if (event.getButton() != MouseButton.PRIMARY)
-                                return;
-
-                            if (!event.isControlDown()) {
-                                for (ListCell<Log> logListCell : selected) {
-                                    if (logListCell != this) {
-                                        logListCell.pseudoClassStateChanged(SELECTED, false);
-                                        if (logListCell.getItem() != null) {
-                                            logListCell.getItem().setSelected(false);
-                                        }
-                                    }
-                                }
-
-                                selected.clear();
-                            }
-
-                            selected.add(this);
-                            pseudoClassStateChanged(SELECTED, true);
-                            if (getItem() != null) {
-                                getItem().setSelected(true);
-                            }
-
-                            event.consume();
-                        });
                    }

                    @Override
@@ -361,7 +336,6 @@ public final class LogWindow extends Stage {
                        pseudoClassStateChanged(INFO, !empty && item.getLevel() == Log4jLevel.INFO);
                        pseudoClassStateChanged(DEBUG, !empty && item.getLevel() == Log4jLevel.DEBUG);
                        pseudoClassStateChanged(TRACE, !empty && item.getLevel() == Log4jLevel.TRACE);
-                        pseudoClassStateChanged(SELECTED, !empty && item.isSelected());

                        if (empty) {
                            setText(null);
@@ -373,10 +347,13 @@ public final class LogWindow extends Stage {

                listView.setOnKeyPressed(event -> {
                    if (event.isControlDown() && event.getCode() == KeyCode.C) {
+                        if (listView.getSelectionModel().isEmpty())
+                            return;
+
                        StringBuilder stringBuilder = new StringBuilder();

-                        for (Log item : listView.getItems()) {
-                            if (item != null && item.isSelected()) {
+                        for (Log item : listView.getSelectionModel().getSelectedItems()) {
+                            if (item != null) {
                                if (item.getLog() != null)
                                    stringBuilder.append(item.getLog());
                                stringBuilder.append('\n');
@@ -411,11 +388,12 @@ public final class LogWindow extends Stage {
                terminateButton.setOnAction(e -> getSkinnable().onTerminateGame());

                SpinnerPane exportDumpPane = new SpinnerPane();
+                exportDumpPane.getStyleClass().add("small-spinner-pane");
                JFXButton exportDumpButton = new JFXButton(i18n("logwindow.export_dump"));
                if (SystemUtils.supportJVMAttachment()) {
                    exportDumpButton.setOnAction(e -> getSkinnable().onExportDump(exportDumpPane));
                } else {
-                    exportDumpButton.setTooltip(new Tooltip(i18n("logwindow.export_dump.no_dependency")));
+                    FXUtils.installFastTooltip(exportDumpPane, i18n("logwindow.export_dump.no_dependency"));
                    exportDumpButton.setDisable(true);
                }
                exportDumpPane.setContent(exportDumpButton);
@@ -424,6 +402,13 @@ public final class LogWindow extends Stage {
                clearButton.setOnAction(e -> getSkinnable().onClear());
                hBox.getChildren().setAll(autoScrollCheckBox, exportLogsButton, terminateButton, exportDumpPane, clearButton);

+                control.getGameProcess().getProcess()
+                        .onExit()
+                        .thenRunAsync(() -> {
+                            terminateButton.setDisable(true);
+                            exportDumpButton.setDisable(true);
+                        }, Schedulers.javafx());
+
                vbox.getChildren().add(bottom);
            }
        }
@@ -0,0 +1,101 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 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 com.sun.jna.Pointer;
+import org.jackhuang.hmcl.util.platform.macos.ObjectiveCRuntime;
+import org.jetbrains.annotations.Nullable;
+
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+
+public final class MacOSNativeUtils {
+
+    private static final Pointer nsApp = init();
+
+    private static @Nullable Pointer init() {
+        if (ObjectiveCRuntime.INSTANCE == null) {
+            return null;
+        }
+
+        try {
+            var objc = ObjectiveCRuntime.INSTANCE;
+
+            Pointer nsApplication = objc.objc_getClass("NSApplication");
+            if (!isNull(nsApplication)) {
+                Pointer sharedSel = objc.sel_registerName("sharedApplication");
+                if (!isNull(sharedSel))
+                    return objc.objc_msgSend(nsApplication, sharedSel);
+            }
+        } catch (Throwable e) {
+            LOG.warning("Failed to initialize macOS appearance support", e);
+        }
+
+        return null;
+    }
+
+    public static boolean isSupported() {
+        return nsApp != null;
+    }
+
+    private static boolean isNull(Pointer pointer) {
+        return pointer == null || Pointer.nativeValue(pointer) == 0;
+    }
+
+    public static void setAppearance(boolean dark) {
+        setAppearance(dark, false);
+    }
+
+    public static void setAppearance(boolean dark, boolean highContrast) {
+        if (nsApp == null) return;
+
+        try {
+            var objc = ObjectiveCRuntime.INSTANCE;
+
+            Pointer nsAppearance = objc.objc_getClass("NSAppearance");
+            if (isNull(nsAppearance))
+                return;
+
+            Pointer namedSel = objc.sel_registerName("appearanceNamed:");
+            Pointer nsString = objc.objc_getClass("NSString");
+            if (isNull(nsString)) return;
+
+            Pointer sel = objc.sel_registerName("stringWithUTF8String:");
+
+            String appearanceName;
+            if (highContrast) {
+                appearanceName = dark ? "NSAppearanceNameAccessibilityHighContrastDarkAqua" : "NSAppearanceNameAccessibilityHighContrastAqua";
+            } else {
+                appearanceName = dark ? "NSAppearanceNameDarkAqua" : "NSAppearanceNameAqua";
+            }
+
+            Pointer appearanceNamePtr = objc.objc_msgSend(nsString, sel, appearanceName);
+            if (isNull(appearanceNamePtr)) return;
+
+            Pointer appearance = objc.objc_msgSend(nsAppearance, namedSel, appearanceNamePtr);
+            if (isNull(appearance)) return;
+
+            Pointer setSel = objc.sel_registerName("setAppearance:");
+            objc.objc_msgSend(nsApp, setSel, appearance);
+        } catch (Throwable t) {
+            LOG.warning("Failed to set macOS appearance", t);
+        }
+    }
+
+    private MacOSNativeUtils() {
+    }
+}
@@ -0,0 +1,228 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 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.application.Platform;
+import javafx.beans.property.*;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.control.Control;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.StackPane;
+import javafx.scene.shape.Rectangle;
+import org.jackhuang.hmcl.util.FXThread;
+import org.jackhuang.hmcl.util.MathUtils;
+import org.jackhuang.hmcl.util.platform.SystemInfo;
+import org.jackhuang.hmcl.util.platform.hardware.PhysicalMemoryStatus;
+
+import java.lang.ref.WeakReference;
+
+/// @author Glavo
+public final class MemoryStatusBar extends Control {
+
+    private static final String DEFAULT_STYLE_CLASS = "memory-status-bar";
+
+    public MemoryStatusBar() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+
+        setPrefWidth(200);
+    }
+
+    private final ReadOnlyObjectProperty<PhysicalMemoryStatus> memoryStatus = UpdateMemoryStatus.memoryStatusProperty();
+
+    /// The memory status of the system.
+    ///
+    /// The property will be automatically updated.
+    ///
+    /// The property has no bean, because it may share between multiple MemoryStatusBar instances.
+    public ReadOnlyObjectProperty<PhysicalMemoryStatus> memoryStatusProperty() {
+        return memoryStatus;
+    }
+
+    public PhysicalMemoryStatus getMemoryStatus() {
+        return memoryStatus.get();
+    }
+
+    private final DoubleProperty memoryAllocated = new SimpleDoubleProperty();
+
+    public DoubleProperty memoryAllocatedProperty() {
+        return memoryAllocated;
+    }
+
+    public double getMemoryAllocated() {
+        return memoryAllocated.get();
+    }
+
+    public void setMemoryAllocated(double memoryAllocated) {
+        this.memoryAllocated.set(memoryAllocated);
+    }
+
+    @Override
+    protected SkinBase<MemoryStatusBar> createDefaultSkin() {
+        return new Skin(this);
+    }
+
+    private static final class Skin extends SkinBase<MemoryStatusBar> {
+        private static final int HEIGHT = 4;
+
+        private final StackPane track;
+        private final Rectangle memoryUsed;
+        private final Rectangle memoryAllocate;
+
+        private double contentWidth = -1;
+
+        Skin(MemoryStatusBar control) {
+            super(control);
+
+            track = new StackPane();
+            track.getStyleClass().add("track");
+            track.setPadding(new Insets(HEIGHT, 0, 0, 0));
+
+            memoryUsed = new Rectangle();
+            memoryUsed.setManaged(false);
+            memoryUsed.setArcWidth(HEIGHT);
+            memoryUsed.setArcHeight(HEIGHT);
+            memoryUsed.getStyleClass().add("memory-used");
+
+            memoryAllocate = new Rectangle();
+            memoryAllocate.setManaged(false);
+            memoryAllocate.setArcWidth(HEIGHT);
+            memoryAllocate.setArcHeight(HEIGHT);
+            memoryAllocate.getStyleClass().add("memory-allocate");
+
+            this.getChildren().setAll(track, memoryAllocate, memoryUsed);
+
+            registerInvalidationListener(control.memoryStatusProperty(), it -> updateBar());
+            registerInvalidationListener(control.memoryAllocatedProperty(), it -> updateBar());
+        }
+
+        private void updateBar() {
+            if (contentWidth <= 0) {
+                // not yet layout
+                return;
+            }
+
+            PhysicalMemoryStatus status = getSkinnable().getMemoryStatus();
+            double total = status.getTotal();
+            double used = status.getUsed();
+            double allocated = getSkinnable().getMemoryAllocated();
+
+            if (total <= 0) {
+                memoryUsed.setWidth(contentWidth);
+                memoryAllocate.setWidth(contentWidth);
+                return;
+            }
+
+            double usedWidth = MathUtils.clamp(contentWidth * (used / total), 0, contentWidth);
+            double allocatedWidth = MathUtils.clamp(contentWidth * (allocated / total) + usedWidth, 0, contentWidth);
+
+            memoryUsed.setWidth(usedWidth);
+            memoryAllocate.setWidth(allocatedWidth);
+        }
+
+        @Override
+        protected void layoutChildren(double contentX, double contentY, double contentWidth, double contentHeight) {
+            track.resizeRelocate(contentX, contentY, contentWidth, contentHeight);
+            memoryUsed.relocate(contentX, contentY);
+            memoryAllocate.relocate(contentX, contentY);
+
+            this.contentWidth = contentWidth;
+
+            memoryUsed.setHeight(contentHeight);
+            memoryAllocate.setHeight(contentHeight);
+
+            updateBar();
+        }
+
+        @Override
+        public double computeBaselineOffset(double topInset, double rightInset, double bottomInset, double leftInset) {
+            return Node.BASELINE_OFFSET_SAME_AS_HEIGHT;
+        }
+
+        @Override
+        protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+            return leftInset + track.prefWidth(height) + rightInset;
+        }
+
+        @Override
+        protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+            return topInset + HEIGHT + bottomInset;
+        }
+
+        @Override
+        protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+            return computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
+        }
+    }
+
+    private static final class UpdateMemoryStatus extends Thread {
+
+        private static final int UPDATE_INTERVAL = 3000;
+
+        @FXThread
+        private static WeakReference<ObjectProperty<PhysicalMemoryStatus>> memoryStatusPropertyCache;
+
+        @FXThread
+        static ReadOnlyObjectProperty<PhysicalMemoryStatus> memoryStatusProperty() {
+            if (memoryStatusPropertyCache != null) {
+                var property = memoryStatusPropertyCache.get();
+                if (property != null) {
+                    return property;
+                }
+            }
+
+            ObjectProperty<PhysicalMemoryStatus> property = new SimpleObjectProperty<>(PhysicalMemoryStatus.INVALID);
+            memoryStatusPropertyCache = new WeakReference<>(property);
+            new UpdateMemoryStatus(memoryStatusPropertyCache).start();
+            return property;
+        }
+
+        private final WeakReference<ObjectProperty<PhysicalMemoryStatus>> memoryStatusPropertyRef;
+
+        UpdateMemoryStatus(WeakReference<ObjectProperty<PhysicalMemoryStatus>> memoryStatusPropertyRef) {
+            this.memoryStatusPropertyRef = memoryStatusPropertyRef;
+
+            setName("UpdateMemoryStatus");
+            setDaemon(true);
+            setPriority(Thread.MIN_PRIORITY);
+        }
+
+        @Override
+        public void run() {
+            while (true) {
+                PhysicalMemoryStatus status = SystemInfo.getPhysicalMemoryStatus();
+
+                var memoryStatusProperty = memoryStatusPropertyRef.get();
+                if (memoryStatusProperty == null)
+                    return;
+
+                if (Controllers.isStopped())
+                    return;
+
+                Platform.runLater(() -> memoryStatusProperty.set(status));
+
+                try {
+                    //noinspection BusyWait
+                    Thread.sleep(UPDATE_INTERVAL);
+                } catch (InterruptedException e) {
+                    return;
+                }
+            }
+        }
+    }
+}
@@ -62,6 +62,7 @@ public enum SVG {
    EXTENSION_FILL("M8.8 21H5q-.825 0-1.4125-.5875T3 19V15.2q1.2 0 2.1-.7625T6 12.5q0-1.175-.9-1.9375T3 9.8V6q0-.825.5875-1.4125T5 4H9q0-1.05.725-1.775T11.5 1.5q1.05 0 1.775.725T14 4h4q.825 0 1.4125.5875T20 6v4q1.05 0 1.775.725T22.5 12.5q0 1.05-.725 1.775T20 15v4q0 .825-.5875 1.4125T18 21H14.2q0-1.25-.7875-2.125T11.5 18q-1.125 0-1.9125.875T8.8 21Z"),
    FEEDBACK("M12 15Q12.425 15 12.7125 14.7125T13 14Q13 13.575 12.7125 13.2875T12 13Q11.575 13 11.2875 13.2875T11 14Q11 14.425 11.2875 14.7125T12 15ZM11 11H13V5H11V11ZM2 22V4Q2 3.175 2.5875 2.5875T4 2H20Q20.825 2 21.4125 2.5875T22 4V16Q22 16.825 21.4125 17.4125T20 18H6L2 22ZM5.15 16H20V4H4V17.125L5.15 16ZM4 16V4 16Z"),
    FEEDBACK_FILL("M2 22V4q0-.825.5875-1.4125T4 2H20q.825 0 1.4125.5875T22 4V16q0 .825-.5875 1.4125T20 18H6L2 22Zm10-7q.425 0 .7125-.2875T13 14t-.2875-.7125T12 13t-.7125.2875T11 14t.2875.7125T12 15Zm-1-4h2V5H11v6Z"),
+    FILE_OPEN("M6 22q-0.825 0-1.4125-0.5875T4 20v-16q0-0.825 0.5875-1.4125T6 2h8l6 6v6h-2v-5H13v-5H6v16h9v2H6Zm15.95 0.375L19 19.425v2.225h-2v-5.65h5.65v2h-2.25l2.95 2.95-1.4 1.425Zm-15.95-2.375v-16 16Z"),
    FOLDER("M4 20Q3.175 20 2.5875 19.4125T2 18V6Q2 5.175 2.5875 4.5875T4 4H10L12 6H20Q20.825 6 21.4125 6.5875T22 8V18Q22 18.825 21.4125 19.4125T20 20H4ZM4 18H20V8H11.175L9.175 6H4V18ZM4 18V6 18Z"),
    FOLDER_COPY("M3 21Q2.175 21 1.5875 20.4125T1 19V6H3V19H20V21H3ZM7 17Q6.175 17 5.5875 16.4125T5 15V4Q5 3.175 5.5875 2.5875T7 2H12L14 4H21Q21.825 4 22.4125 4.5875T23 6V15Q23 15.825 22.4125 16.4125T21 17H7ZM7 15H21V6H13.175L11.175 4H7V15ZM7 15V4 15Z"),
    FOLDER_OPEN("M4 20Q3.175 20 2.5875 19.4125T2 18V6Q2 5.175 2.5875 4.5875T4 4H10L12 6H20Q20.825 6 21.4125 6.5875T22 8H11.175L9.175 6H4V18L6.4 10H23.5L20.925 18.575Q20.725 19.225 20.1875 19.6125T19 20H4ZM6.1 18H19L20.8 12H7.9L6.1 18ZM6.1 18 7.9 12 6.1 18ZM4 8V6 8Z"),
@@ -50,10 +50,10 @@ public final class UpgradeDialog extends JFXDialogLayout {
        setHeading(new Label(i18n("update.changelog")));
        setBody(new JFXSpinner());

-        String url = CHANGELOG_URL + remoteVersion.getChannel().channelName + ".html";
+        String url = CHANGELOG_URL + remoteVersion.channel().channelName + ".html";

        Task.supplyAsync(Schedulers.io(), () -> {
-            VersionNumber targetVersion = VersionNumber.asVersion(remoteVersion.getVersion());
+            VersionNumber targetVersion = VersionNumber.asVersion(remoteVersion.version());
            VersionNumber currentVersion = VersionNumber.asVersion(Metadata.VERSION);
            if (targetVersion.compareTo(currentVersion) <= 0)
                // Downgrade update, no need to display changelog
@@ -164,6 +164,9 @@ public class AccountListItem extends RadioButton {
                    if (skinImg.isError()) {
                        throw new InvalidSkinException("Failed to read skin image", skinImg.getException());
                    }
+                    if (skinImg.getWidth() != 64 || (skinImg.getHeight() != 32 && skinImg.getHeight() != 64)) {
+                        throw new InvalidSkinException("Invalid skin size");
+                    }
                    NormalizedSkin skin = new NormalizedSkin(skinImg);
                    String model = skin.isSlim() ? "slim" : "";
                    LOG.info("Uploading skin [" + selectedFile + "], model [" + model + "]");
@@ -125,7 +125,7 @@ public final class AccountListItemSkin extends SkinBase<AccountListItem> {
        spinnerMove.setContent(btnMove);
        right.getChildren().add(spinnerMove);

-        JFXButton btnRefresh = new JFXButton();
+        JFXButton btnRefresh = FXUtils.newToggleButton4(SVG.REFRESH);
        SpinnerPane spinnerRefresh = new SpinnerPane();
        spinnerRefresh.getStyleClass().setAll("small-spinner-pane");
        if (skinnable.getAccount() instanceof MicrosoftAccount && Accounts.OAUTH_CALLBACK.getClientId().isEmpty()) {
@@ -144,13 +144,11 @@ public final class AccountListItemSkin extends SkinBase<AccountListItem> {
                    })
                    .start();
        });
-        btnRefresh.getStyleClass().add("toggle-icon4");
-        btnRefresh.setGraphic(SVG.REFRESH.createIcon());
        FXUtils.installFastTooltip(btnRefresh, i18n("button.refresh"));
        spinnerRefresh.setContent(btnRefresh);
        right.getChildren().add(spinnerRefresh);

-        JFXButton btnUpload = new JFXButton();
+        JFXButton btnUpload = FXUtils.newToggleButton4(SVG.CHECKROOM);
        SpinnerPane spinnerUpload = new SpinnerPane();
        btnUpload.setOnAction(e -> {
            Task<?> uploadTask = skinnable.uploadSkin();
@@ -161,29 +159,23 @@ public final class AccountListItemSkin extends SkinBase<AccountListItem> {
                        .start();
            }
        });
-        btnUpload.getStyleClass().add("toggle-icon4");
-        btnUpload.setGraphic(SVG.CHECKROOM.createIcon());
        FXUtils.installFastTooltip(btnUpload, i18n("account.skin.upload"));
        btnUpload.disableProperty().bind(Bindings.not(skinnable.canUploadSkin()));
        spinnerUpload.setContent(btnUpload);
        spinnerUpload.getStyleClass().add("small-spinner-pane");
        right.getChildren().add(spinnerUpload);

-        JFXButton btnCopyUUID = new JFXButton();
+        JFXButton btnCopyUUID = FXUtils.newToggleButton4(SVG.CONTENT_COPY);
        SpinnerPane spinnerCopyUUID = new SpinnerPane();
        spinnerCopyUUID.getStyleClass().add("small-spinner-pane");
-        btnUpload.getStyleClass().add("toggle-icon4");
        btnCopyUUID.setOnAction(e -> FXUtils.copyText(skinnable.getAccount().getUUID().toString()));
-        btnCopyUUID.setGraphic(SVG.CONTENT_COPY.createIcon());
        FXUtils.installFastTooltip(btnCopyUUID, i18n("account.copy_uuid"));
        spinnerCopyUUID.setContent(btnCopyUUID);
        right.getChildren().add(spinnerCopyUUID);

-        JFXButton btnRemove = new JFXButton();
+        JFXButton btnRemove = FXUtils.newToggleButton4(SVG.DELETE_FOREVER);
        btnRemove.setOnAction(e -> Controllers.confirm(i18n("button.remove.confirm"), i18n("button.remove"), skinnable::remove, null));
-        btnRemove.getStyleClass().add("toggle-icon4");
        BorderPane.setAlignment(btnRemove, Pos.CENTER);
-        btnRemove.setGraphic(SVG.DELETE.createIcon());
        FXUtils.installFastTooltip(btnRemove, i18n("button.delete"));
        right.getChildren().add(btnRemove);
        root.setRight(right);
@@ -115,7 +115,7 @@ public final class AddAuthlibInjectorServerPane extends TransitionPane implement
                GridPane.setRowIndex(lblServerName, 1);

                lblServerWarning = new Label(i18n("account.injector.http"));
-                lblServerWarning.setStyle("-fx-text-fill: red;");
+                lblServerWarning.setStyle("-fx-text-fill: -monet-error;");
                GridPane.setColumnIndex(lblServerWarning, 0);
                GridPane.setRowIndex(lblServerWarning, 2);
                lblServerWarning.managedProperty().bind(lblServerWarning.visibleProperty());
@@ -303,7 +303,7 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
            for (String key : ALLOWED_LINKS) {
                String value = links.get(key);
                if (value != null) {
-                    Hyperlink link = new Hyperlink(i18n("account.injector.link." + key));
+                    JFXHyperlink link = new JFXHyperlink(i18n("account.injector.link." + key));
                    FXUtils.installSlowTooltip(link, value);
                    link.setOnAction(e -> FXUtils.openLink(value));
                    result.add(link);
@@ -399,9 +399,7 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
                });
                linksContainer.setMinWidth(USE_PREF_SIZE);

-                JFXButton btnAddServer = new JFXButton();
-                btnAddServer.setGraphic(SVG.ADD.createIcon(20));
-                btnAddServer.getStyleClass().add("toggle-icon4");
+                JFXButton btnAddServer = FXUtils.newToggleButton4(SVG.ADD, 20);
                btnAddServer.setOnAction(e -> {
                    Controllers.dialog(new AddAuthlibInjectorServerPane());
                });
@@ -566,7 +564,7 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
        }
    }

-    private static class DialogCharacterSelector extends BorderPane implements CharacterSelector {
+    public static class DialogCharacterSelector extends JFXDialogLayout implements CharacterSelector {

        private final AdvancedListBox listBox = new AdvancedListBox();
        private final JFXButton cancel = new JFXButton();
@@ -578,17 +576,17 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
            setStyle("-fx-padding: 8px;");

            cancel.setText(i18n("button.cancel"));
-            StackPane.setAlignment(cancel, Pos.BOTTOM_RIGHT);
            cancel.setOnAction(e -> latch.countDown());
+            cancel.getStyleClass().add("dialog-cancel");

            listBox.startCategory(i18n("account.choose").toUpperCase(Locale.ROOT));

-            setCenter(listBox);
+            setBody(listBox);

            HBox hbox = new HBox();
            hbox.setAlignment(Pos.CENTER_RIGHT);
            hbox.getChildren().add(cancel);
-            setBottom(hbox);
+            setActions(hbox);

            onEscPressed(this, cancel::fire);
        }
@@ -1,3 +1,20 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026  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.account;

 import com.jfoenix.controls.JFXButton;
@@ -175,16 +192,20 @@ public class MicrosoftAccountLoginPane extends JFXDialogLayout implements Dialog
        } else if (currentStep instanceof Step.WaitForScanQrCode wait) {
            loginButtonSpinner.setLoading(true);

+            String scanUri = "https://www.microsoft.com/link".equals(wait.verificationUri())
+                    ? "https://www.microsoft.com/link?otc=" + wait.userCode()
+                    : wait.verificationUri();
+
            var deviceHint = new HintPane(MessageDialogPane.MessageType.INFO);
            deviceHint.setSegment(i18n("account.methods.microsoft.methods.device.hint",
-                    StringUtils.escapeXmlAttribute(wait.verificationUri()),
+                    StringUtils.escapeXmlAttribute(scanUri),
                    wait.verificationUri(),
                    wait.userCode()
            ));

            var qrCode = new SVGPath();
            qrCode.fillProperty().bind(Themes.colorSchemeProperty().getPrimary());
-            qrCode.setContent(QrCodeUtils.toSVGPath(QrCode.encodeText(wait.verificationUri() + "?otc=" + wait.userCode(), QrCode.Ecc.MEDIUM)));
+            qrCode.setContent(QrCodeUtils.toSVGPath(QrCode.encodeText(scanUri, QrCode.Ecc.MEDIUM)));
            qrCode.setScaleX(3);
            qrCode.setScaleY(3);

@@ -21,6 +21,7 @@ import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXComboBox;
 import com.jfoenix.controls.JFXDialogLayout;
 import com.jfoenix.controls.JFXTextField;
+import javafx.animation.PauseTransition;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.geometry.Insets;
@@ -29,6 +30,7 @@ import javafx.scene.control.Label;
 import javafx.scene.input.DragEvent;
 import javafx.scene.input.TransferMode;
 import javafx.scene.layout.*;
+import javafx.util.Duration;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.offline.Skin;
 import org.jackhuang.hmcl.auth.yggdrasil.TextureModel;
@@ -135,7 +137,9 @@ public class OfflineAccountSkinPane extends StackPane {
            capeSelector.setValue(account.getSkin().getLocalCapePath());
        }

-        skinBinding = FXUtils.observeWeak(() -> {
+        PauseTransition pauseTransition = new PauseTransition(Duration.seconds(1));
+
+        Runnable loadSkin = () -> {
            getSkin().load(account.getUsername())
                    .whenComplete(Schedulers.javafx(), (result, exception) -> {
                        if (exception != null) {
@@ -157,6 +161,23 @@ public class OfflineAccountSkinPane extends StackPane {
                                    result.getCape() != null ? result.getCape().getImage() : null);
                        }
                    }).start();
+        };
+
+        pauseTransition.setOnFinished(e -> loadSkin.run());
+
+        skinBinding = FXUtils.observeWeak(() -> {
+            Skin.Type selectedType = skinItem.getSelectedData();
+
+            if (selectedType == Skin.Type.CUSTOM_SKIN_LOADER_API) {
+                if (!cslApiField.validate()) {
+                    pauseTransition.stop();
+                    return;
+                }
+                pauseTransition.playFromStart();
+            } else {
+                pauseTransition.stop();
+                loadSkin.run();
+            }
        }, skinItem.selectedDataProperty(), cslApiField.textProperty(), modelCombobox.valueProperty(), skinSelector.valueProperty(), capeSelector.valueProperty());

        FXUtils.onChangeAndOperate(skinItem.selectedDataProperty(), selectedData -> {
@@ -17,7 +17,6 @@
 */
 package org.jackhuang.hmcl.ui.construct;

-import com.jfoenix.controls.JFXButton;
 import javafx.beans.property.*;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
@@ -85,13 +84,11 @@ public class AdvancedListItem extends Control {
    }

    public void setRightAction(SVG icon, Runnable action) {
-        var button = new JFXButton();
+        var button = FXUtils.newToggleButton4(icon, 14);
        button.setOnAction(e -> {
            action.run();
            e.consume();
        });
-        button.getStyleClass().add("toggle-icon4");
-        button.setGraphic(icon.createIcon(14));
        setAlignment(button, Pos.CENTER);
        setRightGraphic(button);
    }
@@ -19,6 +19,8 @@ package org.jackhuang.hmcl.ui.construct;

 import javafx.animation.*;
 import javafx.application.Platform;
+import javafx.beans.InvalidationListener;
+import javafx.css.PseudoClass;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
@@ -28,6 +30,7 @@ import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
+import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 import org.jackhuang.hmcl.theme.Themes;
 import org.jackhuang.hmcl.ui.FXUtils;
@@ -43,8 +46,6 @@ final class ComponentSublistWrapper extends VBox implements NoPaddingComponent {
    private boolean expanded = false;

    ComponentSublistWrapper(ComponentSublist sublist) {
-        boolean noPadding = !sublist.hasComponentPadding();
-
        this.getStyleClass().add("options-sublist-wrapper");

        Node expandIcon = SVG.KEYBOARD_ARROW_DOWN.createIcon(20);
@@ -104,12 +105,26 @@ final class ComponentSublistWrapper extends VBox implements NoPaddingComponent {

                if (container == null) {
                    this.container = new VBox();
-
-                    if (!noPadding) {
-                        container.setPadding(new Insets(8, 16, 10, 16));
-                    }
+                    this.container.getStyleClass().add("container");
                    FXUtils.setLimitHeight(container, 0);
-                    FXUtils.setOverflowHidden(container);
+
+                    Rectangle rectangle = FXUtils.setOverflowHidden(container);
+                    rectangle.getStyleClass().add("overflow-hidden");
+
+                    var last = PseudoClass.getPseudoClass("last");
+
+                    InvalidationListener updateArc = o -> {
+                        if (ComponentSublistWrapper.this.getPseudoClassStates().contains(last)) {
+                            rectangle.setArcHeight(4);
+                            rectangle.setArcWidth(4);
+                        } else {
+                            rectangle.setArcHeight(0);
+                            rectangle.setArcWidth(0);
+                        }
+                    };
+                    updateArc.invalidated(null);
+                    ComponentSublistWrapper.this.getPseudoClassStates().addListener(updateArc);
+
                    container.getChildren().setAll(sublist);
                    ComponentSublistWrapper.this.getChildren().add(container);

@@ -120,8 +135,7 @@ final class ComponentSublistWrapper extends VBox implements NoPaddingComponent {
            }

            Platform.runLater(() -> {
-                // FIXME: ComponentSubList without padding must have a 4 pixel padding for displaying a border radius.
-                double contentHeight = expanded ? (sublist.prefHeight(sublist.getWidth()) + (noPadding ? 4 : 8 + 10)) : 0;
+                double contentHeight = expanded ? sublist.prefHeight(sublist.getWidth()) : 0;
                double targetRotate = expanded ? -180 : 0;

                if (AnimationUtils.isAnimationEnabled()) {
@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.ui.construct;

 import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXPopup;
 import com.jfoenix.controls.JFXTextField;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
@@ -30,6 +31,7 @@ import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;

 import java.nio.file.Path;
@@ -38,10 +40,18 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public class FileSelector extends HBox {
    private final StringProperty value = new SimpleStringProperty();
-    private String chooserTitle = i18n("selector.choose_file");
-    private boolean directory = false;
+    private String chooserTitle = "";
+    private SelectionMode selectionMode = SelectionMode.FILE;
    private final ObservableList<FileChooser.ExtensionFilter> extensionFilters = FXCollections.observableArrayList();

+    JFXButton selectButton = FXUtils.newToggleButton4(SVG.FOLDER_OPEN, 15);
+
+    public enum SelectionMode {
+        FILE,
+        DIRECTORY,
+        FILE_OR_DIRECTORY
+    }
+
    public String getValue() {
        return value.get();
    }
@@ -63,12 +73,12 @@ public class FileSelector extends HBox {
        return this;
    }

-    public boolean isDirectory() {
-        return directory;
+    public SelectionMode getSelectionMode() {
+        return selectionMode;
    }

-    public FileSelector setDirectory(boolean directory) {
-        this.directory = directory;
+    public FileSelector setSelectionMode(SelectionMode selectionMode) {
+        this.selectionMode = selectionMode;
        return this;
    }

@@ -80,27 +90,20 @@ public class FileSelector extends HBox {
        JFXTextField customField = new JFXTextField();
        FXUtils.bindString(customField, valueProperty());

-        JFXButton selectButton = new JFXButton();
-        selectButton.setGraphic(SVG.FOLDER_OPEN.createIcon(15));
        selectButton.setOnAction(e -> {
-            if (directory) {
-                DirectoryChooser chooser = new DirectoryChooser();
-                chooser.setTitle(chooserTitle);
-                Path dir = FileUtils.toPath(chooser.showDialog(Controllers.getStage()));
-                if (dir != null) {
-                    String path = FileUtils.getAbsolutePath(dir);
-                    customField.setText(path);
-                    value.setValue(path);
-                }
-            } else {
-                FileChooser chooser = new FileChooser();
-                chooser.getExtensionFilters().addAll(getExtensionFilters());
-                chooser.setTitle(chooserTitle);
-                Path file = FileUtils.toPath(chooser.showOpenDialog(Controllers.getStage()));
-                if (file != null) {
-                    String path = FileUtils.getAbsolutePath(file);
-                    customField.setText(path);
-                    value.setValue(path);
+            switch (selectionMode) {
+                case FILE -> openFileChooser(customField);
+                case DIRECTORY -> openDirectoryChooser(customField);
+                case FILE_OR_DIRECTORY -> {
+                    PopupMenu selectPopupMenu = new PopupMenu();
+                    JFXPopup selectModePopup = new JFXPopup(selectPopupMenu);
+
+                    selectPopupMenu.getContent().addAll(
+                            new IconedMenuItem(SVG.FILE_OPEN, i18n("selector.choose_file"), () -> openFileChooser(customField), selectModePopup),
+                            new IconedMenuItem(SVG.FOLDER_OPEN, i18n("selector.choose_directory"), () -> openDirectoryChooser(customField), selectModePopup)
+                    );
+
+                    selectModePopup.show(selectButton, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.RIGHT, -selectButton.getWidth(), 0);
                }
            }
        });
@@ -109,4 +112,27 @@ public class FileSelector extends HBox {
        setSpacing(3);
        getChildren().addAll(customField, selectButton);
    }
+
+    private void openFileChooser(JFXTextField customField) {
+        FileChooser chooser = new FileChooser();
+        chooser.getExtensionFilters().addAll(getExtensionFilters());
+        chooser.setTitle(StringUtils.isBlank(chooserTitle) ? i18n("selector.choose_file") : chooserTitle);
+        Path file = FileUtils.toPath(chooser.showOpenDialog(Controllers.getStage()));
+        if (file != null) {
+            String path = FileUtils.getAbsolutePath(file);
+            customField.setText(path);
+            value.setValue(path);
+        }
+    }
+
+    private void openDirectoryChooser(JFXTextField customField) {
+        DirectoryChooser chooser = new DirectoryChooser();
+        chooser.setTitle(StringUtils.isBlank(chooserTitle) ? i18n("selector.choose_directory") : chooserTitle);
+        Path dir = FileUtils.toPath(chooser.showDialog(Controllers.getStage()));
+        if (dir != null) {
+            String path = FileUtils.getAbsolutePath(dir);
+            customField.setText(path);
+            value.setValue(path);
+        }
+    }
 }
@@ -17,8 +17,14 @@
 */
 package org.jackhuang.hmcl.ui.construct;

+import com.jfoenix.utils.JFXNodeUtils;
+import javafx.animation.Animation;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.NumberBinding;
+import javafx.beans.value.ChangeListener;
 import javafx.geometry.Orientation;
 import javafx.geometry.Point2D;
 import javafx.scene.Node;
@@ -26,7 +32,11 @@ import javafx.scene.control.ScrollBar;
 import javafx.scene.control.Skin;
 import javafx.scene.layout.Region;
 import javafx.scene.shape.Rectangle;
-import org.jackhuang.hmcl.util.Lang;
+import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.animation.AnimationUtils;
+import org.jackhuang.hmcl.ui.animation.Motion;
+import org.jackhuang.hmcl.util.MathUtils;

 // Referenced in root.css
@SuppressWarnings("unused")
@@ -36,6 +46,10 @@ public class FloatScrollBarSkin implements Skin<ScrollBar> {
    private Rectangle track = new Rectangle();
    private Rectangle thumb = new Rectangle();

+    @SuppressWarnings({"FieldCanBeLocal", "FieldMayBeFinal"})
+    private ChangeListener<Boolean> thumbHoverListener;
+    private Animation thumbHoverAnimation;
+
    public FloatScrollBarSkin(final ScrollBar scrollBar) {
        this.scrollBar = scrollBar;
        scrollBar.setPrefHeight(1e-18);
@@ -45,8 +59,8 @@ public class FloatScrollBarSkin implements Skin<ScrollBar> {
            Point2D dragStart;
            double preDragThumbPos;

-            NumberBinding range = Bindings.subtract(scrollBar.maxProperty(), scrollBar.minProperty());
-            NumberBinding position = Bindings.divide(Bindings.subtract(scrollBar.valueProperty(), scrollBar.minProperty()), range);
+            final NumberBinding range = Bindings.subtract(scrollBar.maxProperty(), scrollBar.minProperty());
+            final NumberBinding position = Bindings.divide(Bindings.subtract(scrollBar.valueProperty(), scrollBar.minProperty()), range);

            {
                // Children are added unmanaged because for some reason the height of the bar keeps changing
@@ -63,7 +77,6 @@ public class FloatScrollBarSkin implements Skin<ScrollBar> {

                setup();

-
                thumb.setOnMousePressed(me -> {
                    if (me.isSynthesized()) {
                        // touch-screen events handled by Scroll handler
@@ -75,7 +88,7 @@ public class FloatScrollBarSkin implements Skin<ScrollBar> {
                     */
                    if (getSkinnable().getMax() > getSkinnable().getMin()) {
                        dragStart = thumb.localToParent(me.getX(), me.getY());
-                        double clampedValue = Lang.clamp(getSkinnable().getMin(), getSkinnable().getValue(), getSkinnable().getMax());
+                        double clampedValue = MathUtils.clamp(getSkinnable().getValue(), getSkinnable().getMin(), getSkinnable().getMax());
                        preDragThumbPos = (clampedValue - getSkinnable().getMin()) / (getSkinnable().getMax() - getSkinnable().getMin());
                        me.consume();
                    }
@@ -107,7 +120,7 @@ public class FloatScrollBarSkin implements Skin<ScrollBar> {
                                getSkinnable().requestFocus();
                            double newValue = (position * (getSkinnable().getMax() - getSkinnable().getMin())) + getSkinnable().getMin();
                            if (!Double.isNaN(newValue)) {
-                                getSkinnable().setValue(Lang.clamp(getSkinnable().getMin(), newValue, getSkinnable().getMax()));
+                                getSkinnable().setValue(MathUtils.clamp(newValue, getSkinnable().getMin(), getSkinnable().getMax()));
                            }
                        }

@@ -128,14 +141,18 @@ public class FloatScrollBarSkin implements Skin<ScrollBar> {
                track.widthProperty().unbind();
                track.heightProperty().unbind();

+                double offset = 4;
+
                if (scrollBar.getOrientation() == Orientation.HORIZONTAL) {
-                    track.relocate(0, -5);
-                    track.widthProperty().bind(scrollBar.widthProperty());
-                    track.setHeight(5);
+                    track.relocate(offset, -6.0);
+                    NumberBinding trackWidth = Bindings.max(0, Bindings.subtract(scrollBar.widthProperty(), offset * 2));
+                    track.widthProperty().bind(trackWidth);
+                    track.setHeight(6.0);
                } else {
-                    track.relocate(-5, 0);
-                    track.setWidth(5);
-                    track.heightProperty().bind(scrollBar.heightProperty());
+                    track.relocate(-6.0, offset);
+                    track.setWidth(6.0);
+                    NumberBinding trackHeight = Bindings.max(0, Bindings.subtract(scrollBar.heightProperty(), offset * 2));
+                    track.heightProperty().bind(trackHeight);
                }

                thumb.xProperty().unbind();
@@ -144,15 +161,37 @@ public class FloatScrollBarSkin implements Skin<ScrollBar> {
                thumb.heightProperty().unbind();

                if (scrollBar.getOrientation() == Orientation.HORIZONTAL) {
-                    thumb.relocate(0, -5);
-                    thumb.widthProperty().bind(Bindings.max(20, scrollBar.visibleAmountProperty().divide(range).multiply(scrollBar.widthProperty())));
-                    thumb.setHeight(5);
-                    thumb.xProperty().bind(Bindings.subtract(scrollBar.widthProperty(), thumb.widthProperty()).multiply(position));
+                    thumb.relocate(0, -6.0);
+                    thumb.setHeight(6.0);
+
+                    NumberBinding trackWidth = Bindings.max(0, Bindings.subtract(scrollBar.widthProperty(), offset * 2));
+
+                    thumb.widthProperty().bind(Bindings.min(trackWidth,
+                            Bindings.max(20, scrollBar.visibleAmountProperty().divide(range).multiply(trackWidth))));
+
+                    thumb.xProperty().bind(
+                            Bindings.add(offset,
+                                    Bindings.multiply(
+                                            Bindings.max(0, Bindings.subtract(trackWidth, thumb.widthProperty())),
+                                            position)
+                            )
+                    );
                } else {
-                    thumb.relocate(-5, 0);
-                    thumb.setWidth(5);
-                    thumb.heightProperty().bind(Bindings.max(20, scrollBar.visibleAmountProperty().divide(range).multiply(scrollBar.heightProperty())));
-                    thumb.yProperty().bind(Bindings.subtract(scrollBar.heightProperty(), thumb.heightProperty()).multiply(position));
+                    thumb.relocate(-6.0, 0);
+                    thumb.setWidth(6.0);
+
+                    NumberBinding trackHeight = Bindings.max(0, Bindings.subtract(scrollBar.heightProperty(), offset * 2));
+
+                    thumb.heightProperty().bind(Bindings.min(trackHeight,
+                            Bindings.max(20, scrollBar.visibleAmountProperty().divide(range).multiply(trackHeight))));
+
+                    thumb.yProperty().bind(
+                            Bindings.add(offset,
+                                    Bindings.multiply(
+                                            Bindings.max(0, Bindings.subtract(trackHeight, thumb.heightProperty())),
+                                            position)
+                            )
+                    );
                }
            }

@@ -162,7 +201,7 @@ public class FloatScrollBarSkin implements Skin<ScrollBar> {
                    return Double.MAX_VALUE;
                }

-                return 5;
+                return 6.0;
            }

            @Override
@@ -171,13 +210,46 @@ public class FloatScrollBarSkin implements Skin<ScrollBar> {
                    return Double.MAX_VALUE;
                }

-                return 5;
+                return 6.0;
            }
        };
+
+        this.thumbHoverListener = FXUtils.onWeakChangeAndOperate(thumb.hoverProperty(), newValue -> {
+            if (thumbHoverAnimation != null) {
+                thumbHoverAnimation.stop();
+                thumbHoverAnimation = null;
+            }
+
+            double targetOpacity = newValue ? 1.0 : 0.5;
+            double currentOpacity = thumb.getOpacity();
+
+            double opacityAdjustment = targetOpacity - currentOpacity;
+            if (Math.abs(opacityAdjustment) < 0.001) {
+                if (opacityAdjustment != 0)
+                    thumb.setOpacity(targetOpacity);
+
+                return;
+            }
+
+            if (AnimationUtils.isAnimationEnabled() && JFXNodeUtils.isTreeVisible(thumb)) {
+                thumbHoverAnimation = new Timeline(
+                        new KeyFrame(Duration.ZERO, new KeyValue(thumb.opacityProperty(), currentOpacity)),
+                        new KeyFrame(Motion.SHORT2, new KeyValue(thumb.opacityProperty(), targetOpacity))
+                );
+                thumbHoverAnimation.play();
+            } else {
+                thumb.setOpacity(targetOpacity);
+            }
+        });
    }

    @Override
    public void dispose() {
+        if (thumbHoverAnimation != null) {
+            thumbHoverAnimation.stop();
+            thumbHoverAnimation = null;
+        }
+        thumbHoverListener = null;
        scrollBar = null;
        group = null;
    }
@@ -0,0 +1,163 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 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 javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.css.CssMetaData;
+import javafx.css.Styleable;
+import javafx.css.StyleableDoubleProperty;
+import javafx.css.StyleableProperty;
+import javafx.css.converter.SizeConverter;
+import javafx.geometry.Pos;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.StackPane;
+import javafx.scene.shape.Rectangle;
+import org.jackhuang.hmcl.ui.FXUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/// A custom ImageView with fixed size and corner radius support.
+public class ImageContainer extends StackPane {
+
+    private static final String DEFAULT_STYLE_CLASS = "image-container";
+
+    private final ImageView imageView = new ImageView();
+    private final Rectangle clip = new Rectangle();
+
+    public ImageContainer(double size) {
+        this(size, size);
+    }
+
+    public ImageContainer(double width, double height) {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+
+        FXUtils.setLimitWidth(this, width);
+        FXUtils.setLimitHeight(this, height);
+
+        imageView.setPreserveRatio(true);
+        FXUtils.limitSize(imageView, width, height);
+        StackPane.setAlignment(imageView, Pos.CENTER);
+
+        clip.setWidth(width);
+        clip.setHeight(height);
+        updateCornerRadius(getCornerRadius());
+        this.setClip(clip);
+
+        this.getChildren().setAll(imageView);
+    }
+
+    private void updateCornerRadius(double radius) {
+        clip.setArcWidth(radius);
+        clip.setArcHeight(radius);
+    }
+
+    private static final double DEFAULT_CORNER_RADIUS = 6.0;
+
+    private StyleableDoubleProperty cornerRadius;
+
+    public StyleableDoubleProperty cornerRadiusProperty() {
+        if (this.cornerRadius == null) {
+            cornerRadius = new StyleableDoubleProperty() {
+                @Override
+                public Object getBean() {
+                    return ImageContainer.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "cornerRadius";
+                }
+
+                @Override
+                public CssMetaData<? extends Styleable, Number> getCssMetaData() {
+                    return StyleableProperties.CORNER_RADIUS;
+                }
+
+                @Override
+                protected void invalidated() {
+                    updateCornerRadius(get());
+                }
+            };
+        }
+
+        return cornerRadius;
+    }
+
+    public double getCornerRadius() {
+        return cornerRadius == null ? DEFAULT_CORNER_RADIUS : cornerRadius.get();
+    }
+
+    public void setCornerRadius(double radius) {
+        cornerRadiusProperty().set(radius);
+    }
+
+    public ObjectProperty<Image> imageProperty() {
+        return imageView.imageProperty();
+    }
+
+    public Image getImage() {
+        return imageView.getImage();
+    }
+
+    public void setImage(Image image) {
+        imageView.setImage(image);
+    }
+
+    public BooleanProperty smoothProperty() {
+        return imageView.smoothProperty();
+    }
+
+    public boolean isSmooth() {
+        return imageView.isSmooth();
+    }
+
+    public void setSmooth(boolean smooth) {
+        imageView.setSmooth(smooth);
+    }
+
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
+        return StyleableProperties.STYLEABLES;
+    }
+
+    private static final class StyleableProperties {
+        private static final CssMetaData<ImageContainer, Number> CORNER_RADIUS =
+                new CssMetaData<>("-jfx-corner-radius", SizeConverter.getInstance(), DEFAULT_CORNER_RADIUS) {
+                    @Override
+                    public boolean isSettable(ImageContainer control) {
+                        return control.cornerRadius == null || !control.cornerRadius.isBound();
+                    }
+
+                    @Override
+                    public StyleableProperty<Number> getStyleableProperty(ImageContainer control) {
+                        return control.cornerRadiusProperty();
+                    }
+                };
+
+        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+
+        static {
+            var styleables = new ArrayList<>(StackPane.getClassCssMetaData());
+            styleables.add(CORNER_RADIUS);
+            STYLEABLES = List.copyOf(styleables);
+        }
+    }
+}
@@ -28,7 +28,6 @@ import javafx.event.EventHandler;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
@@ -40,7 +39,7 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@DefaultProperty("image")
 public final class ImagePickerItem extends BorderPane {

-    private final ImageView imageView;
+    private final ImageContainer imageContainer;

    private final StringProperty title = new SimpleStringProperty(this, "title");
    private final ObjectProperty<EventHandler<ActionEvent>> onSelectButtonClicked = new SimpleObjectProperty<>(this, "onSelectButtonClicked");
@@ -48,25 +47,20 @@ public final class ImagePickerItem extends BorderPane {
    private final ObjectProperty<Image> image = new SimpleObjectProperty<>(this, "image");

    public ImagePickerItem() {
-        imageView = new ImageView();
-        imageView.setSmooth(false);
-        imageView.setPreserveRatio(true);
+        imageContainer = new ImageContainer(32);
+        imageContainer.setSmooth(false);

-        JFXButton selectButton = new JFXButton();
-        selectButton.setGraphic(SVG.EDIT.createIcon(20));
+        JFXButton selectButton = FXUtils.newToggleButton4(SVG.EDIT, 20);
        selectButton.onActionProperty().bind(onSelectButtonClicked);
-        selectButton.getStyleClass().add("toggle-icon4");

-        JFXButton deleteButton = new JFXButton();
-        deleteButton.setGraphic(SVG.RESTORE.createIcon(20));
+        JFXButton deleteButton = FXUtils.newToggleButton4(SVG.RESTORE, 20);
        deleteButton.onActionProperty().bind(onDeleteButtonClicked);
-        deleteButton.getStyleClass().add("toggle-icon4");

        FXUtils.installFastTooltip(selectButton, i18n("button.edit"));
        FXUtils.installFastTooltip(deleteButton, i18n("button.reset"));

        HBox hBox = new HBox();
-        hBox.getChildren().setAll(imageView, selectButton, deleteButton);
+        hBox.getChildren().setAll(imageContainer, selectButton, deleteButton);
        hBox.setAlignment(Pos.CENTER_RIGHT);
        hBox.setSpacing(8);
        setRight(hBox);
@@ -78,7 +72,7 @@ public final class ImagePickerItem extends BorderPane {
        vBox.setAlignment(Pos.CENTER_LEFT);
        setLeft(vBox);

-        imageView.imageProperty().bind(image);
+        imageContainer.imageProperty().bind(image);
    }

    public String getTitle() {
@@ -128,8 +122,4 @@ public final class ImagePickerItem extends BorderPane {
    public void setImage(Image image) {
        this.image.set(image);
    }
-
-    public ImageView getImageView() {
-        return imageView;
-    }
 }
@@ -21,6 +21,7 @@ import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialogLayout;
 import com.jfoenix.controls.JFXTextField;
 import com.jfoenix.validation.base.ValidatorBase;
+import javafx.geometry.Insets;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
@@ -56,6 +57,7 @@ public class InputDialogPane extends JFXDialogLayout implements DialogAware {
        this.setBody(new VBox(textField));

        lblCreationWarning = new Label();
+        lblCreationWarning.setPadding(new Insets(0, 5, 0, 0));

        acceptPane = new SpinnerPane();
        acceptPane.getStyleClass().add("small-spinner-pane");
@@ -30,9 +30,6 @@ import org.jackhuang.hmcl.ui.SVG;
 public class LineButton extends LineButtonBase {
    private static final String DEFAULT_STYLE_CLASS = "line-button";

-    private static final int IDX_TRAILING_TEXT = IDX_TRAILING;
-    private static final int IDX_TRAILING_ICON = IDX_TRAILING + 1;
-
    public static LineButton createNavigationButton() {
        var button = new LineButton();
        button.setTrailingIcon(SVG.ARROW_FORWARD);
@@ -50,7 +47,14 @@ public class LineButton extends LineButtonBase {

    public LineButton() {
        getStyleClass().add(DEFAULT_STYLE_CLASS);
-        container.setMouseTransparent(true);
+    }
+
+    protected int getTrailingTextIndex() {
+        return IDX_TRAILING;
+    }
+
+    protected int getTrailingIconIndex() {
+        return getTrailingTextIndex() + 1;
    }

    private ObjectProperty<EventHandler<ActionEvent>> onAction;
@@ -110,12 +114,13 @@ public class LineButton extends LineButtonBase {
                            trailingTextLabel = new Label();
                            trailingTextLabel.getStyleClass().add("trailing-label");
                            trailingTextLabel.setTextOverrun(OverrunStyle.CENTER_ELLIPSIS);
+                            trailingTextLabel.setMouseTransparent(true);
                        }
                        trailingTextLabel.setText(message);
-                        setNode(IDX_TRAILING_TEXT, trailingTextLabel);
+                        setNode(getTrailingTextIndex(), trailingTextLabel);
                    } else if (trailingTextLabel != null) {
                        trailingTextLabel.setText("");
-                        setNode(IDX_TRAILING_TEXT, null);
+                        setNode(getTrailingTextIndex(), null);
                    }
                }
            };
@@ -149,7 +154,7 @@ public class LineButton extends LineButtonBase {

                @Override
                protected void invalidated() {
-                    setNode(IDX_TRAILING_ICON, get());
+                    setNode(getTrailingIconIndex(), get());
                }
            };

@@ -171,6 +176,7 @@ public class LineButton extends LineButtonBase {
    public void setTrailingIcon(SVG rightIcon, double size) {
        Node rightIconNode = rightIcon.createIcon(size);
        rightIconNode.getStyleClass().add("trailing-icon");
+        rightIconNode.setMouseTransparent(true);
        setTrailingIcon(rightIconNode);
    }
 }
@@ -64,6 +64,7 @@ public abstract class LineComponent extends StackPane implements NoPaddingCompon
        this.container = new HBox(SPACING);
        container.getStyleClass().add("line-component-container");
        container.setAlignment(Pos.CENTER_LEFT);
+        container.setPickOnBounds(true);

        this.titleLabel = new Label();
        titleLabel.getStyleClass().add("title-label");
@@ -25,14 +25,16 @@ import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.css.PseudoClass;
 import javafx.geometry.Pos;
+import javafx.scene.Node;
 import javafx.scene.control.Label;
-import javafx.scene.input.MouseButton;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.input.ScrollEvent;
-import javafx.scene.layout.*;
+import javafx.scene.input.*;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.util.javafx.MappedObservableList;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.UnknownNullability;

 import java.util.Collection;
 import java.util.Objects;
@@ -41,24 +43,22 @@ import java.util.function.Function;
 import static org.jackhuang.hmcl.ui.FXUtils.determineOptimalPopupPosition;

 /// @author Glavo
-public final class LineSelectButton<T> extends LineButton {
+public class LineSelectButton<T extends @UnknownNullability Object> extends LineButton {

    private static final String DEFAULT_STYLE_CLASS = "line-select-button";
    private static final PseudoClass SELECTED_PSEUDO_CLASS = PseudoClass.getPseudoClass("selected");

    private JFXPopup popup;
+    @SuppressWarnings({"FieldCanBeLocal", "unused"})
+    private ObservableList<Node> popupItems; // keep a reference

    public LineSelectButton() {
        this.getStyleClass().add(DEFAULT_STYLE_CLASS);

        InvalidationListener updateTrailingText = observable -> {
+            Function<T, String> converter = getConverter();
            T value = getValue();
-            if (value != null) {
-                Function<T, String> converter = getConverter();
-                setTrailingText(converter != null ? converter.apply(value) : value.toString());
-            } else {
-                setTrailingText(null);
-            }
+            setTrailingText(converter != null ? converter.apply(value) : Objects.toString(value, ""));
        };
        converterProperty().addListener(updateTrailingText);
        valueProperty().addListener(updateTrailingText);
@@ -81,17 +81,16 @@ public final class LineSelectButton<T> extends LineButton {
            PopupMenu popupMenu = new PopupMenu();
            this.popup = new JFXPopup(popupMenu);

+            popupMenu.addEventHandler(KeyEvent.KEY_PRESSED, this::handleKeyEvent);
+
            ripplerContainer.addEventFilter(ScrollEvent.ANY, ignored -> popup.hide());

-            Bindings.bindContent(popupMenu.getContent(), MappedObservableList.create(itemsProperty(), item -> {
+            Bindings.bindContent(popupMenu.getContent(), popupItems = MappedObservableList.create(itemsProperty(), item -> {
                VBox vbox = new VBox();

                var itemTitleLabel = new Label();
                itemTitleLabel.getStyleClass().add("title-label");
                itemTitleLabel.textProperty().bind(Bindings.createStringBinding(() -> {
-                    if (item == null)
-                        return "";
-
                    Function<T, String> converter = getConverter();
                    return converter != null ? converter.apply(item) : Objects.toString(item, "");
                }, converterProperty()));
@@ -166,10 +165,14 @@ public final class LineSelectButton<T> extends LineButton {
        return converterProperty().get();
    }

-    public void setConverter(Function<T, String> value) {
+    public void setConverter(Function<T, String> value) { // TODO: rename
        converterProperty().set(value);
    }

+    public void setNullSafeConverter(Function<@NotNull T, String> value) {
+        converterProperty().set(it -> it != null ? value.apply(it) : "");
+    }
+
    private ObjectProperty<Function<T, String>> descriptionConverter;

    public ObjectProperty<Function<T, String>> descriptionConverterProperty() {
@@ -213,4 +216,32 @@ public final class LineSelectButton<T> extends LineButton {
        return items.get();
    }

+    private void handleKeyEvent(KeyEvent event) {
+        ObservableList<T> list = getItems();
+        if (list == null || list.isEmpty()) return;
+        int index = list.indexOf(getValue());
+
+        var code = event.getCode();
+
+        if (code == KeyCode.UP) {
+            if (index > 0) {
+                setValue(list.get(index - 1));
+            } else {
+                setValue(list.get(list.size() - 1));
+            }
+            event.consume();
+        } else if (code == KeyCode.DOWN) {
+            if (index < list.size() - 1) {
+                setValue(list.get(index + 1));
+            } else {
+                setValue(list.get(0));
+            }
+            event.consume();
+        } else if (code == KeyCode.ENTER || code == KeyCode.ESCAPE) {
+            if (popup != null && popup.isShowing()) {
+                popup.hide();
+                event.consume();
+            }
+        }
+    }
 }
@@ -19,8 +19,8 @@ package org.jackhuang.hmcl.ui.construct;

 import javafx.geometry.Insets;
 import javafx.scene.layout.StackPane;
-import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
+import org.jackhuang.hmcl.theme.Themes;

 public class MenuSeparator extends StackPane {

@@ -28,7 +28,7 @@ public class MenuSeparator extends StackPane {
        Rectangle rect = new Rectangle();
        rect.widthProperty().bind(widthProperty().add(-14));
        rect.setHeight(1);
-        rect.setFill(Color.GRAY);
+        rect.fillProperty().bind(Themes.colorSchemeProperty().getOutlineVariant());
        maxHeightProperty().set(10);
        setPadding(new Insets(3));
        getChildren().setAll(rect);
@@ -55,7 +55,8 @@ public final class MultiFileItem<T> extends VBox {

    @SuppressWarnings("unchecked")
    public MultiFileItem() {
-        setPadding(new Insets(0, 0, 10, 0));
+        this.getStyleClass().add("multi-file-item");
+
        setSpacing(8);

        group.selectedToggleProperty().addListener((a, b, newValue) -> {
@@ -266,8 +267,8 @@ public final class MultiFileItem<T> extends VBox {
            selector.setValue(value);
        }

-        public FileOption<T> setDirectory(boolean directory) {
-            selector.setDirectory(directory);
+        public FileOption<T> setSelectionMode(FileSelector.SelectionMode selectionMode) {
+            selector.setSelectionMode(selectionMode);
            return this;
        }

@@ -189,6 +189,7 @@ public class SpinnerPane extends Control {

        Skin(SpinnerPane control) {
            super(control);
+            root.setClip(null);

            updateContent();
            this.getChildren().setAll(root);
@@ -81,12 +81,11 @@ public class TaskExecutorDialogPane extends BorderPane {

        setCancel(cancel);

+        btnCancel.setDisable(onCancel.getCancellationAction() == null);
        btnCancel.setOnAction(e -> {
-            if (onCancel.getCancellationAction() != null) {
-                if (executor != null)
-                    executor.cancel();
-                onCancel.getCancellationAction().accept(this);
-            }
+            if (executor != null)
+                executor.cancel();
+            onCancel.getCancellationAction().accept(this);
        });

        speedEventHandler = FetchTask.SPEED_EVENT.registerWeak(speedEvent -> {
@@ -83,8 +83,8 @@ import static org.jackhuang.hmcl.util.Lang.tryCast;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public final class TaskListPane extends StackPane {
-    private static final Insets DEFAULT_PROGRESS_NODE_PADDING = new Insets(0, 0, 8, 0);
-    private static final Insets STAGED_PROGRESS_NODE_PADDING = new Insets(0, 0, 8, 26);
+    private static final Insets DEFAULT_PROGRESS_NODE_PADDING = new Insets(0, 0, 4, 0);
+    private static final Insets STAGED_PROGRESS_NODE_PADDING = new Insets(0, 0, 4, 26);

    private TaskExecutor executor;
    private final JFXListView<Node> listView = new JFXListView<>();
@@ -279,6 +279,7 @@ public final class TaskListPane extends StackPane {

    private final class Cell extends ListCell<Node> {
        private static final double STATUS_ICON_SIZE = 14;
+        private static final Insets PROGRESS_BAR_MARGIN = new Insets(2, 0, 0, 0);

        private final BorderPane pane = new BorderPane();
        private final StackPane left = new StackPane();
@@ -310,6 +311,7 @@ public final class TaskListPane extends StackPane {
            bar.minWidthProperty().bind(barWidth);
            bar.prefWidthProperty().bind(barWidth);
            bar.maxWidthProperty().bind(barWidth);
+            BorderPane.setMargin(bar, PROGRESS_BAR_MARGIN);

            setGraphic(pane);
        }
@@ -325,8 +327,9 @@ public final class TaskListPane extends StackPane {
            pane.paddingProperty().unbind();
            title.textProperty().unbind();
            message.textProperty().unbind();
-            bar.progressProperty().unbind();

+            bar.setSmoothProgress(false);
+            bar.progressProperty().unbind();
            StageNode prevStageNode;
            if (prevStageNodeRef != null && (prevStageNode = prevStageNodeRef.get()) != null)
                prevStageNode.status.removeListener(statusChangeListener);
@@ -364,6 +367,8 @@ public final class TaskListPane extends StackPane {
                pane.setRight(null);
                pane.setBottom(null);
            }
+
+            bar.setSmoothProgress(true);
        }
    }

@@ -17,6 +17,7 @@
 */
 package org.jackhuang.hmcl.ui.construct;

+import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.StringProperty;
 import javafx.beans.property.StringPropertyBase;
@@ -29,7 +30,6 @@ import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.ui.FXUtils;

 public class TwoLineListItem extends VBox {
    private static final String DEFAULT_STYLE_CLASS = "two-line-list-item";
@@ -146,6 +146,10 @@ public class TwoLineListItem extends VBox {
        subtitleProperty().set(subtitle);
    }

+    public HBox getFirstLine() {
+        return firstLine;
+    }
+
    public Label getTitleLabel() {
        return lblTitle;
    }
@@ -167,12 +171,26 @@ public class TwoLineListItem extends VBox {
            Bindings.bindContent(tagsBox.getChildren(), tags);

            var scrollPane = new ScrollPane(tagsBox);
+            scrollPane.setMinSize(0, 0);
            HBox.setHgrow(scrollPane, Priority.ALWAYS);
+            lblTitle.setMinWidth(Label.USE_PREF_SIZE);
            scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
            scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
-            FXUtils.onChangeAndOperate(tagsBox.heightProperty(), height -> FXUtils.setLimitHeight(scrollPane, height.doubleValue()));
-            scrollPane.setPrefWidth(50);
+            var expectedHeight = Bindings.createDoubleBinding(
+                    () -> {
+                        if (tags.isEmpty()) return 0.0;
+                        double h = tagsBox.prefHeight(-1);
+                        return h > 0 ? h : Double.NaN;
+                    },
+                    tags, tagsBox.heightProperty()
+            );
+
+            scrollPane.minHeightProperty().bind(expectedHeight);
+            scrollPane.prefHeightProperty().bind(expectedHeight);
+            scrollPane.maxHeightProperty().bind(expectedHeight);
            firstLine.getChildren().setAll(lblTitle, scrollPane);
+
+            tags.addListener((InvalidationListener) ignored -> scrollPane.requestLayout());
        }
        return tags;
    }
@@ -20,8 +20,8 @@ package org.jackhuang.hmcl.ui.construct;
 import com.jfoenix.validation.base.ValidatorBase;
 import javafx.beans.NamedArg;
 import javafx.scene.control.TextInputControl;
+import org.glavo.url.WebURL;
 import org.jackhuang.hmcl.util.StringUtils;
-import org.jackhuang.hmcl.util.io.NetworkUtils;

 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

@@ -54,12 +54,7 @@ public class URLValidator extends ValidatorBase {
        if (StringUtils.isBlank(textField.getText()))
            hasErrors.set(!nullable);
        else {
-            try {
-                NetworkUtils.toURI(textField.getText());
-                hasErrors.set(false);
-            } catch (IllegalArgumentException e) {
-                hasErrors.set(true);
-            }
+            hasErrors.set(WebURL.tryParseBrowserInput(textField.getText()) == null);
        }
    }
 }
@@ -39,6 +39,7 @@ import javafx.scene.paint.Color;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.util.Duration;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.animation.AnimationUtils;
 import org.jackhuang.hmcl.ui.animation.Motion;
@@ -46,13 +47,10 @@ import org.jackhuang.hmcl.ui.wizard.Navigation;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;

 public class Decorator extends Control {
-    private final ListProperty<Node> drawer = new SimpleListProperty<>(FXCollections.observableArrayList());
    private final ListProperty<Node> content = new SimpleListProperty<>(FXCollections.observableArrayList());
    private final ListProperty<Node> container = new SimpleListProperty<>(FXCollections.observableArrayList());
    private final ObjectProperty<Background> contentBackground = new SimpleObjectProperty<>();
    private final ObjectProperty<DecoratorPage.State> state = new SimpleObjectProperty<>();
-    private final StringProperty drawerTitle = new SimpleStringProperty();
-    private final ObjectProperty<Runnable> onCloseButtonAction = new SimpleObjectProperty<>();
    private final ObjectProperty<EventHandler<ActionEvent>> onCloseNavButtonAction = new SimpleObjectProperty<>();
    private final ObjectProperty<EventHandler<ActionEvent>> onBackNavButtonAction = new SimpleObjectProperty<>();
    private final ObjectProperty<EventHandler<ActionEvent>> onRefreshNavButtonAction = new SimpleObjectProperty<>();
@@ -117,18 +115,6 @@ public class Decorator extends Control {
        this.drawerWrapper = drawerWrapper;
    }

-    public ObservableList<Node> getDrawer() {
-        return drawer.get();
-    }
-
-    public ListProperty<Node> drawerProperty() {
-        return drawer;
-    }
-
-    public void setDrawer(ObservableList<Node> drawer) {
-        this.drawer.set(drawer);
-    }
-
    public ObservableList<Node> getContent() {
        return content.get();
    }
@@ -153,30 +139,6 @@ public class Decorator extends Control {
        this.state.set(state);
    }

-    public String getDrawerTitle() {
-        return drawerTitle.get();
-    }
-
-    public StringProperty drawerTitleProperty() {
-        return drawerTitle;
-    }
-
-    public void setDrawerTitle(String drawerTitle) {
-        this.drawerTitle.set(drawerTitle);
-    }
-
-    public Runnable getOnCloseButtonAction() {
-        return onCloseButtonAction.get();
-    }
-
-    public ObjectProperty<Runnable> onCloseButtonActionProperty() {
-        return onCloseButtonAction;
-    }
-
-    public void setOnCloseButtonAction(Runnable onCloseButtonAction) {
-        this.onCloseButtonAction.set(onCloseButtonAction);
-    }
-
    public ObservableList<Node> getContainer() {
        return container.get();
    }
@@ -301,7 +263,26 @@ public class Decorator extends Control {
    }

    public void close() {
-        onCloseButtonAction.get().run();
+        if (AnimationUtils.playWindowAnimation()) {
+            Timeline timeline = new Timeline(
+                    new KeyFrame(Duration.millis(0),
+                            new KeyValue(opacityProperty(), 1, Motion.EASE),
+                            new KeyValue(scaleXProperty(), 1, Motion.EASE),
+                            new KeyValue(scaleYProperty(), 1, Motion.EASE),
+                            new KeyValue(scaleZProperty(), 0.3, Motion.EASE)
+                    ),
+                    new KeyFrame(Duration.millis(200),
+                            new KeyValue(opacityProperty(), 0, Motion.EASE),
+                            new KeyValue(scaleXProperty(), 0.8, Motion.EASE),
+                            new KeyValue(scaleYProperty(), 0.8, Motion.EASE),
+                            new KeyValue(scaleZProperty(), 0.8, Motion.EASE)
+                    )
+            );
+            timeline.setOnFinished(event -> Launcher.stopApplication());
+            timeline.play();
+        } else {
+            Launcher.stopApplication();
+        }
    }

    public void capableDraggingWindow(Node node) {
@@ -20,9 +20,6 @@ package org.jackhuang.hmcl.ui.decorator;
 import com.jfoenix.controls.JFXSnackbar;
 import com.jfoenix.controls.JFXSnackbarLayout;
 import javafx.animation.Interpolator;
-import javafx.animation.KeyFrame;
-import javafx.animation.KeyValue;
-import javafx.animation.Timeline;
 import javafx.beans.InvalidationListener;
 import javafx.beans.WeakInvalidationListener;
 import javafx.geometry.Insets;
@@ -37,7 +34,7 @@ import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.stage.Stage;
 import javafx.util.Duration;
-import org.jackhuang.hmcl.Launcher;
+import org.glavo.url.WebURL;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDnD;
 import org.jackhuang.hmcl.setting.EnumBackgroundImage;
@@ -47,7 +44,6 @@ import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.DialogUtils;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.account.AddAuthlibInjectorServerPane;
-import org.jackhuang.hmcl.ui.animation.AnimationUtils;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.Motion;
 import org.jackhuang.hmcl.ui.animation.TransitionPane.AnimationProducer;
@@ -55,20 +51,19 @@ import org.jackhuang.hmcl.ui.construct.JFXDialogPane;
 import org.jackhuang.hmcl.ui.construct.Navigator;
 import org.jackhuang.hmcl.ui.wizard.Refreshable;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
-import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.MathUtils;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jetbrains.annotations.Nullable;

 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
+import java.util.ArrayList;
 import java.util.Locale;
 import java.util.Random;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;

-import static java.util.stream.Collectors.toList;
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.newBuiltinImage;
 import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
@@ -81,28 +76,6 @@ public class DecoratorController {

    public DecoratorController(Stage stage, Node mainPage) {
        decorator = new Decorator(stage);
-        decorator.setOnCloseButtonAction(() -> {
-            if (AnimationUtils.playWindowAnimation()) {
-                Timeline timeline = new Timeline(
-                        new KeyFrame(Duration.millis(0),
-                                new KeyValue(decorator.opacityProperty(), 1, Motion.EASE),
-                                new KeyValue(decorator.scaleXProperty(), 1, Motion.EASE),
-                                new KeyValue(decorator.scaleYProperty(), 1, Motion.EASE),
-                                new KeyValue(decorator.scaleZProperty(), 0.3, Motion.EASE)
-                        ),
-                        new KeyFrame(Duration.millis(200),
-                                new KeyValue(decorator.opacityProperty(), 0, Motion.EASE),
-                                new KeyValue(decorator.scaleXProperty(), 0.8, Motion.EASE),
-                                new KeyValue(decorator.scaleYProperty(), 0.8, Motion.EASE),
-                                new KeyValue(decorator.scaleZProperty(), 0.8, Motion.EASE)
-                        )
-                );
-                timeline.setOnFinished(event -> Launcher.stopApplication());
-                timeline.play();
-            } else {
-                Launcher.stopApplication();
-            }
-        });
        decorator.titleTransparentProperty().bind(config().titleTransparentProperty());

        navigator = new Navigator();
@@ -221,7 +194,10 @@ public class DecoratorController {
                String backgroundImage = config().getBackgroundImage();
                if (backgroundImage != null)
                    try {
-                        image = tryLoadImage(Paths.get(backgroundImage));
+                        Path path = Path.of(backgroundImage);
+                        image = Files.isDirectory(path)
+                                ? randomImageIn(path)
+                                : tryLoadImage(path);
                    } catch (Exception e) {
                        LOG.warning("Couldn't load background image", e);
                    }
@@ -230,7 +206,7 @@ public class DecoratorController {
                String backgroundImageUrl = config().getBackgroundImageUrl();
                if (backgroundImageUrl != null) {
                    try {
-                        image = FXUtils.loadImage(backgroundImageUrl);
+                        image = FXUtils.loadImage(WebURL.parseBrowserInput(backgroundImageUrl));
                    } catch (Exception e) {
                        LOG.warning("Couldn't load background image", e);
                    }
@@ -243,7 +219,7 @@ public class DecoratorController {
                return new Background(new BackgroundFill(new Color(1, 1, 1, 0.5), CornerRadii.EMPTY, Insets.EMPTY));
            case PAINT:
                Paint paint = config().getBackgroundPaint();
-                double opacity = Lang.clamp(0, config().getBackgroundImageOpacity(), 100) / 100.;
+                double opacity = MathUtils.clamp(config().getBackgroundImageOpacity(), 0, 100) / 100.;
                if (paint instanceof Color || paint == null) {
                    Color color = (Color) paint;
                    if (color == null)
@@ -327,14 +303,14 @@ public class DecoratorController {
            return null;
        }

-        List<Path> candidates;
+        ArrayList<Path> candidates;
        try (Stream<Path> stream = Files.list(imageDir)) {
            candidates = stream
                    .filter(it -> FXUtils.IMAGE_EXTENSIONS.contains(getExtension(it).toLowerCase(Locale.ROOT)))
                    .filter(Files::isReadable)
-                    .collect(toList());
+                    .collect(Collectors.toCollection(ArrayList::new));
        } catch (IOException e) {
-            LOG.warning("Failed to list files in ./bg", e);
+            LOG.warning("Failed to list files in " + imageDir, e);
            return null;
        }

@@ -274,6 +274,7 @@ public class DecoratorSkin extends SkinBase<Decorator> {

            if (canBack) {
                JFXButton backNavButton = new JFXButton();
+                skinnable.forbidDraggingWindow(backNavButton);
                backNavButton.setFocusTraversable(false);
                backNavButton.setGraphic(SVG.ARROW_BACK.createIcon(Themes.titleFillProperty()));
                backNavButton.getStyleClass().add("jfx-decorator-button");
@@ -285,6 +286,7 @@ public class DecoratorSkin extends SkinBase<Decorator> {

            if (canClose) {
                JFXButton closeNavButton = new JFXButton();
+                skinnable.forbidDraggingWindow(closeNavButton);
                closeNavButton.setFocusTraversable(false);
                closeNavButton.setGraphic(SVG.CLOSE.createIcon(Themes.titleFillProperty()));
                closeNavButton.getStyleClass().add("jfx-decorator-button");
@@ -349,13 +351,9 @@ public class DecoratorSkin extends SkinBase<Decorator> {
                refreshNavButton.setGraphic(SVG.REFRESH.createIcon(Themes.titleFillProperty()));
                refreshNavButton.getStyleClass().add("jfx-decorator-button");
                refreshNavButton.onActionProperty().bind(skinnable.onRefreshNavButtonActionProperty());
+                skinnable.forbidDraggingWindow(refreshNavButton);

-                Rectangle separator = new Rectangle();
-                separator.visibleProperty().bind(refreshNavButton.visibleProperty());
-                separator.heightProperty().bind(navBar.heightProperty());
-                separator.setFill(Color.GRAY);
-
-                navRight.getChildren().setAll(refreshNavButton, separator);
+                navRight.getChildren().setAll(refreshNavButton);
                navBar.setRight(navRight);
            }
        }
@@ -54,13 +54,18 @@ import org.jackhuang.hmcl.util.TaskCancellationAction;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jetbrains.annotations.Nullable;

+import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Locale;
+import java.util.Set;
 import java.util.concurrent.CancellationException;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;

 import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;

 public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage {
    private final ReadOnlyObjectWrapper<DecoratorPage.State> state = new ReadOnlyObjectWrapper<>(DecoratorPage.State.fromTitle(i18n("download"), -1));
@@ -84,8 +89,8 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage
        newGameTab.setNodeSupplier(loadVersionFor(() -> new VersionsPage(versionPageNavigator, i18n("install.installer.choose", i18n("install.installer.game")), "", DownloadProviders.getDownloadProvider(),
                "game", versionPageNavigator::onGameSelected)));
        modpackTab.setNodeSupplier(loadVersionFor(() -> {
-            DownloadListPage page = HMCLLocalizedDownloadListPage.ofModPack((profile, __, mod, file) -> {
-                Versions.downloadModpackImpl(profile, uploadVersion, mod, file);
+            DownloadListPage page = HMCLLocalizedDownloadListPage.ofModPack((downloadProvider, profile, __, mod, file) -> {
+                Versions.downloadModpackImpl(downloadProvider, profile, uploadVersion, mod, file);
            }, false);

            JFXButton installLocalModpackButton = FXUtils.newRaisedButton(i18n("install.modpack"));
@@ -94,9 +99,9 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage
            page.getActions().add(installLocalModpackButton);
            return page;
        }));
-        modTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofMod((profile, version, mod, file) -> download(profile, version, file, "mods"), true)));
-        resourcePackTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofResourcePack((profile, version, mod, file) -> download(profile, version, file, "resourcepacks"), true)));
-        shaderTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofShaderPack((profile, version, mod, file) -> download(profile, version, file, "shaderpacks"), true)));
+        modTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofMod((downloadProvider, profile, version, mod, file) -> download(downloadProvider, profile, version, file, "mods"), true)));
+        resourcePackTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofResourcePack((downloadProvider, profile, version, mod, file) -> download(downloadProvider, profile, version, file, "resourcepacks"), true)));
+        shaderTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofShaderPack((downloadProvider, profile, version, mod, file) -> download(downloadProvider, profile, version, file, "shaderpacks"), true)));
        worldTab.setNodeSupplier(loadVersionFor(() -> new DownloadListPage(CurseForgeRemoteModRepository.WORLDS)));
        tab = new TabHeader(transitionPane, newGameTab, modpackTab, modTab, resourcePackTab, shaderTab, worldTab);

@@ -129,16 +134,29 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage
        };
    }

-    public static void download(Profile profile, @Nullable String version, RemoteMod.Version file, String subdirectoryName) {
+    public static void download(DownloadProvider downloadProvider, Profile profile, @Nullable String version, RemoteMod.Version file, String subdirectoryName) {
        if (version == null) version = profile.getSelectedVersion();

        Path runDirectory = profile.getRepository().hasVersion(version) ? profile.getRepository().getRunDirectory(version) : profile.getRepository().getBaseDirectory();

+        Set<String> existingFiles;
+
+        try (var list = Files.list(runDirectory.resolve(subdirectoryName))) {
+            existingFiles = list.map(Path::getFileName)
+                    .map(Path::toString)
+                    .collect(Collectors.toSet());
+        } catch (IOException e) {
+            LOG.warning("Failed to list files in " + runDirectory.resolve(subdirectoryName), e);
+            existingFiles = Set.of();
+        }
+
+        Set<String> finalExistingFiles = existingFiles;
+
        Controllers.prompt(i18n("archive.file.name"), (result, handler) -> {
            Path dest = runDirectory.resolve(subdirectoryName).resolve(result);

            Controllers.taskDialog(Task.composeAsync(() -> {
-                var task = new FileDownloadTask(file.getFile().getUrl(), dest);
+                var task = new FileDownloadTask(downloadProvider.injectURLWithCandidates(file.getFile().getUrl()), dest);
                task.setName(file.getName());
                return task;
            }).whenComplete(Schedulers.javafx(), exception -> {
@@ -153,7 +171,7 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage
                }
            }), i18n("message.downloading"), TaskCancellationAction.NORMAL);
            handler.resolve();
-        }, file.getFile().getFilename(), new Validator(i18n("install.new_game.malformed"), FileUtils::isNameValid));
+        }, file.getFile().getFilename(), new Validator(i18n("install.new_game.malformed"), FileUtils::isNameValidForJar), new Validator(i18n("profile.already_exists"), (it) -> !finalExistingFiles.contains(it)));

    }

@@ -28,6 +28,7 @@ import org.jackhuang.hmcl.ui.construct.RequiredValidator;
 import org.jackhuang.hmcl.ui.construct.Validator;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.util.SettingsMap;
+import org.jackhuang.hmcl.util.i18n.I18n;

 import static javafx.beans.binding.Bindings.createBooleanBinding;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -50,11 +51,11 @@ public class InstallersPage extends AbstractInstallersPage {

    @Override
    public String getTitle() {
-        return group.getGame().versionProperty().get().version();
+        return ((RemoteVersion) controller.getSettings().get("game")).getGameVersion();
    }

    private String getVersion(String id) {
-        return ((RemoteVersion) controller.getSettings().get(id)).getSelfVersion();
+        return I18n.getDisplayVersion((RemoteVersion) controller.getSettings().get(id));
    }

    protected void reload() {
@@ -111,7 +112,7 @@ public class InstallersPage extends AbstractInstallersPage {
    }

    private void setTxtNameWithLoaders() {
-        StringBuilder nameBuilder = new StringBuilder(group.getGame().versionProperty().get().version());
+        StringBuilder nameBuilder = new StringBuilder(getTitle());

        for (InstallerItem library : group.getLibraries()) {
            String libraryId = library.getLibraryId().replace(LibraryAnalyzer.LibraryType.MINECRAFT.getPatchId(), "");
@@ -120,23 +121,22 @@ public class InstallersPage extends AbstractInstallersPage {
            }

            LibraryAnalyzer.LibraryType libraryType = LibraryAnalyzer.LibraryType.fromPatchId(libraryId);
+
            if (libraryType != null) {
                String loaderName = switch (libraryType) {
-                    case FORGE -> i18n("install.installer.forge");
-                    case NEO_FORGE -> i18n("install.installer.neoforge");
-                    case CLEANROOM -> i18n("install.installer.cleanroom");
-                    case LEGACY_FABRIC -> i18n("install.installer.legacyfabric").replace(" ", "_");
-                    case FABRIC -> i18n("install.installer.fabric");
-                    case LITELOADER -> i18n("install.installer.liteloader");
-                    case QUILT -> i18n("install.installer.quilt");
-                    case OPTIFINE -> i18n("install.installer.optifine");
+                    case FORGE -> "Forge";
+                    case NEO_FORGE -> "NeoForge";
+                    case CLEANROOM -> "Cleanroom";
+                    case LEGACY_FABRIC -> "LegacyFabric";
+                    case FABRIC -> "Fabric";
+                    case LITELOADER -> "LiteLoader";
+                    case QUILT -> "Quilt";
+                    case OPTIFINE -> "OptiFine";
                    default -> null;
                };

-                if (loaderName == null)
-                    continue;
-
-                nameBuilder.append("-").append(loaderName);
+                if (loaderName != null)
+                    nameBuilder.append('-').append(loaderName);
            }
        }

@@ -47,6 +47,7 @@ public final class ModpackInstallWizardProvider implements WizardProvider {
    private final Path file;
    private final String updateVersion;
    private String iconUrl;
+    private boolean hasSource;

    public ModpackInstallWizardProvider(Profile profile) {
        this(profile, null, null);
@@ -79,6 +80,7 @@ public final class ModpackInstallWizardProvider implements WizardProvider {
        if (StringUtils.isNotBlank(iconUrl))
            settings.put(LocalModpackPage.MODPACK_ICON_URL, iconUrl);
        settings.put(ModpackPage.PROFILE, profile);
+        hasSource = settings.containsKey(LocalModpackPage.MODPACK_FILE) || settings.containsKey(RemoteModpackPage.MODPACK_SERVER_MANIFEST);
    }

    private Task<?> finishModpackInstallingAsync(SettingsMap settings) {
@@ -156,7 +158,6 @@ public final class ModpackInstallWizardProvider implements WizardProvider {

    @Override
    public Node createPage(WizardController controller, int step, SettingsMap settings) {
-        boolean hasSource = controller.getSettings().containsKey(LocalModpackPage.MODPACK_FILE) || settings.containsKey(RemoteModpackPage.MODPACK_SERVER_MANIFEST);
        if (hasSource) {
            return switch (step) {
                case 0 -> createModpackInstallPage(controller);
@@ -1,3 +1,20 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 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.download;

 import com.jfoenix.controls.JFXButton;
@@ -42,11 +59,11 @@ public abstract class ModpackPage extends SpinnerPane implements WizardPage {
        {
            var archiveNamePane = new LinePane();
            {
-                archiveNamePane.setTitle(i18n("archive.file.name"));
+                archiveNamePane.setTitle(i18n("version.name"));

                txtModpackName = new JFXTextField();
                txtModpackName.setPrefWidth(300);
-                // FIXME: Validator are not shown properly
+                FXUtils.setLimitHeight(archiveNamePane, 75);
                // BorderPane.setMargin(txtModpackName, new Insets(0, 0, 8, 32));
                BorderPane.setAlignment(txtModpackName, Pos.CENTER_RIGHT);
                archiveNamePane.setRight(txtModpackName);
@@ -97,8 +97,7 @@ public final class ModpackSelectionPage extends VBox implements WizardPage {
        graphic.setMouseTransparent(true);
        graphic.setLeft(new TwoLineListItem(i18n("modpack.choose." + type), i18n("modpack.choose." + type + ".detail")));

-        SVGPath arrow = new SVGPath();
-        arrow.setContent(SVG.ARROW_FORWARD.getPath());
+        SVGPath arrow = SVG.ARROW_FORWARD.createIcon();
        BorderPane.setAlignment(arrow, Pos.CENTER);
        graphic.setRight(arrow);

@@ -144,8 +143,6 @@ public final class ModpackSelectionPage extends VBox implements WizardPage {
                    // otherwise we still consider the file as modpack zip file
                    // since casually the url may not ends with ".zip"
                    Path modpack = Files.createTempFile("modpack", ".zip");
-                    handler.resolve();
-
                    Controllers.taskDialog(
                            new FileDownloadTask(url, modpack)
                                    .whenComplete(Schedulers.javafx(), e -> {
@@ -278,10 +278,12 @@ public final class VersionsPage extends Control implements WizardPage, Refreshab
                    iconType = VersionIconType.COMMAND;

                imageView.setImage(iconType.getIcon());
+                String displayGameVersion = I18n.getDisplayVersion(GameVersionNumber.asGameVersion(remoteVersion.getGameVersion()));
+
                if (twoLineListItem.getSubtitle() == null)
-                    twoLineListItem.setSubtitle(remoteVersion.getGameVersion());
+                    twoLineListItem.setSubtitle(displayGameVersion);
                else
-                    twoLineListItem.addTag(remoteVersion.getGameVersion());
+                    twoLineListItem.addTag(displayGameVersion);
            }
        }
    }
@@ -421,7 +423,11 @@ public final class VersionsPage extends Control implements WizardPage, Refreshab
                    if (status == Status.LOADING)
                        transitionPane.setContent(spinner, ContainerAnimations.FADE);
                    else if (status == Status.SUCCESS)
-                        transitionPane.setContent(centerWrapper, ContainerAnimations.FADE);
+                        if (control.versions.isEmpty()) {
+                            transitionPane.setContent(emptyPane, ContainerAnimations.FADE);
+                        } else {
+                            transitionPane.setContent(centerWrapper, ContainerAnimations.FADE);
+                        }
                    else // if (status == Status.FAILED)
                        transitionPane.setContent(failedPane, ContainerAnimations.FADE);
                });
@@ -214,7 +214,7 @@ public final class ExportWizardProvider implements WizardProvider {
                                vs.isFullscreen(),
                                vs.getWidth(),
                                vs.getHeight(),
-                                vs.getMaxMemory(),
+                                null,
                                exportInfo.getMinMemory(),
                                vs.isShowLogs(),
                                /* showConsoleOnError */ true,
@@ -221,10 +221,15 @@ public final class ModpackInfoPage extends Control implements WizardPage {

                    list.getContent().addAll(
                            createTextFieldLinePane(i18n("modpack.name"), skinnable.name, new RequiredValidator()),
-                            createTextFieldLinePane(i18n("archive.author"), skinnable.author, new RequiredValidator()),
                            createTextFieldLinePane(i18n("archive.version"), skinnable.version, new RequiredValidator())
                    );

+                    if (skinnable.options.isRequireAuthor()) {
+                        list.getContent().add(
+                                createTextFieldLinePane(i18n("archive.author"), skinnable.author, new RequiredValidator())
+                        );
+                    }
+
                    if (skinnable.options.isRequireFileApi()) {
                        list.getContent().add(createTextFieldLinePane(
                                i18n("modpack.file_api"), skinnable.fileApi,
@@ -311,7 +316,7 @@ public final class ModpackInfoPage extends Control implements WizardPage {
                    if (skinnable.options.isRequireAuthlibInjectorServer()) {
                        var serversSelectButton = new LineSelectButton<AuthlibInjectorServer>();
                        serversSelectButton.setTitle(i18n("account.injector.server"));
-                        serversSelectButton.setConverter(AuthlibInjectorServer::getName);
+                        serversSelectButton.setNullSafeConverter(AuthlibInjectorServer::getName);
                        serversSelectButton.setDescriptionConverter(AuthlibInjectorServer::getUrl);
                        serversSelectButton.itemsProperty().set(config().getAuthlibInjectorServers());

@@ -17,11 +17,21 @@
 */
 package org.jackhuang.hmcl.ui.image;

-import com.twelvemonkeys.imageio.plugins.webp.WebPImageReaderSpi;
 import javafx.animation.Timeline;
+import javafx.application.Platform;
+import javafx.scene.SnapshotParameters;
 import javafx.scene.image.Image;
 import javafx.scene.image.PixelFormat;
 import javafx.scene.image.WritableImage;
+import javafx.scene.paint.Color;
+import org.girod.javafx.svgimage.LoaderParameters;
+import org.girod.javafx.svgimage.SVGImage;
+import org.girod.javafx.svgimage.SVGLoader;
+import org.girod.javafx.svgimage.ScaleQuality;
+import org.glavo.webp.WebPImage;
+import org.glavo.webp.WebPImageLoadOptions;
+import org.glavo.webp.javafx.WebPFXImage;
+import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.ui.image.apng.Png;
 import org.jackhuang.hmcl.ui.image.apng.argb8888.Argb8888Bitmap;
 import org.jackhuang.hmcl.ui.image.apng.argb8888.Argb8888BitmapSequence;
@@ -30,16 +40,13 @@ import org.jackhuang.hmcl.ui.image.apng.chunks.PngFrameControl;
 import org.jackhuang.hmcl.ui.image.apng.error.PngException;
 import org.jackhuang.hmcl.ui.image.apng.error.PngIntegrityException;
 import org.jackhuang.hmcl.ui.image.internal.AnimationImageImpl;
-import org.jackhuang.hmcl.util.SwingFXUtils;
 import org.jetbrains.annotations.Nullable;

-import javax.imageio.ImageIO;
-import javax.imageio.ImageReader;
-import javax.imageio.stream.ImageInputStream;
-import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.regex.Pattern;

 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
@@ -61,16 +68,48 @@ public final class ImageUtils {
    };

    public static final ImageLoader WEBP = (input, requestedWidth, requestedHeight, preserveRatio, smooth) -> {
-        WebPImageReaderSpi spi = new WebPImageReaderSpi();
-        ImageReader reader = spi.createReaderInstance(null);
-        BufferedImage bufferedImage;
-        try (ImageInputStream imageInput = ImageIO.createImageInputStream(input)) {
-            reader.setInput(imageInput, true, true);
-            bufferedImage = reader.read(0, reader.getDefaultReadParam());
-        } finally {
-            reader.dispose();
+        var options = new WebPImageLoadOptions(requestedWidth, requestedHeight, preserveRatio, smooth);
+        return new WebPFXImage(WebPImage.read(input, options));
+    };
+
+    public static final ImageLoader SVG = (input, requestedWidth, requestedHeight, preserveRatio, smooth) -> {
+        String content = new String(input.readAllBytes(), StandardCharsets.UTF_8);
+
+        LoaderParameters parameters = new LoaderParameters();
+        parameters.autoStartAnimations = false;
+
+        SVGImage image;
+
+        if (Platform.isFxApplicationThread()) {
+            image = SVGLoader.load(content, parameters);
+        } else {
+            // TODO: Currently, SVGLoader.load(...) requires the javafx.swing module if it operates on a non-JavaFX thread.
+            image = CompletableFuture.supplyAsync(
+                    () -> SVGLoader.load(content, parameters),
+                    Schedulers.javafx()
+            ).get();
+        }
+
+        if (image == null)
+            throw new IOException("Failed to load SVG image");
+
+        var snapshotParameters = new SnapshotParameters();
+        snapshotParameters.setFill(Color.TRANSPARENT);
+
+        if (requestedWidth <= 0. || requestedHeight <= 0.) {
+            return image.toImage(snapshotParameters);
+        }
+
+        double scaleX = requestedWidth / image.getScaledWidth();
+        double scaleY = requestedHeight / image.getScaledHeight();
+
+        if (preserveRatio || scaleX == scaleY) {
+            double scale = Math.min(scaleX, scaleY);
+            return image.scale(scale).toImage(snapshotParameters);
+        } else {
+            // FIXME: Use DEFAULT_SVG_SNAPSHOT_PARAMS
+            return image.toImageScaled(ScaleQuality.RENDER_QUALITY, scaleX, scaleY);
        }
-        return SwingFXUtils.toFXImage(bufferedImage, requestedWidth, requestedHeight, preserveRatio, smooth);
    };

    public static final ImageLoader APNG = (input, requestedWidth, requestedHeight, preserveRatio, smooth) -> {
@@ -136,11 +175,13 @@ public final class ImageUtils {

    public static final Map<String, ImageLoader> EXT_TO_LOADER = Map.of(
            "webp", WEBP,
+            "svg", SVG,
            "apng", APNG
    );

    public static final Map<String, ImageLoader> CONTENT_TYPE_TO_LOADER = Map.of(
            "image/webp", WEBP,
+            "image/svg+xml", SVG,
            "image/apng", APNG
    );

@@ -165,6 +206,14 @@ public final class ImageUtils {
                && Arrays.equals(headerBuffer, 8, 12, WEBP_HEADER, 0, 4);
    }

+    private static final byte[] SVG_HEADER = "<svg".getBytes(StandardCharsets.US_ASCII);
+
+    // This is currently a simple check, more complex checks can be considered in the future
+    public static boolean isSVG(byte[] headerBuffer) {
+        return headerBuffer.length > SVG_HEADER.length
+                && Arrays.equals(headerBuffer, 0, SVG_HEADER.length, SVG_HEADER, 0, SVG_HEADER.length);
+    }
+
    private static final byte[] PNG_HEADER = {
            (byte) 0x89, (byte) 0x50, (byte) 0x4e, (byte) 0x47,
            (byte) 0x0d, (byte) 0x0a, (byte) 0x1a, (byte) 0x0a,
@@ -232,6 +281,8 @@ public final class ImageUtils {
            return WEBP;
        if (isApng(headerBuffer))
            return APNG;
+        if (isSVG(headerBuffer))
+            return SVG;
        return null;
    }

@@ -406,6 +457,19 @@ public final class ImageUtils {
            return new AnimationImageImpl(width, height, framePixels, durations, cycleCount);
    }

+    private static int[] rgbaToArgb(ByteBuffer rgba) {
+        int pixelCount = rgba.remaining() / 4;
+        int[] argb = new int[pixelCount];
+        for (int i = 0; i < pixelCount; i++) {
+            int r = rgba.get() & 0xFF;
+            int g = rgba.get() & 0xFF;
+            int b = rgba.get() & 0xFF;
+            int a = rgba.get() & 0xFF;
+            argb[i] = (a << 24) | (r << 16) | (g << 8) | b;
+        }
+        return argb;
+    }
+
    private ImageUtils() {
    }
 }
@@ -18,10 +18,8 @@
 package org.jackhuang.hmcl.ui.main;

 import com.google.gson.*;
-import javafx.geometry.Insets;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.image.Image;
-import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.theme.Themes;
@@ -30,6 +28,7 @@ import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.WeakListenerHolder;
 import org.jackhuang.hmcl.ui.construct.ComponentList;
 import org.jackhuang.hmcl.ui.construct.LineButton;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.util.gson.JsonUtils;

 import java.io.IOException;
@@ -38,11 +37,18 @@ import java.io.InputStream;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;

-public final class AboutPage extends StackPane {
+public final class AboutPage extends SpinnerPane {

    private final WeakListenerHolder holder = new WeakListenerHolder();

    public AboutPage() {
+        VBox content = new VBox();
+        content.getStyleClass().add("spinner-pane-content");
+        ScrollPane scrollPane = new ScrollPane(content);
+        scrollPane.setFitToWidth(true);
+        FXUtils.smoothScrolling(scrollPane);
+        setContent(scrollPane);
+
        ComponentList about = new ComponentList();
        {
            var launcher = LineButton.createExternalLinkButton(Metadata.PUBLISH_URL);
@@ -66,7 +72,7 @@ public final class AboutPage extends StackPane {

        ComponentList legal = new ComponentList();
        {
-            var copyright = LineButton.createExternalLinkButton(Metadata.ABOUT_URL);
+            var copyright = new LineButton();
            copyright.setLargeTitle(true);
            copyright.setTitle(i18n("about.copyright"));
            copyright.setSubtitle(i18n("about.copyright.statement"));
@@ -84,27 +90,16 @@ public final class AboutPage extends StackPane {
            legal.getContent().setAll(copyright, claim, openSource);
        }

-        VBox content = new VBox(16);
-        content.setPadding(new Insets(10));
        content.getChildren().setAll(
                ComponentList.createComponentListTitle(i18n("about")),
                about,
-
                ComponentList.createComponentListTitle(i18n("about.thanks_to")),
                thanks,
-
                ComponentList.createComponentListTitle(i18n("about.dependency")),
                deps,
-
                ComponentList.createComponentListTitle(i18n("about.legal")),
                legal
        );
-
-
-        ScrollPane scrollPane = new ScrollPane(content);
-        scrollPane.setFitToWidth(true);
-        FXUtils.smoothScrolling(scrollPane);
-        getChildren().setAll(scrollPane);
    }

    private static Image loadImage(String url) {
@@ -27,14 +27,20 @@ import javafx.scene.control.ScrollPane;
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.*;
 import org.jackhuang.hmcl.setting.DownloadProviders;
+import org.jackhuang.hmcl.setting.EnumCommonDirectory;
+import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.task.FetchTask;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.WeakListenerHolder;
 import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.util.i18n.I18n;
+import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.javafx.SafeStringConverter;

 import java.net.Proxy;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;

@@ -72,7 +78,7 @@ public class DownloadSettingsPage extends StackPane {
                var versionListSourcePane = new LineSelectButton<String>();
                versionListSourcePane.disableProperty().bind(autoChooseDownloadSource.selectedProperty().not());
                versionListSourcePane.setTitle(i18n("settings.launcher.version_list_source"));
-                versionListSourcePane.setConverter(converter);
+                versionListSourcePane.setNullSafeConverter(converter);
                versionListSourcePane.setDescriptionConverter(descriptionConverter);
                versionListSourcePane.setItems(DownloadProviders.AUTO_PROVIDERS.keySet());
                versionListSourcePane.valueProperty().bindBidirectional(config().versionListSourceProperty());
@@ -80,21 +86,55 @@ public class DownloadSettingsPage extends StackPane {
                var downloadSourcePane = new LineSelectButton<String>();
                downloadSourcePane.disableProperty().bind(autoChooseDownloadSource.selectedProperty());
                downloadSourcePane.setTitle(i18n("settings.launcher.download_source"));
-                downloadSourcePane.setConverter(converter);
+                downloadSourcePane.setNullSafeConverter(converter);
                downloadSourcePane.setDescriptionConverter(descriptionConverter);
                downloadSourcePane.setItems(DownloadProviders.DIRECT_PROVIDERS.keySet());
                downloadSourcePane.valueProperty().bindBidirectional(config().downloadTypeProperty());

-                downloadSource.getContent().setAll(autoChooseDownloadSource, versionListSourcePane, downloadSourcePane);
+                var defaultAddonSourcePane = new LineSelectButton<String>();
+                defaultAddonSourcePane.setTitle(i18n("settings.launcher.default_addon_source"));
+                defaultAddonSourcePane.setNullSafeConverter(key -> I18n.i18n("mods." + key));
+                defaultAddonSourcePane.setItems("modrinth", "curseforge");
+                defaultAddonSourcePane.valueProperty().bindBidirectional(config().defaultAddonSourceProperty());
+
+                downloadSource.getContent().setAll(autoChooseDownloadSource, versionListSourcePane, downloadSourcePane, defaultAddonSourcePane);
            }

            content.getChildren().addAll(ComponentList.createComponentListTitle(i18n("settings.launcher.download_source")), downloadSource);
        }

        {
+            var downloadList = new ComponentList();
+
            VBox downloadThreads = new VBox(16);
-            downloadThreads.getStyleClass().add("card-non-transparent");
+
+            ComponentSublist fileCommonLocationSublist = new ComponentSublist();
+
            {
+                {
+                    MultiFileItem<EnumCommonDirectory> fileCommonLocation = new MultiFileItem<>();
+                    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"))
+                                    .setSelectionMode(FileSelector.SelectionMode.DIRECTORY)
+                                    .bindBidirectional(config().commonDirectoryProperty())
+                    ));
+                    fileCommonLocation.selectedDataProperty().bindBidirectional(config().commonDirTypeProperty());
+
+                    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);
+                }
+
                {
                    JFXCheckBox chkAutoDownloadThreads = new JFXCheckBox(i18n("settings.launcher.download.threads.auto"));
                    VBox.setMargin(chkAutoDownloadThreads, new Insets(8, 0, 0, 0));
@@ -147,7 +187,8 @@ public class DownloadSettingsPage extends StackPane {
                }
            }

-            content.getChildren().addAll(ComponentList.createComponentListTitle(i18n("download")), downloadThreads);
+            downloadList.getContent().addAll(fileCommonLocationSublist, downloadThreads);
+            content.getChildren().addAll(ComponentList.createComponentListTitle(i18n("download")), downloadList);
        }

        {
@@ -324,4 +365,11 @@ public class DownloadSettingsPage extends StackPane {
        }

    }
+
+    private void clearCacheDirectory() {
+        String commonDirectory = Settings.instance().getCommonDirectory();
+        if (commonDirectory != null) {
+            FileUtils.cleanDirectoryQuietly(Path.of(commonDirectory, "cache"));
+        }
+    }
 }
@@ -17,7 +17,6 @@
 */
 package org.jackhuang.hmcl.ui.main;

-import javafx.geometry.Insets;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.theme.Themes;
@@ -37,9 +36,7 @@ public class FeedbackPage extends SpinnerPane {

    public FeedbackPage() {
        VBox content = new VBox();
-        content.setPadding(new Insets(10));
-        content.setSpacing(10);
-        content.setFillWidth(true);
+        content.getStyleClass().add("spinner-pane-content");
        ScrollPane scrollPane = new ScrollPane(content);
        scrollPane.setFitToWidth(true);
        FXUtils.smoothScrolling(scrollPane);
@@ -84,8 +81,5 @@ public class FeedbackPage extends SpinnerPane {
                ComponentList.createComponentListTitle(i18n("contact.feedback")),
                feedback
        );
-
-        this.setContent(content);
    }
-
 }
@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.ui.main;

 import com.google.gson.annotations.SerializedName;
-import javafx.geometry.Insets;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.Metadata;
@@ -42,9 +41,7 @@ public class HelpPage extends SpinnerPane {

    public HelpPage() {
        content = new VBox();
-        content.setPadding(new Insets(10));
-        content.setSpacing(10);
-        content.setFillWidth(true);
+        content.getStyleClass().add("spinner-pane-content");
        ScrollPane scrollPane = new ScrollPane(content);
        scrollPane.setFitToWidth(true);
        FXUtils.smoothScrolling(scrollPane);
@@ -47,6 +47,7 @@ import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.DialogPane;
 import org.jackhuang.hmcl.ui.construct.JFXHyperlink;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.ui.wizard.SinglePageWizardProvider;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.Result;
@@ -233,7 +234,6 @@ public final class JavaDownloadDialog extends StackPane {
            downloadButton.setOnAction(e -> onDownload());
            downloadButton.getStyleClass().add("dialog-accept");
            downloadButton.disableProperty().bind(Bindings.isNull(remoteVersionBox.getSelectionModel().selectedItemProperty()));
-            downloadButtonPane.getChildren().setAll(downloadButton);

            JFXButton cancelButton = new JFXButton(i18n("button.cancel"));
            cancelButton.setOnAction(e -> fireEvent(new DialogCloseEvent()));
@@ -300,6 +300,11 @@ public final class JavaDownloadDialog extends StackPane {
                remoteVersionBox.getSelectionModel().selectFirst();
            });

+            SpinnerPane spinnerPane = new SpinnerPane();
+            spinnerPane.getStyleClass().add("small-spinner-pane");
+            spinnerPane.setContent(downloadButton);
+            downloadButtonPane.getChildren().setAll(spinnerPane);
+
            Consumer<DiscoJavaVersionList> updateListStatus = list -> {
                remoteVersionBox.setItems(null);
                packageTypeBox.getItems().clear();
@@ -308,11 +313,11 @@ public final class JavaDownloadDialog extends StackPane {
                warningLabel.setText(null);

                if (list == null || (list.versions != null && list.versions.isEmpty()))
-                    downloadButtonPane.getChildren().setAll(downloadButton);
+                    spinnerPane.hideSpinner();
                else if (list.status == DiscoJavaVersionList.Status.LOADING)
-                    downloadButtonPane.getChildren().setAll(new JFXSpinner());
+                    spinnerPane.showSpinner();
                else {
-                    downloadButtonPane.getChildren().setAll(downloadButton);
+                    spinnerPane.hideSpinner();

                    if (list.status == DiscoJavaVersionList.Status.SUCCESS) {
                        packageTypeBox.getItems().setAll(list.versions.keySet());
@@ -241,9 +241,7 @@ public final class JavaManagementPage extends ListPageBase<JavaRuntime> {
            HBox right = new HBox();
            right.setAlignment(Pos.CENTER_RIGHT);
            {
-                JFXButton revealButton = new JFXButton();
-                revealButton.setGraphic(SVG.FOLDER_OPEN.createIcon());
-                revealButton.getStyleClass().add("toggle-icon4");
+                JFXButton revealButton = FXUtils.newToggleButton4(SVG.FOLDER_OPEN);
                revealButton.setOnAction(e -> {
                    JavaRuntime java = getItem();
                    if (java != null)
@@ -157,26 +157,20 @@ public final class JavaRestorePage extends ListPageBase<JavaRestorePage.Disabled
            HBox right = new HBox();
            right.setAlignment(Pos.CENTER_RIGHT);
            {
-                JFXButton revealButton = new JFXButton();
-                revealButton.getStyleClass().add("toggle-icon4");
-                revealButton.setGraphic(SVG.FOLDER_OPEN.createIcon());
+                JFXButton revealButton = FXUtils.newToggleButton4(SVG.FOLDER_OPEN);
                revealButton.setOnAction(e -> skinnable.onReveal());
                FXUtils.installFastTooltip(revealButton, i18n("reveal.in_file_manager"));

                if (skinnable.realPath == null) {
                    revealButton.setDisable(true);

-                    JFXButton removeButton = new JFXButton();
-                    removeButton.getStyleClass().add("toggle-icon4");
-                    removeButton.setGraphic(SVG.DELETE.createIcon());
+                    JFXButton removeButton = FXUtils.newToggleButton4(SVG.DELETE_FOREVER);
                    removeButton.setOnAction(e -> skinnable.onRemove());
                    FXUtils.installFastTooltip(removeButton, i18n("java.disabled.management.remove"));

                    right.getChildren().setAll(revealButton, removeButton);
                } else {
-                    JFXButton restoreButton = new JFXButton();
-                    restoreButton.getStyleClass().add("toggle-icon4");
-                    restoreButton.setGraphic(SVG.RESTORE.createIcon());
+                    JFXButton restoreButton = FXUtils.newToggleButton4(SVG.RESTORE);
                    restoreButton.setOnAction(e -> skinnable.onRestore());
                    FXUtils.installFastTooltip(restoreButton, i18n("java.disabled.management.restore"));

@@ -28,6 +28,7 @@ import javafx.collections.ObservableList;
 import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
+import javafx.scene.Cursor;
 import javafx.scene.control.Label;
 import javafx.scene.control.Tooltip;
 import javafx.scene.image.ImageView;
@@ -170,6 +171,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
        FXUtils.setLimitHeight(updatePane, 55);
        StackPane.setAlignment(updatePane, Pos.TOP_RIGHT);
        FXUtils.onClicked(updatePane, this::onUpgrade);
+        updatePane.setCursor(Cursor.HAND);
        FXUtils.onChange(showUpdateProperty(), this::showUpdate);

        {
@@ -183,7 +185,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
                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())));
+                        latestVersion == null ? "" : i18n("update.bubble.title", latestVersion.version())));

                hBox.getChildren().setAll(SVG.UPDATE.createIcon(20), prompt);
            }
@@ -227,7 +229,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
                            launchLabel.setText(i18n("version.launch.empty"));
                            currentLabel.setText(null);
                            graphic.getChildren().setAll(launchLabel);
-                            launchButton.setOnAction(e -> MainPage.this.launchNoGame());
+                            FXUtils.setOnActionWithCooldown(launchButton, MainPage.this::launchNoGame);
                            if (tooltip == null)
                                tooltip = new Tooltip(i18n("version.launch.empty.tooltip"));
                            FXUtils.installFastTooltip(launchButton, tooltip);
@@ -235,7 +237,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
                            launchLabel.setText(i18n("version.launch"));
                            currentLabel.setText(currentGame);
                            graphic.getChildren().setAll(launchLabel, currentLabel);
-                            launchButton.setOnAction(e -> MainPage.this.launch());
+                            FXUtils.setOnActionWithCooldown(launchButton, MainPage.this::launch);
                            if (tooltip != null)
                                Tooltip.uninstall(launchButton, tooltip);
                        }
@@ -277,10 +279,12 @@ public final class MainPage extends StackPane implements DecoratorPage {
    private void showUpdate(boolean show) {
        doAnimation(show);

-        if (show && getLatestVersion() != null && !Objects.equals(config().getPromptedVersion(), getLatestVersion().getVersion())) {
-            Controllers.dialog(new MessageDialogPane.Builder("", i18n("update.bubble.title", getLatestVersion().getVersion()), MessageDialogPane.MessageType.INFO)
+        if (show && !config().isDisableAutoShowUpdateDialog()
+                && getLatestVersion() != null
+                && !Objects.equals(config().getPromptedVersion(), getLatestVersion().version())) {
+            Controllers.dialog(new MessageDialogPane.Builder("", i18n("update.bubble.title", getLatestVersion().version()), MessageDialogPane.MessageType.INFO)
                    .addAction(i18n("button.view"), () -> {
-                        config().setPromptedVersion(getLatestVersion().getVersion());
+                        config().setPromptedVersion(getLatestVersion().version());
                        onUpgrade();
                    })
                    .addCancel(null)
@@ -79,7 +79,7 @@ public class PersonalizationPage extends StackPane {
        {
            var brightnessPane = new LineSelectButton<String>();
            brightnessPane.setTitle(i18n("settings.launcher.brightness"));
-            brightnessPane.setConverter(name -> i18n("settings.launcher.brightness." + name));
+            brightnessPane.setNullSafeConverter(name -> i18n("settings.launcher.brightness." + name));
            brightnessPane.setItems("auto", "light", "dark");
            brightnessPane.valueProperty().bindBidirectional(config().themeBrightnessProperty());

@@ -135,6 +135,7 @@ public class PersonalizationPage extends StackPane {
                    new MultiFileItem.FileOption<>(i18n("settings.custom"), EnumBackgroundImage.CUSTOM)
                            .setChooserTitle(i18n("launcher.background.choose"))
                            .addExtensionFilter(FXUtils.getImageExtensionFilter())
+                            .setSelectionMode(FileSelector.SelectionMode.FILE_OR_DIRECTORY)
                            .bindBidirectional(config().backgroundImageProperty()),
                    new MultiFileItem.StringOption<>(i18n("launcher.background.network"), EnumBackgroundImage.NETWORK)
                            .setValidators(new URLValidator(true))
@@ -226,9 +227,7 @@ public class PersonalizationPage extends StackPane {
                                .fallbackTo(12.0)
                                .asPredicate(Validator.addTo(txtLogFontSize)));

-                        JFXButton clearButton = new JFXButton();
-                        clearButton.getStyleClass().add("toggle-icon4");
-                        clearButton.setGraphic(SVG.RESTORE.createIcon());
+                        JFXButton clearButton = FXUtils.newToggleButton4(SVG.RESTORE);
                        clearButton.setOnAction(e -> cboLogFont.setValue(null));

                        FXUtils.installFastTooltip(clearButton, i18n("button.reset"));
@@ -276,9 +275,7 @@ public class PersonalizationPage extends StackPane {
                        cboFont.setValue(config().getLauncherFontFamily());
                        FXUtils.onChange(cboFont.valueProperty(), FontManager::setFontFamily);

-                        JFXButton clearButton = new JFXButton();
-                        clearButton.getStyleClass().add("toggle-icon4");
-                        clearButton.setGraphic(SVG.RESTORE.createIcon());
+                        JFXButton clearButton = FXUtils.newToggleButton4(SVG.RESTORE);
                        clearButton.setOnAction(e -> cboFont.setValue(null));

                        FXUtils.installFastTooltip(clearButton, i18n("button.reset"));
@@ -298,7 +295,7 @@ public class PersonalizationPage extends StackPane {
                var fontAntiAliasingPane = new LineSelectButton<Optional<FontSmoothingType>>();
                fontAntiAliasingPane.setTitle(i18n("settings.launcher.font.anti_aliasing"));
                fontAntiAliasingPane.setSubtitle(i18n("settings.take_effect_after_restart"));
-                fontAntiAliasingPane.setConverter(value ->
+                fontAntiAliasingPane.setNullSafeConverter(value ->
                        value.isPresent()
                                ? i18n("settings.launcher.font.anti_aliasing." + value.get().name().toLowerCase(Locale.ROOT))
                                : i18n("settings.launcher.font.anti_aliasing.auto")
@@ -54,6 +54,7 @@ import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.TaskCancellationAction;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.*;
 import org.jackhuang.hmcl.util.versioning.VersionNumber;

@@ -98,7 +99,7 @@ public class RootPage extends DecoratorAnimatedPage implements DecoratorPage {
        if (mainPage == null) {
            MainPage mainPage = new MainPage();
            FXUtils.applyDragListener(mainPage,
-                    file -> ModpackHelper.isFileModpackByExtension(file) || NBTFileType.isNBTFileByExtension(file),
+                    file -> ModpackHelper.isFileModpackByExtension(file) || NBTFileType.isNBTFileByExtension(file) || "json".equalsIgnoreCase(FileUtils.getExtension(file)),
                    modpacks -> {
                        Path file = modpacks.get(0);
                        if (ModpackHelper.isFileModpackByExtension(file)) {
@@ -113,6 +114,8 @@ public class RootPage extends DecoratorAnimatedPage implements DecoratorPage {
                                Controllers.dialog(i18n("nbt.open.failed") + "\n\n" + StringUtils.getStackTrace(e),
                                        i18n("message.error"), MessageDialogPane.MessageType.ERROR);
                            }
+                        } else if ("json".equalsIgnoreCase(FileUtils.getExtension(file))) {
+                            Versions.installFromJson(Profiles.getSelectedProfile(), file);
                        }
                    });

@@ -18,24 +18,20 @@
 package org.jackhuang.hmcl.ui.main;

 import com.jfoenix.controls.JFXButton;
-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.beans.property.StringProperty;
+import javafx.css.PseudoClass;
 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 javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.setting.EnumCommonDirectory;
-import org.jackhuang.hmcl.setting.Settings;
+import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
@@ -45,6 +41,8 @@ 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.AprilFools;
+import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.i18n.SupportedLocale;
@@ -59,246 +57,212 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;

 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-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 ScrollPane {
-
-    @SuppressWarnings("FieldCanBeLocal")
-    private final ToggleGroup updateChannelGroup;
    @SuppressWarnings("FieldCanBeLocal")
    private final InvalidationListener updateListener;

    public SettingsPage() {
        this.setFitToWidth(true);

-        VBox rootPane = new VBox();
+        VBox rootPane = new VBox(10);
        rootPane.setPadding(new Insets(10));
        this.setContent(rootPane);
        FXUtils.smoothScrolling(this);

-        ComponentList settingsPane = new ComponentList();
        {
+            ComponentList updatePaneList = 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);
-
+                ObjectProperty<UpdateChannel> updateChannel;
                {
-                    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);
-            }
+                    JFXButton updateButton = FXUtils.newToggleButton4(SVG.UPDATE, 20);
+                    updateButton.setOnAction(e -> onUpdate());
+                    updateButton.setPadding(Insets.EMPTY);
+                    FXUtils.installFastTooltip(updateButton, i18n("update.tooltip"));

-            {
-                ComponentSublist updatePane = new ComponentSublist();
-                updatePane.setTitle(i18n("update"));
-                updatePane.setHasSubtitle(true);
+                    var updatePane = new LineSelectButton<UpdateChannel>() {

-                final Label lblUpdate;
-                final Label lblUpdateSub;
-                {
-                    VBox headerLeft = new VBox();
+                        {
+                            getStyleClass().add("update-pane");
+                            setNode(IDX_TRAILING, updateButton);
+                        }

-                    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");
+                        @Override
+                        protected int getTrailingTextIndex() {
+                            return LineComponent.IDX_TRAILING + 1;
                        }
                    };
-                    UpdateChecker.latestVersionProperty().addListener(new WeakInvalidationListener(updateListener));
-                    UpdateChecker.outdatedProperty().addListener(new WeakInvalidationListener(updateListener));
-                    UpdateChecker.checkingUpdateProperty().addListener(new WeakInvalidationListener(updateListener));
-                    updateListener.invalidated(null);
+                    updateChannel = updatePane.valueProperty();
+                    updatePane.setTitle(i18n("update"));
+                    updatePane.setValue(UpdateChannel.getChannel());

-                    updatePane.setHeaderRight(btnUpdate);
+                    updatePane.setNullSafeConverter(channel -> i18n("update.channel." + channel.channelName));
+                    updatePane.setItems(List.of(UpdateChannel.STABLE, UpdateChannel.DEVELOPMENT));
+                    updatePane.setDescriptionConverter(channel -> i18n("update.note." + channel.channelName));
+
+                    final StringProperty lblUpdateSubProperty = updatePane.subtitleProperty();
+
+                    {
+                        updateListener = any -> {
+                            boolean outdated = UpdateChecker.isOutdated();
+
+                            updateButton.setVisible(outdated);
+                            updateButton.setManaged(outdated);
+                            updatePane.pseudoClassStateChanged(PseudoClass.getPseudoClass("active"), outdated);
+
+                            if (UpdateChecker.isOutdated()) {
+                                lblUpdateSubProperty.set(i18n("update.newest_version", UpdateChecker.getLatestVersion().version()));
+                            } else if (UpdateChecker.isCheckingUpdate()) {
+                                lblUpdateSubProperty.set(i18n("update.checking"));
+                            } else {
+                                lblUpdateSubProperty.set(i18n("update.latest"));
+                            }
+                        };
+                        UpdateChecker.latestVersionProperty().addListener(new WeakInvalidationListener(updateListener));
+                        UpdateChecker.outdatedProperty().addListener(new WeakInvalidationListener(updateListener));
+                        UpdateChecker.checkingUpdateProperty().addListener(new WeakInvalidationListener(updateListener));
+                        updateListener.invalidated(null);
+                    }
+
+                    updatePaneList.getContent().add(updatePane);
                }

                {
-                    VBox content = new VBox(12);
-                    content.setPadding(new Insets(8, 0, 0, 0));
+                    LineToggleButton previewPane = new LineToggleButton();
+                    previewPane.setTitle(i18n("update.preview"));
+                    previewPane.setSubtitle(i18n("update.preview.subtitle"));
+                    previewPane.selectedProperty().bindBidirectional(config().acceptPreviewUpdateProperty());

-                    updateChannelGroup = new ToggleGroup();
+                    InvalidationListener checkUpdateListener = e -> {
+                        UpdateChecker.requestCheckUpdate(updateChannel.get(), previewPane.isSelected());
+                    };
+                    updateChannel.addListener(checkUpdateListener);
+                    previewPane.selectedProperty().addListener(checkUpdateListener);

-                    JFXRadioButton chkUpdateStable = new JFXRadioButton(i18n("update.channel.stable"));
-                    chkUpdateStable.setUserData(UpdateChannel.STABLE);
-                    chkUpdateStable.setToggleGroup(updateChannelGroup);
-
-                    JFXRadioButton chkUpdateDev = new JFXRadioButton(i18n("update.channel.dev"));
-                    chkUpdateDev.setUserData(UpdateChannel.DEVELOPMENT);
-                    chkUpdateDev.setToggleGroup(updateChannelGroup);
-
-                    Label noteWrapper = new Label(i18n("update.note"));
-                    VBox.setMargin(noteWrapper, new Insets(8, 0, 0, 0));
-
-                    content.getChildren().setAll(chkUpdateStable, chkUpdateDev, noteWrapper);
-
-                    updatePane.getContent().add(content);
+                    updatePaneList.getContent().add(previewPane);
                }
-                settingsPane.getContent().add(updatePane);
+
+                {
+                    LineToggleButton disableAutoShowUpdateDialogPane = new LineToggleButton();
+                    disableAutoShowUpdateDialogPane.setTitle(i18n("update.disable_auto_show_update_dialog"));
+                    disableAutoShowUpdateDialogPane.setSubtitle(i18n("update.disable_auto_show_update_dialog.subtitle"));
+                    disableAutoShowUpdateDialogPane.selectedProperty().bindBidirectional(config().disableAutoShowUpdateDialogProperty());
+                    updatePaneList.getContent().add(disableAutoShowUpdateDialogPane);
+                }
+
+                rootPane.getChildren().addAll(ComponentList.createComponentListTitle(i18n("update")), updatePaneList);
            }

            {
-                LineToggleButton previewPane = new LineToggleButton();
-                previewPane.setTitle(i18n("update.preview"));
-                previewPane.setSubtitle(i18n("update.preview.subtitle"));
-                previewPane.selectedProperty().bindBidirectional(config().acceptPreviewUpdateProperty());
+                ComponentList languagePaneList = new ComponentList();

-                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);
+                {
+                    var chooseLanguagePane = new LineSelectButton<SupportedLocale>();
+                    chooseLanguagePane.setTitle(i18n("settings.launcher.language"));
+                    chooseLanguagePane.setSubtitle(i18n("settings.take_effect_after_restart"));

-                settingsPane.getContent().add(previewPane);
+                    SupportedLocale currentLocale = I18n.getLocale();
+                    chooseLanguagePane.setNullSafeConverter(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);
+                    });
+                    chooseLanguagePane.setItems(SupportedLocale.getSupportedLocales());
+                    chooseLanguagePane.valueProperty().bindBidirectional(config().localizationProperty());
+
+                    languagePaneList.getContent().add(chooseLanguagePane);
+
+                    LineToggleButton disableAutoGameOptionsPane = new LineToggleButton();
+                    disableAutoGameOptionsPane.setTitle(i18n("settings.launcher.disable_auto_game_options"));
+                    disableAutoGameOptionsPane.selectedProperty().bindBidirectional(config().disableAutoGameOptionsProperty());
+
+                    languagePaneList.getContent().add(disableAutoGameOptionsPane);
+                }
+
+                rootPane.getChildren().addAll(ComponentList.createComponentListTitle(i18n("settings.launcher.language")), languagePaneList);
            }

            {
-                MultiFileItem<EnumCommonDirectory> fileCommonLocation = new MultiFileItem<>();
-                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())
-                ));
-                fileCommonLocation.selectedDataProperty().bindBidirectional(config().commonDirTypeProperty());
+                ComponentList miscPaneList = new ComponentList();

-                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()));
+                if (AprilFools.isShowAprilFoolsSettings()) {
+                    LineToggleButton disableAprilFools = new LineToggleButton();
+                    disableAprilFools.setTitle(i18n("settings.launcher.disable_april_fools"));
+                    disableAprilFools.setSubtitle(i18n("settings.take_effect_after_restart"));
+                    disableAprilFools.selectedProperty().bindBidirectional(config().disableAprilFoolsProperty());
+                    miscPaneList.getContent().add(disableAprilFools);
+                }

-                JFXButton cleanButton = FXUtils.newBorderButton(i18n("launcher.cache_directory.clean"));
-                cleanButton.setOnAction(e -> clearCacheDirectory());
-                fileCommonLocationSublist.setHeaderRight(cleanButton);
+                {
+                    LineToggleButton allowAutoAgentPane = new LineToggleButton();
+                    allowAutoAgentPane.setTitle(i18n("settings.launcher.allow_auto_agent"));
+                    allowAutoAgentPane.setSubtitle(i18n("settings.launcher.allow_auto_agent.subtitle"));
+                    allowAutoAgentPane.selectedProperty().bindBidirectional(config().allowAutoAgentProperty());

-                settingsPane.getContent().add(fileCommonLocationSublist);
+                    miscPaneList.getContent().add(allowAutoAgentPane);
+                }
+
+                {
+                    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);
+
+                    SpinnerPane exportLogPane = new SpinnerPane();
+
+                    JFXButton logButton = FXUtils.newBorderButton(i18n("settings.launcher.launcher_log.export"));
+                    exportLogPane.setContent(logButton);
+                    logButton.setOnAction(e -> {
+                        exportLogPane.showSpinner();
+                        onExportLogs().whenCompleteAsync((result, exception) -> {
+                            exportLogPane.hideSpinner();
+                            if (exception == null) {
+                                Controllers.dialog(i18n("settings.launcher.launcher_log.export.success", result));
+                                FXUtils.showFileInExplorer(result);
+                            } else {
+                                LOG.warning("Failed to export logs", exception);
+                                Controllers.dialog(
+                                        i18n("settings.launcher.launcher_log.export.failed") + "\n" + StringUtils.getStackTrace(exception),
+                                        null,
+                                        MessageType.ERROR
+                                );
+                            }
+                        }, Schedulers.javafx());
+                    });
+
+                    HBox buttonBox = new HBox();
+                    buttonBox.setSpacing(10);
+                    buttonBox.getChildren().addAll(openLogFolderButton, exportLogPane);
+                    BorderPane.setAlignment(buttonBox, Pos.CENTER_RIGHT);
+                    debugPane.setRight(buttonBox);
+
+                    miscPaneList.getContent().add(debugPane);
+                }
+
+                rootPane.getChildren().addAll(ComponentList.createComponentListTitle(i18n("settings.launcher.misc")), miscPaneList);
            }
-
-            {
-                var chooseLanguagePane = new LineSelectButton<SupportedLocale>();
-                chooseLanguagePane.setTitle(i18n("settings.launcher.language"));
-                chooseLanguagePane.setSubtitle(i18n("settings.take_effect_after_restart"));
-
-                SupportedLocale currentLocale = I18n.getLocale();
-                chooseLanguagePane.setConverter(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);
-                });
-                chooseLanguagePane.setItems(SupportedLocale.getSupportedLocales());
-                chooseLanguagePane.valueProperty().bindBidirectional(config().localizationProperty());
-
-                settingsPane.getContent().add(chooseLanguagePane);
-            }
-
-            {
-                LineToggleButton disableAutoGameOptionsPane = new LineToggleButton();
-                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);
        }
    }

@@ -363,96 +327,78 @@ public final class SettingsPage extends ScrollPane {
        }
    }

-    private void onExportLogs() {
-        thread(() -> {
+    private CompletableFuture<Path> onExportLogs() {
+        return CompletableFuture.supplyAsync(Lang.wrap(() -> {
            String nameBase = "hmcl-exported-logs-" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss"));
            List<Path> recentLogFiles = LOG.findRecentLogFiles(5);

            Path outputFile;
-            try {
-                if (recentLogFiles.isEmpty()) {
-                    outputFile = Metadata.CURRENT_DIRECTORY.resolve(nameBase + ".log");
+            if (recentLogFiles.isEmpty()) {
+                outputFile = Metadata.CURRENT_DIRECTORY.resolve(nameBase + ".log");

-                    LOG.info("Exporting latest logs to " + outputFile);
-                    try (OutputStream output = Files.newOutputStream(outputFile)) {
-                        LOG.exportLogs(output);
-                    }
-                } else {
-                    outputFile = Metadata.CURRENT_DIRECTORY.resolve(nameBase + ".zip");
+                LOG.info("Exporting latest logs to " + outputFile);
+                try (OutputStream output = Files.newOutputStream(outputFile)) {
+                    LOG.exportLogs(output);
+                }
+            } else {
+                outputFile = Metadata.CURRENT_DIRECTORY.resolve(nameBase + ".zip");

-                    LOG.info("Exporting latest logs to " + outputFile);
+                LOG.info("Exporting latest logs to " + outputFile);

-                    byte[] buffer = new byte[IOUtils.DEFAULT_BUFFER_SIZE];
-                    try (var os = Files.newOutputStream(outputFile);
-                         var zos = new ZipOutputStream(os)) {
+                byte[] buffer = new byte[IOUtils.DEFAULT_BUFFER_SIZE];
+                try (var os = Files.newOutputStream(outputFile);
+                     var zos = new ZipOutputStream(os)) {

-                        Set<String> entryNames = new HashSet<>();
+                    Set<String> entryNames = new HashSet<>();

-                        for (Path path : recentLogFiles) {
-                            String fileName = FileUtils.getName(path);
-                            String extension = StringUtils.substringAfterLast(fileName, '.');
+                    for (Path path : recentLogFiles) {
+                        String fileName = FileUtils.getName(path);
+                        String extension = StringUtils.substringAfterLast(fileName, '.');

-                            if ("gz".equals(extension) || "xz".equals(extension)) {
-                                // If an exception occurs while decompressing the input file, we should
-                                // ensure the input file and the current zip entry are closed,
-                                // then copy the compressed file content as-is into a new entry in the zip file.
-
-                                InputStream input = null;
-                                try {
-                                    input = Files.newInputStream(path);
-                                    input = "gz".equals(extension)
-                                            ? new GZIPInputStream(input)
-                                            : new XZInputStream(input);
-                                } catch (Throwable ex) {
-                                    LOG.warning("Failed to open log file " + path, ex);
-                                    IOUtils.closeQuietly(input, ex);
-                                    input = null;
-                                }
-
-                                String entryName = getEntryName(entryNames, StringUtils.substringBeforeLast(fileName, "."));
-                                if (input != null && exportLogFile(zos, path, entryName, input, buffer))
-                                    continue;
-                            }
-
-                            // Copy the log file content as-is into a new entry in the zip file.
+                        if ("gz".equals(extension) || "xz".equals(extension)) {
                            // If an exception occurs while decompressing the input file, we should
-                            // ensure the input file and the current zip entry are closed.
+                            // ensure the input file and the current zip entry are closed,
+                            // then copy the compressed file content as-is into a new entry in the zip file.

-                            InputStream input;
+                            InputStream input = null;
                            try {
                                input = Files.newInputStream(path);
+                                input = "gz".equals(extension)
+                                        ? new GZIPInputStream(input)
+                                        : new XZInputStream(input);
                            } catch (Throwable ex) {
                                LOG.warning("Failed to open log file " + path, ex);
-                                continue;
+                                IOUtils.closeQuietly(input, ex);
+                                input = null;
                            }

-                            exportLogFile(zos, path, getEntryName(entryNames, fileName), input, buffer);
+                            String entryName = getEntryName(entryNames, StringUtils.substringBeforeLast(fileName, "."));
+                            if (input != null && exportLogFile(zos, path, entryName, input, buffer))
+                                continue;
                        }

-                        zos.putNextEntry(new ZipEntry(getEntryName(entryNames, "hmcl-latest.log")));
-                        LOG.exportLogs(zos);
-                        zos.closeEntry();
+                        // Copy the log file content as-is into a new entry in the zip file.
+                        // If an exception occurs while decompressing the input file, we should
+                        // ensure the input file and the current zip entry are closed.
+
+                        InputStream input;
+                        try {
+                            input = Files.newInputStream(path);
+                        } catch (Throwable ex) {
+                            LOG.warning("Failed to open log file " + path, ex);
+                            continue;
+                        }
+
+                        exportLogFile(zos, path, getEntryName(entryNames, fileName), input, buffer);
                    }
+
+                    zos.putNextEntry(new ZipEntry(getEntryName(entryNames, "hmcl-latest.log")));
+                    LOG.exportLogs(zos);
+                    zos.closeEntry();
                }
-            } catch (IOException e) {
-                LOG.warning("Failed to export logs", e);
-                Platform.runLater(() -> Controllers.dialog(i18n("settings.launcher.launcher_log.export.failed") + "\n" + StringUtils.getStackTrace(e), null, MessageType.ERROR));
-                return;
            }

-            Platform.runLater(() -> Controllers.dialog(i18n("settings.launcher.launcher_log.export.success", outputFile)));
-            FXUtils.showFileInExplorer(outputFile);
-        });
-    }
-
-    private void onSponsor() {
-        FXUtils.openLink("https://github.com/HMCL-dev/HMCL");
-    }
-
-    private void clearCacheDirectory() {
-        String commonDirectory = Settings.instance().getCommonDirectory();
-        if (commonDirectory != null) {
-            FileUtils.cleanDirectoryQuietly(Path.of(commonDirectory, "cache"));
-        }
+            return outputFile;
+        }), Schedulers.io());
    }
 }
@@ -22,8 +22,14 @@ import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
+import javafx.scene.control.Skin;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeView;
+import javafx.scene.control.skin.TreeViewSkin;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
+import org.glavo.nbt.NBTElement;
+import org.glavo.nbt.tag.Tag;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
@@ -33,6 +39,7 @@ import org.jackhuang.hmcl.ui.construct.PageCloseEvent;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;

 import java.io.IOException;
 import java.nio.file.Path;
@@ -56,8 +63,9 @@ public final class NBTEditorPage extends SpinnerPane implements DecoratorPage {

        this.state = new ReadOnlyObjectWrapper<>(State.fromTitle(i18n("nbt.title", file.toString())));
        this.file = file;
-        this.type = NBTFileType.ofFile(file);

+        //noinspection DataFlowIssue
+        this.type = NBTFileType.ofFile(file);
        if (type == null) {
            throw new IOException("Unknown type of file " + file);
        }
@@ -85,14 +93,33 @@ public final class NBTEditorPage extends SpinnerPane implements DecoratorPage {

        actions.getChildren().setAll(saveButton, cancelButton);

-        Task.supplyAsync(() -> type.readAsTree(file))
+        Task.supplyAsync(() -> type.read(file))
                .whenComplete(Schedulers.javafx(), (result, exception) -> {
                    if (exception == null) {
                        setLoading(false);
-                        NBTTreeView view = new NBTTreeView(result);
+
+                        NBTTreeItem root = new NBTTreeItem(result, FileUtils.getName(file));
+                        var view = new TreeView<>(root) {
+                            @Override
+                            protected Skin<?> createDefaultSkin() {
+                                return new TreeViewSkin<>(this) {
+                                    {
+                                        FXUtils.smoothScrolling(getVirtualFlow());
+                                    }
+                                };
+                            }
+                        };
+                        view.setCellFactory(ignored -> new NBTTreeCell());
+                        view.addEventHandler(TreeItem.<NBTElement>branchExpandedEvent(), event -> {
+                            TreeItem<NBTElement> item = event.getTreeItem();
+                            if (item.getValue() instanceof Tag && item.getChildren().size() == 1)
+                                item.getChildren().get(0).setExpanded(true);
+                        });
+                        root.setExpanded(true);
+
                        BorderPane.setMargin(view, new Insets(10));
                        onEscPressed(view, cancelButton::fire);
-                        root.setCenter(view);
+                        this.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);
@@ -17,148 +17,34 @@
 */
 package org.jackhuang.hmcl.ui.nbt;

-import com.github.steveice10.opennbt.NBTIO;
-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.github.steveice10.opennbt.tag.builtin.IntTag;
-import com.github.steveice10.opennbt.tag.builtin.ListTag;
-import com.github.steveice10.opennbt.tag.builtin.Tag;
-import kala.compress.utils.BoundedInputStream;
+import org.glavo.nbt.NBTElement;
+import org.glavo.nbt.chunk.ChunkRegion;
+import org.glavo.nbt.io.NBTCodec;
+import org.glavo.nbt.tag.Tag;
 import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jetbrains.annotations.Nullable;

-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.RandomAccessFile;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.Inflater;
-import java.util.zip.InflaterInputStream;

-/**
- * @author Glavo
- */
+/// @author Glavo
 public enum NBTFileType {
    COMPRESSED("dat", "dat_old") {
        @Override
        public Tag read(Path file) throws IOException {
-            try (BufferedInputStream fileInputStream = new BufferedInputStream(Files.newInputStream(file))) {
-                fileInputStream.mark(3);
-                byte[] header = new byte[3];
-                if (fileInputStream.read(header) < 3) {
-                    throw new IOException("File is too small");
-                }
-                fileInputStream.reset();
-
-                InputStream input;
-                if (Arrays.equals(header, new byte[]{0x1f, (byte) 0x8b, 0x08})) {
-                    input = new GZIPInputStream(fileInputStream);
-                } else {
-                    input = fileInputStream;
-                }
-
-                Tag tag = NBTIO.readTag(input);
-                if (!(tag instanceof CompoundTag))
-                    throw new IOException("Unexpected tag: " + tag);
-                return tag;
-            }
+            return NBTCodec.of().readTag(file);
        }
    },
    ANVIL("mca") {
        @Override
-        public Tag read(Path file) throws IOException {
-            return REGION.read(file);
-        }
-
-        @Override
-        public NBTTreeView.Item readAsTree(Path file) throws IOException {
-            return REGION.readAsTree(file);
+        public NBTElement read(Path file) throws IOException {
+            return NBTCodec.of().readRegion(file);
        }
    },
    REGION("mcr") {
        @Override
-        public Tag read(Path file) throws IOException {
-            try (RandomAccessFile r = new RandomAccessFile(file.toFile(), "r")) {
-                ListTag tag = new ListTag(file.getFileName().toString(), CompoundTag.class);
-                if (r.length() == 0) {
-                    return tag;
-                }
-
-                byte[] header = new byte[4096];
-                byte[] buffer = new byte[1 * 1024 * 1024]; // The maximum size of each chunk is 1MiB
-                Inflater inflater = new Inflater();
-
-                r.readFully(header);
-                for (int i = 0; i < 4096; i += 4) {
-                    int offset = ((header[i] & 0xff) << 16) + ((header[i + 1] & 0xff) << 8) + (header[i + 2] & 0xff);
-                    int length = header[i + 3] & 0xff;
-
-                    if (offset == 0 || length == 0) {
-                        continue;
-                    }
-
-                    r.seek(offset * 4096L);
-                    r.readFully(buffer, 0, length * 4096);
-
-                    int chunkLength = ((buffer[0] & 0xff) << 24) + ((buffer[1] & 0xff) << 16) + ((buffer[2] & 0xff) << 8) + (buffer[3] & 0xff);
-
-                    InputStream input = new ByteArrayInputStream(buffer);
-                    input.skip(5);
-                    input = new BoundedInputStream(input, chunkLength - 1);
-
-                    switch (buffer[4]) {
-                        case 0x01:
-                            // GZip
-                            input = new GZIPInputStream(input);
-                            break;
-                        case 0x02:
-                            // Zlib
-                            inflater.reset();
-                            input = new InflaterInputStream(input, inflater);
-                            break;
-                        case 0x03:
-                            // Uncompressed
-                            break;
-                        default:
-                            throw new IOException("Unsupported compression method: " + Integer.toHexString(buffer[4] & 0xff));
-                    }
-
-                    try (InputStream in = input) {
-                        Tag chunk = NBTIO.readTag(in);
-                        if (!(chunk instanceof CompoundTag))
-                            throw new IOException("Unexpected tag: " + chunk);
-
-                        tag.add(chunk);
-                    }
-                }
-                return tag;
-            }
-        }
-
-        @Override
-        public NBTTreeView.Item readAsTree(Path file) throws IOException {
-            NBTTreeView.Item item = new NBTTreeView.Item(read(file));
-
-            for (Tag tag : ((ListTag) item.getValue())) {
-                CompoundTag chunk = (CompoundTag) tag;
-
-                NBTTreeView.Item tree = NBTTreeView.buildTree(chunk);
-
-                Tag xPos = chunk.get("xPos");
-                Tag zPos = chunk.get("zPos");
-
-                if (xPos instanceof IntTag && zPos instanceof IntTag) {
-                    tree.setText(String.format("Chunk: %d  %d", xPos.getValue(), zPos.getValue()));
-                } else {
-                    tree.setText("Chunk: Unknown");
-                }
-
-                item.getChildren().add(tree);
-            }
-
-            return item;
+        public ChunkRegion read(Path file) throws IOException {
+            return NBTCodec.of().readRegion(file);
        }
    };

@@ -168,7 +54,7 @@ public enum NBTFileType {
        return NBTFileType.ofFile(file) != null;
    }

-    public static NBTFileType ofFile(Path file) {
+    public static @Nullable NBTFileType ofFile(Path file) {
        String ext = FileUtils.getExtension(file);
        for (NBTFileType type : types) {
            for (String extension : type.extensions) {
@@ -186,11 +72,6 @@ public enum NBTFileType {
        this.extensions = extensions;
    }

-    public abstract Tag read(Path file) throws IOException;
+    public abstract NBTElement read(Path file) throws IOException;

-    public NBTTreeView.Item readAsTree(Path file) throws IOException {
-        NBTTreeView.Item root = NBTTreeView.buildTree(read(file));
-        root.setName(file.getFileName().toString());
-        return root;
-    }
 }