[release/3.12] 更新文言文翻译 (#5849 )

https://github.com/HMCL-dev/HMCL/pull/5845
[release/3.12] Update default Java version to JAVA_25 (#5846 )
2026-03-24 21:44:35 +08:00 · 2026-03-24 21:38:17 +08:00 · 2026-03-24 21:37:49 +08:00 · 2026-03-24 21:37:20 +08:00
275 changed files with 4727 additions and 11734 deletions
@@ -1,3 +0,0 @@
-code_review:
-  pull_request_opened:
-    code_review: false
@@ -1,65 +0,0 @@
-# Default: normalize all text files to LF in the repository and on checkout.
-# Git auto-detects binary files and leaves them untouched.
-* text=auto eol=lf
-
-# ─── Explicitly text – source & build ────────────────────────────────────────
-*.java        text eol=lf
-*.kt          text eol=lf
-*.kts         text eol=lf
-*.groovy      text eol=lf
-*.gradle      text eol=lf
-
-# ─── Configuration & data ─────────────────────────────────────────────────────
-*.properties  text eol=lf
-*.toml        text eol=lf
-*.xml         text eol=lf
-*.json        text eol=lf
-*.yaml        text eol=lf
-*.yml         text eol=lf
-*.csv         text eol=lf
-*.html        text eol=lf
-*.css         text eol=lf
-*.txt         text eol=lf
-*.md          text eol=lf
-*.svg         text eol=lf
-*.MF          text eol=lf
-
-# Gradle dependency-lock files
-*.lockfile    text eol=lf
-
-# ─── Scripts ──────────────────────────────────────────────────────────────────
-# Unix shell scripts must always use LF so they stay executable on Linux/macOS.
-*.sh          text eol=lf
-gradlew       text eol=lf
-
-# CI pipeline scripts
-Jenkinsfile   text eol=lf
-
-# Windows batch files must keep CRLF so cmd.exe can parse them.
-*.bat         text eol=crlf
-
-# ─── Binary files ─────────────────────────────────────────────────────────────
-# Raster / animated images
-*.png         binary
-*.apng        binary
-*.jpg         binary
-*.jpeg        binary
-*.webp        binary
-*.gif         binary
-*.ico         binary
-
-# Archives & compiled artifacts
-*.jar         binary
-*.zip         binary
-*.class       binary
-
-# Cryptographic / certificate files
-*.der         binary
-
-# Minecraft schematic
-*.litematic   binary
-
-# Compiled / intermediate build artefacts
-*.bin         binary
-*.probe       binary
-
@@ -48,9 +48,3 @@ jobs:
        name: HMCL-${{ env.SHORT_SHA }}-sh
        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,20 +46,16 @@ 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: |
@@ -71,7 +67,6 @@ 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
@@ -81,8 +76,6 @@ 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
@@ -93,7 +86,6 @@ 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 \
@@ -128,9 +120,6 @@ 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
@@ -5,7 +5,6 @@ hs_err_pid*
 *.hprof

 .gradle
-gradle.properties

 *.lck
 *.1
@@ -65,10 +64,4 @@ language-subtag-registry
 # test
 /hmcl.json
 /.hmcl.json
-/.hmcl/
-
-# AI
-/.gemini/
-!/.gemini/config.yaml
-.codex
-/.gradle-*/
+/.hmcl/
@@ -1,6 +0,0 @@
-<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>
@@ -1,8 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="HMCL">
-    <LanguageOptions name="JAVA">
-      <option name="fileTypeOverride" value="3" />
-      <option name="addBlankAfter" value="false" />
-    </LanguageOptions>
-  </settings>
-</component>
@@ -1,21 +0,0 @@
-# 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.
@@ -6,8 +6,6 @@ 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
@@ -58,8 +56,7 @@ dependencies {
    implementation(project(":HMCLCore"))
    implementation(project(":HMCLBoot"))
    implementation("libs:JFoenix")
-    implementation(libs.jwebp)
-    implementation(libs.fxsvgimage)
+    implementation(libs.twelvemonkeys.imageio.webp)
    implementation(libs.java.info)
    implementation(libs.monet.fx)
    implementation(libs.nayuki.qrcodegen)
@@ -69,7 +66,6 @@ dependencies {
    }

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

 fun digest(algorithm: String, bytes: ByteArray): ByteArray = MessageDigest.getInstance(algorithm).digest(bytes)
@@ -159,7 +155,6 @@ 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")
@@ -197,7 +192,7 @@ tasks.shadowJar {
    exclude("META-INF/services/javax.imageio.spi.ImageInputStreamSpi")

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

@@ -253,22 +248,20 @@ 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 { artifactFile(it) })
+    outputs.files(extensions.map { File(jarPath.parentFile, jarPath.nameWithoutExtension + '.' + it) })

    doLast {
        val jarContent = jarPath.readBytes()

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

@@ -283,31 +276,8 @@ 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> {
@@ -404,14 +374,12 @@ 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,13 +23,21 @@ import com.jfoenix.controls.events.JFXDialogEvent;
 import com.jfoenix.converters.DialogTransitionConverter;
 import com.jfoenix.effects.JFXDepthManager;
 import com.jfoenix.transitions.CachedTransition;
-import javafx.animation.*;
+import javafx.animation.Interpolator;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
+import javafx.animation.Transition;
 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.*;
+import javafx.css.CssMetaData;
+import javafx.css.SimpleStyleableObjectProperty;
+import javafx.css.Styleable;
+import javafx.css.StyleableObjectProperty;
+import javafx.css.StyleableProperty;
 import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.geometry.Pos;
@@ -41,6 +49,7 @@ 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;
@@ -146,6 +155,7 @@ 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
@@ -371,14 +381,6 @@ public class JFXDialog extends StackPane {
            setCycleDuration(Duration.seconds(0.4));
            setDelay(Duration.ZERO);
        }
-
-        @Override
-        protected void starting() {
-        }
-
-        @Override
-        protected void stopping() {
-        }
    }

    /***************************************************************************
@@ -231,11 +231,10 @@ public class JFXRippler extends StackPane {
     *
     * @return the ripple radius size
     */
-    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 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 void setOverLayBounds(Rectangle overlay) {
@@ -474,7 +473,7 @@ public class JFXRippler extends StackPane {
                super(centerX,
                        centerY,
                        getRipplerRadius() == Region.USE_COMPUTED_SIZE ?
-                                computeRippleRadius(centerX, centerY) : getRipplerRadius(), null);
+                                computeRippleRadius() : getRipplerRadius(), null);
                setCache(true);
                setCacheHint(CacheHint.SPEED);
                setCacheShape(true);
@@ -519,7 +518,7 @@ public class JFXRippler extends StackPane {
                        new KeyValue(opacityProperty(),
                                1,
                                RIPPLE_INTERPOLATOR)
-                ), new KeyFrame(Duration.millis(600), inKeyValues));
+                ), new KeyFrame(Duration.millis(900), inKeyValues));

                setScaleX(0);
                setScaleY(0);
@@ -1,277 +0,0 @@
-//
-// 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,16 +40,12 @@ 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
 */
@@ -82,7 +78,7 @@ public class JFXCustomColorPickerDialog extends StackPane {

        // create JFX Decorator
        pickerDecorator = new JFXDecorator(dialog, this, false, false, false);
-        pickerDecorator.setOnCloseButtonAction(this::close);
+        pickerDecorator.setOnCloseButtonAction(this::updateColor);
        pickerDecorator.setPickOnBounds(false);
        customScene = new Scene(pickerDecorator, Color.TRANSPARENT);
        StyleSheets.init(customScene);
@@ -157,22 +153,6 @@ 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) -> {
@@ -199,7 +179,7 @@ public class JFXCustomColorPickerDialog extends StackPane {
                            (int) (newColor.getRed() * 255),
                            (int) (newColor.getGreen() * 255),
                            (int) (newColor.getBlue() * 255));
-                    String rgb = String.format("rgb(%d, %d, %d)",
+                    String rgb = String.format("rgba(%d, %d, %d, 1)",
                            (int) (newColor.getRed() * 255),
                            (int) (newColor.getGreen() * 255),
                            (int) (newColor.getBlue() * 255));
@@ -252,13 +232,7 @@ 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(() -> {
@@ -288,6 +262,9 @@ public class JFXCustomColorPickerDialog extends StackPane {
            });
        };

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

@@ -317,11 +294,7 @@ public class JFXCustomColorPickerDialog extends StackPane {
        if (!systemChange) {
            userChange = true;
            try {
-                Color color = Color.valueOf(colorWebString);
-                if (color.getOpacity() != 1.0) {
-                    color = Color.color(color.getRed(), color.getGreen(), color.getBlue());
-                }
-                curvedColorPicker.setColor(color);
+                curvedColorPicker.setColor(Color.valueOf(colorWebString));
            } catch (IllegalArgumentException ignored) {
                // if color is not valid then do nothing
            }
@@ -25,7 +25,6 @@ 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;
@@ -50,8 +49,6 @@ public final class EntryPoint {
        createHMCLDirectories();
        LOG.start(Metadata.HMCL_CURRENT_DIRECTORY.resolve("logs"));

-        checkWine();
-
        setupJavaFXVMOptions();

        if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
@@ -223,20 +220,6 @@ 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,34 +17,35 @@
 */
 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.*;
+import org.jackhuang.hmcl.util.CrashReporter;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.JarUtils;
-import org.jackhuang.hmcl.util.platform.*;
+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 java.io.File;
 import java.io.IOException;
@@ -64,8 +65,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.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public final class Launcher extends Application {
    public static final CookieManager COOKIE_MANAGER = new CookieManager();
@@ -110,7 +111,7 @@ public final class Launcher extends Application {
            if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS
                    && ConfigHolder.isNewlyCreated()
                    && System.getProperty("user.dir").startsWith("/private/var/folders/")) {
-                if (!confirmWithCountdown(AlertType.WARNING, i18n("fatal.mac_app_translocation"), 5))
+                if (showAlert(AlertType.WARNING, i18n("fatal.mac_app_translocation"), ButtonType.YES, ButtonType.NO) == ButtonType.NO)
                    return;
            } else {
                checkConfigInTempDir();
@@ -136,9 +137,6 @@ 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();
@@ -184,27 +182,6 @@ 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();

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

    private static void checkConfigInTempDir() {
        if (ConfigHolder.isNewlyCreated() && isConfigInTempDir()
-                && !confirmWithCountdown(AlertType.WARNING, i18n("fatal.config_in_temp_dir"), 5)) {
+                && showAlert(AlertType.WARNING, i18n("fatal.config_in_temp_dir"), ButtonType.YES, ButtonType.NO) == ButtonType.NO) {
            EntryPoint.exit(0);
        }
    }
@@ -344,8 +321,6 @@ 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,6 +24,7 @@ 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;

 /**
@@ -45,9 +46,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";
@@ -58,38 +59,34 @@ 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 = Path.of(System.getProperty("user.dir")).toAbsolutePath().normalize();
+    public static final Path CURRENT_DIRECTORY = Paths.get(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", System.getenv("HMCL_USER_HOME"));
-        if (StringUtils.isBlank(hmclHome)) {
+        String hmclHome = System.getProperty("hmcl.home");
+        if (hmclHome == null) {
            if (OperatingSystem.CURRENT_OS.isLinuxOrBSD()) {
                String xdgData = System.getenv("XDG_DATA_HOME");
                if (StringUtils.isNotBlank(xdgData)) {
-                    HMCL_GLOBAL_DIRECTORY = Path.of(xdgData, "hmcl").toAbsolutePath().normalize();
+                    HMCL_GLOBAL_DIRECTORY = Paths.get(xdgData, "hmcl").toAbsolutePath().normalize();
                } else {
-                    HMCL_GLOBAL_DIRECTORY = Path.of(System.getProperty("user.home"), ".local", "share", "hmcl").toAbsolutePath().normalize();
+                    HMCL_GLOBAL_DIRECTORY = Paths.get(System.getProperty("user.home"), ".local", "share", "hmcl").toAbsolutePath().normalize();
                }
            } else {
                HMCL_GLOBAL_DIRECTORY = OperatingSystem.getWorkingDirectory("hmcl");
            }
        } else {
-            HMCL_GLOBAL_DIRECTORY = Path.of(hmclHome).toAbsolutePath().normalize();
+            HMCL_GLOBAL_DIRECTORY = Paths.get(hmclHome).toAbsolutePath().normalize();
        }

-        String hmclCurrentDir = System.getProperty("hmcl.dir", System.getenv("HMCL_LOCAL_HOME"));
-        HMCL_CURRENT_DIRECTORY = StringUtils.isNotBlank(hmclCurrentDir)
-                ? Path.of(hmclCurrentDir).toAbsolutePath().normalize()
+        String hmclCurrentDir = System.getProperty("hmcl.dir");
+        HMCL_CURRENT_DIRECTORY = hmclCurrentDir != null
+                ? Paths.get(hmclCurrentDir).toAbsolutePath().normalize()
                : CURRENT_DIRECTORY.resolve(".hmcl");
-
-        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");
+        DEPENDENCIES_DIRECTORY = HMCL_CURRENT_DIRECTORY.resolve("dependencies");
    }

    public static boolean isStable() {
@@ -1,20 +1,3 @@
-/*
- * 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,16 +21,12 @@ 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;
@@ -154,60 +150,4 @@ 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(), 64, 64, true, true);
+                    return FXUtils.loadImage(iconFile.get());
                } catch (Exception e) {
                    LOG.warning("Failed to load version icon of " + id, e);
                }
@@ -430,7 +430,6 @@ 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())
@@ -515,7 +514,7 @@ public final class HMCLGameRepository extends DefaultGameRepository {
                FORBIDDEN_VERSION_IDS.contains(id.toLowerCase(Locale.ROOT)))
            return false;

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

    /**
@@ -65,18 +65,16 @@ 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;
@@ -172,55 +170,33 @@ public final class LauncherHelper {
                                }
                            }),
                            Task.composeAsync(() -> {
-                                if (OperatingSystem.CURRENT_OS != OperatingSystem.WINDOWS
-                                        || !(setting.getRenderer() instanceof Renderer.Driver renderer)
-                                        || renderer.mesaDriverName() == null)
-                                    return null;
+                                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;
+                                    }

-                                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;
-                                }
+                                    String agent = FileUtils.getAbsolutePath(file) + "=" + renderer.name().toLowerCase(Locale.ROOT);

-                                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));
+                                    if (GameLibrariesTask.shouldDownloadLibrary(repository, version.get(), lib, integrityCheck)) {
+                                        return new LibraryDownloadTask(dependencyManager, file, lib)
+                                                .thenRunAsync(() -> javaAgents.add(agent));
+                                    } else {
+                                        javaAgents.add(agent);
+                                        return null;
+                                    }
                                } 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(
@@ -231,7 +207,6 @@ 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));
@@ -624,7 +599,7 @@ public final class LauncherHelper {
                            break;
                        case VANILLA_X86:
                            if (setting.getNativesDirType() == NativesDirectoryType.VERSION_FOLDER
-                                    && Platform.isSupportedTranslationX86_64()) {
+                                    && isCompatibleWithX86Java()) {
                                suggestions.add(i18n("launch.advice.vanilla_x86.translation"));
                            }
                            break;
@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.game;

 import org.jackhuang.hmcl.download.DownloadProvider;
+import org.jackhuang.hmcl.mod.LocalModFile;
 import org.jackhuang.hmcl.mod.RemoteMod;
 import org.jackhuang.hmcl.mod.RemoteModRepository;
 import org.jackhuang.hmcl.ui.versions.ModTranslations;
@@ -46,42 +47,33 @@ public abstract class LocalizedRemoteModRepository implements RemoteModRepositor
            return getBackedRemoteModRepository().search(downloadProvider, gameVersion, category, pageOffset, pageSize, searchFilter, sort, sortOrder);
        }

-        Set<String> englishSearchFiltersSet = new LinkedHashSet<>(INITIAL_CAPACITY);
+        Set<String> englishSearchFiltersSet = new HashSet<>(INITIAL_CAPACITY);

        int count = 0;
        for (ModTranslations.Mod mod : ModTranslations.getTranslationsByRepositoryType(getType()).searchMod(searchFilter)) {
-            String englishSearchFilter = String.join(" ", StringUtils.tokenize(StringUtils.isNotBlank(mod.getSubname()) ? mod.getSubname() : mod.getName()));
-            if (StringUtils.isNotBlank(englishSearchFilter)) {
-                englishSearchFiltersSet.add(englishSearchFilter);
+            for (String englishWord : StringUtils.tokenize(StringUtils.isNotBlank(mod.getSubname()) ? mod.getSubname() : mod.getName())) {
+                if (englishSearchFiltersSet.contains(englishWord)) {
+                    continue;
+                }
+
+                englishSearchFiltersSet.add(englishWord);
            }

            count++;
            if (count >= 3) break;
        }

-        if (englishSearchFiltersSet.isEmpty()) {
-            return getBackedRemoteModRepository().search(downloadProvider, gameVersion, category, pageOffset, pageSize, searchFilter, sort, sortOrder);
-        }
-
        RemoteMod[] searchResultArray = new RemoteMod[pageSize];
        int totalPages, chineseIndex = 0, englishIndex = pageSize - 1;
        {
-            SearchResult searchResult = null;
-            List<RemoteMod> remoteMods = List.of();
-            for (String englishSearchFilter : englishSearchFiltersSet) {
-                searchResult = getBackedRemoteModRepository().search(downloadProvider, gameVersion, category, pageOffset, pageSize, englishSearchFilter, getBackedRemoteModRepositorySortOrder(), sortOrder);
-                remoteMods = searchResult.getUnsortedResults().toList();
-                if (!remoteMods.isEmpty()) {
-                    break;
-                }
-            }
-
-            for (RemoteMod remoteMod : remoteMods) {
+            SearchResult searchResult = getBackedRemoteModRepository().search(downloadProvider, gameVersion, category, pageOffset, pageSize, String.join(" ", englishSearchFiltersSet), getBackedRemoteModRepositorySortOrder(), sortOrder);
+            for (Iterator<RemoteMod> iterator = searchResult.getUnsortedResults().iterator(); iterator.hasNext(); ) {
                if (chineseIndex > englishIndex) {
                    LOG.warning("Too many search results! Are the backed remote mod repository broken? Or are the API broken?");
                    continue;
                }

+                RemoteMod remoteMod = iterator.next();
                ModTranslations.Mod chineseTranslation = ModTranslations.getTranslationsByRepositoryType(getType()).getModByCurseForgeId(remoteMod.getSlug());
                if (chineseTranslation != null && !StringUtils.isBlank(chineseTranslation.getName()) && StringUtils.containsChinese(chineseTranslation.getName())) {
                    searchResultArray[chineseIndex++] = remoteMod;
@@ -118,8 +110,8 @@ public abstract class LocalizedRemoteModRepository implements RemoteModRepositor
    }

    @Override
-    public Optional<RemoteMod.Version> getRemoteVersionByLocalFile(Path file) throws IOException {
-        return getBackedRemoteModRepository().getRemoteVersionByLocalFile(file);
+    public Optional<RemoteMod.Version> getRemoteVersionByLocalFile(LocalModFile localModFile, Path file) throws IOException {
+        return getBackedRemoteModRepository().getRemoteVersionByLocalFile(localModFile, file);
    }

    @Override
@@ -31,6 +31,7 @@ public final class Log {

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

    public Log(String log) {
        this.log = log;
@@ -56,6 +57,14 @@ 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,10 +51,7 @@ import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Stream;

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

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

    public static boolean isExternalGameNameConflicts(String name) {
@@ -214,16 +211,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(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
+                    .withStagesHints("hmcl.modpack", "hmcl.modpack.download");
        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(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
+                    .withStagesHints("hmcl.modpack", "hmcl.modpack.download");
        else
            return modpack.getInstallTask(profile.getDependency(), zipFile, name, iconUrl)
                    .whenComplete(Schedulers.javafx(), success, failure)
-                    .withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
+                    .withStagesHints("hmcl.modpack", "hmcl.modpack.download");
    }

    public static Task<Void> getUpdateTask(Profile profile, ServerModpackManifest manifest, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException {
@@ -231,7 +228,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(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
+                        .withStagesHints("hmcl.modpack", "hmcl.modpack.download");
            default:
                throw new UnsupportedModpackException();
        }
@@ -30,10 +30,7 @@ import org.jackhuang.hmcl.util.io.NetworkUtils;

 import java.io.IOException;
 import java.security.SecureRandom;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;

@@ -166,16 +163,8 @@ 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<LoginCompletedDeviceCodeEvent> onLoginCompletedDeviceCode = new EventManager<>();
        public final EventManager<OpenBrowserEvent> onOpenBrowserAuthorizationCode = new EventManager<>();
        public final EventManager<OpenBrowserEvent> onOpenBrowserDevice = new EventManager<>();

@@ -203,11 +192,6 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
            onGrantDeviceCode.fireEvent(new GrantDeviceCodeEvent(this, userCode, verificationURI));
        }

-        @Override
-        public void loginCompletedDeviceCode() {
-            onLoginCompletedDeviceCode.fireEvent(new LoginCompletedDeviceCodeEvent(this));
-        }
-
        @Override
        public void openBrowser(OAuth.GrantFlow grantFlow, String url) throws IOException {
            lastlyOpenedURL = url;
@@ -244,12 +228,6 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
        }
    }

-    public static class LoginCompletedDeviceCodeEvent extends Event {
-        public LoginCompletedDeviceCodeEvent(Object source) {
-            super(source);
-        }
-    }
-
    public static class OpenBrowserEvent extends Event {
        private final String url;

@@ -99,7 +99,7 @@ public final class HMCLJavaRepository implements JavaRepository {
        return getJavaExecutable(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.component());
    }

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

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

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

-        ArrayList<Path> list = new ArrayList<>();
+        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);
+        }

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

            JavaInfo info;
            if (JavaManager.isCompatible(platform))
-                info = JavaInfoUtils.fromExecutable(executable);
+                info = JavaInfoUtils.fromExecutable(executable, false);
            else
-                info = new JavaInfo(platform, result.download().version().name(), null);
+                info = new JavaInfo(platform, result.download.getVersion().getName(), 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,7 +18,6 @@
 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;
@@ -28,6 +27,7 @@ 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,10 +39,35 @@ public final class JavaInfoUtils {
    private JavaInfoUtils() {
    }

-    public static @NotNull JavaInfo fromExecutable(Path executable) throws IOException {
+    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 {
        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");
        }
@@ -69,6 +94,7 @@ public final class JavaInfoUtils {
                            ? architecture
                            : Architecture.SYSTEM_ARCH);

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

-    @JsonSerializable
-    private record Result(@SerializedName("os.name") String osName, @SerializedName("os.arch") String osArch,
-                          @SerializedName("java.version") String javaVersion,
-                          @SerializedName("java.vendor") String javaVendor) {
+    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;
    }
 }
@@ -17,8 +17,6 @@
 */
 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;
@@ -32,9 +30,7 @@ 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;
@@ -44,14 +40,9 @@ 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;
@@ -64,16 +55,6 @@ 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"));

@@ -122,27 +103,16 @@ 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) {
-
-                    // 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;
-                }
+                if (Architecture.SYSTEM_ARCH == Architecture.ARM64)
+                    return OperatingSystem.SYSTEM_BUILD_NUMBER >= 21277 && architecture == Architecture.X86_64 || architecture == Architecture.X86;
                break;
            case LINUX:
                if (Architecture.SYSTEM_ARCH == Architecture.X86_64)
                    return architecture == Architecture.X86;
                break;
            case MACOS:
-                // macOS Arm64 compatible with x86-64 programs via Rosetta 2.
-                if (Architecture.SYSTEM_ARCH == Architecture.ARM64 && Platform.isSupportedTranslationX86_64())
+                if (Architecture.SYSTEM_ARCH == Architecture.ARM64)
                    return architecture == Architecture.X86_64;
                break;
        }
@@ -190,12 +160,12 @@ public final class JavaManager {
            return javaRuntime;
        }

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

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

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

    // search java

-    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);
+    private static Map<Path, JavaRuntime> searchPotentialJavaExecutables() {
+        Map<Path, JavaRuntime> javaRuntimes = new HashMap<>();
+        searchAllJavaInRepository(javaRuntimes, Platform.SYSTEM_PLATFORM);
        switch (OperatingSystem.CURRENT_OS) {
            case WINDOWS:
                if (Architecture.SYSTEM_ARCH == Architecture.X86_64)
-                    searcher.searchAllJavaInRepository(Platform.WINDOWS_X86);
+                    searchAllJavaInRepository(javaRuntimes, Platform.WINDOWS_X86);
                if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
-                    if (Platform.isSupportedTranslationX86_64())
-                        searcher.searchAllJavaInRepository(Platform.WINDOWS_X86_64);
-                    searcher.searchAllJavaInRepository(Platform.WINDOWS_X86);
+                    if (OperatingSystem.SYSTEM_BUILD_NUMBER >= 21277)
+                        searchAllJavaInRepository(javaRuntimes, Platform.WINDOWS_X86_64);
+                    searchAllJavaInRepository(javaRuntimes, Platform.WINDOWS_X86);
                }
                break;
            case MACOS:
-                if (Architecture.SYSTEM_ARCH == Architecture.ARM64 && Platform.isSupportedTranslationX86_64())
-                    searcher.searchAllJavaInRepository(Platform.MACOS_X86_64);
+                if (Architecture.SYSTEM_ARCH == Architecture.ARM64)
+                    searchAllJavaInRepository(javaRuntimes, Platform.MACOS_X86_64);
                break;
        }

        switch (OperatingSystem.CURRENT_OS) {
            case WINDOWS:
-                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");
+                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.searchJavaInProgramFiles("ProgramFiles", "C:\\Program Files");
-                searcher.searchJavaInProgramFiles("ProgramFiles(x86)", "C:\\Program Files (x86)");
+                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)");
+                }
                break;
            case LINUX:
-                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!
+                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!
                break;
            case MACOS:
-                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"));
+                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"));
                // Homebrew
-                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@*")) {
+                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@*")) {
                    for (Path dir : dirs) {
-                        searcher.searchAllJavaInDirectory(dir);
+                        searchAllJavaInDirectory(javaRuntimes, dir);
                    }
                } catch (IOException e) {
                    LOG.warning("Failed to get subdirectories of /opt/homebrew/Cellar");
@@ -427,16 +397,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 -> searcher.searchAllOfficialJava(it, false));
+                    .ifPresent(it -> searchAllOfficialJava(javaRuntimes, it, false));

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

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

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

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

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

-        searcher.saveCache();
-
-        LOG.trace(searcher.javaRuntimes.values().stream().sorted()
+        LOG.trace(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 " + searcher.javaRuntimes.size() + "\n", "")));
-        return searcher.javaRuntimes;
+                .collect(Collectors.joining("\n", "Finished Java lookup, found " + javaRuntimes.size() + "\n", "")));
+
+        return javaRuntimes;
    }

-    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;
+    private static void tryAddJavaHome(Map<Path, JavaRuntime> javaRuntimes, Path javaHome) {
+        Path executable = getExecutable(javaHome);
+        if (!Files.isRegularFile(executable)) {
+            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) {
+        try {
+            executable = executable.toRealPath();
+        } catch (IOException e) {
+            LOG.warning("Failed to resolve path " + executable, e);
+            return;
        }

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

+        JavaInfo info = null;
+
+        Path releaseFile = javaHome.resolve("release");
+        if (Files.exists(releaseFile)) {
            try {
-                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;
-            }
-        }
-
-        void saveCache() {
-            if (!needRefreshCache)
-                return;
-
-            needRefreshCache = false;
-            try {
-                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();
+                info = JavaInfo.fromReleaseFile(releaseFile);
            } catch (IOException e) {
-                return;
+                LOG.warning("Failed to read release file " + releaseFile, e);
            }
+        }

-            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;
+        if (info == null) {
            try {
-                info = JavaInfoUtils.fromExecutable(executable);
+                info = JavaInfoUtils.fromExecutable(executable, false);
            } 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);
            }
        }

-        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
+        if (info != null && isCompatible(info.getPlatform()))
+            javaRuntimes.put(executable, JavaRuntime.of(executable, info, false));
+    }

-            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);
-                }
-            }
+    private static void tryAddJavaExecutable(Map<Path, JavaRuntime> javaRuntimes, Path executable) {
+        try {
+            executable = executable.toRealPath();
+        } catch (IOException e) {
+            return;
        }

-        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);
+        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());
                }
            } catch (IOException e) {
-                LOG.warning("Failed to list java-runtime directory " + directory, e);
+                LOG.warning("Failed to verify Java in " + component, e);
+                return;
            }
        }

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

-            try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory)) {
-                for (Path subDir : stream) {
-                    tryAddJavaHome(subDir);
+        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);
                }
-            } catch (IOException e) {
-                LOG.warning("Failed to find Java in " + directory, e);
+                searchAllOfficialJava(javaRuntimes, directory, getMojangJavaPlatform(Platform.WINDOWS_X86), verify);
            }
+        } 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);
+            }
+        } 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;
        }

-        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;
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory)) {
+            for (Path subDir : stream) {
+                tryAddJavaHome(javaRuntimes, subDir);
            }
+        } catch (IOException e) {
+            LOG.warning("Failed to find Java in " + directory, e);
+        }
+    }

-            for (String vendor : KNOWN_VENDOR_DIRECTORIES) {
-                searchAllJavaInDirectory(path.resolve(vendor));
-            }
+    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;
        }

-        void searchJavaInMacJavaVirtualMachines(Path directory) {
-            if (!Files.isDirectory(directory)) {
-                return;
-            }
+        for (String vendor : new String[]{"Java", "BellSoft", "AdoptOpenJDK", "Zulu", "Microsoft", "Eclipse Foundation", "Semeru"}) {
+            searchAllJavaInDirectory(javaRuntimes, path.resolve(vendor));
+        }
+    }

-            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);
-            }
+    private static void searchJavaInMacJavaVirtualMachines(Map<Path, JavaRuntime> javaRuntimes, Path directory) {
+        if (!Files.isDirectory(directory)) {
+            return;
        }

-        // ==== Windows Registry Support ====
-        void queryJavaInRegistryKey(WinReg.HKEY hkey, String location) {
-            WinReg reg = WinReg.INSTANCE;
-            if (reg == null)
-                return;
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory)) {
+            for (Path subDir : stream) {
+                tryAddJavaHome(javaRuntimes, subDir.resolve("Contents/Home"));
+            }
+        } catch (IOException e) {
+            LOG.warning("Failed to find Java in " + directory, e);
+        }
+    }

-            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);
-                    }
+    // ==== Windows Registry Support ====
+    private static void queryJavaInRegistryKey(Map<Path, JavaRuntime> javaRuntimes, 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);
                }
            }
        }
-
    }
 }
@@ -468,9 +468,7 @@ public final class Accounts {
            }
        } else if (exception instanceof MicrosoftService.XBox400Exception) {
            return i18n("account.methods.microsoft.error.wrong_verify_method");
-        } else if (exception instanceof MicrosoftService.MinecraftJavaEditionLicenseNotFoundException) {
-            return i18n("account.methods.microsoft.error.no_license");
-        } else if (exception instanceof MicrosoftService.MinecraftJavaEditionProfileNotFoundException) {
+        } else if (exception instanceof MicrosoftService.NoMinecraftJavaEditionProfileException) {
            return i18n("account.methods.microsoft.error.no_character");
        } else if (exception instanceof MicrosoftService.NoXuiException) {
            return i18n("account.methods.microsoft.error.add_family");
@@ -567,21 +567,6 @@ 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();

@@ -704,21 +689,6 @@ 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,20 +1,3 @@
-/*
- * 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_FORGE -> VersionIconType.NEO_FORGE;
+            case NEO_FORGED -> VersionIconType.NEO_FORGE;
            case FABRIC -> VersionIconType.FABRIC;
            case QUILT -> VersionIconType.QUILT;
            case LITE_LOADER -> VersionIconType.CHICKEN;
@@ -603,20 +603,6 @@ 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() {
@@ -834,9 +820,8 @@ 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.OpenGL.LLVMPIPE)
+            if (src.getRenderer() == Renderer.LLVMPIPE)
                obj.addProperty("useSoftwareRenderer", true);

            return obj;
@@ -909,19 +894,16 @@ 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(GraphicsAPI.valueOf(name.toUpperCase(Locale.ROOT)));
+                            return Optional.of(Renderer.valueOf(name.toUpperCase(Locale.ROOT)));
                        } catch (IllegalArgumentException ignored) {
                            return Optional.empty();
                        }
-                    }).orElseGet(() -> vs.getRenderer() instanceof Renderer.Driver renderer ? renderer.api() : GraphicsAPI.DEFAULT));
+                    }).orElseGet(() -> {
+                        boolean useSoftwareRenderer = Optional.ofNullable(obj.get("useSoftwareRenderer")).map(JsonElement::getAsBoolean).orElse(false);
+                        return useSoftwareRenderer ? Renderer.LLVMPIPE : Renderer.DEFAULT;
+                    }));

            return vs;
        }
@@ -71,15 +71,9 @@ 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();
@@ -119,7 +113,7 @@ public final class TerracottaBundle {
                        throw new ArtifactMalformedException(String.format("Expecting %s file in terracotta bundle.", file));
                    }

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

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

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

-            MessageDigest digest = DigestUtils.getDigest(check.algorithm());
+            MessageDigest digest = DigestUtils.getDigest(check.getAlgorithm());
            try (InputStream is = new DigestInputStream(Files.newInputStream(path), digest)) {
                int n;
                while ((n = is.read(buffer)) >= 0) {
@@ -188,7 +182,7 @@ public final class TerracottaBundle {
                    }
                }
            }
-            if (!HexFormat.of().formatHex(digest.digest()).equalsIgnoreCase(check.checksum())) {
+            if (!HexFormat.of().formatHex(digest.digest()).equalsIgnoreCase(check.getChecksum())) {
                return false;
            }
        }
@@ -36,9 +36,8 @@ 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.ui.MacOSNativeUtils;
-import org.jackhuang.hmcl.ui.WindowsNativeUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.ui.WindowsNativeUtils;
 import org.jackhuang.hmcl.util.platform.NativeUtils;
 import org.jackhuang.hmcl.util.platform.OSVersion;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
@@ -234,11 +233,6 @@ 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);
        }
    }

@@ -70,7 +70,6 @@ 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;
@@ -106,14 +105,9 @@ public final class Controllers {
        GameListPage gameListPage = new GameListPage();
        gameListPage.selectedProfileProperty().bindBidirectional(Profiles.selectedProfileProperty());
        gameListPage.profilesProperty().bindContent(Profiles.profilesProperty());
-        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);
-            }
+        FXUtils.applyDragListener(gameListPage, ModpackHelper::isFileModpackByExtension, modpacks -> {
+            Path modpack = modpacks.get(0);
+            Controllers.getDecorator().startWizard(new ModpackInstallWizardProvider(Profiles.getSelectedProfile(), modpack), i18n("install.modpack"));
        });
        return gameListPage;
    });
@@ -214,21 +208,6 @@ 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) {
@@ -391,7 +370,7 @@ public final class Controllers {
            Runnable continueAction = () -> globalConfig().setPlatformPromptVersion(1);

            if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS && Architecture.SYSTEM_ARCH == Architecture.ARM64) {
-                continueAction.run();
+                Controllers.dialog(i18n("fatal.unsupported_platform.macos_arm64"), null, MessageType.INFO, continueAction);
            } 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 &&
@@ -595,7 +574,7 @@ public final class Controllers {
        return pane.getCompletableFuture();
    }

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

-    public static TaskExecutorDialogPane taskDialog(Task<?> task, String title, @NotNull TaskCancellationAction onCancel) {
+    public static TaskExecutorDialogPane taskDialog(Task<?> task, String title, TaskCancellationAction onCancel) {
        TaskExecutor executor = task.executor();
        TaskExecutorDialogPane pane = taskDialog(executor, title, onCancel);
        executor.start();
@@ -62,7 +62,6 @@ 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;
@@ -236,8 +235,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 = List.of(
-            "png", "jpg", "jpeg", "bmp", "gif", "webp", "svg", "apng"
+    public static final List<String> IMAGE_EXTENSIONS = Lang.immutableListOf(
+            "png", "jpg", "jpeg", "bmp", "gif", "webp", "apng"
    );

    private static final Map<String, Image> builtinImageCache = new ConcurrentHashMap<>();
@@ -1167,10 +1166,12 @@ public final class FXUtils {
        }
    }

-    public static Image loadImage(WebURL url) throws Exception {
-        URLConnection connection = NetworkUtils.createConnection(url);
-        if (connection instanceof HttpURLConnection httpConnection)
-            connection = NetworkUtils.resolveConnection(httpConnection);
+    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);

        try (BufferedInputStream input = new BufferedInputStream(connection.getInputStream())) {
            String contentType = Objects.requireNonNull(connection.getContentType(), "");
@@ -1584,8 +1585,9 @@ public final class FXUtils {
    }

    /**
-     * Intelligently determines the popup position to prevent the menu from exceeding screen boundaries,
-     * window boundaries, and clipping containers like ScrollPane.
+     * Intelligently determines the popup position to prevent the menu from exceeding screen boundaries.
+     * Supports multi-monitor setups by detecting the current screen where the component is located.
+     * Now handles first-time popup display by forcing layout measurement.
     *
     * @param root          the root node to calculate position relative to
     * @param popupInstance the popup instance to position
@@ -1594,10 +1596,8 @@ public final class FXUtils {
    public static JFXPopup.PopupVPosition determineOptimalPopupPosition(Node root, JFXPopup popupInstance) {
        // Get the screen bounds in screen coordinates
        Bounds screenBounds = root.localToScreen(root.getBoundsInLocal());
-        if (screenBounds == null) {
-            return JFXPopup.PopupVPosition.TOP; // Fallback
-        }

+        // Convert Bounds to Rectangle2D for getScreensForRectangle method
        Rectangle2D boundsRect = new Rectangle2D(
                screenBounds.getMinX(), screenBounds.getMinY(),
                screenBounds.getWidth(), screenBounds.getHeight()
@@ -1608,36 +1608,13 @@ public final class FXUtils {
        Screen currentScreen = screens.isEmpty() ? Screen.getPrimary() : screens.get(0);
        Rectangle2D visualBounds = currentScreen.getVisualBounds();

-        // 1. Initial bounds based on the physical Screen limits
-        double clipMinY = visualBounds.getMinY();
-        double clipMaxY = visualBounds.getMaxY();
-
-        // 2. Constrain by Window (Stage) bounds so it doesn't overflow the application window
-        if (root.getScene() != null && root.getScene().getWindow() != null) {
-            javafx.stage.Window window = root.getScene().getWindow();
-            clipMinY = Math.max(clipMinY, window.getY());
-            clipMaxY = Math.min(clipMaxY, window.getY() + window.getHeight());
-        }
-
-        // 3. Constrain by parent ScrollPanes to handle clipping within the UI layout
-        Node parent = root.getParent();
-        while (parent != null) {
-            if (parent instanceof ScrollPane) {
-                Bounds spBounds = parent.localToScreen(parent.getBoundsInLocal());
-                if (spBounds != null) {
-                    clipMinY = Math.max(clipMinY, spBounds.getMinY());
-                    clipMaxY = Math.min(clipMaxY, spBounds.getMaxY());
-                }
-            }
-            parent = parent.getParent();
-        }
-
+        double screenHeight = visualBounds.getHeight();
+        double screenMinY = visualBounds.getMinY();
        double itemScreenY = screenBounds.getMinY();
-        double itemScreenMaxY = screenBounds.getMaxY();

-        // Calculate available space relative to the narrowest calculated clipping bounds
-        double availableSpaceAbove = itemScreenY - clipMinY;
-        double availableSpaceBelow = clipMaxY - itemScreenMaxY;
+        // Calculate available space relative to the current screen
+        double availableSpaceAbove = itemScreenY - screenMinY;
+        double availableSpaceBelow = screenMinY + screenHeight - itemScreenY - root.getBoundsInLocal().getHeight();

        // Get popup content and ensure it's properly measured
        Region popupContent = popupInstance.getPopupContent();
@@ -1653,7 +1630,8 @@ public final class FXUtils {
            menuHeight = popupContent.getHeight();
            if (menuHeight <= 0) {
                // Fallback: estimate based on number of menu items
-                menuHeight = 300;
+                // Each menu item is roughly 36px height + separators + padding
+                menuHeight = 300; // Conservative estimate for the current menu structure
            }
        } else {
            menuHeight = popupContent.getHeight();
@@ -1662,12 +1640,9 @@ public final class FXUtils {
        // Add some margin for safety
        menuHeight += 20;

-        // Logic: if there isn't enough space below, AND there is more space above, open upwards.
-        if (availableSpaceBelow < menuHeight && availableSpaceAbove > availableSpaceBelow) {
-            return JFXPopup.PopupVPosition.BOTTOM;  // Show menu above the button, expanding upward
-        } else {
-            return JFXPopup.PopupVPosition.TOP;     // Show menu below the button, expanding downward
-        }
+        return (availableSpaceAbove > menuHeight && availableSpaceBelow < menuHeight)
+                ? JFXPopup.PopupVPosition.BOTTOM  // Show menu below the button, expanding downward
+                : JFXPopup.PopupVPosition.TOP;    // Show menu above the button, expanding upward
    }

    public static void useJFXContextMenu(TextInputControl control) {
@@ -42,7 +42,6 @@ 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;
@@ -274,10 +273,10 @@ public class GameCrashWindow extends Stage {
        logWindow.show();
    }

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

-        return CompletableFuture.supplyAsync(() ->
+        CompletableFuture.supplyAsync(() ->
                        logs.stream().map(Log::getLog).collect(Collectors.joining("\n")))
                .thenComposeAsync(logs -> {
                    long processStartTime = managedProcess.getProcess().info()
@@ -302,7 +301,20 @@ public class GameCrashWindow extends Stage {
                                    return false;
                                }
                            });
-                }).thenApply(ignored -> logFile);
+                })
+                .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());
    }

    private final class View extends VBox {
@@ -432,35 +444,8 @@ public class GameCrashWindow extends Stage {
            HBox toolBar = new HBox();
            VBox.setMargin(toolBar, new Insets(0, 0, 4, 0));
            {
-                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 exportGameCrashInfoButton = FXUtils.newRaisedButton(i18n("logwindow.export_game_crash_logs"));
+                exportGameCrashInfoButton.setOnAction(e -> exportGameCrashInfo());

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

            getChildren().setAll(titlePane, infoPane, moddedPane, gameDirPane, toolBar);
@@ -37,7 +37,6 @@ 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())
@@ -58,7 +57,6 @@ public final class HTMLRenderer {
    private boolean underline;
    private boolean strike;
    private boolean highlight;
-    private int indentLevel;
    private String headerLevel;
    private Node hyperlink;

@@ -220,7 +218,7 @@ public final class HTMLRenderer {
                appendImage(node);
                break;
            case "li":
-                appendText("\n" + INDENT.repeat(indentLevel) + " \u2022 ");
+                appendText("\n \u2022 ");
                break;
            case "dt":
                appendText(" ");
@@ -239,14 +237,11 @@ 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) {
@@ -30,14 +30,15 @@ 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;
@@ -168,7 +169,6 @@ 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,10 +241,6 @@ public final class LogWindow extends Stage {
            });
        }

-        private ManagedProcess getGameProcess() {
-            return gameProcess;
-        }
-
        @Override
        protected Skin<?> createDefaultSkin() {
            return new LogWindowSkin(this);
@@ -259,6 +255,9 @@ 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) {
@@ -304,7 +303,6 @@ 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);
@@ -314,6 +312,7 @@ 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) {
@@ -323,6 +322,32 @@ 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
@@ -336,6 +361,7 @@ 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);
@@ -347,13 +373,10 @@ 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.getSelectionModel().getSelectedItems()) {
-                            if (item != null) {
+                        for (Log item : listView.getItems()) {
+                            if (item != null && item.isSelected()) {
                                if (item.getLog() != null)
                                    stringBuilder.append(item.getLog());
                                stringBuilder.append('\n');
@@ -402,13 +425,6 @@ 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);
            }
        }
@@ -1,101 +0,0 @@
-/*
- * 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() {
-    }
-}
@@ -1,228 +0,0 @@
-/*
- * 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;
-                }
-            }
-        }
-    }
-}
@@ -60,10 +60,8 @@ public enum SVG {
    EXPLORE("M12 12Zm0 8q-3.325 0-5.6625-2.3375T4 12Q4 8.675 6.3375 6.3375T12 4q3.325-0 5.6625 2.3375T20 12q0 3.325-2.3375 5.6625T12 20Zm0 2q2.075-0 3.9-.7875t3.175-2.1375q1.35-1.35 2.1375-3.175T22 12q-0-2.075-.7875-3.9T19.075 4.925q-1.35-1.35-3.175-2.1375T12 2q-2.075 0-3.9.7875T4.925 4.925Q3.575 6.275 2.7875 8.1T2 12q0 2.075.7875 3.9T4.925 19.075q1.35 1.35 3.175 2.1375T12 22Zm0-8.5q.625 0 1.0625-.4375T13.5 12t-.4375-1.0625T12 10.5t-1.0625.4375T10.5 12t.4375 1.0625T12 13.5Zm-4.5 3 2-7 7-2-2 7-7 2Z"),
    EXTENSION("M8.8 21H5Q4.175 21 3.5875 20.4125T3 19V15.2Q4.2 15.2 5.1 14.4375T6 12.5Q6 11.325 5.1 10.5625T3 9.8V6Q3 5.175 3.5875 4.5875T5 4H9Q9 2.95 9.725 2.225T11.5 1.5Q12.55 1.5 13.275 2.225T14 4H18Q18.825 4 19.4125 4.5875T20 6V10Q21.05 10 21.775 10.725T22.5 12.5Q22.5 13.55 21.775 14.275T20 15V19Q20 19.825 19.4125 20.4125T18 21H14.2Q14.2 19.75 13.4125 18.875T11.5 18Q10.375 18 9.5875 18.875T8.8 21ZM5 19H7.125Q7.725 17.35 9.05 16.675T11.5 16Q12.625 16 13.95 16.675T15.875 19H18V13H20Q20.2 13 20.35 12.85T20.5 12.5Q20.5 12.3 20.35 12.15T20 12H18V6H12V4Q12 3.8 11.85 3.65T11.5 3.5Q11.3 3.5 11.15 3.65T11 4V6H5V8.2Q6.35 8.7 7.175 9.875T8 12.5Q8 13.925 7.175 15.1T5 16.8V19ZM11.5 12.5Z"),
    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"),
-    FRAME_BUG("M12 19q1.65 0 2.825-1.175T16 15v-4q0-1.65-1.175-2.825T12 7T9.175 8.175T8 11v4q0 1.65 1.175 2.825T12 19m-2-3h4v-2h-4zm0-4h4v-2h-4zm2 9q-1.625 0-3.012-.8T6.8 18H4v-2h2.1q-.075-.5-.088-1T6 14H4v-2h2q0-.5.012-1t.088-1H4V8h2.8q.35-.575.788-1.075T8.6 6.05L7 4.4L8.4 3l2.15 2.15q.7-.225 1.425-.225t1.425.225L15.6 3L17 4.4l-1.65 1.65q.575.375 1.038.862T17.2 8H20v2h-2.1q.075.5.088 1T18 12h2v2h-2q0 .5-.013 1t-.087 1H20v2h-2.8q-.8 1.4-2.187 2.2T12 21M1 6V3q0-.825.588-1.412T3 1h3v2H3v3zm5 17H3q-.825 0-1.412-.587T1 21v-3h2v3h3zm12 0v-2h3v-3h2v3q0 .825-.587 1.413T21 23zm3-17V3h-3V1h3q.825 0 1.413.588T23 3v3z"),
    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"),
@@ -55,7 +55,6 @@ public abstract class ToolbarListPageSkin<E, P extends ListPageBase<E>> extends
            toolbar.setAlignment(Pos.CENTER_LEFT);
            toolbar.setPickOnBounds(false);
            toolbar.getChildren().setAll(toolbarButtons);
-            FXUtils.setOverflowHidden(toolbar, 8);
            root.getContent().add(toolbar);
        }

@@ -50,10 +50,10 @@ public final class UpgradeDialog extends JFXDialogLayout {
        setHeading(new Label(i18n("update.changelog")));
        setBody(new JFXSpinner());

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

        Task.supplyAsync(Schedulers.io(), () -> {
-            VersionNumber targetVersion = VersionNumber.asVersion(remoteVersion.version());
+            VersionNumber targetVersion = VersionNumber.asVersion(remoteVersion.getVersion());
            VersionNumber currentVersion = VersionNumber.asVersion(Metadata.VERSION);
            if (targetVersion.compareTo(currentVersion) <= 0)
                // Downgrade update, no need to display changelog
@@ -17,6 +17,7 @@
 */
 package org.jackhuang.hmcl.ui.account;

+import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;
@@ -26,6 +27,7 @@ import javafx.scene.control.Tooltip;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
 import org.jackhuang.hmcl.game.TexturesLoader;
 import org.jackhuang.hmcl.setting.Accounts;
 import org.jackhuang.hmcl.ui.FXUtils;
@@ -40,7 +42,6 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 public class AccountAdvancedListItem extends AdvancedListItem {
    private final Tooltip tooltip;
    private final Canvas canvas;
-    private boolean tooltipInstalled;

    private final ObjectProperty<Account> account = new SimpleObjectProperty<Account>() {

@@ -50,10 +51,10 @@ public class AccountAdvancedListItem extends AdvancedListItem {
            if (account == null) {
                titleProperty().unbind();
                subtitleProperty().unbind();
+                tooltip.textProperty().unbind();
                setTitle(i18n("account.missing"));
                setSubtitle(i18n("account.missing.add"));
                tooltip.setText(i18n("account.create"));
-                installTooltip();

                TexturesLoader.unbindAvatar(canvas);
                TexturesLoader.drawAvatar(canvas, TexturesLoader.getDefaultSkinImage());
@@ -61,7 +62,7 @@ public class AccountAdvancedListItem extends AdvancedListItem {
            } else {
                titleProperty().bind(BindingMapping.of(account, Account::getCharacter));
                subtitleProperty().bind(accountSubtitle(account));
-                uninstallTooltip();
+                tooltip.textProperty().bind(accountTooltip(account));
                TexturesLoader.bindAvatar(canvas, account);
            }
        }
@@ -73,6 +74,7 @@ public class AccountAdvancedListItem extends AdvancedListItem {

    public AccountAdvancedListItem(Account account) {
        tooltip = new Tooltip();
+        FXUtils.installFastTooltip(this, tooltip);

        canvas = new Canvas(32, 32);
        canvas.setMouseTransparent(true);
@@ -101,17 +103,19 @@ public class AccountAdvancedListItem extends AdvancedListItem {
        }
    }

-    private void installTooltip() {
-        if (!tooltipInstalled) {
-            FXUtils.installFastTooltip(this, tooltip);
-            tooltipInstalled = true;
-        }
-    }
-
-    private void uninstallTooltip() {
-        if (tooltipInstalled) {
-            Tooltip.uninstall(this, tooltip);
-            tooltipInstalled = false;
+    private static ObservableValue<String> accountTooltip(Account account) {
+        if (account instanceof AuthlibInjectorAccount) {
+            AuthlibInjectorServer server = ((AuthlibInjectorAccount) account).getServer();
+            return Bindings.format("%s (%s) (%s)",
+                    BindingMapping.of(account, Account::getCharacter),
+                    account.getUsername(),
+                    BindingMapping.of(server, AuthlibInjectorServer::getName));
+        } else if (account instanceof YggdrasilAccount) {
+            return Bindings.format("%s (%s)",
+                    BindingMapping.of(account, Account::getCharacter),
+                    account.getUsername());
+        } else {
+            return BindingMapping.of(account, Account::getCharacter);
        }
    }

@@ -164,9 +164,6 @@ 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 + "]");
@@ -57,7 +57,6 @@ public final class AccountListPopupMenu extends StackPane {

            for (Account account : Accounts.getAccounts()) {
                AccountAdvancedListItem item = new AccountAdvancedListItem(account);
-                if (Accounts.getSelectedAccount() == account) item.setActive(true);
                item.setOnAction(e -> {
                    Accounts.setSelectedAccount(account);
                    if (getScene().getWindow() instanceof JFXPopup popup)
@@ -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: -monet-error;");
+                lblServerWarning.setStyle("-fx-text-fill: red;");
                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) {
-                    JFXHyperlink link = new JFXHyperlink(i18n("account.injector.link." + key));
+                    Hyperlink link = new Hyperlink(i18n("account.injector.link." + key));
                    FXUtils.installSlowTooltip(link, value);
                    link.setOnAction(e -> FXUtils.openLink(value));
                    result.add(link);
@@ -124,11 +124,6 @@ public class MicrosoftAccountLoginPane extends JFXDialogLayout implements Dialog
                step.set(new Step.WaitForScanQrCode(event.getUserCode(), event.getVerificationUri()));
        }));

-        holder.registerWeak(Accounts.OAUTH_CALLBACK.onLoginCompletedDeviceCode, event -> Platform.runLater(() -> {
-            if (step.get() instanceof Step.WaitForScanQrCode)
-                step.set(new Step.DeviceLoginCompleted());
-        }));
-
        this.step.set(Accounts.OAUTH_CALLBACK.getClientId().isEmpty()
                ? new Step.Init()
                : new Step.StartAuthorizationCodeLogin());
@@ -225,13 +220,6 @@ public class MicrosoftAccountLoginPane extends JFXDialogLayout implements Dialog
            codeBox.setMaxWidth(USE_PREF_SIZE);

            rootContainer.getChildren().addAll(deviceHint, new Group(qrCode), codeBox);
-        } else if (currentStep instanceof Step.DeviceLoginCompleted) {
-            loginButtonSpinner.setLoading(true);
-
-            var hintPane = new HintPane(MessageDialogPane.MessageType.INFO);
-            hintPane.setSegment(i18n("account.methods.microsoft.methods.device.hint.completed"));
-
-            rootContainer.getChildren().addAll(hintPane);
        } else if (currentStep instanceof Step.LoginFailed failed) {
            btnLogin.setOnAction(e -> this.step.set(new Step.StartAuthorizationCodeLogin()));
            loginButtonSpinner.setLoading(false);
@@ -324,10 +312,6 @@ public class MicrosoftAccountLoginPane extends JFXDialogLayout implements Dialog

        }

-        record DeviceLoginCompleted() implements Step {
-
-        }
-
        record LoginFailed(String message) implements Step {
        }
    }
@@ -21,7 +21,6 @@ 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;
@@ -30,7 +29,6 @@ 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;
@@ -137,9 +135,7 @@ public class OfflineAccountSkinPane extends StackPane {
            capeSelector.setValue(account.getSkin().getLocalCapePath());
        }

-        PauseTransition pauseTransition = new PauseTransition(Duration.seconds(1));
-
-        Runnable loadSkin = () -> {
+        skinBinding = FXUtils.observeWeak(() -> {
            getSkin().load(account.getUsername())
                    .whenComplete(Schedulers.javafx(), (result, exception) -> {
                        if (exception != null) {
@@ -161,23 +157,6 @@ 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 -> {
@@ -19,8 +19,6 @@ 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;
@@ -30,7 +28,6 @@ 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;
@@ -46,6 +43,8 @@ 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);
@@ -105,26 +104,12 @@ final class ComponentSublistWrapper extends VBox implements NoPaddingComponent {

                if (container == null) {
                    this.container = new VBox();
-                    this.container.getStyleClass().add("container");
+
+                    if (!noPadding) {
+                        container.setPadding(new Insets(8, 16, 10, 16));
+                    }
                    FXUtils.setLimitHeight(container, 0);
-
-                    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);
-
+                    FXUtils.setOverflowHidden(container);
                    container.getChildren().setAll(sublist);
                    ComponentSublistWrapper.this.getChildren().add(container);

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

            Platform.runLater(() -> {
-                double contentHeight = expanded ? sublist.prefHeight(sublist.getWidth()) : 0;
+                // 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 targetRotate = expanded ? -180 : 0;

                if (AnimationUtils.isAnimationEnabled()) {
@@ -18,7 +18,6 @@
 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;
@@ -31,7 +30,6 @@ 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;
@@ -40,18 +38,10 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public class FileSelector extends HBox {
    private final StringProperty value = new SimpleStringProperty();
-    private String chooserTitle = "";
-    private SelectionMode selectionMode = SelectionMode.FILE;
+    private String chooserTitle = i18n("selector.choose_file");
+    private boolean directory = false;
    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();
    }
@@ -73,12 +63,12 @@ public class FileSelector extends HBox {
        return this;
    }

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

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

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

+        JFXButton selectButton = FXUtils.newToggleButton4(SVG.FOLDER_OPEN, 15);
        selectButton.setOnAction(e -> {
-            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);
+            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);
                }
            }
        });
@@ -112,27 +108,4 @@ 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,14 +17,8 @@
 */
 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;
@@ -32,11 +26,7 @@ import javafx.scene.control.ScrollBar;
 import javafx.scene.control.Skin;
 import javafx.scene.layout.Region;
 import javafx.scene.shape.Rectangle;
-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;
+import org.jackhuang.hmcl.util.Lang;

 // Referenced in root.css
@SuppressWarnings("unused")
@@ -46,10 +36,6 @@ 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);
@@ -59,8 +45,8 @@ public class FloatScrollBarSkin implements Skin<ScrollBar> {
            Point2D dragStart;
            double preDragThumbPos;

-            final NumberBinding range = Bindings.subtract(scrollBar.maxProperty(), scrollBar.minProperty());
-            final NumberBinding position = Bindings.divide(Bindings.subtract(scrollBar.valueProperty(), scrollBar.minProperty()), range);
+            NumberBinding range = Bindings.subtract(scrollBar.maxProperty(), scrollBar.minProperty());
+            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
@@ -77,6 +63,7 @@ public class FloatScrollBarSkin implements Skin<ScrollBar> {

                setup();

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

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

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

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

                if (scrollBar.getOrientation() == Orientation.HORIZONTAL) {
-                    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)
-                            )
-                    );
+                    thumb.relocate(0, -8);
+                    thumb.widthProperty().bind(Bindings.max(20, scrollBar.visibleAmountProperty().divide(range).multiply(scrollBar.widthProperty())));
+                    thumb.setHeight(8);
+                    thumb.xProperty().bind(Bindings.subtract(scrollBar.widthProperty(), thumb.widthProperty()).multiply(position));
                } else {
-                    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)
-                            )
-                    );
+                    thumb.relocate(-8, 0);
+                    thumb.setWidth(8);
+                    thumb.heightProperty().bind(Bindings.max(20, scrollBar.visibleAmountProperty().divide(range).multiply(scrollBar.heightProperty())));
+                    thumb.yProperty().bind(Bindings.subtract(scrollBar.heightProperty(), thumb.heightProperty()).multiply(position));
                }
            }

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

-                return 6.0;
+                return 8;
            }

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

-                return 6.0;
+                return 8;
            }
        };
-
-        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;
    }
@@ -21,7 +21,6 @@ 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;
@@ -57,7 +56,6 @@ 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,6 +30,9 @@ 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);
@@ -47,14 +50,7 @@ public class LineButton extends LineButtonBase {

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

    private ObjectProperty<EventHandler<ActionEvent>> onAction;
@@ -114,13 +110,12 @@ 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(getTrailingTextIndex(), trailingTextLabel);
+                        setNode(IDX_TRAILING_TEXT, trailingTextLabel);
                    } else if (trailingTextLabel != null) {
                        trailingTextLabel.setText("");
-                        setNode(getTrailingTextIndex(), null);
+                        setNode(IDX_TRAILING_TEXT, null);
                    }
                }
            };
@@ -154,7 +149,7 @@ public class LineButton extends LineButtonBase {

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

@@ -176,7 +171,6 @@ 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,7 +64,6 @@ 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");
@@ -20,12 +20,14 @@ package org.jackhuang.hmcl.ui.construct;
 import com.jfoenix.controls.JFXPopup;
 import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
-import javafx.beans.property.*;
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleObjectProperty;
 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.*;
 import javafx.scene.layout.StackPane;
@@ -33,8 +35,6 @@ 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;
@@ -43,22 +43,24 @@ import java.util.function.Function;
 import static org.jackhuang.hmcl.ui.FXUtils.determineOptimalPopupPosition;

 /// @author Glavo
-public class LineSelectButton<T extends @UnknownNullability Object> extends LineButton {
+public final class LineSelectButton<T> 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();
-            setTrailingText(converter != null ? converter.apply(value) : Objects.toString(value, ""));
+            if (value != null) {
+                Function<T, String> converter = getConverter();
+                setTrailingText(converter != null ? converter.apply(value) : value.toString());
+            } else {
+                setTrailingText(null);
+            }
        };
        converterProperty().addListener(updateTrailingText);
        valueProperty().addListener(updateTrailingText);
@@ -85,12 +87,15 @@ public class LineSelectButton<T extends @UnknownNullability Object> extends Line

            ripplerContainer.addEventFilter(ScrollEvent.ANY, ignored -> popup.hide());

-            Bindings.bindContent(popupMenu.getContent(), popupItems = MappedObservableList.create(itemsProperty(), item -> {
+            Bindings.bindContent(popupMenu.getContent(), 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()));
@@ -165,14 +170,10 @@ public class LineSelectButton<T extends @UnknownNullability Object> extends Line
        return converterProperty().get();
    }

-    public void setConverter(Function<T, String> value) { // TODO: rename
+    public void setConverter(Function<T, String> value) {
        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() {
@@ -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.fillProperty().bind(Themes.colorSchemeProperty().getOutlineVariant());
+        rect.setFill(Color.GRAY);
        maxHeightProperty().set(10);
        setPadding(new Insets(3));
        getChildren().setAll(rect);
@@ -55,8 +55,7 @@ public final class MultiFileItem<T> extends VBox {

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

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

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

@@ -81,11 +81,12 @@ public class TaskExecutorDialogPane extends BorderPane {

        setCancel(cancel);

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

        speedEventHandler = FetchTask.SPEED_EVENT.registerWeak(speedEvent -> {
@@ -17,7 +17,6 @@
 */
 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;
@@ -30,6 +29,7 @@ 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,10 +146,6 @@ public class TwoLineListItem extends VBox {
        subtitleProperty().set(subtitle);
    }

-    public HBox getFirstLine() {
-        return firstLine;
-    }
-
    public Label getTitleLabel() {
        return lblTitle;
    }
@@ -171,26 +167,12 @@ 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);
-            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);
+            FXUtils.onChangeAndOperate(tagsBox.heightProperty(), height -> FXUtils.setLimitHeight(scrollPane, height.doubleValue()));
+            scrollPane.setPrefWidth(50);
            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,7 +54,12 @@ public class URLValidator extends ValidatorBase {
        if (StringUtils.isBlank(textField.getText()))
            hasErrors.set(!nullable);
        else {
-            hasErrors.set(WebURL.tryParseBrowserInput(textField.getText()) == null);
+            try {
+                NetworkUtils.toURI(textField.getText());
+                hasErrors.set(false);
+            } catch (IllegalArgumentException e) {
+                hasErrors.set(true);
+            }
        }
    }
 }
@@ -34,7 +34,6 @@ import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.stage.Stage;
 import javafx.util.Duration;
-import org.glavo.url.WebURL;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDnD;
 import org.jackhuang.hmcl.setting.EnumBackgroundImage;
@@ -51,7 +50,7 @@ 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.MathUtils;
+import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jetbrains.annotations.Nullable;

@@ -206,7 +205,7 @@ public class DecoratorController {
                String backgroundImageUrl = config().getBackgroundImageUrl();
                if (backgroundImageUrl != null) {
                    try {
-                        image = FXUtils.loadImage(WebURL.parseBrowserInput(backgroundImageUrl));
+                        image = FXUtils.loadImage(backgroundImageUrl);
                    } catch (Exception e) {
                        LOG.warning("Couldn't load background image", e);
                    }
@@ -219,7 +218,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 = MathUtils.clamp(config().getBackgroundImageOpacity(), 0, 100) / 100.;
+                double opacity = Lang.clamp(0, config().getBackgroundImageOpacity(), 100) / 100.;
                if (paint instanceof Color || paint == null) {
                    Color color = (Color) paint;
                    if (color == null)
@@ -274,7 +274,6 @@ 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");
@@ -286,7 +285,6 @@ 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");
@@ -351,9 +349,13 @@ 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);

-                navRight.getChildren().setAll(refreshNavButton);
+                Rectangle separator = new Rectangle();
+                separator.visibleProperty().bind(refreshNavButton.visibleProperty());
+                separator.heightProperty().bind(navBar.heightProperty());
+                separator.setFill(Color.GRAY);
+
+                navRight.getChildren().setAll(refreshNavButton, separator);
                navBar.setRight(navRight);
            }
        }
@@ -54,27 +54,15 @@ 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 {
-    public static final org.jackhuang.hmcl.ui.versions.DownloadPage.DownloadCallback FOR_MOD =
-            (downloadProvider, profile, version, mod, file) -> download(downloadProvider, profile, version, file, "mods");
-    public static final org.jackhuang.hmcl.ui.versions.DownloadPage.DownloadCallback FOR_RESOURCE_PACK =
-            (downloadProvider, profile, version, mod, file) -> download(downloadProvider, profile, version, file, "resourcepacks");
-    public static final org.jackhuang.hmcl.ui.versions.DownloadPage.DownloadCallback FOR_SHADER =
-            (downloadProvider, profile, version, mod, file) -> download(downloadProvider, profile, version, file, "shaderpacks");
-
    private final ReadOnlyObjectWrapper<DecoratorPage.State> state = new ReadOnlyObjectWrapper<>(DecoratorPage.State.fromTitle(i18n("download"), -1));
    private final TabHeader tab;
    private final TabHeader.Tab<VersionsPage> newGameTab = new TabHeader.Tab<>("newGameTab");
@@ -106,9 +94,9 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage
            page.getActions().add(installLocalModpackButton);
            return page;
        }));
-        modTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofMod(FOR_MOD, true)));
-        resourcePackTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofResourcePack(FOR_RESOURCE_PACK, true)));
-        shaderTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofShaderPack(FOR_SHADER, 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);

@@ -146,19 +134,6 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage

        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);

@@ -178,7 +153,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::isNameValidForJar), new Validator(i18n("profile.already_exists"), (it) -> !finalExistingFiles.contains(it)));
+        }, file.getFile().getFilename(), new Validator(i18n("install.new_game.malformed"), FileUtils::isNameValid));

    }

@@ -220,9 +195,8 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage
        tab.select(modpackTab, false);
    }

-    public DownloadListPage showResourcePackDownloads() {
+    public void showResourcepackDownloads() {
        tab.select(resourcePackTab, false);
-        return resourcePackTab.getNode();
    }

    public DownloadListPage showModDownloads() {
@@ -1,20 +1,3 @@
-/*
- * 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;
@@ -97,7 +97,8 @@ 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 = SVG.ARROW_FORWARD.createIcon();
+        SVGPath arrow = new SVGPath();
+        arrow.setContent(SVG.ARROW_FORWARD.getPath());
        BorderPane.setAlignment(arrow, Pos.CENTER);
        graphic.setRight(arrow);

@@ -423,11 +423,7 @@ public final class VersionsPage extends Control implements WizardPage, Refreshab
                    if (status == Status.LOADING)
                        transitionPane.setContent(spinner, ContainerAnimations.FADE);
                    else if (status == Status.SUCCESS)
-                        if (control.versions.isEmpty()) {
-                            transitionPane.setContent(emptyPane, ContainerAnimations.FADE);
-                        } else {
-                            transitionPane.setContent(centerWrapper, ContainerAnimations.FADE);
-                        }
+                        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(),
-                                null,
+                                vs.getMaxMemory(),
                                exportInfo.getMinMemory(),
                                vs.isShowLogs(),
                                /* showConsoleOnError */ true,
@@ -316,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.setNullSafeConverter(AuthlibInjectorServer::getName);
+                        serversSelectButton.setConverter(AuthlibInjectorServer::getName);
                        serversSelectButton.setDescriptionConverter(AuthlibInjectorServer::getUrl);
                        serversSelectButton.itemsProperty().set(config().getAuthlibInjectorServers());

@@ -17,21 +17,11 @@
 */
 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;
@@ -40,13 +30,16 @@ 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;
@@ -68,48 +61,16 @@ public final class ImageUtils {
    };

    public static final ImageLoader WEBP = (input, requestedWidth, requestedHeight, preserveRatio, smooth) -> {
-        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);
+        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();
        }
+        return SwingFXUtils.toFXImage(bufferedImage, requestedWidth, requestedHeight, preserveRatio, smooth);
    };

    public static final ImageLoader APNG = (input, requestedWidth, requestedHeight, preserveRatio, smooth) -> {
@@ -175,13 +136,11 @@ 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
    );

@@ -206,14 +165,6 @@ 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,
@@ -281,8 +232,6 @@ public final class ImageUtils {
            return WEBP;
        if (isApng(headerBuffer))
            return APNG;
-        if (isSVG(headerBuffer))
-            return SVG;
        return null;
    }

@@ -457,19 +406,6 @@ 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,8 +18,10 @@
 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;
@@ -28,7 +30,6 @@ 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;
@@ -37,18 +38,11 @@ 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 SpinnerPane {
+public final class AboutPage extends StackPane {

    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);
@@ -72,7 +66,7 @@ public final class AboutPage extends SpinnerPane {

        ComponentList legal = new ComponentList();
        {
-            var copyright = new LineButton();
+            var copyright = LineButton.createExternalLinkButton(Metadata.ABOUT_URL);
            copyright.setLargeTitle(true);
            copyright.setTitle(i18n("about.copyright"));
            copyright.setSubtitle(i18n("about.copyright.statement"));
@@ -90,16 +84,27 @@ public final class AboutPage extends SpinnerPane {
            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,20 +27,14 @@ 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;

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

-                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);
+                downloadSource.getContent().setAll(autoChooseDownloadSource, versionListSourcePane, downloadSourcePane);
            }

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

        {
-            var downloadList = new ComponentList();
-
            VBox downloadThreads = new VBox(16);
-
-            ComponentSublist fileCommonLocationSublist = new ComponentSublist();
-
+            downloadThreads.getStyleClass().add("card-non-transparent");
            {
-                {
-                    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));
@@ -187,8 +147,7 @@ public class DownloadSettingsPage extends StackPane {
                }
            }

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

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

    }
-
-    private void clearCacheDirectory() {
-        String commonDirectory = Settings.instance().getCommonDirectory();
-        if (commonDirectory != null) {
-            FileUtils.cleanDirectoryQuietly(Path.of(commonDirectory, "cache"));
-        }
-    }
 }
@@ -17,6 +17,7 @@
 */
 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;
@@ -36,7 +37,9 @@ public class FeedbackPage extends SpinnerPane {

    public FeedbackPage() {
        VBox content = new VBox();
-        content.getStyleClass().add("spinner-pane-content");
+        content.setPadding(new Insets(10));
+        content.setSpacing(10);
+        content.setFillWidth(true);
        ScrollPane scrollPane = new ScrollPane(content);
        scrollPane.setFitToWidth(true);
        FXUtils.smoothScrolling(scrollPane);
@@ -81,5 +84,8 @@ public class FeedbackPage extends SpinnerPane {
                ComponentList.createComponentListTitle(i18n("contact.feedback")),
                feedback
        );
+
+        this.setContent(content);
    }
+
 }
@@ -18,6 +18,7 @@
 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;
@@ -41,7 +42,9 @@ public class HelpPage extends SpinnerPane {

    public HelpPage() {
        content = new VBox();
-        content.getStyleClass().add("spinner-pane-content");
+        content.setPadding(new Insets(10));
+        content.setSpacing(10);
+        content.setFillWidth(true);
        ScrollPane scrollPane = new ScrollPane(content);
        scrollPane.setFitToWidth(true);
        FXUtils.smoothScrolling(scrollPane);
@@ -47,7 +47,6 @@ 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;
@@ -234,6 +233,7 @@ 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,11 +300,6 @@ 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();
@@ -313,11 +308,11 @@ public final class JavaDownloadDialog extends StackPane {
                warningLabel.setText(null);

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

                    if (list.status == DiscoJavaVersionList.Status.SUCCESS) {
                        packageTypeBox.getItems().setAll(list.versions.keySet());
@@ -28,7 +28,6 @@ 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;
@@ -171,7 +170,6 @@ 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);

        {
@@ -185,7 +183,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.version())));
+                        latestVersion == null ? "" : i18n("update.bubble.title", latestVersion.getVersion())));

                hBox.getChildren().setAll(SVG.UPDATE.createIcon(20), prompt);
            }
@@ -281,10 +279,10 @@ public final class MainPage extends StackPane implements DecoratorPage {

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

@@ -135,7 +135,6 @@ 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))
@@ -295,7 +294,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.setNullSafeConverter(value ->
+                fontAntiAliasingPane.setConverter(value ->
                        value.isPresent()
                                ? i18n("settings.launcher.font.anti_aliasing." + value.get().name().toLowerCase(Locale.ROOT))
                                : i18n("settings.launcher.font.anti_aliasing.auto")
@@ -54,7 +54,6 @@ 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;

@@ -99,7 +98,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) || "json".equalsIgnoreCase(FileUtils.getExtension(file)),
+                    file -> ModpackHelper.isFileModpackByExtension(file) || NBTFileType.isNBTFileByExtension(file),
                    modpacks -> {
                        Path file = modpacks.get(0);
                        if (ModpackHelper.isFileModpackByExtension(file)) {
@@ -114,8 +113,6 @@ 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);
                        }
                    });

@@ -187,6 +184,7 @@ public class RootPage extends DecoratorAnimatedPage implements DecoratorPage {
                Controllers.getDownloadPage().showGameDownloads();
                Controllers.navigate(Controllers.getDownloadPage());
            });
+            FXUtils.installFastTooltip(downloadItem, i18n("download.hint"));
            if (AnimationUtils.isAnimationEnabled()) {
                FXUtils.prepareOnMouseEnter(downloadItem, Controllers::prepareDownloadPage);
            }
@@ -18,20 +18,24 @@
 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.layout.BorderPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.VBox;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.layout.*;
+import javafx.scene.text.TextAlignment;
 import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.setting.EnumCommonDirectory;
+import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
@@ -42,7 +46,6 @@ 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;
@@ -57,212 +60,260 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
+import java.util.*;
 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(10);
+        VBox rootPane = new VBox();
        rootPane.setPadding(new Insets(10));
        this.setContent(rootPane);
        FXUtils.smoothScrolling(this);

+        ComponentList settingsPane = new ComponentList();
        {
-            ComponentList updatePaneList = new ComponentList();
            {
-                ObjectProperty<UpdateChannel> updateChannel;
+                StackPane sponsorPane = new StackPane();
+                sponsorPane.setCursor(Cursor.HAND);
+                FXUtils.onClicked(sponsorPane, this::onSponsor);
+                sponsorPane.setPadding(new Insets(8, 0, 8, 0));
+
+                GridPane gridPane = new GridPane();
+
+                ColumnConstraints col = new ColumnConstraints();
+                col.setHgrow(Priority.SOMETIMES);
+                col.setMaxWidth(Double.POSITIVE_INFINITY);
+
+                gridPane.getColumnConstraints().setAll(col);
+
+                RowConstraints row = new RowConstraints();
+                row.setMinHeight(Double.NEGATIVE_INFINITY);
+                row.setValignment(VPos.TOP);
+                row.setVgrow(Priority.SOMETIMES);
+                gridPane.getRowConstraints().setAll(row);
+
                {
+                    Label label = new Label(i18n("sponsor.hmcl"));
+                    label.setWrapText(true);
+                    label.setTextAlignment(TextAlignment.JUSTIFY);
+                    GridPane.setRowIndex(label, 0);
+                    GridPane.setColumnIndex(label, 0);
+                    gridPane.getChildren().add(label);
+                }

-                    JFXButton updateButton = FXUtils.newToggleButton4(SVG.UPDATE, 20);
-                    updateButton.setOnAction(e -> onUpdate());
-                    updateButton.setPadding(Insets.EMPTY);
-                    FXUtils.installFastTooltip(updateButton, i18n("update.tooltip"));
+                sponsorPane.getChildren().setAll(gridPane);
+                settingsPane.getContent().add(sponsorPane);
+            }

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

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

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

-                    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);
+                    updatePane.setHeaderRight(btnUpdate);
                }

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

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

-                    updatePaneList.getContent().add(previewPane);
+                    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);
                }
-
-                {
-                    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);
+                settingsPane.getContent().add(updatePane);
            }

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

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

-                    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);
+                settingsPane.getContent().add(previewPane);
            }

            {
-                ComponentList miscPaneList = new ComponentList();
-
-                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);
-                }
-
-                {
-                    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());
-
-                    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);
+                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());
+                settingsPane.getContent().add(disableAutoShowUpdateDialogPane);
            }
+
+            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());
+                settingsPane.getContent().add(disableAprilFools);
+            }
+
+            {
+                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());
+
+                ComponentSublist fileCommonLocationSublist = new ComponentSublist();
+                fileCommonLocationSublist.getContent().add(fileCommonLocation);
+                fileCommonLocationSublist.setTitle(i18n("launcher.cache_directory"));
+                fileCommonLocationSublist.setHasSubtitle(true);
+                fileCommonLocationSublist.subtitleProperty().bind(
+                        Bindings.createObjectBinding(() -> Optional.ofNullable(Settings.instance().getCommonDirectory())
+                                        .orElse(i18n("launcher.cache_directory.disabled")),
+                                config().commonDirectoryProperty(), config().commonDirTypeProperty()));
+
+                JFXButton cleanButton = FXUtils.newBorderButton(i18n("launcher.cache_directory.clean"));
+                cleanButton.setOnAction(e -> clearCacheDirectory());
+                fileCommonLocationSublist.setHeaderRight(cleanButton);
+
+                settingsPane.getContent().add(fileCommonLocationSublist);
+            }
+
+            {
+                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);
        }
    }

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

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

            Path outputFile;
-            if (recentLogFiles.isEmpty()) {
-                outputFile = Metadata.CURRENT_DIRECTORY.resolve(nameBase + ".log");
+            try {
+                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.
+                            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;
+                                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;
                            }

-                            String entryName = getEntryName(entryNames, StringUtils.substringBeforeLast(fileName, "."));
-                            if (input != null && exportLogFile(zos, path, entryName, input, buffer))
+                            // 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);
                        }

-                        // 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();
                    }
-
-                    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;
            }

-            return outputFile;
-        }), Schedulers.io());
+            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"));
+        }
    }
 }
@@ -22,14 +22,8 @@ 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;
@@ -39,7 +33,6 @@ 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;
@@ -63,9 +56,8 @@ public final class NBTEditorPage extends SpinnerPane implements DecoratorPage {

        this.state = new ReadOnlyObjectWrapper<>(State.fromTitle(i18n("nbt.title", file.toString())));
        this.file = file;
-
-        //noinspection DataFlowIssue
        this.type = NBTFileType.ofFile(file);
+
        if (type == null) {
            throw new IOException("Unknown type of file " + file);
        }
@@ -93,33 +85,14 @@ public final class NBTEditorPage extends SpinnerPane implements DecoratorPage {

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

-        Task.supplyAsync(() -> type.read(file))
+        Task.supplyAsync(() -> type.readAsTree(file))
                .whenComplete(Schedulers.javafx(), (result, exception) -> {
                    if (exception == null) {
                        setLoading(false);
-
-                        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);
-
+                        NBTTreeView view = new NBTTreeView(result);
                        BorderPane.setMargin(view, new Insets(10));
                        onEscPressed(view, cancelButton::fire);
-                        this.root.setCenter(view);
+                        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,34 +17,148 @@
 */
 package org.jackhuang.hmcl.ui.nbt;

-import org.glavo.nbt.NBTElement;
-import org.glavo.nbt.chunk.ChunkRegion;
-import org.glavo.nbt.io.NBTCodec;
-import org.glavo.nbt.tag.Tag;
+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.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 {
-            return NBTCodec.of().readTag(file);
+            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;
+            }
        }
    },
    ANVIL("mca") {
        @Override
-        public NBTElement read(Path file) throws IOException {
-            return NBTCodec.of().readRegion(file);
+        public Tag read(Path file) throws IOException {
+            return REGION.read(file);
+        }
+
+        @Override
+        public NBTTreeView.Item readAsTree(Path file) throws IOException {
+            return REGION.readAsTree(file);
        }
    },
    REGION("mcr") {
        @Override
-        public ChunkRegion read(Path file) throws IOException {
-            return NBTCodec.of().readRegion(file);
+        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;
        }
    };

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

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

-    public abstract NBTElement read(Path file) throws IOException;
+    public abstract Tag 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;
+    }
 }
@@ -0,0 +1,79 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2025 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.nbt;
+
+import com.github.steveice10.opennbt.tag.builtin.Tag;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * @author Glavo
+ */
+public enum NBTTagType {
+    BYTE, SHORT, INT, LONG, FLOAT, DOUBLE,
+    BYTE_ARRAY, INT_ARRAY, LONG_ARRAY,
+    STRING,
+    LIST, COMPOUND;
+
+    private static final Map<String, NBTTagType> lookupTable = new HashMap<>();
+
+    static {
+        for (NBTTagType type : values()) {
+            lookupTable.put(type.getTagClassName(), type);
+        }
+    }
+
+    public static NBTTagType typeOf(Tag tag) {
+        NBTTagType type = lookupTable.get(tag.getClass().getSimpleName());
+        if (type == null) {
+            throw new IllegalArgumentException("Unknown tag: " + type);
+        }
+        return type;
+    }
+
+    private final String iconUrl;
+    private final String tagClassName;
+
+    NBTTagType() {
+        String tagName;
+        String className;
+
+        int idx = name().indexOf('_');
+        if (idx < 0) {
+            tagName = name().charAt(0) + name().substring(1).toLowerCase(Locale.ROOT);
+            className = tagName + "Tag";
+        } else {
+            tagName = name().charAt(0) + name().substring(1, idx + 1).toLowerCase(Locale.ROOT)
+                    + name().charAt(idx + 1) + name().substring(idx + 2).toLowerCase(Locale.ROOT);
+            className = tagName.substring(0, idx) + tagName.substring(idx + 1) + "Tag";
+        }
+
+        this.iconUrl = "/assets/img/nbt/TAG_" + tagName + ".png";
+        this.tagClassName = className;
+    }
+
+    public String getIconUrl() {
+        return iconUrl;
+    }
+
+    public String getTagClassName() {
+        return tagClassName;
+    }
+}
@@ -1,129 +0,0 @@
-/*
- * 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.nbt;
-
-import javafx.scene.control.TreeCell;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import org.glavo.nbt.NBTElement;
-import org.glavo.nbt.chunk.Chunk;
-import org.glavo.nbt.chunk.ChunkRegion;
-import org.glavo.nbt.tag.*;
-import org.jackhuang.hmcl.ui.FXUtils;
-import org.jetbrains.annotations.Nullable;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public final class NBTTreeCell extends TreeCell<@Nullable NBTElement> {
-
-    private static @Nullable Image getIcon(NBTElement element) {
-        if (element instanceof Tag tag) {
-            TagType<?> type = tag.getType();
-            if (type == TagType.BYTE) {
-                return FXUtils.newBuiltinImage("/assets/img/nbt/TAG_Byte.png");
-            } else if (type == TagType.SHORT) {
-                return FXUtils.newBuiltinImage("/assets/img/nbt/TAG_Short.png");
-            } else if (type == TagType.INT) {
-                return FXUtils.newBuiltinImage("/assets/img/nbt/TAG_Int.png");
-            } else if (type == TagType.LONG) {
-                return FXUtils.newBuiltinImage("/assets/img/nbt/TAG_Long.png");
-            } else if (type == TagType.FLOAT) {
-                return FXUtils.newBuiltinImage("/assets/img/nbt/TAG_Float.png");
-            } else if (type == TagType.DOUBLE) {
-                return FXUtils.newBuiltinImage("/assets/img/nbt/TAG_Double.png");
-            } else if (type == TagType.STRING) {
-                return FXUtils.newBuiltinImage("/assets/img/nbt/TAG_String.png");
-            } else if (type == TagType.BYTE_ARRAY) {
-                return FXUtils.newBuiltinImage("/assets/img/nbt/TAG_Byte_Array.png");
-            } else if (type == TagType.INT_ARRAY) {
-                return FXUtils.newBuiltinImage("/assets/img/nbt/TAG_Int_Array.png");
-            } else if (type == TagType.LONG_ARRAY) {
-                return FXUtils.newBuiltinImage("/assets/img/nbt/TAG_Long_Array.png");
-            } else if (type == TagType.LIST) {
-                return FXUtils.newBuiltinImage("/assets/img/nbt/TAG_List.png");
-            } else if (type == TagType.COMPOUND) {
-                return FXUtils.newBuiltinImage("/assets/img/nbt/TAG_Compound.png");
-            } else {
-                return null;
-            }
-        } else if (element instanceof ChunkRegion)
-            return FXUtils.newBuiltinImage("/assets/img/nbt/TAG_List.png");
-        else if (element instanceof Chunk)
-            return FXUtils.newBuiltinImage("/assets/img/nbt/TAG_Compound.png");
-        else
-            return null;
-    }
-
-    private final ImageView imageView;
-
-    public NBTTreeCell() {
-        imageView = new ImageView();
-        imageView.setFitHeight(16);
-        imageView.setFitWidth(16);
-        setGraphic(imageView);
-    }
-
-    private NBTTreeItem getNBTTreeItem() {
-        return (NBTTreeItem) getTreeItem();
-    }
-
-    @Override
-    public void updateItem(@Nullable NBTElement item, boolean empty) {
-        super.updateItem(item, empty);
-
-        if (empty || item == null) {
-            imageView.setImage(null);
-            setText(null);
-            return;
-        }
-
-        imageView.setImage(getIcon(item));
-
-        String name = getNBTTreeItem().getOverrideName();
-        if (name == null) {
-            NBTElement value = getNBTTreeItem().getValue();
-
-            if (value instanceof Tag tag) {
-                if (tag.getParent() instanceof ListTag<?>) {
-                    name = Integer.toString(tag.getIndex());
-                } else {
-                    name = tag.getName();
-                }
-            } else if (value instanceof Chunk chunk) {
-                name = "Chunk (" + chunk.getLocalX() + ", " + chunk.getLocalZ() + ")";
-            } else {
-                name = "";
-            }
-        }
-
-        String text;
-        if (item instanceof ParentTag<?> parentTag) {
-            text = i18n("nbt.entries", parentTag.size());
-        } else if (item instanceof ValueTag<?> valueTag) {
-            text = valueTag.getAsString();
-        } else {
-            text = null;
-        }
-
-        if (text == null) {
-            setText(name);
-        } else {
-            setText(name + ": " + text);
-        }
-    }
-}
@@ -1,68 +0,0 @@
-/*
- * 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.nbt;
-
-import javafx.collections.ObservableList;
-import javafx.scene.control.TreeItem;
-import org.glavo.nbt.NBTElement;
-import org.glavo.nbt.NBTParent;
-import org.glavo.nbt.chunk.Chunk;
-import org.glavo.nbt.tag.*;
-import org.jetbrains.annotations.Nullable;
-
-/// @author Glavo
-public final class NBTTreeItem extends TreeItem<NBTElement> {
-    private final @Nullable String overrideName;
-
-    public NBTTreeItem(NBTElement value) {
-        this(value, null);
-    }
-
-    public NBTTreeItem(NBTElement value, @Nullable String overrideName) {
-        super(value);
-        this.overrideName = overrideName;
-    }
-
-    @Override
-    public boolean isLeaf() {
-        return !(getValue() instanceof NBTParent<?> parent) || parent.isEmpty();
-    }
-
-    private boolean needInitChildren = true;
-
-    @Override
-    public ObservableList<TreeItem<NBTElement>> getChildren() {
-        ObservableList<TreeItem<NBTElement>> children = super.getChildren();
-        if (needInitChildren) {
-            needInitChildren = false;
-
-            if (getValue() instanceof Chunk chunk) {
-                if (chunk.getRootTag() != null) {
-                    children.setAll(chunk.getRootTag().stream().map(NBTTreeItem::new).toList());
-                }
-            } else if (getValue() instanceof NBTParent<?> parent) {
-                children.setAll(parent.stream().map(NBTTreeItem::new).toList());
-            }
-        }
-        return children;
-    }
-
-    public @Nullable String getOverrideName() {
-        return overrideName;
-    }
-}
@@ -0,0 +1,184 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2025 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.nbt;
+
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.ListTag;
+import com.github.steveice10.opennbt.tag.builtin.Tag;
+import javafx.scene.control.TreeCell;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeView;
+import javafx.scene.control.skin.TreeViewSkin;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.util.Callback;
+import org.jackhuang.hmcl.ui.FXUtils;
+
+import java.lang.reflect.Array;
+import java.util.EnumMap;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+/**
+ * @author Glavo
+ */
+public final class NBTTreeView extends TreeView<Tag> {
+
+    public NBTTreeView(NBTTreeView.Item tree) {
+        this.setRoot(tree);
+        if (tree != null) tree.setExpanded(true);
+        this.setCellFactory(cellFactory());
+    }
+
+    @Override
+    protected javafx.scene.control.Skin<?> createDefaultSkin() {
+        return new TreeViewSkin<Tag>(this) {
+            {
+                FXUtils.smoothScrolling(getVirtualFlow());
+            }
+        };
+    }
+
+    private static Callback<TreeView<Tag>, TreeCell<Tag>> cellFactory() {
+        EnumMap<NBTTagType, Image> icons = new EnumMap<>(NBTTagType.class);
+
+        return view -> new TreeCell<>() {
+            private void setTagText(String text) {
+                String name = ((Item) getTreeItem()).getName();
+
+                if (name == null) {
+                    setText(text);
+                } else if (text == null) {
+                    setText(name);
+                } else {
+                    setText(name + ": " + text);
+                }
+            }
+
+            private void setTagText(int nEntries) {
+                setTagText(i18n("nbt.entries", nEntries));
+            }
+
+            @Override
+            public void updateItem(Tag item, boolean empty) {
+                super.updateItem(item, empty);
+
+                ImageView imageView = (ImageView) this.getGraphic();
+                if (imageView == null) {
+                    imageView = new ImageView();
+                    this.setGraphic(imageView);
+                }
+
+                if (item == null) {
+                    imageView.setImage(null);
+                    setText(null);
+                    return;
+                }
+
+                NBTTagType tagType = NBTTagType.typeOf(item);
+                imageView.setImage(icons.computeIfAbsent(tagType, type -> new Image(type.getIconUrl())));
+                imageView.setFitHeight(16);
+                imageView.setFitWidth(16);
+
+                if (((Item) getTreeItem()).getText() != null) {
+                    setText(((Item) getTreeItem()).getText());
+                } else {
+                    switch (tagType) {
+                        case BYTE:
+                        case SHORT:
+                        case INT:
+                        case LONG:
+                        case FLOAT:
+                        case DOUBLE:
+                        case STRING:
+                            setTagText(item.getValue().toString());
+                            break;
+                        case BYTE_ARRAY:
+                        case INT_ARRAY:
+                        case LONG_ARRAY:
+                            setTagText(Array.getLength(item.getValue()));
+                            break;
+                        case LIST:
+                            setTagText(((ListTag) item).size());
+                            break;
+                        case COMPOUND:
+                            setTagText(((CompoundTag) item).size());
+                            break;
+                        default:
+                            setTagText(null);
+                    }
+                }
+            }
+        };
+    }
+
+    public static Item buildTree(Tag tag) {
+        Item item = new Item(tag);
+
+        if (tag instanceof CompoundTag) {
+            for (Tag subTag : ((CompoundTag) tag)) {
+                item.getChildren().add(buildTree(subTag));
+            }
+        } else if (tag instanceof ListTag) {
+            int idx = 0;
+            for (Tag subTag : ((ListTag) tag)) {
+                Item subTree = buildTree(subTag);
+                subTree.setName(String.valueOf(idx++));
+                item.getChildren().add(subTree);
+            }
+        }
+        FXUtils.onChangeAndOperate(item.expandedProperty(), expanded -> {
+            if (expanded && item.getChildren().size() == 1) item.getChildren().get(0).setExpanded(true);
+        });
+
+        return item;
+    }
+
+    public CompoundTag getRootTag() {
+        return ((CompoundTag) getRoot().getValue());
+    }
+
+    public static class Item extends TreeItem<Tag> {
+
+        private String text;
+        private String name;
+
+        public Item() {
+        }
+
+        public Item(Tag value) {
+            super(value);
+        }
+
+        public String getText() {
+            return text;
+        }
+
+        public void setText(String text) {
+            this.text = text;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name == null ? getValue().getName() : name;
+        }
+    }
+}
@@ -1,22 +0,0 @@
-/*
- * 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/>.
- */
-
-@NotNullByDefault
-package org.jackhuang.hmcl.ui.nbt;
-
-import org.jetbrains.annotations.NotNullByDefault;
@@ -33,7 +33,7 @@ public class SkinCube extends MeshView {
        public static float[] createTexCoords(float width, float height, float depth, float scaleX, float scaleY,
                float startX, float startY, boolean isSlim) {
            float x = (width + depth) * 2, y = height + depth, half_width = width / x * scaleX, half_depth = depth / x * scaleX,
-                    top_x = depth / x * scaleX + startX, top_y = startY, arm4 = half_width,
+                    top_x = depth / x * scaleX + startX, top_y = startY, arm4 = isSlim ? half_depth : half_width,
                    bottom_x = startX, middle_y = depth / y * scaleY + top_y, bottom_y = scaleY + top_y;
            return new float[]{
                    top_x, top_y,                                    // T0  ---
@@ -58,14 +58,14 @@ public class SkinCube extends MeshView {
                    5, 0, 4, 1, 0, 5,    //P5,T0, P4,T1, P0,T5
                    5, 0, 0, 5, 1, 4,    //P5,T0, P0,T5, P1,T4
                    // RIGHT
-                    5, 3, 1, 4, 3, 9,    //P5,T3, P1,T4, P3,T9
-                    5, 3, 3, 9, 7, 8,    //P5,T3, P3,T9, P7,T8
+                    0, 5, 4, 6, 6, 11,   //P0,T4 ,P4,T3, P6,T8
+                    0, 5, 6, 11, 2, 10,  //P0,T4 ,P6,T8, P2,T9
                    // FRONT
                    1, 4, 0, 5, 2, 10,   //P1,T5, P0,T4, P2,T9
                    1, 4, 2, 10, 3, 9,   //P1,T5, P2,T9, P3,T10
                    // LEFT
-                    0, 5, 4, 6, 6, 11,   //P0,T4 ,P4,T3, P6,T8
-                    0, 5, 6, 11, 2, 10,  //P0,T4 ,P6,T8, P2,T9
+                    5, 3, 1, 4, 3, 9,    //P5,T6, P1,T5, P3,T10
+                    5, 3, 3, 9, 7, 8,    //P5,T6, P3,T10,P7,T11
                    // BACK
                    4, 6, 5, 7, 7, 12,   //P4,T6, P5,T7, P7,T12
                    4, 6, 7, 12, 6, 11,  //P4,T6, P7,T12,P6,T11
@@ -131,15 +131,14 @@ public class SkinMultipleCubes extends Group {
        // LEFT
        getChildren().add(new Face(skin, start_x + width_interval + depth_interval, start_y + depth_interval, depth, height, interval, false, false,
                () -> new Box(thick, length, length), (b, p) -> {
-            b.setTranslateX(-(width * length + thick) / 2.0);
+            b.setTranslateX((width * length + thick) / 2.0);
            b.setTranslateY(-((height - 1) / 2.0 - p.getY()) * b.getHeight());
            b.setTranslateZ(((depth - 1) / 2.0 - p.getX()) * b.getDepth());
        }));
-
        // RIGHT
        getChildren().add(new Face(skin, start_x, start_y + depth_interval, depth, height, interval, true, false,
                () -> new Box(thick, length, length), (b, p) -> {
-            b.setTranslateX((width * length + thick) / 2.0);
+            b.setTranslateX(-(width * length + thick) / 2.0);
            b.setTranslateY(-((height - 1) / 2.0 - p.getY()) * b.getHeight());
            b.setTranslateZ(((depth - 1) / 2.0 - p.getX()) * b.getDepth());
        }));
@@ -164,7 +164,7 @@ public class TerracottaControllerPage extends StackPane {
                    if (uninitialized.hasLegacy() && I18n.isUseChinese()) {
                        Object feedback = config().getShownTips().get(FEEDBACK_TIP);
                        if (!(feedback instanceof Number number) || number.intValue() < 1) {
-                            Controllers.confirm(i18n("terracotta.feedback.desc.update"), i18n("terracotta.feedback.title"), () -> {
+                            Controllers.confirm(i18n("terracotta.feedback.desc"), i18n("terracotta.feedback.title"), () -> {
                                FXUtils.openLink(TerracottaMetadata.FEEDBACK_LINK);
                                config().getShownTips().put(FEEDBACK_TIP, 1);
                            }, () -> {
@@ -246,7 +246,7 @@ public class TerracottaControllerPage extends StackPane {
                        } else {
                            handler.resolve();
                        }
-                    }, "", new RequiredValidator(i18n("input.not_empty")));
+                    });
                });

                if (ThreadLocalRandom.current().nextDouble() < 0.02D) {
@@ -1,20 +1,3 @@
-/*
- * 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.versions;

 import com.jfoenix.controls.JFXTextField;
@@ -25,7 +8,6 @@ import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.*;
-import org.jackhuang.hmcl.game.GraphicsAPI;
 import org.jackhuang.hmcl.game.NativesDirectoryType;
 import org.jackhuang.hmcl.game.Renderer;
 import org.jackhuang.hmcl.setting.Profile;
@@ -37,7 +19,6 @@ import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jackhuang.hmcl.util.platform.Platform;
-import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 import org.jetbrains.annotations.Nullable;

 import java.nio.file.FileSystems;
@@ -71,7 +52,6 @@ public final class AdvancedVersionSettingPage extends StackPane implements Decor
    private final ComponentSublist nativesDirSublist;
    private final MultiFileItem<NativesDirectoryType> nativesDirItem;
    private final MultiFileItem.FileOption<NativesDirectoryType> nativesDirCustomOption;
-    private final LineSelectButton<GraphicsAPI> graphicsBackendPane;
    private final LineSelectButton<Renderer> rendererPane;

    public AdvancedVersionSettingPage(Profile profile, @Nullable String versionId, VersionSetting versionSetting) {
@@ -82,10 +62,6 @@ public final class AdvancedVersionSettingPage extends StackPane implements Decor
                versionId == null ? i18n("settings.advanced") : i18n("settings.advanced.title", versionId)
        ));

-        @Nullable GameVersionNumber gameVersion = versionId != null
-                ? GameVersionNumber.asGameVersion(profile.getRepository().getGameVersion(versionId))
-                : null;
-
        this.getStyleClass().add("gray-background");

        ScrollPane scrollPane = new ScrollPane();
@@ -183,55 +159,23 @@ public final class AdvancedVersionSettingPage extends StackPane implements Decor
            nativesDirSublist.setHasSubtitle(true);
            nativesDirCustomOption = new MultiFileItem.FileOption<>(i18n("settings.advanced.natives_directory.custom"), NativesDirectoryType.CUSTOM)
                    .setChooserTitle(i18n("settings.advanced.natives_directory.choose"))
-                    .setSelectionMode(FileSelector.SelectionMode.DIRECTORY);
+                    .setDirectory(true);
            nativesDirItem.loadChildren(Arrays.asList(
                    new MultiFileItem.Option<>(i18n("settings.advanced.natives_directory.default"), NativesDirectoryType.VERSION_FOLDER),
                    nativesDirCustomOption
            ));
-
-            graphicsBackendPane = new LineSelectButton<>();
-            graphicsBackendPane.setTitle(i18n("settings.advanced.graphics_backend"));
-            graphicsBackendPane.setNullSafeConverter(backend -> i18n("settings.advanced.graphics_backend." + backend.name().toLowerCase(Locale.ROOT)));
-            graphicsBackendPane.setDescriptionConverter(backend -> switch (backend) {
-                    case DEFAULT -> i18n("settings.advanced.graphics_backend.default.desc");
-                    case OPENGL -> i18n("settings.advanced.graphics_backend.opengl.desc");
-                    case VULKAN -> {
-                        if (gameVersion == null)
-                            yield i18n("settings.advanced.graphics_backend.vulkan.desc.global");
-                        else if (gameVersion.compareTo("26.2-snapshot-2") < 0)
-                            yield i18n("settings.advanced.graphics_backend.vulkan.desc.unsupported");
-                        else
-                            yield i18n("settings.advanced.graphics_backend.vulkan.desc");
-                    }
-                    default -> null;
-                });
-            graphicsBackendPane.setValue(GraphicsAPI.DEFAULT);
-            graphicsBackendPane.setItems(GraphicsAPI.values());
+            HintPane nativesDirHint = new HintPane(MessageDialogPane.MessageType.WARNING);
+            nativesDirHint.setText(i18n("settings.advanced.natives_directory.hint"));
+            nativesDirItem.getChildren().add(nativesDirHint);

            rendererPane = new LineSelectButton<>();
            rendererPane.setTitle(i18n("settings.advanced.renderer"));
-            rendererPane.setNullSafeConverter(e -> i18n("settings.advanced.renderer." + e.name().toLowerCase(Locale.ROOT)));
+            rendererPane.setConverter(e -> i18n("settings.advanced.renderer." + e.name().toLowerCase(Locale.ROOT)));
            rendererPane.setDescriptionConverter(e -> {
                String bundleKey = "settings.advanced.renderer." + e.name().toLowerCase(Locale.ROOT) + ".desc";
                return I18n.hasKey(bundleKey) ? i18n(bundleKey) : null;
            });
-            rendererPane.setValue(Renderer.DEFAULT);
-
-            FXUtils.onChangeAndOperate(graphicsBackendPane.valueProperty(), backend -> {
-                if (backend == null) { // unbind
-                    return;
-                }
-
-                rendererPane.setItems(Renderer.getSupported(backend));
-                if (backend == GraphicsAPI.DEFAULT) {
-                    rendererPane.setDisable(true);
-                    rendererPane.setValue(Renderer.DEFAULT);
-                } else {
-                    rendererPane.setDisable(false);
-                    if (!(rendererPane.getValue() instanceof Renderer.Driver driver) || driver.api() != backend)
-                        rendererPane.setValue(Renderer.DEFAULT);
-                }
-            });
+            rendererPane.setItems(Renderer.values());

            noJVMArgsPane = new LineToggleButton();
            noJVMArgsPane.setTitle(i18n("settings.advanced.no_jvm_args"));
@@ -251,14 +195,12 @@ public final class AdvancedVersionSettingPage extends StackPane implements Decor

            useNativeGLFWPane = new LineToggleButton();
            useNativeGLFWPane.setTitle(i18n("settings.advanced.use_native_glfw"));
-            useNativeGLFWPane.setSubtitle(i18n("settings.advanced.linux_freebsd_only"));

            useNativeOpenALPane = new LineToggleButton();
            useNativeOpenALPane.setTitle(i18n("settings.advanced.use_native_openal"));
-            useNativeOpenALPane.setSubtitle(i18n("settings.advanced.linux_freebsd_only"));

            workaroundPane.getContent().setAll(
-                    nativesDirSublist, graphicsBackendPane, rendererPane, noJVMArgsPane, noOptimizingJVMArgsPane, noGameCheckPane,
+                    nativesDirSublist, rendererPane, noJVMArgsPane, noOptimizingJVMArgsPane, noGameCheckPane,
                    noJVMCheckPane, noNativesPatchPane
            );

@@ -291,7 +233,6 @@ public final class AdvancedVersionSettingPage extends StackPane implements Decor
        FXUtils.bindString(txtPreLaunchCommand, versionSetting.preLaunchCommandProperty());
        FXUtils.bindString(txtPostExitCommand, versionSetting.postExitCommandProperty());
        rendererPane.valueProperty().bindBidirectional(versionSetting.rendererProperty());
-        graphicsBackendPane.valueProperty().bindBidirectional(versionSetting.graphicsBackendProperty());
        noGameCheckPane.selectedProperty().bindBidirectional(versionSetting.notCheckGameProperty());
        noJVMCheckPane.selectedProperty().bindBidirectional(versionSetting.notCheckJVMProperty());
        noJVMArgsPane.selectedProperty().bindBidirectional(versionSetting.noJVMArgsProperty());
@@ -334,7 +275,6 @@ public final class AdvancedVersionSettingPage extends StackPane implements Decor
        FXUtils.unbind(txtPreLaunchCommand, versionSetting.preLaunchCommandProperty());
        FXUtils.unbind(txtPostExitCommand, versionSetting.postExitCommandProperty());
        rendererPane.valueProperty().unbindBidirectional(versionSetting.rendererProperty());
-        graphicsBackendPane.valueProperty().unbindBidirectional(versionSetting.graphicsBackendProperty());
        noGameCheckPane.selectedProperty().unbindBidirectional(versionSetting.notCheckGameProperty());
        noJVMCheckPane.selectedProperty().unbindBidirectional(versionSetting.notCheckJVMProperty());
        noJVMArgsPane.selectedProperty().unbindBidirectional(versionSetting.noJVMArgsProperty());
@@ -22,7 +22,7 @@ import javafx.collections.ObservableList;
 import javafx.scene.control.Skin;
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.game.World;
-import org.jackhuang.hmcl.mod.DataPack;
+import org.jackhuang.hmcl.mod.Datapack;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
@@ -44,45 +44,45 @@ import java.util.regex.Pattern;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;

-public final class DataPackListPage extends ListPageBase<DataPackListPageSkin.DataPackInfoObject> implements WorldManagePage.WorldRefreshable {
+public final class DatapackListPage extends ListPageBase<DatapackListPageSkin.DatapackInfoObject> implements WorldManagePage.WorldRefreshable {
    private final World world;
-    private final DataPack dataPack;
+    private final Datapack datapack;
    final BooleanProperty readOnly;

-    public DataPackListPage(WorldManagePage worldManagePage) {
+    public DatapackListPage(WorldManagePage worldManagePage) {
        world = worldManagePage.getWorld();
-        dataPack = new DataPack(world.getFile().resolve("datapacks"));
-        setItems(MappedObservableList.create(dataPack.getPacks(), DataPackListPageSkin.DataPackInfoObject::new));
+        datapack = new Datapack(world.getFile().resolve("datapacks"));
+        setItems(MappedObservableList.create(datapack.getPacks(), DatapackListPageSkin.DatapackInfoObject::new));
        readOnly = worldManagePage.readOnlyProperty();
        FXUtils.applyDragListener(this, it -> Objects.equals("zip", FileUtils.getExtension(it)),
-                this::installMultiDataPack, this::refresh);
+                this::installMultiDatapack, this::refresh);

        refresh();
    }

-    private void installMultiDataPack(List<Path> dataPackPath) {
-        dataPackPath.forEach(this::installSingleDataPack);
+    private void installMultiDatapack(List<Path> datapackPath) {
+        datapackPath.forEach(this::installSingleDatapack);
        if (readOnly.get()) {
            Controllers.showToast(i18n("datapack.reload.toast"));
        }
    }

-    private void installSingleDataPack(Path dataPack) {
+    private void installSingleDatapack(Path datapack) {
        try {
-            this.dataPack.installPack(dataPack, world.getGameVersion());
+            this.datapack.installPack(datapack, world.getGameVersion());
        } catch (IOException | IllegalArgumentException e) {
-            LOG.warning("Unable to parse datapack file " + dataPack, e);
+            LOG.warning("Unable to parse datapack file " + datapack, e);
        }
    }

    @Override
    protected Skin<?> createDefaultSkin() {
-        return new DataPackListPageSkin(this);
+        return new DatapackListPageSkin(this);
    }

    public void refresh() {
        setLoading(true);
-        Task.runAsync(dataPack::loadFromDir)
+        Task.runAsync(datapack::loadFromDir)
                .withRunAsync(Schedulers.javafx(), () -> setLoading(false))
                .start();
    }
@@ -94,18 +94,18 @@ public final class DataPackListPage extends ListPageBase<DataPackListPageSkin.Da
        List<Path> res = FileUtils.toPaths(chooser.showOpenMultipleDialog(Controllers.getStage()));

        if (res != null) {
-            installMultiDataPack(res);
+            installMultiDatapack(res);
        }

-        dataPack.loadFromDir();
+        datapack.loadFromDir();
    }

-    void removeSelected(ObservableList<DataPackListPageSkin.DataPackInfoObject> selectedItems) {
+    void removeSelected(ObservableList<DatapackListPageSkin.DatapackInfoObject> selectedItems) {
        selectedItems.stream()
-                .map(DataPackListPageSkin.DataPackInfoObject::getPackInfo)
+                .map(DatapackListPageSkin.DatapackInfoObject::getPackInfo)
                .forEach(pack -> {
                    try {
-                        dataPack.deletePack(pack);
+                        datapack.deletePack(pack);
                    } catch (IOException e) {
                        // Fail to remove mods if the game is running or the datapack is absent.
                        LOG.warning("Failed to delete datapack \"" + pack.getId() + "\"", e);
@@ -113,23 +113,23 @@ public final class DataPackListPage extends ListPageBase<DataPackListPageSkin.Da
                });
    }

-    void enableSelected(ObservableList<DataPackListPageSkin.DataPackInfoObject> selectedItems) {
+    void enableSelected(ObservableList<DatapackListPageSkin.DatapackInfoObject> selectedItems) {
        selectedItems.stream()
-                .map(DataPackListPageSkin.DataPackInfoObject::getPackInfo)
+                .map(DatapackListPageSkin.DatapackInfoObject::getPackInfo)
                .forEach(pack -> pack.setActive(true));
    }

-    void disableSelected(ObservableList<DataPackListPageSkin.DataPackInfoObject> selectedItems) {
+    void disableSelected(ObservableList<DatapackListPageSkin.DatapackInfoObject> selectedItems) {
        selectedItems.stream()
-                .map(DataPackListPageSkin.DataPackInfoObject::getPackInfo)
+                .map(DatapackListPageSkin.DatapackInfoObject::getPackInfo)
                .forEach(pack -> pack.setActive(false));
    }

    void openDataPackFolder() {
-        FXUtils.openFolder(dataPack.getPath());
+        FXUtils.openFolder(datapack.getPath());
    }

-    @NotNull Predicate<DataPackListPageSkin.DataPackInfoObject> updateSearchPredicate(String queryString) {
+    @NotNull Predicate<DatapackListPageSkin.DatapackInfoObject> updateSearchPredicate(String queryString) {
        if (queryString.isBlank()) {
            return dataPack -> true;
        }
@@ -28,7 +28,6 @@ import javafx.beans.InvalidationListener;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.collections.ListChangeListener;
 import javafx.collections.transformation.FilteredList;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -43,7 +42,7 @@ import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.StackPane;
 import javafx.util.Duration;
-import org.jackhuang.hmcl.mod.DataPack;
+import org.jackhuang.hmcl.mod.Datapack;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
@@ -68,7 +67,7 @@ import static org.jackhuang.hmcl.ui.ToolbarListPageSkin.createToolbarButton2;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;

-final class DataPackListPageSkin extends SkinBase<DataPackListPage> {
+final class DatapackListPageSkin extends SkinBase<DatapackListPage> {

    private final TransitionPane toolbarPane;
    private final HBox searchBar;
@@ -76,8 +75,8 @@ final class DataPackListPageSkin extends SkinBase<DataPackListPage> {
    private final HBox selectingToolbar;
    InvalidationListener updateBarByStateWeakListener;

-    private final JFXListView<DataPackInfoObject> listView;
-    private final FilteredList<DataPackInfoObject> filteredList;
+    private final JFXListView<DatapackInfoObject> listView;
+    private final FilteredList<DatapackInfoObject> filteredList;

    private final BooleanProperty isSearching = new SimpleBooleanProperty(false);
    private final BooleanProperty isSelecting = new SimpleBooleanProperty(false);
@@ -86,7 +85,7 @@ final class DataPackListPageSkin extends SkinBase<DataPackListPage> {
    private static final AtomicInteger lastShiftClickIndex = new AtomicInteger(-1);
    final Consumer<Integer> toggleSelect;

-    DataPackListPageSkin(DataPackListPage skinnable) {
+    DatapackListPageSkin(DatapackListPage skinnable) {
        super(skinnable);

        StackPane pane = new StackPane();
@@ -98,14 +97,6 @@ final class DataPackListPageSkin extends SkinBase<DataPackListPage> {
        listView = new JFXListView<>();
        filteredList = new FilteredList<>(skinnable.getItems());

-        // reason for not using selectAll() is that selectAll() first clears all selected then selects all, causing the toolbar to flicker
-        var selectAllButton = createToolbarButton2(i18n("button.select_all"), SVG.SELECT_ALL, () -> listView.getSelectionModel().selectRange(0, listView.getItems().size()));
-
-        ListChangeListener<Object> listener = change -> {
-            selectAllButton.setDisable(!listView.getItems().isEmpty()
-                    && listView.getSelectionModel().getSelectedItems().size() == listView.getItems().size());
-        };
-
        {
            toolbarPane = new TransitionPane();
            searchBar = new HBox();
@@ -132,13 +123,12 @@ final class DataPackListPageSkin extends SkinBase<DataPackListPage> {
            enableButton.disableProperty().bind(getSkinnable().readOnly);
            disableButton.disableProperty().bind(getSkinnable().readOnly);

-            listView.getSelectionModel().getSelectedItems().addListener(listener);
-
            selectingToolbar.getChildren().addAll(
                    removeButton,
                    enableButton,
                    disableButton,
-                    selectAllButton,
+                    createToolbarButton2(i18n("button.select_all"), SVG.SELECT_ALL, () ->
+                            listView.getSelectionModel().selectRange(0, listView.getItems().size())),//reason for not using selectAll() is that selectAll() first clears all selected then selects all, causing the toolbar to flicker
                    createToolbarButton2(i18n("button.cancel"), SVG.CANCEL, () ->
                            listView.getSelectionModel().clearSelection())
            );
@@ -191,10 +181,9 @@ final class DataPackListPageSkin extends SkinBase<DataPackListPage> {
            ComponentList.setVgrow(center, Priority.ALWAYS);
            center.loadingProperty().bind(skinnable.loadingProperty());

-            listView.setCellFactory(x -> new DataPackInfoListCell(listView, getSkinnable().readOnly));
+            listView.setCellFactory(x -> new DatapackInfoListCell(listView, getSkinnable().readOnly));
            listView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
            this.listView.setItems(filteredList);
-            listView.getItems().addListener(listener);

            // ListViewBehavior would consume ESC pressed event, preventing us from handling it, so we ignore it here
            FXUtils.ignoreEvent(listView, KeyEvent.KEY_PRESSED, e -> e.getCode() == KeyCode.ESCAPE);
@@ -227,13 +216,13 @@ final class DataPackListPageSkin extends SkinBase<DataPackListPage> {
        }
    }

-    static class DataPackInfoObject extends RecursiveTreeObject<DataPackInfoObject> {
+    static class DatapackInfoObject extends RecursiveTreeObject<DatapackInfoObject> {
        private final BooleanProperty activeProperty;
-        private final DataPack.Pack packInfo;
+        private final Datapack.Pack packInfo;

        private SoftReference<CompletableFuture<Image>> iconCache;

-        DataPackInfoObject(DataPack.Pack packInfo) {
+        DatapackInfoObject(Datapack.Pack packInfo) {
            this.packInfo = packInfo;
            this.activeProperty = packInfo.activeProperty();
        }
@@ -246,7 +235,7 @@ final class DataPackListPageSkin extends SkinBase<DataPackListPage> {
            return packInfo.getDescription().toString();
        }

-        DataPack.Pack getPackInfo() {
+        Datapack.Pack getPackInfo() {
            return packInfo;
        }

@@ -281,7 +270,7 @@ final class DataPackListPageSkin extends SkinBase<DataPackListPage> {
            }
        }

-        public void loadIcon(ImageContainer imageContainer, @Nullable WeakReference<ObjectProperty<DataPackInfoObject>> current) {
+        public void loadIcon(ImageContainer imageContainer, @Nullable WeakReference<ObjectProperty<DatapackInfoObject>> current) {
            SoftReference<CompletableFuture<Image>> iconCache = this.iconCache;
            CompletableFuture<Image> imageFuture;
            if (iconCache != null && (imageFuture = iconCache.get()) != null) {
@@ -297,7 +286,7 @@ final class DataPackListPageSkin extends SkinBase<DataPackListPage> {
            imageContainer.setImage(FXUtils.newBuiltinImage("/assets/img/unknown_pack.png"));
            imageFuture.thenAcceptAsync(image -> {
                if (current != null) {
-                    ObjectProperty<DataPackInfoObject> infoObjectProperty = current.get();
+                    ObjectProperty<DatapackInfoObject> infoObjectProperty = current.get();
                    if (infoObjectProperty == null || infoObjectProperty.get() != this) {
                        // The current ListCell has already switched to another object
                        return;
@@ -309,13 +298,13 @@ final class DataPackListPageSkin extends SkinBase<DataPackListPage> {
        }
    }

-    private final class DataPackInfoListCell extends MDListCell<DataPackInfoObject> {
+    private final class DatapackInfoListCell extends MDListCell<DatapackInfoObject> {
        final JFXCheckBox checkBox = new JFXCheckBox();
        ImageContainer imageContainer = new ImageContainer(32);
        final TwoLineListItem content = new TwoLineListItem();
        BooleanProperty booleanProperty;

-        DataPackInfoListCell(JFXListView<DataPackInfoObject> listView, BooleanProperty isReadOnlyProperty) {
+        DatapackInfoListCell(JFXListView<DatapackInfoObject> listView, BooleanProperty isReadOnlyProperty) {
            super(listView);

            HBox container = new HBox(8);
@@ -337,7 +326,7 @@ final class DataPackListPageSkin extends SkinBase<DataPackListPage> {
        }

        @Override
-        protected void updateControl(DataPackInfoObject dataItem, boolean empty) {
+        protected void updateControl(DatapackInfoObject dataItem, boolean empty) {
            if (empty) return;
            content.setTitle(dataItem.getTitle());
            content.setSubtitle(dataItem.getSubtitle());
@@ -349,7 +338,7 @@ final class DataPackListPageSkin extends SkinBase<DataPackListPage> {
        }
    }

-    public void handleSelect(DataPackInfoListCell cell, MouseEvent mouseEvent) {
+    public void handleSelect(DatapackInfoListCell cell, MouseEvent mouseEvent) {
        if (cell.isEmpty()) {
            mouseEvent.consume();
            return;
@@ -192,7 +192,7 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
        }).executor(true);
    }

-    protected String getLocalizedCategory(String category, Object self) {
+    protected String getLocalizedCategory(String category) {
        return repository instanceof ModrinthRemoteModRepository
                ? i18n("modrinth.category." + category)
                : i18n("curse.category." + category);
@@ -204,9 +204,9 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP

    private String getLocalizedCategoryIndent(ModDownloadListPageSkin.CategoryIndented category) {
        return StringUtils.repeats(' ', category.indent * 4) +
-                (category.category() == null
+                (category.getCategory() == null
                        ? i18n("curse.category.0")
-                        : getLocalizedCategory(category.category().id(), category.category().self()));
+                        : getLocalizedCategory(category.getCategory().getId()));
    }

    protected String getLocalizedOfficialPage() {
@@ -386,7 +386,7 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
                    int pageOffset = control.pageOffset.get();
                    getSkinnable().search(gameVersionField.getSelectionModel().getSelectedItem(),
                            Optional.ofNullable(categoryComboBox.getSelectionModel().getSelectedItem())
-                                    .map(CategoryIndented::category)
+                                    .map(CategoryIndented::getCategory)
                                    .orElse(null),
                            pageOffset == -1 ? 0 : pageOffset,
                            nameField.getText(),
@@ -531,6 +531,7 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
                listView.setSelectionModel(new NoneMultipleSelectionModel<>());
                // ListViewBehavior would consume ESC pressed event, preventing us from handling it, so we ignore it here
                ignoreEvent(listView, KeyEvent.KEY_PRESSED, e -> e.getCode() == KeyCode.ESCAPE);
+
                listView.setCellFactory(x -> new ListCell<>() {
                    private static final Insets PADDING = new Insets(9, 9, 0, 9);

@@ -577,15 +578,11 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
                        } else {
                            ModTranslations.Mod mod = ModTranslations.getTranslationsByRepositoryType(getSkinnable().repository.getType()).getModByCurseForgeId(item.getSlug());
                            content.setTitle(mod != null && I18n.isUseChinese() ? mod.getDisplayName() : item.getTitle());
-                            String description = item.getDescription();
-                            if (description != null) {
-                                description = description.replaceAll("\\R", " ");
-                            }
-                            content.setSubtitle(description);
+                            content.setSubtitle(item.getDescription());
                            content.getTags().clear();
                            for (String category : item.getCategories()) {
                                if (getSkinnable().shouldDisplayCategory(category))
-                                    content.addTag(getSkinnable().getLocalizedCategory(category, null));
+                                    content.addTag(getSkinnable().getLocalizedCategory(category));
                            }
                            iconLoader.load(imageContainer.imageProperty(), item.getIconUrl());
                            setGraphic(wrapper);
@@ -597,13 +594,29 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
            getChildren().setAll(pane);
        }

-        private record CategoryIndented(int indent, RemoteModRepository.Category category) {
+        private static class CategoryIndented {
            private static final CategoryIndented ALL = new CategoryIndented(0, null);
+
+            private final int indent;
+            private final RemoteModRepository.Category category;
+
+            public CategoryIndented(int indent, RemoteModRepository.Category category) {
+                this.indent = indent;
+                this.category = category;
+            }
+
+            public int getIndent() {
+                return indent;
+            }
+
+            public RemoteModRepository.Category getCategory() {
+                return category;
+            }
        }

        private static void resolveCategory(RemoteModRepository.Category category, int indent, List<CategoryIndented> result) {
            result.add(new CategoryIndented(indent, category));
-            for (RemoteModRepository.Category subcategory : category.subcategories()) {
+            for (RemoteModRepository.Category subcategory : category.getSubcategories()) {
                resolveCategory(subcategory, indent + 1, result);
            }
        }
@@ -27,8 +27,16 @@ import javafx.beans.property.SimpleBooleanProperty;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
+import javafx.scene.control.Control;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.Skin;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
@@ -46,7 +54,11 @@ import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.Pair;
+import org.jackhuang.hmcl.util.SimpleMultimap;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.TaskCancellationAction;
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.javafx.BindingMapping;
@@ -54,7 +66,14 @@ import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 import org.jetbrains.annotations.Nullable;

 import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

@@ -73,7 +92,6 @@ public class DownloadPage extends Control implements DecoratorPage {
    private final Profile.ProfileVersion version;
    private final DownloadCallback callback;
    private final DownloadListPage page;
-    private final RemoteModRepository.Type type;

    private SimpleMultimap<String, RemoteMod.Version, List<RemoteMod.Version>> versions;

@@ -81,8 +99,7 @@ public class DownloadPage extends Control implements DecoratorPage {
        this.page = page;
        this.repository = page.repository;
        this.addon = addon;
-        this.type = Objects.requireNonNullElse(addon.getRepositoryType(), repository.getType());
-        this.translations = ModTranslations.getTranslationsByRepositoryType(this.type);
+        this.translations = ModTranslations.getTranslationsByRepositoryType(repository.getType());
        this.mod = translations.getModByCurseForgeId(addon.getSlug());
        this.version = version;
        this.callback = callback;
@@ -161,13 +178,13 @@ public class DownloadPage extends Control implements DecoratorPage {

    public void download(RemoteMod mod, RemoteMod.Version file) {
        if (this.callback == null) {
-            saveAs(file);
+            saveAs(mod, file);
        } else {
            this.callback.download(page.getDownloadProvider(), version.getProfile(), version.getVersion(), mod, file);
        }
    }

-    public void saveAs(RemoteMod.Version file) {
+    public void saveAs(RemoteMod mod, RemoteMod.Version file) {
        String extension = StringUtils.substringAfterLast(file.getFile().getFilename(), '.');

        FileChooser fileChooser = new FileChooser();
@@ -227,10 +244,8 @@ public class DownloadPage extends Control implements DecoratorPage {
                content.setSubtitle(getSkinnable().addon.getDescription());
                content.getSubtitleLabel().setWrapText(true);
                getSkinnable().addon.getCategories().stream()
-                        .filter(category -> getSkinnable().page.shouldDisplayCategory(category))
-                        .map(category -> getSkinnable().page.getLocalizedCategory(category, null))
+                        .map(category -> getSkinnable().page.getLocalizedCategory(category))
                        .forEach(content::addTag);
-                content.getFirstLine().setMinWidth(0);
                descriptionPane.getChildren().add(content);

                if (getSkinnable().mod != null) {
@@ -277,84 +292,46 @@ public class DownloadPage extends Control implements DecoratorPage {
                        Version game = repository.getResolvedPreservingPatchesVersion(control.version.getVersion());
                        String gameVersion = repository.getGameVersion(game).orElse(null);

-                        if (gameVersion != null && control.versions.containsKey(gameVersion)) {
+                        if (gameVersion != null) {
                            List<RemoteMod.Version> modVersions = control.versions.get(gameVersion);
                            if (modVersions != null && !modVersions.isEmpty()) {
                                Set<ModLoaderType> targetLoaders = LibraryAnalyzer.analyze(game, gameVersion).getModLoaders();

                                resolve:
                                for (RemoteMod.Version modVersion : modVersions) {
-                                    if (getSkinnable().type == RemoteModRepository.Type.MOD) {
-                                        for (ModLoaderType loader : modVersion.getLoaders()) {
-                                            if (targetLoaders.contains(loader)) {
-                                                list.getContent().addAll(
-                                                        ComponentList.createComponentListTitle(i18n("mods.download.recommend", gameVersion)),
-                                                        new ModItem(control.addon, modVersion, control)
-                                                );
-                                                break resolve;
-                                            }
+                                    for (ModLoaderType loader : modVersion.getLoaders()) {
+                                        if (targetLoaders.contains(loader)) {
+                                            list.getContent().addAll(
+                                                    ComponentList.createComponentListTitle(i18n("mods.download.recommend", gameVersion)),
+                                                    new ModItem(control.addon, modVersion, control)
+                                            );
+                                            break resolve;
                                        }
-                                    } else {
-                                        list.getContent().addAll(
-                                                ComponentList.createComponentListTitle(i18n("mods.download.recommend", gameVersion)),
-                                                new ModItem(control.addon, modVersion, control)
-                                        );
-                                        break;
                                    }
                                }
                            }
                        }
                    }

-                    final class Versions {
-                        static ComponentSublist createSublist(DownloadPage control, String title, List<String> target) {
-                            var sublist = new ComponentSublist(() -> {
-                                ArrayList<ModItem> items = new ArrayList<>();
-                                for (String gv : target) {
-                                    List<RemoteMod.Version> versions = control.versions.get(gv);
-                                    if (versions != null) {
-                                        for (RemoteMod.Version v : versions) {
-                                            items.add(new ModItem(control.addon, v, control));
-                                        }
-                                    }
-                                }
-                                return items;
-                            });
-
-                            sublist.setTitle(title);
-                            sublist.getStyleClass().add("no-padding");
-
-                            return sublist;
+                    for (String gameVersion : control.versions.keys().stream()
+                            .sorted(Collections.reverseOrder(GameVersionNumber::compare))
+                            .toList()) {
+                        List<RemoteMod.Version> versions = control.versions.get(gameVersion);
+                        if (versions == null || versions.isEmpty()) {
+                            continue;
                        }

-                        final List<String> releases = new ArrayList<>();
-                        final List<String> snapshots = new ArrayList<>();
-                    }
+                        var sublist = new ComponentSublist(() -> {
+                            ArrayList<ModItem> items = new ArrayList<>(versions.size());
+                            for (RemoteMod.Version v : versions) {
+                                items.add(new ModItem(control.addon, v, control));
+                            }
+                            return items;
+                        });
+                        sublist.getStyleClass().add("no-padding");
+                        sublist.setTitle("Minecraft " + gameVersion);

-                    TreeMap<GameVersionNumber, Versions> map = new TreeMap<>(Collections.reverseOrder());
-                    for (String version : control.versions.keys()) {
-                        GameVersionNumber gameVersion = GameVersionNumber.asGameVersion(version);
-                        GameVersionNumber releaseOfSnapshot = GameVersionNumber.getReleaseOfSnapshot(gameVersion);
-                        GameVersionNumber releaseVersion = Objects.requireNonNullElse(releaseOfSnapshot, gameVersion);
-
-                        Versions lists = map.computeIfAbsent(releaseVersion, v -> new Versions());
-
-                        if (releaseOfSnapshot == null) {
-                            lists.releases.add(version);
-                        } else {
-                            lists.snapshots.add(version);
-                        }
-                    }
-
-                    for (Map.Entry<GameVersionNumber, Versions> entry : map.entrySet()) {
-                        GameVersionNumber gameVersion = entry.getKey();
-                        Versions versions = entry.getValue();
-
-                        if (!versions.releases.isEmpty())
-                            list.getContent().add(Versions.createSublist(control, i18n("addon.download.title.release", gameVersion), versions.releases));
-
-                        if (!versions.snapshots.isEmpty())
-                            list.getContent().add(Versions.createSublist(control, i18n("addon.download.title.snapshot", gameVersion), versions.snapshots));
+                        list.getContent().add(sublist);
                    }
                });
            }
@@ -363,7 +340,7 @@ public class DownloadPage extends Control implements DecoratorPage {
        }
    }

-    private static final class DependencyModItem extends LineButton {
+    private static final class DependencyModItem extends StackPane {
        public static final EnumMap<RemoteMod.DependencyType, String> I18N_KEY = new EnumMap<>(Lang.mapOf(
                Pair.pair(RemoteMod.DependencyType.EMBEDDED, "mods.dependency.embedded"),
                Pair.pair(RemoteMod.DependencyType.OPTIONAL, "mods.dependency.optional"),
@@ -374,37 +351,29 @@ public class DownloadPage extends Control implements DecoratorPage {
                Pair.pair(RemoteMod.DependencyType.BROKEN, "mods.dependency.broken")
        ));

-        DependencyModItem(DownloadListPage page, RemoteMod addon, Profile.ProfileVersion version) {
+        DependencyModItem(DownloadListPage page, RemoteMod addon, Profile.ProfileVersion version, DownloadCallback callback) {
            HBox pane = new HBox(8);
            pane.setPadding(new Insets(0, 8, 0, 8));
            pane.setAlignment(Pos.CENTER_LEFT);
            TwoLineListItem content = new TwoLineListItem();
-            pane.setMouseTransparent(true);
            HBox.setHgrow(content, Priority.ALWAYS);
            var imageView = new ImageContainer(40);
            pane.getChildren().setAll(imageView, content);
-            FXUtils.setLimitHeight(this, 60);

-            RemoteModRepository.Type type = addon.getRepositoryType();
-            DownloadCallback callback = switch (type) {
-                case MOD -> org.jackhuang.hmcl.ui.download.DownloadPage.FOR_MOD;
-                case RESOURCE_PACK -> org.jackhuang.hmcl.ui.download.DownloadPage.FOR_RESOURCE_PACK;
-                case SHADER_PACK -> org.jackhuang.hmcl.ui.download.DownloadPage.FOR_SHADER;
-                default -> null; // Dependencies should not be modpacks, worlds or customized stuff
-            };
-            setOnAction((e) -> {
+            RipplerContainer container = new RipplerContainer(pane);
+            FXUtils.onClicked(container, () -> {
                fireEvent(new DialogCloseEvent());
                Controllers.navigate(new DownloadPage(page, addon, version, callback));
            });
-            setNode(IDX_LEADING, pane);
+            getChildren().setAll(container);

            if (addon != RemoteMod.BROKEN) {
-                ModTranslations.Mod mod = ModTranslations.getTranslationsByRepositoryType(type).getModByCurseForgeId(addon.getSlug());
+                ModTranslations.Mod mod = ModTranslations.getTranslationsByRepositoryType(page.repository.getType()).getModByCurseForgeId(addon.getSlug());
                content.setTitle(mod != null && I18n.isUseChinese() ? mod.getDisplayName() : addon.getTitle());
                content.setSubtitle(addon.getDescription());
                for (String category : addon.getCategories()) {
                    if (page.shouldDisplayCategory(category))
-                        content.addTag(page.getLocalizedCategory(category, null));
+                        content.addTag(page.getLocalizedCategory(category));
                }
                if (StringUtils.isNotBlank(addon.getIconUrl())) {
                    imageView.imageProperty().bind(FXUtils.newRemoteImage(addon.getIconUrl(), 80, 80, true, true));
@@ -459,7 +428,7 @@ public class DownloadPage extends Control implements DecoratorPage {
                            case CLEANROOM:
                                content.addTag(i18n("install.installer.cleanroom"));
                                break;
-                            case NEO_FORGE:
+                            case NEO_FORGED:
                                content.addTag(i18n("install.installer.neoforge"));
                                break;
                            case FABRIC:
@@ -491,7 +460,7 @@ public class DownloadPage extends Control implements DecoratorPage {

    private static final class ModVersion extends JFXDialogLayout {
        public ModVersion(RemoteMod mod, RemoteMod.Version version, DownloadPage selfPage) {
-            RemoteModRepository.Type type = selfPage.type;
+            RemoteModRepository.Type type = selfPage.repository.getType();

            String title = switch (type) {
                case WORLD -> "world.download.title";
@@ -513,7 +482,6 @@ public class DownloadPage extends Control implements DecoratorPage {
            loadDependencies(version, selfPage, spinnerPane, dependenciesList);
            spinnerPane.setOnFailedAction(e -> loadDependencies(version, selfPage, spinnerPane, dependenciesList));

-            scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
            scrollPane.setContent(dependenciesList);
            scrollPane.setFitToWidth(true);
            scrollPane.setFitToHeight(true);
@@ -543,7 +511,7 @@ public class DownloadPage extends Control implements DecoratorPage {
                if (!spinnerPane.isLoading() && spinnerPane.getFailedReason() == null) {
                    fireEvent(new DialogCloseEvent());
                }
-                selfPage.saveAs(version);
+                selfPage.saveAs(mod, version);
            });

            JFXButton cancelButton = new JFXButton(i18n("button.cancel"));
@@ -587,7 +555,7 @@ public class DownloadPage extends Control implements DecoratorPage {
                                if (dep == RemoteMod.BROKEN) {
                                    return;
                                }
-                                DependencyModItem dependencyModItem = new DependencyModItem(selfPage.page, dep, selfPage.version);
+                                DependencyModItem dependencyModItem = new DependencyModItem(selfPage.page, dep, selfPage.version, selfPage.callback);
                                dependencies.get(dependency.getType()).add(dependencyModItem);
                            })
                            .setSignificance(Task.TaskSignificance.MINOR));
@@ -34,10 +34,7 @@ import javafx.scene.control.Skin;
 import javafx.scene.control.SkinBase;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Priority;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
+import javafx.scene.layout.*;
 import javafx.util.Duration;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
@@ -244,8 +241,6 @@ public class GameListPage extends DecoratorAnimatedPage implements DecoratorPage

                    toolbarPane.setContent(toolbarNormal, ContainerAnimations.FADE);

-                    FXUtils.setOverflowHidden(toolbarPane, 8);
-
                    root.getContent().add(toolbarPane);
                }

@@ -31,6 +31,7 @@ import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.game.Version;
@@ -52,10 +53,7 @@ public final class GameListPopupMenu extends StackPane {
                            double initOffsetX, double initOffsetY,
                            Profile profile, List<Version> versions) {
        GameListPopupMenu menu = new GameListPopupMenu();
-        menu.getItems().setAll(versions.stream()
-                .filter(it -> profile.getRepository().hasVersion(it.getId()))
-                .map(it -> new GameItem(profile, it.getId()))
-                .toList());
+        menu.getItems().setAll(versions.stream().map(it -> new GameItem(profile, it.getId())).toList());
        JFXPopup popup = new JFXPopup(menu);
        popup.show(owner, vAlign, hAlign, initOffsetX, initOffsetY);
    }
@@ -68,11 +66,10 @@ public final class GameListPopupMenu extends StackPane {
        this.getStyleClass().add("popup-menu-content");

        listView.setCellFactory(Cell::new);
-
-        listView.setFixedCellSize(50);
+        listView.setFixedCellSize(60);
        listView.setPrefWidth(300);

-        listView.prefHeightProperty().bind(Bindings.size(getItems()).multiply(50).add(2));
+        listView.prefHeightProperty().bind(Bindings.size(getItems()).multiply(60).add(2));

        Label placeholder = new Label(i18n("version.empty"));
        placeholder.setStyle("-fx-padding: 10px; -fx-text-fill: -monet-on-surface-variant; -fx-font-style: italic;");
@@ -97,34 +94,35 @@ public final class GameListPopupMenu extends StackPane {

        public Cell(ListView<GameItem> listView) {
            this.setPadding(Insets.EMPTY);
+            HBox root = new HBox();
+
+            root.setSpacing(8);
+            root.setAlignment(Pos.CENTER_LEFT);
+
+            StackPane imageViewContainer = new StackPane();
+            FXUtils.setLimitWidth(imageViewContainer, 32);
+            FXUtils.setLimitHeight(imageViewContainer, 32);

            this.imageView = new ImageContainer(32);
-            this.imageView.setMouseTransparent(true);
-            BorderPane.setAlignment(imageView, Pos.CENTER);
+            imageViewContainer.getChildren().setAll(imageView);

            this.content = new TwoLineListItem();
-            this.content.setMouseTransparent(true);
            FXUtils.onChangeAndOperate(tag, tag -> {
                content.getTags().clear();
                if (StringUtils.isNotBlank(tag)) {
                    content.addTag(tag);
                }
            });
+            BorderPane.setAlignment(content, Pos.CENTER);
+            root.getChildren().setAll(imageView, content);

-            BorderPane container = new BorderPane();
-            container.getStyleClass().add("container");
-            container.setPickOnBounds(false);
-            container.setLeft(imageView);
-            container.setCenter(content);
+            StackPane pane = new StackPane();
+            pane.getChildren().setAll(root);
+            pane.getStyleClass().add("menu-container");
+            root.setMouseTransparent(true);

-            RipplerContainer ripplerContainer = new RipplerContainer(container);
-
-            StackPane rootPane = new StackPane();
-            rootPane.getStyleClass().add("advanced-list-item");
-            rootPane.getChildren().setAll(ripplerContainer);
-            rootPane.maxWidthProperty().bind(listView.widthProperty().subtract(5));
-
-            FXUtils.onClicked(rootPane, () -> {
+            RipplerContainer ripplerContainer = new RipplerContainer(pane);
+            FXUtils.onClicked(ripplerContainer, () -> {
                GameItem item = getItem();
                if (item != null) {
                    item.getProfile().setSelectedVersion(item.getId());
@@ -132,8 +130,8 @@ public final class GameListPopupMenu extends StackPane {
                        popup.hide();
                }
            });
-
-            this.graphic = rootPane;
+            this.graphic = ripplerContainer;
+            ripplerContainer.maxWidthProperty().bind(listView.widthProperty().subtract(5));
        }

        @Override
@@ -19,14 +19,12 @@ package org.jackhuang.hmcl.ui.versions;

 import org.jackhuang.hmcl.game.LocalizedRemoteModRepository;
 import org.jackhuang.hmcl.mod.RemoteModRepository;
-import org.jackhuang.hmcl.mod.curse.CurseAddon;
 import org.jackhuang.hmcl.mod.curse.CurseForgeRemoteModRepository;
 import org.jackhuang.hmcl.mod.modrinth.ModrinthRemoteModRepository;
 import org.jackhuang.hmcl.util.i18n.I18n;

 import java.util.MissingResourceException;

-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;

@@ -51,14 +49,6 @@ public final class HMCLLocalizedDownloadListPage extends DownloadListPage {
        return new HMCLLocalizedDownloadListPage(callback, versionSelection, RemoteModRepository.Type.RESOURCE_PACK, CurseForgeRemoteModRepository.RESOURCE_PACKS, ModrinthRemoteModRepository.RESOURCE_PACKS);
    }

-    public static DownloadListPage ofCurseForgeResourcePack(DownloadPage.DownloadCallback callback, boolean versionSelection) {
-        return new HMCLLocalizedDownloadListPage(callback, versionSelection, RemoteModRepository.Type.RESOURCE_PACK, CurseForgeRemoteModRepository.RESOURCE_PACKS, null);
-    }
-
-    public static DownloadListPage ofModrinthResourcePack(DownloadPage.DownloadCallback callback, boolean versionSelection) {
-        return new HMCLLocalizedDownloadListPage(callback, versionSelection, RemoteModRepository.Type.RESOURCE_PACK, null, ModrinthRemoteModRepository.RESOURCE_PACKS);
-    }
-
    public static DownloadListPage ofShaderPack(DownloadPage.DownloadCallback callback, boolean versionSelection) {
        var page = new HMCLLocalizedDownloadListPage(callback, versionSelection, RemoteModRepository.Type.SHADER_PACK, CurseForgeRemoteModRepository.SHADERS, ModrinthRemoteModRepository.SHADER_PACKS);
        page.supportChinese.set(false);
@@ -71,30 +61,13 @@ public final class HMCLLocalizedDownloadListPage extends DownloadListPage {
        repository = new Repository(type, curseForge, modrinth);

        supportChinese.set(true);
-
-        boolean supportedCurseForge = CurseForgeRemoteModRepository.isAvailable() && curseForge != null;
-
-        downloadSources.setAll("mods.modrinth");
-        if (supportedCurseForge) {
-            downloadSources.add("mods.curseforge");
-        }
-
-        if ("curseforge".equalsIgnoreCase(config().getDefaultAddonSource())) {
-            if (supportedCurseForge) {
-                downloadSource.set("mods.curseforge");
-            } else if (modrinth != null) {
-                downloadSource.set("mods.modrinth");
-            } else {
-                throw new AssertionError("Should not be here.");
-            }
+        downloadSources.get().setAll("mods.modrinth", "mods.curseforge");
+        if (modrinth != null) {
+            downloadSource.set("mods.modrinth");
+        } else if (curseForge != null) {
+            downloadSource.set("mods.curseforge");
        } else {
-            if (modrinth != null) {
-                downloadSource.set("mods.modrinth");
-            } else if (supportedCurseForge) {
-                downloadSource.set("mods.curseforge");
-            } else {
-                throw new AssertionError("Should not be here.");
-            }
+            throw new AssertionError("Should not be here.");
        }
    }

@@ -134,7 +107,7 @@ public final class HMCLLocalizedDownloadListPage extends DownloadListPage {
    }

    @Override
-    protected String getLocalizedCategory(String category, Object self) {
+    protected String getLocalizedCategory(String category) {
        if (category.isEmpty()) {
            return "";
        }
@@ -144,9 +117,6 @@ public final class HMCLLocalizedDownloadListPage extends DownloadListPage {
            return I18n.getResourceBundle().getString(key);
        } catch (MissingResourceException e) {
            LOG.warning("Cannot find key " + key + " in resource bundle");
-            if (self instanceof CurseAddon.Category curseCategory) {
-                return curseCategory.getName();
-            }
            return category;
        }
    }
Author	SHA1	Message	Date
Glavo	f7024a4c0f	[release/3.12] 更新文言文翻译 (#5849 ) https://github.com/HMCL-dev/HMCL/pull/5845	2026-03-24 21:44:35 +08:00
Glavo	31c7e3a60f	[release/3.12] Update default Java version to JAVA_25 (#5846 ) https://github.com/HMCL-dev/HMCL/pull/5841	2026-03-24 21:38:17 +08:00
Glavo	43cfe29eeb	[release/3.12] 修复 JFXTextField 导致 GPU 占用率异常高的问题 (#5847 ) https://github.com/HMCL-dev/HMCL/pull/5839	2026-03-24 21:37:49 +08:00
Glavo	4921804283	[release/3.12] Add Minecraft 26.1 snapshot/pre/rc versions (#5848 ) https://github.com/HMCL-dev/HMCL/pull/5833	2026-03-24 21:37:20 +08:00