Bump Shadow Plugin to 9.3.1 (#5392)

close #5387

Co-authored-by: xirren <xirren@outlook.com>

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -9,15 +9,15 @@ body:
       value: |
         提交前请确认：
 
-        * 该问题确实是 **HMCL 的错误**，而**不是 Minecraft 非正常退出**，如果你的 Minecraft 非正常退出，请前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 服务器](https://discord.gg/jVvC7HfM6U) 获取帮助。
-        * 你的启动器版本是**最新的预览版本**，可以点击 [此处](https://zkitefly.github.io/HMCL-Snapshot-Update/) 下载最新预览版本。
+        * 该问题确实是 **HMCL 的错误**，而**不是 Minecraft 非正常退出**。如果你的 Minecraft 非正常退出，请前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 服务器](https://discord.gg/jVvC7HfM6U) 获取帮助。
+        * 你的启动器版本是**最新的预览版本**。你可以从 [GitHub Actions](https://github.com/HMCL-dev/HMCL/actions/workflows/gradle.yml?query=branch%3Amain+event%3Apush) 或 [nightly.link](https://nightly.link/HMCL-dev/HMCL/workflows/gradle/main) 下载最新预览版本。
 
         如果你的问题并不属于上述两类，你可以选取另一种 Issue 类型，或者直接前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 服务器](https://discord.gg/jVvC7HfM6U) 获取帮助。
 
         Before submitting, please confirm:
 
         * The issue is indeed **a bug of HMCL**, not **Minecraft abnormal exit**. If your Minecraft exits abnormally, please go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord server](https://discord.gg/jVvC7HfM6U) for help.
-        * Your launcher is the **latest nightly build**. You can click [here](https://zkitefly.github.io/HMCL-Snapshot-Update/en) to download the latest nightly build.
+        * Your launcher is the **latest nightly build**. You can download the latest nightly build from [GitHub Actions](https://github.com/HMCL-dev/HMCL/actions/workflows/gradle.yml?query=branch%3Amain+event%3Apush) or [nightly.link](https://nightly.link/HMCL-dev/HMCL/workflows/gradle/main).
 
         If your issue does not fall into the above two categories, you can choose another type of issue or directly go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord server](https://discord.gg/jVvC7HfM6U) for help.
   - type: textarea
@@ -38,7 +38,7 @@ body:
     attributes:
       label: 启动器崩溃报告 / 启动器日志文件 | Launcher Crash Report / Launcher Log File
       description: |
-        如果你的启动器崩溃了，请将崩溃报告填入（或将文件拖入）下方。
+        如果你的启动器崩溃了，请将崩溃报告填入 (或将文件拖入) 下方。
         如果你的启动器没有崩溃，请在遇到问题后**不要退出启动器**，在启动器的 “设置 → 通用 → 调试” 一栏中点击 “导出启动器日志”，并将导出的日志拖到下方的输入栏中。
         **请注意：启动器崩溃报告或日志文件是诊断问题的重要依据，请务必上传！**
         

.github/workflows/mirror.yml

@@ -11,8 +11,9 @@ concurrency:
 jobs:
   mirror:
     strategy:
+      fail-fast: false
       matrix:
-        target:
+        include:
           - name: Gitee
             repo: gitee.com/huanghongxun/HMCL
             user: 'hmcl-sync'
@@ -21,12 +22,12 @@ jobs:
             repo: cnb.cool/HMCL-dev/HMCL
             user: 'cnb'
             token: 'CNB_SYNC_TOKEN'
-    name: Mirror to ${{ matrix.target.name }}
+    name: Mirror to ${{ matrix.name }}
     if: ${{ github.repository == 'HMCL-dev/HMCL' }}
     runs-on: ubuntu-latest
     steps:
-      - name: Mirror GitHub to ${{ matrix.target.name }}
+      - name: Mirror GitHub to ${{ matrix.name }}
         run: |
-          git clone --mirror "https://github.com/$GITHUB_REPOSITORY.git" -- repo
+          git clone --mirror "https://github.com/${{ github.repository }}.git" -- repo
           cd repo
-          git push -f --prune "https://${{ matrix.target.user }}:${{ secrets[matrix.target.token] }}@${{ matrix.target.repo }}.git" "refs/heads/*:refs/heads/*" "refs/tags/*:refs/tags/*"
+          git push -f --prune "https://${{ matrix.user }}:${{ secrets[matrix.token] }}@${{ matrix.repo }}.git" "refs/heads/*:refs/heads/*" "refs/tags/*:refs/tags/*"

HMCL/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jackhuang.hmcl.gradle.TerracottaConfigUpgradeTask
 import org.jackhuang.hmcl.gradle.ci.GitHubActionUtils
 import org.jackhuang.hmcl.gradle.ci.JenkinsUtils
 import org.jackhuang.hmcl.gradle.l10n.CheckTranslations
@@ -240,6 +241,11 @@ tasks.processResources {
         from(upsideDownTranslate.map { it.outputFile })
         from(createLocaleNamesResourceBundle.map { it.outputDirectory })
     }
+
+    inputs.property("terracotta_version", libs.versions.terracotta)
+    doLast {
+        upgradeTerracottaConfig.get().checkValid()
+    }
 }
 
 val makeExecutables by tasks.registering {
@@ -362,6 +368,26 @@ tasks.register<JavaExec>("run") {
     }
 }
 
+// terracotta
+
+val upgradeTerracottaConfig = tasks.register<TerracottaConfigUpgradeTask>("upgradeTerracottaConfig") {
+    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"
+    ))
+
+    version.set(libs.versions.terracotta)
+    downloadURL.set($$"https://github.com/burningtnt/Terracotta/releases/download/v${version}/terracotta-${version}-${classifier}-pkg.tar.gz")
+
+    templateFile.set(source)
+    outputFile.set(destination)
+}
+
 // Check Translations
 
 tasks.register<CheckTranslations>("checkTranslations") {

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

@@ -0,0 +1,129 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.jfoenix.controls;
+
+import com.jfoenix.converters.ButtonTypeConverter;
+import com.jfoenix.skins.JFXButtonSkin;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.css.CssMetaData;
+import javafx.css.SimpleStyleableObjectProperty;
+import javafx.css.Styleable;
+import javafx.css.StyleableObjectProperty;
+import javafx.css.StyleableProperty;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.Labeled;
+import javafx.scene.control.Skin;
+import javafx.scene.paint.Paint;
+
+public class JFXButton extends Button {
+    private static final String DEFAULT_STYLE_CLASS = "jfx-button";
+
+    private List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+
+    public JFXButton() {
+        this.initialize();
+    }
+
+    public JFXButton(String text) {
+        super(text);
+        this.initialize();
+    }
+
+    public JFXButton(String text, Node graphic) {
+        super(text, graphic);
+        this.initialize();
+    }
+
+    private void initialize() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+    }
+
+    protected Skin<?> createDefaultSkin() {
+        return new JFXButtonSkin(this);
+    }
+
+    private final ObjectProperty<Paint> ripplerFill = new SimpleObjectProperty<>(this, "ripplerFill", null);
+
+    public final ObjectProperty<Paint> ripplerFillProperty() {
+        return this.ripplerFill;
+    }
+
+    public final Paint getRipplerFill() {
+        return this.ripplerFillProperty().get();
+    }
+
+    public final void setRipplerFill(Paint ripplerFill) {
+        this.ripplerFillProperty().set(ripplerFill);
+    }
+
+    private final StyleableObjectProperty<ButtonType> buttonType = new SimpleStyleableObjectProperty<>(
+            JFXButton.StyleableProperties.BUTTON_TYPE, this, "buttonType", JFXButton.ButtonType.FLAT);
+
+    public ButtonType getButtonType() {
+        return this.buttonType == null ? JFXButton.ButtonType.FLAT : this.buttonType.get();
+    }
+
+    public StyleableObjectProperty<ButtonType> buttonTypeProperty() {
+        return this.buttonType;
+    }
+
+    public void setButtonType(ButtonType type) {
+        this.buttonType.set(type);
+    }
+
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        if (this.STYLEABLES == null) {
+            List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Control.getClassCssMetaData());
+            styleables.addAll(getClassCssMetaData());
+            styleables.addAll(Labeled.getClassCssMetaData());
+            this.STYLEABLES = List.copyOf(styleables);
+        }
+
+        return this.STYLEABLES;
+    }
+
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return JFXButton.StyleableProperties.CHILD_STYLEABLES;
+    }
+
+    protected void layoutChildren() {
+        super.layoutChildren();
+        this.setNeedsLayout(false);
+    }
+
+    public enum ButtonType {
+        FLAT,
+        RAISED;
+    }
+
+    private static final class StyleableProperties {
+        private static final CssMetaData<JFXButton, ButtonType> BUTTON_TYPE;
+        private static final List<CssMetaData<? extends Styleable, ?>> CHILD_STYLEABLES;
+
+        static {
+            BUTTON_TYPE = new CssMetaData<>("-jfx-button-type", ButtonTypeConverter.getInstance(), JFXButton.ButtonType.FLAT) {
+                public boolean isSettable(JFXButton control) {
+                    return control.buttonType == null || !control.buttonType.isBound();
+                }
+
+                public StyleableProperty<ButtonType> getStyleableProperty(JFXButton control) {
+                    return control.buttonTypeProperty();
+                }
+            };
+            List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Control.getClassCssMetaData());
+            Collections.addAll(styleables, BUTTON_TYPE);
+            CHILD_STYLEABLES = List.copyOf(styleables);
+        }
+    }
+}

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

@@ -0,0 +1,357 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.converters.base.NodeConverter;
+import com.jfoenix.skins.JFXComboBoxListViewSkin;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.ObservableList;
+import javafx.css.*;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.PaintConverter;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+import javafx.util.StringConverter;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static org.jackhuang.hmcl.ui.FXUtils.useJFXContextMenu;
+
+/**
+ * JFXComboBox is the material design implementation of a combobox.
+ *
+ * @author Shadi Shaheen
+ * @version 1.0
+ * @since 2016-03-09
+ */
+public class JFXComboBox<T> extends ComboBox<T> {
+
+    /**
+     * {@inheritDoc}
+     */
+    public JFXComboBox() {
+        initialize();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public JFXComboBox(ObservableList<T> items) {
+        super(items);
+        initialize();
+    }
+
+    private void initialize() {
+        getStyleClass().add(DEFAULT_STYLE_CLASS);
+        this.setCellFactory(listView -> new JFXListCell<T>() {
+            @Override
+            public void updateItem(T item, boolean empty) {
+                super.updateItem(item, empty);
+                updateDisplayText(this, item, empty);
+            }
+        });
+
+        // had to refactor the code out of the skin class to allow
+        // customization of the button cell
+        this.setButtonCell(new ListCell<T>() {
+            {
+                // fixed clearing the combo box value is causing
+                // java prompt text to be shown because the button cell is not updated
+                JFXComboBox.this.valueProperty().addListener(observable -> {
+                    if (JFXComboBox.this.getValue() == null) {
+                        updateItem(null, true);
+                    }
+                });
+            }
+
+            @Override
+            protected void updateItem(T item, boolean empty) {
+                updateDisplayText(this, item, empty);
+                this.setVisible(item != null || !empty);
+            }
+
+        });
+
+        useJFXContextMenu(editorProperty().get());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new JFXComboBoxListViewSkin<T>(this);
+    }
+
+    /**
+     * Initialize the style class to 'jfx-combo-box'.
+     * <p>
+     * This is the selector class from which CSS can be used to style
+     * this control.
+     */
+    private static final String DEFAULT_STYLE_CLASS = "jfx-combo-box";
+
+    /***************************************************************************
+     *                                                                         *
+     * Node Converter Property                                                 *
+     *                                                                         *
+     **************************************************************************/
+    /**
+     * Converts the user-typed input (when the ComboBox is
+     * {@link #editableProperty() editable}) to an object of type T, such that
+     * the input may be retrieved via the  {@link #valueProperty() value} property.
+     */
+    public ObjectProperty<NodeConverter<T>> nodeConverterProperty() {
+        return nodeConverter;
+    }
+
+    private ObjectProperty<NodeConverter<T>> nodeConverter = new SimpleObjectProperty<>(this, "nodeConverter",
+            JFXComboBox.<T>defaultNodeConverter());
+
+    public final void setNodeConverter(NodeConverter<T> value) {
+        nodeConverterProperty().set(value);
+    }
+
+    public final NodeConverter<T> getNodeConverter() {
+        return nodeConverterProperty().get();
+    }
+
+    private static <T> NodeConverter<T> defaultNodeConverter() {
+        return new NodeConverter<T>() {
+            @Override
+            public Node toNode(T object) {
+                if (object == null) {
+                    return null;
+                }
+                StackPane selectedValueContainer = new StackPane();
+                selectedValueContainer.getStyleClass().add("combo-box-selected-value-container");
+                selectedValueContainer.setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, null, null)));
+                Label selectedValueLabel = object instanceof Label ? new Label(((Label) object).getText()) : new Label(
+                        object.toString());
+                selectedValueLabel.setTextFill(Color.BLACK);
+                selectedValueContainer.getChildren().add(selectedValueLabel);
+                StackPane.setAlignment(selectedValueLabel, Pos.CENTER_LEFT);
+                StackPane.setMargin(selectedValueLabel, new Insets(0, 0, 0, 5));
+                return selectedValueContainer;
+            }
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public T fromNode(Node node) {
+                return (T) node;
+            }
+
+            @Override
+            public String toString(T object) {
+                if (object == null) {
+                    return null;
+                }
+                if (object instanceof Label) {
+                    return ((Label) object).getText();
+                }
+                return object.toString();
+            }
+        };
+    }
+
+    private boolean updateDisplayText(ListCell<T> cell, T item, boolean empty) {
+        if (empty) {
+            // create empty cell
+            if (cell == null) {
+                return true;
+            }
+            cell.setGraphic(null);
+            cell.setText(null);
+            return true;
+        } else if (item instanceof Node) {
+            Node currentNode = cell.getGraphic();
+            Node newNode = (Node) item;
+            //  create a node from the selected node of the listview
+            //  using JFXComboBox {@link #nodeConverterProperty() NodeConverter})
+            NodeConverter<T> nc = this.getNodeConverter();
+            Node node = nc == null ? null : nc.toNode(item);
+            if (currentNode == null || !currentNode.equals(newNode)) {
+                cell.setText(null);
+                cell.setGraphic(node == null ? newNode : node);
+            }
+            return node == null;
+        } else {
+            // run item through StringConverter if it isn't null
+            StringConverter<T> c = this.getConverter();
+            String s = item == null ? this.getPromptText() : (c == null ? item.toString() : c.toString(item));
+            cell.setText(s);
+            cell.setGraphic(null);
+            return s == null || s.isEmpty();
+        }
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * styleable Properties                                                    *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * set true to show a float the prompt text when focusing the field
+     */
+    private StyleableBooleanProperty labelFloat = new SimpleStyleableBooleanProperty(StyleableProperties.LABEL_FLOAT,
+            JFXComboBox.this,
+            "lableFloat",
+            false);
+
+    public final StyleableBooleanProperty labelFloatProperty() {
+        return this.labelFloat;
+    }
+
+    public final boolean isLabelFloat() {
+        return this.labelFloatProperty().get();
+    }
+
+    public final void setLabelFloat(final boolean labelFloat) {
+        this.labelFloatProperty().set(labelFloat);
+    }
+
+    /**
+     * default color used when the field is unfocused
+     */
+    private StyleableObjectProperty<Paint> unFocusColor = new SimpleStyleableObjectProperty<>(StyleableProperties.UNFOCUS_COLOR,
+            JFXComboBox.this,
+            "unFocusColor",
+            Color.rgb(77,
+                    77,
+                    77));
+
+    public Paint getUnFocusColor() {
+        return unFocusColor == null ? Color.rgb(77, 77, 77) : unFocusColor.get();
+    }
+
+    public StyleableObjectProperty<Paint> unFocusColorProperty() {
+        return this.unFocusColor;
+    }
+
+    public void setUnFocusColor(Paint color) {
+        this.unFocusColor.set(color);
+    }
+
+    /**
+     * default color used when the field is focused
+     */
+    private StyleableObjectProperty<Paint> focusColor = new SimpleStyleableObjectProperty<>(StyleableProperties.FOCUS_COLOR,
+            JFXComboBox.this,
+            "focusColor",
+            Color.valueOf("#4059A9"));
+
+    public Paint getFocusColor() {
+        return focusColor == null ? Color.valueOf("#4059A9") : focusColor.get();
+    }
+
+    public StyleableObjectProperty<Paint> focusColorProperty() {
+        return this.focusColor;
+    }
+
+    public void setFocusColor(Paint color) {
+        this.focusColor.set(color);
+    }
+
+    private final static class StyleableProperties {
+        private static final CssMetaData<JFXComboBox<?>, Paint> UNFOCUS_COLOR = new CssMetaData<JFXComboBox<?>, Paint>(
+                "-jfx-unfocus-color",
+                PaintConverter.getInstance(),
+                Color.valueOf("#A6A6A6")) {
+            @Override
+            public boolean isSettable(JFXComboBox<?> control) {
+                return control.unFocusColor == null || !control.unFocusColor.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(JFXComboBox<?> control) {
+                return control.unFocusColorProperty();
+            }
+        };
+        private static final CssMetaData<JFXComboBox<?>, Paint> FOCUS_COLOR = new CssMetaData<JFXComboBox<?>, Paint>(
+                "-jfx-focus-color",
+                PaintConverter.getInstance(),
+                Color.valueOf("#3f51b5")) {
+            @Override
+            public boolean isSettable(JFXComboBox<?> control) {
+                return control.focusColor == null || !control.focusColor.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(JFXComboBox<?> control) {
+                return control.focusColorProperty();
+            }
+        };
+        private static final CssMetaData<JFXComboBox<?>, Boolean> LABEL_FLOAT = new CssMetaData<JFXComboBox<?>, Boolean>(
+                "-jfx-label-float",
+                BooleanConverter.getInstance(),
+                false) {
+            @Override
+            public boolean isSettable(JFXComboBox<?> control) {
+                return control.labelFloat == null || !control.labelFloat.isBound();
+            }
+
+            @Override
+            public StyleableBooleanProperty getStyleableProperty(JFXComboBox<?> control) {
+                return control.labelFloatProperty();
+            }
+        };
+
+
+        private static final List<CssMetaData<? extends Styleable, ?>> CHILD_STYLEABLES;
+
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(
+                    Control.getClassCssMetaData());
+            Collections.addAll(styleables, UNFOCUS_COLOR, FOCUS_COLOR, LABEL_FLOAT);
+            CHILD_STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+    }
+
+    // inherit the styleable properties from parent
+    private List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        if (STYLEABLES == null) {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(
+                    Control.getClassCssMetaData());
+            styleables.addAll(getClassCssMetaData());
+            styleables.addAll(Control.getClassCssMetaData());
+            STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+        return STYLEABLES;
+    }
+
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.CHILD_STYLEABLES;
+    }
+}
+

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

@@ -0,0 +1,297 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.skins.JFXPasswordFieldSkin;
+import com.jfoenix.validation.base.ValidatorBase;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.css.*;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.PaintConverter;
+import javafx.scene.control.Control;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.Skin;
+import javafx.scene.control.TextField;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+import static org.jackhuang.hmcl.ui.FXUtils.useJFXContextMenu;
+
+/**
+ * JFXPasswordField is the material design implementation of a password Field.
+ *
+ * @author Shadi Shaheen
+ * @version 1.0
+ * @since 2016-03-09
+ */
+public class JFXPasswordField extends PasswordField {
+
+    /**
+     * {@inheritDoc}
+     */
+    public JFXPasswordField() {
+        initialize();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new JFXPasswordFieldSkin(this);
+    }
+
+    private void initialize() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+        if ("dalvik".equals(System.getProperty("java.vm.name").toLowerCase(Locale.ROOT))) {
+            this.setStyle("-fx-skin: \"com.jfoenix.android.skins.JFXPasswordFieldSkinAndroid\";");
+        }
+
+
+        useJFXContextMenu(this);
+    }
+
+    /**
+     * Initialize the style class to 'jfx-password-field'.
+     * <p>
+     * This is the selector class from which CSS can be used to style
+     * this control.
+     */
+    private static final String DEFAULT_STYLE_CLASS = "jfx-password-field";
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * holds the current active validator on the password field in case of validation error
+     */
+    private ReadOnlyObjectWrapper<ValidatorBase> activeValidator = new ReadOnlyObjectWrapper<>();
+
+    public ValidatorBase getActiveValidator() {
+        return activeValidator == null ? null : activeValidator.get();
+    }
+
+    public ReadOnlyObjectProperty<ValidatorBase> activeValidatorProperty() {
+        return this.activeValidator.getReadOnlyProperty();
+    }
+
+    /**
+     * list of validators that will validate the password value upon calling
+     * {{@link #validate()}
+     */
+    private ObservableList<ValidatorBase> validators = FXCollections.observableArrayList();
+
+    public ObservableList<ValidatorBase> getValidators() {
+        return validators;
+    }
+
+    public void setValidators(ValidatorBase... validators) {
+        this.validators.addAll(validators);
+    }
+
+    /**
+     * validates the password value using the list of validators provided by the user
+     * {{@link #setValidators(ValidatorBase...)}
+     *
+     * @return true if the value is valid else false
+     */
+    public boolean validate() {
+        for (ValidatorBase validator : validators) {
+            if (validator.getSrcControl() == null) {
+                validator.setSrcControl(this);
+            }
+            validator.validate();
+            if (validator.getHasErrors()) {
+                activeValidator.set(validator);
+                return false;
+            }
+        }
+        activeValidator.set(null);
+        return true;
+    }
+
+    public void resetValidation() {
+        pseudoClassStateChanged(ValidatorBase.PSEUDO_CLASS_ERROR, false);
+        activeValidator.set(null);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * styleable Properties                                                    *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * set true to show a float the prompt text when focusing the field
+     */
+    private StyleableBooleanProperty labelFloat = new SimpleStyleableBooleanProperty(StyleableProperties.LABEL_FLOAT, JFXPasswordField.this, "lableFloat", false);
+
+    public final StyleableBooleanProperty labelFloatProperty() {
+        return this.labelFloat;
+    }
+
+    public final boolean isLabelFloat() {
+        return this.labelFloatProperty().get();
+    }
+
+    public final void setLabelFloat(final boolean labelFloat) {
+        this.labelFloatProperty().set(labelFloat);
+    }
+
+    /**
+     * default color used when the field is unfocused
+     */
+    private StyleableObjectProperty<Paint> unFocusColor = new SimpleStyleableObjectProperty<>(StyleableProperties.UNFOCUS_COLOR, JFXPasswordField.this, "unFocusColor", Color.rgb(77, 77, 77));
+
+    public Paint getUnFocusColor() {
+        return unFocusColor == null ? Color.rgb(77, 77, 77) : unFocusColor.get();
+    }
+
+    public StyleableObjectProperty<Paint> unFocusColorProperty() {
+        return this.unFocusColor;
+    }
+
+    public void setUnFocusColor(Paint color) {
+        this.unFocusColor.set(color);
+    }
+
+    /**
+     * default color used when the field is focused
+     */
+    private StyleableObjectProperty<Paint> focusColor = new SimpleStyleableObjectProperty<>(StyleableProperties.FOCUS_COLOR, JFXPasswordField.this, "focusColor", Color.valueOf("#4059A9"));
+
+    public Paint getFocusColor() {
+        return focusColor == null ? Color.valueOf("#4059A9") : focusColor.get();
+    }
+
+    public StyleableObjectProperty<Paint> focusColorProperty() {
+        return this.focusColor;
+    }
+
+    public void setFocusColor(Paint color) {
+        this.focusColor.set(color);
+    }
+
+    /**
+     * disable animation on validation
+     */
+    private StyleableBooleanProperty disableAnimation = new SimpleStyleableBooleanProperty(StyleableProperties.DISABLE_ANIMATION, JFXPasswordField.this, "disableAnimation", false);
+
+    public final StyleableBooleanProperty disableAnimationProperty() {
+        return this.disableAnimation;
+    }
+
+    public final Boolean isDisableAnimation() {
+        return disableAnimation != null && this.disableAnimationProperty().get();
+    }
+
+    public final void setDisableAnimation(final Boolean disabled) {
+        this.disableAnimationProperty().set(disabled);
+    }
+
+    private final static class StyleableProperties {
+        private static final CssMetaData<JFXPasswordField, Paint> UNFOCUS_COLOR = new CssMetaData<JFXPasswordField, Paint>("-jfx-unfocus-color", PaintConverter.getInstance(), Color.valueOf("#A6A6A6")) {
+            @Override
+            public boolean isSettable(JFXPasswordField control) {
+                return control.unFocusColor == null || !control.unFocusColor.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(JFXPasswordField control) {
+                return control.unFocusColorProperty();
+            }
+        };
+        private static final CssMetaData<JFXPasswordField, Paint> FOCUS_COLOR = new CssMetaData<JFXPasswordField, Paint>("-jfx-focus-color", PaintConverter.getInstance(), Color.valueOf("#3f51b5")) {
+            @Override
+            public boolean isSettable(JFXPasswordField control) {
+                return control.focusColor == null || !control.focusColor.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(JFXPasswordField control) {
+                return control.focusColorProperty();
+            }
+        };
+
+        private static final CssMetaData<JFXPasswordField, Boolean> LABEL_FLOAT = new CssMetaData<JFXPasswordField, Boolean>("-jfx-label-float", BooleanConverter.getInstance(), false) {
+            @Override
+            public boolean isSettable(JFXPasswordField control) {
+                return control.labelFloat == null || !control.labelFloat.isBound();
+            }
+
+            @Override
+            public StyleableBooleanProperty getStyleableProperty(JFXPasswordField control) {
+                return control.labelFloatProperty();
+            }
+        };
+
+        private static final CssMetaData<JFXPasswordField, Boolean> DISABLE_ANIMATION = new CssMetaData<JFXPasswordField, Boolean>("-fx-disable-animation", BooleanConverter.getInstance(), false) {
+            @Override
+            public boolean isSettable(JFXPasswordField control) {
+                return control.disableAnimation == null || !control.disableAnimation.isBound();
+            }
+
+            @Override
+            public StyleableBooleanProperty getStyleableProperty(JFXPasswordField control) {
+                return control.disableAnimationProperty();
+            }
+        };
+
+
+        private static final List<CssMetaData<? extends Styleable, ?>> CHILD_STYLEABLES;
+
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Control.getClassCssMetaData());
+            Collections.addAll(styleables, UNFOCUS_COLOR, FOCUS_COLOR, LABEL_FLOAT, DISABLE_ANIMATION);
+            CHILD_STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+    }
+
+    // inherit the styleable properties from parent
+    private List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        if (STYLEABLES == null) {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Control.getClassCssMetaData());
+            styleables.addAll(getClassCssMetaData());
+            styleables.addAll(TextField.getClassCssMetaData());
+            STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+        return STYLEABLES;
+    }
+
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.CHILD_STYLEABLES;
+    }
+
+}
+

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

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

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

@@ -34,6 +34,7 @@ import javafx.geometry.Bounds;
 import javafx.scene.CacheHint;
 import javafx.scene.Group;
 import javafx.scene.Node;
+import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.Region;
@@ -77,14 +78,13 @@ public class JFXRippler extends StackPane {
     protected Node control;
 
     protected static final double RIPPLE_MAX_RADIUS = 300;
-
-    private boolean enabled = true;
-    private boolean forceOverlay = false;
-    private final Interpolator rippleInterpolator = Interpolator.SPLINE(0.0825,
+    private static final Interpolator RIPPLE_INTERPOLATOR = Interpolator.SPLINE(0.0825,
             0.3025,
             0.0875,
             0.9975); //0.1, 0.54, 0.28, 0.95);
 
+    private boolean forceOverlay = false;
+
     /// creates empty rippler node
     public JFXRippler() {
         this(null, RipplerMask.RECT, RipplerPos.FRONT);
@@ -176,10 +176,6 @@ public class JFXRippler extends StackPane {
         return control;
     }
 
-    public void setEnabled(boolean enable) {
-        this.enabled = enable;
-    }
-
     // methods that can be changed by extending the rippler class
 
     /// generate the clipping mask
@@ -255,10 +251,15 @@ public class JFXRippler extends StackPane {
         if (getChildren().contains(control)) {
             control.boundsInParentProperty().addListener(observable -> resetRippler());
         }
-        control.addEventHandler(MouseEvent.MOUSE_PRESSED,
-                (event) -> createRipple(event.getX(), event.getY()));
+        control.addEventHandler(MouseEvent.MOUSE_PRESSED, event -> {
+            if (event.getButton() == MouseButton.PRIMARY)
+                createRipple(event.getX(), event.getY());
+        });
         // create fade out transition for the ripple
-        control.addEventHandler(MouseEvent.MOUSE_RELEASED, e -> releaseRipple());
+        control.addEventHandler(MouseEvent.MOUSE_RELEASED, event -> {
+            if (event.getButton() == MouseButton.PRIMARY)
+                releaseRipple();
+        });
     }
 
     /**
@@ -363,25 +364,23 @@ public class JFXRippler extends StackPane {
         }
 
         void createRipple() {
-            if (enabled) {
-                if (!generating.getAndSet(true)) {
-                    // create overlay once then change its color later
-                    createOverlay();
-                    if (this.getClip() == null || (getChildren().size() == 1 && !cacheRipplerClip) || resetClip) {
-                        this.setClip(getMask());
-                    }
-                    this.resetClip = false;
-
-                    // create the ripple effect
-                    final Ripple ripple = new Ripple(generatorCenterX, generatorCenterY);
-                    getChildren().add(ripple);
-                    ripplesQueue.add(ripple);
-
-                    // animate the ripple
-                    overlayRect.outAnimation.stop();
-                    overlayRect.inAnimation.play();
-                    ripple.inAnimation.play();
+            if (!generating.getAndSet(true)) {
+                // create overlay once then change its color later
+                createOverlay();
+                if (this.getClip() == null || (getChildren().size() == 1 && !cacheRipplerClip) || resetClip) {
+                    this.setClip(getMask());
                 }
+                this.resetClip = false;
+
+                // create the ripple effect
+                final Ripple ripple = new Ripple(generatorCenterX, generatorCenterY);
+                getChildren().add(ripple);
+                ripplesQueue.add(ripple);
+
+                // animate the ripple
+                overlayRect.outAnimation.stop();
+                overlayRect.inAnimation.play();
+                ripple.inAnimation.play();
             }
         }
 
@@ -415,15 +414,15 @@ public class JFXRippler extends StackPane {
                 overlayRect.setClip(getMask());
                 getChildren().add(0, overlayRect);
                 overlayRect.fillProperty().bind(Bindings.createObjectBinding(() -> {
-                    if (ripplerFill.get() instanceof Color) {
-                        return new Color(((Color) ripplerFill.get()).getRed(),
-                                ((Color) ripplerFill.get()).getGreen(),
-                                ((Color) ripplerFill.get()).getBlue(),
+                    if (getRipplerFill() instanceof Color fill) {
+                        return new Color(fill.getRed(),
+                                fill.getGreen(),
+                                fill.getBlue(),
                                 0.2);
                     } else {
                         return Color.TRANSPARENT;
                     }
-                }, ripplerFill));
+                }, ripplerFillProperty()));
             }
         }
 
@@ -473,8 +472,8 @@ public class JFXRippler extends StackPane {
             private Ripple(double centerX, double centerY) {
                 super(centerX,
                         centerY,
-                        ripplerRadius.get().doubleValue() == Region.USE_COMPUTED_SIZE ?
-                                computeRippleRadius() : ripplerRadius.get().doubleValue(), null);
+                        getRipplerRadius() == Region.USE_COMPUTED_SIZE ?
+                                computeRippleRadius() : getRipplerRadius(), null);
                 setCache(true);
                 setCacheHint(CacheHint.SPEED);
                 setCacheShape(true);
@@ -484,12 +483,12 @@ public class JFXRippler extends StackPane {
                 KeyValue[] inKeyValues = new KeyValue[isRipplerRecenter() ? 4 : 2];
                 outKeyValues = new KeyValue[isRipplerRecenter() ? 5 : 3];
 
-                inKeyValues[0] = new KeyValue(scaleXProperty(), 0.9, rippleInterpolator);
-                inKeyValues[1] = new KeyValue(scaleYProperty(), 0.9, rippleInterpolator);
+                inKeyValues[0] = new KeyValue(scaleXProperty(), 0.9, RIPPLE_INTERPOLATOR);
+                inKeyValues[1] = new KeyValue(scaleYProperty(), 0.9, RIPPLE_INTERPOLATOR);
 
-                outKeyValues[0] = new KeyValue(this.scaleXProperty(), 1, rippleInterpolator);
-                outKeyValues[1] = new KeyValue(this.scaleYProperty(), 1, rippleInterpolator);
-                outKeyValues[2] = new KeyValue(this.opacityProperty(), 0, rippleInterpolator);
+                outKeyValues[0] = new KeyValue(this.scaleXProperty(), 1, RIPPLE_INTERPOLATOR);
+                outKeyValues[1] = new KeyValue(this.scaleYProperty(), 1, RIPPLE_INTERPOLATOR);
+                outKeyValues[2] = new KeyValue(this.opacityProperty(), 0, RIPPLE_INTERPOLATOR);
 
                 if (isRipplerRecenter()) {
                     double dx = (control.getLayoutBounds().getWidth() / 2 - centerX) / 1.55;
@@ -497,42 +496,42 @@ public class JFXRippler extends StackPane {
                     inKeyValues[2] = outKeyValues[3] = new KeyValue(translateXProperty(),
                             Math.signum(dx) * Math.min(Math.abs(dx),
                                     this.getRadius() / 2),
-                            rippleInterpolator);
+                            RIPPLE_INTERPOLATOR);
                     inKeyValues[3] = outKeyValues[4] = new KeyValue(translateYProperty(),
                             Math.signum(dy) * Math.min(Math.abs(dy),
                                     this.getRadius() / 2),
-                            rippleInterpolator);
+                            RIPPLE_INTERPOLATOR);
                 }
                 inAnimation = new Timeline(new KeyFrame(Duration.ZERO,
                         new KeyValue(scaleXProperty(),
                                 0,
-                                rippleInterpolator),
+                                RIPPLE_INTERPOLATOR),
                         new KeyValue(scaleYProperty(),
                                 0,
-                                rippleInterpolator),
+                                RIPPLE_INTERPOLATOR),
                         new KeyValue(translateXProperty(),
                                 0,
-                                rippleInterpolator),
+                                RIPPLE_INTERPOLATOR),
                         new KeyValue(translateYProperty(),
                                 0,
-                                rippleInterpolator),
+                                RIPPLE_INTERPOLATOR),
                         new KeyValue(opacityProperty(),
                                 1,
-                                rippleInterpolator)
+                                RIPPLE_INTERPOLATOR)
                 ), new KeyFrame(Duration.millis(900), inKeyValues));
 
                 setScaleX(0);
                 setScaleY(0);
-                if (ripplerFill.get() instanceof Color) {
-                    Color circleColor = new Color(((Color) ripplerFill.get()).getRed(),
-                            ((Color) ripplerFill.get()).getGreen(),
-                            ((Color) ripplerFill.get()).getBlue(),
+                if (getRipplerFill() instanceof Color fill) {
+                    Color circleColor = new Color(fill.getRed(),
+                            fill.getGreen(),
+                            fill.getBlue(),
                             0.3);
                     setStroke(circleColor);
                     setFill(circleColor);
                 } else {
-                    setStroke(ripplerFill.get());
-                    setFill(ripplerFill.get());
+                    setStroke(getRipplerFill());
+                    setFill(getRipplerFill());
                 }
             }
         }
@@ -585,110 +584,125 @@ public class JFXRippler extends StackPane {
      * the ripple recenter property, by default it's false.
      * if true the ripple effect will show gravitational pull to the center of its control
      */
-    private final StyleableObjectProperty<Boolean> ripplerRecenter = new SimpleStyleableObjectProperty<>(
-            StyleableProperties.RIPPLER_RECENTER,
-            JFXRippler.this,
-            "ripplerRecenter",
-            false);
+    private StyleableBooleanProperty ripplerRecenter;
 
-    public Boolean isRipplerRecenter() {
+    public boolean isRipplerRecenter() {
         return ripplerRecenter != null && ripplerRecenter.get();
     }
 
-    public StyleableObjectProperty<Boolean> ripplerRecenterProperty() {
+    public StyleableBooleanProperty ripplerRecenterProperty() {
+        if (this.ripplerRecenter == null) {
+            this.ripplerRecenter = new SimpleStyleableBooleanProperty(
+                    StyleableProperties.RIPPLER_RECENTER,
+                    JFXRippler.this,
+                    "ripplerRecenter",
+                    false);
+        }
         return this.ripplerRecenter;
     }
 
-    public void setRipplerRecenter(Boolean radius) {
-        this.ripplerRecenter.set(radius);
+    public void setRipplerRecenter(boolean recenter) {
+        ripplerRecenterProperty().set(recenter);
     }
 
     /**
      * the ripple radius size, by default it will be automatically computed.
      */
-    private final StyleableObjectProperty<Number> ripplerRadius = new SimpleStyleableObjectProperty<>(
-            StyleableProperties.RIPPLER_RADIUS,
-            JFXRippler.this,
-            "ripplerRadius",
-            Region.USE_COMPUTED_SIZE);
+    private StyleableDoubleProperty ripplerRadius;
 
-    public Number getRipplerRadius() {
+    public double getRipplerRadius() {
         return ripplerRadius == null ? Region.USE_COMPUTED_SIZE : ripplerRadius.get();
     }
 
-    public StyleableObjectProperty<Number> ripplerRadiusProperty() {
+    public StyleableDoubleProperty ripplerRadiusProperty() {
+        if (this.ripplerRadius == null) {
+            this.ripplerRadius = new SimpleStyleableDoubleProperty(
+                    StyleableProperties.RIPPLER_RADIUS,
+                    JFXRippler.this,
+                    "ripplerRadius",
+                    Region.USE_COMPUTED_SIZE);
+        }
         return this.ripplerRadius;
     }
 
-    public void setRipplerRadius(Number radius) {
-        this.ripplerRadius.set(radius);
+    public void setRipplerRadius(double radius) {
+        ripplerRadiusProperty().set(radius);
     }
 
+    private static final Color DEFAULT_RIPPLER_FILL = Color.rgb(0, 200, 255);
+
     /**
      * the default color of the ripple effect
      */
-    private final StyleableObjectProperty<Paint> ripplerFill = new SimpleStyleableObjectProperty<>(StyleableProperties.RIPPLER_FILL,
-            JFXRippler.this,
-            "ripplerFill",
-            Color.rgb(0,
-                    200,
-                    255));
+    private StyleableObjectProperty<Paint> ripplerFill;
 
     public Paint getRipplerFill() {
-        return ripplerFill == null ? Color.rgb(0, 200, 255) : ripplerFill.get();
+        return ripplerFill == null ? DEFAULT_RIPPLER_FILL : ripplerFill.get();
     }
 
     public StyleableObjectProperty<Paint> ripplerFillProperty() {
+        if (this.ripplerFill == null) {
+            this.ripplerFill = new SimpleStyleableObjectProperty<>(StyleableProperties.RIPPLER_FILL,
+                    JFXRippler.this,
+                    "ripplerFill",
+                    DEFAULT_RIPPLER_FILL);
+        }
         return this.ripplerFill;
     }
 
     public void setRipplerFill(Paint color) {
-        this.ripplerFill.set(color);
+        ripplerFillProperty().set(color);
     }
 
     /// mask property used for clipping the rippler.
     /// can be either CIRCLE/RECT
-    private final StyleableObjectProperty<RipplerMask> maskType = new SimpleStyleableObjectProperty<>(
-            StyleableProperties.MASK_TYPE,
-            JFXRippler.this,
-            "maskType",
-            RipplerMask.RECT);
+    private StyleableObjectProperty<RipplerMask> maskType;
 
     public RipplerMask getMaskType() {
         return maskType == null ? RipplerMask.RECT : maskType.get();
     }
 
     public StyleableObjectProperty<RipplerMask> maskTypeProperty() {
+        if (this.maskType == null) {
+            this.maskType = new SimpleStyleableObjectProperty<>(
+                    StyleableProperties.MASK_TYPE,
+                    JFXRippler.this,
+                    "maskType",
+                    RipplerMask.RECT);
+        }
         return this.maskType;
     }
 
     public void setMaskType(RipplerMask type) {
-        this.maskType.set(type);
+        if (this.maskType != null || type != RipplerMask.RECT)
+            maskTypeProperty().set(type);
     }
 
     /**
      * the ripple disable, by default it's false.
      * if true the ripple effect will be hidden
      */
-    private final StyleableBooleanProperty ripplerDisabled = new SimpleStyleableBooleanProperty(
-            StyleableProperties.RIPPLER_DISABLED,
-            JFXRippler.this,
-            "ripplerDisabled",
-            false);
+    private StyleableBooleanProperty ripplerDisabled;
 
-    public Boolean isRipplerDisabled() {
+    public boolean isRipplerDisabled() {
         return ripplerDisabled != null && ripplerDisabled.get();
     }
 
     public StyleableBooleanProperty ripplerDisabledProperty() {
+        if (this.ripplerDisabled == null) {
+            this.ripplerDisabled = new SimpleStyleableBooleanProperty(
+                    StyleableProperties.RIPPLER_DISABLED,
+                    JFXRippler.this,
+                    "ripplerDisabled",
+                    false);
+        }
         return this.ripplerDisabled;
     }
 
-    public void setRipplerDisabled(Boolean disabled) {
-        this.ripplerDisabled.set(disabled);
+    public void setRipplerDisabled(boolean disabled) {
+        ripplerDisabledProperty().set(disabled);
     }
 
-
     /**
      * indicates whether the ripple effect is infront of or behind the node
      */
@@ -735,7 +749,7 @@ public class JFXRippler extends StackPane {
                 };
         private static final CssMetaData<JFXRippler, Paint> RIPPLER_FILL =
                 new CssMetaData<>("-jfx-rippler-fill",
-                        PaintConverter.getInstance(), Color.rgb(0, 200, 255)) {
+                        PaintConverter.getInstance(), DEFAULT_RIPPLER_FILL) {
                     @Override
                     public boolean isSettable(JFXRippler control) {
                         return control.ripplerFill == null || !control.ripplerFill.isBound();

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

@@ -0,0 +1,297 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.skins.JFXTextAreaSkin;
+import com.jfoenix.validation.base.ValidatorBase;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.css.*;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.PaintConverter;
+import javafx.scene.control.Control;
+import javafx.scene.control.Skin;
+import javafx.scene.control.TextArea;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static org.jackhuang.hmcl.ui.FXUtils.useJFXContextMenu;
+
+/**
+ * JFXTextArea is the material design implementation of a text area.
+ *
+ * @author Shadi Shaheen
+ * @version 1.0
+ * @since 2016-03-09
+ */
+public class JFXTextArea extends TextArea {
+    /**
+     * Initialize the style class to 'jfx-text-field'.
+     * <p>
+     * This is the selector class from which CSS can be used to style
+     * this control.
+     */
+    private static final String DEFAULT_STYLE_CLASS = "jfx-text-area";
+
+    /**
+     * {@inheritDoc}
+     */
+    public JFXTextArea() {
+        initialize();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public JFXTextArea(String text) {
+        super(text);
+        initialize();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new JFXTextAreaSkin(this);
+    }
+
+    private void initialize() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+        if ("dalvik".equalsIgnoreCase(System.getProperty("java.vm.name"))) {
+            this.setStyle("-fx-skin: \"com.jfoenix.android.skins.JFXTextAreaSkinAndroid\";");
+        }
+
+        useJFXContextMenu(this);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * holds the current active validator on the text area in case of validation error
+     */
+    private ReadOnlyObjectWrapper<ValidatorBase> activeValidator = new ReadOnlyObjectWrapper<>();
+
+    public ValidatorBase getActiveValidator() {
+        return activeValidator == null ? null : activeValidator.get();
+    }
+
+    public ReadOnlyObjectProperty<ValidatorBase> activeValidatorProperty() {
+        return this.activeValidator.getReadOnlyProperty();
+    }
+
+    /**
+     * list of validators that will validate the text value upon calling
+     * {{@link #validate()}
+     */
+    private ObservableList<ValidatorBase> validators = FXCollections.observableArrayList();
+
+    public ObservableList<ValidatorBase> getValidators() {
+        return validators;
+    }
+
+    public void setValidators(ValidatorBase... validators) {
+        this.validators.addAll(validators);
+    }
+
+    /**
+     * validates the text value using the list of validators provided by the user
+     * {{@link #setValidators(ValidatorBase...)}
+     *
+     * @return true if the value is valid else false
+     */
+    public boolean validate() {
+        for (ValidatorBase validator : validators) {
+            if (validator.getSrcControl() == null) {
+                validator.setSrcControl(this);
+            }
+            validator.validate();
+            if (validator.getHasErrors()) {
+                activeValidator.set(validator);
+                return false;
+            }
+        }
+        activeValidator.set(null);
+        return true;
+    }
+
+    public void resetValidation() {
+        pseudoClassStateChanged(ValidatorBase.PSEUDO_CLASS_ERROR, false);
+        activeValidator.set(null);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * styleable Properties                                                    *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * set true to show a float the prompt text when focusing the field
+     */
+    private StyleableBooleanProperty labelFloat = new SimpleStyleableBooleanProperty(StyleableProperties.LABEL_FLOAT, JFXTextArea.this, "lableFloat", false);
+
+    public final StyleableBooleanProperty labelFloatProperty() {
+        return this.labelFloat;
+    }
+
+    public final boolean isLabelFloat() {
+        return this.labelFloatProperty().get();
+    }
+
+    public final void setLabelFloat(final boolean labelFloat) {
+        this.labelFloatProperty().set(labelFloat);
+    }
+
+    /**
+     * default color used when the text area is unfocused
+     */
+    private StyleableObjectProperty<Paint> unFocusColor = new SimpleStyleableObjectProperty<>(StyleableProperties.UNFOCUS_COLOR, JFXTextArea.this, "unFocusColor", Color.rgb(77, 77, 77));
+
+    public Paint getUnFocusColor() {
+        return unFocusColor == null ? Color.rgb(77, 77, 77) : unFocusColor.get();
+    }
+
+    public StyleableObjectProperty<Paint> unFocusColorProperty() {
+        return this.unFocusColor;
+    }
+
+    public void setUnFocusColor(Paint color) {
+        this.unFocusColor.set(color);
+    }
+
+    /**
+     * default color used when the text area is focused
+     */
+    private StyleableObjectProperty<Paint> focusColor = new SimpleStyleableObjectProperty<>(StyleableProperties.FOCUS_COLOR, JFXTextArea.this, "focusColor", Color.valueOf("#4059A9"));
+
+    public Paint getFocusColor() {
+        return focusColor == null ? Color.valueOf("#4059A9") : focusColor.get();
+    }
+
+    public StyleableObjectProperty<Paint> focusColorProperty() {
+        return this.focusColor;
+    }
+
+    public void setFocusColor(Paint color) {
+        this.focusColor.set(color);
+    }
+
+    /**
+     * disable animation on validation
+     */
+    private StyleableBooleanProperty disableAnimation = new SimpleStyleableBooleanProperty(StyleableProperties.DISABLE_ANIMATION, JFXTextArea.this, "disableAnimation", false);
+
+    public final StyleableBooleanProperty disableAnimationProperty() {
+        return this.disableAnimation;
+    }
+
+    public final Boolean isDisableAnimation() {
+        return disableAnimation != null && this.disableAnimationProperty().get();
+    }
+
+    public final void setDisableAnimation(final Boolean disabled) {
+        this.disableAnimationProperty().set(disabled);
+    }
+
+    private final static class StyleableProperties {
+        private static final CssMetaData<JFXTextArea, Paint> UNFOCUS_COLOR = new CssMetaData<JFXTextArea, Paint>("-jfx-unfocus-color", PaintConverter.getInstance(), Color.rgb(77, 77, 77)) {
+            @Override
+            public boolean isSettable(JFXTextArea control) {
+                return control.unFocusColor == null || !control.unFocusColor.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(JFXTextArea control) {
+                return control.unFocusColorProperty();
+            }
+        };
+        private static final CssMetaData<JFXTextArea, Paint> FOCUS_COLOR = new CssMetaData<JFXTextArea, Paint>("-jfx-focus-color", PaintConverter.getInstance(), Color.valueOf("#4059A9")) {
+            @Override
+            public boolean isSettable(JFXTextArea control) {
+                return control.focusColor == null || !control.focusColor.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(JFXTextArea control) {
+                return control.focusColorProperty();
+            }
+        };
+        private static final CssMetaData<JFXTextArea, Boolean> LABEL_FLOAT = new CssMetaData<JFXTextArea, Boolean>("-jfx-label-float", BooleanConverter.getInstance(), false) {
+            @Override
+            public boolean isSettable(JFXTextArea control) {
+                return control.labelFloat == null || !control.labelFloat.isBound();
+            }
+
+            @Override
+            public StyleableBooleanProperty getStyleableProperty(JFXTextArea control) {
+                return control.labelFloatProperty();
+            }
+        };
+
+        private static final CssMetaData<JFXTextArea, Boolean> DISABLE_ANIMATION = new CssMetaData<JFXTextArea, Boolean>("-jfx-disable-animation", BooleanConverter.getInstance(), false) {
+            @Override
+            public boolean isSettable(JFXTextArea control) {
+                return control.disableAnimation == null || !control.disableAnimation.isBound();
+            }
+
+            @Override
+            public StyleableBooleanProperty getStyleableProperty(JFXTextArea control) {
+                return control.disableAnimationProperty();
+            }
+        };
+
+        private static final List<CssMetaData<? extends Styleable, ?>> CHILD_STYLEABLES;
+
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Control.getClassCssMetaData());
+            Collections.addAll(styleables, UNFOCUS_COLOR, FOCUS_COLOR, LABEL_FLOAT, DISABLE_ANIMATION);
+            CHILD_STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+    }
+
+    // inherit the styleable properties from parent
+    private List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        if (STYLEABLES == null) {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Control.getClassCssMetaData());
+            styleables.addAll(getClassCssMetaData());
+            styleables.addAll(TextArea.getClassCssMetaData());
+            STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+        return STYLEABLES;
+    }
+
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.CHILD_STYLEABLES;
+    }
+}

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

@@ -0,0 +1,299 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.skins.JFXTextFieldSkin;
+import com.jfoenix.validation.base.ValidatorBase;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.css.*;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.PaintConverter;
+import javafx.scene.control.Control;
+import javafx.scene.control.Skin;
+import javafx.scene.control.TextField;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static org.jackhuang.hmcl.ui.FXUtils.useJFXContextMenu;
+
+/**
+ * JFXTextField is the material design implementation of a text Field.
+ *
+ * @author Shadi Shaheen
+ * @version 1.0
+ * @since 2016-03-09
+ */
+public class JFXTextField extends TextField {
+    /**
+     * Initialize the style class to 'jfx-text-field'.
+     * <p>
+     * This is the selector class from which CSS can be used to style
+     * this control.
+     */
+    private static final String DEFAULT_STYLE_CLASS = "jfx-text-field";
+
+    /**
+     * {@inheritDoc}
+     */
+    public JFXTextField() {
+        initialize();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public JFXTextField(String text) {
+        super(text);
+        initialize();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new JFXTextFieldSkin(this);
+    }
+
+    private void initialize() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+        if ("dalvik".equalsIgnoreCase(System.getProperty("java.vm.name"))) {
+            this.setStyle("-fx-skin: \"com.jfoenix.android.skins.JFXTextFieldSkinAndroid\";");
+        }
+
+        useJFXContextMenu(this);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * holds the current active validator on the text field in case of validation error
+     */
+    private ReadOnlyObjectWrapper<ValidatorBase> activeValidator = new ReadOnlyObjectWrapper<>();
+
+    public ValidatorBase getActiveValidator() {
+        return activeValidator == null ? null : activeValidator.get();
+    }
+
+    public ReadOnlyObjectProperty<ValidatorBase> activeValidatorProperty() {
+        return this.activeValidator.getReadOnlyProperty();
+    }
+
+    /**
+     * list of validators that will validate the text value upon calling
+     * {{@link #validate()}
+     */
+    private ObservableList<ValidatorBase> validators = FXCollections.observableArrayList();
+
+    public ObservableList<ValidatorBase> getValidators() {
+        return validators;
+    }
+
+    public void setValidators(ValidatorBase... validators) {
+        this.validators.addAll(validators);
+    }
+
+    /**
+     * validates the text value using the list of validators provided by the user
+     * {{@link #setValidators(ValidatorBase...)}
+     *
+     * @return true if the value is valid else false
+     */
+    public boolean validate() {
+        for (ValidatorBase validator : validators) {
+            if (validator.getSrcControl() == null) {
+                validator.setSrcControl(this);
+            }
+            validator.validate();
+            if (validator.getHasErrors()) {
+                activeValidator.set(validator);
+                return false;
+            }
+        }
+        activeValidator.set(null);
+        return true;
+    }
+
+    public void resetValidation() {
+        pseudoClassStateChanged(ValidatorBase.PSEUDO_CLASS_ERROR, false);
+        activeValidator.set(null);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * styleable Properties                                                    *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * set true to show a float the prompt text when focusing the field
+     */
+    private StyleableBooleanProperty labelFloat = new SimpleStyleableBooleanProperty(StyleableProperties.LABEL_FLOAT, JFXTextField.this, "lableFloat", false);
+
+    public final StyleableBooleanProperty labelFloatProperty() {
+        return this.labelFloat;
+    }
+
+    public final boolean isLabelFloat() {
+        return this.labelFloatProperty().get();
+    }
+
+    public final void setLabelFloat(final boolean labelFloat) {
+        this.labelFloatProperty().set(labelFloat);
+    }
+
+    /**
+     * default color used when the field is unfocused
+     */
+    private StyleableObjectProperty<Paint> unFocusColor = new SimpleStyleableObjectProperty<>(StyleableProperties.UNFOCUS_COLOR, JFXTextField.this, "unFocusColor", Color.rgb(77, 77, 77));
+
+    public Paint getUnFocusColor() {
+        return unFocusColor == null ? Color.rgb(77, 77, 77) : unFocusColor.get();
+    }
+
+    public StyleableObjectProperty<Paint> unFocusColorProperty() {
+        return this.unFocusColor;
+    }
+
+    public void setUnFocusColor(Paint color) {
+        this.unFocusColor.set(color);
+    }
+
+    /**
+     * default color used when the field is focused
+     */
+    private StyleableObjectProperty<Paint> focusColor = new SimpleStyleableObjectProperty<>(StyleableProperties.FOCUS_COLOR, JFXTextField.this, "focusColor", Color.valueOf("#4059A9"));
+
+    public Paint getFocusColor() {
+        return focusColor == null ? Color.valueOf("#4059A9") : focusColor.get();
+    }
+
+    public StyleableObjectProperty<Paint> focusColorProperty() {
+        return this.focusColor;
+    }
+
+    public void setFocusColor(Paint color) {
+        this.focusColor.set(color);
+    }
+
+    /**
+     * disable animation on validation
+     */
+    private StyleableBooleanProperty disableAnimation = new SimpleStyleableBooleanProperty(StyleableProperties.DISABLE_ANIMATION, JFXTextField.this, "disableAnimation", false);
+
+    public final StyleableBooleanProperty disableAnimationProperty() {
+        return this.disableAnimation;
+    }
+
+    public final Boolean isDisableAnimation() {
+        return disableAnimation != null && this.disableAnimationProperty().get();
+    }
+
+    public final void setDisableAnimation(final Boolean disabled) {
+        this.disableAnimationProperty().set(disabled);
+    }
+
+    private final static class StyleableProperties {
+        private static final CssMetaData<JFXTextField, Paint> UNFOCUS_COLOR = new CssMetaData<JFXTextField, Paint>("-jfx-unfocus-color", PaintConverter.getInstance(), Color.valueOf("#A6A6A6")) {
+            @Override
+            public boolean isSettable(JFXTextField control) {
+                return control.unFocusColor == null || !control.unFocusColor.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(JFXTextField control) {
+                return control.unFocusColorProperty();
+            }
+        };
+        private static final CssMetaData<JFXTextField, Paint> FOCUS_COLOR = new CssMetaData<JFXTextField, Paint>("-jfx-focus-color", PaintConverter.getInstance(), Color.valueOf("#3f51b5")) {
+            @Override
+            public boolean isSettable(JFXTextField control) {
+                return control.focusColor == null || !control.focusColor.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(JFXTextField control) {
+                return control.focusColorProperty();
+            }
+        };
+        private static final CssMetaData<JFXTextField, Boolean> LABEL_FLOAT = new CssMetaData<JFXTextField, Boolean>("-jfx-label-float", BooleanConverter.getInstance(), false) {
+            @Override
+            public boolean isSettable(JFXTextField control) {
+                return control.labelFloat == null || !control.labelFloat.isBound();
+            }
+
+            @Override
+            public StyleableBooleanProperty getStyleableProperty(JFXTextField control) {
+                return control.labelFloatProperty();
+            }
+        };
+
+        private static final CssMetaData<JFXTextField, Boolean> DISABLE_ANIMATION = new CssMetaData<JFXTextField, Boolean>("-jfx-disable-animation", BooleanConverter.getInstance(), false) {
+            @Override
+            public boolean isSettable(JFXTextField control) {
+                return control.disableAnimation == null || !control.disableAnimation.isBound();
+            }
+
+            @Override
+            public StyleableBooleanProperty getStyleableProperty(JFXTextField control) {
+                return control.disableAnimationProperty();
+            }
+        };
+
+
+        private static final List<CssMetaData<? extends Styleable, ?>> CHILD_STYLEABLES;
+
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Control.getClassCssMetaData());
+            Collections.addAll(styleables, UNFOCUS_COLOR, FOCUS_COLOR, LABEL_FLOAT, DISABLE_ANIMATION);
+            CHILD_STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+    }
+
+    // inherit the styleable properties from parent
+    private List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        if (STYLEABLES == null) {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Control.getClassCssMetaData());
+            styleables.addAll(getClassCssMetaData());
+            styleables.addAll(TextField.getClassCssMetaData());
+            STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+        return STYLEABLES;
+    }
+
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.CHILD_STYLEABLES;
+    }
+}
+

HMCL/src/main/java/com/jfoenix/effects/JFXDepthManager.java

@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2016 JFoenix
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.jfoenix.effects;
+
+import javafx.scene.Node;
+import javafx.scene.effect.BlurType;
+import javafx.scene.effect.DropShadow;
+import javafx.scene.layout.Pane;
+import javafx.scene.paint.Color;
+
+/**
+ * it will create a shadow effect for a given node and a specified depth level.
+ * depth levels are {0,1,2,3,4,5}
+ *
+ * @author Shadi Shaheen
+ * @version 1.0
+ * @since 2016-03-09
+ */
+public final class JFXDepthManager {
+    private JFXDepthManager() {
+        throw new AssertionError();
+    }
+
+    private static final DropShadow[] depth = new DropShadow[] {
+            new DropShadow(BlurType.GAUSSIAN, Color.TRANSPARENT, 0, 0, 0, 0),
+            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.12), 4, 0, 0, 1),
+            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.16), 6, 0, 0, 2),
+            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.20), 10, 0, 0, 3),
+            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.24), 14, 0, 0, 4),
+            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.28), 20, 0, 0, 6)
+    };
+
+    /**
+     * this method is used to add shadow effect to the node,
+     * however the shadow is not real ( gets affected with node transformations)
+     * <p>
+     * use {@link #createMaterialNode(Node, int)} instead to generate a real shadow
+     */
+    public static void setDepth(Node control, int level) {
+        level = level < 0 ? 0 : level;
+        level = level > 5 ? 5 : level;
+        control.setEffect(new DropShadow(BlurType.GAUSSIAN,
+                depth[level].getColor(),
+                depth[level].getRadius(),
+                depth[level].getSpread(),
+                depth[level].getOffsetX(),
+                depth[level].getOffsetY()));
+    }
+
+    public static int getLevels() {
+        return depth.length;
+    }
+
+    public static DropShadow getShadowAt(int level) {
+        return depth[level];
+    }
+
+    /**
+     * this method will generate a new container node that prevent
+     * control transformation to be applied to the shadow effect
+     * (which makes it looks as a real shadow)
+     */
+    public static Node createMaterialNode(Node control, int level) {
+        Node container = new Pane(control) {
+            @Override
+            protected double computeMaxWidth(double height) {
+                return computePrefWidth(height);
+            }
+
+            @Override
+            protected double computeMaxHeight(double width) {
+                return computePrefHeight(width);
+            }
+
+            @Override
+            protected double computePrefWidth(double height) {
+                return control.prefWidth(height);
+            }
+
+            @Override
+            protected double computePrefHeight(double width) {
+                return control.prefHeight(width);
+            }
+        };
+        container.getStyleClass().add("depth-container");
+        container.setPickOnBounds(false);
+        level = level < 0 ? 0 : level;
+        level = level > 5 ? 5 : level;
+        container.setEffect(new DropShadow(BlurType.GAUSSIAN,
+                depth[level].getColor(),
+                depth[level].getRadius(),
+                depth[level].getSpread(),
+                depth[level].getOffsetX(),
+                depth[level].getOffsetY()));
+        return container;
+    }
+
+    public static void pop(Node control) {
+        control.setEffect(new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.26), 5, 0.05, 0, 1));
+    }
+
+}
+

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

@@ -0,0 +1,222 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.jfoenix.skins;
+
+import com.jfoenix.adapters.skins.ButtonSkin;
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXRippler;
+import com.jfoenix.effects.JFXDepthManager;
+import com.jfoenix.transitions.CachedTransition;
+import javafx.animation.Interpolator;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
+import javafx.animation.Transition;
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.effect.DropShadow;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.layout.CornerRadii;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Shape;
+import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.FXUtils;
+
+public class JFXButtonSkin extends ButtonSkin {
+    private final StackPane buttonContainer = new StackPane();
+    private final JFXRippler buttonRippler = new JFXRippler(new StackPane()) {
+        protected Node getMask() {
+            StackPane mask = new StackPane();
+            mask.shapeProperty().bind(JFXButtonSkin.this.buttonContainer.shapeProperty());
+            mask.backgroundProperty().bind(Bindings.createObjectBinding(() -> new Background(
+                    new BackgroundFill(Color.WHITE,
+                            JFXButtonSkin.this.buttonContainer.backgroundProperty().get() != null && !JFXButtonSkin.this.buttonContainer.getBackground().getFills().isEmpty()
+                                    ? JFXButtonSkin.this.buttonContainer.getBackground().getFills().get(0).getRadii()
+                                    : JFXButtonSkin.this.defaultRadii, JFXButtonSkin.this.buttonContainer.backgroundProperty().get() != null && !JFXButtonSkin.this.buttonContainer.getBackground().getFills().isEmpty() ? JFXButtonSkin.this.buttonContainer.getBackground().getFills().get(0).getInsets() : Insets.EMPTY)),
+                    JFXButtonSkin.this.buttonContainer.backgroundProperty()));
+            mask.resize(JFXButtonSkin.this.buttonContainer.getWidth() - JFXButtonSkin.this.buttonContainer.snappedRightInset() - JFXButtonSkin.this.buttonContainer.snappedLeftInset(), JFXButtonSkin.this.buttonContainer.getHeight() - JFXButtonSkin.this.buttonContainer.snappedBottomInset() - JFXButtonSkin.this.buttonContainer.snappedTopInset());
+            return mask;
+        }
+
+        private void initListeners() {
+            this.ripplerPane.setOnMousePressed((event) -> {
+                if (JFXButtonSkin.this.releaseManualRippler != null) {
+                    JFXButtonSkin.this.releaseManualRippler.run();
+                }
+
+                JFXButtonSkin.this.releaseManualRippler = null;
+                this.createRipple(event.getX(), event.getY());
+            });
+        }
+    };
+    private Transition clickedAnimation;
+    private final CornerRadii defaultRadii = new CornerRadii(3.0);
+    private boolean invalid = true;
+    private Runnable releaseManualRippler = null;
+
+    public JFXButtonSkin(JFXButton button) {
+        super(button);
+        this.getSkinnable().armedProperty().addListener((o, oldVal, newVal) -> {
+            if (newVal) {
+                this.releaseManualRippler = this.buttonRippler.createManualRipple();
+                if (this.clickedAnimation != null) {
+                    this.clickedAnimation.setRate(1.0);
+                    this.clickedAnimation.play();
+                }
+            } else {
+                if (this.releaseManualRippler != null) {
+                    this.releaseManualRippler.run();
+                }
+
+                if (this.clickedAnimation != null) {
+                    this.clickedAnimation.setRate(-1.0);
+                    this.clickedAnimation.play();
+                }
+            }
+
+        });
+        this.buttonContainer.getChildren().add(this.buttonRippler);
+        button.buttonTypeProperty().addListener((o, oldVal, newVal) -> this.updateButtonType(newVal));
+        button.setOnMousePressed((e) -> {
+            if (this.clickedAnimation != null) {
+                this.clickedAnimation.setRate(1.0F);
+                this.clickedAnimation.play();
+            }
+        });
+        button.setOnMouseReleased((e) -> {
+            if (this.clickedAnimation != null) {
+                this.clickedAnimation.setRate(-1.0F);
+                this.clickedAnimation.play();
+            }
+        });
+
+        ReadOnlyBooleanProperty focusVisibleProperty = FXUtils.focusVisibleProperty(button);
+        if (focusVisibleProperty == null) {
+            focusVisibleProperty = button.focusedProperty();
+        }
+        focusVisibleProperty.addListener((o, oldVal, newVal) -> {
+            if (newVal) {
+                if (!this.getSkinnable().isPressed()) {
+                    this.buttonRippler.showOverlay();
+                }
+            } else {
+                this.buttonRippler.hideOverlay();
+            }
+        });
+        button.pressedProperty().addListener((o, oldVal, newVal) -> this.buttonRippler.hideOverlay());
+        button.setPickOnBounds(false);
+        this.buttonContainer.setPickOnBounds(false);
+        this.buttonContainer.shapeProperty().bind(this.getSkinnable().shapeProperty());
+        this.buttonContainer.borderProperty().bind(this.getSkinnable().borderProperty());
+        this.buttonContainer.backgroundProperty().bind(Bindings.createObjectBinding(() -> {
+            if (button.getBackground() == null || this.isJavaDefaultBackground(button.getBackground()) || this.isJavaDefaultClickedBackground(button.getBackground())) {
+                button.setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, this.defaultRadii, null)));
+            }
+
+            try {
+                return new Background(new BackgroundFill(this.getSkinnable().getBackground() != null ? this.getSkinnable().getBackground().getFills().get(0).getFill() : Color.TRANSPARENT, this.getSkinnable().getBackground() != null ? this.getSkinnable().getBackground().getFills().get(0).getRadii() : this.defaultRadii, Insets.EMPTY));
+            } catch (Exception var3) {
+                return this.getSkinnable().getBackground();
+            }
+        }, this.getSkinnable().backgroundProperty()));
+        button.ripplerFillProperty().addListener((o, oldVal, newVal) -> this.buttonRippler.setRipplerFill(newVal));
+        if (button.getBackground() == null || this.isJavaDefaultBackground(button.getBackground())) {
+            button.setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, this.defaultRadii, null)));
+        }
+
+        this.updateButtonType(button.getButtonType());
+        this.updateChildren();
+    }
+
+    protected void updateChildren() {
+        super.updateChildren();
+        if (this.buttonContainer != null) {
+            this.getChildren().add(0, this.buttonContainer);
+        }
+
+        for (int i = 1; i < this.getChildren().size(); ++i) {
+            this.getChildren().get(i).setMouseTransparent(true);
+        }
+    }
+
+    protected void layoutChildren(double x, double y, double w, double h) {
+        if (this.invalid) {
+            if (((JFXButton) this.getSkinnable()).getRipplerFill() == null) {
+                for (int i = this.getChildren().size() - 1; i >= 1; --i) {
+                    if (this.getChildren().get(i) instanceof Shape shape) {
+                        this.buttonRippler.setRipplerFill(shape.getFill());
+                        shape.fillProperty().addListener((o, oldVal, newVal) -> this.buttonRippler.setRipplerFill(newVal));
+                        break;
+                    }
+
+                    if (this.getChildren().get(i) instanceof Label label) {
+                        this.buttonRippler.setRipplerFill(label.getTextFill());
+                        label.textFillProperty().addListener((o, oldVal, newVal) -> this.buttonRippler.setRipplerFill(newVal));
+                        break;
+                    }
+                }
+            } else {
+                this.buttonRippler.setRipplerFill(((JFXButton) this.getSkinnable()).getRipplerFill());
+            }
+
+            this.invalid = false;
+        }
+
+        double shift = 1.0F;
+        this.buttonContainer.resizeRelocate(this.getSkinnable().getLayoutBounds().getMinX() - shift, this.getSkinnable().getLayoutBounds().getMinY() - shift, this.getSkinnable().getWidth() + (double) 2.0F * shift, this.getSkinnable().getHeight() + (double) 2.0F * shift);
+        this.layoutLabelInArea(x, y, w, h);
+    }
+
+    private boolean isJavaDefaultBackground(Background background) {
+        try {
+            String firstFill = background.getFills().get(0).getFill().toString();
+            return "0xffffffba".equals(firstFill) || "0xffffffbf".equals(firstFill) || "0xffffff12".equals(firstFill) || "0xffffffbd".equals(firstFill);
+        } catch (Exception var3) {
+            return false;
+        }
+    }
+
+    private boolean isJavaDefaultClickedBackground(Background background) {
+        try {
+            return "0x039ed3ff".equals(background.getFills().get(0).getFill().toString());
+        } catch (Exception var3) {
+            return false;
+        }
+    }
+
+    private void updateButtonType(JFXButton.ButtonType type) {
+        switch (type) {
+            case RAISED -> {
+                JFXDepthManager.setDepth(this.buttonContainer, 2);
+                this.clickedAnimation = new ButtonClickTransition();
+            }
+            case FLAT -> this.buttonContainer.setEffect(null);
+        }
+    }
+
+    private class ButtonClickTransition extends CachedTransition {
+        public ButtonClickTransition() {
+            super(JFXButtonSkin.this.buttonContainer, new Timeline(
+                    new KeyFrame(Duration.ZERO,
+                            new KeyValue(((DropShadow) JFXButtonSkin.this.buttonContainer.getEffect()).radiusProperty(), JFXDepthManager.getShadowAt(2).radiusProperty().get(), Interpolator.EASE_BOTH),
+                            new KeyValue(((DropShadow) JFXButtonSkin.this.buttonContainer.getEffect()).spreadProperty(), JFXDepthManager.getShadowAt(2).spreadProperty().get(), Interpolator.EASE_BOTH),
+                            new KeyValue(((DropShadow) JFXButtonSkin.this.buttonContainer.getEffect()).offsetXProperty(), JFXDepthManager.getShadowAt(2).offsetXProperty().get(), Interpolator.EASE_BOTH),
+                            new KeyValue(((DropShadow) JFXButtonSkin.this.buttonContainer.getEffect()).offsetYProperty(), JFXDepthManager.getShadowAt(2).offsetYProperty().get(), Interpolator.EASE_BOTH)),
+                    new KeyFrame(Duration.millis(1000.0F),
+                            new KeyValue(((DropShadow) JFXButtonSkin.this.buttonContainer.getEffect()).radiusProperty(), JFXDepthManager.getShadowAt(5).radiusProperty().get(), Interpolator.EASE_BOTH),
+                            new KeyValue(((DropShadow) JFXButtonSkin.this.buttonContainer.getEffect()).spreadProperty(), JFXDepthManager.getShadowAt(5).spreadProperty().get(), Interpolator.EASE_BOTH),
+                            new KeyValue(((DropShadow) JFXButtonSkin.this.buttonContainer.getEffect()).offsetXProperty(), JFXDepthManager.getShadowAt(5).offsetXProperty().get(), Interpolator.EASE_BOTH),
+                            new KeyValue(((DropShadow) JFXButtonSkin.this.buttonContainer.getEffect()).offsetYProperty(), JFXDepthManager.getShadowAt(5).offsetYProperty().get(), Interpolator.EASE_BOTH))));
+            this.setCycleDuration(Duration.seconds(0.2));
+            this.setDelay(Duration.seconds(0.0F));
+        }
+    }
+}

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

@@ -17,6 +17,7 @@ import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
 import javafx.animation.Transition;
+import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 import javafx.geometry.VPos;
@@ -35,6 +36,7 @@ import javafx.scene.paint.Color;
 import javafx.scene.shape.SVGPath;
 import javafx.util.Duration;
 import org.jackhuang.hmcl.theme.Themes;
+import org.jackhuang.hmcl.ui.FXUtils;
 
 public class JFXCheckBoxSkin extends CheckBoxSkin {
     private final StackPane box = new StackPane();
@@ -75,7 +77,11 @@ public class JFXCheckBoxSkin extends CheckBoxSkin {
             this.updateRippleColor();
             this.playSelectAnimation(newVal);
         });
-        control.focusedProperty().addListener((o, oldVal, newVal) -> {
+
+        ReadOnlyBooleanProperty focusVisibleProperty = FXUtils.focusVisibleProperty(control);
+        if (focusVisibleProperty == null)
+            focusVisibleProperty = control.focusedProperty();
+        focusVisibleProperty.addListener((o, oldVal, newVal) -> {
             if (newVal) {
                 if (!this.getSkinnable().isPressed()) {
                     this.rippler.showOverlay();

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

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

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

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

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

@@ -12,6 +12,7 @@ import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
+import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 import javafx.geometry.VPos;
@@ -23,6 +24,7 @@ import javafx.scene.paint.Color;
 import javafx.scene.shape.Circle;
 import javafx.scene.text.Text;
 import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.animation.AnimationUtils;
 
 public class JFXRadioButtonSkin extends RadioButtonSkin {
@@ -58,7 +60,12 @@ public class JFXRadioButtonSkin extends RadioButtonSkin {
         AnchorPane.setRightAnchor(this.rippler, this.labelOffset);
 
         this.updateChildren();
-        control.focusedProperty().addListener((o, oldVal, newVal) -> {
+        ReadOnlyBooleanProperty focusVisibleProperty = FXUtils.focusVisibleProperty(control);
+        if (focusVisibleProperty == null) {
+            focusVisibleProperty = control.focusedProperty();
+        }
+
+        focusVisibleProperty.addListener((o, oldVal, newVal) -> {
             if (newVal) {
                 if (!this.getSkinnable().isPressed()) {
                     this.rippler.showOverlay();
@@ -66,7 +73,6 @@ public class JFXRadioButtonSkin extends RadioButtonSkin {
             } else {
                 this.rippler.hideOverlay();
             }
-
         });
         control.pressedProperty().addListener((o, oldVal, newVal) -> this.rippler.hideOverlay());
         this.registerChangeListener(control.selectedColorProperty(), ignored -> updateColors());

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

@@ -50,10 +50,12 @@ public final class EntryPoint {
         LOG.start(Metadata.HMCL_CURRENT_DIRECTORY.resolve("logs"));
 
         setupJavaFXVMOptions();
-        checkDirectoryPath();
 
-        if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS && !isInsideMacAppBundle())
-            initIcon();
+        if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
+            System.getProperties().putIfAbsent("apple.awt.application.appearance", "system");
+            if (!isInsideMacAppBundle())
+                initIcon();
+        }
 
         checkJavaFX();
         verifyJavaFX();
@@ -192,16 +194,6 @@ public final class EntryPoint {
         }
     }
 
-    private static void checkDirectoryPath() {
-        String currentDir = System.getProperty("user.dir", "");
-        if (currentDir.contains("!")) {
-            LOG.error("The current working path contains an exclamation mark: " + currentDir);
-            // No Chinese translation because both Swing and JavaFX cannot render Chinese character properly when exclamation mark exists in the path.
-            showErrorAndExit("Exclamation mark(!) is not allowed in the path where HMCL is in.\n"
-                    + "The path is " + currentDir);
-        }
-    }
-
     private static void checkJavaFX() {
         try {
             SelfDependencyPatcher.patch();

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

@@ -253,7 +253,7 @@ public final class Launcher extends Application {
         if (Files.exists(mcDir))
             files.add(mcDir.toString());
 
-        String command = new CommandBuilder().add("sudo", "chown", "-R", userName).addAll(files).toString();
+        String command = new CommandBuilder().addAll("sudo", "chown", "-R", userName).addAll(files).toString();
         ButtonType copyAndExit = new ButtonType(i18n("button.copy_and_exit"));
 
         if (showAlert(AlertType.ERROR,

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

@@ -46,6 +46,7 @@ import org.jackhuang.hmcl.util.versioning.VersionNumber;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
+import java.net.Proxy;
 import java.nio.file.Files;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
@@ -174,7 +175,7 @@ public final class HMCLGameRepository extends DefaultGameRepository {
         }
         Files.copy(fromJson, toJson);
 
-        JsonUtils.writeToJsonFile(toJson, fromVersion.setId(dstId));
+        JsonUtils.writeToJsonFile(toJson, fromVersion.setId(dstId).setJar(dstId));
 
         VersionSetting oldVersionSetting = getVersionSetting(srcId).clone();
         GameDirectoryType originalGameDirType = oldVersionSetting.getGameDirType();
@@ -321,6 +322,8 @@ public final class HMCLGameRepository extends DefaultGameRepository {
                     return VersionIconType.FABRIC.getIcon();
                 else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.QUILT))
                     return VersionIconType.QUILT.getIcon();
+                else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.LEGACY_FABRIC))
+                    return VersionIconType.LEGACY_FABRIC.getIcon();
                 else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.NEO_FORGE))
                     return VersionIconType.NEO_FORGE.getIcon();
                 else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.FORGE))
@@ -419,6 +422,7 @@ public final class HMCLGameRepository extends DefaultGameRepository {
                 .setHeight(vs.getHeight())
                 .setFullscreen(vs.isFullscreen())
                 .setWrapper(vs.getWrapper())
+                .setProxyOption(getProxyOption())
                 .setPreLaunchCommand(vs.getPreLaunchCommand())
                 .setPostExitCommand(vs.getPostExitCommand())
                 .setNoGeneratedJVMArgs(vs.isNoJVMArgs())
@@ -438,17 +442,6 @@ public final class HMCLGameRepository extends DefaultGameRepository {
             builder.setQuickPlayOption(new QuickPlayOption.MultiPlayer(vs.getServerIp()));
         }
 
-        if (config().hasProxy()) {
-            builder.setProxyType(config().getProxyType());
-            builder.setProxyHost(config().getProxyHost());
-            builder.setProxyPort(config().getProxyPort());
-
-            if (config().hasProxyAuth()) {
-                builder.setProxyUser(config().getProxyUser());
-                builder.setProxyPass(config().getProxyPass());
-            }
-        }
-
         Path json = getModpackConfiguration(version);
         if (Files.exists(json)) {
             try {
@@ -558,4 +551,39 @@ public final class HMCLGameRepository extends DefaultGameRepository {
             return minimum;
         }
     }
+
+    public static ProxyOption getProxyOption() {
+        if (!config().hasProxy() || config().getProxyType() == null) {
+            return ProxyOption.Default.INSTANCE;
+        }
+
+        return switch (config().getProxyType()) {
+            case DIRECT -> ProxyOption.Direct.INSTANCE;
+            case HTTP, SOCKS -> {
+                String proxyHost = config().getProxyHost();
+                int proxyPort = config().getProxyPort();
+
+                if (StringUtils.isBlank(proxyHost) || proxyPort < 0 || proxyPort > 0xFFFF) {
+                    yield ProxyOption.Default.INSTANCE;
+                }
+
+                String proxyUser = config().getProxyUser();
+                String proxyPass = config().getProxyPass();
+
+                if (StringUtils.isBlank(proxyUser)) {
+                    proxyUser = null;
+                    proxyPass = null;
+                } else if (proxyPass == null) {
+                    proxyPass = "";
+                }
+
+                if (config().getProxyType() == Proxy.Type.HTTP) {
+                    yield new ProxyOption.Http(proxyHost, proxyPort, proxyUser, proxyPass);
+                } else {
+                    yield new ProxyOption.Socks(proxyHost, proxyPort, proxyUser, proxyPass);
+                }
+            }
+            default -> ProxyOption.Default.INSTANCE;
+        };
+    }
 }

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

@@ -79,7 +79,7 @@ public final class HMCLModpackProvider implements ModpackProvider {
 
     private final static class HMCLModpack extends Modpack {
         @Override
-        public Task<?> getInstallTask(DefaultDependencyManager dependencyManager, Path zipFile, String name) {
+        public Task<?> getInstallTask(DefaultDependencyManager dependencyManager, Path zipFile, String name, String iconUrl) {
             return new HMCLModpackInstallTask(((HMCLGameRepository) dependencyManager.getGameRepository()).getProfile(), zipFile, this, name);
         }
     }

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

@@ -325,13 +325,13 @@ public final class LauncherHelper {
                                     message = i18n("launch.failed.command_too_long");
                                 } else if (ex instanceof ExecutionPolicyLimitException) {
                                     Controllers.prompt(new PromptDialogPane.Builder(i18n("launch.failed.execution_policy"),
-                                            (result, resolve, reject) -> {
+                                            (result, handler) -> {
                                                 if (CommandBuilder.setExecutionPolicy()) {
                                                     LOG.info("Set the ExecutionPolicy for the scope 'CurrentUser' to 'RemoteSigned'");
-                                                    resolve.run();
+                                                    handler.resolve();
                                                 } else {
                                                     LOG.warning("Failed to set ExecutionPolicy");
-                                                    reject.accept(i18n("launch.failed.execution_policy.failed_to_set"));
+                                                    handler.reject(i18n("launch.failed.execution_policy.failed_to_set"));
                                                 }
                                             })
                                             .addQuestion(new PromptDialogPane.Builder.HintQuestion(i18n("launch.failed.execution_policy.hint")))
@@ -389,7 +389,7 @@ public final class LauncherHelper {
                         int targetJavaVersionMajor = Integer.parseInt(setting.getJavaVersion());
                         GameJavaVersion minimumJavaVersion = GameJavaVersion.getMinimumJavaVersion(gameVersion);
 
-                        if (minimumJavaVersion != null && targetJavaVersionMajor < minimumJavaVersion.getMajorVersion()) {
+                        if (minimumJavaVersion != null && targetJavaVersionMajor < minimumJavaVersion.majorVersion()) {
                             Controllers.dialog(
                                     i18n("launch.failed.java_version_too_low"),
                                     i18n("message.error"),
@@ -634,7 +634,7 @@ public final class LauncherHelper {
     private static CompletableFuture<JavaRuntime> downloadJava(GameJavaVersion javaVersion, Profile profile) {
         CompletableFuture<JavaRuntime> future = new CompletableFuture<>();
         Controllers.dialog(new MessageDialogPane.Builder(
-                i18n("launch.advice.require_newer_java_version", javaVersion.getMajorVersion()),
+                i18n("launch.advice.require_newer_java_version", javaVersion.majorVersion()),
                 i18n("message.warning"),
                 MessageType.QUESTION)
                 .yesOrNo(() -> {

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

@@ -17,21 +17,19 @@
  */
 package org.jackhuang.hmcl.game;
 
-import org.jackhuang.hmcl.util.io.IOUtils;
-import org.jackhuang.hmcl.util.logging.Logger;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.io.IOUtils;
 import org.jackhuang.hmcl.util.io.Zipper;
+import org.jackhuang.hmcl.util.logging.Logger;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.lang.management.ManagementFactory;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.attribute.FileTime;
+import java.nio.file.PathMatcher;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -43,7 +41,9 @@ public final class LogExporter {
     private LogExporter() {
     }
 
-    public static CompletableFuture<Void> exportLogs(Path zipFile, DefaultGameRepository gameRepository, String versionId, String logs, String launchScript) {
+    public static CompletableFuture<Void> exportLogs(
+            Path zipFile, DefaultGameRepository gameRepository, String versionId, String logs, String launchScript,
+            PathMatcher logMatcher) {
         Path runDirectory = gameRepository.getRunDirectory(versionId);
         Path baseDirectory = gameRepository.getBaseDirectory();
         List<String> versions = new ArrayList<>();
@@ -64,11 +64,11 @@ public final class LogExporter {
         }
 
         return CompletableFuture.runAsync(() -> {
-            try (Zipper zipper = new Zipper(zipFile)) {
-                processLogs(runDirectory.resolve("liteconfig"), "*.log", "liteconfig", zipper);
-                processLogs(runDirectory.resolve("logs"), "*.log", "logs", zipper);
-                processLogs(runDirectory, "*.log", "runDirectory", zipper);
-                processLogs(runDirectory.resolve("crash-reports"), "*.txt", "crash-reports", zipper);
+            try (Zipper zipper = new Zipper(zipFile, true)) {
+                processLogs(runDirectory.resolve("liteconfig"), "*.log", "liteconfig", zipper, logMatcher);
+                processLogs(runDirectory.resolve("logs"), "*.log", "logs", zipper, logMatcher);
+                processLogs(runDirectory, "*.log", "runDirectory", zipper, logMatcher);
+                processLogs(runDirectory.resolve("crash-reports"), "*.txt", "crash-reports", zipper, logMatcher);
 
                 zipper.putTextFile(LOG.getLogs(), "hmcl.log");
                 zipper.putTextFile(logs, "minecraft.log");
@@ -86,14 +86,11 @@ public final class LogExporter {
         });
     }
 
-    private static void processLogs(Path directory, String fileExtension, String logDirectory, Zipper zipper) {
+    private static void processLogs(Path directory, String fileExtension, String logDirectory, Zipper zipper, PathMatcher logMatcher) {
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory, fileExtension)) {
-            long processStartTime = ManagementFactory.getRuntimeMXBean().getStartTime();
-
             for (Path file : stream) {
                 if (Files.isRegularFile(file)) {
-                    FileTime time = Files.readAttributes(file, BasicFileAttributes.class).lastModifiedTime();
-                    if (time.toMillis() >= processStartTime) {
+                    if (logMatcher == null || logMatcher.matches(file)) {
                         try (BufferedReader reader = IOUtils.newBufferedReaderMaybeNativeEncoding(file)) {
                             zipper.putLines(reader.lines().map(Logger::filterForbiddenToken), file.getFileName().toString());
                         } catch (IOException e) {

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

@@ -188,7 +188,7 @@ public final class ModpackHelper {
                 });
     }
 
-    public static Task<?> getInstallTask(Profile profile, Path zipFile, String name, Modpack modpack) {
+    public static Task<?> getInstallTask(Profile profile, Path zipFile, String name, Modpack modpack, String iconUrl) {
         profile.getRepository().markVersionAsModpack(name);
 
         ExceptionalRunnable<?> success = () -> {
@@ -208,17 +208,17 @@ public final class ModpackHelper {
         };
 
         if (modpack.getManifest() instanceof MultiMCInstanceConfiguration)
-            return modpack.getInstallTask(profile.getDependency(), zipFile, name)
+            return modpack.getInstallTask(profile.getDependency(), zipFile, name, iconUrl)
                     .whenComplete(Schedulers.defaultScheduler(), success, failure)
                     .thenComposeAsync(createMultiMCPostInstallTask(profile, (MultiMCInstanceConfiguration) modpack.getManifest(), name))
                     .withStagesHint(List.of("hmcl.modpack", "hmcl.modpack.download"));
         else if (modpack.getManifest() instanceof McbbsModpackManifest)
-            return modpack.getInstallTask(profile.getDependency(), zipFile, name)
+            return modpack.getInstallTask(profile.getDependency(), zipFile, name, iconUrl)
                     .whenComplete(Schedulers.defaultScheduler(), success, failure)
                     .thenComposeAsync(createMcbbsPostInstallTask(profile, (McbbsModpackManifest) modpack.getManifest(), name))
                     .withStagesHint(List.of("hmcl.modpack", "hmcl.modpack.download"));
         else
-            return modpack.getInstallTask(profile.getDependency(), zipFile, name)
+            return modpack.getInstallTask(profile.getDependency(), zipFile, name, iconUrl)
                     .whenComplete(Schedulers.javafx(), success, failure)
                     .withStagesHint(List.of("hmcl.modpack", "hmcl.modpack.download"));
     }

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

@@ -152,6 +152,12 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
         @Override
         public void openBrowser(String url) throws IOException {
             lastlyOpenedURL = url;
+
+            try {
+                Thread.sleep(1500);
+            } catch (InterruptedException ignored) {
+            }
+
             FXUtils.openLink(url);
 
             onOpenBrowser.fireEvent(new OpenBrowserEvent(this, url));

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

@@ -30,7 +30,9 @@ import org.jackhuang.hmcl.util.platform.Platform;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
-import java.nio.file.*;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.*;
 
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
@@ -57,7 +59,7 @@ public final class HMCLJavaRepository implements JavaRepository {
     }
 
     public Path getJavaDir(Platform platform, GameJavaVersion gameJavaVersion) {
-        return getJavaDir(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.getComponent());
+        return getJavaDir(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.component());
     }
 
     @Override
@@ -66,7 +68,7 @@ public final class HMCLJavaRepository implements JavaRepository {
     }
 
     public Path getManifestFile(Platform platform, GameJavaVersion gameJavaVersion) {
-        return getManifestFile(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.getComponent());
+        return getManifestFile(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.component());
     }
 
     public boolean isInstalled(Platform platform, String name) {
@@ -74,7 +76,7 @@ public final class HMCLJavaRepository implements JavaRepository {
     }
 
     public boolean isInstalled(Platform platform, GameJavaVersion gameJavaVersion) {
-        return isInstalled(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.getComponent());
+        return isInstalled(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.component());
     }
 
     public @Nullable Path getJavaExecutable(Platform platform, String name) {
@@ -94,7 +96,7 @@ public final class HMCLJavaRepository implements JavaRepository {
     }
 
     public @Nullable Path getJavaExecutable(Platform platform, GameJavaVersion gameJavaVersion) {
-        return getJavaExecutable(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.getComponent());
+        return getJavaExecutable(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.component());
     }
 
     private static void getAllJava(List<JavaRuntime> list, Platform platform, Path platformRoot, boolean isManaged) {
@@ -169,7 +171,7 @@ public final class HMCLJavaRepository implements JavaRepository {
 
             Map<String, Object> update = new LinkedHashMap<>();
             update.put("provider", "mojang");
-            update.put("component", gameJavaVersion.getComponent());
+            update.put("component", gameJavaVersion.component());
 
             Map<String, JavaLocalFiles.Local> files = new LinkedHashMap<>();
             result.remoteFiles.getFiles().forEach((path, file) -> {

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

@@ -414,6 +414,12 @@ public final class Accounts {
             return i18n("account.failed.no_character");
         } else if (exception instanceof ServerDisconnectException) {
             if (exception.getCause() instanceof SSLException) {
+                if (exception.getCause().getMessage() != null && exception.getCause().getMessage().contains("Remote host terminated")) {
+                    return i18n("account.failed.connect_authentication_server");
+                }
+                if (exception.getCause().getMessage() != null && (exception.getCause().getMessage().contains("No name matching") || exception.getCause().getMessage().contains("No subject alternative DNS name matching"))) {
+                    return i18n("account.failed.dns");
+                }
                 return i18n("account.failed.ssl");
             } else {
                 return i18n("account.failed.connect_authentication_server");
@@ -465,7 +471,7 @@ public final class Accounts {
         } 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_probably");
+            return i18n("account.methods.microsoft.error.add_family");
         } else if (exception instanceof OAuthServer.MicrosoftAuthenticationNotSupportedException) {
             return i18n("account.methods.microsoft.snapshot");
         } else if (exception instanceof OAuthAccount.WrongAccountException) {

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

@@ -134,7 +134,10 @@ public final class DownloadProviders {
                 return i18n("install.failed.downloading.detail", uri) + "\n" + i18n("exception.access_denied", ((AccessDeniedException) exception.getCause()).getFile());
             } else if (exception.getCause() instanceof ArtifactMalformedException) {
                 return i18n("install.failed.downloading.detail", uri) + "\n" + i18n("exception.artifact_malformed");
-            } else if (exception.getCause() instanceof SSLHandshakeException) {
+            } else if (exception.getCause() instanceof SSLHandshakeException && !(exception.getCause().getMessage() != null && exception.getCause().getMessage().contains("Remote host terminated"))) {
+                if (exception.getCause().getMessage() != null && (exception.getCause().getMessage().contains("No name matching") || exception.getCause().getMessage().contains("No subject alternative DNS name matching"))) {
+                    return i18n("install.failed.downloading.detail", uri) + "\n" + i18n("exception.dns.pollution");
+                }
                 return i18n("install.failed.downloading.detail", uri) + "\n" + i18n("exception.ssl_handshake");
             } else {
                 return i18n("install.failed.downloading.detail", uri) + "\n" + StringUtils.getStackTrace(exception.getCause());

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

@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.setting;
 
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.text.Font;
 import org.jackhuang.hmcl.Metadata;
@@ -94,31 +95,26 @@ public final class FontManager {
             return null;
     });
 
-    private static final ObjectProperty<FontReference> fontProperty;
+    private static final ObjectProperty<FontReference> font = new SimpleObjectProperty<>();
 
     static {
+        updateFont();
+        LOG.info("Font: " + (font.get() != null ? font.get().family() : "System"));
+    }
+
+    private static void updateFont() {
         String fontFamily = config().getLauncherFontFamily();
         if (fontFamily == null)
             fontFamily = System.getProperty("hmcl.font.override");
         if (fontFamily == null)
             fontFamily = System.getenv("HMCL_FONT");
 
-        FontReference fontReference;
         if (fontFamily == null) {
             Font defaultFont = DEFAULT_FONT.get();
-            fontReference = defaultFont != null ? new FontReference(defaultFont) : null;
-        } else
-            fontReference = new FontReference(fontFamily);
-
-        fontProperty = new SimpleObjectProperty<>(fontReference);
-
-        LOG.info("Font: " + (fontReference != null ? fontReference.getFamily() : "System"));
-        fontProperty.addListener((obs, oldValue, newValue) -> {
-            if (newValue != null)
-                config().setLauncherFontFamily(newValue.getFamily());
-            else
-                config().setLauncherFontFamily(null);
-        });
+            font.set(defaultFont != null ? new FontReference(defaultFont) : null);
+        } else {
+            font.set(new FontReference(fontFamily));
+        }
     }
 
     private static Font tryLoadDefaultFont(Path dir) {
@@ -231,64 +227,35 @@ public final class FontManager {
         }
     }
 
-    public static ObjectProperty<FontReference> fontProperty() {
-        return fontProperty;
+    public static ReadOnlyObjectProperty<FontReference> fontProperty() {
+        return font;
     }
 
     public static FontReference getFont() {
-        return fontProperty.get();
-    }
-
-    public static void setFont(FontReference font) {
-        fontProperty.set(font);
+        return font.get();
     }
 
     public static void setFontFamily(String fontFamily) {
-        setFont(fontFamily != null ? new FontReference(fontFamily) : null);
+        config().setLauncherFontFamily(fontFamily);
+        updateFont();
     }
 
     // https://github.com/HMCL-dev/HMCL/issues/4072
-    public static final class FontReference {
-        private final @NotNull String family;
-        private final @Nullable String style;
+    public record FontReference(@NotNull String family, @Nullable String style) {
+        public FontReference {
+            Objects.requireNonNull(family);
+        }
 
         public FontReference(@NotNull String family) {
-            this.family = Objects.requireNonNull(family);
-            this.style = null;
+            this(family, null);
         }
 
         public FontReference(@NotNull Font font) {
-            this.family = font.getFamily();
-            this.style = font.getStyle();
-        }
-
-        public @NotNull String getFamily() {
-            return family;
-        }
-
-        public @Nullable String getStyle() {
-            return style;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (!(o instanceof FontReference))
-                return false;
-            FontReference that = (FontReference) o;
-            return Objects.equals(family, that.family) && Objects.equals(style, that.style);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(family, style);
-        }
-
-        @Override
-        public String toString() {
-            return String.format("FontReference[family='%s', style='%s']", family, style);
+            this(font.getFamily(), font.getStyle());
         }
     }
 
     private FontManager() {
     }
 }
+

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

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

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

@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.setting;
 
 import javafx.beans.InvalidationListener;
+import org.jackhuang.hmcl.task.FetchTask;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.jetbrains.annotations.NotNull;
@@ -114,6 +115,8 @@ public final class ProxyManager {
         config().hasProxyAuthProperty().addListener(updateAuthenticator);
         config().proxyUserProperty().addListener(updateAuthenticator);
         config().proxyPassProperty().addListener(updateAuthenticator);
+
+        FetchTask.notifyInitialized();
     }
 
     private static abstract class AbstractProxySelector extends ProxySelector {

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

@@ -90,11 +90,11 @@ public final class StyleSheets {
         final String defaultCss = "/assets/css/font.css";
         final FontManager.FontReference font = FontManager.getFont();
 
-        if (font == null || "System".equals(font.getFamily()))
+        if (font == null || "System".equals(font.family()))
             return defaultCss;
 
-        String fontFamily = font.getFamily();
-        String style = font.getStyle();
+        String fontFamily = font.family();
+        String style = font.style();
         String weight = null;
         String posture = null;
 

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

@@ -36,7 +36,9 @@ public enum VersionIconType {
     FURNACE("/assets/img/furnace.png"),
     QUILT("/assets/img/quilt.png"),
     APRIL_FOOLS("/assets/img/april_fools.png"),
-    CLEANROOM("/assets/img/cleanroom.png");
+    CLEANROOM("/assets/img/cleanroom.png"),
+    LEGACY_FABRIC("/assets/img/legacyfabric.png")
+    ;
 
     // Please append new items at last
 

HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java

@@ -0,0 +1,191 @@
+/*
+ * 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.terracotta;
+
+import kala.compress.archivers.tar.TarArchiveEntry;
+import org.jackhuang.hmcl.download.ArtifactMalformedException;
+import org.jackhuang.hmcl.task.FetchTask;
+import org.jackhuang.hmcl.task.FileDownloadTask;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.terracotta.provider.AbstractTerracottaProvider;
+import org.jackhuang.hmcl.util.DigestUtils;
+import org.jackhuang.hmcl.util.io.ChecksumMismatchException;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.logging.Logger;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jackhuang.hmcl.util.tree.TarFileTree;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.net.http.HttpResponse;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.DigestInputStream;
+import java.security.DigestOutputStream;
+import java.security.MessageDigest;
+import java.util.HexFormat;
+import java.util.List;
+import java.util.Map;
+
+public final class TerracottaBundle {
+    private final Path root;
+
+    private final List<URI> links;
+
+    private final FileDownloadTask.IntegrityCheck hash;
+
+    private final Map<String, FileDownloadTask.IntegrityCheck> files;
+
+    public TerracottaBundle(Path root, List<URI> links, FileDownloadTask.IntegrityCheck hash, Map<String, FileDownloadTask.IntegrityCheck> files) {
+        this.root = root;
+        this.links = links;
+        this.hash = hash;
+        this.files = files;
+    }
+
+    public Task<Path> download(AbstractTerracottaProvider.DownloadContext context) {
+        return Task.supplyAsync(() -> Files.createTempFile("terracotta-", ".tar.gz"))
+                .thenComposeAsync(Schedulers.javafx(), pkg -> {
+                    FileDownloadTask download = new FileDownloadTask(links, pkg, hash) {
+                        @Override
+                        protected Context getContext(HttpResponse<?> response, boolean checkETag, String bmclapiHash) throws IOException {
+                            FetchTask.Context delegate = super.getContext(response, checkETag, bmclapiHash);
+                            return new Context() {
+                                @Override
+                                public void withResult(boolean success) {
+                                    delegate.withResult(success);
+                                }
+
+                                @Override
+                                public void write(byte[] buffer, int offset, int len) throws IOException {
+                                    context.checkCancellation();
+                                    delegate.write(buffer, offset, len);
+                                }
+
+                                @Override
+                                public void close() throws IOException {
+                                    if (isSuccess()) {
+                                        context.checkCancellation();
+                                    }
+
+                                    delegate.close();
+                                }
+                            };
+                        }
+                    };
+
+                    context.bindProgress(download.progressProperty());
+                    return download.thenSupplyAsync(() -> pkg);
+                });
+    }
+
+    public Task<?> install(Path pkg) {
+        return Task.runAsync(() -> {
+            Files.createDirectories(root);
+            FileUtils.cleanDirectory(root);
+
+            try (TarFileTree tree = TarFileTree.open(pkg)) {
+                for (Map.Entry<String, FileDownloadTask.IntegrityCheck> entry : files.entrySet()) {
+                    String file = entry.getKey();
+                    FileDownloadTask.IntegrityCheck check = entry.getValue();
+
+                    Path path = root.resolve(file);
+                    TarArchiveEntry archive = tree.getEntry("/" + file);
+                    if (archive == null) {
+                        throw new ArtifactMalformedException(String.format("Expecting %s file in terracotta bundle.", file));
+                    }
+
+                    MessageDigest digest = DigestUtils.getDigest(check.getAlgorithm());
+                    try (
+                            InputStream is = tree.getInputStream(archive);
+                            OutputStream os = new DigestOutputStream(Files.newOutputStream(path), digest)
+                    ) {
+                        is.transferTo(os);
+                    }
+
+                    String hash = HexFormat.of().formatHex(digest.digest());
+                    if (!check.getChecksum().equalsIgnoreCase(hash)) {
+                        throw new ChecksumMismatchException(check.getAlgorithm(), check.getChecksum(), hash);
+                    }
+
+                    switch (OperatingSystem.CURRENT_OS) {
+                        case LINUX, MACOS, FREEBSD -> Files.setPosixFilePermissions(path, FileUtils.parsePosixFilePermission(archive.getMode()));
+                    }
+                }
+            }
+        }).whenComplete(exception -> {
+            if (exception != null) {
+                FileUtils.deleteDirectory(root);
+            }
+        });
+    }
+
+    public Path locate(String file) {
+        FileDownloadTask.IntegrityCheck check = files.get(file);
+        if (check == null) {
+            throw new AssertionError(String.format("Expecting %s file in terracotta bundle.", file));
+        }
+        return root.resolve(file).toAbsolutePath();
+    }
+
+    public AbstractTerracottaProvider.Status status() throws IOException {
+        if (Files.exists(root) && isLocalBundleValid()) {
+            return AbstractTerracottaProvider.Status.READY;
+        }
+
+        try {
+            if (TerracottaMetadata.hasLegacyVersionFiles()) {
+                return AbstractTerracottaProvider.Status.LEGACY_VERSION;
+            }
+        } catch (IOException e) {
+            Logger.LOG.warning("Cannot determine whether legacy versions exist.", e);
+        }
+        return AbstractTerracottaProvider.Status.NOT_EXIST;
+    }
+
+    private boolean isLocalBundleValid() throws IOException { // FIXME: Make control flow clearer.
+        long total = 0;
+        byte[] buffer = new byte[8192];
+
+        for (Map.Entry<String, FileDownloadTask.IntegrityCheck> entry : files.entrySet()) {
+            Path path = root.resolve(entry.getKey());
+            FileDownloadTask.IntegrityCheck check = entry.getValue();
+            if (!Files.isReadable(path)) {
+                return false;
+            }
+
+            MessageDigest digest = DigestUtils.getDigest(check.getAlgorithm());
+            try (InputStream is = new DigestInputStream(Files.newInputStream(path), digest)) {
+                int n;
+                while ((n = is.read(buffer)) >= 0) {
+                    total += n;
+                    if (total >= 50 * 1024 * 1024) { // >=50MB
+                        return false;
+                    }
+                }
+            }
+            if (!HexFormat.of().formatHex(digest.digest()).equalsIgnoreCase(check.getChecksum())) {
+                return false;
+            }
+        }
+        return true;
+    }
+}

HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaManager.java

@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.terracotta;
 
 import com.google.gson.JsonObject;
-import com.google.gson.reflect.TypeToken;
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyDoubleWrapper;
 import javafx.beans.property.ReadOnlyObjectProperty;
@@ -29,24 +28,26 @@ import org.jackhuang.hmcl.task.DownloadException;
 import org.jackhuang.hmcl.task.GetTask;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.terracotta.provider.ITerracottaProvider;
+import org.jackhuang.hmcl.terracotta.provider.AbstractTerracottaProvider;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.util.FXThread;
 import org.jackhuang.hmcl.util.InvocationDispatcher;
 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.io.HttpRequest;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.jackhuang.hmcl.util.platform.ManagedProcess;
 import org.jackhuang.hmcl.util.platform.SystemUtils;
-import org.jackhuang.hmcl.util.tree.TarFileTree;
-import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Map;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.LockSupport;
 
@@ -70,9 +71,10 @@ public final class TerracottaManager {
                 switch (TerracottaMetadata.PROVIDER.status()) {
                     case NOT_EXIST -> setState(new TerracottaState.Uninitialized(false));
                     case LEGACY_VERSION -> setState(new TerracottaState.Uninitialized(true));
-                    case READY -> launch(setState(new TerracottaState.Launching()));
+                    case READY -> launch(setState(new TerracottaState.Launching()), false);
                 }
             } catch (Exception e) {
+                LOG.warning("Cannot initialize Terracotta.", e);
                 compareAndSet(TerracottaState.Bootstrap.INSTANCE, new TerracottaState.Fatal(TerracottaState.Fatal.Type.UNKNOWN));
             }
         });
@@ -82,114 +84,145 @@ public final class TerracottaManager {
         return STATE.getReadOnlyProperty();
     }
 
-    static {
-        Lang.thread(() -> {
-            while (true) {
-                TerracottaState state = STATE_V.get();
-                if (!(state instanceof TerracottaState.PortSpecific portSpecific)) {
-                    LockSupport.parkNanos(500_000);
+    private static final Thread DAEMON = Lang.thread(TerracottaManager::runBackground, "Terracotta Background Daemon", true);
+
+    @FXThread // Written in FXThread, read-only on background daemon
+    private static volatile boolean daemonRunning = false;
+
+    private static void runBackground() {
+        final long ACTIVE = TimeUnit.MILLISECONDS.toNanos(500);
+        final long BACKGROUND = TimeUnit.SECONDS.toMillis(15);
+
+        while (true) {
+            if (daemonRunning) {
+                LockSupport.parkNanos(ACTIVE);
+            } else {
+                long deadline = System.currentTimeMillis() + BACKGROUND;
+                do {
+                    LockSupport.parkUntil(deadline);
+                } while (!daemonRunning && System.currentTimeMillis() < deadline - 100);
+            }
+
+            if (!(STATE_V.get() instanceof TerracottaState.PortSpecific state)) {
+                continue;
+            }
+            int port = state.port;
+            int index = state instanceof TerracottaState.Ready ready ? ready.index : Integer.MIN_VALUE;
+
+            TerracottaState next;
+            try {
+                TerracottaState.Ready object = HttpRequest.GET(String.format("http://127.0.0.1:%d/state", port))
+                        .retry(5)
+                        .getJson(TerracottaState.Ready.class);
+                if (object.index <= index) {
                     continue;
                 }
-
-                int port = portSpecific.port;
-                int index = state instanceof TerracottaState.Ready ready ? ready.index : Integer.MIN_VALUE;
-
-                TerracottaState next;
-                try {
-                    next = new GetTask(URI.create(String.format("http://127.0.0.1:%d/state", port)))
-                            .setSignificance(Task.TaskSignificance.MINOR)
-                            .thenApplyAsync(jsonString -> {
-                                TerracottaState.Ready object = JsonUtils.fromNonNullJson(jsonString, TypeToken.get(TerracottaState.Ready.class));
-                                if (object.index <= index) {
-                                    return null;
-                                }
-
-                                object.port = port;
-                                return object;
-                            })
-                            .setSignificance(Task.TaskSignificance.MINOR)
-                            .run();
-                } catch (Exception e) {
-                    LOG.warning("Cannot fetch state from Terracotta.", e);
-                    next = new TerracottaState.Fatal(TerracottaState.Fatal.Type.TERRACOTTA);
-                }
-
-                if (next != null) {
-                    compareAndSet(state, next);
-                }
-
-                LockSupport.parkNanos(500_000);
+                object.port = port;
+                next = object;
+            } catch (Exception e) {
+                LOG.warning("Cannot fetch state from Terracotta.", e);
+                next = new TerracottaState.Fatal(TerracottaState.Fatal.Type.TERRACOTTA);
             }
-        }, "Terracotta Background Daemon", true);
+
+            compareAndSet(state, next);
+        }
     }
 
-    public static boolean validate(Path file) {
-        return FileUtils.getName(file).equalsIgnoreCase(TerracottaMetadata.PACKAGE_NAME);
-    }
-
-    public static TerracottaState.Preparing install(@Nullable Path file) {
+    @FXThread
+    public static void switchDaemon(boolean active) {
         FXUtils.checkFxUserThread();
 
-        TerracottaState state = STATE_V.get();
-        if (!(state instanceof TerracottaState.Uninitialized ||
-                state instanceof TerracottaState.Preparing preparing && preparing.hasInstallFence() ||
-                state instanceof TerracottaState.Fatal && ((TerracottaState.Fatal) state).isRecoverable())
-        ) {
-            return null;
-        }
-
-        if (file != null && !FileUtils.getName(file).equalsIgnoreCase(TerracottaMetadata.PACKAGE_NAME)) {
-            return null;
-        }
-
-        TerracottaState.Preparing preparing = new TerracottaState.Preparing(new ReadOnlyDoubleWrapper(-1));
-
-        Task.supplyAsync(Schedulers.io(), () -> {
-            return file != null ? TarFileTree.open(file) : null;
-        }).thenComposeAsync(Schedulers.javafx(), tree -> {
-            return getProvider().install(preparing, tree).whenComplete(exception -> {
-                if (tree != null) {
-                    tree.close();
-                }
-                if (exception != null) {
-                    throw exception;
-                }
-            });
-        }).whenComplete(exception -> {
-            if (exception == null) {
-                try {
-                    TerracottaMetadata.removeLegacyVersionFiles();
-                } catch (IOException e) {
-                    LOG.warning("Unable to remove legacy terracotta files.", e);
-                }
-
-                TerracottaState.Launching launching = new TerracottaState.Launching();
-                if (compareAndSet(preparing, launching)) {
-                    launch(launching);
-                }
-            } else if (exception instanceof CancellationException) {
-            } else if (exception instanceof ITerracottaProvider.ArchiveFileMissingException) {
-                LOG.warning("Cannot install terracotta from local package.", exception);
-                compareAndSet(preparing, new TerracottaState.Fatal(TerracottaState.Fatal.Type.INSTALL));
-            } else if (exception instanceof DownloadException) {
-                compareAndSet(preparing, new TerracottaState.Fatal(TerracottaState.Fatal.Type.NETWORK));
-            } else {
-                compareAndSet(preparing, new TerracottaState.Fatal(TerracottaState.Fatal.Type.INSTALL));
+        boolean dr = daemonRunning;
+        if (dr != active) {
+            daemonRunning = active;
+            if (active) {
+                LockSupport.unpark(DAEMON);
             }
-        }).start();
-
-        return compareAndSet(state, preparing) ? preparing : null;
+        }
     }
 
-    private static ITerracottaProvider getProvider() {
-        ITerracottaProvider provider = TerracottaMetadata.PROVIDER;
+    private static AbstractTerracottaProvider getProvider() {
+        AbstractTerracottaProvider provider = TerracottaMetadata.PROVIDER;
         if (provider == null) {
             throw new AssertionError("Terracotta Provider must NOT be null.");
         }
         return provider;
     }
 
-    public static TerracottaState recover(@Nullable Path file) {
+    public static boolean isInvalidBundle(Path file) {
+        return !FileUtils.getName(file).equalsIgnoreCase(TerracottaMetadata.PACKAGE_NAME);
+    }
+
+    @FXThread
+    public static TerracottaState.Preparing download() {
+        FXUtils.checkFxUserThread();
+
+        TerracottaState state = STATE_V.get();
+        if (!(state instanceof TerracottaState.Uninitialized || state instanceof TerracottaState.Fatal && ((TerracottaState.Fatal) state).isRecoverable())
+        ) {
+            return null;
+        }
+
+        TerracottaState.Preparing preparing = new TerracottaState.Preparing(new ReadOnlyDoubleWrapper(-1), true);
+
+        Task.composeAsync(() -> getProvider().download(preparing))
+                .thenComposeAsync(pkg -> {
+                    if (!preparing.requestInstallFence()) {
+                        return null;
+                    }
+
+                    return getProvider().install(pkg).thenRunAsync(() -> {
+                        TerracottaState.Launching launching = new TerracottaState.Launching();
+                        if (compareAndSet(preparing, launching)) {
+                            launch(launching, true);
+                        }
+                    });
+                }).whenComplete(exception -> {
+                    if (exception instanceof CancellationException) {
+                        // no-op
+                    } else if (exception instanceof DownloadException) {
+                        compareAndSet(preparing, new TerracottaState.Fatal(TerracottaState.Fatal.Type.NETWORK));
+                    } else {
+                        compareAndSet(preparing, new TerracottaState.Fatal(TerracottaState.Fatal.Type.INSTALL));
+                    }
+                }).start();
+
+        return compareAndSet(state, preparing) ? preparing : null;
+    }
+
+    @FXThread
+    public static TerracottaState.Preparing install(Path bundle) {
+        FXUtils.checkFxUserThread();
+        if (isInvalidBundle(bundle)) {
+            return null;
+        }
+
+        TerracottaState state = STATE_V.get();
+        TerracottaState.Preparing preparing;
+        if (state instanceof TerracottaState.Preparing previousPreparing && previousPreparing.requestInstallFence()) {
+            preparing = previousPreparing;
+        } else if (state instanceof TerracottaState.Uninitialized || state instanceof TerracottaState.Fatal && ((TerracottaState.Fatal) state).isRecoverable()) {
+            preparing = new TerracottaState.Preparing(new ReadOnlyDoubleWrapper(-1), false);
+        } else {
+            return null;
+        }
+
+        Task.composeAsync(() -> getProvider().install(bundle))
+                .thenRunAsync(() -> {
+                    TerracottaState.Launching launching = new TerracottaState.Launching();
+                    if (compareAndSet(preparing, launching)) {
+                        launch(launching, true);
+                    }
+                })
+                .whenComplete(exception -> {
+                    compareAndSet(preparing, new TerracottaState.Fatal(TerracottaState.Fatal.Type.INSTALL));
+                }).start();
+
+        return state != preparing && compareAndSet(state, preparing) ? preparing : null;
+    }
+
+    @FXThread
+    public static TerracottaState recover() {
         FXUtils.checkFxUserThread();
 
         TerracottaState state = STATE_V.get();
@@ -198,21 +231,23 @@ public final class TerracottaManager {
         }
 
         try {
+            // FIXME: A temporary limit has been employed in TerracottaBundle#checkExisting, making
+            //        hash check accept 50MB at most. Calling it on JavaFX should be safe.
             return switch (getProvider().status()) {
-                case NOT_EXIST, LEGACY_VERSION -> install(file);
+                case NOT_EXIST, LEGACY_VERSION -> download();
                 case READY -> {
                     TerracottaState.Launching launching = setState(new TerracottaState.Launching());
-                    launch(launching);
+                    launch(launching, false);
                     yield launching;
                 }
             };
-        } catch (NullPointerException | IOException e) {
+        } catch (RuntimeException | IOException e) {
             LOG.warning("Cannot determine Terracotta state.", e);
             return setState(new TerracottaState.Fatal(TerracottaState.Fatal.Type.UNKNOWN));
         }
     }
 
-    private static void launch(TerracottaState.Launching state) {
+    private static void launch(TerracottaState.Launching state, boolean removeLegacy) {
         Task.supplyAsync(() -> {
             Path path = Files.createTempDirectory(String.format("hmcl-terracotta-%d", ThreadLocalRandom.current().nextLong())).resolve("http").toAbsolutePath();
             ManagedProcess process = new ManagedProcess(new ProcessBuilder(getProvider().ofCommandLine(path)));
@@ -230,7 +265,7 @@ public final class TerracottaManager {
                     if (exitTime == -1) {
                         exitTime = System.currentTimeMillis();
                     } else if (System.currentTimeMillis() - exitTime >= 10000) {
-                        throw new IllegalStateException("Process has exited for 10s.");
+                        throw new IllegalStateException(String.format("Process has exited for 10s, code = %s", process.getExitCode()));
                     }
                 }
             }
@@ -238,6 +273,9 @@ public final class TerracottaManager {
             TerracottaState next;
             if (exception == null) {
                 next = new TerracottaState.Unknown(port);
+                if (removeLegacy) {
+                    TerracottaMetadata.removeLegacyVersionFiles();
+                }
             } else {
                 next = new TerracottaState.Fatal(TerracottaState.Fatal.Type.TERRACOTTA);
             }
@@ -272,23 +310,27 @@ public final class TerracottaManager {
     public static TerracottaState.HostScanning setScanning() {
         TerracottaState state = STATE_V.get();
         if (state instanceof TerracottaState.PortSpecific portSpecific) {
-            new GetTask(NetworkUtils.toURI(String.format(
-                    "http://127.0.0.1:%d/state/scanning?player=%s", portSpecific.port, getPlayerName()))
-            ).setSignificance(Task.TaskSignificance.MINOR).start();
+            String uri = NetworkUtils.withQuery(String.format("http://127.0.0.1:%d/state/scanning", portSpecific.port), Map.of(
+                    "player", getPlayerName()
+            ));
 
+            new GetTask(uri).setSignificance(Task.TaskSignificance.MINOR).start();
             return new TerracottaState.HostScanning(-1, -1, null);
         }
         return null;
     }
 
-    public static Task<TerracottaState.GuestStarting> setGuesting(String room) {
+    public static Task<TerracottaState.GuestConnecting> setGuesting(String room) {
         TerracottaState state = STATE_V.get();
         if (state instanceof TerracottaState.PortSpecific portSpecific) {
-            return new GetTask(NetworkUtils.toURI(String.format(
-                    "http://127.0.0.1:%d/state/guesting?room=%s&player=%s", portSpecific.port, room, getPlayerName()
-            )))
+            String uri = NetworkUtils.withQuery(String.format("http://127.0.0.1:%d/state/guesting", portSpecific.port), Map.of(
+                    "room", room,
+                    "player", getPlayerName()
+            ));
+
+            return new GetTask(uri)
                     .setSignificance(Task.TaskSignificance.MINOR)
-                    .thenSupplyAsync(() -> new TerracottaState.GuestStarting(-1, -1, null))
+                    .thenSupplyAsync(() -> new TerracottaState.GuestConnecting(-1, -1, null))
                     .setSignificance(Task.TaskSignificance.MINOR);
         } else {
             return null;

HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaMetadata.java

@@ -20,10 +20,10 @@ package org.jackhuang.hmcl.terracotta;
 import com.google.gson.annotations.SerializedName;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.task.FileDownloadTask;
+import org.jackhuang.hmcl.terracotta.provider.AbstractTerracottaProvider;
 import org.jackhuang.hmcl.terracotta.provider.GeneralProvider;
-import org.jackhuang.hmcl.terracotta.provider.ITerracottaProvider;
 import org.jackhuang.hmcl.terracotta.provider.MacOSProvider;
-import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.gson.JsonSerializable;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.i18n.LocaleUtils;
 import org.jackhuang.hmcl.util.i18n.LocalizedText;
@@ -32,6 +32,8 @@ import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.jackhuang.hmcl.util.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.OSVersion;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jackhuang.hmcl.util.versioning.VersionNumber;
+import org.jackhuang.hmcl.util.versioning.VersionRange;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
@@ -40,11 +42,11 @@ import java.net.URI;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
@@ -52,46 +54,60 @@ public final class TerracottaMetadata {
     private TerracottaMetadata() {
     }
 
-    public record Link(@SerializedName("desc") LocalizedText description, String link) {
+    private record Options(String version, String classifier) {
+        public String replace(String value) {
+            return value.replace("${version}", version).replace("${classifier}", classifier);
+        }
     }
 
+    @JsonSerializable
+    public record Link(
+            @SerializedName("desc") LocalizedText description,
+            @SerializedName("link") String link
+    ) {
+    }
+
+    @JsonSerializable
+    private record Package(
+            @SerializedName("hash") String hash,
+            @SerializedName("files") Map<String, String> files
+    ) {
+    }
+
+    @JsonSerializable
     private record Config(
-            @SerializedName("version_legacy") String legacy,
-            @SerializedName("version_recent") List<String> recent,
             @SerializedName("version_latest") String latest,
 
-            @SerializedName("classifiers") Map<String, String> classifiers,
+            @SerializedName("packages") Map<String, Package> pkgs,
             @SerializedName("downloads") List<String> downloads,
             @SerializedName("downloads_CN") List<String> downloadsCN,
             @SerializedName("links") List<Link> links
     ) {
-        private @Nullable TerracottaNative of(String classifier) {
-            String hash = this.classifiers.get(classifier);
-            if (hash == null)
+        private @Nullable TerracottaBundle resolve(Options options) {
+            Package pkg = pkgs.get(options.classifier);
+            if (pkg == null) {
                 return null;
-
-            if (!hash.startsWith("sha256:"))
-                throw new IllegalArgumentException(String.format("Invalid hash value %s for classifier %s.", hash, classifier));
-            hash = hash.substring("sha256:".length());
-
-            List<URI> links = new ArrayList<>(this.downloads.size() + this.downloadsCN.size());
-            for (String download : LocaleUtils.IS_CHINA_MAINLAND
-                    ? Lang.merge(this.downloadsCN, this.downloads)
-                    : Lang.merge(this.downloads, this.downloadsCN)) {
-                links.add(URI.create(download.replace("${version}", this.latest).replace("${classifier}", classifier)));
             }
 
-            return new TerracottaNative(
-                    Collections.unmodifiableList(links),
-                    Metadata.DEPENDENCIES_DIRECTORY.resolve(
-                            String.format("terracotta/%s/terracotta-%s-%s", this.latest, this.latest, classifier)
-                    ).toAbsolutePath(),
-                    new FileDownloadTask.IntegrityCheck("SHA-256", hash)
+            Stream<String> stream = downloads.stream(), streamCN = downloadsCN.stream();
+            List<URI> links = (LocaleUtils.IS_CHINA_MAINLAND ? Stream.concat(streamCN, stream) : Stream.concat(stream, streamCN))
+                    .map(link -> URI.create(options.replace(link)))
+                    .toList();
+
+            Map<String, FileDownloadTask.IntegrityCheck> files = pkg.files.entrySet().stream().collect(Collectors.toUnmodifiableMap(
+                    Map.Entry::getKey,
+                    entry -> new FileDownloadTask.IntegrityCheck("SHA-512", entry.getValue())
+            ));
+
+            return new TerracottaBundle(
+                    Metadata.DEPENDENCIES_DIRECTORY.resolve(options.replace("terracotta/${version}")).toAbsolutePath(),
+                    links, new FileDownloadTask.IntegrityCheck("SHA-512", pkg.hash),
+                    files
             );
         }
     }
 
-    public static final ITerracottaProvider PROVIDER;
+    public static final AbstractTerracottaProvider PROVIDER;
     public static final String PACKAGE_NAME;
     public static final List<Link> PACKAGE_LINKS;
     public static final String FEEDBACK_LINK = NetworkUtils.withQuery("https://docs.hmcl.net/multiplayer/feedback.html", Map.of(
@@ -99,8 +115,6 @@ public final class TerracottaMetadata {
             "launcher_version", Metadata.VERSION
     ));
 
-    private static final Pattern LEGACY;
-    private static final List<String> RECENT;
     private static final String LATEST;
 
     static {
@@ -111,95 +125,80 @@ public final class TerracottaMetadata {
             throw new ExceptionInInitializerError(e);
         }
 
-        LEGACY = Pattern.compile(config.legacy);
-        RECENT = config.recent;
         LATEST = config.latest;
 
-        ProviderContext context = locateProvider(config);
-        PROVIDER = context != null ? context.provider() : null;
-        PACKAGE_NAME = context != null ? String.format("terracotta-%s-%s-pkg.tar.gz", config.latest, context.branch) : null;
-
-        if (context != null) {
-            List<Link> packageLinks = new ArrayList<>(config.links.size());
-            for (Link link : config.links) {
-                packageLinks.add(new Link(
-                        link.description,
-                        link.link.replace("${version}", LATEST)
-                                .replace("${classifier}", context.branch)
-                ));
-            }
+        Options options = new Options(config.latest, OperatingSystem.CURRENT_OS.getCheckedName() + "-" + Architecture.SYSTEM_ARCH.getCheckedName());
+        TerracottaBundle bundle = config.resolve(options);
+        AbstractTerracottaProvider provider;
+        if (bundle == null || (provider = locateProvider(bundle, options)) == null) {
+            PROVIDER = null;
+            PACKAGE_NAME = null;
+            PACKAGE_LINKS = null;
+        } else {
+            PROVIDER = provider;
+            PACKAGE_NAME = options.replace("terracotta-${version}-${classifier}-pkg.tar.gz");
 
+            List<Link> packageLinks = config.links.stream()
+                    .map(link -> new Link(link.description, options.replace(link.link)))
+                    .collect(Collectors.toList());
             Collections.shuffle(packageLinks);
             PACKAGE_LINKS = Collections.unmodifiableList(packageLinks);
-        } else {
-            PACKAGE_LINKS = null;
-        }
-    }
-
-    private record ProviderContext(ITerracottaProvider provider, String branch) {
-        ProviderContext(ITerracottaProvider provider, String system, String arch) {
-            this(provider, system + "-" + arch);
         }
     }
 
     @Nullable
-    private static ProviderContext locateProvider(Config config) {
-        String arch = Architecture.SYSTEM_ARCH.getCheckedName();
+    private static AbstractTerracottaProvider locateProvider(TerracottaBundle bundle, Options options) {
+        String prefix = options.replace("terracotta-${version}-${classifier}");
+
+        // FIXME: As HMCL is a cross-platform application, developers may mistakenly locate
+        //        non-existent files in non-native platform logic without assertion errors during debugging.
         return switch (OperatingSystem.CURRENT_OS) {
             case WINDOWS -> {
                 if (!OperatingSystem.SYSTEM_VERSION.isAtLeast(OSVersion.WINDOWS_10))
                     yield null;
 
-                TerracottaNative target = config.of("windows-%s.exe".formatted(arch));
-                yield target != null
-                        ? new ProviderContext(new GeneralProvider(target), "windows", arch)
-                        : null;
-            }
-            case LINUX -> {
-                TerracottaNative target = config.of("linux-%s".formatted(arch));
-                yield target != null
-                        ? new ProviderContext(new GeneralProvider(target), "linux", arch)
-                        : null;
-            }
-            case MACOS -> {
-                TerracottaNative installer = config.of("macos-%s.pkg".formatted(arch));
-                TerracottaNative binary = config.of("macos-%s".formatted(arch));
-
-                yield installer != null && binary != null
-                        ? new ProviderContext(new MacOSProvider(installer, binary), "macos", arch)
-                        : null;
+                yield new GeneralProvider(bundle, bundle.locate(prefix + ".exe"));
             }
+            case LINUX, FREEBSD -> new GeneralProvider(bundle, bundle.locate(prefix));
+            case MACOS -> new MacOSProvider(
+                    bundle, bundle.locate(prefix), bundle.locate(prefix + ".pkg")
+            );
             default -> null;
         };
     }
 
-    public static void removeLegacyVersionFiles() throws IOException {
-        try (DirectoryStream<Path> terracotta = Files.newDirectoryStream(Metadata.DEPENDENCIES_DIRECTORY.resolve("terracotta").toAbsolutePath())) {
-            for (Path path : terracotta) {
-                String name = FileUtils.getName(path);
-                if (LATEST.equals(name) || RECENT.contains(name) || !LEGACY.matcher(name).matches()) {
-                    continue;
-                }
+    public static void removeLegacyVersionFiles() {
+        try (DirectoryStream<Path> terracotta = collectLegacyVersionFiles()) {
+            if (terracotta == null)
+                return;
 
+            for (Path path : terracotta) {
                 try {
                     FileUtils.deleteDirectory(path);
                 } catch (IOException e) {
                     LOG.warning(String.format("Unable to remove legacy terracotta files: %s", path), e);
                 }
             }
+        } catch (IOException e) {
+            LOG.warning("Unable to remove legacy terracotta files.", e);
         }
     }
 
     public static boolean hasLegacyVersionFiles() throws IOException {
-        try (DirectoryStream<Path> terracotta = Files.newDirectoryStream(Metadata.DEPENDENCIES_DIRECTORY.resolve("terracotta").toAbsolutePath())) {
-            for (Path path : terracotta) {
-                String name = FileUtils.getName(path);
-                if (!LATEST.equals(name) && (RECENT.contains(name) || LEGACY.matcher(name).matches())) {
-                    return true;
-                }
-            }
+        try (DirectoryStream<Path> terracotta = collectLegacyVersionFiles()) {
+            return terracotta != null && terracotta.iterator().hasNext();
         }
+    }
 
-        return false;
+    private static @Nullable DirectoryStream<Path> collectLegacyVersionFiles() throws IOException {
+        Path terracottaDir = Metadata.DEPENDENCIES_DIRECTORY.resolve("terracotta");
+        if (Files.notExists(terracottaDir))
+            return null;
+
+        VersionRange<VersionNumber> range = VersionNumber.atMost(LATEST);
+        return Files.newDirectoryStream(terracottaDir, path -> {
+            String name = FileUtils.getName(path);
+            return !LATEST.equals(name) && range.contains(VersionNumber.asVersion(name));
+        });
     }
 }

HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaNative.java

@@ -1,147 +0,0 @@
-/*
- * 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.terracotta;
-
-import kala.compress.archivers.tar.TarArchiveEntry;
-import org.jackhuang.hmcl.task.FileDownloadTask;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.terracotta.provider.ITerracottaProvider;
-import org.jackhuang.hmcl.util.DigestUtils;
-import org.jackhuang.hmcl.util.io.FileUtils;
-import org.jackhuang.hmcl.util.logging.Logger;
-import org.jackhuang.hmcl.util.tree.TarFileTree;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.net.http.HttpResponse;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.MessageDigest;
-import java.util.HexFormat;
-import java.util.List;
-import java.util.concurrent.CancellationException;
-
-public final class TerracottaNative {
-    private final List<URI> links;
-    private final FileDownloadTask.IntegrityCheck checking;
-    private final Path path;
-
-    public TerracottaNative(List<URI> links, Path path, FileDownloadTask.IntegrityCheck checking) {
-        this.links = links;
-        this.path = path;
-        this.checking = checking;
-    }
-
-    public Path getPath() {
-        return path;
-    }
-
-    public Task<?> install(ITerracottaProvider.Context context, @Nullable TarFileTree tree) {
-        if (tree == null) {
-            return new FileDownloadTask(links, path, checking) {
-                @Override
-                protected Context getContext(HttpResponse<?> response, boolean checkETag, String bmclapiHash) throws IOException {
-                    Context delegate = super.getContext(response, checkETag, bmclapiHash);
-                    return new Context() {
-                        @Override
-                        public void withResult(boolean success) {
-                            delegate.withResult(success);
-                        }
-
-                        @Override
-                        public void write(byte[] buffer, int offset, int len) throws IOException {
-                            if (!context.hasInstallFence()) {
-                                throw new CancellationException("User has installed terracotta from local archives.");
-                            }
-                            delegate.write(buffer, offset, len);
-                        }
-
-                        @Override
-                        public void close() throws IOException {
-                            if (isSuccess() && !context.requestInstallFence()) {
-                                throw new CancellationException();
-                            }
-
-                            delegate.close();
-                        }
-                    };
-                }
-            };
-        }
-
-        return Task.runAsync(() -> {
-            String name = FileUtils.getName(path);
-            TarArchiveEntry entry = tree.getRoot().getFiles().get(name);
-            if (entry == null) {
-                throw new ITerracottaProvider.ArchiveFileMissingException("Cannot exact entry: " + name);
-            }
-
-            if (!context.requestInstallFence()) {
-                throw new CancellationException();
-            }
-
-            Files.createDirectories(path.toAbsolutePath().getParent());
-
-            MessageDigest digest = DigestUtils.getDigest(checking.getAlgorithm());
-            try (
-                    InputStream stream = tree.getInputStream(entry);
-                    OutputStream os = Files.newOutputStream(path)
-            ) {
-                stream.transferTo(new OutputStream() {
-                    @Override
-                    public void write(int b) throws IOException {
-                        os.write(b);
-                        digest.update((byte) b);
-                    }
-
-                    @Override
-                    public void write(byte @NotNull [] buffer, int offset, int len) throws IOException {
-                        os.write(buffer, offset, len);
-                        digest.update(buffer, offset, len);
-                    }
-                });
-            }
-            String checksum = HexFormat.of().formatHex(digest.digest());
-            if (!checksum.equalsIgnoreCase(checking.getChecksum())) {
-                Files.delete(path);
-                throw new ITerracottaProvider.ArchiveFileMissingException("Incorrect checksum (" + checking.getAlgorithm() + "), expected: " + checking.getChecksum() + ", actual: " + checksum);
-            }
-        });
-    }
-
-    public ITerracottaProvider.Status status() throws IOException {
-        if (Files.exists(path)) {
-            if (DigestUtils.digestToString(checking.getAlgorithm(), path).equalsIgnoreCase(checking.getChecksum())) {
-                return ITerracottaProvider.Status.READY;
-            }
-        }
-
-        try {
-            if (TerracottaMetadata.hasLegacyVersionFiles()) {
-                return ITerracottaProvider.Status.LEGACY_VERSION;
-            }
-        } catch (IOException e) {
-            Logger.LOG.warning("Cannot determine whether legacy versions exist.");
-        }
-        return ITerracottaProvider.Status.NOT_EXIST;
-    }
-}

HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaState.java

@@ -21,15 +21,16 @@ import com.google.gson.JsonParseException;
 import com.google.gson.annotations.SerializedName;
 import javafx.beans.property.ReadOnlyDoubleProperty;
 import javafx.beans.property.ReadOnlyDoubleWrapper;
-import javafx.beans.value.ObservableValue;
+import javafx.beans.value.ObservableDoubleValue;
 import org.jackhuang.hmcl.terracotta.profile.TerracottaProfile;
-import org.jackhuang.hmcl.terracotta.provider.ITerracottaProvider;
+import org.jackhuang.hmcl.terracotta.provider.AbstractTerracottaProvider;
 import org.jackhuang.hmcl.util.gson.JsonSubtype;
 import org.jackhuang.hmcl.util.gson.JsonType;
 import org.jackhuang.hmcl.util.gson.TolerableValidationException;
 import org.jackhuang.hmcl.util.gson.Validation;
 
 import java.util.List;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public abstract sealed class TerracottaState {
@@ -63,32 +64,38 @@ public abstract sealed class TerracottaState {
         }
     }
 
-    public static final class Preparing extends TerracottaState implements ITerracottaProvider.Context {
+    public static final class Preparing extends TerracottaState implements AbstractTerracottaProvider.DownloadContext {
         private final ReadOnlyDoubleWrapper progress;
 
-        private final AtomicBoolean installFence = new AtomicBoolean(false);
+        private final AtomicBoolean hasInstallFence;
 
-        Preparing(ReadOnlyDoubleWrapper progress) {
+        Preparing(ReadOnlyDoubleWrapper progress, boolean hasInstallFence) {
             this.progress = progress;
+            this.hasInstallFence = new AtomicBoolean(hasInstallFence);
         }
 
         public ReadOnlyDoubleProperty progressProperty() {
             return progress.getReadOnlyProperty();
         }
 
-        @Override
-        public void bindProgress(ObservableValue<? extends Number> value) {
-            progress.bind(value);
-        }
-
-        @Override
         public boolean requestInstallFence() {
-            return installFence.compareAndSet(false, true);
+            return hasInstallFence.compareAndSet(true, false);
+        }
+
+        public boolean hasInstallFence() {
+            return hasInstallFence.get();
         }
 
         @Override
-        public boolean hasInstallFence() {
-            return !installFence.get();
+        public void bindProgress(ObservableDoubleValue progress) {
+            this.progress.bind(progress);
+        }
+
+        @Override
+        public void checkCancellation() {
+            if (!hasInstallFence()) {
+                throw new CancellationException("User has installed terracotta from local archives.");
+            }
         }
     }
 
@@ -112,7 +119,7 @@ public abstract sealed class TerracottaState {
                     @JsonSubtype(clazz = HostScanning.class, name = "host-scanning"),
                     @JsonSubtype(clazz = HostStarting.class, name = "host-starting"),
                     @JsonSubtype(clazz = HostOK.class, name = "host-ok"),
-                    @JsonSubtype(clazz = GuestStarting.class, name = "guest-connecting"),
+                    @JsonSubtype(clazz = GuestConnecting.class, name = "guest-connecting"),
                     @JsonSubtype(clazz = GuestStarting.class, name = "guest-starting"),
                     @JsonSubtype(clazz = GuestOK.class, name = "guest-ok"),
                     @JsonSubtype(clazz = Exception.class, name = "exception"),
@@ -202,12 +209,34 @@ public abstract sealed class TerracottaState {
         }
     }
 
-    public static final class GuestStarting extends Ready {
-        GuestStarting(int port, int index, String state) {
+    public static final class GuestConnecting extends Ready {
+        GuestConnecting(int port, int index, String state) {
             super(port, index, state);
         }
     }
 
+    public static final class GuestStarting extends Ready {
+        public enum Difficulty {
+            UNKNOWN,
+            EASIEST,
+            SIMPLE,
+            MEDIUM,
+            TOUGH
+        }
+
+        @SerializedName("difficulty")
+        private final Difficulty difficulty;
+
+        GuestStarting(int port, int index, String state, Difficulty difficulty) {
+            super(port, index, state);
+            this.difficulty = difficulty;
+        }
+
+        public Difficulty getDifficulty() {
+            return difficulty;
+        }
+    }
+
     public static final class GuestOK extends Ready implements Validation {
         @SerializedName("url")
         private final String url;

HMCL/src/main/java/org/jackhuang/hmcl/terracotta/provider/AbstractTerracottaProvider.java

@@ -0,0 +1,63 @@
+/*
+ * 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.terracotta.provider;
+
+import javafx.beans.value.ObservableDoubleValue;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.terracotta.TerracottaBundle;
+import org.jackhuang.hmcl.util.FXThread;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.concurrent.CancellationException;
+
+public abstract class AbstractTerracottaProvider {
+    public enum Status {
+        NOT_EXIST,
+        LEGACY_VERSION,
+        READY
+    }
+
+    public interface DownloadContext {
+        @FXThread
+        void bindProgress(ObservableDoubleValue progress);
+
+        void checkCancellation() throws CancellationException;
+    }
+
+    protected final TerracottaBundle bundle;
+
+    protected AbstractTerracottaProvider(TerracottaBundle bundle) {
+        this.bundle = bundle;
+    }
+
+    public Status status() throws IOException {
+        return bundle.status();
+    }
+
+    public final Task<Path> download(DownloadContext progress) {
+        return bundle.download(progress);
+    }
+
+    public Task<?> install(Path pkg) throws IOException {
+        return bundle.install(pkg);
+    }
+
+    public abstract List<String> ofCommandLine(Path portTransfer);
+}

HMCL/src/main/java/org/jackhuang/hmcl/terracotta/provider/GeneralProvider.java

@@ -17,51 +17,21 @@
  */
 package org.jackhuang.hmcl.terracotta.provider;
 
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.terracotta.TerracottaNative;
-import org.jackhuang.hmcl.util.platform.OperatingSystem;
-import org.jackhuang.hmcl.util.tree.TarFileTree;
-import org.jetbrains.annotations.Nullable;
+import org.jackhuang.hmcl.terracotta.TerracottaBundle;
 
-import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.attribute.PosixFilePermission;
 import java.util.List;
-import java.util.Set;
 
-public final class GeneralProvider implements ITerracottaProvider {
-    private final TerracottaNative target;
+public final class GeneralProvider extends AbstractTerracottaProvider {
+    private final Path executable;
 
-    public GeneralProvider(TerracottaNative target) {
-        this.target = target;
+    public GeneralProvider(TerracottaBundle bundle, Path executable) {
+        super(bundle);
+        this.executable = executable;
     }
 
     @Override
-    public Status status() throws IOException {
-        return target.status();
-    }
-
-    @Override
-    public Task<?> install(Context context, @Nullable TarFileTree tree) throws IOException {
-        Task<?> task = target.install(context, tree);
-        context.bindProgress(task.progressProperty());
-        if (OperatingSystem.CURRENT_OS.isLinuxOrBSD()) {
-            task = task.thenRunAsync(() -> Files.setPosixFilePermissions(target.getPath(), Set.of(
-                    PosixFilePermission.OWNER_READ,
-                    PosixFilePermission.OWNER_WRITE,
-                    PosixFilePermission.OWNER_EXECUTE,
-                    PosixFilePermission.GROUP_READ,
-                    PosixFilePermission.GROUP_EXECUTE,
-                    PosixFilePermission.OTHERS_READ,
-                    PosixFilePermission.OTHERS_EXECUTE
-            )));
-        }
-        return task;
-    }
-
-    @Override
-    public List<String> ofCommandLine(Path path) {
-        return List.of(target.getPath().toString(), "--hmcl", path.toString());
+    public List<String> ofCommandLine(Path portTransfer) {
+        return List.of(executable.toString(), "--hmcl", portTransfer.toString());
     }
 }

HMCL/src/main/java/org/jackhuang/hmcl/terracotta/provider/ITerracottaProvider.java

@@ -1,77 +0,0 @@
-/*
- * 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.terracotta.provider;
-
-import javafx.beans.value.ObservableValue;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.tree.TarFileTree;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.List;
-
-public interface ITerracottaProvider {
-    enum Status {
-        NOT_EXIST,
-        LEGACY_VERSION,
-        READY
-    }
-
-    interface Context {
-        void bindProgress(ObservableValue<? extends Number> value);
-
-        boolean requestInstallFence();
-        
-        boolean hasInstallFence();
-    }
-
-    abstract class ProviderException extends IOException {
-        public ProviderException(String message) {
-            super(message);
-        }
-
-        public ProviderException(String message, Throwable cause) {
-            super(message, cause);
-        }
-
-        public ProviderException(Throwable cause) {
-            super(cause);
-        }
-    }
-
-    final class ArchiveFileMissingException extends ProviderException {
-        public ArchiveFileMissingException(String message) {
-            super(message);
-        }
-
-        public ArchiveFileMissingException(String message, Throwable cause) {
-            super(message, cause);
-        }
-
-        public ArchiveFileMissingException(Throwable cause) {
-            super(cause);
-        }
-    }
-
-    Status status() throws IOException;
-
-    Task<?> install(Context context, @Nullable TarFileTree tree) throws IOException;
-
-    List<String> ofCommandLine(Path path);
-}

HMCL/src/main/java/org/jackhuang/hmcl/terracotta/provider/MacOSProvider.java

@@ -19,103 +19,77 @@ package org.jackhuang.hmcl.terracotta.provider;
 
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.terracotta.TerracottaNative;
+import org.jackhuang.hmcl.terracotta.TerracottaBundle;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.ManagedProcess;
 import org.jackhuang.hmcl.util.platform.SystemUtils;
-import org.jackhuang.hmcl.util.tree.TarFileTree;
-import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.nio.file.attribute.PosixFilePermission;
 import java.util.List;
-import java.util.Set;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
-public final class MacOSProvider implements ITerracottaProvider {
-    public final TerracottaNative installer, binary;
+public final class MacOSProvider extends AbstractTerracottaProvider {
+    private final Path executable, installer;
 
-    public MacOSProvider(TerracottaNative installer, TerracottaNative binary) {
+    public MacOSProvider(TerracottaBundle bundle, Path executable, Path installer) {
+        super(bundle);
+        this.executable = executable;
         this.installer = installer;
-        this.binary = binary;
     }
 
     @Override
     public Status status() throws IOException {
-        assert binary != null;
-
         if (!Files.exists(Path.of("/Applications/terracotta.app"))) {
             return Status.NOT_EXIST;
         }
 
-        return binary.status();
+        return bundle.status();
     }
 
     @Override
-    public Task<?> install(Context context, @Nullable TarFileTree tree) throws IOException {
-        assert installer != null && binary != null;
+    public Task<?> install(Path pkg) throws IOException {
+        return super.install(pkg).thenComposeAsync(() -> {
+            Path osascript = SystemUtils.which("osascript");
+            if (osascript == null) {
+                throw new IllegalStateException("Cannot locate 'osascript' system executable on MacOS for installing Terracotta.");
+            }
 
-        Task<?> installerTask = installer.install(context, tree);
-        Task<?> binaryTask = binary.install(context, tree);
-        context.bindProgress(installerTask.progressProperty().add(binaryTask.progressProperty()).multiply(0.4)); // (1 + 1) * 0.4 = 0.8
+            Path movedInstaller = Files.createTempDirectory(Metadata.HMCL_GLOBAL_DIRECTORY, "terracotta-pkg")
+                    .toRealPath()
+                    .resolve(FileUtils.getName(installer));
+            Files.copy(installer, movedInstaller, StandardCopyOption.REPLACE_EXISTING);
 
-        return Task.allOf(
-                installerTask.thenComposeAsync(() -> {
-                    Path osascript = SystemUtils.which("osascript");
-                    if (osascript == null) {
-                        throw new IllegalStateException("Cannot locate 'osascript' system executable on MacOS for installing Terracotta.");
-                    }
+            ManagedProcess process = new ManagedProcess(new ProcessBuilder(
+                    osascript.toString(), "-e", String.format(
+                    "do shell script \"installer -pkg '%s' -target /\" with prompt \"%s\" with administrator privileges",
+                    movedInstaller, i18n("terracotta.sudo_installing")
+            )));
+            process.pumpInputStream(SystemUtils::onLogLine);
+            process.pumpErrorStream(SystemUtils::onLogLine);
 
-                    Path pkg = Files.createTempDirectory(Metadata.HMCL_GLOBAL_DIRECTORY, "terracotta-pkg")
-                            .toRealPath()
-                            .resolve(FileUtils.getName(installer.getPath()));
-                    Files.copy(installer.getPath(), pkg, StandardCopyOption.REPLACE_EXISTING);
+            return Task.fromCompletableFuture(process.getProcess().onExit()).thenRunAsync(() -> {
+                try {
+                    FileUtils.cleanDirectory(movedInstaller.getParent());
+                } catch (IOException e) {
+                    LOG.warning("Cannot remove temporary Terracotta package file.", e);
+                }
 
-                    ManagedProcess process = new ManagedProcess(new ProcessBuilder(
-                            osascript.toString(), "-e", String.format(
-                            "do shell script \"installer -pkg '%s' -target /\" with prompt \"%s\" with administrator privileges",
-                            pkg, i18n("terracotta.sudo_installing")
-                    )));
-                    process.pumpInputStream(SystemUtils::onLogLine);
-                    process.pumpErrorStream(SystemUtils::onLogLine);
-
-                    return Task.fromCompletableFuture(process.getProcess().onExit()).thenRunAsync(() -> {
-                        try {
-                            FileUtils.cleanDirectory(pkg.getParent());
-                        } catch (IOException e) {
-                            LOG.warning("Cannot remove temporary Terracotta package file.", e);
-                        }
-
-                        if (process.getExitCode() != 0) {
-                            throw new IllegalStateException(String.format(
-                                    "Cannot install Terracotta %s: system installer exited with code %d",
-                                    pkg,
-                                    process.getExitCode()
-                            ));
-                        }
-                    });
-                }),
-                binaryTask.thenRunAsync(() -> Files.setPosixFilePermissions(binary.getPath(), Set.of(
-                        PosixFilePermission.OWNER_READ,
-                        PosixFilePermission.OWNER_WRITE,
-                        PosixFilePermission.OWNER_EXECUTE,
-                        PosixFilePermission.GROUP_READ,
-                        PosixFilePermission.GROUP_EXECUTE,
-                        PosixFilePermission.OTHERS_READ,
-                        PosixFilePermission.OTHERS_EXECUTE
-                )))
-        );
+                if (process.getExitCode() != 0) {
+                    throw new IllegalStateException(String.format(
+                            "Cannot install Terracotta %s: system installer exited with code %d", movedInstaller, process.getExitCode()
+                    ));
+                }
+            });
+        });
     }
 
     @Override
     public List<String> ofCommandLine(Path path) {
-        assert binary != null;
-
-        return List.of(binary.getPath().toString(), "--hmcl", path.toString());
+        return List.of(executable.toString(), "--hmcl", path.toString());
     }
 }

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

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.theme;
 
+import com.sun.jna.Pointer;
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -24,7 +25,10 @@ import javafx.beans.binding.ObjectBinding;
 import javafx.beans.binding.ObjectExpression;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
+import javafx.event.EventHandler;
 import javafx.scene.paint.Color;
+import javafx.stage.Stage;
+import javafx.stage.WindowEvent;
 import org.glavo.monetfx.Brightness;
 import org.glavo.monetfx.ColorScheme;
 import org.glavo.monetfx.Contrast;
@@ -32,13 +36,23 @@ import org.glavo.monetfx.beans.property.ColorSchemeProperty;
 import org.glavo.monetfx.beans.property.ReadOnlyColorSchemeProperty;
 import org.glavo.monetfx.beans.property.SimpleColorSchemeProperty;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.ui.WindowsNativeUtils;
+import org.jackhuang.hmcl.util.platform.NativeUtils;
+import org.jackhuang.hmcl.util.platform.OSVersion;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jackhuang.hmcl.util.platform.SystemUtils;
+import org.jackhuang.hmcl.util.platform.windows.Dwmapi;
+import org.jackhuang.hmcl.util.platform.windows.WinConstants;
+import org.jackhuang.hmcl.util.platform.windows.WinReg;
+import org.jackhuang.hmcl.util.platform.windows.WinTypes;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.util.*;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
 /// @author Glavo
 public final class Themes {
@@ -65,7 +79,7 @@ public final class Themes {
                     if (FXUtils.DARK_MODE != null) {
                         yield FXUtils.DARK_MODE.get() ? Brightness.DARK : Brightness.LIGHT;
                     } else {
-                        yield Brightness.DEFAULT;
+                        yield getDefaultBrightness();
                     }
                 }
                 case "dark" -> Brightness.DARK;
@@ -97,6 +111,66 @@ public final class Themes {
         theme.addListener(listener);
     }
 
+    private static Brightness defaultBrightness;
+
+    private static Brightness getDefaultBrightness() {
+        if (defaultBrightness != null)
+            return defaultBrightness;
+
+        LOG.info("Detecting system theme brightness");
+        Brightness brightness = Brightness.DEFAULT;
+        if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
+            WinReg reg = WinReg.INSTANCE;
+            if (reg != null) {
+                Object appsUseLightTheme = reg.queryValue(WinReg.HKEY.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", "AppsUseLightTheme");
+                if (appsUseLightTheme instanceof Integer value) {
+                    brightness = value == 0 ? Brightness.DARK : Brightness.LIGHT;
+                }
+            }
+        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
+            try {
+                String result = SystemUtils.run("/usr/bin/defaults", "read", "-g", "AppleInterfaceStyle").trim();
+                brightness = "Dark".equalsIgnoreCase(result) ? Brightness.DARK : Brightness.LIGHT;
+            } catch (Exception e) {
+                // If the key does not exist, it means Light mode is used
+                brightness = Brightness.LIGHT;
+            }
+        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX) {
+            Path dbusSend = SystemUtils.which("dbus-send");
+            if (dbusSend != null) {
+                try {
+                    String[] result = SystemUtils.run(List.of(
+                            FileUtils.getAbsolutePath(dbusSend),
+                            "--session",
+                            "--print-reply=literal",
+                            "--reply-timeout=1000",
+                            "--dest=org.freedesktop.portal.Desktop",
+                            "/org/freedesktop/portal/desktop",
+                            "org.freedesktop.portal.Settings.Read",
+                            "string:org.freedesktop.appearance",
+                            "string:color-scheme"
+                    ), Duration.ofSeconds(2)).trim().split(" ");
+
+                    if (result.length > 0) {
+                        String value = result[result.length - 1];
+                        // 1: prefer dark
+                        // 2: prefer light
+                        if ("1".equals(value)) {
+                            brightness = Brightness.DARK;
+                        } else if ("2".equals(value)) {
+                            brightness = Brightness.LIGHT;
+                        }
+                    }
+                } catch (Exception e) {
+                    LOG.warning("Failed to get system theme from D-Bus", e);
+                }
+            }
+        }
+        LOG.info("Detected system theme brightness: " + brightness);
+
+        return defaultBrightness = brightness;
+    }
+
     public static ObjectExpression<Theme> themeProperty() {
         return theme;
     }
@@ -129,6 +203,39 @@ public final class Themes {
         return darkMode;
     }
 
+    public static void applyNativeDarkMode(Stage stage) {
+        if (OperatingSystem.SYSTEM_VERSION.isAtLeast(OSVersion.WINDOWS_11) && NativeUtils.USE_JNA && Dwmapi.INSTANCE != null) {
+            ChangeListener<Boolean> listener = FXUtils.onWeakChange(Themes.darkModeProperty(), darkMode -> {
+                if (stage.isShowing()) {
+                    WindowsNativeUtils.getWindowHandle(stage).ifPresent(handle -> {
+                        if (handle == WinTypes.HANDLE.INVALID_VALUE)
+                            return;
+
+                        Dwmapi.INSTANCE.DwmSetWindowAttribute(
+                                new WinTypes.HANDLE(Pointer.createConstant(handle)),
+                                WinConstants.DWMWA_USE_IMMERSIVE_DARK_MODE,
+                                new WinTypes.BOOLByReference(new WinTypes.BOOL(darkMode)),
+                                WinTypes.BOOL.SIZE
+                        );
+                    });
+                }
+            });
+            stage.getProperties().put("Themes.applyNativeDarkMode.listener", listener);
+
+            if (stage.isShowing()) {
+                listener.changed(null, false, Themes.darkModeProperty().get());
+            } else {
+                stage.addEventFilter(WindowEvent.WINDOW_SHOWN, new EventHandler<>() {
+                    @Override
+                    public void handle(WindowEvent event) {
+                        stage.removeEventFilter(WindowEvent.WINDOW_SHOWN, this);
+                        listener.changed(null, false, Themes.darkModeProperty().get());
+                    }
+                });
+            }
+        }
+    }
+
     private Themes() {
     }
 }

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

@@ -19,6 +19,7 @@ package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialogLayout;
+import com.jfoenix.validation.base.ValidatorBase;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
@@ -72,9 +73,10 @@ import java.nio.file.Path;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-import static org.jackhuang.hmcl.setting.ConfigHolder.*;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.setting.ConfigHolder.globalConfig;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
 public final class Controllers {
     public static final String JAVA_VERSION_TIP = "javaVersion";
@@ -505,8 +507,8 @@ public final class Controllers {
         return prompt(title, onResult, "");
     }
 
-    public static CompletableFuture<String> prompt(String title, FutureCallback<String> onResult, String initialValue) {
-        InputDialogPane pane = new InputDialogPane(title, initialValue, onResult);
+    public static CompletableFuture<String> prompt(String title, FutureCallback<String> onResult, String initialValue, ValidatorBase... validators) {
+        InputDialogPane pane = new InputDialogPane(title, initialValue, onResult, validators);
         dialog(pane);
         return pane.getCompletableFuture();
     }

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

@@ -0,0 +1,155 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2025  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui;
+
+import com.jfoenix.controls.JFXDialog;
+import javafx.application.Platform;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.event.EventHandler;
+import javafx.scene.Node;
+import javafx.scene.layout.StackPane;
+import org.jackhuang.hmcl.ui.animation.AnimationUtils;
+import org.jackhuang.hmcl.ui.construct.DialogAware;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
+import org.jackhuang.hmcl.ui.construct.JFXDialogPane;
+import org.jackhuang.hmcl.ui.decorator.Decorator;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Optional;
+import java.util.function.Consumer;
+
+public final class DialogUtils {
+    private DialogUtils() {
+    }
+
+    public static final String PROPERTY_DIALOG_INSTANCE = DialogUtils.class.getName() + ".dialog.instance";
+    public static final String PROPERTY_DIALOG_PANE_INSTANCE = DialogUtils.class.getName() + ".dialog.pane.instance";
+    public static final String PROPERTY_DIALOG_CLOSE_HANDLER = DialogUtils.class.getName() + ".dialog.closeListener";
+
+    public static final String PROPERTY_PARENT_PANE_REF = DialogUtils.class.getName() + ".dialog.parentPaneRef";
+    public static final String PROPERTY_PARENT_DIALOG_REF = DialogUtils.class.getName() + ".dialog.parentDialogRef";
+
+    public static void show(Decorator decorator, Node content) {
+        if (decorator.getDrawerWrapper() == null) {
+            Platform.runLater(() -> show(decorator, content));
+            return;
+        }
+
+        show(decorator.getDrawerWrapper(), content, (dialog) -> {
+            JFXDialogPane pane = (JFXDialogPane) dialog.getContent();
+            decorator.capableDraggingWindow(dialog);
+            decorator.forbidDraggingWindow(pane);
+            dialog.setDialogContainer(decorator.getDrawerWrapper());
+        });
+    }
+
+    public static void show(StackPane container, Node content) {
+        show(container, content, null);
+    }
+
+    public static void show(StackPane container, Node content, @Nullable Consumer<JFXDialog> onDialogCreated) {
+        FXUtils.checkFxUserThread();
+
+        JFXDialog dialog = (JFXDialog) container.getProperties().get(PROPERTY_DIALOG_INSTANCE);
+        JFXDialogPane dialogPane = (JFXDialogPane) container.getProperties().get(PROPERTY_DIALOG_PANE_INSTANCE);
+
+        if (dialog == null) {
+            dialog = new JFXDialog(AnimationUtils.isAnimationEnabled()
+                    ? JFXDialog.DialogTransition.CENTER
+                    : JFXDialog.DialogTransition.NONE);
+            dialogPane = new JFXDialogPane();
+
+            dialog.setContent(dialogPane);
+            dialog.setDialogContainer(container);
+            dialog.setOverlayClose(false);
+
+            container.getProperties().put(PROPERTY_DIALOG_INSTANCE, dialog);
+            container.getProperties().put(PROPERTY_DIALOG_PANE_INSTANCE, dialogPane);
+
+            if (onDialogCreated != null) {
+                onDialogCreated.accept(dialog);
+            }
+
+            dialog.show();
+        }
+
+        content.getProperties().put(PROPERTY_PARENT_PANE_REF, dialogPane);
+        content.getProperties().put(PROPERTY_PARENT_DIALOG_REF, dialog);
+
+        dialogPane.push(content);
+
+        EventHandler<DialogCloseEvent> handler = event -> close(content);
+        content.getProperties().put(PROPERTY_DIALOG_CLOSE_HANDLER, handler);
+        content.addEventHandler(DialogCloseEvent.CLOSE, handler);
+
+        handleDialogShown(dialog, content);
+    }
+
+    private static void handleDialogShown(JFXDialog dialog, Node node) {
+        if (dialog.isVisible()) {
+            dialog.requestFocus();
+            if (node instanceof DialogAware dialogAware)
+                dialogAware.onDialogShown();
+        } else {
+            dialog.visibleProperty().addListener(new ChangeListener<>() {
+                @Override
+                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                    if (newValue) {
+                        dialog.requestFocus();
+                        if (node instanceof DialogAware dialogAware)
+                            dialogAware.onDialogShown();
+                        observable.removeListener(this);
+                    }
+                }
+            });
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public static void close(Node content) {
+        FXUtils.checkFxUserThread();
+
+        Optional.ofNullable(content.getProperties().get(PROPERTY_DIALOG_CLOSE_HANDLER))
+                .ifPresent(handler -> content.removeEventHandler(DialogCloseEvent.CLOSE, (EventHandler<DialogCloseEvent>) handler));
+
+        JFXDialogPane pane = (JFXDialogPane) content.getProperties().get(PROPERTY_PARENT_PANE_REF);
+        JFXDialog dialog = (JFXDialog) content.getProperties().get(PROPERTY_PARENT_DIALOG_REF);
+
+        if (dialog != null && pane != null) {
+            if (pane.size() == 1 && pane.peek().orElse(null) == content) {
+                dialog.setOnDialogClosed(e -> pane.pop(content));
+                dialog.close();
+
+                StackPane container = dialog.getDialogContainer();
+                if (container != null) {
+                    container.getProperties().remove(PROPERTY_DIALOG_INSTANCE);
+                    container.getProperties().remove(PROPERTY_DIALOG_PANE_INSTANCE);
+                    container.getProperties().remove(PROPERTY_PARENT_DIALOG_REF);
+                    container.getProperties().remove(PROPERTY_PARENT_PANE_REF);
+                }
+            } else {
+                pane.pop(content);
+            }
+
+            if (content instanceof DialogAware dialogAware) {
+                dialogAware.onDialogClosed();
+            }
+        }
+    }
+}

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

@@ -18,7 +18,8 @@
 package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.controls.*;
-import javafx.animation.*;
+import javafx.animation.Animation;
+import javafx.animation.Interpolator;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -26,7 +27,10 @@ import javafx.beans.WeakInvalidationListener;
 import javafx.beans.WeakListener;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.*;
-import javafx.beans.value.*;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableBooleanValue;
+import javafx.beans.value.ObservableValue;
+import javafx.beans.value.WeakChangeListener;
 import javafx.collections.ObservableMap;
 import javafx.event.Event;
 import javafx.event.EventDispatcher;
@@ -39,20 +43,23 @@ import javafx.scene.Cursor;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
 import javafx.scene.control.*;
 import javafx.scene.control.skin.VirtualFlow;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.*;
-import javafx.scene.layout.*;
+import javafx.scene.layout.ColumnConstraints;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
-import javafx.stage.*;
+import javafx.stage.FileChooser;
+import javafx.stage.Screen;
+import javafx.stage.Stage;
 import javafx.util.Callback;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
@@ -61,9 +68,13 @@ import org.jackhuang.hmcl.task.CacheFileTask;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.animation.AnimationUtils;
+import org.jackhuang.hmcl.ui.construct.IconedMenuItem;
+import org.jackhuang.hmcl.ui.construct.MenuSeparator;
+import org.jackhuang.hmcl.ui.construct.PopupMenu;
 import org.jackhuang.hmcl.ui.image.ImageLoader;
 import org.jackhuang.hmcl.ui.image.ImageUtils;
-import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.ResourceNotFoundError;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.jackhuang.hmcl.util.javafx.ExtendedProperties;
@@ -88,12 +99,14 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.ref.WeakReference;
-import java.net.*;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLConnection;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.PathMatcher;
-import java.util.List;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.*;
@@ -102,8 +115,8 @@ import java.util.regex.Pattern;
 
 import static org.jackhuang.hmcl.util.Lang.thread;
 import static org.jackhuang.hmcl.util.Lang.tryCast;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
 public final class FXUtils {
     private FXUtils() {
@@ -137,6 +150,7 @@ public final class FXUtils {
     public static final @Nullable ReadOnlyObjectProperty<Color> ACCENT_COLOR;
 
     public static final @Nullable MethodHandle TEXT_TRUNCATED_PROPERTY;
+    public static final @Nullable MethodHandle FOCUS_VISIBLE_PROPERTY;
 
     static {
         String jfxVersion = System.getProperty("javafx.version");
@@ -203,6 +217,20 @@ public final class FXUtils {
             }
         }
         TEXT_TRUNCATED_PROPERTY = textTruncatedProperty;
+
+        MethodHandle focusVisibleProperty = null;
+        if (JAVAFX_MAJOR_VERSION >= 19) {
+            try {
+                focusVisibleProperty = MethodHandles.publicLookup().findVirtual(
+                        Node.class,
+                        "focusVisibleProperty",
+                        MethodType.methodType(ReadOnlyBooleanProperty.class)
+                );
+            } catch (Throwable e) {
+                LOG.warning("Failed to lookup focusVisibleProperty", e);
+            }
+        }
+        FOCUS_VISIBLE_PROPERTY = focusVisibleProperty;
     }
 
     public static final String DEFAULT_MONOSPACE_FONT = OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? "Consolas" : "Monospace";
@@ -284,6 +312,14 @@ public final class FXUtils {
         });
     }
 
+    public static Node wrap(Node node) {
+        return limitingSize(node, 30, 20);
+    }
+
+    public static Node wrap(SVG svg) {
+        return wrap(svg.createIcon(20));
+    }
+
     private static class ListenerPair<T> {
         private final ObservableValue<T> value;
         private final ChangeListener<? super T> listener;
@@ -397,6 +433,20 @@ public final class FXUtils {
         return pane;
     }
 
+    public static void limitCellWidth(ListView<?> listView, ListCell<?> cell) {
+        ReadOnlyDoubleProperty widthProperty;
+
+        if (listView.lookup(".clipped-container") instanceof Region clippedContainer) {
+            widthProperty = clippedContainer.widthProperty();
+        } else {
+            widthProperty = listView.widthProperty();
+        }
+
+        cell.maxWidthProperty().bind(widthProperty);
+        cell.prefWidthProperty().bind(widthProperty);
+        cell.minWidthProperty().bind(widthProperty);
+    }
+
     public static void smoothScrolling(ScrollPane scrollPane) {
         if (AnimationUtils.isAnimationEnabled())
             ScrollUtils.addSmoothScrolling(scrollPane);
@@ -423,6 +473,20 @@ public final class FXUtils {
         }
     }
 
+    public static @Nullable ReadOnlyBooleanProperty focusVisibleProperty(Node node) {
+        if (FOCUS_VISIBLE_PROPERTY != null) {
+            try {
+                return (ReadOnlyBooleanProperty) FOCUS_VISIBLE_PROPERTY.invokeExact(node);
+            } catch (RuntimeException | Error e) {
+                throw e;
+            } catch (Throwable e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            return null;
+        }
+    }
+
     private static final Duration TOOLTIP_FAST_SHOW_DELAY = Duration.millis(50);
     private static final Duration TOOLTIP_SLOW_SHOW_DELAY = Duration.millis(500);
     private static final Duration TOOLTIP_SHOW_DURATION = Duration.millis(5000);
@@ -1188,12 +1252,14 @@ public final class FXUtils {
 
     public static Task<Image> getRemoteImageTask(String url, int requestedWidth, int requestedHeight, boolean preserveRatio, boolean smooth) {
         return new CacheFileTask(url)
+                .setSignificance(Task.TaskSignificance.MINOR)
                 .thenApplyAsync(file -> loadImage(file, requestedWidth, requestedHeight, preserveRatio, smooth))
                 .setSignificance(Task.TaskSignificance.MINOR);
     }
 
     public static Task<Image> getRemoteImageTask(URI uri, int requestedWidth, int requestedHeight, boolean preserveRatio, boolean smooth) {
         return new CacheFileTask(uri)
+                .setSignificance(Task.TaskSignificance.MINOR)
                 .thenApplyAsync(file -> loadImage(file, requestedWidth, requestedHeight, preserveRatio, smooth))
                 .setSignificance(Task.TaskSignificance.MINOR);
     }
@@ -1208,6 +1274,7 @@ public final class FXUtils {
                         LOG.warning("An exception encountered while loading remote image: " + url, exception);
                     }
                 })
+                .setSignificance(Task.TaskSignificance.MINOR)
                 .start();
         return image;
     }
@@ -1232,8 +1299,8 @@ public final class FXUtils {
         return button;
     }
 
-    public static Label newSafeTruncatedLabel(String text) {
-        Label label = new Label(text);
+    public static Label newSafeTruncatedLabel() {
+        Label label = new Label();
         label.setTextOverrun(OverrunStyle.CENTER_WORD_ELLIPSIS);
         showTooltipWhenTruncated(label);
         return label;
@@ -1309,17 +1376,11 @@ public final class FXUtils {
     }
 
     public static <T> Callback<ListView<T>, ListCell<T>> jfxListCellFactory(Function<T, Node> graphicBuilder) {
-        Holder<Object> lastCell = new Holder<>();
         return view -> new JFXListCell<T>() {
             @Override
             public void updateItem(T item, boolean empty) {
                 super.updateItem(item, empty);
 
-                // https://mail.openjdk.org/pipermail/openjfx-dev/2022-July/034764.html
-                if (this == lastCell.value && !isVisible())
-                    return;
-                lastCell.value = this;
-
                 if (!empty) {
                     setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
                     setGraphic(graphicBuilder.apply(item));
@@ -1364,7 +1425,16 @@ public final class FXUtils {
 
     public static void onClicked(Node node, Runnable action) {
         node.addEventHandler(MouseEvent.MOUSE_CLICKED, e -> {
-            if (e.getButton() == MouseButton.PRIMARY && e.getClickCount() == 1) {
+            if (e.getButton() == MouseButton.PRIMARY) {
+                action.run();
+                e.consume();
+            }
+        });
+    }
+
+    public static void onSecondaryButtonClicked(Node node, Runnable action) {
+        node.addEventHandler(MouseEvent.MOUSE_CLICKED, e -> {
+            if (e.getButton() == MouseButton.SECONDARY) {
                 action.run();
                 e.consume();
             }
@@ -1410,16 +1480,6 @@ public final class FXUtils {
         });
     }
 
-    public static void clearFocus(Node node) {
-        Scene scene = node.getScene();
-        if (scene != null) {
-            Parent root = scene.getRoot();
-            if (root != null) {
-                root.requestFocus();
-            }
-        }
-    }
-
     public static void copyOnDoubleClick(Labeled label) {
         label.addEventHandler(MouseEvent.MOUSE_CLICKED, e -> {
             if (e.getButton() == MouseButton.PRIMARY && e.getClickCount() == 2) {
@@ -1576,4 +1636,39 @@ public final class FXUtils {
                 ? 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) {
+        control.setContextMenu(null);
+
+        PopupMenu menu = new PopupMenu();
+        JFXPopup popup = new JFXPopup(menu);
+        popup.setAutoHide(true);
+
+        control.setOnContextMenuRequested(e -> {
+            boolean hasNoSelection = control.getSelectedText().isEmpty();
+
+            IconedMenuItem undo = new IconedMenuItem(SVG.UNDO, i18n("menu.undo"), control::undo, popup);
+            IconedMenuItem redo = new IconedMenuItem(SVG.REDO, i18n("menu.redo"), control::redo, popup);
+            IconedMenuItem cut = new IconedMenuItem(SVG.CONTENT_CUT, i18n("menu.cut"), control::cut, popup);
+            IconedMenuItem copy = new IconedMenuItem(SVG.CONTENT_COPY, i18n("menu.copy"), control::copy, popup);
+            IconedMenuItem paste = new IconedMenuItem(SVG.CONTENT_PASTE, i18n("menu.paste"), control::paste, popup);
+            IconedMenuItem delete = new IconedMenuItem(SVG.DELETE, i18n("menu.deleteselection"), () -> control.replaceSelection(""), popup);
+            IconedMenuItem selectall = new IconedMenuItem(SVG.SELECT_ALL, i18n("menu.selectall"), control::selectAll, popup);
+
+            menu.getContent().setAll(undo, redo, new MenuSeparator(), cut, copy, paste, delete, new MenuSeparator(), selectall);
+
+            undo.setDisable(!control.isUndoable());
+            redo.setDisable(!control.isRedoable());
+            cut.setDisable(hasNoSelection);
+            delete.setDisable(hasNoSelection);
+            copy.setDisable(hasNoSelection);
+            paste.setDisable(!Clipboard.getSystemClipboard().hasString());
+            selectall.setDisable(control.getText() == null || control.getText().isEmpty());
+
+            JFXPopup.PopupVPosition vPosition = determineOptimalPopupPosition(control, popup);
+            popup.show(control, vPosition, JFXPopup.PopupHPosition.LEFT, e.getX(), vPosition == JFXPopup.PopupVPosition.TOP ? e.getY() : e.getY() - control.getHeight());
+
+            e.consume();
+        });
+    }
 }

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

@@ -24,11 +24,11 @@ import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.Scene;
-import javafx.scene.control.Alert;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
+import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
@@ -40,6 +40,8 @@ import org.jackhuang.hmcl.launch.ProcessListener;
 import org.jackhuang.hmcl.setting.StyleSheets;
 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.TwoLineListItem;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.Log4jLevel;
@@ -50,9 +52,12 @@ import org.jackhuang.hmcl.util.logging.Logger;
 import org.jackhuang.hmcl.util.platform.*;
 
 import java.io.IOException;
+import java.lang.management.ManagementFactory;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.attribute.FileTime;
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -81,10 +86,13 @@ public class GameCrashWindow extends Stage {
     private final ProcessListener.ExitType exitType;
     private final LaunchOptions launchOptions;
     private final View view;
+    private final StackPane stackPane;
 
     private final List<Log> logs;
 
     public GameCrashWindow(ManagedProcess managedProcess, ProcessListener.ExitType exitType, DefaultGameRepository repository, Version version, LaunchOptions launchOptions, List<Log> logs) {
+        Themes.applyNativeDarkMode(this);
+
         this.managedProcess = managedProcess;
         this.exitType = exitType;
         this.repository = repository;
@@ -93,7 +101,7 @@ public class GameCrashWindow extends Stage {
         this.logs = logs;
         this.analyzer = LibraryAnalyzer.analyze(version, repository.getGameVersion(version).orElse(null));
 
-        memory = Optional.ofNullable(launchOptions.getMaxMemory()).map(i -> i + " MB").orElse("-");
+        memory = Optional.ofNullable(launchOptions.getMaxMemory()).map(i -> i + " " + i18n("settings.memory.unit.mib")).orElse("-");
 
         total_memory = MEGABYTES.formatBytes(SystemInfo.getTotalMemorySize());
 
@@ -103,9 +111,10 @@ public class GameCrashWindow extends Stage {
 
         this.view = new View();
 
+        this.stackPane = new StackPane(view);
         this.feedbackTextFlow.getChildren().addAll(FXUtils.parseSegment(i18n("game.crash.feedback"), Controllers::onHyperlinkAction));
 
-        setScene(new Scene(view, 800, 480));
+        setScene(new Scene(stackPane, 800, 480));
         StyleSheets.init(getScene());
         setTitle(i18n("game.crash.title"));
         FXUtils.setIcon(this);
@@ -269,22 +278,41 @@ public class GameCrashWindow extends Stage {
 
         CompletableFuture.supplyAsync(() ->
                         logs.stream().map(Log::getLog).collect(Collectors.joining("\n")))
-                .thenComposeAsync(logs ->
-                        LogExporter.exportLogs(logFile, repository, launchOptions.getVersionName(), logs, new CommandBuilder().addAll(managedProcess.getCommands()).toString()))
-                .handleAsync((result, exception) -> {
-                    Alert alert;
+                .thenComposeAsync(logs -> {
+                    long processStartTime = managedProcess.getProcess().info()
+                            .startInstant()
+                            .map(Instant::toEpochMilli).orElseGet(() -> {
+                                try {
+                                    return ManagementFactory.getRuntimeMXBean().getStartTime();
+                                } catch (Throwable e) {
+                                    LOG.warning("Failed to get process start time", e);
+                                    return 0L;
+                                }
+                            });
 
+                    return LogExporter.exportLogs(logFile, repository, launchOptions.getVersionName(), logs,
+                            new CommandBuilder().addAll(managedProcess.getCommands()).toString(),
+                            path -> {
+                                try {
+                                    FileTime lastModifiedTime = Files.getLastModifiedTime(path);
+                                    return lastModifiedTime.toMillis() >= processStartTime;
+                                } catch (Throwable e) {
+                                    LOG.warning("Failed to read file attributes", e);
+                                    return false;
+                                }
+                            });
+                })
+                .handleAsync((result, exception) -> {
                     if (exception == null) {
                         FXUtils.showFileInExplorer(logFile);
-                        alert = new Alert(Alert.AlertType.INFORMATION, i18n("settings.launcher.launcher_log.export.success", 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);
-                        alert = new Alert(Alert.AlertType.WARNING, i18n("settings.launcher.launcher_log.export.failed") + "\n" + StringUtils.getStackTrace(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);
                     }
 
-                    alert.setTitle(i18n("settings.launcher.launcher_log.export"));
-                    alert.showAndWait();
-
                     return null;
                 }, Schedulers.javafx());
     }

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

@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXRippler;
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
@@ -62,7 +63,7 @@ public class InstallerItem extends Control {
     private final ObjectProperty<Runnable> onInstall = new SimpleObjectProperty<>(this, "onInstall");
     private final ObjectProperty<Runnable> onRemove = new SimpleObjectProperty<>(this, "onRemove");
 
-    public interface State {
+    public sealed interface State {
     }
 
     public static final class InstallableState implements State {
@@ -72,46 +73,10 @@ public class InstallerItem extends Control {
         }
     }
 
-    public static final class IncompatibleState implements State {
-        private final String incompatibleItemName;
-        private final String incompatibleItemVersion;
-
-        public IncompatibleState(String incompatibleItemName, String incompatibleItemVersion) {
-            this.incompatibleItemName = incompatibleItemName;
-            this.incompatibleItemVersion = incompatibleItemVersion;
-        }
-
-        public String getIncompatibleItemName() {
-            return incompatibleItemName;
-        }
-
-        public String getIncompatibleItemVersion() {
-            return incompatibleItemVersion;
-        }
+    public record IncompatibleState(String incompatibleItemName, String incompatibleItemVersion) implements State {
     }
 
-    public static final class InstalledState implements State {
-        private final String version;
-        private final boolean external;
-        private final boolean incompatibleWithGame;
-
-        public InstalledState(String version, boolean external, boolean incompatibleWithGame) {
-            this.version = version;
-            this.external = external;
-            this.incompatibleWithGame = incompatibleWithGame;
-        }
-
-        public String getVersion() {
-            return version;
-        }
-
-        public boolean isExternal() {
-            return external;
-        }
-
-        public boolean isIncompatibleWithGame() {
-            return incompatibleWithGame;
-        }
+    public record InstalledState(String version, boolean external, boolean incompatibleWithGame) implements State {
     }
 
     public enum Style {
@@ -127,37 +92,18 @@ public class InstallerItem extends Control {
         this.id = id;
         this.style = style;
 
-        switch (id) {
-            case "game":
-                iconType = VersionIconType.GRASS;
-                break;
-            case "fabric":
-            case "fabric-api":
-                iconType = VersionIconType.FABRIC;
-                break;
-            case "forge":
-                iconType = VersionIconType.FORGE;
-                break;
-            case "cleanroom":
-                iconType = VersionIconType.CLEANROOM;
-                break;
-            case "liteloader":
-                iconType = VersionIconType.CHICKEN;
-                break;
-            case "optifine":
-                iconType = VersionIconType.OPTIFINE;
-                break;
-            case "quilt":
-            case "quilt-api":
-                iconType = VersionIconType.QUILT;
-                break;
-            case "neoforge":
-                iconType = VersionIconType.NEO_FORGE;
-                break;
-            default:
-                iconType = null;
-                break;
-        }
+        iconType = switch (id) {
+            case "game" -> VersionIconType.GRASS;
+            case "fabric", "fabric-api" -> VersionIconType.FABRIC;
+            case "legacyfabric", "legacyfabric-api" -> VersionIconType.LEGACY_FABRIC;
+            case "forge" -> VersionIconType.FORGE;
+            case "cleanroom" -> VersionIconType.CLEANROOM;
+            case "liteloader" -> VersionIconType.CHICKEN;
+            case "optifine" -> VersionIconType.OPTIFINE;
+            case "quilt", "quilt-api" -> VersionIconType.QUILT;
+            case "neoforge" -> VersionIconType.NEO_FORGE;
+            default -> null;
+        };
     }
 
     public String getLibraryId() {
@@ -236,6 +182,8 @@ public class InstallerItem extends Control {
             InstallerItem fabricApi = new InstallerItem(FABRIC_API, style);
             InstallerItem forge = new InstallerItem(FORGE, style);
             InstallerItem cleanroom = new InstallerItem(CLEANROOM, style);
+            InstallerItem legacyfabric = new InstallerItem(LEGACY_FABRIC, style);
+            InstallerItem legacyfabricApi = new InstallerItem(LEGACY_FABRIC_API, style);
             InstallerItem neoForge = new InstallerItem(NEO_FORGE, style);
             InstallerItem liteLoader = new InstallerItem(LITELOADER, style);
             InstallerItem optiFine = new InstallerItem(OPTIFINE, style);
@@ -243,11 +191,11 @@ public class InstallerItem extends Control {
             InstallerItem quiltApi = new InstallerItem(QUILT_API, style);
 
             Map<InstallerItem, Set<InstallerItem>> incompatibleMap = new HashMap<>();
-            mutualIncompatible(incompatibleMap, forge, fabric, quilt, neoForge, cleanroom);
-            addIncompatibles(incompatibleMap, liteLoader, fabric, quilt, neoForge, cleanroom);
-            addIncompatibles(incompatibleMap, optiFine, fabric, quilt, neoForge, cleanroom);
-            addIncompatibles(incompatibleMap, fabricApi, forge, quiltApi, neoForge, liteLoader, optiFine, cleanroom);
-            addIncompatibles(incompatibleMap, quiltApi, forge, fabric, fabricApi, neoForge, liteLoader, optiFine, cleanroom);
+            mutualIncompatible(incompatibleMap, forge, fabric, quilt, neoForge, cleanroom, legacyfabric);
+            addIncompatibles(incompatibleMap, liteLoader, fabric, quilt, neoForge, cleanroom, legacyfabric);
+            addIncompatibles(incompatibleMap, optiFine, fabric, quilt, neoForge, cleanroom, liteLoader, legacyfabric);
+            addIncompatibles(incompatibleMap, fabricApi, forge, quiltApi, neoForge, liteLoader, optiFine, cleanroom, legacyfabricApi, legacyfabricApi);
+            addIncompatibles(incompatibleMap, quiltApi, forge, fabric, fabricApi, neoForge, liteLoader, optiFine, cleanroom, legacyfabric, legacyfabricApi);
 
             for (Map.Entry<InstallerItem, Set<InstallerItem>> entry : incompatibleMap.entrySet()) {
                 InstallerItem item = entry.getKey();
@@ -281,7 +229,7 @@ public class InstallerItem extends Control {
                 game.versionProperty.set(new InstalledState(gameVersion, false, false));
             }
 
-            InstallerItem[] all = {game, forge, neoForge, liteLoader, optiFine, fabric, fabricApi, quilt, quiltApi, cleanroom};
+            InstallerItem[] all = {game, forge, neoForge, liteLoader, optiFine, fabric, fabricApi, quilt, quiltApi, legacyfabric, legacyfabricApi, cleanroom};
 
             for (InstallerItem item : all) {
                 if (!item.resolvedStateProperty.isBound()) {
@@ -298,9 +246,9 @@ public class InstallerItem extends Control {
             if (gameVersion == null) {
                 this.libraries = all;
             } else if (gameVersion.equals("1.12.2")) {
-                this.libraries = new InstallerItem[]{game, forge, cleanroom, liteLoader, optiFine};
-            } else if (GameVersionNumber.compare(gameVersion, "1.13") < 0) {
-                this.libraries = new InstallerItem[]{game, forge, liteLoader, optiFine};
+                this.libraries = new InstallerItem[]{game, forge, cleanroom, liteLoader, legacyfabric, legacyfabricApi, optiFine};
+            } else if (GameVersionNumber.compare(gameVersion, "1.13.2") <= 0) {
+                this.libraries = new InstallerItem[]{game, forge, liteLoader, optiFine, legacyfabric, legacyfabricApi};
             } else {
                 this.libraries = new InstallerItem[]{game, forge, neoForge, optiFine, fabric, fabricApi, quilt, quiltApi};
             }
@@ -335,10 +283,15 @@ public class InstallerItem extends Control {
             }
             pane.getStyleClass().add("installer-item");
             RipplerContainer container = new RipplerContainer(pane);
-            getChildren().setAll(container);
+            container.setPosition(JFXRippler.RipplerPos.BACK);
+            StackPane paneWrapper = new StackPane();
+            paneWrapper.getStyleClass().add("installer-item-wrapper");
+            paneWrapper.getChildren().setAll(container);
+            getChildren().setAll(paneWrapper);
 
             pane.pseudoClassStateChanged(LIST_ITEM, control.style == Style.LIST_ITEM);
             pane.pseudoClassStateChanged(CARD, control.style == Style.CARD);
+            paneWrapper.pseudoClassStateChanged(CARD, control.style == Style.CARD);
 
             if (control.iconType != null) {
                 ImageView view = new ImageView(control.iconType.getIcon());
@@ -367,21 +320,20 @@ public class InstallerItem extends Control {
             statusLabel.textProperty().bind(Bindings.createStringBinding(() -> {
                 State state = control.resolvedStateProperty.get();
 
-                if (state instanceof InstalledState) {
-                    InstalledState s = (InstalledState) state;
-                    if (s.incompatibleWithGame) {
-                        return i18n("install.installer.change_version", s.version);
+                if (state instanceof InstalledState installedState) {
+                    if (installedState.incompatibleWithGame) {
+                        return i18n("install.installer.change_version", installedState.version);
                     }
-                    if (s.external) {
-                        return i18n("install.installer.external_version", s.version);
+                    if (installedState.external) {
+                        return i18n("install.installer.external_version", installedState.version);
                     }
-                    return i18n("install.installer.version", s.version);
+                    return i18n("install.installer.version", installedState.version);
                 } else if (state instanceof InstallableState) {
                     return control.style == Style.CARD
                             ? i18n("install.installer.do_not_install")
                             : i18n("install.installer.not_installed");
-                } else if (state instanceof IncompatibleState) {
-                    return i18n("install.installer.incompatible", i18n("install.installer." + ((IncompatibleState) state).incompatibleItemName));
+                } else if (state instanceof IncompatibleState incompatibleState) {
+                    return i18n("install.installer.incompatible", i18n("install.installer." + incompatibleState.incompatibleItemName));
                 } else {
                     throw new AssertionError("Unknown state type: " + state.getClass());
                 }
@@ -402,7 +354,7 @@ public class InstallerItem extends Control {
             } else {
                 removeButton.visibleProperty().bind(Bindings.createBooleanBinding(() -> {
                     State state = control.resolvedStateProperty.get();
-                    return state instanceof InstalledState && !((InstalledState) state).external;
+                    return state instanceof InstalledState installedState && !installedState.external;
                 }, control.resolvedStateProperty));
             }
             removeButton.managedProperty().bind(removeButton.visibleProperty());

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

@@ -1,49 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.scene.Node;
-import javafx.scene.control.Skin;
-
-public abstract class ListPage<T extends Node> extends ListPageBase<T> {
-    private final BooleanProperty refreshable = new SimpleBooleanProperty(this, "refreshable", false);
-
-    public abstract void add();
-
-    public void refresh() {
-    }
-
-    @Override
-    protected Skin<?> createDefaultSkin() {
-        return new ListPageSkin(this);
-    }
-
-    public boolean isRefreshable() {
-        return refreshable.get();
-    }
-
-    public BooleanProperty refreshableProperty() {
-        return refreshable;
-    }
-
-    public void setRefreshable(boolean refreshable) {
-        this.refreshable.set(refreshable);
-    }
-}

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

@@ -1,108 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui;
-
-import com.jfoenix.controls.JFXButton;
-import javafx.beans.binding.Bindings;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.SkinBase;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.ui.construct.SpinnerPane;
-
-public class ListPageSkin extends SkinBase<ListPage<?>> {
-
-    public ListPageSkin(ListPage<?> skinnable) {
-        super(skinnable);
-
-        SpinnerPane spinnerPane = new SpinnerPane();
-        spinnerPane.getStyleClass().add("large-spinner-pane");
-        Pane placeholder = new Pane();
-        VBox list = new VBox();
-
-        StackPane contentPane = new StackPane();
-        {
-            ScrollPane scrollPane = new ScrollPane();
-            {
-                scrollPane.setFitToWidth(true);
-
-                list.maxWidthProperty().bind(scrollPane.widthProperty());
-                list.setSpacing(10);
-
-                VBox content = new VBox();
-                content.getChildren().setAll(list, placeholder);
-
-                Bindings.bindContent(list.getChildren(), skinnable.itemsProperty());
-
-                scrollPane.setContent(content);
-                FXUtils.smoothScrolling(scrollPane);
-            }
-            
-            VBox vBox = new VBox();
-            {
-                vBox.getStyleClass().add("card-list");
-                vBox.setAlignment(Pos.BOTTOM_RIGHT);
-                vBox.setPickOnBounds(false);
-
-                JFXButton btnAdd = FXUtils.newRaisedButton("");
-                FXUtils.setLimitWidth(btnAdd, 40);
-                FXUtils.setLimitHeight(btnAdd, 40);
-                btnAdd.setGraphic(SVG.ADD.createIcon());
-                btnAdd.setOnAction(e -> skinnable.add());
-
-                JFXButton btnRefresh = new JFXButton();
-                FXUtils.setLimitWidth(btnRefresh, 40);
-                FXUtils.setLimitHeight(btnRefresh, 40);
-                btnRefresh.getStyleClass().add("jfx-button-raised-round");
-                btnRefresh.setButtonType(JFXButton.ButtonType.RAISED);
-                btnRefresh.setGraphic(SVG.REFRESH.createIcon());
-                btnRefresh.setOnAction(e -> skinnable.refresh());
-
-                vBox.getChildren().setAll(btnAdd);
-
-                FXUtils.onChangeAndOperate(skinnable.refreshableProperty(),
-                        refreshable -> {
-                            if (refreshable) {
-                                list.setPadding(new Insets(10, 10, 15 + 40 + 15 + 40 + 15, 10));
-                                vBox.getChildren().setAll(btnRefresh, btnAdd);
-                            } else {
-                                list.setPadding(new Insets(10, 10, 15 + 40 + 15, 10));
-                                vBox.getChildren().setAll(btnAdd);
-                            }
-                        });
-            }
-
-            // Keep a blank space to prevent buttons from blocking up mod items.
-            BorderPane group = new BorderPane();
-            group.setPickOnBounds(false);
-            group.setBottom(vBox);
-            placeholder.minHeightProperty().bind(vBox.heightProperty());
-
-            contentPane.getChildren().setAll(scrollPane, group);
-        }
-
-        spinnerPane.loadingProperty().bind(skinnable.loadingProperty());
-        spinnerPane.setContent(contentPane);
-
-        getChildren().setAll(spinnerPane);
-    }
-}

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

@@ -21,7 +21,6 @@ import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXCheckBox;
 import com.jfoenix.controls.JFXComboBox;
 import com.jfoenix.controls.JFXListView;
-import com.sun.jna.Pointer;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
@@ -29,31 +28,23 @@ import javafx.beans.property.*;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.css.PseudoClass;
-import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Scene;
-import javafx.scene.control.Label;
 import javafx.scene.control.*;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.MouseButton;
 import javafx.scene.layout.*;
 import javafx.stage.Stage;
-import javafx.stage.WindowEvent;
 import org.jackhuang.hmcl.game.GameDumpGenerator;
 import org.jackhuang.hmcl.game.Log;
 import org.jackhuang.hmcl.setting.StyleSheets;
 import org.jackhuang.hmcl.theme.Themes;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
 import org.jackhuang.hmcl.ui.construct.NoneMultipleSelectionModel;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
-import org.jackhuang.hmcl.util.Holder;
-import org.jackhuang.hmcl.util.CircularArrayList;
-import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.Log4jLevel;
+import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.platform.*;
-import org.jackhuang.hmcl.util.platform.windows.Dwmapi;
-import org.jackhuang.hmcl.util.platform.windows.WinConstants;
-import org.jackhuang.hmcl.util.platform.windows.WinTypes;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -66,8 +57,8 @@ import java.util.stream.Collectors;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.util.Lang.thread;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
 /**
  * @author huangyuhui
@@ -90,41 +81,13 @@ public final class LogWindow extends Stage {
     private final LogWindowImpl impl;
     private final ManagedProcess gameProcess;
 
-    @SuppressWarnings("unused")
-    private Object windowsDarkModeListenerHolder;
-
-    {
-        if (OperatingSystem.SYSTEM_VERSION.isAtLeast(OSVersion.WINDOWS_11) && NativeUtils.USE_JNA && Dwmapi.INSTANCE != null) {
-            this.addEventFilter(WindowEvent.WINDOW_SHOWN, new EventHandler<>() {
-                @Override
-                public void handle(WindowEvent event) {
-                    LogWindow.this.removeEventFilter(WindowEvent.WINDOW_SHOWN, this);
-
-                    windowsDarkModeListenerHolder = FXUtils.onWeakChangeAndOperate(Themes.darkModeProperty(), darkMode -> {
-                        if (LogWindow.this.isShowing()) {
-                            WindowsNativeUtils.getWindowHandle(LogWindow.this).ifPresent(handle -> {
-                                if (handle == WinTypes.HANDLE.INVALID_VALUE)
-                                    return;
-
-                                Dwmapi.INSTANCE.DwmSetWindowAttribute(
-                                        new WinTypes.HANDLE(Pointer.createConstant(handle)),
-                                        WinConstants.DWMWA_USE_IMMERSIVE_DARK_MODE,
-                                        new WinTypes.BOOLByReference(new WinTypes.BOOL(darkMode)),
-                                        WinTypes.BOOL.SIZE
-                                );
-                            });
-                        }
-                    });
-                }
-            });
-        }
-    }
-
     public LogWindow(ManagedProcess gameProcess) {
         this(gameProcess, new CircularArrayList<>());
     }
 
     public LogWindow(ManagedProcess gameProcess, CircularArrayList<Log> logs) {
+        Themes.applyNativeDarkMode(this);
+
         this.logs = logs;
         this.impl = new LogWindowImpl();
         setScene(new Scene(impl, 800, 480));
@@ -200,10 +163,12 @@ public final class LogWindow extends Stage {
         private final StringProperty[] buttonText = new StringProperty[LEVELS.length];
         private final BooleanProperty[] showLevel = new BooleanProperty[LEVELS.length];
         private final JFXComboBox<Integer> cboLines = new JFXComboBox<>();
+        private final StackPane stackPane = new StackPane();
 
         LogWindowImpl() {
             getStyleClass().add("log-window");
 
+            listView.getProperties().put("no-smooth-scrolling", true);
             listView.setItems(FXCollections.observableList(new CircularArrayList<>(logs.size())));
 
             for (int i = 0; i < LEVELS.length; i++) {
@@ -241,9 +206,8 @@ public final class LogWindow extends Stage {
                 }
 
                 Platform.runLater(() -> {
-                    Alert alert = new Alert(Alert.AlertType.INFORMATION, i18n("settings.launcher.launcher_log.export.success", logFile));
-                    alert.setTitle(i18n("settings.launcher.launcher_log.export"));
-                    alert.showAndWait();
+                    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);
                 });
 
                 FXUtils.showFileInExplorer(logFile);
@@ -267,9 +231,8 @@ public final class LogWindow extends Stage {
                     LOG.warning("Failed to create minecraft jstack dump", e);
 
                     Platform.runLater(() -> {
-                        Alert alert = new Alert(Alert.AlertType.ERROR, i18n("logwindow.export_dump"));
-                        alert.setTitle(i18n("message.error"));
-                        alert.showAndWait();
+                        var dialog = new MessageDialogPane.Builder(i18n("logwindow.export_dump") + "\n" + StringUtils.getStackTrace(e), i18n("message.error"), MessageDialogPane.MessageType.ERROR).ok(null).build();
+                        DialogUtils.show(stackPane, dialog);
                     });
                 }
 
@@ -300,7 +263,9 @@ public final class LogWindow extends Stage {
 
             VBox vbox = new VBox(3);
             vbox.setPadding(new Insets(3, 0, 3, 0));
-            getChildren().setAll(vbox);
+            getSkinnable().stackPane.getChildren().setAll(vbox);
+            getChildren().setAll(getSkinnable().stackPane);
+
 
             {
                 BorderPane borderPane = new BorderPane();
@@ -343,8 +308,7 @@ public final class LogWindow extends Stage {
 
                 listView.setStyle("-fx-font-family: \"" + Lang.requireNonNullElse(config().getFontFamily(), FXUtils.DEFAULT_MONOSPACE_FONT)
                         + "\"; -fx-font-size: " + config().getFontSize() + "px;");
-                Holder<Object> lastCell = new Holder<>();
-                listView.setCellFactory(x -> new ListCell<Log>() {
+                listView.setCellFactory(x -> new ListCell<>() {
                     {
                         x.setSelectionModel(new NoneMultipleSelectionModel<>());
                         getStyleClass().add("log-window-list-cell");
@@ -388,11 +352,6 @@ public final class LogWindow extends Stage {
                     protected void updateItem(Log item, boolean empty) {
                         super.updateItem(item, empty);
 
-                        // https://mail.openjdk.org/pipermail/openjfx-dev/2022-July/034764.html
-                        if (this == lastCell.value && !isVisible())
-                            return;
-                        lastCell.value = this;
-
                         pseudoClassStateChanged(EMPTY, empty);
                         pseudoClassStateChanged(FATAL, !empty && item.getLevel() == Log4jLevel.FATAL);
                         pseudoClassStateChanged(ERROR, !empty && item.getLevel() == Log4jLevel.ERROR);

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

@@ -50,7 +50,9 @@ public enum SVG {
     CHECKROOM("M3 20Q2.575 20 2.2875 19.7125T2 19Q2 18.75 2.1 18.5375T2.4 18.2L11 11.75V10Q11 9.575 11.3 9.2875T12.025 9Q12.65 9 13.075 8.55T13.5 7.475Q13.5 6.85 13.0625 6.425T12 6Q11.375 6 10.9375 6.4375T10.5 7.5H8.5Q8.5 6.05 9.525 5.025T12 4Q13.45 4 14.475 5.0125T15.5 7.475Q15.5 8.65 14.8125 9.575T13 10.85V11.75L21.6 18.2Q21.8 18.325 21.9 18.5375T22 19Q22 19.425 21.7125 19.7125T21 20H3ZM6 18H18L12 13.5 6 18Z"),
     CHECK_CIRCLE("M10.6 16.6 17.65 9.55 16.25 8.15 10.6 13.8 7.75 10.95 6.35 12.35 10.6 16.6ZM12 22Q9.925 22 8.1 21.2125T4.925 19.075Q3.575 17.725 2.7875 15.9T2 12Q2 9.925 2.7875 8.1T4.925 4.925Q6.275 3.575 8.1 2.7875T12 2Q14.075 2 15.9 2.7875T19.075 4.925Q20.425 6.275 21.2125 8.1T22 12Q22 14.075 21.2125 15.9T19.075 19.075Q17.725 20.425 15.9 21.2125T12 22ZM12 20Q15.35 20 17.675 17.675T20 12Q20 8.65 17.675 6.325T12 4Q8.65 4 6.325 6.325T4 12Q4 15.35 6.325 17.675T12 20ZM12 12Z"),
     CLOSE("M6.4 19 5 17.6 10.6 12 5 6.4 6.4 5 12 10.6 17.6 5 19 6.4 13.4 12 19 17.6 17.6 19 12 13.4 6.4 19Z"),
+    CONTENT_CUT("m12 14l-2.35 2.35q.2.375.275.8T10 18q0 1.65-1.175 2.825T6 22t-2.825-1.175T2 18t1.175-2.825T6 14q.425 0 .85.075t.8.275L10 12L7.65 9.65q-.375.2-.8.275T6 10q-1.65 0-2.825-1.175T2 6t1.175-2.825T6 2t2.825 1.175T10 6q0 .425-.075.85t-.275.8L20.6 18.6q.675.675.3 1.538T19.575 21q-.275 0-.537-.112t-.463-.313zm3-3l-2-2l5.575-5.575q.2-.2.463-.312T19.574 3q.95 0 1.313.875t-.313 1.55zM6 8q.825 0 1.413-.587T8 6t-.587-1.412T6 4t-1.412.588T4 6t.588 1.413T6 8m6 4.5q.2 0 .35-.15t.15-.35t-.15-.35t-.35-.15t-.35.15t-.15.35t.15.35t.35.15M6 20q.825 0 1.413-.587T8 18t-.587-1.412T6 16t-1.412.588T4 18t.588 1.413T6 20"),
     CONTENT_COPY("M9 18Q8.175 18 7.5875 17.4125T7 16V4Q7 3.175 7.5875 2.5875T9 2H18Q18.825 2 19.4125 2.5875T20 4V16Q20 16.825 19.4125 17.4125T18 18H9ZM9 16H18V4H9V16ZM5 22Q4.175 22 3.5875 21.4125T3 20V6H5V20H16V22H5ZM9 16V4 16Z"),
+    CONTENT_PASTE("M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h4.175q.275-.875 1.075-1.437T12 1q1 0 1.788.563T14.85 3H19q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21zm0-2h14V5h-2v2q0 .425-.288.713T16 8H8q-.425 0-.712-.288T7 7V5H5zm7-14q.425 0 .713-.288T13 4t-.288-.712T12 3t-.712.288T11 4t.288.713T12 5"),
     CREATE_NEW_FOLDER("M14 16h2V14h2V12H16V10H14v2H12v2h2v2ZM4 20q-.825 0-1.4125-.5875T2 18V6q0-.825.5875-1.4125T4 4h6l2 2h8q.825 0 1.4125.5875T22 8V18q0 .825-.5875 1.4125T20 20H4Zm0-2H20V8H11.175l-2-2H4V18ZV6 18Z"),
     DELETE("M7 21Q6.175 21 5.5875 20.4125T5 19V6H4V4H9V3H15V4H20V6H19V19Q19 19.825 18.4125 20.4125T17 21H7ZM17 6H7V19H17V6ZM9 17H11V8H9V17ZM13 17H15V8H13V17ZM7 6V19 6Z"),
     DELETE_FOREVER("M9.4 16.5 12 13.9 14.6 16.5 16 15.1 13.4 12.5 16 9.9 14.6 8.5 12 11.1 9.4 8.5 8 9.9 10.6 12.5 8 15.1 9.4 16.5ZM7 21Q6.175 21 5.5875 20.4125T5 19V6H4V4H9V3H15V4H20V6H19V19Q19 19.825 18.4125 20.4125T17 21H7ZM17 6H7V19H17V6ZM7 6V19 6Z"),
@@ -102,6 +104,7 @@ public enum SVG {
     PERSON("M12 12Q10.35 12 9.175 10.825T8 8Q8 6.35 9.175 5.175T12 4Q13.65 4 14.825 5.175T16 8Q16 9.65 14.825 10.825T12 12ZM4 20V17.2Q4 16.35 4.4375 15.6375T5.6 14.55Q7.15 13.775 8.75 13.3875T12 13Q13.65 13 15.25 13.3875T18.4 14.55Q19.125 14.925 19.5625 15.6375T20 17.2V20H4ZM6 18H18V17.2Q18 16.925 17.8625 16.7T17.5 16.35Q16.15 15.675 14.775 15.3375T12 15Q10.6 15 9.225 15.3375T6.5 16.35Q6.275 16.475 6.1375 16.7T6 17.2V18ZM12 10Q12.825 10 13.4125 9.4125T14 8Q14 7.175 13.4125 6.5875T12 6Q11.175 6 10.5875 6.5875T10 8Q10 8.825 10.5875 9.4125T12 10ZM12 8ZM12 18Z"),
     PUBLIC("M12 22Q9.925 22 8.1 21.2125T4.925 19.075Q3.575 17.725 2.7875 15.9T2 12Q2 9.925 2.7875 8.1T4.925 4.925Q6.275 3.575 8.1 2.7875T12 2Q14.075 2 15.9 2.7875T19.075 4.925Q20.425 6.275 21.2125 8.1T22 12Q22 14.075 21.2125 15.9T19.075 19.075Q17.725 20.425 15.9 21.2125T12 22ZM11 19.95V18Q10.175 18 9.5875 17.4125T9 16V15L4.2 10.2Q4.125 10.65 4.0625 11.1T4 12Q4 15.025 5.9875 17.3T11 19.95ZM17.9 17.4Q18.925 16.275 19.4625 14.8875T20 12Q20 9.55 18.6375 7.525T15 4.6V5Q15 5.825 14.4125 6.4125T13 7H11V9Q11 9.425 10.7125 9.7125T10 10H8V12H14Q14.425 12 14.7125 12.2875T15 13V16H16Q16.65 16 17.175 16.3875T17.9 17.4Z"),
     REFRESH("M12 20Q8.65 20 6.325 17.675T4 12Q4 8.65 6.325 6.325T12 4Q13.725 4 15.3 4.7125T18 6.75V4H20V11H13V9H17.2Q16.4 7.6 15.0125 6.8T12 6Q9.5 6 7.75 7.75T6 12Q6 14.5 7.75 16.25T12 18Q13.925 18 15.475 16.9T17.65 14H19.75Q19.05 16.65 16.9 18.325T12 20Z"),
+    REDO("M16.2 10H9.9q-1.575 0-2.738 1T6 13.5T7.163 16T9.9 17H16q.425 0 .713.288T17 18t-.288.713T16 19H9.9q-2.425 0-4.163-1.575T4 13.5t1.738-3.925T9.9 8h6.3l-1.9-1.9q-.275-.275-.275-.7t.275-.7t.7-.275t.7.275l3.6 3.6q.15.15.213.325t.062.375t-.062.375t-.213.325l-3.6 3.6q-.275.275-.7.275t-.7-.275t-.275-.7t.275-.7z"),
     RELEASE_CIRCLE("M9,7H13A2,2 0 0,1 15,9V11C15,11.84 14.5,12.55 13.76,12.85L15,17H13L11.8,13H11V17H9V7M11,9V11H13V9H11M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2M12,4A8,8 0 0,0 4,12C4,16.41 7.58,20 12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4Z"), // Not Material
     RESTORE("M12 21Q8.55 21 5.9875 18.7125T3.05 13H5.1Q5.45 15.6 7.4125 17.3T12 19Q14.925 19 16.9625 16.9625T19 12Q19 9.075 16.9625 7.0375T12 5Q10.275 5 8.775 5.8T6.25 8H9V10H3V4H5V6.35Q6.275 4.75 8.1125 3.875T12 3Q13.875 3 15.5125 3.7125T18.3625 5.6375Q19.575 6.85 20.2875 8.4875T21 12Q21 13.875 20.2875 15.5125T18.3625 18.3625Q17.15 19.575 15.5125 20.2875T12 21Z"), // Not Material
     ROCKET_LAUNCH("M5.65 10.025 7.6 10.85Q7.95 10.15 8.325 9.5T9.15 8.2L7.75 7.925 5.65 10.025ZM9.2 12.1 12.05 14.925Q13.1 14.525 14.3 13.7T16.55 11.825Q18.3 10.075 19.2875 7.9375T20.15 4Q18.35 3.875 16.2 4.8625T12.3 7.6Q11.25 8.65 10.425 9.85T9.2 12.1ZM13.65 10.475Q13.075 9.9 13.075 9.0625T13.65 7.65Q14.225 7.075 15.075 7.075T16.5 7.65Q17.075 8.225 17.075 9.0625T16.5 10.475Q15.925 11.05 15.075 11.05T13.65 10.475ZM14.125 18.5 16.225 16.4 15.95 15Q15.3 15.45 14.65 15.8125T13.3 16.525L14.125 18.5ZM21.95 2.175Q22.425 5.2 21.3625 8.0625T17.7 13.525L18.2 16Q18.3 16.5 18.15 16.975T17.65 17.8L13.45 22 11.35 17.075 7.075 12.8 2.15 10.7 6.325 6.5Q6.675 6.15 7.1625 6T8.15 5.95L10.625 6.45Q13.225 3.85 16.075 2.775T21.95 2.175ZM3.925 15.975Q4.8 15.1 6.0625 15.0875T8.2 15.95Q9.075 16.825 9.0625 18.0875T8.175 20.225Q7.55 20.85 6.0875 21.3T2.05 22.1Q2.4 19.525 2.85 18.0625T3.925 15.975ZM5.35 17.375Q5.1 17.625 4.85 18.2875T4.5 19.625Q5.175 19.525 5.8375 19.2875T6.75 18.8Q7.05 18.5 7.075 18.075T6.8 17.35Q6.5 17.05 6.075 17.0625T5.35 17.375Z"),
@@ -120,7 +123,9 @@ public enum SVG {
     TEXTURE("M4.4-3Q3.925-3.1 3.5125-3.5125T3-4.4L19.6-21Q20.125-20.875 20.5-20.4875T21.025-19.6L4.4-3ZM3-9.3V-12.1L11.9-21H14.7L3-9.3ZM3-17V-19Q3-19.825 3.5875-20.4125T5-21H7L3-17ZM17-3 21-7V-5Q21-4.175 20.4125-3.5875T19-3H17ZM9.3-3 21-14.7V-11.9L12.1-3H9.3Z"),
     TRIP("M4 21Q3.175 21 2.5875 20.4125T2 19V8Q2 7.175 2.5875 6.5875T4 6H8V4Q8 3.175 8.5875 2.5875T10 2H14Q14.825 2 15.4125 2.5875T16 4V6H20Q20.825 6 21.4125 6.5875T22 8V19Q22 19.825 21.4125 20.4125T20 21H4ZM10 6H14V4H10V6ZM6 8H4V19H6V8ZM16 19V8H8V19H16ZM18 8V19H20V8H18ZM12 13.5Z"),
     TUNE("M11 21V15H13V17H21V19H13V21H11ZM3 19V17H9V19H3ZM7 15V13H3V11H7V9H9V15H7ZM11 13V11H21V13H11ZM15 9V3H17V5H21V7H17V9H15ZM3 7V5H13V7H3Z"),
+    UNFOLD_MORE("M12 21 7.5 16.5l1.45-1.45L12 18.1l3.05-3.05 1.45 1.45L12 21ZM8.95 9.05 7.5 7.6 12 3.1l4.5 4.5-1.45 1.45L12 6 8.95 9.05Z"),
     UPDATE("M12 21Q10.125 21 8.4875 20.2875T5.6375 18.3625Q4.425 17.15 3.7125 15.5125T3 12Q3 10.125 3.7125 8.4875T5.6375 5.6375Q6.85 4.425 8.4875 3.7125T12 3Q14.05 3 15.8875 3.875T19 6.35V4H21V10H15V8H17.75Q16.725 6.6 15.225 5.8T12 5Q9.075 5 7.0375 7.0375T5 12Q5 14.925 7.0375 16.9625T12 19Q14.625 19 16.5875 17.3T18.9 13H20.95Q20.575 16.425 18.0125 18.7125T12 21ZM14.8 16.2 11 12.4V7H13V11.6L16.2 14.8 14.8 16.2Z"),
+    UNDO("M8 19q-.425 0-.712-.288T7 18t.288-.712T8 17h6.1q1.575 0 2.738-1T18 13.5T16.838 11T14.1 10H7.8l1.9 1.9q.275.275.275.7t-.275.7t-.7.275t-.7-.275L4.7 9.7q-.15-.15-.213-.325T4.426 9t.063-.375T4.7 8.3l3.6-3.6q.275-.275.7-.275t.7.275t.275.7t-.275.7L7.8 8h6.3q2.425 0 4.163 1.575T20 13.5t-1.737 3.925T14.1 19z"),
     VISIBILITY("M12 16q1.875 0 3.1875-1.3125T16.5 11.5 15.1875 8.3125 12 7 8.8125 8.3125 7.5 11.5t1.3125 3.1875T12 16Zm0-1.8q-1.125 0-1.9125-.7875T9.3 11.5t.7875-1.9125T12 8.8q1.125 0 1.9125.7875T14.7 11.5q0 1.125-.7875 1.9125T12 14.2ZM12 19q-3.65 0-6.65-2.0375T1 11.5Q2.35 8.075 5.35 6.0375T12 4q3.65 0 6.65 2.0375T23 11.5q-1.35 3.425-4.35 5.4625T12 19Zm0-7.5ZM12 17q2.825 0 5.1875-1.4875T20.8 11.5q-1.25-2.525-3.6125-4.0125T12 6 6.8125 7.4875 3.2 11.5q1.25 2.525 3.6125 4.0125T12 17Z"),
     VISIBILITY_OFF("M16.1 13.3l-1.45-1.45q.225-1.175-.675-2.2t-2.325-.8L10.2 7.4q.425-.2.8625-.3T12 7q1.875 0 3.1875 1.3125T16.5 11.5q0 .5-.1.9375t-.3.8625Zm3.2 3.15-1.45-1.4q.95-.725 1.6875-1.5875T20.8 11.5q-1.25-2.525-3.5875-4.0125T12 6q-.725 0-1.425.1T9.2 6.4L7.65 4.85q1.025-.425 2.1-.6375T12 4q3.775 0 6.725 2.0875T23 11.5q-.575 1.475-1.5125 2.7375T19.3 16.45Zm.5 6.15-4.2-4.15q-.875.275-1.7625.4125T12 19q-3.775 0-6.725-2.0875T1 11.5q.525-1.325 1.325-2.4625T4.15 7L1.4 4.2 2.8 2.8 21.2 21.2l-1.4 1.4ZM5.55 8.4q-.725.65-1.325 1.425T3.2 11.5q1.25 2.525 3.5875 4.0125T12 17q.5 0 .975-.0625T13.95 16.8l-.9-.95q-.275.075-.525.1125T12 16q-1.875 0-3.1875-1.3125T7.5 11.5q0-.275.0375-.525T7.65 10.45L5.55 8.4Zm7.975 2.325ZM9.75 12.6Z"),
     WARNING("M1 21 12 2 23 21H1ZM4.45 19H19.55L12 6 4.45 19ZM12 18Q12.425 18 12.7125 17.7125T13 17Q13 16.575 12.7125 16.2875T12 16Q11.575 16 11.2875 16.2875T11 17Q11 17.425 11.2875 17.7125T12 18ZM11 15H13V10H11V15ZM12 12.5Z"),

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

@@ -25,7 +25,6 @@ import javafx.animation.Animation.Status;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.event.EventHandler;
-import javafx.scene.control.IndexedCell;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.skin.VirtualFlow;
 import javafx.scene.input.MouseEvent;
@@ -55,6 +54,8 @@ final class ScrollUtils {
     private static final double DEFAULT_SPEED = 1.0;
     private static final double DEFAULT_TRACK_PAD_ADJUSTMENT = 7.0;
 
+    private static final double CUTOFF_DELTA = 0.01;
+
     /**
      * Determines if the given ScrollEvent comes from a trackpad.
      * <p></p>
@@ -211,7 +212,7 @@ final class ScrollUtils {
                     break;
             }
 
-            if (Math.abs(dy) < 0.001) {
+            if (Math.abs(dy) < CUTOFF_DELTA) {
                 timeline.stop();
             }
         }));
@@ -226,7 +227,6 @@ final class ScrollUtils {
         final double[] derivatives = new double[FRICTIONS.length];
 
         Timeline timeline = new Timeline();
-        Holder<ScrollDirection> scrollDirectionHolder = new Holder<>();
         final EventHandler<MouseEvent> mouseHandler = event -> timeline.stop();
         final EventHandler<ScrollEvent> scrollHandler = event -> {
             if (event.getEventType() == ScrollEvent.SCROLL) {
@@ -234,7 +234,6 @@ final class ScrollUtils {
                 if (scrollDirection == ScrollDirection.LEFT || scrollDirection == ScrollDirection.RIGHT) {
                     return;
                 }
-                scrollDirectionHolder.value = scrollDirection;
                 double currentSpeed = isTrackPad(event, scrollDirection) ? speed / trackPadAdjustment : speed;
 
                 derivatives[0] += scrollDirection.intDirection * currentSpeed;
@@ -256,17 +255,9 @@ final class ScrollUtils {
             }
 
             double dy = derivatives[derivatives.length - 1];
+            virtualFlow.scrollPixels(dy);
 
-            int cellCount = virtualFlow.getCellCount();
-            IndexedCell<?> firstVisibleCell = virtualFlow.getFirstVisibleCell();
-            double height = firstVisibleCell != null ? firstVisibleCell.getHeight() * cellCount : 0.0;
-
-            double delta = height > 0.0
-                    ? dy / height
-                    : (scrollDirectionHolder.value == ScrollDirection.DOWN ? 0.001 : -0.001);
-            virtualFlow.setPosition(Math.min(Math.max(virtualFlow.getPosition() + delta, 0), 1));
-
-            if (Math.abs(dy) < 0.001) {
+            if (Math.abs(dy) < CUTOFF_DELTA) {
                 timeline.stop();
             }
         }));

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

@@ -18,24 +18,28 @@
 package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXListView;
 import javafx.beans.binding.Bindings;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
-import javafx.scene.control.ScrollPane;
+import javafx.scene.control.ListCell;
 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 org.jackhuang.hmcl.ui.construct.ComponentList;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 
 import java.util.List;
 
-public abstract class ToolbarListPageSkin<T extends ListPageBase<? extends Node>> extends SkinBase<T> {
+public abstract class ToolbarListPageSkin<E, P extends ListPageBase<E>> extends SkinBase<P> {
 
-    public ToolbarListPageSkin(T skinnable) {
+    protected final JFXListView<E> listView;
+
+    public ToolbarListPageSkin(P skinnable) {
         super(skinnable);
 
         SpinnerPane spinnerPane = new SpinnerPane();
@@ -58,18 +62,13 @@ public abstract class ToolbarListPageSkin<T extends ListPageBase<? extends Node>
         }
 
         {
-            ScrollPane scrollPane = new ScrollPane();
-            ComponentList.setVgrow(scrollPane, Priority.ALWAYS);
-            scrollPane.setFitToWidth(true);
-
-            VBox content = new VBox();
-
-            Bindings.bindContent(content.getChildren(), skinnable.itemsProperty());
-
-            scrollPane.setContent(content);
-            FXUtils.smoothScrolling(scrollPane);
-
-            root.getContent().add(scrollPane);
+            this.listView = new JFXListView<>();
+            this.listView.setPadding(Insets.EMPTY);
+            this.listView.setCellFactory(listView -> createListCell((JFXListView<E>) listView));
+            ComponentList.setVgrow(listView, Priority.ALWAYS);
+            Bindings.bindContent(this.listView.getItems(), skinnable.itemsProperty());
+            FXUtils.ignoreEvent(listView, KeyEvent.KEY_PRESSED, e -> e.getCode() == KeyCode.ESCAPE);
+            root.getContent().add(listView);
         }
 
         spinnerPane.setContent(root);
@@ -89,10 +88,7 @@ public abstract class ToolbarListPageSkin<T extends ListPageBase<? extends Node>
         ret.getStyleClass().add("jfx-tool-bar-button");
         ret.setGraphic(wrap(svg.createIcon()));
         ret.setText(text);
-        ret.setOnAction(e -> {
-            onClick.run();
-            FXUtils.clearFocus(ret);
-        });
+        ret.setOnAction(e -> onClick.run());
         return ret;
     }
 
@@ -105,5 +101,21 @@ public abstract class ToolbarListPageSkin<T extends ListPageBase<? extends Node>
         return ret;
     }
 
-    protected abstract List<Node> initializeToolbar(T skinnable);
+    protected abstract List<Node> initializeToolbar(P skinnable);
+
+    protected ListCell<E> createListCell(JFXListView<E> listView) {
+        return new ListCell<>() {
+            @Override
+            protected void updateItem(E item, boolean empty) {
+                super.updateItem(item, empty);
+                if (!empty && item instanceof Node node) {
+                    setGraphic(node);
+                    setText(null);
+                } else {
+                    setGraphic(null);
+                    setText(null);
+                }
+            }
+        };
+    }
 }

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

@@ -55,4 +55,8 @@ public class WeakListenerHolder {
     public boolean remove(Object obj) {
         return refs.remove(obj);
     }
+
+    public void clear() {
+        refs.clear();
+    }
 }

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

@@ -130,7 +130,7 @@ public final class AccountListItemSkin extends SkinBase<AccountListItem> {
         spinnerRefresh.getStyleClass().setAll("small-spinner-pane");
         if (skinnable.getAccount() instanceof MicrosoftAccount && Accounts.OAUTH_CALLBACK.getClientId().isEmpty()) {
             btnRefresh.setDisable(true);
-            FXUtils.installFastTooltip(spinnerRefresh, i18n("account.methods.microsoft.snapshot"));
+            FXUtils.installFastTooltip(spinnerRefresh, i18n("account.methods.microsoft.snapshot.tooltip"));
         }
         btnRefresh.setOnAction(e -> {
             spinnerRefresh.showSpinner();

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

@@ -54,7 +54,7 @@ import org.jackhuang.hmcl.util.javafx.MappedObservableList;
 import java.util.Locale;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.globalConfig;
-import static org.jackhuang.hmcl.ui.versions.VersionPage.wrap;
+import static org.jackhuang.hmcl.ui.FXUtils.wrap;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.createSelectedItemPropertyFor;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;

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

@@ -0,0 +1,79 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.account;
+
+import com.jfoenix.controls.JFXPopup;
+import javafx.beans.InvalidationListener;
+import javafx.beans.WeakInvalidationListener;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.layout.StackPane;
+import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public final class AccountListPopupMenu extends StackPane {
+    public static void show(Node owner, JFXPopup.PopupVPosition vAlign, JFXPopup.PopupHPosition hAlign,
+                            double initOffsetX, double initOffsetY) {
+        var menu = new AccountListPopupMenu();
+        JFXPopup popup = new JFXPopup(menu);
+        popup.show(owner, vAlign, hAlign, initOffsetX, initOffsetY);
+    }
+
+    @SuppressWarnings("FieldCanBeLocal")
+    private final BooleanBinding isEmpty = Bindings.isEmpty(Accounts.getAccounts());
+    @SuppressWarnings("FieldCanBeLocal")
+    private final InvalidationListener listener;
+
+    public AccountListPopupMenu() {
+        AdvancedListBox box = new AdvancedListBox();
+        box.getStyleClass().add("no-padding");
+        box.setPrefWidth(220);
+        box.setPrefHeight(-1);
+        box.setMaxHeight(260);
+
+        listener = o -> {
+            box.clear();
+
+            for (Account account : Accounts.getAccounts()) {
+                AccountAdvancedListItem item = new AccountAdvancedListItem(account);
+                item.setOnAction(e -> {
+                    Accounts.setSelectedAccount(account);
+                    if (getScene().getWindow() instanceof JFXPopup popup)
+                        popup.hide();
+                });
+                box.add(item);
+            }
+        };
+        listener.invalidated(null);
+        Accounts.getAccounts().addListener(new WeakInvalidationListener(listener));
+
+        Label placeholder = new Label(i18n("account.empty"));
+        placeholder.setStyle("-fx-padding: 10px; -fx-text-fill: -monet-on-surface-variant; -fx-font-style: italic;");
+
+        FXUtils.onChangeAndOperate(isEmpty, empty -> {
+            getChildren().setAll(empty ? placeholder : box);
+        });
+    }
+
+}

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

@@ -25,11 +25,10 @@ import javafx.scene.layout.*;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionPane;
-import org.jackhuang.hmcl.ui.construct.DialogAware;
-import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
-import org.jackhuang.hmcl.ui.construct.SpinnerPane;
+import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.util.Lang;
 
 import javax.net.ssl.SSLException;
@@ -88,6 +87,10 @@ public final class AddAuthlibInjectorServerPane extends TransitionPane implement
 
             addServerPane.setBody(txtServerUrl);
             addServerPane.setActions(lblCreationWarning, actions);
+
+            txtServerUrl.getValidators().addAll(new RequiredValidator(), new URLValidator());
+            FXUtils.setValidateWhileTextChanged(txtServerUrl, true);
+            btnAddNext.disableProperty().bind(txtServerUrl.activeValidatorProperty().isNotNull());
         }
 
         confirmServerPane = new JFXDialogLayout();
@@ -115,6 +118,7 @@ public final class AddAuthlibInjectorServerPane extends TransitionPane implement
                 lblServerWarning.setStyle("-fx-text-fill: red;");
                 GridPane.setColumnIndex(lblServerWarning, 0);
                 GridPane.setRowIndex(lblServerWarning, 2);
+                lblServerWarning.managedProperty().bind(lblServerWarning.visibleProperty());
                 GridPane.setColumnSpan(lblServerWarning, 2);
 
                 body.getChildren().setAll(
@@ -149,7 +153,6 @@ public final class AddAuthlibInjectorServerPane extends TransitionPane implement
         this.setContent(addServerPane, ContainerAnimations.NONE);
 
         lblCreationWarning.maxWidthProperty().bind(((FlowPane) lblCreationWarning.getParent()).widthProperty());
-        btnAddNext.disableProperty().bind(txtServerUrl.textProperty().isEmpty());
         nextPane.hideSpinner();
 
         onEscPressed(this, this::onAddCancel);
@@ -162,6 +165,12 @@ public final class AddAuthlibInjectorServerPane extends TransitionPane implement
 
     private String resolveFetchExceptionMessage(Throwable exception) {
         if (exception instanceof SSLException) {
+            if (exception.getMessage() != null && exception.getMessage().contains("Remote host terminated")) {
+                return i18n("account.failed.connect_injector_server");
+            }
+            if (exception.getMessage() != null && (exception.getMessage().contains("No name matching") || exception.getMessage().contains("No subject alternative DNS name matching"))) {
+                return i18n("account.failed.dns");
+            }
             return i18n("account.failed.ssl");
         } else if (exception instanceof IOException) {
             return i18n("account.failed.connect_injector_server");

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

@@ -35,8 +35,6 @@ import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.layout.*;
-
-import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.auth.AccountFactory;
 import org.jackhuang.hmcl.auth.CharacterSelector;
 import org.jackhuang.hmcl.auth.NoSelectedCharacterException;
@@ -64,11 +62,7 @@ import org.jackhuang.hmcl.util.gson.UUIDTypeAdapter;
 import org.jackhuang.hmcl.util.javafx.BindingMapping;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.regex.Pattern;
 
@@ -286,72 +280,95 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
             btnAccept.disableProperty().unbind();
             detailsContainer.getChildren().remove(detailsPane);
             lblErrorMessage.setText("");
+            lblErrorMessage.setVisible(true);
         }
+
         if (factory == Accounts.FACTORY_MICROSOFT) {
             VBox vbox = new VBox(8);
-            if (!Accounts.OAUTH_CALLBACK.getClientId().isEmpty()) {
-                HintPane hintPane = new HintPane(MessageDialogPane.MessageType.INFO);
-                FXUtils.onChangeAndOperate(deviceCode, deviceCode -> {
-                    if (deviceCode != null) {
-                        FXUtils.copyText(deviceCode.getUserCode());
-                        hintPane.setSegment(i18n("account.methods.microsoft.manual", deviceCode.getUserCode(), deviceCode.getVerificationUri()));
-                    } else {
-                        hintPane.setSegment(i18n("account.methods.microsoft.hint"));
-                    }
-                });
-                FXUtils.onClicked(hintPane, () -> {
-                    if (deviceCode.get() != null) {
-                        FXUtils.copyText(deviceCode.get().getUserCode());
-                    }
-                });
+            detailsPane = vbox;
 
-                holder.add(Accounts.OAUTH_CALLBACK.onGrantDeviceCode.registerWeak(value -> {
-                    runInFX(() -> deviceCode.set(value));
-                }));
-                FlowPane box = new FlowPane();
-                box.setHgap(8);
-                JFXHyperlink birthLink = new JFXHyperlink(i18n("account.methods.microsoft.birth"));
-                birthLink.setExternalLink("https://support.microsoft.com/account-billing/837badbc-999e-54d2-2617-d19206b9540a");
-                JFXHyperlink profileLink = new JFXHyperlink(i18n("account.methods.microsoft.profile"));
-                profileLink.setExternalLink("https://account.live.com/editprof.aspx");
-                JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.microsoft.purchase"));
-                purchaseLink.setExternalLink(YggdrasilService.PURCHASE_URL);
-                JFXHyperlink deauthorizeLink = new JFXHyperlink(i18n("account.methods.microsoft.deauthorize"));
-                deauthorizeLink.setExternalLink("https://account.live.com/consent/Edit?client_id=000000004C794E0A");
-                JFXHyperlink forgotpasswordLink = new JFXHyperlink(i18n("account.methods.forgot_password"));
-                forgotpasswordLink.setExternalLink("https://account.live.com/ResetPassword.aspx");
-                JFXHyperlink createProfileLink = new JFXHyperlink(i18n("account.methods.microsoft.makegameidsettings"));
-                createProfileLink.setExternalLink("https://www.minecraft.net/msaprofile/mygames/editprofile");
-                JFXHyperlink bannedQueryLink = new JFXHyperlink(i18n("account.methods.ban_query"));
-                bannedQueryLink.setExternalLink("https://enforcement.xbox.com/enforcement/showenforcementhistory");
-                box.getChildren().setAll(profileLink, birthLink, purchaseLink, deauthorizeLink, forgotpasswordLink, createProfileLink, bannedQueryLink);
-                GridPane.setColumnSpan(box, 2);
-
-                if (!IntegrityChecker.isOfficial()) {
-                    HintPane unofficialHint = new HintPane(MessageDialogPane.MessageType.WARNING);
-                    unofficialHint.setText(i18n("unofficial.hint"));
-                    vbox.getChildren().add(unofficialHint);
-                }
-
-                vbox.getChildren().addAll(hintPane, box);
-
-                btnAccept.setDisable(false);
-            } else {
+            if (Accounts.OAUTH_CALLBACK.getClientId().isEmpty()) {
                 HintPane hintPane = new HintPane(MessageDialogPane.MessageType.WARNING);
                 hintPane.setSegment(i18n("account.methods.microsoft.snapshot"));
-
-                JFXHyperlink officialWebsite = new JFXHyperlink(i18n("account.methods.microsoft.snapshot.website"));
-                officialWebsite.setExternalLink(Metadata.PUBLISH_URL);
-
-                vbox.getChildren().setAll(hintPane, officialWebsite);
-                btnAccept.setDisable(true);
+                vbox.getChildren().add(hintPane);
+                return;
             }
 
-            detailsPane = vbox;
+            if (!IntegrityChecker.isOfficial()) {
+                HintPane hintPane = new HintPane(MessageDialogPane.MessageType.WARNING);
+                hintPane.setSegment(i18n("unofficial.hint"));
+                vbox.getChildren().add(hintPane);
+            }
+
+            VBox codeBox = new VBox(8);
+            Label hint = new Label(i18n("account.methods.microsoft.code"));
+            Label code = new Label();
+            code.setMouseTransparent(true);
+            code.setStyle("-fx-font-size: 24");
+            codeBox.getChildren().addAll(hint, code);
+            codeBox.setAlignment(Pos.CENTER);
+            vbox.getChildren().add(codeBox);
+
+            HintPane hintPane = new HintPane(MessageDialogPane.MessageType.INFO);
+            HintPane errHintPane = new HintPane(MessageDialogPane.MessageType.ERROR);
+            errHintPane.setVisible(false);
+            errHintPane.setManaged(false);
+
+            codeBox.setVisible(false);
+            codeBox.setManaged(false);
+
+            FXUtils.onChangeAndOperate(deviceCode, deviceCode -> {
+                if (deviceCode != null) {
+                    FXUtils.copyText(deviceCode.getUserCode());
+                    code.setText(deviceCode.getUserCode());
+                    hintPane.setSegment(i18n("account.methods.microsoft.manual", deviceCode.getVerificationUri()));
+                    codeBox.setVisible(true);
+                    codeBox.setManaged(true);
+                } else {
+                    hintPane.setSegment(i18n("account.methods.microsoft.hint"));
+                    codeBox.setVisible(false);
+                    codeBox.setManaged(false);
+                }
+            });
+
+            lblErrorMessage.setVisible(false);
+            lblErrorMessage.textProperty().addListener((obs, oldVal, newVal) -> {
+                boolean hasError = !newVal.isEmpty();
+                errHintPane.setSegment(newVal);
+                errHintPane.setVisible(hasError);
+                errHintPane.setManaged(hasError);
+                hintPane.setVisible(!hasError);
+                hintPane.setManaged(!hasError);
+                codeBox.setVisible(!hasError && deviceCode.get() != null);
+                codeBox.setManaged(!hasError && deviceCode.get() != null);
+            });
+
+            FXUtils.onClicked(codeBox, () -> {
+                if (deviceCode.get() != null) FXUtils.copyText(deviceCode.get().getUserCode());
+            });
+
+            holder.add(Accounts.OAUTH_CALLBACK.onGrantDeviceCode.registerWeak(value ->
+                    runInFX(() -> deviceCode.set(value))
+            ));
+
+            HBox linkBox = new HBox();
+            JFXHyperlink profileLink = new JFXHyperlink(i18n("account.methods.microsoft.profile"));
+            profileLink.setExternalLink("https://account.live.com/editprof.aspx");
+            JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.microsoft.purchase"));
+            purchaseLink.setExternalLink(YggdrasilService.PURCHASE_URL);
+            JFXHyperlink deauthorizeLink = new JFXHyperlink(i18n("account.methods.microsoft.deauthorize"));
+            deauthorizeLink.setExternalLink("https://account.live.com/consent/Edit?client_id=000000004C794E0A");
+            JFXHyperlink forgotpasswordLink = new JFXHyperlink(i18n("account.methods.forgot_password"));
+            forgotpasswordLink.setExternalLink("https://account.live.com/ResetPassword.aspx");
+            linkBox.getChildren().setAll(profileLink, purchaseLink, deauthorizeLink, forgotpasswordLink);
+
+            vbox.getChildren().addAll(hintPane, errHintPane, linkBox);
+            btnAccept.setDisable(false);
         } else {
             detailsPane = new AccountDetailsInputPane(factory, btnAccept::fire);
             btnAccept.disableProperty().bind(((AccountDetailsInputPane) detailsPane).validProperty().not());
         }
+
         detailsContainer.getChildren().add(detailsPane);
     }
 
@@ -460,6 +477,9 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
                 onChangeAndOperate(cboServers.valueProperty(), server -> {
                     this.server = server;
                     linksContainer.getChildren().setAll(createHyperlinks(server));
+
+                    if (txtUsername != null)
+                        txtUsername.validate();
                 });
                 linksContainer.setMinWidth(USE_PREF_SIZE);
 
@@ -590,6 +610,9 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
             if ((factory instanceof AuthlibInjectorAccountFactory) && this.server != null) {
                 return !server.isNonEmailLogin();
             }
+            if (factory instanceof BoundAuthlibInjectorAccountFactory bound) {
+                return !bound.getServer().isNonEmailLogin();
+            }
             return false;
         }
 

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

@@ -66,11 +66,11 @@ public class OAuthAccountLoginDialog extends DialogPane {
 
         HBox box = new HBox(8);
         JFXHyperlink birthLink = new JFXHyperlink(i18n("account.methods.microsoft.birth"));
-        birthLink.setOnAction(e -> FXUtils.openLink("https://support.microsoft.com/account-billing/how-to-change-a-birth-date-on-a-microsoft-account-837badbc-999e-54d2-2617-d19206b9540a"));
+        birthLink.setExternalLink("https://support.microsoft.com/account-billing/how-to-change-a-birth-date-on-a-microsoft-account-837badbc-999e-54d2-2617-d19206b9540a");
         JFXHyperlink profileLink = new JFXHyperlink(i18n("account.methods.microsoft.profile"));
-        profileLink.setOnAction(e -> FXUtils.openLink("https://account.live.com/editprof.aspx"));
+        profileLink.setExternalLink("https://account.live.com/editprof.aspx");
         JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.microsoft.purchase"));
-        purchaseLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.PURCHASE_URL));
+        purchaseLink.setExternalLink(YggdrasilService.PURCHASE_URL);
         box.getChildren().setAll(profileLink, birthLink, purchaseLink);
         GridPane.setColumnSpan(box, 2);
 

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

@@ -24,6 +24,7 @@ import com.jfoenix.controls.JFXTextField;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.geometry.Insets;
+import javafx.geometry.VPos;
 import javafx.scene.control.Label;
 import javafx.scene.input.DragEvent;
 import javafx.scene.input.TransferMode;
@@ -159,7 +160,9 @@ public class OfflineAccountSkinPane extends StackPane {
 
         FXUtils.onChangeAndOperate(skinItem.selectedDataProperty(), selectedData -> {
             GridPane gridPane = new GridPane();
-            gridPane.setPadding(new Insets(0, 0, 0, 10));
+            // Increase bottom padding to prevent the prompt from overlapping with the dialog action area
+
+            gridPane.setPadding(new Insets(0, 0, 45, 10));
             gridPane.setHgap(16);
             gridPane.setVgap(8);
             gridPane.getColumnConstraints().setAll(new ColumnConstraints(), FXUtils.getColumnHgrowing());
@@ -172,9 +175,23 @@ public class OfflineAccountSkinPane extends StackPane {
                 case LITTLE_SKIN:
                     HintPane hint = new HintPane(MessageDialogPane.MessageType.INFO);
                     hint.setText(i18n("account.skin.type.little_skin.hint"));
+
+                    // Spanning two columns and expanding horizontally
+                    GridPane.setColumnSpan(hint, 2);
+                    GridPane.setHgrow(hint, Priority.ALWAYS);
+                    hint.setMaxWidth(Double.MAX_VALUE);
+
+                    // Force top alignment within cells (to avoid vertical offset caused by the baseline)
+                    GridPane.setValignment(hint, VPos.TOP);
+
+                    // Set a fixed height as the preferred height to prevent the GridPane from stretching or leaving empty space.
+                    hint.setMaxHeight(Region.USE_PREF_SIZE);
+                    hint.setMinHeight(Region.USE_PREF_SIZE);
+
                     gridPane.addRow(0, hint);
                     break;
                 case LOCAL_FILE:
+                    gridPane.setPadding(new Insets(0, 0, 0, 10));
                     gridPane.addRow(0, new Label(i18n("account.skin.model")), modelCombobox);
                     gridPane.addRow(1, new Label(i18n("account.skin")), skinSelector);
                     gridPane.addRow(2, new Label(i18n("account.cape")), capeSelector);

HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionPane.java

@@ -82,7 +82,9 @@ public class TransitionPane extends StackPane {
                     duration, interpolator);
             newAnimation.setOnFinished(e -> {
                 setMouseTransparent(false);
-                getChildren().remove(previousNode);
+                if (previousNode != currentNode) {
+                    getChildren().remove(previousNode);
+                }
 
                 if (cacheHint != null) {
                     newView.setCache(false);

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

@@ -30,7 +30,6 @@ import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionPane;
-import org.jackhuang.hmcl.ui.versions.VersionPage;
 
 import java.util.function.Consumer;
 
@@ -75,7 +74,7 @@ public class AdvancedListBox extends ScrollPane {
         item.setActionButtonVisible(false);
         item.setTitle(title);
         if (leftGraphic != null) {
-            item.setLeftGraphic(VersionPage.wrap(leftGraphic));
+            item.setLeftGraphic(FXUtils.wrap(leftGraphic));
         }
         return item;
     }

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

@@ -25,7 +25,7 @@ import javafx.scene.layout.HBox;
 import org.jackhuang.hmcl.ui.FXUtils;
 
 public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
-    private final PseudoClass SELECTED = PseudoClass.getPseudoClass("selected");
+    private static final PseudoClass SELECTED = PseudoClass.getPseudoClass("selected");
 
     public AdvancedListItemSkin(AdvancedListItem skinnable) {
         super(skinnable);

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

@@ -17,13 +17,8 @@
  */
 package org.jackhuang.hmcl.ui.construct;
 
-import javafx.beans.DefaultProperty;
+import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
-import javafx.beans.binding.ObjectBinding;
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.css.PseudoClass;
@@ -33,88 +28,21 @@ import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Control;
 import javafx.scene.control.Label;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Priority;
-import javafx.scene.layout.VBox;
+import javafx.scene.layout.*;
 import org.jackhuang.hmcl.util.javafx.MappedObservableList;
 
-import java.util.List;
-import java.util.function.Supplier;
-
-@DefaultProperty("content")
-public class ComponentList extends Control {
-    private final StringProperty title = new SimpleStringProperty(this, "title", "Group");
-    private final StringProperty subtitle = new SimpleStringProperty(this, "subtitle", "");
-    private final IntegerProperty depth = new SimpleIntegerProperty(this, "depth", 0);
-    private boolean hasSubtitle = false;
-    public final ObservableList<Node> content = FXCollections.observableArrayList();
-    private Supplier<List<? extends Node>> lazyInitializer;
+public class ComponentList extends Control implements NoPaddingComponent {
 
     public ComponentList() {
         getStyleClass().add("options-list");
     }
 
-    public ComponentList(Supplier<List<? extends Node>> lazyInitializer) {
-        this();
-        this.lazyInitializer = lazyInitializer;
-    }
-
-    public String getTitle() {
-        return title.get();
-    }
-
-    public StringProperty titleProperty() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title.set(title);
-    }
-
-    public String getSubtitle() {
-        return subtitle.get();
-    }
-
-    public StringProperty subtitleProperty() {
-        return subtitle;
-    }
-
-    public void setSubtitle(String subtitle) {
-        this.subtitle.set(subtitle);
-    }
-
-    public int getDepth() {
-        return depth.get();
-    }
-
-    public IntegerProperty depthProperty() {
-        return depth;
-    }
-
-    public void setDepth(int depth) {
-        this.depth.set(depth);
-    }
-
-    public boolean isHasSubtitle() {
-        return hasSubtitle;
-    }
-
-    public void setHasSubtitle(boolean hasSubtitle) {
-        this.hasSubtitle = hasSubtitle;
-    }
+    private final ObservableList<Node> content = FXCollections.observableArrayList();
 
     public ObservableList<Node> getContent() {
         return content;
     }
 
-    void doLazyInit() {
-        if (lazyInitializer != null) {
-            this.getContent().setAll(lazyInitializer.get());
-            setNeedsLayout(true);
-            lazyInitializer = null;
-        }
-    }
-
     @Override
     public Orientation getContentBias() {
         return Orientation.HORIZONTAL;
@@ -130,49 +58,72 @@ public class ComponentList extends Control {
         private static final PseudoClass PSEUDO_CLASS_LAST = PseudoClass.getPseudoClass("last");
 
         private final ObservableList<Node> list;
-        private final ObjectBinding<Node> firstItem;
-        private final ObjectBinding<Node> lastItem;
 
         Skin(ComponentList control) {
             super(control);
 
             list = MappedObservableList.create(control.getContent(), node -> {
-                ComponentListCell cell = new ComponentListCell(node);
-                cell.getStyleClass().add("options-list-item");
-                if (node.getProperties().containsKey("ComponentList.vgrow")) {
-                    VBox.setVgrow(cell, (Priority) node.getProperties().get("ComponentList.vgrow"));
+                Pane wrapper;
+                if (node instanceof ComponentSublist sublist) {
+                    sublist.getStyleClass().remove("options-list");
+                    sublist.getStyleClass().add("options-sublist");
+                    wrapper = new ComponentSublistWrapper(sublist);
+                } else {
+                    wrapper = new StackPane(node);
                 }
-                if (node.getProperties().containsKey("ComponentList.noPadding")) {
-                    cell.getStyleClass().add("no-padding");
+
+                wrapper.getStyleClass().add("options-list-item");
+
+                if (node.getProperties().get("ComponentList.vgrow") instanceof Priority priority) {
+                    VBox.setVgrow(wrapper, priority);
                 }
-                return cell;
+
+                if (node instanceof NoPaddingComponent || node.getProperties().containsKey("ComponentList.noPadding")) {
+                    wrapper.getStyleClass().add("no-padding");
+                }
+                return wrapper;
             });
 
-            firstItem = Bindings.valueAt(list, 0);
-            firstItem.addListener((observable, oldValue, newValue) -> {
-                if (newValue != null)
-                    newValue.pseudoClassStateChanged(PSEUDO_CLASS_FIRST, true);
-                if (oldValue != null)
-                    oldValue.pseudoClassStateChanged(PSEUDO_CLASS_FIRST, false);
-            });
-            if (!list.isEmpty())
-                list.get(0).pseudoClassStateChanged(PSEUDO_CLASS_FIRST, true);
-
-            lastItem = Bindings.valueAt(list, Bindings.subtract(Bindings.size(list), 1));
-            lastItem.addListener((observable, oldValue, newValue) -> {
-                if (newValue != null)
-                    newValue.pseudoClassStateChanged(PSEUDO_CLASS_LAST, true);
-                if (oldValue != null)
-                    oldValue.pseudoClassStateChanged(PSEUDO_CLASS_LAST, false);
-            });
-            if (!list.isEmpty())
-                list.get(list.size() - 1).pseudoClassStateChanged(PSEUDO_CLASS_LAST, true);
+            updateStyle();
+            list.addListener((InvalidationListener) o -> updateStyle());
 
             VBox vbox = new VBox();
             vbox.setFillWidth(true);
             Bindings.bindContent(vbox.getChildren(), list);
             node = vbox;
         }
+
+        private Node prevFirstItem;
+        private Node prevLastItem;
+
+        private void updateStyle() {
+            Node firstItem;
+            Node lastItem;
+
+            if (list.isEmpty()) {
+                firstItem = null;
+                lastItem = null;
+            } else {
+                firstItem = list.get(0);
+                lastItem = list.get(list.size() - 1);
+            }
+
+            if (firstItem != prevFirstItem) {
+                if (prevFirstItem != null)
+                    prevFirstItem.pseudoClassStateChanged(PSEUDO_CLASS_FIRST, false);
+                if (firstItem != null)
+                    firstItem.pseudoClassStateChanged(PSEUDO_CLASS_FIRST, true);
+                prevFirstItem = firstItem;
+            }
+
+            if (lastItem != prevLastItem) {
+                if (prevLastItem != null)
+                    prevLastItem.pseudoClassStateChanged(PSEUDO_CLASS_LAST, false);
+                if (lastItem != null)
+                    lastItem.pseudoClassStateChanged(PSEUDO_CLASS_LAST, true);
+                prevLastItem = lastItem;
+            }
+        }
     }
 
     public static Node createComponentListTitle(String title) {
@@ -189,4 +140,8 @@ public class ComponentList extends Control {
     public static void setVgrow(Node node, Priority priority) {
         node.getProperties().put("ComponentList.vgrow", priority);
     }
+
+    public static void setNoPadding(Node node) {
+        node.getProperties().put("ComponentList.noPadding", true);
+    }
 }

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

@@ -1,215 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui.construct;
-
-import javafx.animation.*;
-import javafx.application.Platform;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
-import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.input.MouseButton;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.*;
-import javafx.scene.shape.Rectangle;
-import javafx.util.Duration;
-import org.jackhuang.hmcl.theme.Themes;
-import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.SVG;
-import org.jackhuang.hmcl.ui.animation.AnimationUtils;
-import org.jackhuang.hmcl.ui.animation.Motion;
-
-/**
- * @author huangyuhui
- */
-final class ComponentListCell extends StackPane {
-    private final Node content;
-    private Animation expandAnimation;
-    private Rectangle clipRect;
-    private final BooleanProperty expanded = new SimpleBooleanProperty(this, "expanded", false);
-
-    ComponentListCell(Node content) {
-        this.content = content;
-
-        updateLayout();
-    }
-
-    private void updateClip(double newHeight) {
-        if (clipRect != null)
-            clipRect.setHeight(newHeight);
-    }
-
-    @Override
-    protected void layoutChildren() {
-        super.layoutChildren();
-
-        if (clipRect == null)
-            clipRect = new Rectangle(0, 0, getWidth(), getHeight());
-        else {
-            clipRect.setX(0);
-            clipRect.setY(0);
-            clipRect.setHeight(getHeight());
-            clipRect.setWidth(getWidth());
-        }
-    }
-
-    private void updateLayout() {
-        if (content instanceof ComponentList list) {
-            content.getStyleClass().remove("options-list");
-            content.getStyleClass().add("options-sublist");
-
-            getStyleClass().add("no-padding");
-
-            VBox groupNode = new VBox();
-
-            Node expandIcon = SVG.KEYBOARD_ARROW_DOWN.createIcon(20);
-            expandIcon.setMouseTransparent(true);
-            HBox.setMargin(expandIcon, new Insets(0, 8, 0, 8));
-
-            VBox labelVBox = new VBox();
-            labelVBox.setMouseTransparent(true);
-            labelVBox.setAlignment(Pos.CENTER_LEFT);
-
-            boolean overrideHeaderLeft = false;
-            if (list instanceof ComponentSublist) {
-                Node leftNode = ((ComponentSublist) list).getHeaderLeft();
-                if (leftNode != null) {
-                    labelVBox.getChildren().setAll(leftNode);
-                    overrideHeaderLeft = true;
-                }
-            }
-
-            if (!overrideHeaderLeft) {
-                Label label = new Label();
-                label.textProperty().bind(list.titleProperty());
-                label.getStyleClass().add("title-label");
-                labelVBox.getChildren().add(label);
-
-                if (list.isHasSubtitle()) {
-                    Label subtitleLabel = new Label();
-                    subtitleLabel.textProperty().bind(list.subtitleProperty());
-                    subtitleLabel.getStyleClass().add("subtitle-label");
-                    subtitleLabel.textFillProperty().bind(Themes.colorSchemeProperty().getOnSurfaceVariant());
-                    labelVBox.getChildren().add(subtitleLabel);
-                }
-            }
-
-            HBox header = new HBox();
-            header.setSpacing(16);
-            header.getChildren().add(labelVBox);
-            header.setPadding(new Insets(10, 16, 10, 16));
-            header.setAlignment(Pos.CENTER_LEFT);
-            HBox.setHgrow(labelVBox, Priority.ALWAYS);
-            if (list instanceof ComponentSublist) {
-                Node rightNode = ((ComponentSublist) list).getHeaderRight();
-                if (rightNode != null)
-                    header.getChildren().add(rightNode);
-            }
-            header.getChildren().add(expandIcon);
-
-            RipplerContainer headerRippler = new RipplerContainer(header);
-            groupNode.getChildren().add(headerRippler);
-
-            VBox container = new VBox();
-            boolean hasPadding = !(list instanceof ComponentSublist subList) || subList.hasComponentPadding();
-            if (hasPadding) {
-                container.setPadding(new Insets(8, 16, 10, 16));
-            }
-            FXUtils.setLimitHeight(container, 0);
-            FXUtils.setOverflowHidden(container);
-            container.getChildren().setAll(content);
-            groupNode.getChildren().add(container);
-
-            headerRippler.addEventHandler(MouseEvent.MOUSE_CLICKED, event -> {
-                if (event.getButton() != MouseButton.PRIMARY)
-                    return;
-
-                event.consume();
-
-                if (expandAnimation != null && expandAnimation.getStatus() == Animation.Status.RUNNING) {
-                    expandAnimation.stop();
-                }
-
-                boolean expanded = !isExpanded();
-                setExpanded(expanded);
-                if (expanded) {
-                    list.doLazyInit();
-                    list.layout();
-                }
-
-                Platform.runLater(() -> {
-                    // FIXME: ComponentSubList without padding must have a 4 pixel padding for displaying a border radius.
-                    double newAnimatedHeight = (list.prefHeight(list.getWidth()) + (hasPadding ? 8 + 10 : 4)) * (expanded ? 1 : -1);
-                    double newHeight = expanded ? getHeight() + newAnimatedHeight : prefHeight(list.getWidth());
-                    double contentHeight = expanded ? newAnimatedHeight : 0;
-                    double targetRotate = expanded ? -180 : 0;
-
-                    if (expanded) {
-                        updateClip(newHeight);
-                    }
-
-                    if (AnimationUtils.isAnimationEnabled()) {
-                        double currentRotate = expandIcon.getRotate();
-                        Duration duration = Motion.LONG2.multiply(Math.abs(currentRotate - targetRotate) / 180.0);
-                        Interpolator interpolator = Motion.EASE_IN_OUT_CUBIC_EMPHASIZED;
-
-                        expandAnimation = new Timeline(
-                                new KeyFrame(duration,
-                                        new KeyValue(container.minHeightProperty(), contentHeight, interpolator),
-                                        new KeyValue(container.maxHeightProperty(), contentHeight, interpolator),
-                                        new KeyValue(expandIcon.rotateProperty(), targetRotate, interpolator))
-                        );
-
-                        if (!expanded) {
-                            expandAnimation.setOnFinished(e2 -> updateClip(newHeight));
-                        }
-
-                        expandAnimation.play();
-                    } else {
-                        container.setMinHeight(contentHeight);
-                        container.setMaxHeight(contentHeight);
-                        expandIcon.setRotate(targetRotate);
-
-                        if (!expanded) {
-                            updateClip(newHeight);
-                        }
-                    }
-                });
-            });
-
-            getChildren().setAll(groupNode);
-        } else {
-            getStyleClass().remove("no-padding");
-            getChildren().setAll(content);
-        }
-    }
-
-    public boolean isExpanded() {
-        return expanded.get();
-    }
-
-    public BooleanProperty expandedProperty() {
-        return expanded;
-    }
-
-    public void setExpanded(boolean expanded) {
-        this.expanded.set(expanded);
-    }
-}

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

@@ -17,57 +17,100 @@
  */
 package org.jackhuang.hmcl.ui.construct;
 
-import javafx.beans.DefaultProperty;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.*;
 import javafx.scene.Node;
 
-@DefaultProperty("content")
+import java.util.List;
+import java.util.function.Supplier;
+
 public class ComponentSublist extends ComponentList {
 
-    private final ObjectProperty<Node> headerLeft = new SimpleObjectProperty<>(this, "headerLeft");
-    private final ObjectProperty<Node> headerRight = new SimpleObjectProperty<>(this, "headerRight");
-    private final BooleanProperty componentPadding = new SimpleBooleanProperty(this, "componentPadding", true);
+    Supplier<List<? extends Node>> lazyInitializer;
 
     public ComponentSublist() {
         super();
     }
 
-    public Node getHeaderLeft() {
-        return headerLeft.get();
+    public ComponentSublist(Supplier<List<? extends Node>> lazyInitializer) {
+        this.lazyInitializer = lazyInitializer;
     }
 
-    public ObjectProperty<Node> headerLeftProperty() {
+    void doLazyInit() {
+        if (lazyInitializer != null) {
+            this.getContent().setAll(lazyInitializer.get());
+            setNeedsLayout(true);
+            lazyInitializer = null;
+        }
+    }
+
+    private final StringProperty title = new SimpleStringProperty(this, "title", "Group");
+
+    public StringProperty titleProperty() {
+        return title;
+    }
+
+    public String getTitle() {
+        return titleProperty().get();
+    }
+
+    public void setTitle(String title) {
+        titleProperty().set(title);
+    }
+
+    private StringProperty subtitle;
+
+    public StringProperty subtitleProperty() {
+        if (subtitle == null)
+            subtitle = new SimpleStringProperty(this, "subtitle", "");
+
+        return subtitle;
+    }
+
+    public String getSubtitle() {
+        return subtitleProperty().get();
+    }
+
+    public void setSubtitle(String subtitle) {
+        subtitleProperty().set(subtitle);
+    }
+
+    private boolean hasSubtitle = false;
+
+    public boolean isHasSubtitle() {
+        return hasSubtitle;
+    }
+
+    public void setHasSubtitle(boolean hasSubtitle) {
+        this.hasSubtitle = hasSubtitle;
+    }
+
+    private Node headerLeft;
+
+    public Node getHeaderLeft() {
         return headerLeft;
     }
 
     public void setHeaderLeft(Node headerLeft) {
-        this.headerLeft.set(headerLeft);
+        this.headerLeft = headerLeft;
     }
 
+    private Node headerRight;
+
     public Node getHeaderRight() {
-        return headerRight.get();
-    }
-
-    public ObjectProperty<Node> headerRightProperty() {
         return headerRight;
     }
 
     public void setHeaderRight(Node headerRight) {
-        this.headerRight.set(headerRight);
+        this.headerRight = headerRight;
     }
 
+    private boolean componentPadding = true;
+
     public boolean hasComponentPadding() {
-        return componentPadding.get();
-    }
-
-    public BooleanProperty componentPaddingProperty() {
         return componentPadding;
     }
 
     public void setComponentPadding(boolean componentPadding) {
-        this.componentPadding.set(componentPadding);
+        this.componentPadding = componentPadding;
     }
 }

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

@@ -0,0 +1,146 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.animation.*;
+import javafx.application.Platform;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
+import javafx.util.Duration;
+import org.jackhuang.hmcl.theme.Themes;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.ui.animation.AnimationUtils;
+import org.jackhuang.hmcl.ui.animation.Motion;
+
+/// @author Glavo
+final class ComponentSublistWrapper extends VBox implements NoPaddingComponent {
+    private VBox container;
+
+    private Animation expandAnimation;
+    private boolean expanded = false;
+
+    ComponentSublistWrapper(ComponentSublist sublist) {
+        boolean noPadding = !sublist.hasComponentPadding();
+
+        Node expandIcon = SVG.KEYBOARD_ARROW_DOWN.createIcon(20);
+        expandIcon.setMouseTransparent(true);
+        HBox.setMargin(expandIcon, new Insets(0, 8, 0, 8));
+
+        VBox labelVBox = new VBox();
+        labelVBox.setMouseTransparent(true);
+        labelVBox.setAlignment(Pos.CENTER_LEFT);
+
+        Node leftNode = sublist.getHeaderLeft();
+        if (leftNode == null) {
+            Label label = new Label();
+            label.textProperty().bind(sublist.titleProperty());
+            label.getStyleClass().add("title-label");
+            labelVBox.getChildren().add(label);
+
+            if (sublist.isHasSubtitle()) {
+                Label subtitleLabel = new Label();
+                subtitleLabel.textProperty().bind(sublist.subtitleProperty());
+                subtitleLabel.getStyleClass().add("subtitle-label");
+                subtitleLabel.textFillProperty().bind(Themes.colorSchemeProperty().getOnSurfaceVariant());
+                labelVBox.getChildren().add(subtitleLabel);
+            }
+        } else {
+            labelVBox.getChildren().setAll(leftNode);
+        }
+
+        HBox header = new HBox();
+        header.setSpacing(16);
+        header.getChildren().add(labelVBox);
+        header.setPadding(new Insets(10, 16, 10, 16));
+        header.setAlignment(Pos.CENTER_LEFT);
+        HBox.setHgrow(labelVBox, Priority.ALWAYS);
+        Node rightNode = sublist.getHeaderRight();
+        if (rightNode != null)
+            header.getChildren().add(rightNode);
+        header.getChildren().add(expandIcon);
+
+        RipplerContainer headerRippler = new RipplerContainer(header);
+        this.getChildren().add(headerRippler);
+
+        headerRippler.addEventHandler(MouseEvent.MOUSE_CLICKED, event -> {
+            if (event.getButton() != MouseButton.PRIMARY)
+                return;
+
+            event.consume();
+
+            if (expandAnimation != null && expandAnimation.getStatus() == Animation.Status.RUNNING) {
+                expandAnimation.stop();
+            }
+
+            boolean expanded = !this.expanded;
+            this.expanded = expanded;
+            if (expanded) {
+                sublist.doLazyInit();
+
+                if (container == null) {
+                    this.container = new VBox();
+
+                    if (!noPadding) {
+                        container.setPadding(new Insets(8, 16, 10, 16));
+                    }
+                    FXUtils.setLimitHeight(container, 0);
+                    FXUtils.setOverflowHidden(container);
+                    container.getChildren().setAll(sublist);
+                    ComponentSublistWrapper.this.getChildren().add(container);
+
+                    this.applyCss();
+                }
+
+                this.layout();
+            }
+
+            Platform.runLater(() -> {
+                // FIXME: ComponentSubList without padding must have a 4 pixel padding for displaying a border radius.
+                double contentHeight = expanded ? (sublist.prefHeight(sublist.getWidth()) + (noPadding ? 4 : 8 + 10)) : 0;
+                double targetRotate = expanded ? -180 : 0;
+
+                if (AnimationUtils.isAnimationEnabled()) {
+                    double currentRotate = expandIcon.getRotate();
+                    Duration duration = Motion.LONG2.multiply(Math.abs(currentRotate - targetRotate) / 180.0);
+                    Interpolator interpolator = Motion.EASE_IN_OUT_CUBIC_EMPHASIZED;
+
+                    expandAnimation = new Timeline(
+                            new KeyFrame(duration,
+                                    new KeyValue(container.minHeightProperty(), contentHeight, interpolator),
+                                    new KeyValue(container.maxHeightProperty(), contentHeight, interpolator),
+                                    new KeyValue(expandIcon.rotateProperty(), targetRotate, interpolator))
+                    );
+
+                    expandAnimation.play();
+                } else {
+                    container.setMinHeight(contentHeight);
+                    container.setMaxHeight(contentHeight);
+                    expandIcon.setRotate(targetRotate);
+                }
+            });
+        });
+    }
+}

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

@@ -23,7 +23,6 @@ import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.control.Label;
-import javafx.scene.control.Tooltip;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.DirectoryChooser;
@@ -45,7 +44,6 @@ public class FileItem extends BorderPane {
 
     private final SimpleStringProperty name = new SimpleStringProperty(this, "name");
     private final SimpleStringProperty title = new SimpleStringProperty(this, "title");
-    private final SimpleStringProperty tooltip = new SimpleStringProperty(this, "tooltip");
     private final SimpleStringProperty path = new SimpleStringProperty(this, "path");
     private final SimpleBooleanProperty convertToRelativePath = new SimpleBooleanProperty(this, "convertToRelativePath");
 
@@ -65,10 +63,6 @@ public class FileItem extends BorderPane {
         FXUtils.installFastTooltip(right, i18n("button.edit"));
         setRight(right);
 
-        Tooltip tip = new Tooltip();
-        tip.textProperty().bind(tooltipProperty());
-        Tooltip.install(this, tip);
-
         convertToRelativePath.addListener(onInvalidating(() -> path.set(processPath(path.get()))));
     }
 
@@ -142,18 +136,6 @@ public class FileItem extends BorderPane {
         this.title.set(title);
     }
 
-    public String getTooltip() {
-        return tooltip.get();
-    }
-
-    public StringProperty tooltipProperty() {
-        return tooltip;
-    }
-
-    public void setTooltip(String tooltip) {
-        this.tooltip.set(tooltip);
-    }
-
     public String getPath() {
         return path.get();
     }

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

@@ -1,69 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui.construct;
-
-import com.jfoenix.controls.JFXListView;
-import com.jfoenix.effects.JFXDepthManager;
-import javafx.css.PseudoClass;
-import javafx.geometry.Insets;
-import javafx.scene.Cursor;
-import javafx.scene.control.ListCell;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.ui.FXUtils;
-
-public abstract class FloatListCell<T> extends ListCell<T> {
-    private final PseudoClass SELECTED = PseudoClass.getPseudoClass("selected");
-
-    protected final StackPane pane = new StackPane();
-
-    public FloatListCell(JFXListView<T> listView) {
-        setText(null);
-        setGraphic(null);
-
-        pane.getStyleClass().add("card");
-        pane.setCursor(Cursor.HAND);
-        setPadding(new Insets(9, 9, 0, 9));
-        JFXDepthManager.setDepth(pane, 1);
-
-        FXUtils.onChangeAndOperate(selectedProperty(), selected -> {
-            pane.pseudoClassStateChanged(SELECTED, selected);
-        });
-
-        Region clippedContainer = (Region) listView.lookup(".clipped-container");
-        setPrefWidth(0);
-        if (clippedContainer != null) {
-            maxWidthProperty().bind(clippedContainer.widthProperty());
-            prefWidthProperty().bind(clippedContainer.widthProperty());
-            minWidthProperty().bind(clippedContainer.widthProperty());
-        }
-    }
-
-    @Override
-    protected void updateItem(T item, boolean empty) {
-        super.updateItem(item, empty);
-        updateControl(item, empty);
-        if (empty) {
-            setGraphic(null);
-        } else {
-            setGraphic(pane);
-        }
-    }
-
-    protected abstract void updateControl(T dataItem, boolean empty);
-}

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

@@ -58,11 +58,12 @@ public final class ImagePickerItem extends BorderPane {
         selectButton.getStyleClass().add("toggle-icon4");
 
         JFXButton deleteButton = new JFXButton();
-        deleteButton.setGraphic(SVG.CLOSE.createIcon(20));
+        deleteButton.setGraphic(SVG.RESTORE.createIcon(20));
         deleteButton.onActionProperty().bind(onDeleteButtonClicked);
         deleteButton.getStyleClass().add("toggle-icon4");
 
         FXUtils.installFastTooltip(selectButton, i18n("button.edit"));
+        FXUtils.installFastTooltip(deleteButton, i18n("button.reset"));
 
         HBox hBox = new HBox();
         hBox.getChildren().setAll(imageView, selectButton, deleteButton);

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

@@ -20,9 +20,11 @@ package org.jackhuang.hmcl.ui.construct;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialogLayout;
 import com.jfoenix.controls.JFXTextField;
+import com.jfoenix.validation.base.ValidatorBase;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.FutureCallback;
 
 import java.util.concurrent.CompletableFuture;
@@ -30,12 +32,22 @@ import java.util.concurrent.CompletableFuture;
 import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-public class InputDialogPane extends JFXDialogLayout {
+public class InputDialogPane extends JFXDialogLayout implements DialogAware {
     private final CompletableFuture<String> future = new CompletableFuture<>();
 
     private final JFXTextField textField;
     private final Label lblCreationWarning;
     private final SpinnerPane acceptPane;
+    private final JFXButton acceptButton;
+
+    public InputDialogPane(String text, String initialValue, FutureCallback<String> onResult, ValidatorBase... validators) {
+        this(text, initialValue, onResult);
+        if (validators != null && validators.length > 0) {
+            textField.getValidators().addAll(validators);
+            FXUtils.setValidateWhileTextChanged(textField, true);
+            acceptButton.disableProperty().bind(textField.activeValidatorProperty().isNotNull());
+        }
+    }
 
     public InputDialogPane(String text, String initialValue, FutureCallback<String> onResult) {
         textField = new JFXTextField(initialValue);
@@ -47,7 +59,7 @@ public class InputDialogPane extends JFXDialogLayout {
 
         acceptPane = new SpinnerPane();
         acceptPane.getStyleClass().add("small-spinner-pane");
-        JFXButton acceptButton = new JFXButton(i18n("button.ok"));
+        acceptButton = new JFXButton(i18n("button.ok"));
         acceptButton.getStyleClass().add("dialog-accept");
         acceptPane.setContent(acceptButton);
 
@@ -60,19 +72,30 @@ public class InputDialogPane extends JFXDialogLayout {
         acceptButton.setOnAction(e -> {
             acceptPane.showSpinner();
 
-            onResult.call(textField.getText(), () -> {
-                acceptPane.hideSpinner();
-                future.complete(textField.getText());
-                fireEvent(new DialogCloseEvent());
-            }, msg -> {
-                acceptPane.hideSpinner();
-                lblCreationWarning.setText(msg);
+            onResult.call(textField.getText(), new FutureCallback.ResultHandler() {
+                @Override
+                public void resolve() {
+                    acceptPane.hideSpinner();
+                    future.complete(textField.getText());
+                    fireEvent(new DialogCloseEvent());
+                }
+
+                @Override
+                public void reject(String reason) {
+                    acceptPane.hideSpinner();
+                    lblCreationWarning.setText(reason);
+                }
             });
         });
-
+        textField.setOnAction(event -> acceptButton.fire());
         onEscPressed(this, cancelButton::fire);
     }
 
+    @Override
+    public void onDialogShown() {
+        textField.requestFocus();
+    }
+
     public CompletableFuture<String> getCompletableFuture() {
         return future;
     }

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

@@ -0,0 +1,123 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.beans.property.StringPropertyBase;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.Label;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+
+/// @author Glavo
+public abstract class LineButtonBase extends StackPane implements NoPaddingComponent {
+
+    private static final Insets PADDING = new Insets(8, 8, 8, 16);
+
+    protected final BorderPane root;
+    protected final RipplerContainer container;
+
+    private final Label titleLabel;
+
+    public LineButtonBase() {
+        this.root = new BorderPane();
+        root.setPadding(PADDING);
+        root.setMinHeight(48);
+
+        this.container = new RipplerContainer(root);
+        this.getChildren().setAll(container);
+
+        this.titleLabel = new Label();
+        root.setCenter(titleLabel);
+        BorderPane.setAlignment(titleLabel, Pos.CENTER_LEFT);
+        titleLabel.textProperty().bind(titleProperty());
+        titleLabel.getStyleClass().add("title");
+    }
+
+    private final StringProperty title = new SimpleStringProperty(this, "title");
+
+    public StringProperty titleProperty() {
+        return title;
+    }
+
+    public String getTitle() {
+        return titleProperty().get();
+    }
+
+    public void setTitle(String title) {
+        this.titleProperty().set(title);
+    }
+
+    private StringProperty subtitle;
+
+    public StringProperty subtitleProperty() {
+        if (subtitle == null) {
+            subtitle = new StringPropertyBase() {
+                private VBox left;
+                private Label subtitleLabel;
+
+                @Override
+                public String getName() {
+                    return "subtitle";
+                }
+
+                @Override
+                public Object getBean() {
+                    return LineButtonBase.this;
+                }
+
+                @Override
+                protected void invalidated() {
+                    String subtitle = get();
+                    if (subtitle != null && !subtitle.isEmpty()) {
+                        if (left == null) {
+                            left = new VBox();
+                            left.setMouseTransparent(true);
+                            left.setAlignment(Pos.CENTER_LEFT);
+
+                            subtitleLabel = new Label();
+                            subtitleLabel.setWrapText(true);
+                            subtitleLabel.setMinHeight(Region.USE_PREF_SIZE);
+                            subtitleLabel.getStyleClass().add("subtitle");
+                        }
+                        subtitleLabel.setText(subtitle);
+                        left.getChildren().setAll(titleLabel, subtitleLabel);
+                        root.setCenter(left);
+                    } else if (left != null) {
+                        subtitleLabel.setText(null);
+                        root.setCenter(titleLabel);
+                    }
+                }
+            };
+        }
+
+        return subtitle;
+    }
+
+    public String getSubtitle() {
+        return subtitleProperty().get();
+    }
+
+    public void setSubtitle(String subtitle) {
+        subtitleProperty().set(subtitle);
+    }
+}

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

@@ -0,0 +1,112 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ObjectPropertyBase;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.layout.HBox;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;
+
+/// @author Glavo
+public final class LineNavigationButton extends LineButtonBase {
+    private static final String DEFAULT_STYLE_CLASS = "line-navigation-button";
+
+    public LineNavigationButton() {
+        getStyleClass().add(DEFAULT_STYLE_CLASS);
+
+        root.setMouseTransparent(true);
+
+        HBox right = new HBox();
+        root.setRight(right);
+        {
+            right.setAlignment(Pos.CENTER_RIGHT);
+
+            Label valueLabel = new Label();
+            valueLabel.getStyleClass().add("subtitle");
+            valueLabel.textProperty().bind(messageProperty());
+
+            Node arrowIcon = SVG.ARROW_FORWARD.createIcon(24);
+            HBox.setMargin(arrowIcon, new Insets(0, 8, 0, 8));
+
+            disabledProperty().addListener((observable, oldValue, newValue) ->
+                    arrowIcon.setOpacity(newValue ? 0.4 : 1.0));
+
+            right.getChildren().setAll(valueLabel, arrowIcon);
+        }
+
+        FXUtils.onClicked(container, this::fire);
+    }
+
+    public void fire() {
+        fireEvent(new ActionEvent());
+    }
+
+    private final ObjectProperty<EventHandler<ActionEvent>> onAction = new ObjectPropertyBase<>() {
+
+        @Override
+        protected void invalidated() {
+            setEventHandler(ActionEvent.ACTION, get());
+        }
+
+        @Override
+        public Object getBean() {
+            return LineNavigationButton.this;
+        }
+
+        @Override
+        public String getName() {
+            return "onAction";
+        }
+    };
+
+    public ObjectProperty<EventHandler<ActionEvent>> onActionProperty() {
+        return onAction;
+    }
+
+    public EventHandler<ActionEvent> getOnAction() {
+        return onActionProperty().get();
+    }
+
+    public void setOnAction(EventHandler<ActionEvent> value) {
+        onActionProperty().set(value);
+    }
+
+    private final StringProperty message = new SimpleStringProperty(this, "message", "");
+
+    public StringProperty messageProperty() {
+        return message;
+    }
+
+    public String getMessage() {
+        return messageProperty().get();
+    }
+
+    public void setMessage(String message) {
+        messageProperty().set(message);
+    }
+
+}

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

@@ -0,0 +1,115 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.beans.property.StringPropertyBase;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.Label;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.VBox;
+
+/// @author Glavo
+public class LinePane extends BorderPane implements NoPaddingComponent {
+
+    private static final Insets PADDING = new Insets(8, 8, 8, 16);
+
+    private final Label titleLabel;
+
+    public LinePane() {
+        this.setPadding(PADDING);
+        this.setMinHeight(48);
+
+        this.titleLabel = new Label();
+        this.setCenter(titleLabel);
+        BorderPane.setAlignment(titleLabel, Pos.CENTER_LEFT);
+        titleLabel.textProperty().bind(titleProperty());
+        titleLabel.getStyleClass().add("title");
+    }
+
+    private final StringProperty title = new SimpleStringProperty(this, "title");
+
+    public StringProperty titleProperty() {
+        return title;
+    }
+
+    public String getTitle() {
+        return titleProperty().get();
+    }
+
+    public void setTitle(String title) {
+        this.titleProperty().set(title);
+    }
+
+    private StringProperty subtitle;
+
+    public StringProperty subtitleProperty() {
+        if (subtitle == null) {
+            subtitle = new StringPropertyBase() {
+                private VBox left;
+                private Label subtitleLabel;
+
+                @Override
+                public String getName() {
+                    return "subtitle";
+                }
+
+                @Override
+                public Object getBean() {
+                    return LinePane.this;
+                }
+
+                @Override
+                protected void invalidated() {
+                    String subtitle = get();
+                    if (subtitle != null && !subtitle.isEmpty()) {
+                        if (left == null) {
+                            left = new VBox();
+                            left.setMouseTransparent(true);
+                            left.setAlignment(Pos.CENTER_LEFT);
+
+                            subtitleLabel = new Label();
+                            subtitleLabel.setWrapText(true);
+                            subtitleLabel.setMinHeight(Region.USE_PREF_SIZE);
+                            subtitleLabel.getStyleClass().add("subtitle");
+                        }
+                        subtitleLabel.setText(subtitle);
+                        left.getChildren().setAll(titleLabel, subtitleLabel);
+                        LinePane.this.setCenter(left);
+                    } else if (left != null) {
+                        subtitleLabel.setText(null);
+                        LinePane.this.setCenter(titleLabel);
+                    }
+                }
+            };
+        }
+
+        return subtitle;
+    }
+
+    public String getSubtitle() {
+        return subtitleProperty().get();
+    }
+
+    public void setSubtitle(String subtitle) {
+        subtitleProperty().set(subtitle);
+    }
+}

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

@@ -0,0 +1,231 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import com.jfoenix.controls.JFXPopup;
+import javafx.beans.InvalidationListener;
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.*;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.css.PseudoClass;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.input.ScrollEvent;
+import javafx.scene.layout.*;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.util.javafx.MappedObservableList;
+
+import java.util.Collection;
+import java.util.Objects;
+import java.util.function.Function;
+
+import static org.jackhuang.hmcl.ui.FXUtils.determineOptimalPopupPosition;
+
+/// @author Glavo
+public final class LineSelectButton<T> extends LineButtonBase {
+
+    private static final String DEFAULT_STYLE_CLASS = "line-select-button";
+    private static final PseudoClass SELECTED_PSEUDO_CLASS = PseudoClass.getPseudoClass("selected");
+
+    private JFXPopup popup;
+
+    public LineSelectButton() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+
+        root.setMouseTransparent(true);
+
+        HBox right = new HBox();
+        root.setRight(right);
+        {
+            right.setAlignment(Pos.CENTER_RIGHT);
+
+            Label valueLabel = new Label();
+            valueLabel.getStyleClass().add("subtitle");
+
+            InvalidationListener updateValue = observable -> {
+                T value = getValue();
+                if (value == null)
+                    valueLabel.setText("");
+                else {
+                    Function<T, String> converter = getConverter();
+                    valueLabel.setText(converter != null ? converter.apply(value) : value.toString());
+                }
+            };
+            converterProperty().addListener(updateValue);
+            valueProperty().addListener(updateValue);
+
+            Node arrowIcon = SVG.UNFOLD_MORE.createIcon(24);
+            HBox.setMargin(arrowIcon, new Insets(0, 8, 0, 8));
+
+            right.getChildren().setAll(valueLabel, arrowIcon);
+        }
+
+        container.addEventHandler(MouseEvent.MOUSE_CLICKED, event -> {
+            if (event.getButton() == MouseButton.PRIMARY) {
+                if (popup == null) {
+                    PopupMenu popupMenu = new PopupMenu();
+                    this.popup = new JFXPopup(popupMenu);
+
+                    container.addEventFilter(ScrollEvent.ANY, ignored -> popup.hide());
+
+                    Bindings.bindContent(popupMenu.getContent(), MappedObservableList.create(itemsProperty(), item -> {
+                        VBox vbox = new VBox();
+
+                        var itemTitleLabel = new Label();
+                        itemTitleLabel.getStyleClass().add("title");
+                        itemTitleLabel.textProperty().bind(Bindings.createStringBinding(() -> {
+                            if (item == null)
+                                return "";
+
+                            Function<T, String> converter = getConverter();
+                            return converter != null ? converter.apply(item) : Objects.toString(item, "");
+                        }, converterProperty()));
+
+                        var itemSubtitleLabel = new Label();
+                        itemSubtitleLabel.getStyleClass().add("subtitle");
+                        itemSubtitleLabel.textProperty().bind(Bindings.createStringBinding(() -> {
+                            Function<T, String> descriptionConverter = getDescriptionConverter();
+                            return descriptionConverter != null ? descriptionConverter.apply(item) : "";
+                        }, descriptionConverterProperty()));
+
+                        FXUtils.onChangeAndOperate(itemSubtitleLabel.textProperty(), text -> {
+                            if (text == null || text.isEmpty()) {
+                                vbox.getChildren().setAll(itemTitleLabel);
+                            } else {
+                                vbox.getChildren().setAll(itemTitleLabel, itemSubtitleLabel);
+                            }
+                        });
+
+                        var wrapper = new StackPane(vbox);
+                        wrapper.setAlignment(Pos.CENTER_LEFT);
+                        wrapper.getStyleClass().add("menu-container");
+                        wrapper.setMouseTransparent(true);
+                        RipplerContainer ripplerContainer = new RipplerContainer(wrapper);
+                        FXUtils.onClicked(ripplerContainer, () -> {
+                            setValue(item);
+                            popup.hide();
+                        });
+
+                        FXUtils.onChangeAndOperate(valueProperty(),
+                                value -> wrapper.pseudoClassStateChanged(SELECTED_PSEUDO_CLASS, Objects.equals(value, item)));
+
+                        return ripplerContainer;
+                    }));
+
+                    popup.showingProperty().addListener((observable, oldValue, newValue) ->
+                            container.getRippler().setRipplerDisabled(newValue));
+                }
+
+                if (popup.isShowing()) {
+                    popup.hide();
+                } else {
+                    JFXPopup.PopupVPosition vPosition = determineOptimalPopupPosition(this, popup);
+                    popup.show(this, vPosition, JFXPopup.PopupHPosition.RIGHT,
+                            0,
+                            vPosition == JFXPopup.PopupVPosition.TOP ? this.getHeight() : -this.getHeight());
+                }
+
+                event.consume();
+            } else if (event.getButton() == MouseButton.SECONDARY) {
+                if (popup != null)
+                    popup.hide();
+
+                event.consume();
+            }
+        });
+    }
+
+    private final ObjectProperty<T> value = new SimpleObjectProperty<>(this, "value");
+
+    public ObjectProperty<T> valueProperty() {
+        return value;
+    }
+
+    public T getValue() {
+        return valueProperty().get();
+    }
+
+    public void setValue(T value) {
+        valueProperty().set(value);
+    }
+
+    private final ObjectProperty<Function<T, String>> converter = new SimpleObjectProperty<>(this, "converter");
+
+    public ObjectProperty<Function<T, String>> converterProperty() {
+        return converter;
+    }
+
+    public Function<T, String> getConverter() {
+        return converterProperty().get();
+    }
+
+    public void setConverter(Function<T, String> value) {
+        converterProperty().set(value);
+    }
+
+    private ObjectProperty<Function<T, String>> descriptionConverter;
+
+    public ObjectProperty<Function<T, String>> descriptionConverterProperty() {
+        if (descriptionConverter == null) {
+            descriptionConverter = new SimpleObjectProperty<>(this, "descriptionConverter");
+        }
+        return descriptionConverter;
+    }
+
+    public Function<T, String> getDescriptionConverter() {
+        return descriptionConverterProperty().get();
+    }
+
+    public void setDescriptionConverter(Function<T, String> value) {
+        descriptionConverterProperty().set(value);
+    }
+
+    private final ListProperty<T> items = new SimpleListProperty<>(this, "items", FXCollections.emptyObservableList());
+
+    public ListProperty<T> itemsProperty() {
+        return items;
+    }
+
+    public void setItems(ObservableList<T> value) {
+        itemsProperty().set(value);
+    }
+
+    public void setItems(Collection<T> value) {
+        if (value instanceof ObservableList<T> observableList) {
+            this.setItems(observableList);
+        } else {
+            this.setItems(FXCollections.observableArrayList(value));
+        }
+    }
+
+    @SafeVarargs
+    public final void setItems(T... values) {
+        this.setItems(FXCollections.observableArrayList(values));
+    }
+
+    public ObservableList<T> getItems() {
+        return items.get();
+    }
+
+}

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

@@ -0,0 +1,86 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.beans.property.StringProperty;
+import javafx.beans.property.StringPropertyBase;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.Label;
+import javafx.scene.layout.BorderPane;
+import org.jackhuang.hmcl.ui.FXUtils;
+
+/// @author Glavo
+public final class LineTextPane extends LinePane {
+
+    private static final String DEFAULT_STYLE_CLASS = "line-label-pane";
+
+    public LineTextPane() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+    }
+
+    private StringProperty text;
+
+    public StringProperty textProperty() {
+        if (text == null) {
+            text = new StringPropertyBase() {
+                private static final Insets LABEL_MARGIN = new Insets(0, 8, 0, 16);
+
+                private Label rightLabel;
+
+                @Override
+                public Object getBean() {
+                    return LineTextPane.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "text";
+                }
+
+                @Override
+                protected void invalidated() {
+                    String text = get();
+                    if (text == null || text.isEmpty()) {
+                        if (rightLabel != null)
+                            rightLabel.setText(null);
+                        LineTextPane.this.setRight(null);
+                    } else {
+                        if (rightLabel == null) {
+                            rightLabel = FXUtils.newSafeTruncatedLabel();
+                            FXUtils.copyOnDoubleClick(rightLabel);
+                            BorderPane.setMargin(rightLabel, LABEL_MARGIN);
+                            BorderPane.setAlignment(rightLabel, Pos.CENTER_RIGHT);
+                        }
+                        rightLabel.setText(text);
+                        LineTextPane.this.setRight(rightLabel);
+                    }
+                }
+            };
+        }
+        return text;
+    }
+
+    public String getText() {
+        return textProperty().get();
+    }
+
+    public void setText(String text) {
+        textProperty().set(text);
+    }
+}

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

@@ -0,0 +1,57 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2021  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import com.jfoenix.controls.JFXToggleButton;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.geometry.Pos;
+import javafx.scene.layout.BorderPane;
+import org.jackhuang.hmcl.ui.FXUtils;
+
+public final class LineToggleButton extends LineButtonBase {
+    private static final String DEFAULT_STYLE_CLASS = "line-toggle-button";
+
+    public LineToggleButton() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+
+        JFXToggleButton toggleButton = new JFXToggleButton();
+        toggleButton.selectedProperty().bindBidirectional(selectedProperty());
+        toggleButton.setSize(8);
+        FXUtils.setLimitHeight(toggleButton, 30);
+
+        BorderPane.setAlignment(toggleButton, Pos.CENTER);
+        root.setRight(toggleButton);
+
+        FXUtils.onClicked(container, toggleButton::fire);
+    }
+
+    private final BooleanProperty selected = new SimpleBooleanProperty(this, "selected");
+
+    public BooleanProperty selectedProperty() {
+        return selected;
+    }
+
+    public boolean isSelected() {
+        return selectedProperty().get();
+    }
+
+    public void setSelected(boolean selected) {
+        selectedProperty().set(selected);
+    }
+}

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

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

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

@@ -87,7 +87,7 @@ public final class MessageDialogPane extends HBox {
         {
             StackPane titlePane = new StackPane();
             titlePane.getStyleClass().addAll("jfx-layout-heading", "title");
-            titlePane.getChildren().setAll(new Label(title != null ? title : i18n("message.info")));
+            titlePane.getChildren().setAll(new Label(title != null ? title : type.getDisplayName()));
 
             StackPane content = new StackPane();
             content.getStyleClass().add("jfx-layout-body");
@@ -190,6 +190,7 @@ public final class MessageDialogPane extends HBox {
 
         public Builder addCancel(String cancelText, @Nullable Runnable cancel) {
             JFXButton btnCancel = new JFXButton(cancelText);
+            btnCancel.setButtonType(JFXButton.ButtonType.FLAT);
             btnCancel.getStyleClass().add("dialog-cancel");
             if (cancel != null) {
                 btnCancel.setOnAction(e -> cancel.run());

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

@@ -1,164 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui.construct;
-
-import com.jfoenix.controls.JFXColorPicker;
-import com.jfoenix.controls.JFXRadioButton;
-import javafx.beans.NamedArg;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.control.Toggle;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-import org.jackhuang.hmcl.ui.FXUtils;
-
-import java.util.Collection;
-import java.util.Optional;
-import java.util.function.Consumer;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public class MultiColorItem extends ComponentList {
-    private final StringProperty customTitle = new SimpleStringProperty(this, "customTitle", i18n("selector.custom"));
-    private final StringProperty chooserTitle = new SimpleStringProperty(this, "chooserTitle", i18n("selector.choose_file"));
-
-    private final ToggleGroup group = new ToggleGroup();
-    private final JFXColorPicker colorPicker = new JFXColorPicker();
-    private final JFXRadioButton radioCustom = new JFXRadioButton();
-    private final BorderPane custom = new BorderPane();
-    private final VBox pane = new VBox();
-    private final boolean hasCustom;
-
-    private Consumer<Toggle> toggleSelectedListener;
-    private Consumer<Color> colorConsumer;
-
-    public MultiColorItem(@NamedArg(value = "hasCustom", defaultValue = "true") boolean hasCustom) {
-        this.hasCustom = hasCustom;
-
-        radioCustom.textProperty().bind(customTitleProperty());
-        radioCustom.setToggleGroup(group);
-        colorPicker.disableProperty().bind(radioCustom.selectedProperty().not());
-
-        colorPicker.setOnAction(e -> Optional.ofNullable(colorConsumer).ifPresent(c -> c.accept(colorPicker.getValue())));
-
-        custom.setLeft(radioCustom);
-        custom.setStyle("-fx-padding: 3;");
-        HBox right = new HBox();
-        right.setSpacing(3);
-        right.getChildren().addAll(colorPicker);
-        custom.setRight(right);
-        FXUtils.setLimitHeight(custom, 40);
-
-        pane.setStyle("-fx-padding: 0 0 10 0;");
-        pane.setSpacing(8);
-
-        if (hasCustom)
-            pane.getChildren().add(custom);
-        getContent().add(pane);
-
-        group.selectedToggleProperty().addListener((a, b, newValue) -> {
-            if (toggleSelectedListener != null)
-                toggleSelectedListener.accept(newValue);
-        });
-    }
-
-    public Node createChildren(String title) {
-        return createChildren(title, null);
-    }
-
-    public Node createChildren(String title, Object userData) {
-        return createChildren(title, "", userData);
-    }
-
-    public Node createChildren(String title, String subtitle, Object userData) {
-        BorderPane pane = new BorderPane();
-        pane.setStyle("-fx-padding: 3;");
-
-        JFXRadioButton left = new JFXRadioButton(title);
-        left.setToggleGroup(group);
-        left.setUserData(userData);
-        pane.setLeft(left);
-
-        Label right = new Label(subtitle);
-        right.getStyleClass().add("subtitle-label");
-        right.setStyle("-fx-font-size: 10;");
-        pane.setRight(right);
-
-        return pane;
-    }
-
-    public void loadChildren(Collection<Node> list) {
-        pane.getChildren().setAll(list);
-
-        if (hasCustom)
-            pane.getChildren().add(custom);
-    }
-
-    public ToggleGroup getGroup() {
-        return group;
-    }
-
-    public String getCustomTitle() {
-        return customTitle.get();
-    }
-
-    public StringProperty customTitleProperty() {
-        return customTitle;
-    }
-
-    public void setCustomTitle(String customTitle) {
-        this.customTitle.set(customTitle);
-    }
-
-    public String getChooserTitle() {
-        return chooserTitle.get();
-    }
-
-    public StringProperty chooserTitleProperty() {
-        return chooserTitle;
-    }
-
-    public void setChooserTitle(String chooserTitle) {
-        this.chooserTitle.set(chooserTitle);
-    }
-
-    public void setCustomUserData(Object userData) {
-        radioCustom.setUserData(userData);
-    }
-
-    public boolean isCustomToggle(Toggle toggle) {
-        return radioCustom == toggle;
-    }
-
-    public void setToggleSelectedListener(Consumer<Toggle> consumer) {
-        toggleSelectedListener = consumer;
-    }
-
-    public void setOnColorPickerChanged(Consumer<Color> consumer) {
-        colorConsumer = consumer;
-    }
-
-    public void setColor(Color color) {
-        colorPicker.setValue(color);
-    }
-}

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

@@ -181,6 +181,7 @@ public final class MultiFileItem<T> extends VBox {
                 center.setWrapText(true);
                 center.getStyleClass().add("subtitle-label");
                 center.setStyle("-fx-font-size: 10;");
+                center.setPadding(new Insets(0, 0, 0, 15));
                 pane.setCenter(center);
             }
 

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

@@ -0,0 +1,24 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+/// Marker interface for no padding in [ComponentList].
+///
+/// @author Glavo
+interface NoPaddingComponent {
+}

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

@@ -1,118 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2021  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui.construct;
-
-import com.jfoenix.controls.JFXToggleButton;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
-import javafx.scene.control.Label;
-import javafx.scene.input.MouseButton;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.util.StringUtils;
-
-public class OptionToggleButton extends StackPane {
-    private final StringProperty title = new SimpleStringProperty();
-    private final StringProperty subtitle = new SimpleStringProperty();
-    private final BooleanProperty selected = new SimpleBooleanProperty();
-
-    public OptionToggleButton() {
-        getProperties().put("ComponentList.noPadding", true);
-
-        BorderPane pane = new BorderPane();
-        pane.setPadding(new Insets(8, 8, 8, 16));
-        RipplerContainer container = new RipplerContainer(pane);
-        getChildren().setAll(container);
-
-        VBox left = new VBox();
-        left.setMouseTransparent(true);
-        Label titleLabel = new Label();
-        titleLabel.textProperty().bind(title);
-        Label subtitleLabel = new Label();
-        subtitleLabel.setWrapText(true);
-        subtitleLabel.setMouseTransparent(true);
-        subtitleLabel.getStyleClass().add("subtitle");
-        subtitleLabel.textProperty().bind(subtitle);
-        pane.setCenter(left);
-        left.setAlignment(Pos.CENTER_LEFT);
-
-        JFXToggleButton toggleButton = new JFXToggleButton();
-        pane.setRight(toggleButton);
-        toggleButton.selectedProperty().bindBidirectional(selected);
-        toggleButton.setSize(8);
-        FXUtils.setLimitHeight(toggleButton, 30);
-
-        container.addEventHandler(MouseEvent.MOUSE_CLICKED, e -> {
-            if (e.getButton() == MouseButton.PRIMARY) {
-                toggleButton.setSelected(!toggleButton.isSelected());
-                e.consume();
-            }
-        });
-
-        FXUtils.onChangeAndOperate(subtitleProperty(), subtitle -> {
-            if (StringUtils.isNotBlank(subtitle)) {
-                left.getChildren().setAll(titleLabel, subtitleLabel);
-            } else {
-                left.getChildren().setAll(titleLabel);
-            }
-        });
-    }
-
-    public String getTitle() {
-        return title.get();
-    }
-
-    public StringProperty titleProperty() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title.set(title);
-    }
-
-    public String getSubtitle() {
-        return subtitle.get();
-    }
-
-    public StringProperty subtitleProperty() {
-        return subtitle;
-    }
-
-    public void setSubtitle(String subtitle) {
-        this.subtitle.set(subtitle);
-    }
-
-    public boolean isSelected() {
-        return selected.get();
-    }
-
-    public BooleanProperty selectedProperty() {
-        return selected;
-    }
-
-    public void setSelected(boolean selected) {
-        this.selected.set(selected);
-    }
-}

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

@@ -0,0 +1,236 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.css.CssMetaData;
+import javafx.css.Styleable;
+import javafx.css.StyleableObjectProperty;
+import javafx.css.StyleableProperty;
+import javafx.css.converter.InsetsConverter;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.control.Control;
+import javafx.scene.control.Label;
+import javafx.scene.control.Skin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+// TODO: We plan to replace ComponentList with this class, but we need to address some issues first
+
+/// @author Glavo
+public final class OptionsList extends Control {
+    public OptionsList() {
+        this.getStyleClass().add("options-list");
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new OptionsListSkin(this);
+    }
+
+    private final ObservableList<Element> elements = FXCollections.observableArrayList();
+
+    public ObservableList<Element> getElements() {
+        return elements;
+    }
+
+    public void addTitle(String title) {
+        elements.add(new Title(title));
+    }
+
+    public void addNode(Node node) {
+        elements.add(new NodeElement(node));
+    }
+
+    public void addListElement(@NotNull Node node) {
+        elements.add(new ListElement(node));
+    }
+
+    public void addListElements(@NotNull Node... nodes) {
+        for (Node node : nodes) {
+            elements.add(new ListElement(node));
+        }
+    }
+
+    private final StyleableObjectProperty<Insets> contentPadding = new StyleableObjectProperty<>() {
+        @Override
+        public Object getBean() {
+            return OptionsList.this;
+        }
+
+        @Override
+        public String getName() {
+            return "contentPadding";
+        }
+
+        @Override
+        public javafx.css.CssMetaData<OptionsList, Insets> getCssMetaData() {
+            return StyleableProperties.CONTENT_PADDING;
+        }
+    };
+
+    public StyleableObjectProperty<Insets> contentPaddingProperty() {
+        return contentPadding;
+    }
+
+    public Insets getContentPadding() {
+        return contentPaddingProperty().get();
+    }
+
+    public void setContentPadding(Insets padding) {
+        contentPaddingProperty().set(padding);
+    }
+
+    private static final class StyleableProperties {
+        private static final CssMetaData<OptionsList, Insets> CONTENT_PADDING = new CssMetaData<>("-jfx-content-padding", InsetsConverter.getInstance()) {
+            @Override
+            public boolean isSettable(OptionsList styleable) {
+                return styleable.contentPadding == null || !styleable.contentPadding.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Insets> getStyleableProperty(OptionsList styleable) {
+                return styleable.contentPaddingProperty();
+            }
+        };
+
+        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+
+        static {
+            List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Control.getClassCssMetaData());
+            Collections.addAll(styleables, CONTENT_PADDING);
+            STYLEABLES = List.copyOf(styleables);
+        }
+    }
+
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.STYLEABLES;
+    }
+
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        return getClassCssMetaData();
+    }
+
+    public static abstract class Element {
+        protected Node node;
+
+        Node getNode() {
+            if (node == null)
+                node = createNode();
+            return node;
+        }
+
+        protected abstract Node createNode();
+    }
+
+    public static final class Title extends Element {
+        private final @NotNull String title;
+
+        public Title(@NotNull String title) {
+            this.title = title;
+        }
+
+        @Override
+        protected Node createNode() {
+            Label label = new Label(title);
+            label.setPadding(new Insets(8, 0, 8, 0));
+            return label;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            return this == obj || obj instanceof Title that && Objects.equals(this.title, that.title);
+        }
+
+        @Override
+        public int hashCode() {
+            return title.hashCode();
+        }
+
+        @Override
+        public String toString() {
+            return "Title[%s]".formatted(title);
+        }
+
+    }
+
+    public static final class NodeElement extends Element {
+        public NodeElement(@NotNull Node node) {
+            this.node = node;
+        }
+
+        @Override
+        protected Node createNode() {
+            return node;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            return this == obj || obj instanceof NodeElement that && this.node.equals(that.node);
+        }
+
+        @Override
+        public int hashCode() {
+            return node.hashCode();
+        }
+
+        @Override
+        public String toString() {
+            return "NodeElement[node=%s]".formatted(node);
+        }
+    }
+
+    public static final class ListElement extends Element {
+        private final Node original;
+
+        public ListElement(@NotNull Node node) {
+            this.original = node;
+        }
+
+        @Override
+        protected Node createNode() {
+            if (original instanceof ComponentSublist sublist) {
+                return new ComponentSublistWrapper(sublist);
+            } else {
+                return original;
+            }
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            return this == obj || obj instanceof ListElement that && this.original.equals(that.original);
+        }
+
+        @Override
+        public int hashCode() {
+            return original.hashCode();
+        }
+
+        @Override
+        public String toString() {
+            return "ListElement[node=%s]".formatted(original);
+        }
+    }
+}

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

@@ -0,0 +1,152 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import com.jfoenix.controls.JFXListView;
+import javafx.beans.InvalidationListener;
+import javafx.beans.WeakInvalidationListener;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import javafx.collections.ObservableList;
+import javafx.css.PseudoClass;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.StackPane;
+import org.jackhuang.hmcl.ui.FXUtils;
+
+/// @author Glavo
+public final class OptionsListSkin extends SkinBase<OptionsList> {
+
+    private final JFXListView<OptionsList.Element> listView;
+    private final ObjectBinding<ContentPaddings> contentPaddings;
+
+    OptionsListSkin(OptionsList control) {
+        super(control);
+
+        this.listView = new JFXListView<>();
+        listView.setItems(control.getElements());
+        listView.setCellFactory(listView1 -> new Cell());
+
+        this.contentPaddings = Bindings.createObjectBinding(() -> {
+            Insets padding = control.getContentPadding();
+            return padding == null ? ContentPaddings.EMPTY : new ContentPaddings(
+                    new Insets(padding.getTop(), padding.getRight(), 0, padding.getLeft()),
+                    new Insets(0, padding.getRight(), padding.getBottom(), padding.getLeft()),
+                    new Insets(0, padding.getRight(), 0, padding.getLeft())
+            );
+        }, control.contentPaddingProperty());
+
+        this.getChildren().setAll(listView);
+    }
+
+    private record ContentPaddings(Insets first, Insets last, Insets middle) {
+        static final ContentPaddings EMPTY = new ContentPaddings(Insets.EMPTY, Insets.EMPTY, Insets.EMPTY);
+    }
+
+    private final class Cell extends ListCell<OptionsList.Element> {
+        private static final PseudoClass PSEUDO_CLASS_FIRST = PseudoClass.getPseudoClass("first");
+        private static final PseudoClass PSEUDO_CLASS_LAST = PseudoClass.getPseudoClass("last");
+
+        @SuppressWarnings("FieldCanBeLocal")
+        private final InvalidationListener updateStyleListener = o -> updateStyle();
+
+        private StackPane wrapper;
+
+        public Cell() {
+            FXUtils.limitCellWidth(listView, this);
+
+            WeakInvalidationListener weakListener = new WeakInvalidationListener(updateStyleListener);
+            listView.itemsProperty().addListener((o, oldValue, newValue) -> {
+                if (oldValue != null)
+                    oldValue.removeListener(weakListener);
+                if (newValue != null)
+                    newValue.addListener(weakListener);
+
+                weakListener.invalidated(o);
+            });
+            itemProperty().addListener(weakListener);
+            contentPaddings.addListener(weakListener);
+        }
+
+        @Override
+        protected void updateItem(OptionsList.Element item, boolean empty) {
+            super.updateItem(item, empty);
+
+            if (empty || item == null) {
+                setGraphic(null);
+            } else if (item instanceof OptionsList.ListElement element) {
+                if (wrapper == null)
+                    wrapper = createWrapper();
+                else
+                    wrapper.getStyleClass().remove("no-padding");
+
+                Node node = element.getNode();
+                if (node instanceof NoPaddingComponent || node.getProperties().containsKey("ComponentList.noPadding"))
+                    wrapper.getStyleClass().add("no-padding");
+
+                wrapper.getChildren().setAll(node);
+
+                setGraphic(wrapper);
+            } else {
+                setGraphic(item.getNode());
+            }
+
+            updateStyle();
+        }
+
+        private StackPane createWrapper() {
+            var wrapper = new StackPane();
+            wrapper.setAlignment(Pos.CENTER_LEFT);
+            wrapper.getStyleClass().add("options-list-item");
+            updateStyle();
+            return wrapper;
+        }
+
+        private void updateStyle() {
+            OptionsList.Element item = getItem();
+            int index = getIndex();
+            ObservableList<OptionsList.Element> items = getListView().getItems();
+
+            if (item == null || index < 0 || index >= items.size()) {
+                this.setPadding(Insets.EMPTY);
+                return;
+            }
+
+            boolean isFirst = index == 0;
+            boolean isLast = index == items.size() - 1;
+
+            ContentPaddings paddings = contentPaddings.get();
+            if (isFirst) {
+                this.setPadding(paddings.first);
+            } else if (isLast) {
+                this.setPadding(paddings.last);
+            } else {
+                this.setPadding(paddings.middle);
+            }
+
+            if (item instanceof OptionsList.ListElement && wrapper != null) {
+                wrapper.pseudoClassStateChanged(PSEUDO_CLASS_FIRST, isFirst || !(items.get(index - 1) instanceof OptionsList.ListElement));
+                wrapper.pseudoClassStateChanged(PSEUDO_CLASS_LAST, isLast || !(items.get(index + 1) instanceof OptionsList.ListElement));
+            }
+        }
+    }
+
+}

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

@@ -78,6 +78,8 @@ public class PopupMenu extends Control {
             ScrollPane scrollPane = new ScrollPane();
             scrollPane.setFitToHeight(true);
             scrollPane.setFitToWidth(true);
+            scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+            scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
             scrollPane.vbarPolicyProperty().bind(new When(alwaysShowingVBar)
                     .then(ScrollPane.ScrollBarPolicy.ALWAYS)
                     .otherwise(ScrollPane.ScrollBarPolicy.AS_NEEDED));

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

@@ -117,11 +117,17 @@ public class PromptDialogPane extends DialogPane {
     protected void onAccept() {
         setLoading();
 
-        builder.callback.call(builder.questions, () -> {
-            future.complete(builder.questions);
-            runInFX(this::onSuccess);
-        }, msg -> {
-            runInFX(() -> onFailure(msg));
+        builder.callback.call(builder.questions, new FutureCallback.ResultHandler() {
+            @Override
+            public void resolve() {
+                future.complete(builder.questions);
+                runInFX(() -> onSuccess());
+            }
+
+            @Override
+            public void reject(String reason) {
+                runInFX(() -> onFailure(reason));
+            }
         });
     }
 

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

@@ -19,17 +19,12 @@ package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.controls.JFXRippler;
 import javafx.animation.Transition;
-import javafx.beans.DefaultProperty;
-import javafx.beans.InvalidationListener;
-import javafx.beans.NamedArg;
-import javafx.beans.binding.Bindings;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import javafx.css.*;
+import javafx.css.converter.PaintConverter;
+import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.scene.Node;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Background;
 import javafx.scene.layout.BackgroundFill;
 import javafx.scene.layout.CornerRadii;
@@ -37,39 +32,41 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.Rectangle;
-import javafx.util.Duration;
 import org.jackhuang.hmcl.theme.Themes;
 import org.jackhuang.hmcl.ui.animation.AnimationUtils;
 import org.jackhuang.hmcl.ui.animation.Motion;
-import org.jackhuang.hmcl.util.Lang;
 
+import java.util.ArrayList;
 import java.util.List;
 
-@DefaultProperty("container")
 public class RipplerContainer extends StackPane {
     private static final String DEFAULT_STYLE_CLASS = "rippler-container";
-    private static final Duration DURATION = Duration.millis(200);
+    private static final CornerRadii DEFAULT_RADII = new CornerRadii(3);
+    private static final Color DEFAULT_RIPPLER_FILL = Color.rgb(0, 200, 255);
 
-    private final ObjectProperty<Node> container = new SimpleObjectProperty<>(this, "container", null);
-    private final StyleableObjectProperty<Paint> ripplerFill = new SimpleStyleableObjectProperty<>(StyleableProperties.RIPPLER_FILL, this, "ripplerFill", null);
-    private final BooleanProperty selected = new SimpleBooleanProperty(this, "selected", false);
+    private final Node container;
 
     private final StackPane buttonContainer = new StackPane();
     private final JFXRippler buttonRippler = new JFXRippler(new StackPane()) {
+        private static final Background DEFAULT_MASK_BACKGROUND = new Background(new BackgroundFill(Color.WHITE, DEFAULT_RADII, Insets.EMPTY));
+
         @Override
         protected Node getMask() {
             StackPane mask = new StackPane();
             mask.shapeProperty().bind(buttonContainer.shapeProperty());
-            mask.backgroundProperty().bind(Bindings.createObjectBinding(() -> new Background(new BackgroundFill(Color.WHITE, buttonContainer.getBackground() != null && buttonContainer.getBackground().getFills().size() > 0 ? buttonContainer.getBackground().getFills().get(0).getRadii() : defaultRadii, buttonContainer.getBackground() != null && buttonContainer.getBackground().getFills().size() > 0 ? buttonContainer.getBackground().getFills().get(0).getInsets() : Insets.EMPTY)), buttonContainer.backgroundProperty()));
-            mask.resize(buttonContainer.getWidth() - buttonContainer.snappedRightInset() - buttonContainer.snappedLeftInset(), buttonContainer.getHeight() - buttonContainer.snappedBottomInset() - buttonContainer.snappedTopInset());
+            mask.setBackground(DEFAULT_MASK_BACKGROUND);
+            mask.resize(
+                    buttonContainer.getWidth() - buttonContainer.snappedRightInset() - buttonContainer.snappedLeftInset(),
+                    buttonContainer.getHeight() - buttonContainer.snappedBottomInset() - buttonContainer.snappedTopInset()
+            );
             return mask;
         }
     };
 
-    private final CornerRadii defaultRadii = new CornerRadii(3);
+    private Transition coverAnimation;
 
-    public RipplerContainer(@NamedArg("container") Node container) {
-        setContainer(container);
+    public RipplerContainer(Node container) {
+        this.container = container;
 
         getStyleClass().add(DEFAULT_STYLE_CLASS);
         buttonRippler.setPosition(JFXRippler.RipplerPos.BACK);
@@ -86,104 +83,126 @@ public class RipplerContainer extends StackPane {
         setPickOnBounds(false);
 
         buttonContainer.setPickOnBounds(false);
-        buttonRippler.ripplerFillProperty().bind(ripplerFillProperty());
 
-        containerProperty().addListener(o -> updateChildren());
         updateChildren();
 
-        InvalidationListener listener = o -> {
-            if (isSelected()) setBackground(new Background(new BackgroundFill(getRipplerFill(), defaultRadii, null)));
-            else setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, defaultRadii, null)));
-        };
-
-        selectedProperty().addListener(listener);
-        selectedProperty().addListener((a, b, newValue) ->
-                pseudoClassStateChanged(PseudoClass.getPseudoClass("selected"), newValue));
-        ripplerFillProperty().addListener(listener);
-
-        setShape(Lang.apply(new Rectangle(), rectangle -> {
-            rectangle.widthProperty().bind(widthProperty());
-            rectangle.heightProperty().bind(heightProperty());
-        }));
+        var shape = new Rectangle();
+        shape.widthProperty().bind(widthProperty());
+        shape.heightProperty().bind(heightProperty());
+        setShape(shape);
 
+        EventHandler<MouseEvent> mouseEventHandler;
         if (AnimationUtils.isAnimationEnabled()) {
-            setOnMouseEntered(e -> new Transition() {
-                {
-                    setCycleDuration(DURATION);
-                    setInterpolator(Motion.EASE_IN);
+            mouseEventHandler = event -> {
+                if (coverAnimation != null) {
+                    coverAnimation.stop();
+                    coverAnimation = null;
                 }
 
-                @Override
-                protected void interpolate(double frac) {
-                    interpolateBackground(frac);
-                }
-            }.play());
+                if (event.getEventType() == MouseEvent.MOUSE_ENTERED) {
+                    coverAnimation = new Transition() {
+                        {
+                            setCycleDuration(Motion.SHORT4);
+                            setInterpolator(Motion.EASE_IN);
+                        }
 
-            setOnMouseExited(e -> new Transition() {
-                {
-                    setCycleDuration(DURATION);
-                    setInterpolator(Motion.EASE_OUT);
+                        @Override
+                        protected void interpolate(double frac) {
+                            interpolateBackground(frac);
+                        }
+                    };
+                } else {
+                    coverAnimation = new Transition() {
+                        {
+                            setCycleDuration(Motion.SHORT4);
+                            setInterpolator(Motion.EASE_OUT);
+                        }
+
+                        @Override
+                        protected void interpolate(double frac) {
+                            interpolateBackground(1 - frac);
+                        }
+                    };
                 }
 
-                @Override
-                protected void interpolate(double frac) {
-                    interpolateBackground(1 - frac);
-                }
-            }.play());
+                coverAnimation.play();
+            };
         } else {
-            setOnMouseEntered(e -> interpolateBackground(1));
-            setOnMouseExited(e -> interpolateBackground(0));
+            mouseEventHandler = event ->
+                    interpolateBackground(event.getEventType() == MouseEvent.MOUSE_ENTERED ? 1 : 0);
         }
+
+        addEventHandler(MouseEvent.MOUSE_ENTERED, mouseEventHandler);
+        addEventHandler(MouseEvent.MOUSE_EXITED, mouseEventHandler);
     }
 
     private void interpolateBackground(double frac) {
-        Color onSurface = Themes.getColorScheme().getOnSurface();
-        setBackground(new Background(new BackgroundFill(
-                Color.color(onSurface.getRed(), onSurface.getGreen(), onSurface.getBlue(), frac * 0.04),
-                CornerRadii.EMPTY, Insets.EMPTY)));
+        if (frac < 0.01) {
+            setBackground(null);
+        } else {
+            Color onSurface = Themes.getColorScheme().getOnSurface();
+            setBackground(new Background(new BackgroundFill(
+                    Color.color(onSurface.getRed(), onSurface.getGreen(), onSurface.getBlue(), frac * 0.04),
+                    CornerRadii.EMPTY, Insets.EMPTY)));
+        }
     }
 
     protected void updateChildren() {
-        getChildren().addAll(buttonContainer, getContainer());
+        Node container = getContainer();
+        if (buttonRippler.getPosition() == JFXRippler.RipplerPos.BACK) {
+            getChildren().setAll(buttonContainer, container);
+            container.setPickOnBounds(false);
+        } else {
+            getChildren().setAll(container, buttonContainer);
+            buttonContainer.setPickOnBounds(false);
+        }
+    }
 
-        for (int i = 1; i < getChildren().size(); ++i)
-            getChildren().get(i).setPickOnBounds(false);
+    public void setPosition(JFXRippler.RipplerPos pos) {
+        buttonRippler.setPosition(pos);
+        updateChildren();
+    }
+
+    public JFXRippler getRippler() {
+        return buttonRippler;
     }
 
     public Node getContainer() {
-        return container.get();
-    }
-
-    public ObjectProperty<Node> containerProperty() {
         return container;
     }
 
-    public void setContainer(Node container) {
-        this.container.set(container);
-    }
+    private final StyleableObjectProperty<Paint> ripplerFill = new StyleableObjectProperty<>(DEFAULT_RIPPLER_FILL) {
+        @Override
+        public Object getBean() {
+            return RipplerContainer.this;
+        }
 
-    public Paint getRipplerFill() {
-        return ripplerFill.get();
-    }
+        @Override
+        public String getName() {
+            return "ripplerFill";
+        }
+
+        @Override
+        public CssMetaData<? extends Styleable, Paint> getCssMetaData() {
+            return StyleableProperties.RIPPLER_FILL;
+        }
+
+        @Override
+        protected void invalidated() {
+            buttonRippler.setRipplerFill(get());
+        }
+    };
 
     public StyleableObjectProperty<Paint> ripplerFillProperty() {
         return ripplerFill;
     }
 
+    public Paint getRipplerFill() {
+        return ripplerFillProperty().get();
+    }
+
     public void setRipplerFill(Paint ripplerFill) {
-        this.ripplerFill.set(ripplerFill);
-    }
-
-    public boolean isSelected() {
-        return selected.get();
-    }
-
-    public BooleanProperty selectedProperty() {
-        return selected;
-    }
-
-    public void setSelected(boolean selected) {
-        this.selected.set(selected);
+        ripplerFillProperty().set(ripplerFill);
     }
 
     @Override
@@ -192,12 +211,28 @@ public class RipplerContainer extends StackPane {
     }
 
     public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
-        return StyleableProperties.FACTORY.getCssMetaData();
+        return StyleableProperties.STYLEABLES;
     }
 
     private final static class StyleableProperties {
-        private static final StyleablePropertyFactory<RipplerContainer> FACTORY = new StyleablePropertyFactory<>(StackPane.getClassCssMetaData());
+        private static final CssMetaData<RipplerContainer, Paint> RIPPLER_FILL = new CssMetaData<>("-jfx-rippler-fill", PaintConverter.getInstance(), DEFAULT_RIPPLER_FILL) {
+            @Override
+            public boolean isSettable(RipplerContainer styleable) {
+                return styleable.ripplerFill == null || !styleable.ripplerFill.isBound();
+            }
 
-        private static final CssMetaData<RipplerContainer, Paint> RIPPLER_FILL = FACTORY.createPaintCssMetaData("-jfx-rippler-fill", s -> s.ripplerFill, Color.rgb(0, 200, 255));
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(RipplerContainer styleable) {
+                return styleable.ripplerFillProperty();
+            }
+        };
+
+        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+
+        static {
+            var styleables = new ArrayList<>(StackPane.getClassCssMetaData());
+            styleables.add(RIPPLER_FILL);
+            STYLEABLES = List.copyOf(styleables);
+        }
     }
 }

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

@@ -41,6 +41,7 @@ import org.jackhuang.hmcl.download.forge.ForgeOldInstallTask;
 import org.jackhuang.hmcl.download.game.GameAssetDownloadTask;
 import org.jackhuang.hmcl.download.game.GameInstallTask;
 import org.jackhuang.hmcl.download.java.mojang.MojangJavaDownloadTask;
+import org.jackhuang.hmcl.download.legacyfabric.LegacyFabricInstallTask;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderInstallTask;
 import org.jackhuang.hmcl.download.neoforge.NeoForgeInstallTask;
 import org.jackhuang.hmcl.download.neoforge.NeoForgeOldInstallTask;
@@ -92,8 +93,6 @@ public final class TaskListPane extends StackPane {
     private final ObjectProperty<Insets> progressNodePadding = new SimpleObjectProperty<>(Insets.EMPTY);
     private final DoubleProperty cellWidth = new SimpleDoubleProperty();
 
-    private Cell lastCell;
-
     public TaskListPane() {
         listView.setPadding(new Insets(12, 0, 0, 0));
         listView.setCellFactory(l -> new Cell());
@@ -166,6 +165,8 @@ public final class TaskListPane extends StackPane {
                     task.setName(i18n("install.installer.install", i18n("install.installer.game")));
                 } else if (task instanceof CleanroomInstallTask) {
                     task.setName(i18n("install.installer.install", i18n("install.installer.cleanroom")));
+                } else if (task instanceof LegacyFabricInstallTask) {
+                    task.setName(i18n("install.installer.install", i18n("install.installer.legacyfabric")));
                 } else if (task instanceof ForgeNewInstallTask || task instanceof ForgeOldInstallTask) {
                     task.setName(i18n("install.installer.install", i18n("install.installer.forge")));
                 } else if (task instanceof NeoForgeInstallTask || task instanceof NeoForgeOldInstallTask) {
@@ -316,11 +317,6 @@ public final class TaskListPane extends StackPane {
         protected void updateItem(Node item, boolean empty) {
             super.updateItem(item, empty);
 
-            // https://mail.openjdk.org/pipermail/openjfx-dev/2022-July/034764.html
-            if (this == lastCell && !isVisible())
-                return;
-            lastCell = this;
-
             pane.paddingProperty().unbind();
             title.textProperty().unbind();
             message.textProperty().unbind();
@@ -330,8 +326,7 @@ public final class TaskListPane extends StackPane {
             if (prevStageNodeRef != null && (prevStageNode = prevStageNodeRef.get()) != null)
                 prevStageNode.status.removeListener(statusChangeListener);
 
-            if (item instanceof ProgressListNode) {
-                var progressListNode = (ProgressListNode) item;
+            if (item instanceof ProgressListNode progressListNode) {
                 title.setText(progressListNode.title);
                 message.textProperty().bind(progressListNode.message);
                 bar.progressProperty().bind(progressListNode.progress);
@@ -340,8 +335,7 @@ public final class TaskListPane extends StackPane {
                 pane.setLeft(null);
                 pane.setRight(message);
                 pane.setBottom(bar);
-            } else if (item instanceof StageNode) {
-                var stageNode = (StageNode) item;
+            } else if (item instanceof StageNode stageNode) {
                 title.textProperty().bind(stageNode.title);
                 message.setText("");
                 bar.setProgress(ProgressIndicator.INDETERMINATE_PROGRESS);
@@ -434,23 +428,25 @@ public final class TaskListPane extends StackPane {
 
             // CHECKSTYLE:OFF
             // @formatter:off
-            switch (stageKey) {
-                case "hmcl.modpack":            message = i18n("install.modpack"); break;
-                case "hmcl.modpack.download":   message = i18n("launch.state.modpack"); break;
-                case "hmcl.install.assets":     message = i18n("assets.download"); break;
-                case "hmcl.install.libraries":  message = i18n("libraries.download"); break;
-                case "hmcl.install.game":       message = i18n("install.installer.install", i18n("install.installer.game") + " " + stageValue); break;
-                case "hmcl.install.forge":      message = i18n("install.installer.install", i18n("install.installer.forge") + " " + stageValue); break;
-                case "hmcl.install.cleanroom":  message = i18n("install.installer.install", i18n("install.installer.cleanroom") + " " + stageValue); break;
-                case "hmcl.install.neoforge":   message = i18n("install.installer.install", i18n("install.installer.neoforge") + " " + stageValue); break;
-                case "hmcl.install.liteloader": message = i18n("install.installer.install", i18n("install.installer.liteloader") + " " + stageValue); break;
-                case "hmcl.install.optifine":   message = i18n("install.installer.install", i18n("install.installer.optifine") + " " + stageValue); break;
-                case "hmcl.install.fabric":     message = i18n("install.installer.install", i18n("install.installer.fabric") + " " + stageValue); break;
-                case "hmcl.install.fabric-api": message = i18n("install.installer.install", i18n("install.installer.fabric-api") + " " + stageValue); break;
-                case "hmcl.install.quilt":      message = i18n("install.installer.install", i18n("install.installer.quilt") + " " + stageValue); break;
-                case "hmcl.install.quilt-api":  message = i18n("install.installer.install", i18n("install.installer.quilt-api") + " " + stageValue); break;
-                default:                        message = i18n(stageKey); break;
-            }
+            message = switch (stageKey) {
+                case "hmcl.modpack" ->                  i18n("install.modpack");
+                case "hmcl.modpack.download" ->         i18n("launch.state.modpack");
+                case "hmcl.install.assets" ->           i18n("assets.download");
+                case "hmcl.install.libraries" ->        i18n("libraries.download");
+                case "hmcl.install.game" ->             i18n("install.installer.install", i18n("install.installer.game") + " " + stageValue);
+                case "hmcl.install.forge" ->            i18n("install.installer.install", i18n("install.installer.forge") + " " + stageValue);
+                case "hmcl.install.cleanroom" ->        i18n("install.installer.install", i18n("install.installer.cleanroom") + " " + stageValue);
+                case "hmcl.install.neoforge" ->         i18n("install.installer.install", i18n("install.installer.neoforge") + " " + stageValue);
+                case "hmcl.install.liteloader" ->       i18n("install.installer.install", i18n("install.installer.liteloader") + " " + stageValue);
+                case "hmcl.install.optifine" ->         i18n("install.installer.install", i18n("install.installer.optifine") + " " + stageValue);
+                case "hmcl.install.fabric" ->           i18n("install.installer.install", i18n("install.installer.fabric") + " " + stageValue);
+                case "hmcl.install.fabric-api" ->       i18n("install.installer.install", i18n("install.installer.fabric-api") + " " + stageValue);
+                case "hmcl.install.legacyfabric" ->     i18n("install.installer.install", i18n("install.installer.legacyfabric") + " " + stageValue);
+                case "hmcl.install.legacyfabric-api" -> i18n("install.installer.install", i18n("install.installer.legacyfabric-api") + " " + stageValue);
+                case "hmcl.install.quilt" ->            i18n("install.installer.install", i18n("install.installer.quilt") + " " + stageValue);
+                case "hmcl.install.quilt-api" ->        i18n("install.installer.install", i18n("install.installer.quilt-api") + " " + stageValue);
+                default -> i18n(stageKey);
+            };
             // @formatter:on
             // CHECKSTYLE:ON
 
@@ -495,12 +491,10 @@ public final class TaskListPane extends StackPane {
 
         private ProgressListNode(Task<?> task) {
             this.title = task.getName();
-            message.bind(task.messageProperty());
             progress.bind(task.progressProperty());
         }
 
         public void unbind() {
-            message.unbind();
             progress.unbind();
         }
 

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

@@ -44,6 +44,9 @@ public class TwoLineListItem extends VBox {
     private final ObservableList<Label> tags = FXCollections.observableArrayList();
     private final StringProperty subtitle = new SimpleStringProperty(this, "subtitle");
 
+    private final Label lblSubtitle;
+    private final Label lblTitle;
+
     private final AggregatedObservableList<Node> firstLineChildren;
 
     public TwoLineListItem(String titleString, String subtitleString) {
@@ -59,7 +62,7 @@ public class TwoLineListItem extends VBox {
         HBox firstLine = new HBox();
         firstLine.getStyleClass().add("first-line");
 
-        Label lblTitle = new Label();
+        lblTitle = new Label();
         lblTitle.getStyleClass().add("title");
         lblTitle.textProperty().bind(title);
 
@@ -68,7 +71,7 @@ public class TwoLineListItem extends VBox {
         firstLineChildren.appendList(tags);
         Bindings.bindContent(firstLine.getChildren(), firstLineChildren.getAggregatedList());
 
-        Label lblSubtitle = new Label();
+        lblSubtitle = new Label();
         lblSubtitle.getStyleClass().add("subtitle");
         lblSubtitle.textProperty().bind(subtitle);
 
@@ -109,6 +112,14 @@ public class TwoLineListItem extends VBox {
         this.subtitle.set(subtitle);
     }
 
+    public Label getSubtitleLabel() {
+        return lblSubtitle;
+    }
+
+    public Label getTitleLabel() {
+        return lblTitle;
+    }
+
     public void addTag(String tag) {
         Label tagLabel = createTagLabel(tag);
         tagLabel.getStyleClass().add("tag");

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

@@ -17,18 +17,13 @@
  */
 package org.jackhuang.hmcl.ui.decorator;
 
-import com.jfoenix.controls.JFXDialog;
 import com.jfoenix.controls.JFXSnackbar;
 import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
-import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.WeakInvalidationListener;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.image.Image;
@@ -48,14 +43,15 @@ import org.jackhuang.hmcl.setting.EnumBackgroundImage;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.DialogUtils;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.account.AddAuthlibInjectorServerPane;
-import org.jackhuang.hmcl.ui.animation.*;
+import org.jackhuang.hmcl.ui.animation.AnimationUtils;
+import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
+import org.jackhuang.hmcl.ui.animation.Motion;
 import org.jackhuang.hmcl.ui.animation.TransitionPane.AnimationProducer;
-import org.jackhuang.hmcl.ui.construct.DialogAware;
-import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
-import org.jackhuang.hmcl.ui.construct.Navigator;
 import org.jackhuang.hmcl.ui.construct.JFXDialogPane;
+import org.jackhuang.hmcl.ui.construct.Navigator;
 import org.jackhuang.hmcl.ui.wizard.Refreshable;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
 import org.jackhuang.hmcl.util.Lang;
@@ -66,7 +62,9 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.List;
+import java.util.Locale;
+import java.util.Random;
 import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.toList;
@@ -77,14 +75,9 @@ import static org.jackhuang.hmcl.util.io.FileUtils.getExtension;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
 public class DecoratorController {
-    private static final String PROPERTY_DIALOG_CLOSE_HANDLER = DecoratorController.class.getName() + ".dialog.closeListener";
-
     private final Decorator decorator;
     private final Navigator navigator;
 
-    private JFXDialog dialog;
-    private JFXDialogPane dialogPane;
-
     public DecoratorController(Stage stage, Node mainPage) {
         decorator = new Decorator(stage);
         decorator.setOnCloseButtonAction(() -> {
@@ -134,19 +127,24 @@ public class DecoratorController {
 
         // pass key events to current dialog / current page
         decorator.addEventFilter(KeyEvent.ANY, e -> {
-            if (!(e.getTarget() instanceof Node)) {
-                return; // event source can't be determined
+            if (!(e.getTarget() instanceof Node t)) {
+                return;
             }
 
             Node newTarget;
-            if (dialogPane != null && dialogPane.peek().isPresent()) {
-                newTarget = dialogPane.peek().get(); // current dialog
-            } else {
-                newTarget = navigator.getCurrentPage(); // current page
+
+            JFXDialogPane currentDialogPane = null;
+            if (decorator.getDrawerWrapper() != null) {
+                currentDialogPane = (JFXDialogPane) decorator.getDrawerWrapper().getProperties().get(DialogUtils.PROPERTY_DIALOG_PANE_INSTANCE);
             }
 
+            if (currentDialogPane != null && currentDialogPane.peek().isPresent()) {
+                newTarget = currentDialogPane.peek().get();
+            } else {
+                newTarget = navigator.getCurrentPage();
+            }
             boolean needsRedirect = true;
-            Node t = (Node) e.getTarget();
+
             while (t != null) {
                 if (t == newTarget) {
                     // current event target is in newTarget
@@ -266,7 +264,7 @@ public class DecoratorController {
     private Background createBackgroundWithOpacity(Image image, int opacity) {
         if (opacity <= 0) {
             return new Background(new BackgroundFill(new Color(1, 1, 1, 0), CornerRadii.EMPTY, Insets.EMPTY));
-        } else if (opacity >= 100) {
+        } else if (opacity >= 100 || image.getPixelReader() == null) {
             return new Background(new BackgroundImage(
                     image,
                     BackgroundRepeat.NO_REPEAT,
@@ -445,81 +443,12 @@ public class DecoratorController {
     }
 
     // ==== Dialog ====
-
     public void showDialog(Node node) {
-        FXUtils.checkFxUserThread();
-
-        if (dialog == null) {
-            if (decorator.getDrawerWrapper() == null) {
-                // Sometimes showDialog will be invoked before decorator was initialized.
-                // Keep trying again.
-                Platform.runLater(() -> showDialog(node));
-                return;
-            }
-            dialog = new JFXDialog(AnimationUtils.isAnimationEnabled()
-                    ? JFXDialog.DialogTransition.CENTER
-                    : JFXDialog.DialogTransition.NONE);
-            dialogPane = new JFXDialogPane();
-
-            dialog.setContent(dialogPane);
-            decorator.capableDraggingWindow(dialog);
-            decorator.forbidDraggingWindow(dialogPane);
-            dialog.setDialogContainer(decorator.getDrawerWrapper());
-            dialog.setOverlayClose(false);
-            dialog.show();
-
-            navigator.setDisable(true);
-        }
-        dialogPane.push(node);
-
-        EventHandler<DialogCloseEvent> handler = event -> closeDialog(node);
-        node.getProperties().put(PROPERTY_DIALOG_CLOSE_HANDLER, handler);
-        node.addEventHandler(DialogCloseEvent.CLOSE, handler);
-
-        if (dialog.isVisible()) {
-            dialog.requestFocus();
-            if (node instanceof DialogAware)
-                ((DialogAware) node).onDialogShown();
-        } else {
-            dialog.visibleProperty().addListener(new ChangeListener<Boolean>() {
-                @Override
-                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
-                    if (newValue) {
-                        dialog.requestFocus();
-                        if (node instanceof DialogAware)
-                            ((DialogAware) node).onDialogShown();
-                        observable.removeListener(this);
-                    }
-                }
-            });
-        }
+        DialogUtils.show(decorator, node);
     }
 
-    @SuppressWarnings("unchecked")
     private void closeDialog(Node node) {
-        FXUtils.checkFxUserThread();
-
-        Optional.ofNullable(node.getProperties().get(PROPERTY_DIALOG_CLOSE_HANDLER))
-                .ifPresent(handler -> node.removeEventHandler(DialogCloseEvent.CLOSE, (EventHandler<DialogCloseEvent>) handler));
-
-        if (dialog != null) {
-            JFXDialogPane pane = dialogPane;
-
-            if (pane.size() == 1 && pane.peek().orElse(null) == node) {
-                dialog.setOnDialogClosed(e -> pane.pop(node));
-                dialog.close();
-                dialog = null;
-                dialogPane = null;
-
-                navigator.setDisable(false);
-            } else {
-                pane.pop(node);
-            }
-
-            if (node instanceof DialogAware) {
-                ((DialogAware) node).onDialogClosed();
-            }
-        }
+        DialogUtils.close(node);
     }
 
     // ==== Toast ====

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

@@ -328,6 +328,18 @@ public class DecoratorSkin extends SkinBase<Decorator> {
             }
             if (onTitleBarDoubleClick != null)
                 center.setOnMouseClicked(onTitleBarDoubleClick);
+            center.setOnMouseDragged(mouseEvent -> {
+                if (!getSkinnable().isDragging() && primaryStage.isMaximized()) {
+                    getSkinnable().setDragging(true);
+                    mouseInitX = mouseEvent.getScreenX();
+                    mouseInitY = mouseEvent.getScreenY();
+                    primaryStage.setMaximized(false);
+                    stageInitWidth = primaryStage.getWidth();
+                    stageInitHeight = primaryStage.getHeight();
+                    primaryStage.setY(stageInitY = 0);
+                    primaryStage.setX(stageInitX = mouseInitX - stageInitWidth / 2);
+                }
+            });
             navBar.setCenter(center);
 
             if (canRefresh) {

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

@@ -24,12 +24,12 @@ import javafx.beans.property.SimpleBooleanProperty;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
+import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.FlowPane;
 import javafx.scene.layout.HBox;
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.ui.Controllers;
-import javafx.scene.layout.BorderPane;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.InstallerItem;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
@@ -38,9 +38,11 @@ import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
 import org.jackhuang.hmcl.util.SettingsMap;
 
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public abstract class AbstractInstallersPage extends Control implements WizardPage {
+    public static final String FABRIC_QUILT_API_TIP = "fabricQuiltApi";
     protected final WizardController controller;
 
     protected InstallerItem.InstallerItemGroup group;
@@ -56,8 +58,15 @@ public abstract class AbstractInstallersPage extends Control implements WizardPa
             String libraryId = library.getLibraryId();
             if (libraryId.equals(LibraryAnalyzer.LibraryType.MINECRAFT.getPatchId())) continue;
             library.setOnInstall(() -> {
-                if (LibraryAnalyzer.LibraryType.FABRIC_API.getPatchId().equals(libraryId)) {
-                    Controllers.dialog(i18n("install.installer.fabric-api.warning"), i18n("message.warning"), MessageDialogPane.MessageType.WARNING);
+                if (!Boolean.TRUE.equals(config().getShownTips().get(FABRIC_QUILT_API_TIP))
+                        && (LibraryAnalyzer.LibraryType.FABRIC_API.getPatchId().equals(libraryId)
+                        || LibraryAnalyzer.LibraryType.QUILT_API.getPatchId().equals(libraryId)
+                        || LibraryAnalyzer.LibraryType.LEGACY_FABRIC_API.getPatchId().equals(libraryId))) {
+                    Controllers.dialog(new MessageDialogPane.Builder(
+                            i18n("install.installer.fabric-quilt-api.warning", i18n("install.installer." + libraryId)),
+                            i18n("message.warning"),
+                            MessageDialogPane.MessageType.WARNING
+                    ).ok(null).addCancel(i18n("button.do_not_show_again"), () -> config().getShownTips().put(FABRIC_QUILT_API_TIP, true)).build());
                 }
 
                 if (!(library.resolvedStateProperty().get() instanceof InstallerItem.IncompatibleState))
@@ -68,7 +77,7 @@ public abstract class AbstractInstallersPage extends Control implements WizardPa
                                     gameVersion,
                                     downloadProvider,
                                     libraryId,
-                                    () -> controller.onPrev(false, Navigation.NavigationDirection.NEXT)
+                                    () -> controller.onPrev(false, Navigation.NavigationDirection.PREVIOUS)
                             ), Navigation.NavigationDirection.NEXT
                     );
             });

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

@@ -25,7 +25,6 @@ import org.jackhuang.hmcl.download.*;
 import org.jackhuang.hmcl.download.game.GameRemoteVersion;
 import org.jackhuang.hmcl.mod.RemoteMod;
 import org.jackhuang.hmcl.mod.curse.CurseForgeRemoteModRepository;
-import org.jackhuang.hmcl.mod.modrinth.ModrinthRemoteModRepository;
 import org.jackhuang.hmcl.setting.DownloadProviders;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
@@ -40,6 +39,7 @@ import org.jackhuang.hmcl.ui.animation.TransitionPane;
 import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
 import org.jackhuang.hmcl.ui.construct.TabHeader;
+import org.jackhuang.hmcl.ui.construct.Validator;
 import org.jackhuang.hmcl.ui.decorator.DecoratorAnimatedPage;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.ui.versions.DownloadListPage;
@@ -84,8 +84,8 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage
         newGameTab.setNodeSupplier(loadVersionFor(() -> new VersionsPage(versionPageNavigator, i18n("install.installer.choose", i18n("install.installer.game")), "", DownloadProviders.getDownloadProvider(),
                 "game", versionPageNavigator::onGameSelected)));
         modpackTab.setNodeSupplier(loadVersionFor(() -> {
-            DownloadListPage page = HMCLLocalizedDownloadListPage.ofModPack((profile, __, file) -> {
-                Versions.downloadModpackImpl(profile, uploadVersion, file);
+            DownloadListPage page = HMCLLocalizedDownloadListPage.ofModPack((profile, __, mod, file) -> {
+                Versions.downloadModpackImpl(profile, uploadVersion, mod, file);
             }, false);
 
             JFXButton installLocalModpackButton = FXUtils.newRaisedButton(i18n("install.modpack"));
@@ -94,9 +94,9 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage
             page.getActions().add(installLocalModpackButton);
             return page;
         }));
-        modTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofMod((profile, version, file) -> download(profile, version, file, "mods"), true)));
-        resourcePackTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofResourcePack((profile, version, file) -> download(profile, version, file, "resourcepacks"), true)));
-        shaderTab.setNodeSupplier(loadVersionFor(() -> new DownloadListPage(ModrinthRemoteModRepository.SHADER_PACKS, (profile, version, file) -> download(profile, version, file, "shaderpacks"), true)));
+        modTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofMod((profile, version, mod, file) -> download(profile, version, file, "mods"), true)));
+        resourcePackTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofResourcePack((profile, version, mod, file) -> download(profile, version, file, "resourcepacks"), true)));
+        shaderTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofShaderPack((profile, version, mod, file) -> download(profile, version, file, "shaderpacks"), true)));
         worldTab.setNodeSupplier(loadVersionFor(() -> new DownloadListPage(CurseForgeRemoteModRepository.WORLDS)));
         tab = new TabHeader(transitionPane, newGameTab, modpackTab, modTab, resourcePackTab, shaderTab, worldTab);
 
@@ -134,11 +134,7 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage
 
         Path runDirectory = profile.getRepository().hasVersion(version) ? profile.getRepository().getRunDirectory(version) : profile.getRepository().getBaseDirectory();
 
-        Controllers.prompt(i18n("archive.file.name"), (result, resolve, reject) -> {
-            if (!FileUtils.isNameValid(result)) {
-                reject.accept(i18n("install.new_game.malformed"));
-                return;
-            }
+        Controllers.prompt(i18n("archive.file.name"), (result, handler) -> {
             Path dest = runDirectory.resolve(subdirectoryName).resolve(result);
 
             Controllers.taskDialog(Task.composeAsync(() -> {
@@ -156,9 +152,8 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage
                     Controllers.showToast(i18n("install.success"));
                 }
             }), i18n("message.downloading"), TaskCancellationAction.NORMAL);
-
-            resolve.run();
-        }, file.getFile().getFilename());
+            handler.resolve();
+        }, file.getFile().getFilename(), new Validator(i18n("install.new_game.malformed"), FileUtils::isNameValid));
 
     }
 

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

@@ -50,7 +50,7 @@ public class InstallersPage extends AbstractInstallersPage {
 
     @Override
     public String getTitle() {
-        return group.getGame().versionProperty().get().getVersion();
+        return group.getGame().versionProperty().get().version();
     }
 
     private String getVersion(String id) {
@@ -111,7 +111,7 @@ public class InstallersPage extends AbstractInstallersPage {
     }
 
     private void setTxtNameWithLoaders() {
-        StringBuilder nameBuilder = new StringBuilder(group.getGame().versionProperty().get().getVersion());
+        StringBuilder nameBuilder = new StringBuilder(group.getGame().versionProperty().get().version());
 
         for (InstallerItem library : group.getLibraries()) {
             String libraryId = library.getLibraryId().replace(LibraryAnalyzer.LibraryType.MINECRAFT.getPatchId(), "");
@@ -121,32 +121,20 @@ public class InstallersPage extends AbstractInstallersPage {
 
             LibraryAnalyzer.LibraryType libraryType = LibraryAnalyzer.LibraryType.fromPatchId(libraryId);
             if (libraryType != null) {
-                String loaderName;
-                switch (libraryType) {
-                    case FORGE:
-                        loaderName = i18n("install.installer.forge");
-                        break;
-                    case NEO_FORGE:
-                        loaderName = i18n("install.installer.neoforge");
-                        break;
-                    case CLEANROOM:
-                        loaderName = i18n("install.installer.cleanroom");
-                        break;
-                    case FABRIC:
-                        loaderName = i18n("install.installer.fabric");
-                        break;
-                    case LITELOADER:
-                        loaderName = i18n("install.installer.liteloader");
-                        break;
-                    case QUILT:
-                        loaderName = i18n("install.installer.quilt");
-                        break;
-                    case OPTIFINE:
-                        loaderName = i18n("install.installer.optifine");
-                        break;
-                    default:
-                        continue;
-                }
+                String loaderName = switch (libraryType) {
+                    case FORGE -> i18n("install.installer.forge");
+                    case NEO_FORGE -> i18n("install.installer.neoforge");
+                    case CLEANROOM -> i18n("install.installer.cleanroom");
+                    case LEGACY_FABRIC -> i18n("install.installer.legacyfabric").replace(" ", "_");
+                    case FABRIC -> i18n("install.installer.fabric");
+                    case LITELOADER -> i18n("install.installer.liteloader");
+                    case QUILT -> i18n("install.installer.quilt");
+                    case OPTIFINE -> i18n("install.installer.optifine");
+                    default -> null;
+                };
+
+                if (loaderName == null)
+                    continue;
 
                 nameBuilder.append("-").append(loaderName);
             }

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

@@ -180,4 +180,5 @@ public final class LocalModpackPage extends ModpackPage {
     public static final SettingsMap.Key<Modpack> MODPACK_MANIFEST = new SettingsMap.Key<>("MODPACK_MANIFEST");
     public static final SettingsMap.Key<Charset> MODPACK_CHARSET = new SettingsMap.Key<>("MODPACK_CHARSET");
     public static final SettingsMap.Key<Boolean> MODPACK_MANUALLY_CREATED = new SettingsMap.Key<>("MODPACK_MANUALLY_CREATED");
+    public static final SettingsMap.Key<String> MODPACK_ICON_URL = new SettingsMap.Key<>("MODPACK_ICON_URL");
 }

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

@@ -33,6 +33,7 @@ import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
 import org.jackhuang.hmcl.util.SettingsMap;
+import org.jackhuang.hmcl.util.StringUtils;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -45,6 +46,7 @@ public final class ModpackInstallWizardProvider implements WizardProvider {
     private final Profile profile;
     private final Path file;
     private final String updateVersion;
+    private String iconUrl;
 
     public ModpackInstallWizardProvider(Profile profile) {
         this(profile, null, null);
@@ -64,12 +66,18 @@ public final class ModpackInstallWizardProvider implements WizardProvider {
         this.updateVersion = updateVersion;
     }
 
+    public void setIconUrl(String iconUrl) {
+        this.iconUrl = iconUrl;
+    }
+
     @Override
     public void start(SettingsMap settings) {
         if (file != null)
             settings.put(LocalModpackPage.MODPACK_FILE, file);
         if (updateVersion != null)
             settings.put(LocalModpackPage.MODPACK_NAME, updateVersion);
+        if (StringUtils.isNotBlank(iconUrl))
+            settings.put(LocalModpackPage.MODPACK_ICON_URL, iconUrl);
         settings.put(ModpackPage.PROFILE, profile);
     }
 
@@ -78,6 +86,7 @@ public final class ModpackInstallWizardProvider implements WizardProvider {
         ServerModpackManifest serverModpackManifest = settings.get(RemoteModpackPage.MODPACK_SERVER_MANIFEST);
         Modpack modpack = settings.get(LocalModpackPage.MODPACK_MANIFEST);
         String name = settings.get(LocalModpackPage.MODPACK_NAME);
+        String iconUrl = settings.get(LocalModpackPage.MODPACK_ICON_URL);
         Charset charset = settings.get(LocalModpackPage.MODPACK_CHARSET);
         boolean isManuallyCreated = settings.getOrDefault(LocalModpackPage.MODPACK_MANUALLY_CREATED, false);
 
@@ -111,7 +120,7 @@ public final class ModpackInstallWizardProvider implements WizardProvider {
                 return ModpackHelper.getInstallTask(profile, serverModpackManifest, name, modpack)
                         .thenRunAsync(Schedulers.javafx(), () -> profile.setSelectedVersion(name));
             } else {
-                return ModpackHelper.getInstallTask(profile, selected, name, modpack)
+                return ModpackHelper.getInstallTask(profile, selected, name, modpack, iconUrl)
                         .thenRunAsync(Schedulers.javafx(), () -> profile.setSelectedVersion(name));
             }
         }

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

@@ -29,11 +29,14 @@ import javafx.scene.shape.SVGPath;
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.game.ModpackHelper;
 import org.jackhuang.hmcl.mod.server.ServerModpackManifest;
-import org.jackhuang.hmcl.task.*;
+import org.jackhuang.hmcl.task.FileDownloadTask;
+import org.jackhuang.hmcl.task.GetTask;
+import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
+import org.jackhuang.hmcl.ui.construct.URLValidator;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
 import org.jackhuang.hmcl.util.SettingsMap;
@@ -121,37 +124,37 @@ public final class ModpackSelectionPage extends VBox implements WizardPage {
     }
 
     private void onChooseRemoteFile() {
-        Controllers.prompt(i18n("modpack.choose.remote.tooltip"), (url, resolve, reject) -> {
+        Controllers.prompt(i18n("modpack.choose.remote.tooltip"), (url, handler) -> {
             try {
                 if (url.endsWith("server-manifest.json")) {
                     // if urlString ends with .json, we assume that the url is server-manifest.json
                     Controllers.taskDialog(new GetTask(url).whenComplete(Schedulers.javafx(), (result, e) -> {
                         ServerModpackManifest manifest = JsonUtils.fromMaybeMalformedJson(result, ServerModpackManifest.class);
                         if (manifest == null) {
-                            reject.accept(i18n("modpack.type.server.malformed"));
+                            handler.reject(i18n("modpack.type.server.malformed"));
                         } else if (e == null) {
-                            resolve.run();
+                            handler.resolve();
                             controller.getSettings().put(MODPACK_SERVER_MANIFEST, manifest);
                             controller.onNext();
                         } else {
-                            reject.accept(e.getMessage());
+                            handler.reject(e.getMessage());
                         }
                     }).executor(true), i18n("message.downloading"), TaskCancellationAction.NORMAL);
                 } else {
                     // otherwise we still consider the file as modpack zip file
                     // since casually the url may not ends with ".zip"
                     Path modpack = Files.createTempFile("modpack", ".zip");
-                    resolve.run();
+                    handler.resolve();
 
                     Controllers.taskDialog(
                             new FileDownloadTask(url, modpack)
                                     .whenComplete(Schedulers.javafx(), e -> {
                                         if (e == null) {
-                                            resolve.run();
+                                            handler.resolve();
                                             controller.getSettings().put(MODPACK_FILE, modpack);
                                             controller.onNext();
                                         } else {
-                                            reject.accept(e.getMessage());
+                                            handler.reject(e.getMessage());
                                         }
                                     }).executor(true),
                             i18n("message.downloading"),
@@ -159,9 +162,9 @@ public final class ModpackSelectionPage extends VBox implements WizardPage {
                     );
                 }
             } catch (IOException e) {
-                reject.accept(e.getMessage());
+                handler.reject(e.getMessage());
             }
-        });
+        }, "", new URLValidator());
     }
 
     public void onChooseRepository() {